From 008f4ce91a4b08388ecba3234cfea7a36221ce93 Mon Sep 17 00:00:00 2001
From: Ove Kaaven <ovek@transgaming.com>
Date: Sun, 5 Jan 2003 01:05:45 +0000
Subject: [PATCH] Moved a couple of definitions from include/wine/obj_oleaut.h
 to include/oleauto.h.

---
 include/oleauto.h         |  9 +++++++++
 include/wine/obj_oleaut.h | 10 ----------
 ole/dxguid.c              |  1 +
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/include/oleauto.h b/include/oleauto.h
index 2fe0349058a..61a34f3daae 100644
--- a/include/oleauto.h
+++ b/include/oleauto.h
@@ -28,6 +28,8 @@
 extern "C" {
 #endif
 
+DEFINE_OLEGUID(IID_StdOle, 0x00020430,0,0);
+
 struct tagSAFEARRAY;
 struct tagSAFEARRAYBOUND;
 struct tagVARIANT;
@@ -633,6 +635,13 @@ HRESULT WINAPI GetActiveObject(REFCLSID, void*, IUnknown**);
  * 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**);
 HRESULT WINAPI LoadRegTypeLib(REFGUID,WORD,WORD,LCID,ITypeLib**);
diff --git a/include/wine/obj_oleaut.h b/include/wine/obj_oleaut.h
index 421a887c098..ff3a82728ae 100644
--- a/include/wine/obj_oleaut.h
+++ b/include/wine/obj_oleaut.h
@@ -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 LONG DISPID;
 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 )
@@ -229,8 +221,6 @@ typedef DISPID MEMBERID;
 #define DISPID_DESTRUCTOR ( -7 )
 #define DISPID_COLLECT  ( -8 )
 
-#define MEMBERID_NIL DISPID_UNKNOWN
-
 #define IMPLTYPEFLAG_FDEFAULT         (0x1)
 #define IMPLTYPEFLAG_FSOURCE          (0x2)
 #define IMPLTYPEFLAG_FRESTRICTED      (0x4)
diff --git a/ole/dxguid.c b/ole/dxguid.c
index fb6e9789ad8..4bbb637c55e 100644
--- a/ole/dxguid.c
+++ b/ole/dxguid.c
@@ -26,6 +26,7 @@
 #include "winuser.h"
 
 #include "objbase.h"
+#include "oleauto.h"
 #include "olectl.h"
 #include "initguid.h"