Changeset 21493 for trunk/include/win/wine/obj_oleobj.h

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.

File:

• trunk/include/win/wine/obj_oleobj.h (modified) (9 diffs)

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 */