reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-29 06:30:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

- Fix a trace to refer to the object ID rather than the legacy MID.

Browse Source 
- Fix the error case of CoMarshalInterThreadInterface to release the
  stream.
This commit is contained in:
Robert Shearman 2005-09-20 11:36:40 +00:00 committed by Alexandre Julliard
parent a999a990fe
commit d389b57171
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dlls/ole32/marshal.c
View File

@ -1110,7 +1110,7 @@ StdMarshalImpl_ReleaseMarshalData(LPMARSHAL iface, IStream *pStm)
if (!(stubmgr = get_stub_manager(apt, stdobjref.oid))) if (!(stubmgr = get_stub_manager(apt, stdobjref.oid)))
{ {
ERR("could not map MID to stub manager, oxid=%s, oid=%s\n", ERR("could not map object ID to stub manager, oxid=%s, oid=%s\n",
wine_dbgstr_longlong(stdobjref.oxid), wine_dbgstr_longlong(stdobjref.oid)); wine_dbgstr_longlong(stdobjref.oxid), wine_dbgstr_longlong(stdobjref.oid));
return RPC_E_INVALID_OBJREF; return RPC_E_INVALID_OBJREF;
} }
@ -1621,13 +1621,20 @@ HRESULT WINAPI CoMarshalInterThreadInterfaceInStream(
TRACE("(%s, %p, %p)\n",debugstr_guid(riid), pUnk, ppStm); TRACE("(%s, %p, %p)\n",debugstr_guid(riid), pUnk, ppStm);
hres = CreateStreamOnHGlobal(0, TRUE, ppStm); hres = CreateStreamOnHGlobal(NULL, TRUE, ppStm);
if (FAILED(hres)) return hres; if (FAILED(hres)) return hres;
hres = CoMarshalInterface(*ppStm, riid, pUnk, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); hres = CoMarshalInterface(*ppStm, riid, pUnk, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL);
/* FIXME: is this needed? */ if (SUCCEEDED(hres))
memset(&seekto,0,sizeof(seekto)); {
IStream_Seek(*ppStm,seekto,SEEK_SET,&xpos); memset(&seekto, 0, sizeof(seekto));
IStream_Seek(*ppStm, seekto, SEEK_SET, &xpos);
}
else
{
IStream_Release(*ppStm);
*ppStm = NULL;
}
return hres; return hres;
} }