Update of /cvsroot/mingw/w32api/include In directory usw-pr-cvs1:/tmp/cvs-serv23843/include Modified Files: mapi.h ntdef.h richedit.h windef.h windows.h wingdi.h winnt.h winuser.h Added Files: comcat.h Removed Files: excpt.h Log Message: Merge changes from Cygwin CVS --- NEW FILE: comcat.h --- #ifndef _COMCAT_H #define _COMCAT_H #if __GNUC__ >=3 #pragma GCC system_header #endif #include <windows.h> #include <ole2.h> #ifndef _RC_INVOKED #ifdef __cplusplus extern "C"{ #endif EXTERN_C const IID IID_IEnumGUID; typedef interface IEnumGUID *LPENUMGUID; #undef INTERFACE #define INTERFACE IEnumGUID DECLARE_INTERFACE_(IEnumGUID,IUnknown) { STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; STDMETHOD(Next)(THIS_ ULONG,GUID*,ULONG*) PURE; STDMETHOD(Skip)(THIS_ ULONG) PURE; STDMETHOD(Reset)(THIS) PURE; STDMETHOD(Clone)(THIS_ LPENUMGUID*) PURE; }; #undef INTERFACE #ifdef COBJMACROS #define IEnumGUID_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IEnumGUID_AddRef(p) (p)->lpVtbl->AddRef(p) #define IEnumGUID_Release(p) (p)->lpVtbl->Release(p) #define IEnumGUID_Next(p,a,b,c) (p)->lpVtbl->Next(p,a,b,c) #define IEnumGUID_Skip(p,a) (p)->lpVtbl->Skip(p,a) #define IEnumGUID_Reset(p) (p)->lpVtbl->Reset(p) #define IEnumGUID_Clone(p,a) (p)->lpVtbl->Clone(p,a) #endif typedef GUID CATID; typedef REFGUID REFCATID; #define CATID_NULL GUID_NULL #define IsEqualCATID(a, b) IsEqualGUID(a, b) typedef struct tagCATEGORYINFO { CATID catid; /* category identifier for component */ LCID lcid; /* locale identifier */ OLECHAR szDescription[128]; /* description of the category */ } CATEGORYINFO, *LPCATEGORYINFO; EXTERN_C const CATID CATID_Insertable; EXTERN_C const CATID CATID_Control; EXTERN_C const CATID CATID_Programmable; EXTERN_C const CATID CATID_IsShortcut; EXTERN_C const CATID CATID_NeverShowExt; EXTERN_C const CATID CATID_DocObject; EXTERN_C const CATID CATID_Printable; EXTERN_C const CATID CATID_RequiresDataPathHost; EXTERN_C const CATID CATID_PersistsToMoniker; EXTERN_C const CATID CATID_PersistsToStorage; EXTERN_C const CATID CATID_PersistsToStreamInit; EXTERN_C const CATID CATID_PersistsToStream; EXTERN_C const CATID CATID_PersistsToMemory; EXTERN_C const CATID CATID_PersistsToFile; EXTERN_C const CATID CATID_PersistsToPropertyBag; EXTERN_C const CATID CATID_InternetAware; EXTERN_C const CATID CATID_DesignTimeUIActivatableControl; #define IEnumCATID IEnumGUID #define LPENUMCATID LPENUMGUID #define IID_IEnumCATID IID_IEnumGUID #define IEnumCLSID IEnumGUID #define LPENUMCLSID LPENUMGUID #define IID_IEnumCLSID IID_IEnumGUID EXTERN_C const IID IID_ICatInformation; typedef interface ICatInformation *LPCATINFORMATION; EXTERN_C const IID IID_ICatRegister; typedef interface ICatRegister *LPCATREGISTER; EXTERN_C const IID IID_IEnumCATEGORYINFO; typedef interface IEnumCATEGORYINFO *LPENUMCATEGORYINFO; EXTERN_C const CLSID CLSID_StdComponentCategoriesMgr; #define INTERFACE ICatInformation DECLARE_INTERFACE_(ICatInformation,IUnknown) { STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; STDMETHOD(EnumCategories)(THIS_ LCID,LPENUMCATEGORYINFO*) PURE; STDMETHOD(GetCategoryDesc)(THIS_ REFCATID,LCID,PWCHAR*) PURE; STDMETHOD(EnumClassesOfCategories)(THIS_ ULONG,CATID*,ULONG,CATID*,LPENUMCLSID*) PURE; STDMETHOD(IsClassOfCategories)(THIS_ REFCLSID,ULONG,CATID*,ULONG,CATID*) PURE; STDMETHOD(EnumImplCategoriesOfClass)(THIS_ REFCLSID,LPENUMCATID*) PURE; STDMETHOD(EnumReqCategoriesOfClass)(THIS_ REFCLSID,LPENUMCATID*) PURE; }; #undef INTERFACE #ifdef COBJMACROS #define ICatInformation_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define ICatInformation_AddRef(p) (p)->lpVtbl->AddRef(p) #define ICatInformation_Release(p) (p)->lpVtbl->Release(p) #define ICatInformation_EnumCategories(p,a,b) (p)->lpVtbl->EnumCategories(p,a,b) #define ICatInformation_GetCategoryDesc(p,a,b,c) (p)->lpVtbl->GetCategoryDesc(p,a,b,c) #define ICatInformation_EnumClassesOfCategories(p,a,b,c,d,e) (p)->lpVtbl->EnumClassesOfCategories(p,a,b,c,d,e) #define ICatInformation_IsClassOfCategories(p,a,b,c,d,e) (p)->lpVtbl->IsClassOfCategories(p,a,b,c,d,e) #define ICatInformation_EnumImplCategoriesOfClass(p,a,b) (p)->lpVtbl->EnumImplCategoriesOfClass(p,a,b) #define ICatInformation_EnumReqCategoriesOfClass(p,a,b) (p)->lpVtbl->EnumReqCategoriesOfClass(p,a,b) #endif #define INTERFACE ICatRegister DECLARE_INTERFACE_(ICatRegister,IUnknown) { STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; STDMETHOD(RegisterCategories)(THIS_ ULONG,CATEGORYINFO*) PURE; STDMETHOD(UnRegisterCategories)(THIS_ ULONG,CATID*) PURE; STDMETHOD(RegisterClassImplCategories)(THIS_ REFCLSID,ULONG,CATID*) PURE; STDMETHOD(UnRegisterClassImplCategories)(THIS_ REFCLSID,ULONG,CATID*) PURE; STDMETHOD(RegisterClassReqCategories)(THIS_ REFCLSID,ULONG,CATID*) PURE; STDMETHOD(UnRegisterClassReqCategories)(THIS_ REFCLSID,ULONG,CATID*) PURE; }; #undef INTERFACE #ifdef COBJMACROS #define ICatRegister_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define ICatRegister_AddRef(p) (p)->lpVtbl->AddRef(p) #define ICatRegister_Release(p) (p)->lpVtbl->Release(p) #define ICatRegister_RegisterCategories(p,a,b) (p)->lpVtbl->RegisterCategories(p,a,b) #define ICatRegister_UnRegisterCategories(p,a,b) (p)->lpVtbl->UnRegisterCategories(p,a,b) #define ICatRegister_RegisterClassImplCategories(p,a,b,c) (p)->lpVtbl->RegisterClassImplCategories(p,a,b,c) #define ICatRegister_UnRegisterClassImplCategories(p,a,b,c) (p)->lpVtbl->UnRegisterClassImplCategories(p,a,b,c) #define ICatRegister_RegisterClassReqCategories(p,a,b,c) (p)->lpVtbl->RegisterClassReqCategories(p,a,b,c) #define ICatRegister_UnRegisterClassReqCategories(p,a,b,c) (p)->lpVtbl->UnRegisterClassReqCategories(p,a,b,c) #endif EXTERN_C const IID IID_IEnumCATEGORYINFO; #undef INTERFACE #define INTERFACE IEnumCATEGORYINFO DECLARE_INTERFACE_(IEnumCATEGORYINFO,IUnknown) { STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; STDMETHOD(Next)(THIS_ ULONG,CATEGORYINFO*,ULONG*) PURE; STDMETHOD(Skip)(THIS_ ULONG) PURE; STDMETHOD(Reset)(THIS) PURE; STDMETHOD(Clone)(THIS_ LPENUMCATEGORYINFO*) PURE; }; #undef INTERFACE #ifdef COBJMACROS #define IEnumCATEGORYINFO_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IEnumCATEGORYINFO_AddRef(p) (p)->lpVtbl->AddRef(p) #define IEnumCATEGORYINFO_Release(p) (p)->lpVtbl->Release(p) #define IEnumCATEGORYINFO_Next(p,a,b,c) (p)->lpVtbl->Next(p,a,b,c) #define IEnumCATEGORYINFO_Skip(p,a) (p)->lpVtbl->Skip(p,a) #define IEnumCATEGORYINFO_Reset(p) (p)->lpVtbl->Reset(p) #define IEnumCATEGORYINFO_Clone(p,a) (p)->lpVtbl->Clone(p,a) #endif #ifdef __cplusplus } #endif #endif /* _RC_INVOKED */ #endif Index: mapi.h =================================================================== RCS file: /cvsroot/mingw/w32api/include/mapi.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mapi.h 9 Apr 2002 22:09:39 -0000 1.1 --- mapi.h 14 Jun 2002 11:44:47 -0000 1.2 *************** *** 73,78 **** ULONG ulReserved; ULONG ulRecipClass; ! LPTSTR lpszName; ! LPTSTR lpszAddress; ULONG ulEIDSize; LPVOID lpEntryID; --- 73,78 ---- ULONG ulReserved; ULONG ulRecipClass; ! LPSTR lpszName; ! LPSTR lpszAddress; ULONG ulEIDSize; LPVOID lpEntryID; *************** *** 82,87 **** ULONG flFlags; ULONG nPosition; ! LPTSTR lpszPathName; ! LPTSTR lpszFileName; LPVOID lpFileType; } MapiFileDesc, *lpMapiFileDesc; --- 82,87 ---- ULONG flFlags; ULONG nPosition; ! LPSTR lpszPathName; ! LPSTR lpszFileName; LPVOID lpFileType; } MapiFileDesc, *lpMapiFileDesc; *************** *** 95,103 **** typedef struct { ULONG ulReserved; ! LPTSTR lpszSubject; ! LPTSTR lpszNoteText; ! LPTSTR lpszMessageType; ! LPTSTR lpszDateReceived; ! LPTSTR lpszConversationID; FLAGS flFlags; lpMapiRecipDesc lpOriginator; --- 95,103 ---- typedef struct { ULONG ulReserved; ! LPSTR lpszSubject; ! LPSTR lpszNoteText; ! LPSTR lpszMessageType; ! LPSTR lpszDateReceived; ! LPSTR lpszConversationID; FLAGS flFlags; lpMapiRecipDesc lpOriginator; *************** *** 108,120 **** } MapiMessage, *lpMapiMessage; ! ULONG PASCAL MAPILogon (ULONG,LPTSTR,LPTSTR,FLAGS,ULONG,LPLHANDLE); ULONG PASCAL MAPISendMail (LHANDLE,ULONG,lpMapiMessage,FLAGS,ULONG); ! ULONG PASCAL MAPISendDocuments (ULONG,LPTSTR,LPTSTR,LPTSTR,ULONG); ! ULONG PASCAL MAPIReadMail (LHANDLE,ULONG,LPTSTR,FLAGS,ULONG, lpMapiMessage*); ! ULONG PASCAL MAPIFindNext (LHANDLE,ULONG,LPTSTR,LPTSTR,FLAGS,ULONG,LPTSTR); ! ULONG PASCAL MAPIResolveName (LHANDLE,ULONG,LPTSTR,FLAGS,ULONG, lpMapiRecipDesc*); ! ULONG PASCAL MAPIAddress (LHANDLE,ULONG,LPTSTR,ULONG,LPTSTR,ULONG, lpMapiRecipDesc,FLAGS,ULONG,LPULONG, lpMapiRecipDesc*); --- 108,120 ---- } MapiMessage, *lpMapiMessage; ! ULONG PASCAL MAPILogon (ULONG,LPSTR,LPSTR,FLAGS,ULONG,LPLHANDLE); ULONG PASCAL MAPISendMail (LHANDLE,ULONG,lpMapiMessage,FLAGS,ULONG); ! ULONG PASCAL MAPISendDocuments (ULONG,LPSTR,LPSTR,LPSTR,ULONG); ! ULONG PASCAL MAPIReadMail (LHANDLE,ULONG,LPSTR,FLAGS,ULONG, lpMapiMessage*); ! ULONG PASCAL MAPIFindNext (LHANDLE,ULONG,LPSTR,LPSTR,FLAGS,ULONG,LPSTR); ! ULONG PASCAL MAPIResolveName (LHANDLE,ULONG,LPSTR,FLAGS,ULONG, lpMapiRecipDesc*); ! ULONG PASCAL MAPIAddress (LHANDLE,ULONG,LPSTR,ULONG,LPSTR,ULONG, lpMapiRecipDesc,FLAGS,ULONG,LPULONG, lpMapiRecipDesc*); *************** *** 122,127 **** ULONG PASCAL MAPIDetails (LHANDLE,ULONG,lpMapiRecipDesc,FLAGS,ULONG); ULONG PASCAL MAPISaveMail (LHANDLE,ULONG,lpMapiMessage lpszMessage, ! FLAGS,ULONG,LPTSTR); ! ULONG PASCAL MAPIDeleteMail (LHANDLE lpSession,ULONG,LPTSTR,FLAGS,ULONG); ULONG PASCAL MAPILogoff (LHANDLE,ULONG,FLAGS,ULONG); /* Netscape extensions. */ --- 122,127 ---- ULONG PASCAL MAPIDetails (LHANDLE,ULONG,lpMapiRecipDesc,FLAGS,ULONG); ULONG PASCAL MAPISaveMail (LHANDLE,ULONG,lpMapiMessage lpszMessage, ! FLAGS,ULONG,LPSTR); ! ULONG PASCAL MAPIDeleteMail (LHANDLE lpSession,ULONG,LPSTR,FLAGS,ULONG); ULONG PASCAL MAPILogoff (LHANDLE,ULONG,FLAGS,ULONG); /* Netscape extensions. */ *************** *** 130,146 **** /* Handles for use with GetProcAddress */ ! typedef ULONG (PASCAL * LPMAPILOGON) (ULONG,LPTSTR,LPTSTR,FLAGS,ULONG, LPLHANDLE); typedef ULONG (PASCAL * LPMAPISENDMAIL) (LHANDLE,ULONG,lpMapiMessage, FLAGS,ULONG); ! typedef ULONG (PASCAL * LPMAPISENDDOCUMENTS) (ULONG,LPTSTR,LPTSTR, ! LPTSTR,ULONG); ! typedef ULONG (PASCAL * LPMAPIREADMAIL) (LHANDLE,ULONG,LPTSTR,FLAGS, ULONG,lpMapiMessage*); ! typedef ULONG (PASCAL * LPMAPIFINDNEXT) (LHANDLE,ULONG,LPTSTR,LPTSTR, ! FLAGS,ULONG,LPTSTR); ! typedef ULONG (PASCAL * LPMAPIRESOLVENAME) (LHANDLE,ULONG,LPTSTR,FLAGS, ULONG,lpMapiRecipDesc*); ! typedef ULONG (PASCAL * LPMAPIADDRESS) (LHANDLE,ULONG,LPTSTR,ULONG,LPTSTR, ULONG,lpMapiRecipDesc,FLAGS,ULONG, LPULONG,lpMapiRecipDesc*); --- 130,146 ---- /* Handles for use with GetProcAddress */ ! typedef ULONG (PASCAL * LPMAPILOGON) (ULONG,LPSTR,LPSTR,FLAGS,ULONG, LPLHANDLE); typedef ULONG (PASCAL * LPMAPISENDMAIL) (LHANDLE,ULONG,lpMapiMessage, FLAGS,ULONG); ! typedef ULONG (PASCAL * LPMAPISENDDOCUMENTS) (ULONG,LPSTR,LPSTR, ! LPSTR,ULONG); ! typedef ULONG (PASCAL * LPMAPIREADMAIL) (LHANDLE,ULONG,LPSTR,FLAGS, ULONG,lpMapiMessage*); ! typedef ULONG (PASCAL * LPMAPIFINDNEXT) (LHANDLE,ULONG,LPSTR,LPSTR, ! FLAGS,ULONG,LPSTR); ! typedef ULONG (PASCAL * LPMAPIRESOLVENAME) (LHANDLE,ULONG,LPSTR,FLAGS, ULONG,lpMapiRecipDesc*); ! typedef ULONG (PASCAL * LPMAPIADDRESS) (LHANDLE,ULONG,LPSTR,ULONG,LPSTR, ULONG,lpMapiRecipDesc,FLAGS,ULONG, LPULONG,lpMapiRecipDesc*); *************** *** 149,155 **** FLAGS,ULONG); typedef ULONG (PASCAL * LPMAPISAVEMAIL) (LHANDLE,ULONG,lpMapiMessage, ! FLAGS,ULONG,LPTSTR); typedef ULONG (PASCAL * LPMAPIDELETEMAIL) (LHANDLE lpSession,ULONG, ! LPTSTR, FLAGS,ULONG); typedef ULONG (PASCAL * LPMAPILOGOFF)(LHANDLE,ULONG,FLAGS,ULONG); --- 149,155 ---- FLAGS,ULONG); typedef ULONG (PASCAL * LPMAPISAVEMAIL) (LHANDLE,ULONG,lpMapiMessage, ! FLAGS,ULONG,LPSTR); typedef ULONG (PASCAL * LPMAPIDELETEMAIL) (LHANDLE lpSession,ULONG, ! LPSTR, FLAGS,ULONG); typedef ULONG (PASCAL * LPMAPILOGOFF)(LHANDLE,ULONG,FLAGS,ULONG); Index: ntdef.h =================================================================== RCS file: /cvsroot/mingw/w32api/include/ntdef.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ntdef.h 9 Apr 2002 21:17:17 -0000 1.2 --- ntdef.h 14 Jun 2002 11:44:47 -0000 1.3 *************** *** 38,41 **** --- 38,45 ---- } STRING, *PSTRING; #endif + typedef STRING ANSI_STRING; + typedef PSTRING PANSI_STRING; + typedef STRING OEM_STRING; + typedef PSTRING POEM_STRING; typedef LARGE_INTEGER PHYSICAL_ADDRESS, *PPHYSICAL_ADDRESS; typedef enum _SECTION_INHERIT { Index: richedit.h =================================================================== RCS file: /cvsroot/mingw/w32api/include/richedit.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** richedit.h 9 Apr 2002 21:17:17 -0000 1.3 --- richedit.h 14 Jun 2002 11:44:47 -0000 1.4 *************** *** 140,144 **** --- 140,147 ---- #define EM_GETREDONAME (WM_USER+87) #define EM_STOPGROUPTYPING (WM_USER+88) + #define EM_SETTEXTMODE (WM_USER+89) + #define EM_GETTEXTMODE (WM_USER+90) #define EM_AUTOURLDETECT (WM_USER+91) + #define EM_GETTEXTEX (WM_USER+94) #define EM_GETTEXTLENGTHEX (WM_USER+95) #define EM_SHOWSCROLLBAR (WM_USER+96) *************** *** 195,198 **** --- 198,209 ---- #define SCF_ALL 4 #define SCF_USEUIRULES 8 + #define TM_PLAINTEXT 1 + #define TM_RICHTEXT 2 + #define TM_SINGLELEVELUNDO 4 + #define TM_MULTILEVELUNDO 8 + #define TM_SINGLECODEPAGE 16 + #define TM_MULTICODEPAGE 32 + #define GT_DEFAULT 0 + #define GT_USECRLF 1 #define yHeightCharPtsMost 1638 #define lDefaultTab 720 *************** *** 381,384 **** --- 392,402 ---- LPSTR szPunctuation; } PUNCTUATION; + typedef struct _gettextex { + DWORD cb; + DWORD flags; + UINT codepage; + LPCSTR lpDefaultChar; + LPBOOL lpUsedDefaultChar; + } GETTEXTEX; typedef LONG (*EDITWORDBREAKPROCEX)(char*,LONG,BYTE,INT); /* Defines for EM_SETTYPOGRAPHYOPTIONS */ Index: windef.h =================================================================== RCS file: /cvsroot/mingw/w32api/include/windef.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** windef.h 21 May 2002 16:07:06 -0000 1.5 --- windef.h 14 Jun 2002 11:44:47 -0000 1.6 *************** *** 185,188 **** --- 185,201 ---- #endif + /* FIXME: This will make some code compile. The programs will most + likely crash when an exception is raised, but at least they will + compile. */ + #if defined (__GNUC__) && defined (__SEH_NOOP) + #define __try + #define __except(x) if (0) /* don't execute handler */ + #define __finally + + #define _try __try + #define _except __except + #define _finally __finally + #endif + typedef unsigned long DWORD; typedef int WINBOOL,*PWINBOOL,*LPWINBOOL; Index: windows.h =================================================================== RCS file: /cvsroot/mingw/w32api/include/windows.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** windows.h 21 May 2002 16:07:06 -0000 1.5 --- windows.h 14 Jun 2002 11:44:47 -0000 1.6 *************** *** 49,53 **** #include <wincon.h> #include <basetyps.h> - #include <excpt.h> #include <winbase.h> #ifndef _WINGDI_H --- 49,52 ---- *************** *** 105,108 **** --- 104,112 ---- #endif /* (_WIN32_WINNT >= 0x0400) */ #endif + #if !defined (__OBJC__) + #if __GNUC__ >= 3 /* what about Watcom? */ + #include <ole2.h> + #endif + #endif /* __OBJC__ */ #endif /* WIN32_LEAN_AND_MEAN */ Index: wingdi.h =================================================================== RCS file: /cvsroot/mingw/w32api/include/wingdi.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** wingdi.h 9 Apr 2002 21:17:17 -0000 1.7 --- wingdi.h 14 Jun 2002 11:44:47 -0000 1.8 *************** *** 2519,2522 **** --- 2519,2523 ---- HENHMETAFILE WINAPI GetEnhMetaFileA(LPCSTR); HENHMETAFILE WINAPI GetEnhMetaFileW(LPCWSTR); + UINT WINAPI GetEnhMetaFileBits(HENHMETAFILE,UINT,LPBYTE); UINT WINAPI GetEnhMetaFileDescriptionA(HENHMETAFILE,UINT,LPSTR); UINT WINAPI GetEnhMetaFileDescriptionW(HENHMETAFILE,UINT,LPWSTR); Index: winnt.h =================================================================== RCS file: /cvsroot/mingw/w32api/include/winnt.h,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** winnt.h 21 May 2002 16:07:06 -0000 1.23 --- winnt.h 14 Jun 2002 11:44:47 -0000 1.24 *************** *** 1140,1154 **** BYTE AceFlags; WORD AceSize; ! } ACE_HEADER; typedef struct _ACCESS_ALLOWED_ACE { ACE_HEADER Header; ACCESS_MASK Mask; DWORD SidStart; ! } ACCESS_ALLOWED_ACE; typedef struct _ACCESS_DENIED_ACE { ACE_HEADER Header; ACCESS_MASK Mask; DWORD SidStart; ! } ACCESS_DENIED_ACE; typedef struct _SYSTEM_AUDIT_ACE { ACE_HEADER Header; --- 1140,1154 ---- BYTE AceFlags; WORD AceSize; ! } ACE_HEADER, *PACE_HEADER; typedef struct _ACCESS_ALLOWED_ACE { ACE_HEADER Header; ACCESS_MASK Mask; DWORD SidStart; ! } ACCESS_ALLOWED_ACE, *PACCESS_ALLOWED_ACE; typedef struct _ACCESS_DENIED_ACE { ACE_HEADER Header; ACCESS_MASK Mask; DWORD SidStart; ! } ACCESS_DENIED_ACE, *PACCESS_DENIED_ACE; typedef struct _SYSTEM_AUDIT_ACE { ACE_HEADER Header; Index: winuser.h =================================================================== RCS file: /cvsroot/mingw/w32api/include/winuser.h,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** winuser.h 9 Apr 2002 21:17:17 -0000 1.15 --- winuser.h 14 Jun 2002 11:44:47 -0000 1.16 *************** *** 2387,2390 **** --- 2387,2396 ---- DWORD dwFlags; } TOGGLEKEYS; + typedef struct tagMOUSEHOOKSTRUCT { + POINT pt; + HWND hwnd; + UINT wHitTestCode; + DWORD dwExtraInfo; + } MOUSEHOOKSTRUCT, FAR *LPMOUSEHOOKSTRUCT, *PMOUSEHOOKSTRUCT; typedef struct tagTRACKMOUSEEVENT { DWORD cbSize; --- excpt.h DELETED --- |