Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-04 08:25:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

[RPCRT4]

Browse source 
* 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
This commit is contained in:
Amine Khaldi 2013-12-27 10:14:26 +00:00
parent f1eecf0db2
commit e80431a135
27 changed files with 64 additions and 384 deletions
Download patch file Download diff file Expand all files Collapse all files

22
reactos/dll/win32/rpcrt4/cproxy.c
View file

@ -21,27 +21,7 @@
* TODO: Handle non-i386 architectures * TODO: Handle non-i386 architectures
*/ */
#define WIN32_NO_STATUS #include "precomp.h"
#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>
WINE_DEFAULT_DEBUG_CHANNEL(ole); WINE_DEFAULT_DEBUG_CHANNEL(ole);

24
reactos/dll/win32/rpcrt4/cpsf.c
View file

@ -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 #include "precomp.h"
#define _INC_WINDOWS
#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); WINE_DEFAULT_DEBUG_CHANNEL(ole);
static void format_clsid( WCHAR *buffer, const CLSID *clsid ) static void format_clsid( WCHAR *buffer, const CLSID *clsid )

23
reactos/dll/win32/rpcrt4/cstub.c
View file

@ -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 #include "precomp.h"
#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"
WINE_DEFAULT_DEBUG_CHANNEL(ole); WINE_DEFAULT_DEBUG_CHANNEL(ole);

2
reactos/dll/win32/rpcrt4/epm_towers.h
View file

@ -19,6 +19,8 @@
* *
*/ */
#pragma once
#include <epm_c.h> #include <epm_c.h>
#define EPM_PROTOCOL_DNET_NSP 0x04 #define EPM_PROTOCOL_DNET_NSP 0x04

2
reactos/dll/win32/rpcrt4/ncastatus.h
View file

@ -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_COMM_FAILURE 0x1C010001
#define NCA_S_OP_RNG_ERROR 0x1C010002 #define NCA_S_OP_RNG_ERROR 0x1C010002
#define NCA_S_UNK_IF 0x1C010003 #define NCA_S_UNK_IF 0x1C010003

20
reactos/dll/win32/rpcrt4/ndr_clientserver.c
View file

@ -22,25 +22,7 @@
* - check for errors and throw exceptions * - check for errors and throw exceptions
*/ */
#define WIN32_NO_STATUS #include "precomp.h"
#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"
WINE_DEFAULT_DEBUG_CHANNEL(rpc); WINE_DEFAULT_DEBUG_CHANNEL(rpc);

13
reactos/dll/win32/rpcrt4/ndr_contexthandle.c
View file

@ -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 "precomp.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
WINE_DEFAULT_DEBUG_CHANNEL(ole); WINE_DEFAULT_DEBUG_CHANNEL(ole);

17
reactos/dll/win32/rpcrt4/ndr_es.c
View file

@ -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 #include "precomp.h"
#define _INC_WINDOWS
#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);

12
reactos/dll/win32/rpcrt4/ndr_fullpointer.c
View file

@ -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 #include "precomp.h"
#define _INC_WINDOWS
#include <stdarg.h>
#include <windef.h>
#include <winbase.h>
#include <rpc.h>
#include <rpcndr.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(rpc); WINE_DEFAULT_DEBUG_CHANNEL(rpc);

20
reactos/dll/win32/rpcrt4/ndr_marshall.c
View file

@ -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 "precomp.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>
WINE_DEFAULT_DEBUG_CHANNEL(ole); WINE_DEFAULT_DEBUG_CHANNEL(ole);

10
reactos/dll/win32/rpcrt4/ndr_misc.h
View file

