TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 00:32:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

load_dso: we can expect LoadLibraryExW to be available

Browse Source
This commit is contained in:
rdb 2019-09-06 09:46:57 +02:00
parent d92b440617
commit b4fd82b812
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dtool/src/dtoolutil/load_dso.cxx
View File

@ -50,19 +50,7 @@ load_dso(const DSearchPath &path, const Filename &filename) {
return nullptr; return nullptr;
} }
std::wstring os_specific_w = abspath.to_os_specific_w(); std::wstring os_specific_w = abspath.to_os_specific_w();
return LoadLibraryExW(os_specific_w.c_str(), nullptr, LOAD_WITH_ALTERED_SEARCH_PATH);
// 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());
} }
bool bool