Changeset 7915 for trunk/include/win/wine/obj_control.h

Timestamp:

Feb 15, 2002, 3:46:04 PM (24 years ago)

Author:

sandervl

Message:

header updates

File:

• trunk/include/win/wine/obj_control.h (modified) (22 diffs)

trunk/include/win/wine/obj_control.h

@@ -1 @@
-/* $Id: obj_control.h,v 1.7 1999-11-30 20:19:03 sandervl Exp $ */
 /*
  * Defines the COM interfaces and APIs related to structured data storage.
@@ -9 +8 @@
 #define __WINE_WINE_OBJ_CONTROL_H
 
-
-#include "winbase.h"
-#include "wine/obj_oleaut.h" /* for DISPID */
+struct tagMSG;
 
 #ifdef __cplusplus
@@ -169 +166 @@
 #define IOleControl_METHODS \
         ICOM_METHOD1(HRESULT,GetControlInfo, CONTROLINFO*,pCI) \
-        ICOM_METHOD1(HRESULT,OnMnemonic, MSG*,pMsg) \
+        ICOM_METHOD1(HRESULT,OnMnemonic, struct tagMSG*,pMsg) \
         ICOM_METHOD1(HRESULT,OnAmbientPropertyChange, DISPID,dispID) \
         ICOM_METHOD1(HRESULT,FreezeEvents, BOOL,bFreeze)
@@ -178 +175 @@
 #undef ICOM_INTERFACE
 
-#ifdef ICOM_CINTERFACE
-/*** IUnknwon methods ***/
+/*** IUnknown methods ***/
 #define IOleControl_QueryInterface(p,a,b)        ICOM_CALL2(QueryInterface,p,a,b)
 #define IOleControl_AddRef(p)                    ICOM_CALL (AddRef,p)
@@ -188 +184 @@
 #define IOleControl_OnAmbientPropertyChange(p,a) ICOM_CALL1(OnAmbientPropertyChange,p,a)
 #define IOleControl_FreezeEvents(p,a)            ICOM_CALL1(FreezeEvents,p,a)
-#endif
                                 
 
@@ -200 +195 @@
         ICOM_METHOD1(HRESULT,GetExtendedControl, IDispatch**,ppDisp) \
         ICOM_METHOD3(HRESULT,TransformCoords, POINTL*,pPtlHimetric, POINTF*,pPtfContainer, DWORD,dwFlags) \
-        ICOM_METHOD2(HRESULT,TranslateAccelerator, MSG*,pMsg, DWORD,grfModifiers) \
+        ICOM_METHOD2(HRESULT,TranslateAccelerator, struct tagMSG*,pMsg, DWORD,grfModifiers) \
         ICOM_METHOD1(HRESULT,OnFocus, BOOL,fGotFocus) \
         ICOM_METHOD (HRESULT,ShowPropertyFrame)
@@ -209 +204 @@
 #undef ICOM_INTERFACE
 
-#ifdef ICOM_CINTERFACE
-/*** IUnknwon methods ***/
+/*** IUnknown methods ***/
 #define IOleControlSite_QueryInterface(p,a,b)        ICOM_CALL2(QueryInterface,p,a,b)
 #define IOleControlSite_AddRef(p)                    ICOM_CALL (AddRef,p)
@@ -222 +216 @@
 #define IOleControlSite_OnFocus(p,a)                 ICOM_CALL1(OnFocus,p,a)
 #define IOleControlSite_ShowPropertyFrame(p)         ICOM_CALL1(ShowPropertyFrame,p)
-#endif
                                 
                                 
@@ -239 +232 @@
 #undef ICOM_INTERFACE
 
-#ifdef ICOM_CINTERFACE
 /*** IUnknown methods ***/
 #define IOleInPlaceSiteEx_QueryInterface(p,a,b)      ICOM_CALL2(QueryInterface,p,a,b)
@@ -262 +254 @@
 #define IOleInPlaceSiteEx_OnInPlaceDeactivateEx(p,a) ICOM_CALL1(OnInPlaceDeactivateEx,p,a)
 #define IOleInPlaceSiteEx_RequestUIActivate(p)       ICOM_CALL (RequestUIActivate,p)
-#endif
                                  
 
@@ -288 +279 @@
 #undef ICOM_INTERFACE
 
-#ifdef ICOM_CINTERFACE
 /*** IUnknown methods ***/
 #define IOleInPlaceSiteWindowless_QueryInterface(p,a,b)      ICOM_CALL2(QueryInterface,p,a,b)
