ole32: Cleanup QI for IEnumMoniker.

bc9b29f6 · Nikolay Sivov · Alexandre Julliard · 853dc5ec · bc9b29f6
Commit bc9b29f6 authored Mar 20, 2015 by Nikolay Sivov Committed by Alexandre Julliard Mar 20, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 7 deletions

moniker.c dlls/ole32/moniker.c +2 -7

No files found.
--- a/dlls/ole32/moniker.c
+++ b/dlls/ole32/moniker.c
@@ -1298,17 +1298,12 @@ static HRESULT WINAPI EnumMonikerImpl_QueryInterface(IEnumMoniker* iface,REFIID 

    *ppvObject = NULL;

-    if (IsEqualIID(&IID_IUnknown, riid))
-        *ppvObject = This;
+    if (IsEqualIID(&IID_IUnknown, riid) || IsEqualIID(&IID_IEnumMoniker, riid))
+        *ppvObject = &This->IEnumMoniker_iface;
    else
-        if (IsEqualIID(&IID_IEnumMoniker, riid))
-            *ppvObject = This;
-
-    if ((*ppvObject)==NULL)
        return E_NOINTERFACE;

    IEnumMoniker_AddRef(iface);
-
    return S_OK;
 }