[ros-diffs] [jgardou] 49298: [RPCRT4] - Fix build

Author: jgardou
Date: Tue Oct 26 22:07:36 2010
New Revision: 49298

URL: http://svn.reactos.org/svn/reactos?rev=49298&view=rev
Log:
[RPCRT4]
  - Fix build

Modified:
    branches/cmake-bringup/dll/win32/rpcrt4/cproxy.c
    branches/cmake-bringup/dll/win32/rpcrt4/ndr_stubless.c

Modified: branches/cmake-bringup/dll/win32/rpcrt4/cproxy.c
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/rpcrt4/…
==============================================================================
--- branches/cmake-bringup/dll/win32/rpcrt4/cproxy.c [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/rpcrt4/cproxy.c [iso-8859-1] Tue Oct 26 22:07:36
2010
@@ -96,7 +96,7 @@
     args[0] = *(const WORD*)(fs + 8);
     TRACE("(%p)->(%d)([%d bytes]) ret=%08x\n", iface, index, args[0],
args[1]);
 
-    return NdrClientCall2(stubless->pStubDesc, fs, args + 2);
+    return NdrClientCall2(stubless->pStubDesc, fs, args + 2).Simple;
 }
 
 #define BLOCK_SIZE 1024

Modified: branches/cmake-bringup/dll/win32/rpcrt4/ndr_stubless.c
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/rpcrt4/…
==============================================================================
--- branches/cmake-bringup/dll/win32/rpcrt4/ndr_stubless.c [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/rpcrt4/ndr_stubless.c [iso-8859-1] Tue Oct 26
22:07:36 2010
@@ -548,10 +548,7 @@
     }
 }
 
-/* the return type should be CLIENT_CALL_RETURN, but this is incompatible
- * with the way gcc returns structures. "void *" should be the largest type
- * that MIDL should allow you to return anyway */
-LONG_PTR WINAPIV NdrClientCall2(PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pFormat, ...)
+CLIENT_CALL_RETURN WINAPIV NdrClientCall2(PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING
pFormat, ...)
 {
     /* pointer to start of stack where arguments start */
     RPC_MESSAGE rpcMsg;
@@ -574,7 +571,7 @@
     /* -Oif or -Oicf generated format */
     BOOL bV2Format = FALSE;
     /* the value to return to the client from the remote procedure */
-    LONG_PTR RetVal = 0;
+    CLIENT_CALL_RETURN RetVal = {0};
     /* the pointer to the object when in OLE mode */
     void * This = NULL;
     PFORMAT_STRING pHandleFormat;
@@ -630,7 +627,7 @@
     if (!(pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT))
     {
         pFormat = client_get_handle(&stubMsg, pProcHeader, pHandleFormat,
&hBinding);
-        if (!pFormat) return 0;
+        if (!pFormat) return RetVal;
     }
 
     bV2Format = (pStubDesc->Version >= 0x20000);
@@ -729,7 +726,7 @@
         }
         __EXCEPT_ALL
         {
-            RetVal = NdrProxyErrorHandler(GetExceptionCode());
+            RetVal.Simple = NdrProxyErrorHandler(GetExceptionCode());
         }
         __ENDTRY
     }