[PATCH 0/1] MR2753: combase: Check that process ID matches before searching the MTA for a stub manager.

[Connor McAdams (＠cmcadams)]

This silences a harmless ERR message that happens when no stub manager is found for the ipid.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/2753

[PATCH 1/1] combase: Check that process ID matches before searching the MTA for a stub manager.

[Connor McAdams]

From: Connor McAdams <cmcadams(a)codeweavers.com>

Now that MTA objects across processes share a value of 0 in the Data2
field of the stub manager IPID, make sure that we only search the MTA
for stub managers that reside in the current process.

Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com>
---
 dlls/combase/stubmanager.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/combase/stubmanager.c b/dlls/combase/stubmanager.c
index 5bb87c60c1d..ff8937d7bd7 100644
--- a/dlls/combase/stubmanager.c
+++ b/dlls/combase/stubmanager.c
@@ -499,13 +499,13 @@ static HRESULT ipid_to_ifstub(const IPID *ipid, struct apartment **stub_apt,
     /* FIXME: hack for IRemUnknown */
     if (ipid->Data2 == 0xffff)
         *stub_apt = apartment_findfromoxid(*(const OXID *)ipid->Data4);
-    else if (!ipid->Data2)
+    else if (!ipid->Data2 && (ipid->Data3 == (USHORT)GetCurrentProcessId()))
         *stub_apt = apartment_get_mta();
     else
         *stub_apt = apartment_findfromtid(ipid->Data2);
     if (!*stub_apt)
     {
-        TRACE("Couldn't find apartment corresponding to TID 0x%04x\n", ipid->Data2);
+        TRACE("Couldn't find apartment corresponding to TID 0x%04x, PID 0x%04x\n", ipid->Data2, ipid->Data3);
         return RPC_E_INVALID_OBJECT;
     }
     *stubmgr_ret = get_stub_manager_from_ipid(*stub_apt, ipid, ifstub);
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/2753

[PATCH 0/1] MR2753: combase: Check that process ID matches before searching the MTA for a stub manager. - approved

[Huw Davies (＠huw)]

This merge request was approved by Huw Davies.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/2753