ole32: Change returned size in CoGetMarshalSizeMax if object implements IMarshal.

Signed-off-by: Piotr Caban <piotr@codeweavers.com> Signed-off-by: Huw Davies <huw@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

ole32: Change returned size in CoGetMarshalSizeMax if object implements IMarshal.
0725276f · Piotr Caban · Alexandre Julliard · 475b2d6b · 0725276f
Commit 0725276f authored Oct 11, 2018 by Piotr Caban Committed by Alexandre Julliard Oct 15, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 10 deletions

marshal.c dlls/ole32/marshal.c +10 -10

No files found.
--- a/dlls/ole32/marshal.c
+++ b/dlls/ole32/marshal.c
@@ -1804,24 +1804,24 @@ HRESULT WINAPI CoGetMarshalSizeMax(ULONG *pulSize, REFIID riid, IUnknown *pUnk,
 {
    HRESULT hr;
    LPMARSHAL pMarshal;
-    CLSID marshaler_clsid;
+    BOOL std_marshal = FALSE;
-    hr = get_marshaler(riid, pUnk, dwDestContext, pvDestContext, mshlFlags, &pMarshal);
+    if(!pUnk)
-    if (hr != S_OK)
+        return E_POINTER;
-        return hr;
-    hr = IMarshal_GetUnmarshalClass(pMarshal, riid, pUnk, dwDestContext,
+    hr = IUnknown_QueryInterface(pUnk, &IID_IMarshal, (void**)&pMarshal);
-                                    pvDestContext, mshlFlags, &marshaler_clsid);
    if (hr != S_OK)
    {
-        ERR("IMarshal::GetUnmarshalClass failed, 0x%08x\n", hr);
+        std_marshal = TRUE;
-        IMarshal_Release(pMarshal);
+        hr = CoGetStandardMarshal(riid, pUnk, dwDestContext, pvDestContext,
-        return hr;
+                                  mshlFlags, &pMarshal);
    }
+    if (hr != S_OK)
+        return hr;
    hr = IMarshal_GetMarshalSizeMax(pMarshal, riid, pUnk, dwDestContext,
                                    pvDestContext, mshlFlags, pulSize);
-    if (!IsEqualCLSID(&marshaler_clsid, &CLSID_StdMarshal))
+    if (!std_marshal)
        /* add on the size of the whole OBJREF structure like native does */
        *pulSize += sizeof(OBJREF);