Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-23 12:51:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1843701 - Unconditionally use LOAD_LIBRARY_SEARCH_SYSTEM32. r=handyman

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D183631
This commit is contained in:
Masatoshi Kimura 2023-07-17 18:13:51 +00:00
parent 5bb76f890a
commit 5647f7c0f5
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
xpcom/base/nsWindowsHelpers.h
View File

@ -298,16 +298,7 @@ bool inline ConstructSystem32Path(LPCWSTR aModule, WCHAR* aSystemPath,
}
HMODULE inline LoadLibrarySystem32(LPCWSTR aModule) {
static const auto setDefaultDllDirectories =
GetProcAddress(GetModuleHandleW(L"kernel32"), "SetDefaultDllDirectories");
if (setDefaultDllDirectories) {
return LoadLibraryExW(aModule, nullptr, LOAD_LIBRARY_SEARCH_SYSTEM32);
}
WCHAR systemPath[MAX_PATH + 1];
if (!ConstructSystem32Path(aModule, systemPath, MAX_PATH + 1)) {
return NULL;
}
return LoadLibraryExW(systemPath, nullptr, LOAD_WITH_ALTERED_SEARCH_PATH);
return LoadLibraryExW(aModule, nullptr, LOAD_LIBRARY_SEARCH_SYSTEM32);
}
// for UniquePtr