--- mstools/h/rpc.h	2018/08/09 18:20:01	1.1
+++ mstools/h/rpc.h	2018/08/09 18:20:34	1.1.1.2
@@ -1,35 +1,44 @@
 /*********************************************************/
 /**               Microsoft LAN Manager                 **/
-/**       Copyright(c) Microsoft Corp., 1991            **/
+/**          Copyright(c) Microsoft Corp., 1991         **/
 /**                                                     **/
-/**            Base Include file for NT                 **/
+/**              Base Include file for NT               **/
 /**                                                     **/
 /*********************************************************/
 
 #ifndef __RPC_H__
 #define __RPC_H__
 
+#define __RPC_WIN32__
 
-typedef long RPC_STATUS;
+#ifndef __MIDL_USER_DEFINED
+#define midl_user_allocate MIDL_user_allocate
+#define midl_user_free     MIDL_user_free
+#define __MIDL_USER_DEFINED
+#endif
 
+typedef void * I_RPC_HANDLE;
+typedef long RPC_STATUS;
 #define PAPI
 #define RPC_ENTRY
+#define RPC_UNICODE_SUPPORTED
 
 #ifdef IN
-
 #undef IN
 #undef OUT
 #undef OPTIONAL
-#endif
-
-typedef void * RPC_HANDLE;
+#endif /* IN */
 
-#include "rpcbse.h"
+#include "rpcdce.h"
+#include "rpcnsi.h"
 #include "rpcnterr.h"
 
-#ifndef try
+#ifndef RPC_NO_WINDOWS_H
+#include <windows.h>
+#endif // RPC_NO_WINDOWS_H
+
 #include <excpt.h>
-#endif
+#include <winerror.h>
 
 #define RpcTryExcept \
     try \
@@ -63,24 +72,21 @@ typedef void * RPC_HANDLE;
 #define RpcEndFinally \
         }
 
-// define the following functions/variables for benifit of C++ preprocessors
-
-#if defined(i386)
-unsigned long _exception_code(void);
-int _abnormal_termination(void);
-
-#endif
-
 #define RpcExceptionCode() GetExceptionCode()
 #define RpcAbnormalTermination() AbnormalTermination()
 
 RPC_STATUS RPC_ENTRY
 RpcImpersonateClient (
-    IN RPC_HANDLE CallHandle OPTIONAL
+    IN RPC_BINDING_HANDLE BindingHandle OPTIONAL
     );
 
 RPC_STATUS RPC_ENTRY
 RpcRevertToSelf (
     );
 
+unsigned long RPC_ENTRY
+I_RpcMapWin32Status (
+    IN RPC_STATUS Status
+    );
+
 #endif // __RPC_H__