[RPCRT4]

* Create a main header and move some inclusions to it.
* Remove inclusions and definitions that already exist in the main header.
CORE-7716

svn path=/trunk/; revision=61437

diff --git a/reactos/dll/win32/rpcrt4/cproxy.c b/reactos/dll/win32/rpcrt4/cproxy.c
index 54609b9..bc5fcf0 100644 (file)
--- a/reactos/dll/win32/rpcrt4/cproxy.c
+++ b/reactos/dll/win32/rpcrt4/cproxy.c
@@ -21,27 +21,7 @@
  * TODO: Handle non-i386 architectures
  */
 
  * TODO: Handle non-i386 architectures
  */
 

-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <config.h>
-//#include "wine/port.h"
-
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winerror.h"
-
-#include <objbase.h>
-#include <rpcproxy.h>
-
-#include "cpsf.h"
-//#include "ndr_misc.h"
-//#include "ndr_stubless.h"
-#include <wine/debug.h>
+#include "precomp.h"

 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 

diff --git a/reactos/dll/win32/rpcrt4/cpsf.c b/reactos/dll/win32/rpcrt4/cpsf.c
index fffaeb2..72029a6 100644 (file)
--- a/reactos/dll/win32/rpcrt4/cpsf.c
+++ b/reactos/dll/win32/rpcrt4/cpsf.c
@@ -18,32 +18,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
+#include "precomp.h"

 
 

-#include <config.h>
-//#include "wine/port.h"
-
-#include <stdarg.h>
-//#include <stdio.h>
-//#include <string.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winerror.h"

 #include <winreg.h>
 
 #include <winreg.h>
 

-#include <objbase.h>
-
-#include <rpcproxy.h>
-
-#include <wine/unicode.h>
-#include <wine/debug.h>
-
-#include "cpsf.h"
-

 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
 static void format_clsid( WCHAR *buffer, const CLSID *clsid )
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
 static void format_clsid( WCHAR *buffer, const CLSID *clsid )

diff --git a/reactos/dll/win32/rpcrt4/cstub.c b/reactos/dll/win32/rpcrt4/cstub.c
index 7132221..d3a26d7 100644 (file)
--- a/reactos/dll/win32/rpcrt4/cstub.c
+++ b/reactos/dll/win32/rpcrt4/cstub.c
@@ -19,28 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <config.h>
-//#include "wine/port.h"
-
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winerror.h"
-//#include "excpt.h"
-
-#include <objbase.h>
-#include <rpcproxy.h>
-
-#include <wine/debug.h>
-#include <wine/exception.h>
-
-#include "cpsf.h"
+#include "precomp.h"

 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 

diff --git a/reactos/dll/win32/rpcrt4/epm_towers.h b/reactos/dll/win32/rpcrt4/epm_towers.h
index ba6d413..6208deb 100644 (file)
--- a/reactos/dll/win32/rpcrt4/epm_towers.h
+++ b/reactos/dll/win32/rpcrt4/epm_towers.h
@@ -19,6 +19,8 @@
  *
  */
 
  *
  */
 

+#pragma once
+

 #include <epm_c.h>
 
 #define EPM_PROTOCOL_DNET_NSP          0x04
 #include <epm_c.h>
 
 #define EPM_PROTOCOL_DNET_NSP          0x04

diff --git a/reactos/dll/win32/rpcrt4/ncastatus.h b/reactos/dll/win32/rpcrt4/ncastatus.h
index 0a97002..acf0f64 100644 (file)
--- a/reactos/dll/win32/rpcrt4/ncastatus.h
+++ b/reactos/dll/win32/rpcrt4/ncastatus.h
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

+#pragma once
+

 #define NCA_S_COMM_FAILURE               0x1C010001
 #define NCA_S_OP_RNG_ERROR               0x1C010002
 #define NCA_S_UNK_IF                     0x1C010003
 #define NCA_S_COMM_FAILURE               0x1C010001
 #define NCA_S_OP_RNG_ERROR               0x1C010002
 #define NCA_S_UNK_IF                     0x1C010003

diff --git a/reactos/dll/win32/rpcrt4/ndr_clientserver.c b/reactos/dll/win32/rpcrt4/ndr_clientserver.c
index 8415991..b65b39e 100644 (file)
--- a/reactos/dll/win32/rpcrt4/ndr_clientserver.c
+++ b/reactos/dll/win32/rpcrt4/ndr_clientserver.c
@@ -22,25 +22,7 @@
  *  - check for errors and throw exceptions
  */
 
  *  - check for errors and throw exceptions
  */
 

