Changeset 21493 for trunk/include/win/wine

Timestamp:

Dec 2, 2010, 1:18:49 AM (15 years ago)

Author:

dmik

Message:

Fixed broken build after r21492 by sorting out a huuuuge wagon of duplicates, wrong include order and other dirty mess.

Location:

trunk/include/win/wine

Files:

• obj_base.h (modified) (3 diffs)
• obj_oleobj.h (modified) (9 diffs)

trunk/include/win/wine/obj_base.h

@@ -3 +3 @@
  * and the three most basic COM interfaces: IUnknown, IMalloc and IClassFactory.
  */
+
+#ifndef RC_INVOKED
+#include "rpc.h"
+#include "rpcndr.h"
+#endif
 
 #ifndef __WINE_WINE_OBJ_BASE_H
@@ -30 +35 @@
 #include <string.h>
 #endif
+
 #include "wtypes.h"
-
 
 #define LISet32(li, v)   ((li).HighPart = (v) < 0 ? -1 : 0, (li).LowPart = (v))
 #define ULISet32(li, v)  ((li).HighPart = 0, (li).LowPart = (v))
-
-/*****************************************************************************
- * Macros to declare the GUIDs
- */
-#ifdef INITGUID
-#define DEFINE_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
-        extern const GUID name = \
-        { l, w1, w2, { b1, b2,  b3,  b4,  b5,  b6,  b7,  b8 } }
-#else
-#define DEFINE_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
-    extern const GUID name
-#endif
-
-#define DEFINE_OLEGUID(name, l, w1, w2) \
-        DEFINE_GUID(name, l, w1, w2, 0xC0,0,0,0,0,0,0,0x46)
-
-#define DEFINE_SHLGUID(name, l, w1, w2) DEFINE_OLEGUID(name,l,w1,w2)
-
-
-/*****************************************************************************
- * GUID API
- */
-HRESULT WINAPI StringFromCLSID16(REFCLSID id, LPOLESTR16*);
-HRESULT WINAPI StringFromCLSID(REFCLSID id, LPOLESTR*);
-
-HRESULT WINAPI CLSIDFromString16(LPCOLESTR16, CLSID *);
-HRESULT WINAPI CLSIDFromString(LPCOLESTR, CLSID *);
-HRESULT WINAPI CLSIDFromStringA(LPCSTR, CLSID *);
-
-HRESULT WINAPI CLSIDFromProgID16(LPCOLESTR16 progid, LPCLSID riid);
-HRESULT WINAPI CLSIDFromProgID(LPCOLESTR progid, LPCLSID riid);
-
-HRESULT WINAPI ProgIDFromCLSID(REFCLSID clsid, LPOLESTR *lplpszProgID);
-
-INT WINAPI StringFromGUID2(REFGUID id, LPOLESTR str, INT cmax);
-
-BOOL16 WINAPI IsEqualGUID16(GUID* g1,GUID* g2);
-BOOL WINAPI IsEqualGUID32(REFGUID rguid1,REFGUID rguid2);
-/*#define IsEqualGUID WINELIB_NAME(IsEqualGUID)*/
-#if defined(__cplusplus) && !defined(CINTERFACE)
-#define IsEqualGUID(rguid1, rguid2) (!memcmp(&(rguid1), &(rguid2), sizeof(GUID)))
-#else /* defined(__cplusplus) && !defined(CINTERFACE) */
-#define IsEqualGUID(rguid1, rguid2) (!memcmp(rguid1, rguid2, sizeof(GUID)))
-#endif /* defined(__cplusplus) && !defined(CINTERFACE) */
-#define IsEqualIID(riid1, riid2) IsEqualGUID(riid1, riid2)
-#define IsEqualCLSID(rclsid1, rclsid2) IsEqualGUID(rclsid1, rclsid2)
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-inline BOOL operator==(const GUID& guidOne, const GUID& guidOther)
-{
-    return !memcmp(&guidOne,&guidOther,sizeof(GUID));
-}
-inline BOOL operator!=(const GUID& guidOne, const GUID& guidOther)
-{
-    return !(guidOne == guidOther);
-}
-#endif
-
 
 /*****************************************************************************
@@ -908 +855 @@
 LPVOID WINAPI CoTaskMemRealloc(LPVOID ptr, ULONG size);
 
+/*****************************************************************************
+ * GUID API
+ */
+
+HRESULT WINAPI StringFromCLSID16(REFCLSID id, LPOLESTR16*);
+HRESULT WINAPI StringFromCLSID(REFCLSID id, LPOLESTR*);
+
+HRESULT WINAPI CLSIDFromString16(LPCOLESTR16, CLSID *);
+HRESULT WINAPI CLSIDFromString(LPCOLESTR, CLSID *);
+HRESULT WINAPI CLSIDFromStringA(LPCSTR, CLSID *);
+
+HRESULT WINAPI CLSIDFromProgID16(LPCOLESTR16 progid, LPCLSID riid);
+HRESULT WINAPI CLSIDFromProgID(LPCOLESTR progid, LPCLSID riid);
+
+HRESULT WINAPI ProgIDFromCLSID(REFCLSID clsid, LPOLESTR *lplpszProgID);
+
+INT WINAPI StringFromGUID2(REFGUID id, LPOLESTR str, INT cmax);
+
+BOOL16 WINAPI IsEqualGUID16(GUID* g1,GUID* g2);
+BOOL WINAPI IsEqualGUID32(REFGUID rguid1,REFGUID rguid2);
 
 /*****************************************************************************

trunk/include/win/wine/obj_oleobj.h

@@ -2 +2 @@
 /*
  * Defines IOleObject COM and other oleidl.h interfaces
- * 
+ *
  * Depends on 'obj_base.h'.
  */
