Commit 11451080 authored by Nikolay Sivov's avatar Nikolay Sivov Committed by Alexandre Julliard

ole32: No need to test for interface pointer being null.

parent 2f61e191
...@@ -67,7 +67,7 @@ AntiMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) ...@@ -67,7 +67,7 @@ AntiMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject)
TRACE("(%p,%p,%p)\n",This,riid,ppvObject); TRACE("(%p,%p,%p)\n",This,riid,ppvObject);
/* Perform a sanity check on the parameters.*/ /* Perform a sanity check on the parameters.*/
if ( (This==0) || (ppvObject==0) ) if ( ppvObject==0 )
return E_INVALIDARG; return E_INVALIDARG;
/* Initialize the return parameter */ /* Initialize the return parameter */
......
...@@ -101,7 +101,7 @@ CompositeMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject ...@@ -101,7 +101,7 @@ CompositeMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject
TRACE("(%p,%p,%p)\n",This,riid,ppvObject); TRACE("(%p,%p,%p)\n",This,riid,ppvObject);
/* Perform a sanity check on the parameters.*/ /* Perform a sanity check on the parameters.*/
if ( (This==0) || (ppvObject==0) ) if ( ppvObject==0 )
return E_INVALIDARG; return E_INVALIDARG;
/* Initialize the return parameter */ /* Initialize the return parameter */
...@@ -1504,7 +1504,7 @@ EnumMonikerImpl_QueryInterface(IEnumMoniker* iface,REFIID riid,void** ppvObject) ...@@ -1504,7 +1504,7 @@ EnumMonikerImpl_QueryInterface(IEnumMoniker* iface,REFIID riid,void** ppvObject)
TRACE("(%p,%p,%p)\n",This,riid,ppvObject); TRACE("(%p,%p,%p)\n",This,riid,ppvObject);
/* Perform a sanity check on the parameters.*/ /* Perform a sanity check on the parameters.*/
if ( (This==0) || (ppvObject==0) ) if ( ppvObject==0 )
return E_INVALIDARG; return E_INVALIDARG;
/* Initialize the return parameter */ /* Initialize the return parameter */
......
...@@ -51,7 +51,7 @@ HRESULT WINAPI enumx_QueryInterface( ...@@ -51,7 +51,7 @@ HRESULT WINAPI enumx_QueryInterface(
REFIID riid, REFIID riid,
void** ppvObject) void** ppvObject)
{ {
if ( (This==0) || (ppvObject==0) ) if ( ppvObject==0 )
return E_INVALIDARG; return E_INVALIDARG;
*ppvObject = 0; *ppvObject = 0;
......
...@@ -77,7 +77,7 @@ FileMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) ...@@ -77,7 +77,7 @@ FileMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject)
TRACE("(%p,%s,%p)\n",This,debugstr_guid(riid),ppvObject); TRACE("(%p,%s,%p)\n",This,debugstr_guid(riid),ppvObject);
/* Perform a sanity check on the parameters.*/ /* Perform a sanity check on the parameters.*/
if ( (This==0) || (ppvObject==0) ) if ( ppvObject==0 )
return E_INVALIDARG; return E_INVALIDARG;
/* Initialize the return parameter */ /* Initialize the return parameter */
...@@ -1450,7 +1450,7 @@ HRESULT WINAPI CreateFileMoniker(LPCOLESTR lpszPathName, LPMONIKER * ppmk) ...@@ -1450,7 +1450,7 @@ HRESULT WINAPI CreateFileMoniker(LPCOLESTR lpszPathName, LPMONIKER * ppmk)
hr = FileMonikerImpl_Construct(newFileMoniker,lpszPathName); hr = FileMonikerImpl_Construct(newFileMoniker,lpszPathName);
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
hr = FileMonikerImpl_QueryInterface((IMoniker*)newFileMoniker,&IID_IMoniker,(void**)ppmk); hr = IMoniker_QueryInterface((IMoniker*)newFileMoniker,&IID_IMoniker,(void**)ppmk);
else else
HeapFree(GetProcessHeap(),0,newFileMoniker); HeapFree(GetProcessHeap(),0,newFileMoniker);
...@@ -1600,7 +1600,7 @@ static HRESULT WINAPI FileMonikerCF_CreateInstance(LPCLASSFACTORY iface, ...@@ -1600,7 +1600,7 @@ static HRESULT WINAPI FileMonikerCF_CreateInstance(LPCLASSFACTORY iface,
hr = FileMonikerImpl_Construct(newFileMoniker, wszEmpty); hr = FileMonikerImpl_Construct(newFileMoniker, wszEmpty);
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
hr = FileMonikerImpl_QueryInterface((IMoniker*)newFileMoniker, riid, ppv); hr = IMoniker_QueryInterface((IMoniker*)newFileMoniker, riid, ppv);
if (FAILED(hr)) if (FAILED(hr))
HeapFree(GetProcessHeap(),0,newFileMoniker); HeapFree(GetProcessHeap(),0,newFileMoniker);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment