Alexandre Julliard : rpcrt4: Add entry points for the old-style stubless Ndr calls.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 69bc4da51ae730b06a0ee63e9212eac03271a412
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=69bc4da51ae730b06a0ee63e92...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Thu Jun  2 14:40:01 2011 +0200

rpcrt4: Add entry points for the old-style stubless Ndr calls.

---

 dlls/rpcrt4/ndr_stubless.c |   32 ++++++++++++++++++++++++++++++++
 dlls/rpcrt4/rpcrt4.spec    |    6 +++---
 2 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c
index 3fd4cf8..171d74d 100644
--- a/dlls/rpcrt4/ndr_stubless.c
+++ b/dlls/rpcrt4/ndr_stubless.c
@@ -1620,6 +1620,38 @@ void WINAPI NdrServerCall2(PRPC_MESSAGE pRpcMsg)
     NdrStubCall2(NULL, NULL, pRpcMsg, &dwPhase);
 }
 
+/***********************************************************************
+ *            NdrClientCall [RPCRT4.@]
+ */
+CLIENT_CALL_RETURN WINAPIV NdrClientCall( PMIDL_STUB_DESC desc, PFORMAT_STRING format, ... )
+{
+    __ms_va_list args;
+    CLIENT_CALL_RETURN ret;
+
+    __ms_va_start( args, format );
+    ret = NdrClientCall2( desc, format, va_arg( args, unsigned char * ));
+    __ms_va_end( args );
+    return ret;
+}
+
+/***********************************************************************
+ *            NdrStubCall [RPCRT4.@]
+ */
+LONG WINAPI NdrStubCall( struct IRpcStubBuffer *This, struct IRpcChannelBuffer *channel,
+                         PRPC_MESSAGE msg, DWORD *phase )
+{
+    return NdrStubCall2( This, channel, msg, phase );
+}
+
+/***********************************************************************
+ *            NdrServerCall [RPCRT4.@]
+ */
+void WINAPI NdrServerCall( PRPC_MESSAGE msg )
+{
+    DWORD phase;
+    NdrStubCall( NULL, NULL, msg, &phase );
+}
+
 struct async_call_data
 {
     MIDL_STUB_MESSAGE *pStubMsg;
diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec
index aa6fef9..bacef8c 100644
--- a/dlls/rpcrt4/rpcrt4.spec
+++ b/dlls/rpcrt4/rpcrt4.spec
@@ -127,7 +127,7 @@
 @ stdcall NdrCStdStubBuffer_Release(ptr ptr)
 @ stdcall NdrClearOutParameters(ptr ptr ptr)
 @ varargs NdrClientCall2(ptr ptr)
-@ varargs NdrClientCall(ptr ptr) NdrClientCall2
+@ varargs NdrClientCall(ptr ptr)
 @ stdcall NdrClientContextMarshall(ptr ptr long)
 @ stdcall NdrClientContextUnmarshall(ptr ptr ptr)
 @ stub NdrClientInitialize
@@ -273,7 +273,7 @@
 @ stub NdrRpcSsEnableAllocate
 @ stdcall NdrSendReceive(ptr ptr)
 @ stdcall NdrServerCall2(ptr)
-@ stub NdrServerCall
+@ stdcall NdrServerCall(ptr)
 @ stdcall NdrServerContextMarshall(ptr ptr long)
 @ stdcall NdrServerContextNewMarshall(ptr ptr ptr ptr) # wxp
 @ stdcall NdrServerContextNewUnmarshall(ptr ptr) # wxp
@@ -293,7 +293,7 @@
 @ stdcall NdrSimpleTypeMarshall(ptr ptr long)
 @ stdcall NdrSimpleTypeUnmarshall(ptr ptr long)
 @ stdcall NdrStubCall2(ptr ptr ptr ptr)
-@ stub NdrStubCall
+@ stdcall NdrStubCall(ptr ptr ptr ptr)
 @ stdcall NdrStubForwardingFunction(ptr ptr ptr ptr)
 @ stdcall NdrStubGetBuffer(ptr ptr ptr)
 @ stdcall NdrStubInitialize(ptr ptr ptr ptr)