@@ -32 +32 @@
         DWORD dwSrcOfCopy;
 } OBJECTDESCRIPTOR, *LPOBJECTDESCRIPTOR;
-        
+
 typedef enum tagOLEMISC
 {
@@ -69 +69 @@
  */
 DEFINE_OLEGUID(IID_IOleObject,  0x00000112L, 0, 0);
-//#if defined(__WINE_OLE_H) && !defined(NO_LPOLEOBJECT)
-//typedef struct IOleObject IOleObject, *LPOLEOBJECT;
-//#else
 #if !defined(__WINE_OLE_H)
 typedef struct IOleObject IOleObject, *LPOLEOBJECT;
@@ -77 +74 @@
 typedef struct IOleObject IOleObject;
 #endif
-//#endif
 
 DEFINE_OLEGUID(IID_IOleAdviseHolder,  0x00000111L, 0, 0);
@@ -84 +80 @@
 DEFINE_OLEGUID(IID_IEnumOLEVERB,  0x00000104L, 0, 0);
 typedef struct IEnumOLEVERB IEnumOLEVERB, *LPENUMOLEVERB;
-  
+
 /*****************************************************************************
  * IOleObject interface
@@ -116 +112 @@
 ICOM_DEFINE(IOleObject,IUnknown)
 #undef ICOM_INTERFACE
-                                 
+
 #ifdef ICOM_CINTERFACE
 /*** IUnknwon methods ***/
@@ -145 +141 @@
 #define IOleObject_SetColorScheme(p,a,b)    ICOM_CALL1(SetColorScheme,p,a)
 #endif
-                                 
+
 
 /*****************************************************************************
@@ -177 +173 @@
 #define IOleAdviseHolder_SendOnClose(p)             ICOM_CALL (SendOnClose,p)
 #endif
-                                 
+
 
 /*****************************************************************************
@@ -209 +205 @@
 } /* extern "C" */
 #endif /* defined(__cplusplus) */
-                                  
+
 #endif /* __WINE_WINE_OBJ_OLEOBJ_H */