@ -21,16 +21,6 @@
#ifndef __WINE_NDR_MISC_H #ifndef __WINE_NDR_MISC_H
#define __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; struct IPSFactoryBuffer;
PFORMAT_STRING ComputeConformanceOrVariance( PFORMAT_STRING ComputeConformanceOrVariance(

25
reactos/dll/win32/rpcrt4/ndr_ole.c
View file

@ -22,30 +22,7 @@
* - finish RpcStream_Vtbl * - finish RpcStream_Vtbl
*/ */
#define WIN32_NO_STATUS #include "precomp.h"
#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>
WINE_DEFAULT_DEBUG_CHANNEL(ole); WINE_DEFAULT_DEBUG_CHANNEL(ole);

26
reactos/dll/win32/rpcrt4/ndr_stubless.c
View file

@ -23,31 +23,7 @@
* - Some types of binding handles * - Some types of binding handles
*/ */
#define WIN32_NO_STATUS #include "precomp.h"
#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"
WINE_DEFAULT_DEBUG_CHANNEL(rpc); WINE_DEFAULT_DEBUG_CHANNEL(rpc);

2
reactos/dll/win32/rpcrt4/ndr_stubless.h
View file

@ -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> #include <ndrtypes.h>
/* there can't be any alignment with the structures in this file */ /* there can't be any alignment with the structures in this file */

40
reactos/dll/win32/rpcrt4/precomp.h Normal file
View file

@ -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_ */

19
reactos/dll/win32/rpcrt4/rpc_assoc.c
View file

@ -19,24 +19,7 @@
* *
*/ */
#define WIN32_NO_STATUS #include "precomp.h"
#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"
WINE_DEFAULT_DEBUG_CHANNEL(rpc); WINE_DEFAULT_DEBUG_CHANNEL(rpc);

1
reactos/dll/win32/rpcrt4/rpc_assoc.h
View file

@ -20,7 +20,6 @@
*/ */
#include "rpc_binding.h" #include "rpc_binding.h"
//#include "wine/list.h"
typedef struct _RpcAssoc typedef struct _RpcAssoc
{ {

17
reactos/dll/win32/rpcrt4/rpc_async.c
View file

@ -19,22 +19,7 @@
* *
*/ */
#define WIN32_NO_STATUS #include "precomp.h"
#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"
WINE_DEFAULT_DEBUG_CHANNEL(rpc); WINE_DEFAULT_DEBUG_CHANNEL(rpc);

23
reactos/dll/win32/rpcrt4/rpc_binding.c
View file

@ -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 #include "precomp.h"
#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"
WINE_DEFAULT_DEBUG_CHANNEL(rpc); WINE_DEFAULT_DEBUG_CHANNEL(rpc);

4
reactos/dll/win32/rpcrt4/rpc_binding.h
View file

@ -21,12 +21,8 @@
#ifndef __WINE_RPC_BINDING_H #ifndef __WINE_RPC_BINDING_H
#define __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 enum secure_packet_direction
{ {
SECURE_PACKET_SEND, SECURE_PACKET_SEND,

21
reactos/dll/win32/rpcrt4/rpc_epmap.c
View file

@ -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 #include "precomp.h"
#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 "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); WINE_DEFAULT_DEBUG_CHANNEL(ole);
/* The "real" RPC portmapper endpoints that I know of are: /* The "real" RPC portmapper endpoints that I know of are:

20
reactos/dll/win32/rpcrt4/rpc_message.c
View file

@ -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); WINE_DEFAULT_DEBUG_CHANNEL(rpc);
/* note: the DCE/RPC spec says the alignment amount should be 4, but /* note: the DCE/RPC spec says the alignment amount should be 4, but

2
reactos/dll/win32/rpcrt4/rpc_message.h
View file

@ -21,8 +21,6 @@
#ifndef __WINE_RPC_MESSAGE_H #ifndef __WINE_RPC_MESSAGE_H
#define __WINE_RPC_MESSAGE_H #define __WINE_RPC_MESSAGE_H
//#include "rpc_defs.h"
typedef unsigned int NCA_STATUS; typedef unsigned int NCA_STATUS;
RpcPktHdr *RPCRT4_BuildFaultHeader(ULONG DataRepresentation, RPC_STATUS Status) DECLSPEC_HIDDEN; RpcPktHdr *RPCRT4_BuildFaultHeader(ULONG DataRepresentation, RPC_STATUS Status) DECLSPEC_HIDDEN;

26
reactos/dll/win32/rpcrt4/rpc_server.c
View file

@ -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> #include <secext.h>
WINE_DEFAULT_DEBUG_CHANNEL(rpc); WINE_DEFAULT_DEBUG_CHANNEL(rpc);

1
reactos/dll/win32/rpcrt4/rpc_server.h
View file

@ -22,7 +22,6 @@
#define __WINE_RPC_SERVER_H #define __WINE_RPC_SERVER_H
#include "rpc_binding.h" #include "rpc_binding.h"
//#include "wine/list.h"
struct protseq_ops; struct protseq_ops;

28
reactos/dll/win32/rpcrt4/rpc_transport.c
View file

@ -23,20 +23,7 @@
* *
*/ */
#define WIN32_NO_STATUS #include "precomp.h"
#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>
#if defined(__MINGW32__) || defined (_MSC_VER) #if defined(__MINGW32__) || defined (_MSC_VER)
# include <ws2tcpip.h> # include <ws2tcpip.h>
@ -82,21 +69,8 @@
# define ioctlsocket ioctl # define ioctlsocket ioctl
#endif /* defined(__MINGW32__) || defined (_MSC_VER) */ #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" #include "epm_towers.h"
#ifndef SOL_TCP #ifndef SOL_TCP

28
reactos/dll/win32/rpcrt4/rpcrt4_main.c
View file

@ -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 "precomp.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 <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);