[PATCH v2 2/2] combase: Don't marshal objects that implement IAgileObject in RoGetAgileReference.

[Vibhav Pant]

From: Vibhav Pant

---
 dlls/combase/roapi.c       | 27 +++++++++++++++++++++------
 dlls/combase/tests/roapi.c |  4 ----
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c
index df3a3c5c176..48faf62202d 100644
--- a/dlls/combase/roapi.c
+++ b/dlls/combase/roapi.c
@@ -245,6 +245,7 @@ struct agile_reference
     IStream *marshal_stream;
     CRITICAL_SECTION cs;
     IUnknown *obj;
+    BOOLEAN is_agile;
     LONG ref;
 };

@@ -331,6 +332,9 @@ static HRESULT WINAPI agile_ref_Resolve(IAgileReference *iface, REFIID riid, voi

TRACE("(%p, %s, %p)\n", iface, debugstr_guid(riid), obj);

+    if (impl->is_agile)
+        return IUnknown_QueryInterface(impl->obj, riid, obj);
+
     EnterCriticalSection(&impl->cs);
     if (impl->option == AGILEREFERENCE_DELAYEDMARSHAL && impl->marshal_stream == NULL)
     {
@@ -359,6 +363,16 @@ static const IAgileReferenceVtbl agile_ref_vtbl =
     agile_ref_Resolve,
 };

+static BOOL is_object_agile(IUnknown *obj)
+{
+    IAgileObject *agile;
+    HRESULT hr;
+
+    hr = IUnknown_QueryInterface(obj, &IID_IAgileObject, (void **)&agile);
+    if (SUCCEEDED(hr)) IUnknown_Release(agile);
+    return SUCCEEDED(hr);
+}
+
 /***********************************************************************
  *      RoGetAgileReference (combase.@)
  */
@@ -399,8 +413,14 @@ HRESULT WINAPI RoGetAgileReference(enum AgileReferenceOptions option, REFIID rii
     impl->IAgileReference_iface.lpVtbl = &agile_ref_vtbl;
     impl->option = option;
     impl->ref = 1;
+    impl->is_agile = is_object_agile(obj);

-    if (option == AGILEREFERENCE_DEFAULT)
+    if (option == AGILEREFERENCE_DELAYEDMARSHAL || impl->is_agile)
+    {
+        impl->obj = obj;
+        IUnknown_AddRef(impl->obj);
+    }
+    else if (option == AGILEREFERENCE_DEFAULT)
     {
         if (FAILED(hr = marshal_object_in_agile_reference(impl, riid, obj)))
         {
@@ -408,11 +428,6 @@ HRESULT WINAPI RoGetAgileReference(enum AgileReferenceOptions option, REFIID rii
             return hr;
         }
     }
-    else if (option == AGILEREFERENCE_DELAYEDMARSHAL)
-    {
-        impl->obj = obj;
-        IUnknown_AddRef(impl->obj);
-    }

InitializeCriticalSection(&impl->cs);

diff --git a/dlls/combase/tests/roapi.c b/dlls/combase/tests/roapi.c
index fb40dc60f5a..91421605a75 100644
--- a/dlls/combase/tests/roapi.c
+++ b/dlls/combase/tests/roapi.c
@@ -446,9 +446,7 @@ static DWORD CALLBACK test_RoGetAgileReference_thread_proc(void *arg)
     ok(!!unknown, "Expected pointer not NULL.\n");
     if (param->obj_is_agile)
     {
-        todo_wine_if(param->from_type == RO_INIT_SINGLETHREADED || param->to_type == RO_INIT_SINGLETHREADED)
         ok(unknown == param->unk_obj, "Expected the same object.\n");
-        todo_wine_if(param->from_type == RO_INIT_MULTITHREADED && param->to_type == RO_INIT_MULTITHREADED)
         EXPECT_REF(param->unk_obj, 4);
     }
     else if (param->from_type == RO_INIT_MULTITHREADED && param->to_type == RO_INIT_MULTITHREADED)
@@ -565,7 +563,6 @@ static void test_RoGetAgileReference(void)
             hr = RoGetAgileReference(option, &IID_IUnknown, &unk_agile_obj.IUnknown_iface, &agile_reference);
             ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
             ok(!!agile_reference, "Got unexpected agile_reference.\n");
-            todo_wine_if(option == AGILEREFERENCE_DEFAULT)
             EXPECT_REF(&unk_agile_obj, 2);

unknown = NULL;
@@ -573,7 +570,6 @@ static void test_RoGetAgileReference(void)
             ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
             ok(!!unknown, "Expected pointer not NULL.\n");
             ok(unknown == &unk_agile_obj.IUnknown_iface, "Expected the same object.\n");
-            todo_wine
             EXPECT_REF(&unk_agile_obj, 3);

for (to_type = RO_INIT_SINGLETHREADED; to_type <= RO_INIT_MULTITHREADED; to_type++)