Piotr Caban : ole32: Use CLSID_StdMarshal in standard marshaler.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 862ea5074a8688a68ed8e912d4729e7d89892926
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=862ea5074a8688a68ed8e912d...

Author: Piotr Caban 
Date:   Thu Oct 11 19:11:30 2018 +0200

ole32: Use CLSID_StdMarshal in standard marshaler.

Signed-off-by: Piotr Caban 
Signed-off-by: Huw Davies 
Signed-off-by: Alexandre Julliard

---

dlls/ole32/ftmarshal.c |  2 +-
 dlls/ole32/marshal.c   | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/dlls/ole32/ftmarshal.c b/dlls/ole32/ftmarshal.c
index 3eb7f87..c36f5f6 100644
--- a/dlls/ole32/ftmarshal.c
+++ b/dlls/ole32/ftmarshal.c
@@ -144,7 +144,7 @@ FTMarshalImpl_GetUnmarshalClass (LPMARSHAL iface, REFIID riid, void *pv, DWORD d
     if (dwDestContext == MSHCTX_INPROC || dwDestContext == MSHCTX_CROSSCTX)
         *pCid = CLSID_InProcFreeMarshaler;
     else
-        *pCid = CLSID_DfMarshal;
+        *pCid = CLSID_StdMarshal;
     return S_OK;
 }

diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c
index 43b9af7..d8cfffb 100644
--- a/dlls/ole32/marshal.c
+++ b/dlls/ole32/marshal.c
@@ -40,8 +40,6 @@

WINE_DEFAULT_DEBUG_CHANNEL(ole);

-extern const CLSID CLSID_DfMarshal;
-
 /* number of refs given out for normal marshaling */
 #define NORMALEXTREFS 5

@@ -386,7 +384,7 @@ static HRESULT WINAPI Proxy_GetUnmarshalClass(
     IMarshal *iface, REFIID riid, void* pv, DWORD dwDestContext,
     void* pvDestContext, DWORD mshlflags, CLSID* pCid)
 {
-    *pCid = CLSID_DfMarshal;
+    *pCid = CLSID_StdMarshal;
     return S_OK;
 }

@@ -1270,7 +1268,7 @@ StdMarshalImpl_GetUnmarshalClass(
     IMarshal *iface, REFIID riid, void* pv, DWORD dwDestContext,
     void* pvDestContext, DWORD mshlflags, CLSID* pCid)
 {
-    *pCid = CLSID_DfMarshal;
+    *pCid = CLSID_StdMarshal;
     return S_OK;
 }

@@ -1730,7 +1728,7 @@ HRESULT WINAPI CoGetMarshalSizeMax(ULONG *pulSize, REFIID riid, IUnknown *pUnk,

hr = IMarshal_GetMarshalSizeMax(pMarshal, riid, pUnk, dwDestContext,
                                     pvDestContext, mshlFlags, pulSize);
-    if (IsEqualCLSID(&marshaler_clsid, &CLSID_DfMarshal))
+    if (IsEqualCLSID(&marshaler_clsid, &CLSID_StdMarshal))
         /* add on the size of the common header */
         *pulSize += FIELD_OFFSET(OBJREF, u_objref);
     else
@@ -1824,7 +1822,7 @@ HRESULT WINAPI CoMarshalInterface(IStream *pStream, REFIID riid, IUnknown *pUnk,
     }

/* FIXME: implement handler marshaling too */
-    if (IsEqualCLSID(&marshaler_clsid, &CLSID_DfMarshal))
+    if (IsEqualCLSID(&marshaler_clsid, &CLSID_StdMarshal))
     {
         TRACE("Using standard marshaling\n");
         objref.flags = OBJREF_STANDARD;