From 5a19f28b6ee9782c8e41d2df877eb986b323e31f Mon Sep 17 00:00:00 2001
From: Thays Grazia <thaystg@gmail.com>
Date: Tue, 26 Sep 2023 10:25:17 -0300
Subject: [PATCH] Adding more parameters to connect to mono runtime (#4261)

Now it's tested on all platforms: Windows, Linux and Mac, connecting to
iOS and Android, devices and emulators.
---
 src/dbgshim/dbgshim.cpp | 24 +++++++++++++++---------
 src/dbgshim/dbgshim.h   |  9 ++++++---
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/dbgshim/dbgshim.cpp b/src/dbgshim/dbgshim.cpp
index becdea926..40c129c02 100644
--- a/src/dbgshim/dbgshim.cpp
+++ b/src/dbgshim/dbgshim.cpp
@@ -158,8 +158,11 @@ typedef HRESULT (STDAPICALLTYPE *FPCoreCLRCreateCordbObject3)(
     IUnknown **ppCordb);
 
 typedef HRESULT (STDAPICALLTYPE *FPCreateRemoteCordbObject)(
-    DWORD port,
-    LPCWSTR assemblyBasePath,
+    LPCWSTR szIp,
+    DWORD dwPort,
+    LPCWSTR szPlatform,
+    BOOL bIsServer,
+    LPCWSTR szAssemblyBasePath,
     IUnknown **ppCordb);
 
 HRESULT CreateCoreDbg(
@@ -2157,7 +2160,7 @@ CLRCreateInstance(
     return pDebuggingImpl->QueryInterface(riid, ppInterface);
 }
 
-HRESULT CreateCoreDbgRemotePort(HMODULE hDBIModule, DWORD portId, LPCWSTR assemblyBasePath, IUnknown **ppCordb)
+HRESULT CreateCoreDbgRemotePort(HMODULE hDBIModule, LPCWSTR szIp, DWORD dwPort, LPCWSTR szPlatform, BOOL bIsServer, LPCWSTR assemblyBasePath, IUnknown **ppCordb)
 {
     PUBLIC_CONTRACT;
     HRESULT hr = S_OK;
@@ -2169,7 +2172,7 @@ HRESULT CreateCoreDbgRemotePort(HMODULE hDBIModule, DWORD portId, LPCWSTR assemb
         return CORDBG_E_INCOMPATIBLE_PROTOCOL;
     }
 
-    return fpCreate(portId, assemblyBasePath, ppCordb);
+    return fpCreate(szIp, dwPort, szPlatform, bIsServer, assemblyBasePath, ppCordb);
 
     return hr;
 }
@@ -2177,22 +2180,25 @@ HRESULT CreateCoreDbgRemotePort(HMODULE hDBIModule, DWORD portId, LPCWSTR assemb
 DLLEXPORT
 HRESULT
 RegisterForRuntimeStartupRemotePort(
-    _In_ DWORD dwRemotePortId,
-    _In_ LPCWSTR mscordbiPath,
-    _In_ LPCWSTR assemblyBasePath,
+    _In_ LPCWSTR szIp,
+    _In_ DWORD dwPort,
+    _In_ LPCWSTR szPlatform,
+    _In_ BOOL bIsServer,
+    _In_ LPCWSTR szMscordbiPath,
+    _In_ LPCWSTR szAssemblyBasePath,
     _Out_ IUnknown ** ppCordb)
 {
     PUBLIC_CONTRACT;
     HRESULT hr = S_OK;
     HMODULE hMod = NULL;
 
-    hMod = LoadLibraryW(mscordbiPath);
+    hMod = LoadLibraryW(szMscordbiPath);
     if (hMod == NULL)
     {
         hr = CORDBG_E_DEBUG_COMPONENT_MISSING;
         return hr;
     }
 
-    hr = CreateCoreDbgRemotePort(hMod, dwRemotePortId, assemblyBasePath, ppCordb);
+    hr = CreateCoreDbgRemotePort(hMod, szIp, dwPort, szPlatform, bIsServer, szAssemblyBasePath, ppCordb);
     return S_OK;
 }
diff --git a/src/dbgshim/dbgshim.h b/src/dbgshim/dbgshim.h
index 43b44ef5c..b85d8cf51 100644
--- a/src/dbgshim/dbgshim.h
+++ b/src/dbgshim/dbgshim.h
@@ -108,7 +108,10 @@ CreateDebuggingInterfaceFromVersion3(
 
 EXTERN_C HRESULT
 RegisterForRuntimeStartupRemotePort(
-    _In_ DWORD dwRemotePortId,
-    _In_ LPCWSTR mscordbiPath,
-    _In_ LPCWSTR assemblyBasePath,
+    _In_ LPCWSTR szIp,
+    _In_ DWORD dwPort,
+    _In_ LPCWSTR szPlatform,
+    _In_ BOOL bIsServer,
+    _In_ LPCWSTR szMscordbiPath,
+    _In_ LPCWSTR szAssemblyBasePath,
     _Out_ IUnknown ** ppCordb);
-- 
2.34.1