-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winerror.h"
-
-#include <objbase.h>
-
-//#include "rpcproxy.h"
-
-#include <wine/debug.h>
-
-//#include "ndr_misc.h"
-//#include "rpcndr.h"
+#include "precomp.h"

 
 WINE_DEFAULT_DEBUG_CHANNEL(rpc);
 
 
 WINE_DEFAULT_DEBUG_CHANNEL(rpc);
 

diff --git a/reactos/dll/win32/rpcrt4/ndr_contexthandle.c b/reactos/dll/win32/rpcrt4/ndr_contexthandle.c
index c63e20f..4855be3 100644 (file)
--- a/reactos/dll/win32/rpcrt4/ndr_contexthandle.c
+++ b/reactos/dll/win32/rpcrt4/ndr_contexthandle.c
@@ -19,18 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

-#include "ndr_misc.h"
-#include "rpc_assoc.h"
-//#include "rpcndr.h"
-
-//#include "wine/rpcfc.h"
-
-#include <wine/debug.h>
-//#include "wine/list.h"
-
-#ifdef __REACTOS__
-DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);
-#endif
+#include "precomp.h"

 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 

diff --git a/reactos/dll/win32/rpcrt4/ndr_es.c b/reactos/dll/win32/rpcrt4/ndr_es.c
index 544f945..95a2303 100644 (file)
--- a/reactos/dll/win32/rpcrt4/ndr_es.c
+++ b/reactos/dll/win32/rpcrt4/ndr_es.c
@@ -18,24 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
+#include "precomp.h"

 
 

-#include <stdarg.h>
-//#include <stdio.h>
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winerror.h"
-#include <rpc.h>

 #include <midles.h>
 #include <midles.h>

-//#include "ndrtypes.h"
-
-//#include "ndr_misc.h"
-#include "ndr_stubless.h"
-
-#include <wine/debug.h>
-#include <wine/rpcfc.h>

 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 

diff --git a/reactos/dll/win32/rpcrt4/ndr_fullpointer.c b/reactos/dll/win32/rpcrt4/ndr_fullpointer.c
index eaf0608..941cb29 100644 (file)
--- a/reactos/dll/win32/rpcrt4/ndr_fullpointer.c
+++ b/reactos/dll/win32/rpcrt4/ndr_fullpointer.c
@@ -18,17 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <stdarg.h>
-
-#include <windef.h>
-#include <winbase.h>
-#include <rpc.h>
-#include <rpcndr.h>
-
-#include <wine/debug.h>
+#include "precomp.h"

 
 WINE_DEFAULT_DEBUG_CHANNEL(rpc);
 
 
 WINE_DEFAULT_DEBUG_CHANNEL(rpc);
 

diff --git a/reactos/dll/win32/rpcrt4/ndr_marshall.c b/reactos/dll/win32/rpcrt4/ndr_marshall.c
index 3e58ceb..cff8185 100644 (file)
--- a/reactos/dll/win32/rpcrt4/ndr_marshall.c
+++ b/reactos/dll/win32/rpcrt4/ndr_marshall.c
@@ -27,25 +27,7 @@
  *  - Checks for integer addition overflow in user marshall functions
  */
 
  *  - Checks for integer addition overflow in user marshall functions
  */
 

-#include <assert.h>
-//#include <stdarg.h>
-//#include <stdio.h>
-//#include <string.h>
-//#include <limits.h>
-
-#define NONAMELESSUNION
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winerror.h"
-
-#include "ndr_misc.h"
-//#include "rpcndr.h"
-#include <ndrtypes.h>
-
-#include <wine/unicode.h>
-#include <wine/rpcfc.h>
-
-#include <wine/debug.h>
+#include "precomp.h"

 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 

diff --git a/reactos/dll/win32/rpcrt4/ndr_misc.h b/reactos/dll/win32/rpcrt4/ndr_misc.h
index 1c16cc0..c80afc2 100644 (file)
--- a/reactos/dll/win32/rpcrt4/ndr_misc.h
+++ b/reactos/dll/win32/rpcrt4/ndr_misc.h
@@ -21,16 +21,6 @@
 #ifndef __WINE_NDR_MISC_H
 #define __WINE_NDR_MISC_H
 
 #ifndef __WINE_NDR_MISC_H
 #define __WINE_NDR_MISC_H
 

