marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

oleaut32: Remove useless NULL checks.

oldstable
Nikolay Sivov 2014-01-29 08:19:53 +04:00 committed by Alexandre Julliard
parent e9debeb642
commit cb74cd3e48
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dlls/oleaut32/dispatch.c
View File

@ -226,13 +226,15 @@ static HRESULT WINAPI StdDispatch_QueryInterface(
void** ppvObject) void** ppvObject)
{ {
StdDispatch *This = impl_from_IDispatch(iface); StdDispatch *This = impl_from_IDispatch(iface);
TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppvObject); TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppvObject);
*ppvObject = NULL;
if (IsEqualIID(riid, &IID_IDispatch) || if (IsEqualIID(riid, &IID_IDispatch) ||
IsEqualIID(riid, &IID_IUnknown)) IsEqualIID(riid, &IID_IUnknown))
{ {
*ppvObject = This; *ppvObject = iface;
IUnknown_AddRef((LPUNKNOWN)*ppvObject); IDispatch_AddRef(iface);
return S_OK; return S_OK;
} }
return E_NOINTERFACE; return E_NOINTERFACE;
@ -293,10 +295,8 @@ static ULONG WINAPI StdDispatch_Release(LPDISPATCH iface)
*/ */
static HRESULT WINAPI StdDispatch_GetTypeInfoCount(LPDISPATCH iface, UINT * pctinfo) static HRESULT WINAPI StdDispatch_GetTypeInfoCount(LPDISPATCH iface, UINT * pctinfo)
{ {
StdDispatch *This = impl_from_IDispatch(iface);
TRACE("(%p)\n", pctinfo); TRACE("(%p)\n", pctinfo);
*pctinfo = 1;
*pctinfo = This->pTypeInfo ? 1 : 0;
return S_OK; return S_OK;
} }
@ -327,11 +327,9 @@ static HRESULT WINAPI StdDispatch_GetTypeInfo(LPDISPATCH iface, UINT iTInfo, LCI
if (iTInfo != 0) if (iTInfo != 0)
return DISP_E_BADINDEX; return DISP_E_BADINDEX;
if (This->pTypeInfo) *ppTInfo = This->pTypeInfo;
{ ITypeInfo_AddRef(*ppTInfo);
*ppTInfo = This->pTypeInfo;
ITypeInfo_AddRef(*ppTInfo);
}
return S_OK; return S_OK;
} }