ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

oleaut32: Ensure that we're using the right interface in CreateStub implementation.

This commit is contained in:
Jacek Caban 2015-09-04 11:49:30 +02:00 committed by Alexandre Julliard
parent 8747fa2b9f
commit af944cefdf
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dlls/oleaut32/tmarshal.c
View File

@ -2282,6 +2282,7 @@ PSFacBuf_CreateStub(
ITypeInfo *tinfo; ITypeInfo *tinfo;
TMStubImpl *stub; TMStubImpl *stub;
TYPEATTR *typeattr; TYPEATTR *typeattr;
IUnknown *obj;
TRACE("(%s,%p,%p)\n",debugstr_guid(riid),pUnkServer,ppStub); TRACE("(%s,%p,%p)\n",debugstr_guid(riid),pUnkServer,ppStub);
@ -2291,16 +2292,26 @@ PSFacBuf_CreateStub(
return hres; return hres;
} }
/* FIXME: This is not exactly right. We should probably call QI later. */
hres = IUnknown_QueryInterface(pUnkServer, riid, (void**)&obj);
if (FAILED(hres)) {
WARN("Could not get %s iface: %08x\n", debugstr_guid(riid), hres);
obj = pUnkServer;
IUnknown_AddRef(obj);
}
stub = CoTaskMemAlloc(sizeof(TMStubImpl)); stub = CoTaskMemAlloc(sizeof(TMStubImpl));
if (!stub) if (!stub) {
IUnknown_Release(obj);
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
}
stub->IRpcStubBuffer_iface.lpVtbl = &tmstubvtbl; stub->IRpcStubBuffer_iface.lpVtbl = &tmstubvtbl;
stub->ref = 1; stub->ref = 1;
stub->tinfo = tinfo; stub->tinfo = tinfo;
stub->dispatch_stub = NULL; stub->dispatch_stub = NULL;
stub->dispatch_derivative = FALSE; stub->dispatch_derivative = FALSE;
stub->iid = *riid; stub->iid = *riid;
hres = IRpcStubBuffer_Connect(&stub->IRpcStubBuffer_iface,pUnkServer); hres = IRpcStubBuffer_Connect(&stub->IRpcStubBuffer_iface, obj);
*ppStub = &stub->IRpcStubBuffer_iface; *ppStub = &stub->IRpcStubBuffer_iface;
TRACE("IRpcStubBuffer: %p\n", stub); TRACE("IRpcStubBuffer: %p\n", stub);
if (hres) if (hres)
@ -2315,6 +2326,7 @@ PSFacBuf_CreateStub(
ITypeInfo_ReleaseTypeAttr(tinfo, typeattr); ITypeInfo_ReleaseTypeAttr(tinfo, typeattr);
} }
IUnknown_Release(obj);
return hres; return hres;
} }