rpcrt4: Better match the PSDK types and fix the winapi_check warnings.

dlls/rpcrt4/ndr_clientserver.c

@@ -129,7 +129,7 @@ unsigned char* WINAPI NdrServerInitializeNew( PRPC_MESSAGE pRpcMsg, PMIDL_STUB_M
 /***********************************************************************
  *           NdrGetBuffer [RPCRT4.@]
  */
-unsigned char *WINAPI NdrGetBuffer(MIDL_STUB_MESSAGE *stubmsg, ULONG buflen, RPC_BINDING_HANDLE handle)
+unsigned char *WINAPI NdrGetBuffer(PMIDL_STUB_MESSAGE stubmsg, ULONG buflen, RPC_BINDING_HANDLE handle)
 {
   TRACE("(stubmsg == ^%p, buflen == %u, handle == %p): wild guess.\n", stubmsg, buflen, handle);
   
@@ -150,7 +150,7 @@ unsigned char *WINAPI NdrGetBuffer(MIDL_STUB_MESSAGE *stubmsg, ULONG buflen, RPC
 /***********************************************************************
  *           NdrFreeBuffer [RPCRT4.@]
  */
-void WINAPI NdrFreeBuffer(MIDL_STUB_MESSAGE *pStubMsg)
+void WINAPI NdrFreeBuffer(PMIDL_STUB_MESSAGE pStubMsg)
 {
   TRACE("(pStubMsg == ^%p): wild guess.\n", pStubMsg);
   I_RpcFreeBuffer(pStubMsg->RpcMsg);
@@ -161,7 +161,7 @@ void WINAPI NdrFreeBuffer(MIDL_STUB_MESSAGE *pStubMsg)
 /************************************************************************
  *           NdrSendReceive [RPCRT4.@]
  */
-unsigned char *WINAPI NdrSendReceive( MIDL_STUB_MESSAGE *stubmsg, unsigned char *buffer  )
+unsigned char *WINAPI NdrSendReceive( PMIDL_STUB_MESSAGE stubmsg, unsigned char *buffer  )
 {
   RPC_STATUS status;
 

dlls/rpcrt4/rpc_epmap.c

@@ -258,7 +258,7 @@ typedef struct twr_t
  *             TowerExplode (RPCRT4.@)
  */
 RPC_STATUS WINAPI TowerExplode(
-    const twr_t *tower, RPC_SYNTAX_IDENTIFIER *object, RPC_SYNTAX_IDENTIFIER *syntax,
+    const twr_t *tower, PRPC_SYNTAX_IDENTIFIER object, PRPC_SYNTAX_IDENTIFIER syntax,
     char **protseq, char **endpoint, char **address)
 {
     size_t tower_size;

include/rpcndr.h

@@ -610,11 +610,11 @@ RPCRTAPI void RPC_ENTRY
 RPCRTAPI unsigned char* RPC_ENTRY
   NdrServerInitializeNew( PRPC_MESSAGE pRpcMsg, PMIDL_STUB_MESSAGE pStubMsg, PMIDL_STUB_DESC pStubDesc );
 RPCRTAPI unsigned char* RPC_ENTRY
-  NdrGetBuffer( MIDL_STUB_MESSAGE *stubmsg, ULONG buflen, RPC_BINDING_HANDLE handle );
+  NdrGetBuffer( PMIDL_STUB_MESSAGE stubmsg, ULONG buflen, RPC_BINDING_HANDLE handle );
 RPCRTAPI void RPC_ENTRY
-  NdrFreeBuffer( MIDL_STUB_MESSAGE *pStubMsg );
+  NdrFreeBuffer( PMIDL_STUB_MESSAGE pStubMsg );
 RPCRTAPI unsigned char* RPC_ENTRY
-  NdrSendReceive( MIDL_STUB_MESSAGE *stubmsg, unsigned char *buffer );
+  NdrSendReceive( PMIDL_STUB_MESSAGE stubmsg, unsigned char *buffer );
 
 RPCRTAPI unsigned char * RPC_ENTRY
   NdrNsGetBuffer( PMIDL_STUB_MESSAGE pStubMsg, ULONG BufferLength, RPC_BINDING_HANDLE Handle );

tools/winapi/win32.api

@@ -3624,6 +3624,7 @@ RPC_IF_HANDLE
 RPC_STATUS
 UINT
 ULONG
+XLAT_SIDE
 int
 size_t
 unsigned char
@@ -3649,47 +3650,62 @@ LPTYPEINFO
 LPUNKNOWN
 LPVOID
 LPVOID *
-LPWSTR *
 MIDL_STUB_MESSAGE *
 NDR_CCONTEXT
 NDR_CCONTEXT *
 NDR_RUNDOWN
 NDR_SCONTEXT
 PFORMAT_STRING
+PFULL_PTR_XLAT_TABLES
 PMIDL_STUB_DESC
 PMIDL_STUB_MESSAGE
 PRPC_MESSAGE
 PRPC_POLICY
 PRPCOLEMESSAGE
+PRPC_SYNTAX_IDENTIFIER
 ProxyFileInfo **
 REFCLSID
 REFIID
 RPC_AUTH_KEY_RETRIEVAL_FN
+RPC_AUTH_IDENTITY_HANDLE
+RPC_AUTH_IDENTITY_HANDLE *
 RPC_BINDING_HANDLE *
 RPC_BINDING_VECTOR *
 RPC_BINDING_VECTOR **
 RPC_BLOCKING_FN
+RPC_CSTR *
+RPC_EP_INQ_HANDLE *
 RPC_IF_CALLBACK_FN *
+RPC_IF_ID *
+RPC_IF_ID_VECTOR **
 RPC_MGR_EPV *
+RPC_SECURITY_QOS *
 RPC_STATUS *
+RPC_SYNTAX_IDENTIFIER *
+RPC_WSTR *
 UUID *
 UUID_VECTOR *
 ULONG *
 struct IRpcChannelBuffer *
 struct IRpcStubBuffer *
+twr_t *
+twr_t **
 unsigned char *
 unsigned char **
-unsigned short *
-unsigned short **
 void *
+void **
 
 %void
 
 void
 
+%str
+
+RPC_CSTR
+
 %wstr
 
-LPWSTR
+RPC_WSTR
 
 %%rsaenh.dll