Sync with trunk r64509.

[reactos.git] / dll / win32 / mshtml / htmlstorage.c

diff --git a/dll/win32/mshtml/htmlstorage.c b/dll/win32/mshtml/htmlstorage.c
index d6b11c1..eeefdff 100644 (file)
--- a/dll/win32/mshtml/htmlstorage.c
+++ b/dll/win32/mshtml/htmlstorage.c
@@ -33,25 +33,22 @@ static HRESULT WINAPI HTMLStorage_QueryInterface(IHTMLStorage *iface, REFIID rii
 {
     HTMLStorage *This = impl_from_IHTMLStorage(iface);
 
-    *ppv = NULL;
+    TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv);
 
     if(IsEqualGUID(&IID_IUnknown, riid)) {
-        TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv);
         *ppv = &This->IHTMLStorage_iface;
     }else if(IsEqualGUID(&IID_IHTMLStorage, riid)) {
-        TRACE("(%p)->(IID_IHTMLStorage %p)\n", This, ppv);
         *ppv = &This->IHTMLStorage_iface;
     }else if(dispex_query_interface(&This->dispex, riid, ppv)) {
         return *ppv ? S_OK : E_NOINTERFACE;
+    }else {
+        *ppv = NULL;
+        WARN("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv);
+        return E_NOINTERFACE;
     }
 
-    if(*ppv) {
-        IUnknown_AddRef((IUnknown*)*ppv);
-        return S_OK;
-    }
-
-    WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv);
-    return E_NOINTERFACE;
+    IUnknown_AddRef((IUnknown*)*ppv);
+    return S_OK;
 }
 
 static ULONG WINAPI HTMLStorage_AddRef(IHTMLStorage *iface)