Rolled back my LoadLibrary change. The first failed call causes a dialog to pop up in Windows apps (but not console apps) and that's really bad. I'll have to deal with this in my app.
authorSam Lantinga <slouken@libsdl.org>
Sat, 28 Sep 2013 14:06:39 -0700
changeset 7758 54c0acdf9c8e
parent 7757 572546fa1c9b
child 7759 869583422e5a
Rolled back my LoadLibrary change. The first failed call causes a dialog to pop up in Windows apps (but not console apps) and that's really bad. I'll have to deal with this in my app.
src/loadso/windows/SDL_sysloadso.c
--- a/src/loadso/windows/SDL_sysloadso.c	Sat Sep 28 14:06:31 2013 -0700
+++ b/src/loadso/windows/SDL_sysloadso.c	Sat Sep 28 14:06:39 2013 -0700
@@ -34,19 +34,6 @@
 {
     LPTSTR tstr = WIN_UTF8ToString(sofile);
     void *handle = (void *) LoadLibrary(tstr);
-
-	/* By default LoadLibrary uses the current working directory 
-	* as the first item on the search path for implicit dependencies
-	* of whatever it's loading. That is somewhat inconsistent with
-	* what dlopen does on other platforms, so we will try again
-	* with LoadLibraryEx and a slightly different search path. This
-	* causes Windows to search for dependencies in the directory 
-	* that the module itself lives in. */
-	if(handle == NULL)
-	{
-		handle = (void *) LoadLibraryEx(tstr, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
-	}
-
     SDL_free(tstr);
 
     /* Generate an error message if all loads failed */