From ec9951892bab811ac6a8cedda7f7a6bf05e20b5f Mon Sep 17 00:00:00 2001
From: Michael Stefaniuc <mstefani@redhat.de>
Date: Mon, 2 Jul 2012 00:54:55 +0200
Subject: [PATCH] quartz: Handle wrong COM aggregation attempts in
 IClassFactory_CreateInstance.

---
 dlls/quartz/main.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dlls/quartz/main.c b/dlls/quartz/main.c
index a75a794587c..edb9cbce420 100644
--- 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);
-- 
2.11.4.GIT