From c14e9ebc0773e0a82eb541b48751b7051e7688c5 Mon Sep 17 00:00:00 2001
From: Greg Turner <gmturner007@ameritech.net>
Date: Mon, 21 Oct 2002 23:42:01 +0000
Subject: [PATCH] Fix return types of NdrConformantStringMarshall,
 NdrGetBuffer, and NdrSendReceive.

---
 dlls/rpcrt4/ndr_midl.c | 19 +++++++++++--------
 include/rpcndr.h       |  6 +++---
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/dlls/rpcrt4/ndr_midl.c b/dlls/rpcrt4/ndr_midl.c
index 2acf80c1aeb..05eb3b6870c 100644
--- a/dlls/rpcrt4/ndr_midl.c
+++ b/dlls/rpcrt4/ndr_midl.c
@@ -174,37 +174,40 @@ void WINAPI NdrStubGetBuffer(LPRPCSTUBBUFFER This,
 void WINAPI NdrClientInitializeNew( PRPC_MESSAGE pRpcMessage, PMIDL_STUB_MESSAGE pStubMsg, 
                                     PMIDL_STUB_DESC pStubDesc, int unknown )
 {
-  TRACE("stub\n");
+  FIXME("stub\n");
 }
 
 /***********************************************************************
  *            NdrConformantStringMarshall [RPCRT4.@]
  */
-void WINAPI NdrConformantStringMarshall(MIDL_STUB_MESSAGE *pStubMsg, unsigned char *pszMessage,
+unsigned char *WINAPI NdrConformantStringMarshall(MIDL_STUB_MESSAGE *pStubMsg, unsigned char *pszMessage,
   PFORMAT_STRING pFormat)
 { 
-  TRACE("stub\n");
+  FIXME("stub\n");
+  return NULL;
 }
 
 /***********************************************************************
  *           NdrGetBuffer [RPCRT4.@]
  */
-void WINAPI NdrGetBuffer(MIDL_STUB_MESSAGE *stubmsg, unsigned long buflen, RPC_BINDING_HANDLE handle)
+unsigned char *WINAPI NdrGetBuffer(MIDL_STUB_MESSAGE *stubmsg, unsigned long buflen, RPC_BINDING_HANDLE handle)
 {
-  TRACE("stub\n");
+  FIXME("stub\n");
+  return NULL;
 }
 /***********************************************************************
  *           NdrFreeBuffer [RPCRT4.@]
  */
 void WINAPI NdrFreeBuffer(MIDL_STUB_MESSAGE *pStubMsg)
 {
-  TRACE("stub\n");
+  FIXME("stub\n");
 }
 
 /************************************************************************
  *           NdrSendReceive [RPCRT4.@]
  */
-void WINAPI NdrSendReceive( MIDL_STUB_MESSAGE *stubmsg, unsigned char *buffer  )
+unsigned char *WINAPI NdrSendReceive( MIDL_STUB_MESSAGE *stubmsg, unsigned char *buffer  )
 {
-  TRACE("stub\n");
+  FIXME("stub\n");
+  return NULL;
 }
diff --git a/include/rpcndr.h b/include/rpcndr.h
index 52d3ee2e77e..9e1f9dc3f34 100644
--- a/include/rpcndr.h
+++ b/include/rpcndr.h
@@ -299,14 +299,14 @@ RPCRTAPI void RPC_ENTRY
 RPCRTAPI void RPC_ENTRY
   NdrClientInitializeNew( PRPC_MESSAGE pRpcMessage, PMIDL_STUB_MESSAGE pStubMsg, 
                           PMIDL_STUB_DESC pStubDesc, int unknown );
-RPCRTAPI void RPC_ENTRY
+RPCRTAPI unsigned char* RPC_ENTRY
   NdrConformantStringMarshall( MIDL_STUB_MESSAGE *pStubMsg, unsigned char *pszMessage,
                                PFORMAT_STRING pFormat);
-RPCRTAPI void RPC_ENTRY
+RPCRTAPI unsigned char* RPC_ENTRY
   NdrGetBuffer( MIDL_STUB_MESSAGE *stubmsg, unsigned long buflen, RPC_BINDING_HANDLE handle );
 RPCRTAPI void RPC_ENTRY
   NdrFreeBuffer( MIDL_STUB_MESSAGE *pStubMsg );
-RPCRTAPI void RPC_ENTRY
+RPCRTAPI unsigned char* RPC_ENTRY
   NdrSendReceive( MIDL_STUB_MESSAGE *stubmsg, unsigned char *buffer );
 
 #endif /*__WINE_RPCNDR_H */
-- 
2.11.4.GIT