From a050c00b6c9c557a791cd4b582d0197e2a760635 Mon Sep 17 00:00:00 2001 From: Max Schmitt Date: Mon, 2 Aug 2021 16:28:16 +0200 Subject: [PATCH] Revert "browser(winldd): attempt to fix dependency loading on windows (#7790)" (#7948) This reverts commit c1d6c4b25efb70a8fe9eac5badfd62d4f3783365. --- browser_patches/winldd/BUILD_NUMBER | 2 +- browser_patches/winldd/PrintDeps.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/browser_patches/winldd/BUILD_NUMBER b/browser_patches/winldd/BUILD_NUMBER index 49bc2728c7..9540e56f97 100644 --- a/browser_patches/winldd/BUILD_NUMBER +++ b/browser_patches/winldd/BUILD_NUMBER @@ -1 +1 @@ -1005 +1006 diff --git a/browser_patches/winldd/PrintDeps.cpp b/browser_patches/winldd/PrintDeps.cpp index 99b374eab0..e7e15e5ece 100644 --- a/browser_patches/winldd/PrintDeps.cpp +++ b/browser_patches/winldd/PrintDeps.cpp @@ -76,7 +76,7 @@ const DepsMap getDependencies(const HMODULE hMod) { LPCSTR dllName = (LPCSTR)((BYTE*)hMod + pImportDesc->Name); std::string dllPath = "not found"; - HMODULE hModDep = LoadLibraryEx(dllName, NULL, LOAD_LIBRARY_AS_IMAGE_RESOURCE | LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_SEARCH_DEFAULT_DIRS | LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR); + HMODULE hModDep = LoadLibraryEx(dllName, NULL, DONT_RESOLVE_DLL_REFERENCES | LOAD_LIBRARY_SEARCH_USER_DIRS | LOAD_LIBRARY_SEARCH_SYSTEM32); if (hModDep != NULL) { TCHAR pathBuffer[_MAX_PATH]; @@ -97,7 +97,7 @@ const DepsMap getDependencies(const HMODULE hMod) int printDependencies(const char* library) { SetDllDirectoryA("."); - HMODULE hMod = LoadLibraryEx(library, NULL, LOAD_LIBRARY_AS_IMAGE_RESOURCE | LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_SEARCH_DEFAULT_DIRS | LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR); + HMODULE hMod = LoadLibraryEx(library, NULL, DONT_RESOLVE_DLL_REFERENCES | LOAD_LIBRARY_SEARCH_USER_DIRS | LOAD_LIBRARY_SEARCH_SYSTEM32); if (hMod == NULL) { std::cerr << "Failed to load " << library << " Error: " << getLastErrorString() << std::endl;