Commit e9eb274d authored by Huw Davies's avatar Huw Davies Committed by Alexandre Julliard

oleaut32: Return early if there is no matching funcdesc.

parent 0a90d043
...@@ -7805,28 +7805,24 @@ static HRESULT WINAPI ITypeInfo_fnGetDllEntry( ITypeInfo2 *iface, MEMBERID memid ...@@ -7805,28 +7805,24 @@ static HRESULT WINAPI ITypeInfo_fnGetDllEntry( ITypeInfo2 *iface, MEMBERID memid
return TYPE_E_BADMODULEKIND; return TYPE_E_BADMODULEKIND;
pFDesc = TLB_get_funcdesc_by_memberid(This, memid); pFDesc = TLB_get_funcdesc_by_memberid(This, memid);
if(pFDesc){ if (!pFDesc) return TYPE_E_ELEMENTNOTFOUND;
dump_TypeInfo(This);
if (TRACE_ON(ole)) dump_TypeInfo(This);
dump_TLBFuncDescOne(pFDesc); if (TRACE_ON(ole)) dump_TLBFuncDescOne(pFDesc);
if (pBstrDllName) if (pBstrDllName) *pBstrDllName = SysAllocString(TLB_get_bstr(This->DllName));
*pBstrDllName = SysAllocString(TLB_get_bstr(This->DllName));
if (!IS_INTRESOURCE(pFDesc->Entry) && (pFDesc->Entry != (void*)-1))
if (!IS_INTRESOURCE(pFDesc->Entry) && (pFDesc->Entry != (void*)-1)) { {
if (pBstrName) if (pBstrName) *pBstrName = SysAllocString(TLB_get_bstr(pFDesc->Entry));
*pBstrName = SysAllocString(TLB_get_bstr(pFDesc->Entry)); if (pwOrdinal) *pwOrdinal = -1;
if (pwOrdinal) }
*pwOrdinal = -1; else
return S_OK; {
} if (pBstrName) *pBstrName = NULL;
if (pBstrName) if (pwOrdinal) *pwOrdinal = LOWORD(pFDesc->Entry);
*pBstrName = NULL; }
if (pwOrdinal) return S_OK;
*pwOrdinal = LOWORD(pFDesc->Entry);
return S_OK;
}
return TYPE_E_ELEMENTNOTFOUND;
} }
/* internal function to make the inherited interfaces' methods appear /* internal function to make the inherited interfaces' methods appear
......
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