--- mstools/h/rpcdce.h	2018/08/09 18:20:33	1.1.1.1
+++ mstools/h/rpcdce.h	2018/08/09 18:23:08	1.1.1.3
@@ -1,6 +1,6 @@
 /*++
 
-Copyright (c) 1991 Microsoft Corporation
+Copyright (c) 1991-1993 Microsoft Corporation
 
 Module Name:
 
@@ -21,6 +21,10 @@ Revision History:
 #ifndef __RPCDCE_H__
 #define __RPCDCE_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define IN
 #define OUT
 #define OPTIONAL
@@ -64,7 +68,7 @@ typedef struct _UUID_VECTOR
 } UUID_VECTOR;
 #define uuid_vector_t UUID_VECTOR
 
-typedef void PAPI * RPC_IF_HANDLE;
+typedef void __RPC_FAR * RPC_IF_HANDLE;
 
 #ifndef IFID_DEFINED
 #define IFID_DEFINED
@@ -81,18 +85,21 @@ typedef struct _RPC_IF_ID
 #define RPC_C_BINDING_DEFAULT_TIMEOUT 5
 #define RPC_C_BINDING_MAX_TIMEOUT 9
 
+#define RPC_C_LISTEN_MAX_CALLS_DEFAULT 1234
+#define RPC_C_PROTSEQ_MAX_REQS_DEFAULT 10
+
 #ifdef RPC_UNICODE_SUPPORTED
 
 typedef struct _RPC_PROTSEQ_VECTORA
 {
     unsigned int Count;
-    unsigned char PAPI * Protseq[1];
+    unsigned char __RPC_FAR * Protseq[1];
 } RPC_PROTSEQ_VECTORA;
 
 typedef struct _RPC_PROTSEQ_VECTORW
 {
     unsigned int Count;
-    unsigned short PAPI * Protseq[1];
+    unsigned short __RPC_FAR * Protseq[1];
 } RPC_PROTSEQ_VECTORW;
 
 #ifdef UNICODE
@@ -106,19 +113,19 @@ typedef struct _RPC_PROTSEQ_VECTORW
 typedef struct _RPC_PROTSEQ_VECTOR
 {
     unsigned int Count;
-    unsigned char PAPI * Protseq[1];
+    unsigned char __RPC_FAR * Protseq[1];
 } RPC_PROTSEQ_VECTOR;
 
 #endif /* RPC_UNICODE_SUPPORTED */
 
 typedef void
