Browse Source

load_dso: we can expect LoadLibraryExW to be available

rdb 6 years ago
parent
commit
b4fd82b812
1 changed files with 1 additions and 13 deletions
  1. 1 13
      dtool/src/dtoolutil/load_dso.cxx

+ 1 - 13
dtool/src/dtoolutil/load_dso.cxx

@@ -50,19 +50,7 @@ load_dso(const DSearchPath &path, const Filename &filename) {
     return nullptr;
   }
   std::wstring os_specific_w = abspath.to_os_specific_w();
-
-  // Try using LoadLibraryEx, if possible.
-  typedef HMODULE (WINAPI *tLoadLibraryEx)(LPCWSTR, HANDLE, DWORD);
-  tLoadLibraryEx pLoadLibraryEx;
-  HINSTANCE hLib = LoadLibrary("kernel32.dll");
-  if (hLib) {
-    pLoadLibraryEx = (tLoadLibraryEx)GetProcAddress(hLib, "LoadLibraryExW");
-    if (pLoadLibraryEx) {
-      return pLoadLibraryEx(os_specific_w.c_str(), nullptr, LOAD_WITH_ALTERED_SEARCH_PATH);
-    }
-  }
-
-  return LoadLibraryW(os_specific_w.c_str());
+  return LoadLibraryExW(os_specific_w.c_str(), nullptr, LOAD_WITH_ALTERED_SEARCH_PATH);
 }
 
 bool