diff --git a/dlls/ole32/antimoniker.c b/dlls/ole32/antimoniker.c index 92e28530e96..7f040363499 100644 --- a/dlls/ole32/antimoniker.c +++ b/dlls/ole32/antimoniker.c @@ -67,7 +67,7 @@ AntiMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) TRACE("(%p,%p,%p)\n",This,riid,ppvObject); /* Perform a sanity check on the parameters.*/ - if ( (This==0) || (ppvObject==0) ) + if ( ppvObject==0 ) return E_INVALIDARG; /* Initialize the return parameter */ diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index 275d875362b..f7d6ee6cdda 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -101,7 +101,7 @@ CompositeMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject TRACE("(%p,%p,%p)\n",This,riid,ppvObject); /* Perform a sanity check on the parameters.*/ - if ( (This==0) || (ppvObject==0) ) + if ( ppvObject==0 ) return E_INVALIDARG; /* Initialize the return parameter */ @@ -1504,7 +1504,7 @@ EnumMonikerImpl_QueryInterface(IEnumMoniker* iface,REFIID riid,void** ppvObject) TRACE("(%p,%p,%p)\n",This,riid,ppvObject); /* Perform a sanity check on the parameters.*/ - if ( (This==0) || (ppvObject==0) ) + if ( ppvObject==0 ) return E_INVALIDARG; /* Initialize the return parameter */ diff --git a/dlls/ole32/enumx.c b/dlls/ole32/enumx.c index 26653014984..4279ca81fa9 100644 --- a/dlls/ole32/enumx.c +++ b/dlls/ole32/enumx.c @@ -51,7 +51,7 @@ HRESULT WINAPI enumx_QueryInterface( REFIID riid, void** ppvObject) { - if ( (This==0) || (ppvObject==0) ) + if ( ppvObject==0 ) return E_INVALIDARG; *ppvObject = 0; diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c index 01ae5d1d9e7..0cbfc3aee91 100644 --- a/dlls/ole32/filemoniker.c +++ b/dlls/ole32/filemoniker.c @@ -77,7 +77,7 @@ FileMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) TRACE("(%p,%s,%p)\n",This,debugstr_guid(riid),ppvObject); /* Perform a sanity check on the parameters.*/ - if ( (This==0) || (ppvObject==0) ) + if ( ppvObject==0 ) return E_INVALIDARG; /* Initialize the return parameter */ @@ -1450,7 +1450,7 @@ HRESULT WINAPI CreateFileMoniker(LPCOLESTR lpszPathName, LPMONIKER * ppmk) hr = FileMonikerImpl_Construct(newFileMoniker,lpszPathName); if (SUCCEEDED(hr)) - hr = FileMonikerImpl_QueryInterface((IMoniker*)newFileMoniker,&IID_IMoniker,(void**)ppmk); + hr = IMoniker_QueryInterface((IMoniker*)newFileMoniker,&IID_IMoniker,(void**)ppmk); else HeapFree(GetProcessHeap(),0,newFileMoniker); @@ -1600,7 +1600,7 @@ static HRESULT WINAPI FileMonikerCF_CreateInstance(LPCLASSFACTORY iface, hr = FileMonikerImpl_Construct(newFileMoniker, wszEmpty); if (SUCCEEDED(hr)) - hr = FileMonikerImpl_QueryInterface((IMoniker*)newFileMoniker, riid, ppv); + hr = IMoniker_QueryInterface((IMoniker*)newFileMoniker, riid, ppv); if (FAILED(hr)) HeapFree(GetProcessHeap(),0,newFileMoniker);