Changing CreateCoreDbgRemotePort signature replace LPCSTR with LPCWSTR (#4176)

diff --git a/src/dbgshim/dbgshim.cpp b/src/dbgshim/dbgshim.cpp
index 2b5411da32cbac946e57143f774ed4ebe1b6582d..becdea9266c2240b99f743b917367334496af9c4 100644 (file)
--- a/src/dbgshim/dbgshim.cpp
+++ b/src/dbgshim/dbgshim.cpp
@@ -159,7 +159,7 @@ typedef HRESULT (STDAPICALLTYPE *FPCoreCLRCreateCordbObject3)(
 
 typedef HRESULT (STDAPICALLTYPE *FPCreateRemoteCordbObject)(
     DWORD port,
-    LPCSTR assemblyBasePath,
+    LPCWSTR assemblyBasePath,
     IUnknown **ppCordb);
 
 HRESULT CreateCoreDbg(
@@ -2157,7 +2157,7 @@ CLRCreateInstance(
     return pDebuggingImpl->QueryInterface(riid, ppInterface);
 }
 
-HRESULT CreateCoreDbgRemotePort(HMODULE hDBIModule, DWORD portId, LPCSTR assemblyBasePath, IUnknown **ppCordb)
+HRESULT CreateCoreDbgRemotePort(HMODULE hDBIModule, DWORD portId, LPCWSTR assemblyBasePath, IUnknown **ppCordb)
 {
     PUBLIC_CONTRACT;
     HRESULT hr = S_OK;
@@ -2178,15 +2178,15 @@ DLLEXPORT
 HRESULT
 RegisterForRuntimeStartupRemotePort(
     _In_ DWORD dwRemotePortId,
-    _In_ LPCSTR mscordbiPath,
-    _In_ LPCSTR assemblyBasePath,
+    _In_ LPCWSTR mscordbiPath,
+    _In_ LPCWSTR assemblyBasePath,
     _Out_ IUnknown ** ppCordb)
 {
     PUBLIC_CONTRACT;
     HRESULT hr = S_OK;
     HMODULE hMod = NULL;
 
-    hMod = LoadLibraryA(mscordbiPath);
+    hMod = LoadLibraryW(mscordbiPath);
     if (hMod == NULL)
     {
         hr = CORDBG_E_DEBUG_COMPONENT_MISSING;

diff --git a/src/dbgshim/dbgshim.h b/src/dbgshim/dbgshim.h
index b186a5da8c1a81bcbd98c628224520ae1c97966e..43b44ef5c16bf8b8f599e1653448b84fcbe9d363 100644 (file)
--- a/src/dbgshim/dbgshim.h
+++ b/src/dbgshim/dbgshim.h
@@ -109,6 +109,6 @@ CreateDebuggingInterfaceFromVersion3(
 EXTERN_C HRESULT
 RegisterForRuntimeStartupRemotePort(
     _In_ DWORD dwRemotePortId,
-    _In_ LPCSTR mscordbiPath,
-    _In_ LPCSTR assemblyBasePath,
+    _In_ LPCWSTR mscordbiPath,
+    _In_ LPCWSTR assemblyBasePath,
     _Out_ IUnknown ** ppCordb);