@@ -320 +310 @@
 #define IOleInPlaceSiteWindowless_AdjustRect(p,a)          ICOM_CALL1(OnPosRectChange,p,a)
 #define IOleInPlaceSiteWindowless_OnDefWindowMessage(p,a,b,c,d) ICOM_CALL4(OnPosRectChange,p,a,b,c,d)
-#endif
 
 
@@ -336 +325 @@
 #undef ICOM_INTERFACE
 
-#ifdef ICOM_CINTERFACE
 /*** IUnknown methods ***/
 #define IOleInPlaceObjectWindowless_QueryInterface(p,a,b) ICOM_CALL2(QueryInterface,p,a,b)
@@ -352 +340 @@
 #define IOleInPlaceObjectWindowless_OnWindowMessage(p,a,b,c,d) ICOM_CALL4(OnWindowMessage,p,a,b,c,d)
 #define IOleInPlaceObjectWindowless_GetDropTarget(p,a)         ICOM_CALL1(GetDropTarget,p,a)
-#endif
                                  
 
@@ -369 +356 @@
 #undef ICOM_INTERFACE
 
-#ifdef ICOM_CINTERFACE
-/*** IUnknwon methods ***/
+/*** IUnknown methods ***/
 #define IClassFactory2_QueryInterface(p,a,b)      ICOM_CALL2(QueryInterface,p,a,b)
 #define IClassFactory2_AddRef(p)                  ICOM_CALL (AddRef,p)
@@ -381 +367 @@
 #define IClassFactory2_RequestLicKey(p,a,b)       ICOM_CALL2(RequestLicKey,p,a,b)
 #define IClassFactory2_CreateInstanceLic(p,a,b,c,d,e) ICOM_CALL5(CreateInstanceLic,p,a,b,c,d,e)
-#endif
 
 
@@ -400 +385 @@
 #undef ICOM_INTERFACE
 
-#ifdef ICOM_CINTERFACE
-/*** IUnknwon methods ***/
+/*** IUnknown methods ***/
 #define IViewObjectEx_QueryInterface(p,a,b)        ICOM_CALL2(QueryInterface,p,a,b)
 #define IViewObjectEx_AddRef(p)                    ICOM_CALL (AddRef,p)
@@ -420 +404 @@
 #define IViewObjectEx_QueryHitRect(p,a,b,c,d,e)       ICOM_CALL5(QueryHitRect,p,a,b,c,d,e)
 #define IViewObjectEx_GetNaturalExtent(p,a,b,c,d,e,f) ICOM_CALL6(GetNaturalExtent,p,a,b,c,d,e,f)
+
+
+/*****************************************************************************
+ * IProvideClassInfo interface
+ */
+#ifdef __WINE__
+#undef GetClassInfo
 #endif
 
-
-/*****************************************************************************
- * IProvideClassInfo interface
- */
 #define ICOM_INTERFACE IProvideClassInfo
 #define IProvideClassInfo_METHODS \
@@ -435 +422 @@
 #undef ICOM_INTERFACE
 
-#ifdef ICOM_CINTERFACE
-/*** IUnknwon methods ***/
+/*** IUnknown methods ***/
 #define IProvideClassInfo_QueryInterface(p,a,b)        ICOM_CALL2(QueryInterface,p,a,b)
 #define IProvideClassInfo_AddRef(p)                    ICOM_CALL (AddRef,p)
@@ -442 +428 @@
 /*** IProvideClassInfo methods ***/
 #define IProvideClassInfo_GetClassInfo(p,a)            ICOM_CALL1(GetClassInfo,p,a)
-#endif
 
 
@@ -458 +443 @@
 #undef ICOM_INTERFACE
 
-#ifdef ICOM_CINTERFACE
-/*** IUnknwon methods ***/
+/*** IUnknown methods ***/
 #define IProvideClassInfo2_QueryInterface(p,a,b)   ICOM_CALL2(QueryInterface,p,a,b)
 #define IProvideClassInfo2_AddRef(p)               ICOM_CALL (AddRef,p)
@@ -467 +451 @@
 /*** IProvideClassInfo2 methods ***/
 #define IProvideClassInfo2_GetGUID(p,a,b)          ICOM_CALL2(GetGUID,p,a,b)
-#endif
 
 #ifdef __cplusplus