From 577fda46c0381f6c983d1a78a8a9a80003d4b110 Mon Sep 17 00:00:00 2001 From: Aaron R Robinson Date: Thu, 31 Aug 2023 20:58:26 -0700 Subject: [PATCH 1/2] Use LoadLibraryExW on Windows. --- src/coreclr/debug/di/process.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/coreclr/debug/di/process.cpp b/src/coreclr/debug/di/process.cpp index eb0f4ad5f1c262..8d6ac91796bfe5 100644 --- a/src/coreclr/debug/di/process.cpp +++ b/src/coreclr/debug/di/process.cpp @@ -180,7 +180,11 @@ STDAPI DLLEXPORT OpenVirtualProcessImpl2( IUnknown ** ppInstance, CLR_DEBUGGING_PROCESS_FLAGS* pFlagsOut) { +#ifdef TARGET_WINDOWS + HMODULE hDac = LoadLibraryExW(pDacModulePath, NULL, LOAD_LIBRARY_SEARCH_SYSTEM32); +#else HMODULE hDac = LoadLibraryW(pDacModulePath); +#endif // !TARGET_WINDOWS if (hDac == NULL) { return HRESULT_FROM_WIN32(GetLastError()); From f4c145506918415aad5dfe5a6561a1a52c0da531 Mon Sep 17 00:00:00 2001 From: Aaron R Robinson Date: Fri, 1 Sep 2023 08:14:51 -0700 Subject: [PATCH 2/2] Use correct flag. --- src/coreclr/debug/di/process.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/coreclr/debug/di/process.cpp b/src/coreclr/debug/di/process.cpp index 8d6ac91796bfe5..db8f2a4badd67f 100644 --- a/src/coreclr/debug/di/process.cpp +++ b/src/coreclr/debug/di/process.cpp @@ -181,7 +181,7 @@ STDAPI DLLEXPORT OpenVirtualProcessImpl2( CLR_DEBUGGING_PROCESS_FLAGS* pFlagsOut) { #ifdef TARGET_WINDOWS - HMODULE hDac = LoadLibraryExW(pDacModulePath, NULL, LOAD_LIBRARY_SEARCH_SYSTEM32); + HMODULE hDac = LoadLibraryExW(pDacModulePath, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); #else HMODULE hDac = LoadLibraryW(pDacModulePath); #endif // !TARGET_WINDOWS