From bc9b29f65d908d50d6a4ef327d4f9a880a42b19e Mon Sep 17 00:00:00 2001 From: Nikolay Sivov Date: Fri, 20 Mar 2015 09:52:06 +0300 Subject: [PATCH] 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 5c46de999e5..29971569423 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; }