OK, time to get started on eliminating obj_oleaut.h...
Log:
Ove Kaaven <ovek@transgaming.com>
Moved a couple of definitions from include/wine/obj_oleaut.h to
include/oleauto.h.
Index: include/oleauto.h
===================================================================
RCS file: /home/wine/wine/include/oleauto.h,v
retrieving revision 1.48
diff -u -r1.48 oleauto.h
--- include/oleauto.h 2 Jan 2003 23:13:56 -0000 1.48
+++ include/oleauto.h 4 Jan 2003 14:23:07 -0000
@@ -28,6 +28,8 @@
extern "C" {
#endif
+DEFINE_OLEGUID(IID_StdOle, 0x00020430,0,0);
+
struct tagSAFEARRAY;
struct tagSAFEARRAYBOUND;
struct tagVARIANT;
@@ -632,6 +634,13 @@
/*
* TypeLib API
*/
+
+#define MEMBERID_NIL DISPID_UNKNOWN
+
+#define DISPATCH_METHOD 0x1
+#define DISPATCH_PROPERTYGET 0x2
+#define DISPATCH_PROPERTYPUT 0x4
+#define DISPATCH_PROPERTYPUTREF 0x8
HRESULT WINAPI CreateTypeLib(SYSKIND,const OLECHAR*,ICreateTypeLib**);
HRESULT WINAPI CreateTypeLib2(SYSKIND,LPCOLESTR,ICreateTypeLib2**);
Index: include/wine/obj_oleaut.h
===================================================================
RCS file: /home/wine/wine/include/wine/obj_oleaut.h,v
retrieving revision 1.36
diff -u -r1.36 obj_oleaut.h
--- include/wine/obj_oleaut.h 2 Jan 2003 23:13:56 -0000 1.36
+++ include/wine/obj_oleaut.h 4 Jan 2003 14:23:08 -0000
@@ -21,9 +21,6 @@
#ifndef __WINE_WINE_OBJ_OLEAUT_H
#define __WINE_WINE_OBJ_OLEAUT_H
-
-DEFINE_OLEGUID(IID_StdOle, 0x00020430,0,0);
-
/*****************************************************************************
* Predeclare the interfaces
*/
@@ -215,11 +212,6 @@
typedef DWORD HREFTYPE;
typedef DISPID MEMBERID;
-#define DISPATCH_METHOD 0x1
-#define DISPATCH_PROPERTYGET 0x2
-#define DISPATCH_PROPERTYPUT 0x4
-#define DISPATCH_PROPERTYPUTREF 0x8
-
#define DISPID_UNKNOWN ( -1 )
#define DISPID_VALUE ( 0 )
#define DISPID_PROPERTYPUT ( -3 )
@@ -228,8 +220,6 @@
#define DISPID_CONSTRUCTOR ( -6 )
#define DISPID_DESTRUCTOR ( -7 )
#define DISPID_COLLECT ( -8 )
-
-#define MEMBERID_NIL DISPID_UNKNOWN
#define IMPLTYPEFLAG_FDEFAULT (0x1)
#define IMPLTYPEFLAG_FSOURCE (0x2)
