From 52bce3938f36a92999c2d796e96c3766bdd5b0df Mon Sep 17 00:00:00 2001 From: Danny Smith Date: Sat, 13 Sep 2003 12:05:08 +0000 Subject: * include/olectl.h (TEXTMETRICOLE, LPERRORLOG, LPPROPERTYBAG, LPENUMCONNECTIONPOINTS, LPCONNECTIONPOINT, LPENUMCONNECTIONS, LPPROPERTYPAGESITE, LPFONT, LPFONTDISP, OLE_COLOR, HIMETRIC, OLE_YPOS_HIMETRIC, OLE_XSIZE_HIMETRIC, OLE_YSIZE_HIMETRIC, OLE_YSIZE_CONTAINER, OLE_HANDLE, POINTF,LPPOINTF, CONTROLINFO, LPCONTROLINFO, CONNECTDATA, LPCONNECTDATA, LICINFO, LPLICINFO, CAUUID, LPCAUUID, CALPOLESTR, LPCALPOLESTR, CADWORD, LPCADWORD, PROPPAGEINFO, LPPROPPAGEINFO): Remove from here ... * include/ocidl.h: (TEXTMETRICOLE, LPERRORLOG, LPPROPERTYBAG, LPENUMCONNECTIONPOINTS, LPCONNECTIONPOINT, LPENUMCONNECTIONS, LPPROPERTYPAGESITE, LPFONT, LPFONTDISP, OLE_COLOR, HIMETRIC, OLE_YPOS_HIMETRIC, OLE_XSIZE_HIMETRIC, OLE_YSIZE_HIMETRIC, OLE_YSIZE_CONTAINER, OLE_HANDLE, POINTF, LPPOINTF, CONTROLINFO, LPCONTROLINFO, CONNECTDATA, LPCONNECTDATA, LICINFO, LPLICINFO, CAUUID, LPCAUUID, CALPOLESTR, LPCALPOLESTR, CADWORD, LPCADWORD, PROPPAGEINFO, LPPROPPAGEINFO): ... to here, for consistency with documentation. * include/olectl.h: Do #include . * include/ocidl.h: Don't #include . --- winsup/w32api/ChangeLog | 22 ++++++++++++++ winsup/w32api/include/ocidl.h | 66 +++++++++++++++++++++++++++++++++++++++- winsup/w32api/include/olectl.h | 68 ++++-------------------------------------- 3 files changed, 93 insertions(+), 63 deletions(-) diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 9c4d7b486..bb0798cee 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,25 @@ +2003-09-13 Danny Smith + + * include/olectl.h (TEXTMETRICOLE, LPERRORLOG, LPPROPERTYBAG, + LPENUMCONNECTIONPOINTS, LPCONNECTIONPOINT, LPENUMCONNECTIONS, + LPPROPERTYPAGESITE, LPFONT, LPFONTDISP, OLE_COLOR, HIMETRIC, + OLE_YPOS_HIMETRIC, OLE_XSIZE_HIMETRIC, OLE_YSIZE_HIMETRIC, + OLE_YSIZE_CONTAINER, OLE_HANDLE, POINTF,LPPOINTF, CONTROLINFO, + LPCONTROLINFO, CONNECTDATA, LPCONNECTDATA, LICINFO, LPLICINFO, + CAUUID, LPCAUUID, CALPOLESTR, LPCALPOLESTR, CADWORD, LPCADWORD, + PROPPAGEINFO, LPPROPPAGEINFO): Remove from here ... + * include/ocidl.h: (TEXTMETRICOLE, LPERRORLOG, LPPROPERTYBAG, + LPENUMCONNECTIONPOINTS, LPCONNECTIONPOINT, LPENUMCONNECTIONS, + LPPROPERTYPAGESITE, LPFONT, LPFONTDISP, OLE_COLOR, HIMETRIC, + OLE_YPOS_HIMETRIC, OLE_XSIZE_HIMETRIC, OLE_YSIZE_HIMETRIC, + OLE_YSIZE_CONTAINER, OLE_HANDLE, POINTF, LPPOINTF, CONTROLINFO, + LPCONTROLINFO, CONNECTDATA, LPCONNECTDATA, LICINFO, LPLICINFO, + CAUUID, LPCAUUID, CALPOLESTR, LPCALPOLESTR, CADWORD, LPCADWORD, + PROPPAGEINFO, LPPROPPAGEINFO): ... to here, for consistency + with documentation. + * include/olectl.h: Do #include . + * include/ocidl.h: Don't #include . + 2003-09-13 Danny Smith * include/winuser.h (_WIN32_WINNT, _WIN32_WINDOWS, WINVER): diff --git a/winsup/w32api/include/ocidl.h b/winsup/w32api/include/ocidl.h index 9bebf8c66..d856b48fe 100644 --- a/winsup/w32api/include/ocidl.h +++ b/winsup/w32api/include/ocidl.h @@ -1,11 +1,36 @@ #ifndef _OCIDL_H #define _OCIDL_H +#if __GNUC__ >= 3 +#pragma GCC system_header +#endif + #ifdef __cplusplus extern "C" { #endif #include -#include + +typedef interface IErrorLog *LPERRORLOG; +typedef interface IPropertyBag *LPPROPERTYBAG; +typedef interface IEnumConnections *LPENUMCONNECTIONS; +typedef interface IConnectionPoint *LPCONNECTIONPOINT; +typedef interface IEnumConnectionPoints *LPENUMCONNECTIONPOINTS; +typedef interface IPropertyPageSite *LPPROPERTYPAGESITE; +typedef interface IFont *LPFONT; +typedef interface IFontDisp *LPFONTDISP; + +#ifndef OLE2ANSI +typedef TEXTMETRICW TEXTMETRICOLE; +#else +typedef TEXTMETRIC TEXTMETRICOLE; +#endif +typedef TEXTMETRICOLE *LPTEXTMETRICOLE; +typedef DWORD OLE_COLOR; +typedef UINT OLE_HANDLE; +typedef long OLE_XPOS_HIMETRIC; +typedef long OLE_YPOS_HIMETRIC; +typedef long OLE_XSIZE_HIMETRIC; +typedef long OLE_YSIZE_HIMETRIC; typedef enum tagREADYSTATE { READYSTATE_UNINITIALIZED = 0, @@ -14,6 +39,45 @@ typedef enum tagREADYSTATE { READYSTATE_INTERACTIVE = 3, READYSTATE_COMPLETE = 4 } READYSTATE; +typedef struct tagPOINTF { + float x; + float y; +} POINTF,*LPPOINTF; +typedef struct tagCONTROLINFO { + ULONG cb; + HACCEL hAccel; + USHORT cAccel; + DWORD dwFlags; +} CONTROLINFO,*LPCONTROLINFO; +typedef struct tagCONNECTDATA { + LPUNKNOWN pUnk; + DWORD dwCookie; +} CONNECTDATA,*LPCONNECTDATA; +typedef struct tagLICINFO { + long cbLicInfo; + BOOL fRuntimeKeyAvail; + BOOL fLicVerified; +} LICINFO,*LPLICINFO; +typedef struct tagCAUUID { + ULONG cElems; + GUID *pElems; +} CAUUID,*LPCAUUID; +typedef struct tagCALPOLESTR { + ULONG cElems; + LPOLESTR *pElems; +} CALPOLESTR,*LPCALPOLESTR; +typedef struct tagCADWORD { + ULONG cElems; + DWORD *pElems; +} CADWORD,*LPCADWORD; +typedef struct tagPROPPAGEINFO { + ULONG cb; + LPOLESTR pszTitle; + SIZE size; + LPOLESTR pszDocString; + LPOLESTR pszHelpFile; + DWORD dwHelpContext; +} PROPPAGEINFO,*LPPROPPAGEINFO; EXTERN_C const IID IID_IOleControl; #undef INTERFACE diff --git a/winsup/w32api/include/olectl.h b/winsup/w32api/include/olectl.h index 6007b3f6d..f0b86bc32 100644 --- a/winsup/w32api/include/olectl.h +++ b/winsup/w32api/include/olectl.h @@ -1,6 +1,6 @@ #ifndef _OLECTL_H #define _OLECTL_H -#if __GNUC__ >=3 +#if __GNUC__ >= 3 #pragma GCC system_header #endif @@ -8,6 +8,7 @@ extern "C" { #endif +#include #include #define STD_CTL_SCODE(n) MAKE_SCODE(SEVERITY_ERROR,FACILITY_CONTROL,n) @@ -224,18 +225,9 @@ extern "C" { #define DISPID_PICT_HEIGHT 5 #define DISPID_PICT_RENDER 6 -#pragma pack(push,8) -#ifndef OLE2ANSI -typedef TEXTMETRICW TEXTMETRICOLE; -#else -typedef TEXTMETRIC TEXTMETRICOLE; -#endif -typedef TEXTMETRICOLE *LPTEXTMETRICOLE; typedef interface IOleControl *LPOLECONTROL; typedef interface IOleControlSite *LPOLECONTROLSITE; typedef interface ISimpleFrameSite *LPSIMPLEFRAMESITE; -typedef interface IErrorLog *LPERRORLOG; -typedef interface IPropertyBag *LPPROPERTYBAG; typedef interface IPersistPropertyBag *LPPERSISTPROPERTYBAG; typedef interface IPersistStreamInit *LPPERSISTSTREAMINIT; typedef interface IPersistMemory *LPPERSISTMEMORY; @@ -243,68 +235,28 @@ typedef interface IPropertyNotifySink* LPPROPERTYNOTIFYSINK; typedef interface IProvideClassInfo *LPPROVIDECLASSINFO; typedef interface IProvideClassInfo2 *LPPROVIDECLASSINFO2; typedef interface IConnectionPointContainer *LPCONNECTIONPOINTCONTAINER; -typedef interface IEnumConnectionPoints *LPENUMCONNECTIONPOINTS; -typedef interface IConnectionPoint *LPCONNECTIONPOINT; -typedef interface IEnumConnections *LPENUMCONNECTIONS; typedef interface IClassFactory2 *LPCLASSFACTORY2; typedef interface ISpecifyPropertyPages *LPSPECIFYPROPERTYPAGES; typedef interface IPerPropertyBrowsing *LPPERPROPERTYBROWSING; -typedef interface IPropertyPageSite *LPPROPERTYPAGESITE; typedef interface IPropertyPage *LPPROPERTYPAGE; typedef interface IPropertyPage2 *LPPROPERTYPAGE2; -typedef interface IFont *LPFONT; -typedef interface IFontDisp *LPFONTDISP; + typedef interface IPicture *LPPICTURE; typedef interface IPictureDisp *LPPICTUREDISP; -typedef DWORD OLE_COLOR; typedef long OLE_XPOS_PIXELS; typedef long OLE_YPOS_PIXELS; typedef long OLE_XSIZE_PIXELS; typedef long OLE_YSIZE_PIXELS; -typedef long OLE_XPOS_HIMETRIC; -typedef long OLE_YPOS_HIMETRIC; -typedef long OLE_XSIZE_HIMETRIC; -typedef long OLE_YSIZE_HIMETRIC; typedef float OLE_XPOS_CONTAINER; typedef float OLE_YPOS_CONTAINER; typedef float OLE_XSIZE_CONTAINER; -typedef float OLE_YSIZE_CONTAINER; + typedef VARIANT_BOOL OLE_OPTEXCLUSIVE; typedef VARIANT_BOOL OLE_CANCELBOOL; typedef VARIANT_BOOL OLE_ENABLEDEFAULTBOOL; -typedef UINT OLE_HANDLE; + +#pragma pack(push,8) typedef enum { triUnchecked,triChecked1,triGray } OLE_TRISTATE; -typedef struct tagPOINTF { - float x; - float y; -} POINTF,*LPPOINTF; -typedef struct tagCONTROLINFO { - ULONG cb; - HACCEL hAccel; - USHORT cAccel; - DWORD dwFlags; -} CONTROLINFO,*LPCONTROLINFO; -typedef struct tagCONNECTDATA { - LPUNKNOWN pUnk; - DWORD dwCookie; -} CONNECTDATA,*LPCONNECTDATA; -typedef struct tagLICINFO { - long cbLicInfo; - BOOL fRuntimeKeyAvail; - BOOL fLicVerified; -} LICINFO,*LPLICINFO; -typedef struct tagCAUUID { - ULONG cElems; - GUID *pElems; -} CAUUID,*LPCAUUID; -typedef struct tagCALPOLESTR { - ULONG cElems; - LPOLESTR *pElems; -} CALPOLESTR,*LPCALPOLESTR; -typedef struct tagCADWORD { - ULONG cElems; - DWORD *pElems; -} CADWORD,*LPCADWORD; typedef struct tagOCPFIPARAMS { ULONG cbStructSize; HWND hWndOwner; @@ -318,14 +270,6 @@ typedef struct tagOCPFIPARAMS { LCID lcid; DISPID dispidInitialProperty; } OCPFIPARAMS,*LPOCPFIPARAMS; -typedef struct tagPROPPAGEINFO { - ULONG cb; - LPOLESTR pszTitle; - SIZE size; - LPOLESTR pszDocString; - LPOLESTR pszHelpFile; - DWORD dwHelpContext; -} PROPPAGEINFO,*LPPROPPAGEINFO; typedef struct tagFONTDESC { UINT cbSizeofstruct; LPOLESTR lpstrName; -- cgit v1.2.3