瀏覽代碼

SDL_LoadObject on Windows now calls LoadLibrary a second time in its EX form whenever the first load fails. This second call uses the "altered" search path for DLL dependencies, which includes searching the directory that the DLL itself lives in.

Sam Lantinga 12 年之前
父節點
當前提交
dfa53e7e3c
共有 1 個文件被更改,包括 13 次插入0 次删除
  1. 13 0
      src/loadso/windows/SDL_sysloadso.c

+ 13 - 0
src/loadso/windows/SDL_sysloadso.c

@@ -34,6 +34,19 @@ SDL_LoadObject(const char *sofile)
 {
 {
     LPTSTR tstr = WIN_UTF8ToString(sofile);
     LPTSTR tstr = WIN_UTF8ToString(sofile);
     void *handle = (void *) LoadLibrary(tstr);
     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);
     SDL_free(tstr);
 
 
     /* Generate an error message if all loads failed */
     /* Generate an error message if all loads failed */