atl: AtlModuleGetClassObject should store an intermediate pointer in obj->pCF…

atl: AtlModuleGetClassObject should store an intermediate pointer in obj->pCF and then query this for the requested interface. Return CLASS_E_CLASSNOTAVAILABLE instead of E_FAIL.

atl: AtlModuleGetClassObject should store an intermediate pointer in obj->pCF…
72ddcb5f · Rob Shearman · Alexandre Julliard · 3af74c5e · 72ddcb5f
Commit 72ddcb5f authored Apr 25, 2007 by Rob Shearman Committed by Alexandre Julliard Apr 25, 2007
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 2 deletions

atl_main.c dlls/atl/atl_main.c +11 -2

No files found.
--- a/dlls/atl/atl_main.c
+++ b/dlls/atl/atl_main.c
@@ -340,6 +340,7 @@ HRESULT WINAPI AtlModuleGetClassObject(_ATL_MODULEW *pm, REFCLSID rclsid,
                                       REFIID riid, LPVOID *ppv)
 {
    int i;
+    HRESULT hres = CLASS_E_CLASSNOTAVAILABLE;

    TRACE("%p %s %s %p\n", pm, debugstr_guid(rclsid), debugstr_guid(riid), ppv);

@@ -354,13 +355,21 @@ HRESULT WINAPI AtlModuleGetClassObject(_ATL_MODULEW *pm, REFCLSID rclsid,

            TRACE("found object %i\n", i);
            if (obj->pfnGetClassObject)
-                return obj->pfnGetClassObject(obj->pfnCreateInstance, riid, ppv);
+            {
+                if (!obj->pCF)
+                    hres = obj->pfnGetClassObject(obj->pfnCreateInstance,
+                                                  &IID_IUnknown,
+                                                  (void **)&obj->pCF);
+                if (obj->pCF)
+                    hres = IUnknown_QueryInterface(obj->pCF, riid, ppv);
+                break;
+            }
        }
    }

    WARN("no class object found for %s\n", debugstr_guid(rclsid));

-    return E_FAIL;
+    return hres;
 }

 /***********************************************************************