diff --git a/reactos/dll/win32/rpcrt4/cproxy.c b/reactos/dll/win32/rpcrt4/cproxy.c index 54609b9954e..bc5fcf008cf 100644 --- a/reactos/dll/win32/rpcrt4/cproxy.c +++ b/reactos/dll/win32/rpcrt4/cproxy.c @@ -21,27 +21,7 @@ * TODO: Handle non-i386 architectures */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include -//#include "wine/port.h" - -#include - -#define COBJMACROS - -#include -#include -//#include "winerror.h" - -#include -#include - -#include "cpsf.h" -//#include "ndr_misc.h" -//#include "ndr_stubless.h" -#include +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); diff --git a/reactos/dll/win32/rpcrt4/cpsf.c b/reactos/dll/win32/rpcrt4/cpsf.c index fffaeb2fa07..72029a66889 100644 --- 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 */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS +#include "precomp.h" -#include -//#include "wine/port.h" - -#include -//#include -//#include - -#define COBJMACROS - -#include -#include -//#include "winerror.h" #include -#include - -#include - -#include -#include - -#include "cpsf.h" - 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 7132221f51c..d3a26d73c93 100644 --- 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 */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include -//#include "wine/port.h" - -#include - -#define COBJMACROS - -#include -#include -//#include "winerror.h" -//#include "excpt.h" - -#include -#include - -#include -#include - -#include "cpsf.h" +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); diff --git a/reactos/dll/win32/rpcrt4/epm_towers.h b/reactos/dll/win32/rpcrt4/epm_towers.h index ba6d413986b..6208deb5f1f 100644 --- a/reactos/dll/win32/rpcrt4/epm_towers.h +++ b/reactos/dll/win32/rpcrt4/epm_towers.h @@ -19,6 +19,8 @@ * */ +#pragma once + #include #define EPM_PROTOCOL_DNET_NSP 0x04 diff --git a/reactos/dll/win32/rpcrt4/ncastatus.h b/reactos/dll/win32/rpcrt4/ncastatus.h index 0a9700268e2..acf0f64c08b 100644 --- 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 */ +#pragma once + #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 84159912c90..b65b39ec31e 100644 --- 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 */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include - -#define COBJMACROS - -#include -#include -//#include "winerror.h" - -#include - -//#include "rpcproxy.h" - -#include - -//#include "ndr_misc.h" -//#include "rpcndr.h" +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(rpc); diff --git a/reactos/dll/win32/rpcrt4/ndr_contexthandle.c b/reactos/dll/win32/rpcrt4/ndr_contexthandle.c index c63e20fbafc..4855be3b100 100644 --- 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 */ -#include "ndr_misc.h" -#include "rpc_assoc.h" -//#include "rpcndr.h" - -//#include "wine/rpcfc.h" - -#include -//#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); diff --git a/reactos/dll/win32/rpcrt4/ndr_es.c b/reactos/dll/win32/rpcrt4/ndr_es.c index 544f945ba84..95a230349be 100644 --- 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 */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS +#include "precomp.h" -#include -//#include - -#include -#include -//#include "winerror.h" -#include #include -//#include "ndrtypes.h" - -//#include "ndr_misc.h" -#include "ndr_stubless.h" - -#include -#include WINE_DEFAULT_DEBUG_CHANNEL(ole); diff --git a/reactos/dll/win32/rpcrt4/ndr_fullpointer.c b/reactos/dll/win32/rpcrt4/ndr_fullpointer.c index eaf0608c886..941cb29dc9b 100644 --- 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 */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include - -#include -#include -#include -#include - -#include +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(rpc); diff --git a/reactos/dll/win32/rpcrt4/ndr_marshall.c b/reactos/dll/win32/rpcrt4/ndr_marshall.c index 3e58ceb8e70..cff81857284 100644 --- 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 */ -#include -//#include -//#include -//#include -//#include - -#define NONAMELESSUNION -//#include "windef.h" -//#include "winbase.h" -//#include "winerror.h" - -#include "ndr_misc.h" -//#include "rpcndr.h" -#include - -#include -#include - -#include +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); diff --git a/reactos/dll/win32/rpcrt4/ndr_misc.h b/reactos/dll/win32/rpcrt4/ndr_misc.h index 1c16cc0ec44..c80afc29f0b 100644 --- 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 -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include - -#include -#include -#include -#include - struct IPSFactoryBuffer; PFORMAT_STRING ComputeConformanceOrVariance( diff --git a/reactos/dll/win32/rpcrt4/ndr_ole.c b/reactos/dll/win32/rpcrt4/ndr_ole.c index d4de1ab8a53..56c8852cec9 100644 --- a/reactos/dll/win32/rpcrt4/ndr_ole.c +++ b/reactos/dll/win32/rpcrt4/ndr_ole.c @@ -22,30 +22,7 @@ * - finish RpcStream_Vtbl */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include -//#include -//#include - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#include -#include -//#include "winerror.h" - -#include - -#include "ndr_misc.h" -//#include "rpcndr.h" -//#include "rpcproxy.h" -#include -//#include "cpsf.h" - -#include +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); diff --git a/reactos/dll/win32/rpcrt4/ndr_stubless.c b/reactos/dll/win32/rpcrt4/ndr_stubless.c index caabef9ea08..e43ddde805b 100644 --- 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 */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include -//#include "wine/port.h" - -//#include -#include -//#include - -#include -#include -//#include "winerror.h" - -#include -//#include "rpc.h" -#include - -#include -#include -#include - -#include "cpsf.h" -#include "ndr_misc.h" -#include "ndr_stubless.h" +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(rpc); diff --git a/reactos/dll/win32/rpcrt4/ndr_stubless.h b/reactos/dll/win32/rpcrt4/ndr_stubless.h index 92e68137708..fe067f51776 100644 --- 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 */ +#pragma once + #include /* 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 index 00000000000..e67f2e44be5 --- /dev/null +++ b/reactos/dll/win32/rpcrt4/precomp.h @@ -0,0 +1,40 @@ +#ifndef _RPCRT4_PCH_ +#define _RPCRT4_PCH_ + +#include + +#include +#include +#include + +#define _INC_WINDOWS + +#define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include +#define WIN32_NO_STATUS +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include + +#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 242de5a8b52..2ef0260cfa0 100644 --- 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 -#include - -#include -#include -#include -//#include "rpcndr.h" -#include - -#include -#include - -//#include "rpc_binding.h" -#include "rpc_assoc.h" -#include "rpc_message.h" +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(rpc); diff --git a/reactos/dll/win32/rpcrt4/rpc_assoc.h b/reactos/dll/win32/rpcrt4/rpc_assoc.h index 6dd7ed173e6..ddbc27428bb 100644 --- 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 "wine/list.h" typedef struct _RpcAssoc { diff --git a/reactos/dll/win32/rpcrt4/rpc_async.c b/reactos/dll/win32/rpcrt4/rpc_async.c index eb81b54468c..d4dbf163dc0 100644 --- 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 - -#include -#include -#include -#include -//#include "rpcasync.h" - -#include - -//#include "rpc_binding.h" -//#include "rpc_message.h" -#include "ndr_stubless.h" +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(rpc); diff --git a/reactos/dll/win32/rpcrt4/rpc_binding.c b/reactos/dll/win32/rpcrt4/rpc_binding.c index da78832682e..9916fad47d6 100644 --- 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 */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include -//#include -//#include -//#include - -#include -#include -//#include "winnls.h" -//#include "winerror.h" -//#include "winternl.h" -#include - -#include -//#include "rpcndr.h" - -#include - -//#include "rpc_binding.h" -#include "rpc_assoc.h" +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(rpc); diff --git a/reactos/dll/win32/rpcrt4/rpc_binding.h b/reactos/dll/win32/rpcrt4/rpc_binding.h index 74ace91489b..831ce25ed9e 100644 --- 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 -//#include "rpcndr.h" -#include -#include #include "rpc_defs.h" - 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 1b52f0d17ac..07a76b5bbbf 100644 --- 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 */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include - -#include -#include -//#include "winerror.h" - -#include - -#include -#include - -#include "rpc_binding.h" -//#include "epm_c.h" +#include "precomp.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: diff --git a/reactos/dll/win32/rpcrt4/rpc_message.c b/reactos/dll/win32/rpcrt4/rpc_message.c index 17a7edc6a0b..b3cfe5a4cdc 100644 --- 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 */ -#define _INC_WINDOWS +#include "precomp.h" -#include -//#include -//#include - -#include -#include -//#include "winerror.h" #include -#include -//#include "rpcndr.h" -//#include "rpcdcep.h" - -#include - -#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 diff --git a/reactos/dll/win32/rpcrt4/rpc_message.h b/reactos/dll/win32/rpcrt4/rpc_message.h index 119b4a0fcd8..30065ddd025 100644 --- 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 -//#include "rpc_defs.h" - 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 59c16531365..436a014ea01 100644 --- 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 */ -#define _INC_WINDOWS +#include "precomp.h" -#include -//#include "wine/port.h" - -#include -//#include -//#include -#include - -#include -#include -//#include "winerror.h" - -#include -//#include "rpcndr.h" -//#include "excpt.h" - -#include -#include - -#include "rpc_server.h" -#include "rpc_assoc.h" -#include "rpc_message.h" -//#include "rpc_defs.h" -#include "ncastatus.h" #include WINE_DEFAULT_DEBUG_CHANNEL(rpc); diff --git a/reactos/dll/win32/rpcrt4/rpc_server.h b/reactos/dll/win32/rpcrt4/rpc_server.h index 4cf5439f361..04f32dff019 100644 --- 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" -//#include "wine/list.h" struct protseq_ops; diff --git a/reactos/dll/win32/rpcrt4/rpc_transport.c b/reactos/dll/win32/rpcrt4/rpc_transport.c index 01a64bf0c20..e48b1cd168e 100644 --- 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 - -//#include -#include -//#include -#include -//#include -//#include - -#include -#include +#include "precomp.h" #if defined(__MINGW32__) || defined (_MSC_VER) # include @@ -82,21 +69,8 @@ # define ioctlsocket ioctl #endif /* defined(__MINGW32__) || defined (_MSC_VER) */ -//#include "winnls.h" -//#include "winerror.h" #include -#include -#include -#include -//#include "rpcndr.h" - -#include - -//#include "rpc_binding.h" -#include "rpc_assoc.h" -#include "rpc_message.h" -#include "rpc_server.h" #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 f00e123c5c4..1b0d79f3622 100644 --- 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. */ -#include +#include "precomp.h" -#include -#include -//#include -//#include - -#include "ntstatus.h" -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#include -//#include "winerror.h" -#include -//#include "winuser.h" -//#include "winnt.h" -#include #include -//#include "iptypes.h" #include -#include -#include - -//#include "ole2.h" -//#include "rpcndr.h" -//#include "rpcproxy.h" - -//#include "rpc_binding.h" -#include "rpc_server.h" - -#include WINE_DEFAULT_DEBUG_CHANNEL(rpc);