-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <stdarg.h>
-
-#include <windef.h>
-#include <winbase.h>
-#include <rpc.h>
-#include <rpcndr.h>
-

 struct IPSFactoryBuffer;
 
 PFORMAT_STRING ComputeConformanceOrVariance(
 struct IPSFactoryBuffer;
 
 PFORMAT_STRING ComputeConformanceOrVariance(

diff --git a/reactos/dll/win32/rpcrt4/ndr_ole.c b/reactos/dll/win32/rpcrt4/ndr_ole.c
index d4de1ab..56c8852 100644 (file)
--- a/reactos/dll/win32/rpcrt4/ndr_ole.c
+++ b/reactos/dll/win32/rpcrt4/ndr_ole.c
@@ -22,30 +22,7 @@
  *  - finish RpcStream_Vtbl
  */
 
  *  - finish RpcStream_Vtbl
  */
 

-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <stdarg.h>
-//#include <stdio.h>
-//#include <string.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winerror.h"
-
-#include <objbase.h>
-
-#include "ndr_misc.h"
-//#include "rpcndr.h"
-//#include "rpcproxy.h"
-#include <wine/rpcfc.h>
-//#include "cpsf.h"
-
-#include <wine/debug.h>
+#include "precomp.h"

 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 

diff --git a/reactos/dll/win32/rpcrt4/ndr_stubless.c b/reactos/dll/win32/rpcrt4/ndr_stubless.c
index caabef9..e43ddde 100644 (file)
--- a/reactos/dll/win32/rpcrt4/ndr_stubless.c
+++ b/reactos/dll/win32/rpcrt4/ndr_stubless.c
@@ -23,31 +23,7 @@
  *  - Some types of binding handles
  */
 
  *  - Some types of binding handles
  */
 

-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <config.h>
-//#include "wine/port.h"
-
-//#include <stdarg.h>
-#include <stdio.h>
-//#include <string.h>
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winerror.h"
-
-#include <objbase.h>
-//#include "rpc.h"
-#include <rpcproxy.h>
-
-#include <wine/exception.h>
-#include <wine/debug.h>
-#include <wine/rpcfc.h>
-
-#include "cpsf.h"
-#include "ndr_misc.h"
-#include "ndr_stubless.h"
+#include "precomp.h"

 
 WINE_DEFAULT_DEBUG_CHANNEL(rpc);
 
 
 WINE_DEFAULT_DEBUG_CHANNEL(rpc);
 

diff --git a/reactos/dll/win32/rpcrt4/ndr_stubless.h b/reactos/dll/win32/rpcrt4/ndr_stubless.h
index 92e6813..fe067f5 100644 (file)
--- a/reactos/dll/win32/rpcrt4/ndr_stubless.h
+++ b/reactos/dll/win32/rpcrt4/ndr_stubless.h
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

+#pragma once
+

 #include <ndrtypes.h>
 
 /* there can't be any alignment with the structures in this file */
 #include <ndrtypes.h>
 
 /* there can't be any alignment with the structures in this file */

diff --git a/reactos/dll/win32/rpcrt4/precomp.h b/reactos/dll/win32/rpcrt4/precomp.h
new file mode 100644 (file)
index 0000000..e67f2e4
--- /dev/null
+++ b/reactos/dll/win32/rpcrt4/precomp.h
@@ -0,0 +1,40 @@
+#ifndef _RPCRT4_PCH_
+#define _RPCRT4_PCH_
+
+#include <config.h>
+
+#include <assert.h>
+#include <stdarg.h>
+#include <stdio.h>
+
+#define _INC_WINDOWS
+
+#define COBJMACROS
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
+
+#include <ntstatus.h>
+#define WIN32_NO_STATUS
+#include <windef.h>
+#include <winbase.h>
+#include <winternl.h>
+#include <objbase.h>
+#include <rpcproxy.h>
+#include <security.h>
+
+#include <wine/debug.h>
+#include <wine/exception.h>
+#include <wine/list.h>
+#include <wine/rpcfc.h>
+#include <wine/unicode.h>
+
+#include "cpsf.h"
+#include "ncastatus.h"
+#include "ndr_misc.h"
+#include "ndr_stubless.h"
+#include "rpc_assoc.h"
+#include "rpc_binding.h"
+#include "rpc_message.h"
+#include "rpc_server.h"
+
+#endif /* _RPCRT4_PCH_ */

diff --git a/reactos/dll/win32/rpcrt4/rpc_assoc.c b/reactos/dll/win32/rpcrt4/rpc_assoc.c
index 242de5a..2ef0260 100644 (file)
--- a/reactos/dll/win32/rpcrt4/rpc_assoc.c
+++ b/reactos/dll/win32/rpcrt4/rpc_assoc.c
@@ -19,24 +19,7 @@
  *
  */
 
  *
  */
 

-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <stdarg.h>
-#include <assert.h>
-
-#include <windef.h>
-#include <winbase.h>
-#include <rpc.h>
-//#include "rpcndr.h"
-#include <winternl.h>
-
-#include <wine/unicode.h>
-#include <wine/debug.h>
-
-//#include "rpc_binding.h"
-#include "rpc_assoc.h"
-#include "rpc_message.h"
+#include "precomp.h"

 
 WINE_DEFAULT_DEBUG_CHANNEL(rpc);
 
 
 WINE_DEFAULT_DEBUG_CHANNEL(rpc);
 

diff --git a/reactos/dll/win32/rpcrt4/rpc_assoc.h b/reactos/dll/win32/rpcrt4/rpc_assoc.h
index 6dd7ed1..ddbc274 100644 (file)
--- a/reactos/dll/win32/rpcrt4/rpc_assoc.h
+++ b/reactos/dll/win32/rpcrt4/rpc_assoc.h
@@ -20,7 +20,6 @@
  */
 
 #include "rpc_binding.h"
  */
 
 #include "rpc_binding.h"

-//#include "wine/list.h"

 
 typedef struct _RpcAssoc
 {
 
 typedef struct _RpcAssoc
 {

diff --git a/reactos/dll/win32/rpcrt4/rpc_async.c b/reactos/dll/win32/rpcrt4/rpc_async.c
index eb81b54..d4dbf16 100644 (file)
--- a/reactos/dll/win32/rpcrt4/rpc_async.c
+++ b/reactos/dll/win32/rpcrt4/rpc_async.c
@@ -19,22 +19,7 @@
  *
  */
 
  *
  */
 

-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <stdarg.h>
-
-#include <windef.h>
-#include <winbase.h>
-#include <rpc.h>
-#include <rpcndr.h>
-//#include "rpcasync.h"
-
-#include <wine/debug.h>
-
-//#include "rpc_binding.h"
-//#include "rpc_message.h"
-#include "ndr_stubless.h"
+#include "precomp.h"

 
 WINE_DEFAULT_DEBUG_CHANNEL(rpc);
 
 
 WINE_DEFAULT_DEBUG_CHANNEL(rpc);
 

diff --git a/reactos/dll/win32/rpcrt4/rpc_binding.c b/reactos/dll/win32/rpcrt4/rpc_binding.c
index da78832..9916fad 100644 (file)
--- a/reactos/dll/win32/rpcrt4/rpc_binding.c
+++ b/reactos/dll/win32/rpcrt4/rpc_binding.c
@@ -21,28 +21,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <stdarg.h>
-//#include <stdio.h>
-//#include <string.h>
-//#include <assert.h>
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winnls.h"
-//#include "winerror.h"
-//#include "winternl.h"
-#include <wine/unicode.h>
-
-#include <rpc.h>
-//#include "rpcndr.h"
-
-#include <wine/debug.h>
-
-//#include "rpc_binding.h"
-#include "rpc_assoc.h"
+#include "precomp.h"

 
 WINE_DEFAULT_DEBUG_CHANNEL(rpc);
 
 
 WINE_DEFAULT_DEBUG_CHANNEL(rpc);
 

diff --git a/reactos/dll/win32/rpcrt4/rpc_binding.h b/reactos/dll/win32/rpcrt4/rpc_binding.h
index 74ace91..831ce25 100644 (file)
--- a/reactos/dll/win32/rpcrt4/rpc_binding.h
+++ b/reactos/dll/win32/rpcrt4/rpc_binding.h
@@ -21,12 +21,8 @@
 #ifndef __WINE_RPC_BINDING_H
 #define __WINE_RPC_BINDING_H
 
 #ifndef __WINE_RPC_BINDING_H
 #define __WINE_RPC_BINDING_H
 

-//#include "rpcndr.h"
-#include <security.h>
-#include <wine/list.h>

 #include "rpc_defs.h"
 
 #include "rpc_defs.h"
 

-

 enum secure_packet_direction
 {
   SECURE_PACKET_SEND,
 enum secure_packet_direction
 {
   SECURE_PACKET_SEND,

diff --git a/reactos/dll/win32/rpcrt4/rpc_epmap.c b/reactos/dll/win32/rpcrt4/rpc_epmap.c
index 1b52f0d..07a76b5 100644 (file)
--- a/reactos/dll/win32/rpcrt4/rpc_epmap.c
+++ b/reactos/dll/win32/rpcrt4/rpc_epmap.c
@@ -20,28 +20,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <stdarg.h>
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winerror.h"
-
-#include <rpc.h>
-
-#include <wine/debug.h>
-#include <wine/exception.h>
-
-#include "rpc_binding.h"
-//#include "epm_c.h"
+#include "precomp.h"

 #include "epm_towers.h"
 
 #include "epm_towers.h"
 

-#ifdef __REACTOS__
-DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);
-#endif
-

 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
 /* The "real" RPC portmapper endpoints that I know of are:
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
 /* The "real" RPC portmapper endpoints that I know of are:

diff --git a/reactos/dll/win32/rpcrt4/rpc_message.c b/reactos/dll/win32/rpcrt4/rpc_message.c
index 17a7edc..b3cfe5a 100644 (file)
--- a/reactos/dll/win32/rpcrt4/rpc_message.c
+++ b/reactos/dll/win32/rpcrt4/rpc_message.c
@@ -20,28 +20,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

-#define _INC_WINDOWS
+#include "precomp.h"

 
 

-#include <stdarg.h>
-//#include <stdio.h>
-//#include <string.h>
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winerror.h"

 #include <winuser.h>
 
 #include <winuser.h>
 

-#include <rpc.h>
-//#include "rpcndr.h"
-//#include "rpcdcep.h"
-
-#include <wine/debug.h>
-
-#include "rpc_binding.h"
-//#include "rpc_defs.h"
-#include "rpc_message.h"
-#include "ncastatus.h"
-

 WINE_DEFAULT_DEBUG_CHANNEL(rpc);
 
 /* note: the DCE/RPC spec says the alignment amount should be 4, but
 WINE_DEFAULT_DEBUG_CHANNEL(rpc);
 
 /* note: the DCE/RPC spec says the alignment amount should be 4, but

diff --git a/reactos/dll/win32/rpcrt4/rpc_message.h b/reactos/dll/win32/rpcrt4/rpc_message.h
index 119b4a0..30065dd 100644 (file)
--- a/reactos/dll/win32/rpcrt4/rpc_message.h
+++ b/reactos/dll/win32/rpcrt4/rpc_message.h
@@ -21,8 +21,6 @@
 #ifndef __WINE_RPC_MESSAGE_H
 #define __WINE_RPC_MESSAGE_H
 
 #ifndef __WINE_RPC_MESSAGE_H
 #define __WINE_RPC_MESSAGE_H
 

-//#include "rpc_defs.h"
-

 typedef unsigned int NCA_STATUS;
 
 RpcPktHdr *RPCRT4_BuildFaultHeader(ULONG DataRepresentation, RPC_STATUS Status) DECLSPEC_HIDDEN;
 typedef unsigned int NCA_STATUS;
 
 RpcPktHdr *RPCRT4_BuildFaultHeader(ULONG DataRepresentation, RPC_STATUS Status) DECLSPEC_HIDDEN;

diff --git a/reactos/dll/win32/rpcrt4/rpc_server.c b/reactos/dll/win32/rpcrt4/rpc_server.c
index 59c1653..436a014 100644 (file)
--- a/reactos/dll/win32/rpcrt4/rpc_server.c
+++ b/reactos/dll/win32/rpcrt4/rpc_server.c
@@ -20,32 +20,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

-#define _INC_WINDOWS
+#include "precomp.h"

 
 

-#include <config.h>
-//#include "wine/port.h"
-
-#include <stdarg.h>
-//#include <stdio.h>
-//#include <string.h>
-#include <assert.h>
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winerror.h"
-
-#include <rpc.h>
-//#include "rpcndr.h"
-//#include "excpt.h"
-
-#include <wine/debug.h>
-#include <wine/exception.h>
-
-#include "rpc_server.h"
-#include "rpc_assoc.h"
-#include "rpc_message.h"
-//#include "rpc_defs.h"
-#include "ncastatus.h"

 #include <secext.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(rpc);
 #include <secext.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(rpc);

diff --git a/reactos/dll/win32/rpcrt4/rpc_server.h b/reactos/dll/win32/rpcrt4/rpc_server.h
index 4cf5439..04f32df 100644 (file)
--- a/reactos/dll/win32/rpcrt4/rpc_server.h
+++ b/reactos/dll/win32/rpcrt4/rpc_server.h
@@ -22,7 +22,6 @@
 #define __WINE_RPC_SERVER_H
 
 #include "rpc_binding.h"
 #define __WINE_RPC_SERVER_H
 
 #include "rpc_binding.h"

-//#include "wine/list.h"

 
 struct protseq_ops;
 
 
 struct protseq_ops;
 

diff --git a/reactos/dll/win32/rpcrt4/rpc_transport.c b/reactos/dll/win32/rpcrt4/rpc_transport.c
index 01a64bf..e48b1cd 100644 (file)
--- a/reactos/dll/win32/rpcrt4/rpc_transport.c
+++ b/reactos/dll/win32/rpcrt4/rpc_transport.c
@@ -23,20 +23,7 @@
  *
  */
 
  *
  */
 

-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <config.h>
-
-//#include <stdarg.h>
-#include <stdio.h>
-//#include <string.h>
-#include <assert.h>
-//#include <stdlib.h>
-//#include <sys/types.h>
-
-#include <windef.h>
-#include <winbase.h>
+#include "precomp.h"

 
 #if defined(__MINGW32__) || defined (_MSC_VER)
 # include <ws2tcpip.h>
 
 #if defined(__MINGW32__) || defined (_MSC_VER)
 # include <ws2tcpip.h>


@@ -82,21 +69,8 @@
 # define ioctlsocket ioctl
 #endif /* defined(__MINGW32__) || defined (_MSC_VER) */
 
 # define ioctlsocket ioctl
 #endif /* defined(__MINGW32__) || defined (_MSC_VER) */
 

-//#include "winnls.h"
-//#include "winerror.h"

 #include <wininet.h>
 #include <wininet.h>

-#include <winternl.h>
-#include <wine/unicode.h>
-
-#include <rpc.h>
-//#include "rpcndr.h"
-
-#include <wine/debug.h>

 
 

-//#include "rpc_binding.h"
-#include "rpc_assoc.h"
-#include "rpc_message.h"
-#include "rpc_server.h"

 #include "epm_towers.h"
 
 #ifndef SOL_TCP
 #include "epm_towers.h"
 
 #ifndef SOL_TCP

diff --git a/reactos/dll/win32/rpcrt4/rpcrt4_main.c b/reactos/dll/win32/rpcrt4/rpcrt4_main.c
index f00e123..1b0d79f 100644 (file)
--- a/reactos/dll/win32/rpcrt4/rpcrt4_main.c
+++ b/reactos/dll/win32/rpcrt4/rpcrt4_main.c
@@ -28,36 +28,10 @@
  *   NT-based native rpcrt4's.  Commonly-used transport for self-to-self RPC's.
  */
 
  *   NT-based native rpcrt4's.  Commonly-used transport for self-to-self RPC's.
  */
 

-#include <config.h>
-
-#include <stdarg.h>
-#include <stdio.h>
-//#include <stdlib.h>
-//#include <string.h>
-
-#include "ntstatus.h"
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#include <windef.h>
-//#include "winerror.h"
-#include <winbase.h>
-//#include "winuser.h"
-//#include "winnt.h"
-#include <winternl.h>
+#include "precomp.h"
+

 #include <ntsecapi.h>
 #include <ntsecapi.h>

-//#include "iptypes.h"

 #include <iphlpapi.h>
 #include <iphlpapi.h>

-#include <wine/unicode.h>
-#include <rpc.h>
-
-//#include "ole2.h"
-//#include "rpcndr.h"
-//#include "rpcproxy.h"
-
-//#include "rpc_binding.h"
-#include "rpc_server.h"
-
-#include <wine/debug.h>

 
 WINE_DEFAULT_DEBUG_CHANNEL(rpc);
 
 
 WINE_DEFAULT_DEBUG_CHANNEL(rpc);