[ros-diffs] [gvg] 19317: Sync to Wine-0_9_1:

[gvg at svn.reactos.com]

Sync to Wine-0_9_1:
Huw Davies <huw at codeweavers.com>
- Stubs for NdrStubForwardingFunction and NdrCStdStubBuffer2_Release
  along with a few related defines.
- Marshal enums.
Modified: trunk/reactos/lib/rpcrt4/cstub.c
Modified: trunk/reactos/lib/rpcrt4/ndr_marshall.c
Modified: trunk/reactos/lib/rpcrt4/ndr_midl.c
Modified: trunk/reactos/lib/rpcrt4/rpcrt4.spec
  _____  

Modified: trunk/reactos/lib/rpcrt4/cstub.c
--- trunk/reactos/lib/rpcrt4/cstub.c	2005-11-17 21:59:57 UTC (rev
19316)
+++ trunk/reactos/lib/rpcrt4/cstub.c	2005-11-17 22:06:47 UTC (rev
19317)
@@ -109,6 +109,13 @@

   return This->RefCount;
 }
 
+ULONG WINAPI NdrCStdStubBuffer2_Release(LPRPCSTUBBUFFER iface,
+                                        LPPSFACTORYBUFFER pPSF)
+{
+    FIXME("Not implemented\n");
+    return 0;
+}
+
 HRESULT WINAPI CStdStubBuffer_Connect(LPRPCSTUBBUFFER iface,
                                      LPUNKNOWN lpUnkServer)
 {
  _____  

Modified: trunk/reactos/lib/rpcrt4/ndr_marshall.c
--- trunk/reactos/lib/rpcrt4/ndr_marshall.c	2005-11-17 21:59:57 UTC
(rev 19316)
+++ trunk/reactos/lib/rpcrt4/ndr_marshall.c	2005-11-17 22:06:47 UTC
(rev 19317)
@@ -1431,6 +1431,7 @@

       break;
     case RPC_FC_LONG:
     case RPC_FC_ULONG:
+    case RPC_FC_ENUM32:
       TRACE("long=%ld <= %p\n", *(DWORD*)pMemory, pMemory);
       memcpy(pStubMsg->Buffer, pMemory, 4);
       pStubMsg->Buffer += 4;
@@ -1492,6 +1493,7 @@
       break;
     case RPC_FC_LONG:
     case RPC_FC_ULONG:
+    case RPC_FC_ENUM32:
       memcpy(pMemory, pStubMsg->Buffer, 4);
       TRACE("long=%ld => %p\n", *(DWORD*)pMemory, pMemory);
       pStubMsg->Buffer += 4;
@@ -1552,6 +1554,7 @@
       break;
     case RPC_FC_LONG:
     case RPC_FC_ULONG:
+    case RPC_FC_ENUM32:
       pStubMsg->BufferLength += 4;
       pMemory += 4;
       break;
@@ -1605,6 +1608,7 @@
       break;
     case RPC_FC_LONG:
     case RPC_FC_ULONG:
+    case RPC_FC_ENUM32:
       pMemory += 4;
       break;
     case RPC_FC_POINTER:
  _____  

Modified: trunk/reactos/lib/rpcrt4/ndr_midl.c
--- trunk/reactos/lib/rpcrt4/ndr_midl.c	2005-11-17 21:59:57 UTC (rev
19316)
+++ trunk/reactos/lib/rpcrt4/ndr_midl.c	2005-11-17 22:06:47 UTC (rev
19317)
@@ -308,3 +308,13 @@

 
     return RPC_S_OK;
 }
+
+/**********************************************************************
**
+ *           NdrStubForwardingFunction [RPCRT4.@]
+ */
+void __RPC_STUB NdrStubForwardingFunction( IRpcStubBuffer *This,
IRpcChannelBuffer *pChannel,
+                                           PRPC_MESSAGE pMsg, DWORD
*pdwStubPhase )
+{
+    FIXME("Not implemented\n");
+    return;
+}
  _____  

Modified: trunk/reactos/lib/rpcrt4/rpcrt4.spec
--- trunk/reactos/lib/rpcrt4/rpcrt4.spec	2005-11-17 21:59:57 UTC
(rev 19316)
+++ trunk/reactos/lib/rpcrt4/rpcrt4.spec	2005-11-17 22:06:47 UTC
(rev 19317)
@@ -154,7 +154,7 @@

 @ stdcall NdrByteCountPointerFree(ptr ptr ptr)
 @ stdcall NdrByteCountPointerMarshall(ptr ptr ptr)
 @ stdcall NdrByteCountPointerUnmarshall(ptr ptr ptr long)
-@ stub NdrCStdStubBuffer2_Release
+@ stdcall NdrCStdStubBuffer2_Release(ptr ptr)
 @ stdcall NdrCStdStubBuffer_Release(ptr ptr)
 @ stdcall NdrClearOutParameters(ptr ptr ptr)
 @ varargs NdrClientCall2(ptr ptr)
@@ -325,7 +325,7 @@
 @ stdcall NdrSimpleTypeUnmarshall(ptr ptr long)
 @ stub NdrStubCall2
 @ stub NdrStubCall
-@ stub NdrStubForwardingFunction
+@ stdcall NdrStubForwardingFunction(ptr ptr ptr ptr)
 @ stdcall NdrStubGetBuffer(ptr ptr ptr)
 @ stdcall NdrStubInitialize(ptr ptr ptr ptr)
 @ stub NdrStubInitializeMarshall
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://www.reactos.org/pipermail/ros-diffs/attachments/20051117/01527cd3/attachment.html