quartz: Handle wrong COM aggregation attempts in IClassFactory_CreateInstance.

ec995189 · Michael Stefaniuc · Alexandre Julliard · dc59a05b · ec995189
Commit ec995189 authored Jul 02, 2012 by Michael Stefaniuc Committed by Alexandre Julliard Jul 02, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

main.c dlls/quartz/main.c +4 -1

No files found.
--- a/dlls/quartz/main.c
+++ b/dlls/quartz/main.c
@@ -124,10 +124,13 @@ static HRESULT WINAPI DSCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter
    IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
    HRESULT hres;
    LPUNKNOWN punk;
-    
+
    TRACE("(%p)->(%p,%s,%p)\n",This,pOuter,debugstr_guid(riid),ppobj);

    *ppobj = NULL;
+    if(pOuter && !IsEqualGUID(&IID_IUnknown, riid))
+        return E_NOINTERFACE;
+
    hres = This->pfnCreateInstance(pOuter, (LPVOID *) &punk);
    if (SUCCEEDED(hres)) {
        hres = IUnknown_QueryInterface(punk, riid, ppobj);