[dcom 4] More header file stuff

[Mike Hearn]

Ensure the header files work with upcoming DCOM patches

Index: include/rpcdce.h
===================================================================
RCS file: /home/wine/wine/include/rpcdce.h,v
retrieving revision 1.20
diff -u -r1.20 rpcdce.h
--- include/rpcdce.h	5 Sep 2003 23:15:44 -0000	1.20
+++ include/rpcdce.h	21 Sep 2003 16:20:26 -0000
@@ -19,6 +19,23 @@
 #ifndef __WINE_RPCDCE_H
 #define __WINE_RPCDCE_H
 
+#include "windef.h"
+
+/* avoid delving into windows.h ifndef __WINESRC__; this
+   would pull in rpcndr.h, which needs rpcdcep.h, which
+   needs us, in turn, causing a compile failure */
+#ifndef RPC_NO_WINDOWS_H
+#define __NO_HAD_RPC_NO_WINDOWS_H
+#define RPC_NO_WINDOWS_H
+#endif
+
+#include "rpc.h"
+
+#ifdef __NO_HAD_RPC_NO_WINDOWS_H
+#undef RPC_NO_WINDOWS_H
+#undef __NO_HAD_RPC_NO_WINDOWS_H
+#endif
+
 #ifndef GUID_DEFINED
 #include <guiddef.h>
 #endif
Index: include/rpcproxy.h
===================================================================
RCS file: /home/wine/wine/include/rpcproxy.h,v
retrieving revision 1.11
diff -u -r1.11 rpcproxy.h
--- include/rpcproxy.h	5 Sep 2003 23:15:44 -0000	1.11
+++ include/rpcproxy.h	21 Sep 2003 16:20:27 -0000
@@ -24,10 +24,14 @@
 #ifndef __WINE_RPCPROXY_H
 #define __WINE_RPCPROXY_H
 
-#include <basetsd.h>
-#include <guiddef.h>
-#include <rpc.h>
-#include <rpcndr.h>
+#include "wtypes.h"
+#include "basetsd.h"
+#include "guiddef.h"
+#include "winnt.h"
+#include "rpc.h"
+#include "rpcndr.h"
+#include "objbase.h"
+#include "objidl.h"
 
 typedef struct tagCInterfaceStubVtbl *PCInterfaceStubVtblList;
 typedef struct tagCInterfaceProxyVtbl *PCInterfaceProxyVtblList;