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

ole32: Use CLSID_StdMarshal in standard marshaler. 

Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Piotr Caban 2018-10-11 19:11:30 +02:00 committed by Alexandre Julliard
parent 6cc09e3424
commit 862ea5074a
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/ole32/ftmarshal.c
View File

@ -144,7 +144,7 @@ FTMarshalImpl_GetUnmarshalClass (LPMARSHAL iface, REFIID riid, void *pv, DWORD d
if (dwDestContext == MSHCTX_INPROC || dwDestContext == MSHCTX_CROSSCTX) if (dwDestContext == MSHCTX_INPROC || dwDestContext == MSHCTX_CROSSCTX)
*pCid = CLSID_InProcFreeMarshaler; *pCid = CLSID_InProcFreeMarshaler;
else else
*pCid = CLSID_DfMarshal; *pCid = CLSID_StdMarshal;
return S_OK; return S_OK;
} }

10
dlls/ole32/marshal.c
View File

@ -40,8 +40,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(ole); WINE_DEFAULT_DEBUG_CHANNEL(ole);
extern const CLSID CLSID_DfMarshal;
/* number of refs given out for normal marshaling */ /* number of refs given out for normal marshaling */
#define NORMALEXTREFS 5 #define NORMALEXTREFS 5
@ -386,7 +384,7 @@ static HRESULT WINAPI Proxy_GetUnmarshalClass(
IMarshal *iface, REFIID riid, void* pv, DWORD dwDestContext, IMarshal *iface, REFIID riid, void* pv, DWORD dwDestContext,
void* pvDestContext, DWORD mshlflags, CLSID* pCid) void* pvDestContext, DWORD mshlflags, CLSID* pCid)
{ {
*pCid = CLSID_DfMarshal; *pCid = CLSID_StdMarshal;
return S_OK; return S_OK;
} }
@ -1270,7 +1268,7 @@ StdMarshalImpl_GetUnmarshalClass(
IMarshal *iface, REFIID riid, void* pv, DWORD dwDestContext, IMarshal *iface, REFIID riid, void* pv, DWORD dwDestContext,
void* pvDestContext, DWORD mshlflags, CLSID* pCid) void* pvDestContext, DWORD mshlflags, CLSID* pCid)
{ {
*pCid = CLSID_DfMarshal; *pCid = CLSID_StdMarshal;
return S_OK; return S_OK;
} }
@ -1730,7 +1728,7 @@ HRESULT WINAPI CoGetMarshalSizeMax(ULONG *pulSize, REFIID riid, IUnknown *pUnk,
hr = IMarshal_GetMarshalSizeMax(pMarshal, riid, pUnk, dwDestContext, hr = IMarshal_GetMarshalSizeMax(pMarshal, riid, pUnk, dwDestContext,
pvDestContext, mshlFlags, pulSize); pvDestContext, mshlFlags, pulSize);
if (IsEqualCLSID(&marshaler_clsid, &CLSID_DfMarshal)) if (IsEqualCLSID(&marshaler_clsid, &CLSID_StdMarshal))
/* add on the size of the common header */ /* add on the size of the common header */
*pulSize += FIELD_OFFSET(OBJREF, u_objref); *pulSize += FIELD_OFFSET(OBJREF, u_objref);
else else
@ -1824,7 +1822,7 @@ HRESULT WINAPI CoMarshalInterface(IStream *pStream, REFIID riid, IUnknown *pUnk,
} }
/* FIXME: implement handler marshaling too */ /* FIXME: implement handler marshaling too */
if (IsEqualCLSID(&marshaler_clsid, &CLSID_DfMarshal)) if (IsEqualCLSID(&marshaler_clsid, &CLSID_StdMarshal))
{ {
TRACE("Using standard marshaling\n"); TRACE("Using standard marshaling\n");
objref.flags = OBJREF_STANDARD; objref.flags = OBJREF_STANDARD;