-(PAPI * RPC_OBJECT_INQ_FN) (
-    IN UUID PAPI * ObjectUuid,
-    OUT UUID PAPI * TypeUuid,
-    OUT RPC_STATUS PAPI * Status
+RPC_OBJECT_INQ_FN (
+    IN UUID __RPC_FAR * ObjectUuid,
+    OUT UUID __RPC_FAR * TypeUuid,
+    OUT RPC_STATUS __RPC_FAR * Status
     );
 
-typedef void PAPI * RPC_MGR_EPV; /* ### Hacked. */
+#define RPC_MGR_EPV void
 
 typedef struct
 {
@@ -135,13 +142,13 @@ typedef struct
 RPC_STATUS RPC_ENTRY
 RpcBindingCopy (
     IN RPC_BINDING_HANDLE SourceBinding,
-    OUT RPC_BINDING_HANDLE PAPI * DestinationBinding
+    OUT RPC_BINDING_HANDLE __RPC_FAR * DestinationBinding
     );
 
 /* client */
 RPC_STATUS RPC_ENTRY
 RpcBindingFree (
-    IN OUT RPC_BINDING_HANDLE PAPI * Binding
+    IN OUT RPC_BINDING_HANDLE __RPC_FAR * Binding
     );
 
 /* client */
@@ -150,14 +157,14 @@ RpcBindingFree (
 
 RPC_STATUS RPC_ENTRY
 RpcBindingFromStringBindingA (
-    IN unsigned char PAPI * StringBinding,
-    OUT RPC_BINDING_HANDLE PAPI * Binding
+    IN unsigned char __RPC_FAR * StringBinding,
+    OUT RPC_BINDING_HANDLE __RPC_FAR * Binding
     );
 
 RPC_STATUS RPC_ENTRY
 RpcBindingFromStringBindingW (
-    IN unsigned short PAPI * StringBinding,
-    OUT RPC_BINDING_HANDLE PAPI * Binding
+    IN unsigned short __RPC_FAR * StringBinding,
+    OUT RPC_BINDING_HANDLE __RPC_FAR * Binding
     );
 
 #ifdef UNICODE
@@ -170,8 +177,8 @@ RpcBindingFromStringBindingW (
 
 RPC_STATUS RPC_ENTRY
 RpcBindingFromStringBinding (
-    IN unsigned char PAPI * StringBinding,
-    OUT RPC_BINDING_HANDLE PAPI * Binding
+    IN unsigned char __RPC_FAR * StringBinding,
+    OUT RPC_BINDING_HANDLE __RPC_FAR * Binding
     );
 
 #endif /* RPC_UNICODE_SUPPORTED */
@@ -183,7 +190,7 @@ RpcBindingFromStringBinding (
 RPC_STATUS RPC_ENTRY
 RpcBindingInqObject (
     IN RPC_BINDING_HANDLE Binding,
-    OUT UUID PAPI * ObjectUuid
+    OUT UUID __RPC_FAR * ObjectUuid
     );
 
 /* client */
@@ -199,7 +206,7 @@ RpcBindingReset (
 RPC_STATUS RPC_ENTRY
 RpcBindingSetObject (
     IN RPC_BINDING_HANDLE Binding,
-    IN UUID PAPI * ObjectUuid
+    IN UUID __RPC_FAR * ObjectUuid
     );
 
 /* client/server */
@@ -209,13 +216,13 @@ RpcBindingSetObject (
 RPC_STATUS RPC_ENTRY
 RpcBindingToStringBindingA (
     IN RPC_BINDING_HANDLE Binding,
-    OUT unsigned char PAPI * PAPI * StringBinding
+    OUT unsigned char __RPC_FAR * __RPC_FAR * StringBinding
     );
 
 RPC_STATUS RPC_ENTRY
 RpcBindingToStringBindingW (
     IN RPC_BINDING_HANDLE Binding,
-    OUT unsigned short PAPI * PAPI * StringBinding
+    OUT unsigned short __RPC_FAR * __RPC_FAR * StringBinding
     );
 
 #ifdef UNICODE
@@ -229,7 +236,7 @@ RpcBindingToStringBindingW (
 RPC_STATUS RPC_ENTRY
 RpcBindingToStringBinding (
     IN RPC_BINDING_HANDLE Binding,
-    OUT unsigned char PAPI * PAPI * StringBinding
+    OUT unsigned char __RPC_FAR * __RPC_FAR * StringBinding
     );
 
 #endif /* RPC_UNICODE_SUPPORTED */
@@ -237,7 +244,7 @@ RpcBindingToStringBinding (
 /* client/server */
 RPC_STATUS RPC_ENTRY
 RpcBindingVectorFree (
-    IN OUT RPC_BINDING_VECTOR PAPI * PAPI * BindingVector
+    IN OUT RPC_BINDING_VECTOR __RPC_FAR * __RPC_FAR * BindingVector
     );
 
 /* client/server */
@@ -246,22 +253,22 @@ RpcBindingVectorFree (
 
 RPC_STATUS RPC_ENTRY
 RpcStringBindingComposeA (
-    IN unsigned char PAPI * ObjUuid OPTIONAL,
-    IN unsigned char PAPI * Protseq OPTIONAL,
-    IN unsigned char PAPI * NetworkAddr OPTIONAL,
-    IN unsigned char PAPI * Endpoint OPTIONAL,
-    IN unsigned char PAPI * Options OPTIONAL,
-    OUT unsigned char PAPI * PAPI * StringBinding OPTIONAL
+    IN unsigned char __RPC_FAR * ObjUuid OPTIONAL,
+    IN unsigned char __RPC_FAR * Protseq OPTIONAL,
+    IN unsigned char __RPC_FAR * NetworkAddr OPTIONAL,
+    IN unsigned char __RPC_FAR * Endpoint OPTIONAL,
+    IN unsigned char __RPC_FAR * Options OPTIONAL,
+    OUT unsigned char __RPC_FAR * __RPC_FAR * StringBinding OPTIONAL
     );
 
 RPC_STATUS RPC_ENTRY
 RpcStringBindingComposeW (
-    IN unsigned short PAPI * ObjUuid OPTIONAL,
-    IN unsigned short PAPI * Protseq OPTIONAL,
-    IN unsigned short PAPI * NetworkAddr OPTIONAL,
-    IN unsigned short PAPI * Endpoint OPTIONAL,
-    IN unsigned short PAPI * Options OPTIONAL,
-    OUT unsigned short PAPI * PAPI * StringBinding OPTIONAL
+    IN unsigned short __RPC_FAR * ObjUuid OPTIONAL,
+    IN unsigned short __RPC_FAR * Protseq OPTIONAL,
+    IN unsigned short __RPC_FAR * NetworkAddr OPTIONAL,
+    IN unsigned short __RPC_FAR * Endpoint OPTIONAL,
+    IN unsigned short __RPC_FAR * Options OPTIONAL,
+    OUT unsigned short __RPC_FAR * __RPC_FAR * StringBinding OPTIONAL
     );
 
 #ifdef UNICODE
@@ -274,12 +281,12 @@ RpcStringBindingComposeW (
 
 RPC_STATUS RPC_ENTRY
 RpcStringBindingCompose (
-    IN unsigned char PAPI * ObjUuid OPTIONAL,
-    IN unsigned char PAPI * Protseq OPTIONAL,
-    IN unsigned char PAPI * NetworkAddr OPTIONAL,
-    IN unsigned char PAPI * Endpoint OPTIONAL,
-    IN unsigned char PAPI * Options OPTIONAL,
-    OUT unsigned char PAPI * PAPI * StringBinding OPTIONAL
+    IN unsigned char __RPC_FAR * ObjUuid OPTIONAL,
+    IN unsigned char __RPC_FAR * Protseq OPTIONAL,
+    IN unsigned char __RPC_FAR * NetworkAddr OPTIONAL,
+    IN unsigned char __RPC_FAR * Endpoint OPTIONAL,
+    IN unsigned char __RPC_FAR * Options OPTIONAL,
+    OUT unsigned char __RPC_FAR * __RPC_FAR * StringBinding OPTIONAL
     );
 
 #endif /* RPC_UNICODE_SUPPORTED */
@@ -290,22 +297,22 @@ RpcStringBindingCompose (
 
 RPC_STATUS RPC_ENTRY
 RpcStringBindingParseA (
-    IN unsigned char PAPI * StringBinding,
-    OUT unsigned char PAPI * PAPI * ObjUuid OPTIONAL,
-    OUT unsigned char PAPI * PAPI * Protseq OPTIONAL,
-    OUT unsigned char PAPI * PAPI * NetworkAddr OPTIONAL,
-    OUT unsigned char PAPI * PAPI * Endpoint OPTIONAL,
-    OUT unsigned char PAPI * PAPI * NetworkOptions OPTIONAL
+    IN unsigned char __RPC_FAR * StringBinding,
+    OUT unsigned char __RPC_FAR * __RPC_FAR * ObjUuid OPTIONAL,
+    OUT unsigned char __RPC_FAR * __RPC_FAR * Protseq OPTIONAL,
+    OUT unsigned char __RPC_FAR * __RPC_FAR * NetworkAddr OPTIONAL,
+    OUT unsigned char __RPC_FAR * __RPC_FAR * Endpoint OPTIONAL,
+    OUT unsigned char __RPC_FAR * __RPC_FAR * NetworkOptions OPTIONAL
     );
 
 RPC_STATUS RPC_ENTRY
 RpcStringBindingParseW (
-    IN unsigned short PAPI * StringBinding,
-    OUT unsigned short PAPI * PAPI * ObjUuid OPTIONAL,
-    OUT unsigned short PAPI * PAPI * Protseq OPTIONAL,
-    OUT unsigned short PAPI * PAPI * NetworkAddr OPTIONAL,
-    OUT unsigned short PAPI * PAPI * Endpoint OPTIONAL,
-    OUT unsigned short PAPI * PAPI * NetworkOptions OPTIONAL
+    IN unsigned short __RPC_FAR * StringBinding,
+    OUT unsigned short __RPC_FAR * __RPC_FAR * ObjUuid OPTIONAL,
+    OUT unsigned short __RPC_FAR * __RPC_FAR * Protseq OPTIONAL,
+    OUT unsigned short __RPC_FAR * __RPC_FAR * NetworkAddr OPTIONAL,
+    OUT unsigned short __RPC_FAR * __RPC_FAR * Endpoint OPTIONAL,
+    OUT unsigned short __RPC_FAR * __RPC_FAR * NetworkOptions OPTIONAL
     );
 
 #ifdef UNICODE
@@ -318,12 +325,12 @@ RpcStringBindingParseW (
 
 RPC_STATUS RPC_ENTRY
 RpcStringBindingParse (
-    IN unsigned char PAPI * StringBinding,
-    OUT unsigned char PAPI * PAPI * ObjUuid OPTIONAL,
-    OUT unsigned char PAPI * PAPI * Protseq OPTIONAL,
-    OUT unsigned char PAPI * PAPI * NetworkAddr OPTIONAL,
-    OUT unsigned char PAPI * PAPI * Endpoint OPTIONAL,
-    OUT unsigned char PAPI * PAPI * NetworkOptions OPTIONAL
+    IN unsigned char __RPC_FAR * StringBinding,
+    OUT unsigned char __RPC_FAR * __RPC_FAR * ObjUuid OPTIONAL,
+    OUT unsigned char __RPC_FAR * __RPC_FAR * Protseq OPTIONAL,
+    OUT unsigned char __RPC_FAR * __RPC_FAR * NetworkAddr OPTIONAL,
+    OUT unsigned char __RPC_FAR * __RPC_FAR * Endpoint OPTIONAL,
+    OUT unsigned char __RPC_FAR * __RPC_FAR * NetworkOptions OPTIONAL
     );
 
 #endif /* RPC_UNICODE_SUPPORTED */
@@ -334,12 +341,12 @@ RpcStringBindingParse (
 
 RPC_STATUS RPC_ENTRY
 RpcStringFreeA (
-    IN OUT unsigned char PAPI * PAPI * String
+    IN OUT unsigned char __RPC_FAR * __RPC_FAR * String
     );
 
 RPC_STATUS RPC_ENTRY
 RpcStringFreeW (
-    IN OUT unsigned short PAPI * PAPI * String
+    IN OUT unsigned short __RPC_FAR * __RPC_FAR * String
     );
 
 #ifdef UNICODE
@@ -352,7 +359,7 @@ RpcStringFreeW (
 
 RPC_STATUS RPC_ENTRY
 RpcStringFree (
-    IN OUT unsigned char PAPI * PAPI * String
+    IN OUT unsigned char __RPC_FAR * __RPC_FAR * String
     );
 
 #endif /* RPC_UNICODE_SUPPORTED */
@@ -361,7 +368,7 @@ RpcStringFree (
 RPC_STATUS RPC_ENTRY
 RpcIfInqId (
     IN RPC_IF_HANDLE RpcIfHandle,
-    OUT RPC_IF_ID PAPI * RpcIfId
+    OUT RPC_IF_ID __RPC_FAR * RpcIfId
     );
 
 /* client/server */
@@ -370,12 +377,12 @@ RpcIfInqId (
 
 RPC_STATUS RPC_ENTRY
 RpcNetworkIsProtseqValidA (
-    IN unsigned char PAPI * Protseq
+    IN unsigned char __RPC_FAR * Protseq
     );
 
 RPC_STATUS RPC_ENTRY
 RpcNetworkIsProtseqValidW (
-    IN unsigned short PAPI * Protseq
+    IN unsigned short __RPC_FAR * Protseq
     );
 
 #ifdef UNICODE
@@ -388,7 +395,7 @@ RpcNetworkIsProtseqValidW (
 
 RPC_STATUS RPC_ENTRY
 RpcNetworkIsProtseqValid (
-    IN unsigned char PAPI * Protseq
+    IN unsigned char __RPC_FAR * Protseq
     );
 
 #endif /* RPC_UNICODE_SUPPORTED */
@@ -397,7 +404,7 @@ RpcNetworkIsProtseqValid (
 RPC_STATUS RPC_ENTRY
 RpcMgmtInqComTimeout (
     IN RPC_BINDING_HANDLE Binding,
-    OUT unsigned int PAPI * Timeout
+    OUT unsigned int __RPC_FAR * Timeout
     );
 
 /* client */
@@ -413,12 +420,12 @@ RpcMgmtSetComTimeout (
 
 RPC_STATUS RPC_ENTRY
 RpcNetworkInqProtseqsA (
-    OUT RPC_PROTSEQ_VECTORA PAPI * PAPI * ProtseqVector
+    OUT RPC_PROTSEQ_VECTORA __RPC_FAR * __RPC_FAR * ProtseqVector
     );
 
 RPC_STATUS RPC_ENTRY
 RpcNetworkInqProtseqsW (
-    OUT RPC_PROTSEQ_VECTORW PAPI * PAPI * ProtseqVector
+    OUT RPC_PROTSEQ_VECTORW __RPC_FAR * __RPC_FAR * ProtseqVector
     );
 
 #ifdef UNICODE
@@ -431,7 +438,7 @@ RpcNetworkInqProtseqsW (
 
 RPC_STATUS RPC_ENTRY
 RpcNetworkInqProtseqs (
-    OUT RPC_PROTSEQ_VECTOR PAPI * PAPI * ProtseqVector
+    OUT RPC_PROTSEQ_VECTOR __RPC_FAR * __RPC_FAR * ProtseqVector
     );
 
 #endif /* RPC_UNICODE_SUPPORTED */
@@ -439,21 +446,21 @@ RpcNetworkInqProtseqs (
 /* server */
 RPC_STATUS RPC_ENTRY
 RpcObjectInqType (
-    IN UUID PAPI * ObjUuid,
-    OUT UUID PAPI * TypeUuid OPTIONAL
+    IN UUID __RPC_FAR * ObjUuid,
+    OUT UUID __RPC_FAR * TypeUuid OPTIONAL
     );
 
 /* server */
 RPC_STATUS RPC_ENTRY
 RpcObjectSetInqFn (
-    IN RPC_OBJECT_INQ_FN InquiryFn
+    IN RPC_OBJECT_INQ_FN __RPC_FAR * InquiryFn
     );
 
 /* server */
 RPC_STATUS RPC_ENTRY
 RpcObjectSetType (
-    IN UUID PAPI * ObjUuid,
-    IN UUID PAPI * TypeUuid OPTIONAL
+    IN UUID __RPC_FAR * ObjUuid,
+    IN UUID __RPC_FAR * TypeUuid OPTIONAL
     );
 
 /* server */
@@ -462,12 +469,12 @@ RpcObjectSetType (
 
 RPC_STATUS RPC_ENTRY
 RpcProtseqVectorFreeA (
-    IN OUT RPC_PROTSEQ_VECTORA PAPI * PAPI * ProtseqVector
+    IN OUT RPC_PROTSEQ_VECTORA __RPC_FAR * __RPC_FAR * ProtseqVector
     );
 
 RPC_STATUS RPC_ENTRY
 RpcProtseqVectorFreeW (
-    IN OUT RPC_PROTSEQ_VECTORW PAPI * PAPI * ProtseqVector
+    IN OUT RPC_PROTSEQ_VECTORW __RPC_FAR * __RPC_FAR * ProtseqVector
     );
 
 #ifdef UNICODE
@@ -480,7 +487,7 @@ RpcProtseqVectorFreeW (
 
 RPC_STATUS RPC_ENTRY
 RpcProtseqVectorFree (
-    IN OUT RPC_PROTSEQ_VECTOR PAPI * PAPI * ProtseqVector
+    IN OUT RPC_PROTSEQ_VECTOR __RPC_FAR * __RPC_FAR * ProtseqVector
     );
 
 #endif /* RPC_UNICODE_SUPPORTED */
@@ -488,37 +495,38 @@ RpcProtseqVectorFree (
 /* server */
 RPC_STATUS RPC_ENTRY
 RpcServerInqBindings (
-    OUT RPC_BINDING_VECTOR PAPI * PAPI * BindingVector
+    OUT RPC_BINDING_VECTOR __RPC_FAR * __RPC_FAR * BindingVector
     );
 
 /* server */
 RPC_STATUS RPC_ENTRY
 RpcServerInqIf (
     IN RPC_IF_HANDLE IfSpec,
-    IN UUID PAPI * MgrTypeUuid, OPTIONAL
-    OUT RPC_MGR_EPV PAPI * MgrEpv
+    IN UUID __RPC_FAR * MgrTypeUuid, OPTIONAL
+    OUT RPC_MGR_EPV __RPC_FAR * __RPC_FAR * MgrEpv
     );
 
 /* server */
 RPC_STATUS RPC_ENTRY
 RpcServerListen (
     IN unsigned int MinimumCallThreads,
-    IN unsigned int MaxCalls
+    IN unsigned int MaxCalls,
+    IN unsigned int DontWait
     );
 
 /* server */
 RPC_STATUS RPC_ENTRY
 RpcServerRegisterIf (
     IN RPC_IF_HANDLE IfSpec,
-    IN UUID PAPI * MgrTypeUuid OPTIONAL,
-    IN RPC_MGR_EPV MgrEpv OPTIONAL
+    IN UUID __RPC_FAR * MgrTypeUuid OPTIONAL,
+    IN RPC_MGR_EPV __RPC_FAR * MgrEpv OPTIONAL
     );
 
 /* server */
 RPC_STATUS RPC_ENTRY
 RpcServerUnregisterIf (
     IN RPC_IF_HANDLE IfSpec,
-    IN UUID PAPI * MgrTypeUuid, OPTIONAL
+    IN UUID __RPC_FAR * MgrTypeUuid, OPTIONAL
     IN unsigned int WaitForCallsToComplete
     );
 
@@ -526,7 +534,7 @@ RpcServerUnregisterIf (
 RPC_STATUS RPC_ENTRY
 RpcServerUseAllProtseqs (
     IN unsigned int MaxCalls,
-    IN void PAPI * SecurityDescriptor OPTIONAL
+    IN void __RPC_FAR * SecurityDescriptor OPTIONAL
     );
 
 /* server */
@@ -534,7 +542,7 @@ RPC_STATUS RPC_ENTRY
 RpcServerUseAllProtseqsIf (
     IN unsigned int MaxCalls,
     IN RPC_IF_HANDLE IfSpec,
-    IN void PAPI * SecurityDescriptor OPTIONAL
+    IN void __RPC_FAR * SecurityDescriptor OPTIONAL
     );
 
 /* server */
@@ -543,16 +551,16 @@ RpcServerUseAllProtseqsIf (
 
 RPC_STATUS RPC_ENTRY
 RpcServerUseProtseqA (
-    IN unsigned char PAPI * Protseq,
+    IN unsigned char __RPC_FAR * Protseq,
     IN unsigned int MaxCalls,
-    IN void PAPI * SecurityDescriptor OPTIONAL
+    IN void __RPC_FAR * SecurityDescriptor OPTIONAL
     );
 
 RPC_STATUS RPC_ENTRY
 RpcServerUseProtseqW (
-    IN unsigned short PAPI * Protseq,
+    IN unsigned short __RPC_FAR * Protseq,
     IN unsigned int MaxCalls,
-    IN void PAPI * SecurityDescriptor OPTIONAL
+    IN void __RPC_FAR * SecurityDescriptor OPTIONAL
     );
 
 #ifdef UNICODE
@@ -565,9 +573,9 @@ RpcServerUseProtseqW (
 
 RPC_STATUS RPC_ENTRY
 RpcServerUseProtseq (
-    IN unsigned char PAPI * Protseq,
+    IN unsigned char __RPC_FAR * Protseq,
     IN unsigned int MaxCalls,
-    IN void PAPI * SecurityDescriptor OPTIONAL
+    IN void __RPC_FAR * SecurityDescriptor OPTIONAL
     );
 
 #endif /* RPC_UNICODE_SUPPORTED */
@@ -578,18 +586,18 @@ RpcServerUseProtseq (
 
 RPC_STATUS RPC_ENTRY
 RpcServerUseProtseqEpA (
-    IN unsigned char PAPI * Protseq,
+    IN unsigned char __RPC_FAR * Protseq,
     IN unsigned int MaxCalls,
-    IN unsigned char PAPI * Endpoint,
-    IN void PAPI * SecurityDescriptor OPTIONAL
+    IN unsigned char __RPC_FAR * Endpoint,
+    IN void __RPC_FAR * SecurityDescriptor OPTIONAL
     );
 
 RPC_STATUS RPC_ENTRY
 RpcServerUseProtseqEpW (
-    IN unsigned short PAPI * Protseq,
+    IN unsigned short __RPC_FAR * Protseq,
     IN unsigned int MaxCalls,
-    IN unsigned short PAPI * Endpoint,
-    IN void PAPI * SecurityDescriptor OPTIONAL
+    IN unsigned short __RPC_FAR * Endpoint,
+    IN void __RPC_FAR * SecurityDescriptor OPTIONAL
     );
 
 #ifdef UNICODE
@@ -602,10 +610,10 @@ RpcServerUseProtseqEpW (
 
 RPC_STATUS RPC_ENTRY
 RpcServerUseProtseqEp (
-    IN unsigned char PAPI * Protseq,
+    IN unsigned char __RPC_FAR * Protseq,
     IN unsigned int MaxCalls,
-    IN unsigned char PAPI * Endpoint,
-    IN void PAPI * SecurityDescriptor OPTIONAL
+    IN unsigned char __RPC_FAR * Endpoint,
+    IN void __RPC_FAR * SecurityDescriptor OPTIONAL
     );
 
 #endif /* RPC_UNICODE_SUPPORTED */
@@ -616,18 +624,18 @@ RpcServerUseProtseqEp (
 
 RPC_STATUS RPC_ENTRY
 RpcServerUseProtseqIfA (
-    IN unsigned char PAPI * Protseq,
+    IN unsigned char __RPC_FAR * Protseq,
     IN unsigned int MaxCalls,
     IN RPC_IF_HANDLE IfSpec,
-    IN void PAPI * SecurityDescriptor OPTIONAL
+    IN void __RPC_FAR * SecurityDescriptor OPTIONAL
     );
 
 RPC_STATUS RPC_ENTRY
 RpcServerUseProtseqIfW (
-    IN unsigned short PAPI * Protseq,
+    IN unsigned short __RPC_FAR * Protseq,
     IN unsigned int MaxCalls,
     IN RPC_IF_HANDLE IfSpec,
-    IN void PAPI * SecurityDescriptor OPTIONAL
+    IN void __RPC_FAR * SecurityDescriptor OPTIONAL
     );
 
 #ifdef UNICODE
@@ -640,10 +648,10 @@ RpcServerUseProtseqIfW (
 
 RPC_STATUS RPC_ENTRY
 RpcServerUseProtseqIf (
-    IN unsigned char PAPI * Protseq,
+    IN unsigned char __RPC_FAR * Protseq,
     IN unsigned int MaxCalls,
     IN RPC_IF_HANDLE IfSpec,
-    IN void PAPI * SecurityDescriptor OPTIONAL
+    IN void __RPC_FAR * SecurityDescriptor OPTIONAL
     );
 
 #endif /* RPC_UNICODE_SUPPORTED */
@@ -675,6 +683,12 @@ RpcMgmtStopServerListening (
 
 /* server */
 RPC_STATUS RPC_ENTRY
+RpcMgmtWaitServerListen (
+    void
+    );
+
+/* server */
+RPC_STATUS RPC_ENTRY
 RpcMgmtSetServerStackSize (
     IN unsigned long ThreadStackSize
     );
@@ -700,14 +714,14 @@ RPC_STATUS RPC_ENTRY
 RpcNsBindingInqEntryNameA (
     IN RPC_BINDING_HANDLE Binding,
     IN unsigned long EntryNameSyntax,
-    OUT unsigned char PAPI * PAPI * EntryName
+    OUT unsigned char __RPC_FAR * __RPC_FAR * EntryName
     );
 
 RPC_STATUS RPC_ENTRY
 RpcNsBindingInqEntryNameW (
     IN RPC_BINDING_HANDLE Binding,
     IN unsigned long EntryNameSyntax,
-    OUT unsigned short PAPI * PAPI * EntryName
+    OUT unsigned short __RPC_FAR * __RPC_FAR * EntryName
     );
 
 #ifdef UNICODE
@@ -722,13 +736,13 @@ RPC_STATUS RPC_ENTRY
 RpcNsBindingInqEntryName (
     IN RPC_BINDING_HANDLE Binding,
     IN unsigned long EntryNameSyntax,
-    OUT unsigned char PAPI * PAPI * EntryName
+    OUT unsigned char __RPC_FAR * __RPC_FAR * EntryName
     );
 
 #endif /* RPC_UNICODE_SUPPORTED */
 
-typedef void PAPI * RPC_AUTH_IDENTITY_HANDLE;
-typedef void PAPI * RPC_AUTHZ_HANDLE;
+typedef void __RPC_FAR * RPC_AUTH_IDENTITY_HANDLE;
+typedef void __RPC_FAR * RPC_AUTHZ_HANDLE;
 
 #define RPC_C_AUTHN_LEVEL_DEFAULT 0
 #define RPC_C_AUTHN_LEVEL_NONE 1
@@ -753,47 +767,47 @@ typedef void PAPI * RPC_AUTHZ_HANDLE;
 RPC_STATUS RPC_ENTRY
 RpcBindingInqAuthClientA (
     IN RPC_BINDING_HANDLE ClientBinding, OPTIONAL
-    OUT RPC_AUTHZ_HANDLE PAPI * Privs,
-    OUT unsigned char PAPI * PAPI * ServerPrincName, OPTIONAL
-    OUT unsigned long PAPI * AuthnLevel, OPTIONAL
-    OUT unsigned long PAPI * AuthnSvc, OPTIONAL
-    OUT unsigned long PAPI * AuthzSvc OPTIONAL
+    OUT RPC_AUTHZ_HANDLE __RPC_FAR * Privs,
+    OUT unsigned char __RPC_FAR * __RPC_FAR * ServerPrincName, OPTIONAL
+    OUT unsigned long __RPC_FAR * AuthnLevel, OPTIONAL
+    OUT unsigned long __RPC_FAR * AuthnSvc, OPTIONAL
+    OUT unsigned long __RPC_FAR * AuthzSvc OPTIONAL
     );
 
 RPC_STATUS RPC_ENTRY
 RpcBindingInqAuthClientW (
     IN RPC_BINDING_HANDLE ClientBinding, OPTIONAL
-    OUT RPC_AUTHZ_HANDLE PAPI * Privs,
-    OUT unsigned short PAPI * PAPI * ServerPrincName, OPTIONAL
-    OUT unsigned long PAPI * AuthnLevel, OPTIONAL
-    OUT unsigned long PAPI * AuthnSvc, OPTIONAL
-    OUT unsigned long PAPI * AuthzSvc OPTIONAL
+    OUT RPC_AUTHZ_HANDLE __RPC_FAR * Privs,
+    OUT unsigned short __RPC_FAR * __RPC_FAR * ServerPrincName, OPTIONAL
+    OUT unsigned long __RPC_FAR * AuthnLevel, OPTIONAL
+    OUT unsigned long __RPC_FAR * AuthnSvc, OPTIONAL
+    OUT unsigned long __RPC_FAR * AuthzSvc OPTIONAL
     );
 
 RPC_STATUS RPC_ENTRY
 RpcBindingInqAuthInfoA (
     IN RPC_BINDING_HANDLE Binding,
-    OUT unsigned char PAPI * PAPI * ServerPrincName, OPTIONAL
-    OUT unsigned long PAPI * AuthnLevel, OPTIONAL
-    OUT unsigned long PAPI * AuthnSvc, OPTIONAL
-    OUT RPC_AUTH_IDENTITY_HANDLE PAPI * AuthIdentity, OPTIONAL
-    OUT unsigned long PAPI * AuthzSvc OPTIONAL
+    OUT unsigned char __RPC_FAR * __RPC_FAR * ServerPrincName, OPTIONAL
+    OUT unsigned long __RPC_FAR * AuthnLevel, OPTIONAL
+    OUT unsigned long __RPC_FAR * AuthnSvc, OPTIONAL
+    OUT RPC_AUTH_IDENTITY_HANDLE __RPC_FAR * AuthIdentity, OPTIONAL
+    OUT unsigned long __RPC_FAR * AuthzSvc OPTIONAL
     );
 
 RPC_STATUS RPC_ENTRY
 RpcBindingInqAuthInfoW (
     IN RPC_BINDING_HANDLE Binding,
-    OUT unsigned short PAPI * PAPI * ServerPrincName, OPTIONAL
-    OUT unsigned long PAPI * AuthnLevel, OPTIONAL
-    OUT unsigned long PAPI * AuthnSvc, OPTIONAL
-    OUT RPC_AUTH_IDENTITY_HANDLE PAPI * AuthIdentity, OPTIONAL
-    OUT unsigned long PAPI * AuthzSvc OPTIONAL
+    OUT unsigned short __RPC_FAR * __RPC_FAR * ServerPrincName, OPTIONAL
+    OUT unsigned long __RPC_FAR * AuthnLevel, OPTIONAL
+    OUT unsigned long __RPC_FAR * AuthnSvc, OPTIONAL
+    OUT RPC_AUTH_IDENTITY_HANDLE __RPC_FAR * AuthIdentity, OPTIONAL
+    OUT unsigned long __RPC_FAR * AuthzSvc OPTIONAL
     );
 
 RPC_STATUS RPC_ENTRY
 RpcBindingSetAuthInfoA (
     IN RPC_BINDING_HANDLE Binding,
-    IN unsigned char PAPI * ServerPrincName,
+    IN unsigned char __RPC_FAR * ServerPrincName,
     IN unsigned long AuthnLevel,
     IN unsigned long AuthnSvc,
     IN RPC_AUTH_IDENTITY_HANDLE AuthIdentity, OPTIONAL
@@ -803,7 +817,7 @@ RpcBindingSetAuthInfoA (
 RPC_STATUS RPC_ENTRY
 RpcBindingSetAuthInfoW (
     IN RPC_BINDING_HANDLE Binding,
-    IN unsigned short PAPI * ServerPrincName,
+    IN unsigned short __RPC_FAR * ServerPrincName,
     IN unsigned long AuthnLevel,
     IN unsigned long AuthnSvc,
     IN RPC_AUTH_IDENTITY_HANDLE AuthIdentity, OPTIONAL
@@ -811,27 +825,28 @@ RpcBindingSetAuthInfoW (
     );
 
 typedef void
-(PAPI * RPC_AUTH_KEY_RETRIEVAL_FN) (
-    IN void PAPI * Arg,
-    IN unsigned short PAPI * ServerPrincName,
-    OUT void PAPI * PAPI * Key,
-    OUT RPC_STATUS PAPI * Status
+(__RPC_FAR * RPC_AUTH_KEY_RETRIEVAL_FN) (
+    IN void __RPC_FAR * Arg,
+    IN unsigned short __RPC_FAR * ServerPrincName,
+    IN unsigned long KeyVer,
+    OUT void __RPC_FAR * __RPC_FAR * Key,
+    OUT RPC_STATUS __RPC_FAR * Status
     );
 
 RPC_STATUS RPC_ENTRY
 RpcServerRegisterAuthInfoA (
-    IN unsigned char PAPI * ServerPrincName,
+    IN unsigned char __RPC_FAR * ServerPrincName,
     IN unsigned long AuthnSvc,
     IN RPC_AUTH_KEY_RETRIEVAL_FN GetKeyFn OPTIONAL,
-    IN void PAPI * Arg OPTIONAL
+    IN void __RPC_FAR * Arg OPTIONAL
     );
 
 RPC_STATUS RPC_ENTRY
 RpcServerRegisterAuthInfoW (
-    IN unsigned short PAPI * ServerPrincName,
+    IN unsigned short __RPC_FAR * ServerPrincName,
     IN unsigned long AuthnSvc,
     IN RPC_AUTH_KEY_RETRIEVAL_FN GetKeyFn OPTIONAL,
-    IN void PAPI * Arg OPTIONAL
+    IN void __RPC_FAR * Arg OPTIONAL
     );
 
 #ifdef UNICODE
@@ -851,27 +866,27 @@ RpcServerRegisterAuthInfoW (
 RPC_STATUS RPC_ENTRY
 RpcBindingInqAuthClient (
     IN RPC_BINDING_HANDLE ClientBinding, OPTIONAL
-    OUT RPC_AUTHZ_HANDLE PAPI * Privs,
-    OUT unsigned char PAPI * PAPI * ServerPrincName, OPTIONAL
-    OUT unsigned long PAPI * AuthnLevel, OPTIONAL
-    OUT unsigned long PAPI * AuthnSvc, OPTIONAL
-    OUT unsigned long PAPI * AuthzSvc OPTIONAL
+    OUT RPC_AUTHZ_HANDLE __RPC_FAR * Privs,
+    OUT unsigned char __RPC_FAR * __RPC_FAR * ServerPrincName, OPTIONAL
+    OUT unsigned long __RPC_FAR * AuthnLevel, OPTIONAL
+    OUT unsigned long __RPC_FAR * AuthnSvc, OPTIONAL
+    OUT unsigned long __RPC_FAR * AuthzSvc OPTIONAL
     );
 
 RPC_STATUS RPC_ENTRY
 RpcBindingInqAuthInfo (
     IN RPC_BINDING_HANDLE Binding,
-    OUT unsigned char PAPI * PAPI * ServerPrincName, OPTIONAL
-    OUT unsigned long PAPI * AuthnLevel, OPTIONAL
-    OUT unsigned long PAPI * AuthnSvc, OPTIONAL
-    OUT RPC_AUTH_IDENTITY_HANDLE PAPI * AuthIdentity, OPTIONAL
-    OUT unsigned long PAPI * AuthzSvc OPTIONAL
+    OUT unsigned char __RPC_FAR * __RPC_FAR * ServerPrincName, OPTIONAL
+    OUT unsigned long __RPC_FAR * AuthnLevel, OPTIONAL
+    OUT unsigned long __RPC_FAR * AuthnSvc, OPTIONAL
+    OUT RPC_AUTH_IDENTITY_HANDLE __RPC_FAR * AuthIdentity, OPTIONAL
+    OUT unsigned long __RPC_FAR * AuthzSvc OPTIONAL
     );
 
 RPC_STATUS RPC_ENTRY
 RpcBindingSetAuthInfo (
     IN RPC_BINDING_HANDLE Binding,
-    IN unsigned char PAPI * ServerPrincName,
+    IN unsigned char __RPC_FAR * ServerPrincName,
     IN unsigned long AuthnLevel,
     IN unsigned long AuthnSvc,
     IN RPC_AUTH_IDENTITY_HANDLE AuthIdentity, OPTIONAL
@@ -879,37 +894,30 @@ RpcBindingSetAuthInfo (
     );
 
 typedef void
-(PAPI * RPC_AUTH_KEY_RETRIEVAL_FN) (
-    IN void PAPI * Arg,
-    IN unsigned char PAPI * ServerPrincName,
-    OUT void PAPI * PAPI * Key,
-    OUT RPC_STATUS PAPI * Status
+(__RPC_FAR * RPC_AUTH_KEY_RETRIEVAL_FN) (
+    IN void __RPC_FAR * Arg,
+    IN unsigned char __RPC_FAR * ServerPrincName,
+    IN unsigned long KeyVer,
+    OUT void __RPC_FAR * __RPC_FAR * Key,
+    OUT RPC_STATUS __RPC_FAR * Status
     );
 
 RPC_STATUS RPC_ENTRY
 RpcServerRegisterAuthInfo (
-    IN unsigned char PAPI * ServerPrincName,
+    IN unsigned char __RPC_FAR * ServerPrincName,
     IN unsigned long AuthnSvc,
     IN RPC_AUTH_KEY_RETRIEVAL_FN GetKeyFn OPTIONAL,
-    IN void PAPI * Arg OPTIONAL
+    IN void __RPC_FAR * Arg OPTIONAL
     );
 
 #endif /* RPC_UNICODE_SUPPORTED */
 
 typedef struct {
-    unsigned char PAPI * UserName;
-    unsigned char PAPI * ComputerName;
+    unsigned char __RPC_FAR * UserName;
+    unsigned char __RPC_FAR * ComputerName;
     unsigned short Privilege;
     unsigned long AuthFlags;
-} RPC_CLIENT_INFORMATION1, PAPI * PRPC_CLIENT_INFORMATION1;
-
-RPC_STATUS RPC_ENTRY
-RpcQueryClient (
-    IN RPC_BINDING_HANDLE Handle,
-    IN unsigned int ClientInformationLevel,
-    OUT void PAPI * ClientInformation,
-    IN OUT unsigned int PAPI * ClientInformationLength
-    );
+} RPC_CLIENT_INFORMATION1, __RPC_FAR * PRPC_CLIENT_INFORMATION1;
 
 void RPC_ENTRY
 RpcRaiseException (
@@ -919,7 +927,7 @@ RpcRaiseException (
 /* client/server */
 RPC_STATUS RPC_ENTRY
 UuidCreate (
-    OUT UUID PAPI * Uuid
+    OUT UUID __RPC_FAR * Uuid
     );
 
 #ifdef RPC_UNICODE_SUPPORTED
@@ -927,29 +935,29 @@ UuidCreate (
 /* client/server */
 RPC_STATUS RPC_ENTRY
 UuidToStringA (
-    IN UUID PAPI * Uuid,
-    OUT unsigned char PAPI * PAPI * StringUuid
+    IN UUID __RPC_FAR * Uuid,
+    OUT unsigned char __RPC_FAR * __RPC_FAR * StringUuid
     );
 
 /* client/server */
 RPC_STATUS RPC_ENTRY
 UuidFromStringA (
-    IN unsigned char PAPI * StringUuid,
-    OUT UUID PAPI * Uuid
+    IN unsigned char __RPC_FAR * StringUuid,
+    OUT UUID __RPC_FAR * Uuid
     );
 
 /* client/server */
 RPC_STATUS RPC_ENTRY
 UuidToStringW (
-    IN UUID PAPI * Uuid,
-    OUT unsigned short PAPI * PAPI * StringUuid
+    IN UUID __RPC_FAR * Uuid,
+    OUT unsigned short __RPC_FAR * __RPC_FAR * StringUuid
     );
 
 /* client/server */
 RPC_STATUS RPC_ENTRY
 UuidFromStringW (
-    IN unsigned short PAPI * StringUuid,
-    OUT UUID PAPI * Uuid
+    IN unsigned short __RPC_FAR * StringUuid,
+    OUT UUID __RPC_FAR * Uuid
     );
 
 #ifdef UNICODE
@@ -965,15 +973,15 @@ UuidFromStringW (
 /* client/server */
 RPC_STATUS RPC_ENTRY
 UuidToString (
-    IN UUID PAPI * Uuid,
-    OUT unsigned char PAPI * PAPI * StringUuid
+    IN UUID __RPC_FAR * Uuid,
+    OUT unsigned char __RPC_FAR * __RPC_FAR * StringUuid
     );
 
 /* client/server */
 RPC_STATUS RPC_ENTRY
 UuidFromString (
-    IN unsigned char PAPI * StringUuid,
-    OUT UUID PAPI * Uuid
+    IN unsigned char __RPC_FAR * StringUuid,
+    OUT UUID __RPC_FAR * Uuid
     );
 
 #endif /* RPC_UNICODE_SUPPORTED */
@@ -1048,11 +1056,10 @@ RpcEpUnregister(
     IN UUID_VECTOR * UuidVector
     );
 
-/*
-BUGBUG : We need to include rpcdcep.h until the compiler is fixed so
-that it generates clean header files.
-*/
-
 #include "rpcdcep.h"
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __RPCDCE_H__ */