[dcom 3] header file updates

[Mike Hearn]

Ove Kaaven <ovehk at ping.uio.no>
Extra includes in rpcproxy.h, some WIDL ifdefs


Index: include/objidl.idl
===================================================================
RCS file: /home/wine/wine/include/objidl.idl,v
retrieving revision 1.4
diff -u -r1.4 objidl.idl
--- include/objidl.idl	11 Jul 2003 03:52:58 -0000	1.4
+++ include/objidl.idl	12 Sep 2003 17:45:47 -0000
@@ -19,7 +19,9 @@
 import "unknwn.idl";
 
 interface IStream;
+#ifdef __WIDL__
 interface IStream16;
+#endif
 interface IEnumString;
 interface IRunningObjectTable;
 interface IMoniker;
@@ -809,7 +811,9 @@
     [out] IStream **ppstm);
 }
 
+#ifdef __WIDL__
 [
+  local,
   object,
   pointer_default(unique)
 ]
@@ -882,6 +886,7 @@
   HRESULT Clone(
     [out] IStream16 **ppstm);
 }
+#endif /* __WIDL__ */
 
 [
   object,
@@ -1029,7 +1034,9 @@
     [in] DWORD grfStatFlag);
 }
 
+#ifdef __WIDL__
 [
+  local,
   object,
   pointer_default(unique)
 ]
@@ -1141,6 +1148,7 @@
     [out] STATSTG *pstatstg,
     [in] DWORD grfStatFlag);
 }
+#endif /* __WIDL__ */
 
 [
   object,
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	12 Sep 2003 17:45:49 -0000
@@ -24,10 +24,13 @@
 #ifndef __WINE_RPCPROXY_H
 #define __WINE_RPCPROXY_H
 
+#include <wtypes.h>
 #include <basetsd.h>
 #include <guiddef.h>
 #include <rpc.h>
 #include <rpcndr.h>
+#include <objbase.h>
+#include <objidl.h>
 
 typedef struct tagCInterfaceStubVtbl *PCInterfaceStubVtblList;
 typedef struct tagCInterfaceProxyVtbl *PCInterfaceProxyVtblList;