From b4fd82b8120f5b4a5018fc8d0e399708eb1a460f Mon Sep 17 00:00:00 2001 From: rdb Date: Fri, 6 Sep 2019 09:46:57 +0200 Subject: [PATCH] load_dso: we can expect LoadLibraryExW to be available --- dtool/src/dtoolutil/load_dso.cxx | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/dtool/src/dtoolutil/load_dso.cxx b/dtool/src/dtoolutil/load_dso.cxx index 0c7ae24ebe..fcd0c9fffe 100644 --- a/dtool/src/dtoolutil/load_dso.cxx +++ b/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