Nikolay Sivov : ole32: Cleanup QI for IEnumMoniker.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: bc9b29f65d908d50d6a4ef327d4f9a880a42b19e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=bc9b29f65d908d50d6a4ef327d...

Author: Nikolay Sivov <nsivov(a)codeweavers.com>
Date:   Fri Mar 20 09:52:06 2015 +0300

ole32: Cleanup QI for IEnumMoniker.

---

 dlls/ole32/moniker.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c
index 5c46de9..2997156 100644
--- 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;
 }