combase: When looking up an apartment which has a given creator thread ID use…

combase: When looking up an apartment which has a given creator thread ID use multi-threaded apartment only if the thread doesn't have an apartment-threaded one. CoIncrementMTAUsage() always creates the MTA if it doesn't already exist, and mta->tid may accidently match the apt->tid of the apartment-threaded apartment of the thread. Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru> Signed-off-by: Huw Davies <huw@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

combase: When looking up an apartment which has a given creator thread ID use…
b4da1403 · Dmitry Timoshkov · Alexandre Julliard · 251ab17a · b4da1403
Commit b4da1403 authored Jul 29, 2021 by Dmitry Timoshkov Committed by Alexandre Julliard Aug 06, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 1 deletion

apartment.c dlls/combase/apartment.c +8 -1

No files found.
--- a/dlls/combase/apartment.c
+++ b/dlls/combase/apartment.c
@@ -663,13 +663,20 @@ struct apartment * apartment_findfromtid(DWORD tid)
    EnterCriticalSection(&apt_cs);
    LIST_FOR_EACH_ENTRY(apt, &apts, struct apartment, entry)
    {
-        if (apt->tid == tid)
+        if (apt != mta && apt->tid == tid)
        {
            result = apt;
            apartment_addref(result);
            break;
        }
    }
+
+    if (!result && mta && mta->tid == tid)
+    {
+        result = mta;
+        apartment_addref(result);
+    }
+
    LeaveCriticalSection(&apt_cs);

    return result;