From 019f46a6263b0a0ca5cfdcdc6a07e82a193a7b2b Mon Sep 17 00:00:00 2001 From: Earnie Boyd Date: Fri, 25 Jan 2002 00:52:35 +0000 Subject: [PATCH] Merge MinGW differences --- winsup/w32api/ChangeLog | 98 +++++++++++++++++- winsup/w32api/include/commctrl.h | 166 ++++++++++++++++++++++++++++++- winsup/w32api/include/objbase.h | 1 + winsup/w32api/include/winbase.h | 9 +- winsup/w32api/include/wingdi.h | 12 ++- winsup/w32api/include/winnt.h | 13 +++ winsup/w32api/include/winuser.h | 26 +++++ winsup/w32api/lib/user32.def | 1 + winsup/w32api/lib/vfw32.def | 2 +- 9 files changed, 319 insertions(+), 9 deletions(-) diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index beeccadc5..b8ffb8a6b 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -20,18 +20,48 @@ * include/winnt.h: Add missing MEM_ defines, and convert existing to hex for readability. +2002-01-17 Marcus Geelnard + + * include/winsuser.h (tagKBDLLHOOKSTRUCT): Define struct + and typedefs. + (SPI_SETSCREENSAVERRUNNING): Add define. + (LLKHF_ALTDOWN): Add define. + * include/wingdi.h (PFD_GENERIC_ACCELERATED, + PFD_DEPTH_DONTCARE): Add defines. + +2002-01-17 Danny Smith + + * include/objbase.h (CoGetObject): Add prototype. + +2002-01-14 Timothy J. Wood + + * include/winuser.h (ENUM_CURRENT_SETTINGS, + ENUM_REGISTRY_SETTINGS): Add defines. + 2002-01-14 Danny Smith * include/winnt.h (FILE_ATTRIBUTE_ENCRYPTED): Correct constant. (FILE_ATTRIBUTE_DEVICE): Add define. + 2002-01-14 Corinna Vinschen * include/winnt.h: Add INVALID_FILE_ATTRIBUTES. +2002-01-11 Danny Smith + + * ChangeLog: correct date in last entry. + +2002-01-11 Timothy J. Wood + + * include/winuser.h (MONITORENUMPROC): Add typedef. + (EnumDisplayMonitors): Add prototype. + * lib/user32.def (EnumDisplayMonitors): Add stub. + 2002-01-11 Ralf Habacker - * include/ntsecapi.h: Fixed missing void parameter type in some prototypes. + * include/ntsecapi.h: Fixed missing void parameter type in some + prototypes. * include/objbase.h: Ditto. * include/rapi.h: Ditto. * include/rpc.h: Ditto. @@ -42,6 +72,28 @@ * include/rpcproxy.h: Ditto. * include/windef.h: Ditto. +2002-01-07 Danny Smith + + * lib/vfw32.def (LIBRARY): Change to MSVFW32.DLL. + +2002-01-04 TAMURA Kent + + * include/wingdi.h (BI_JPEG, BI_PNG, GGO_BEZIER,GGO_UNHINTED, + LAYOUT_RTL, LAYOUT_BITMAPORIENTATIONPRESERVED): Add defines. + * include/winuser.h (HWND_MESSAGE, WS_EX_COMPOSITED, + WS_EX_LAYERED, WS_EX_LAYOUTRTL, WS_EX_NOACTIVATE, + WS_EX_NOINHERITLAYOUT): Add defines. + * include/winnt.h (PF_RDTSC_INSTRUCTION_AVAILABLE, + PF_PAE_ENABLED, MEM_PHYSICAL, MEM_RESET, MEM_TOP_DOWN, + MEM_WRITE_WATCH): Add defines. + + +2002-01-04 Danny Smith + + * include/winbase.h (InitializeCriticalSectionAndSpinCount): + Add prototype. + (SetCriticalSectionSpinCount): Likewise. + 2001-12-30 Guido Serassio * include/winsvc.h: Add EnumServiceStatusEx(), @@ -67,6 +119,50 @@ * include/commctrl.h: New typedefs for HDLAYOUT and LPHDLAYOUT based on MSDN documentation for XP. +2001-12-15 Andrew Begel + + *include/winbase.h (CreateHardLink): Correct typo in UNICODE + mappings. + +2001-12-11 Phillip Susi + + * include/commctrl.h (ACS_*): Add new defines. + (PGS_*): Ditto. + (CBES_*): Ditto. + (TBSTYLE_*): Ditto. + (TB_*): Ditto. + (TTS_*): Ditto. + (UDS_HOTTRACK): Add define. + (SBT_TOOLTIPS): Ditto. + (TBS_*): Add new defines. + (HDS_*): Ditto. + (LVS_EX_*) Ditto. + (LVKF_*): Ditto. + (TCM_GETEXTENDEDSTYLE): Add define. + (TVS_NOHSCROLL): Ditto. + (TVIF_INTEGRAL): Ditto. + (DTS_SHORTDATECENTURYFORMAT): Ditto. + (TCS_*): Add new defines. + (CBEM_*): Add defines. + (tagNMITEMACTIVATE): Add structure definition and typedefs. + (tagTVITEMEX[AW]: Ditto. + (tagTVINSERTSTRUCT[AW]: Add union member. + * include/winbase.h (VirtualAllocEx): Add prototype. + * include/winuser.h (SS_*): Add new defines. + +2001-12-07 Earnie Boyd + + * Makefile.in: Increment VERSION. + * include/w32api.h: Ditto. + +2001-12-07 Danny Smith + + * include/setupi.h (SetupDiCreateDeviceInterfaceRegKey[AW], + SetupDiCreateDevRegKey[AW],SetupDiDeleteDeviceInterfaceRegKey, + SetupDiDeleteDevRegKey,SetupDiOpenClassRegKey, + SetupDiOpenClassRegKeyEx[AW],SetupDiOpenDeviceInterfaceRegKey, + SetupDiOpenDevRegKey): Correct function names. + 2001-12-07 Earnie Boyd * Makefile.in: Increment VERSION. diff --git a/winsup/w32api/include/commctrl.h b/winsup/w32api/include/commctrl.h index 028734585..bd023bf5f 100644 --- a/winsup/w32api/include/commctrl.h +++ b/winsup/w32api/include/commctrl.h @@ -72,6 +72,14 @@ extern "C" { #define CCS_NOMOVEX 130 #define CCS_RIGHT 131 #endif +#define ACS_CENTER 0x0001 +#define ACS_TRANSPARENT 0x0002 +#define ACS_AUTOPLAY 0x0004 +#define ACS_TIMER 0x0008 +#define PGS_VERT 0x00000000 +#define PGS_HORZ 0x00000001 +#define PGS_AUTOSCROLL 0x00000002 +#define PGS_DRAGNDROP 0x00000004 #define CMB_MASKED 2 #define MINSYSCOMMAND SC_SIZE #define SBT_OWNERDRAW 0x1000 @@ -153,6 +161,13 @@ extern "C" { #define HDI_DI_SETITEM 64 #define HDI_ORDER 128 #endif +#define CBES_EX_NOEDITIMAGE 0x00000001 +#define CBES_EX_NOEDITIMAGEINDENT 0x00000002 +#define CBES_EX_PATHWORDBREAKPROC 0x00000004 +#if (_WIN32_IE >= 0x0400) +#define CBES_EX_NOSIZELIMIT 0x00000008 +#define CBES_EX_CASESENSITIVE 0x00000010 +#endif /* _WIN32_IE >= 0x0400 */ #if (_WIN32_IE >= 0x0500) #define HDI_FILTER 256 #endif @@ -231,6 +246,11 @@ extern "C" { #define TBSTYLE_LIST 4096 #define TBSTYLE_CUSTOMERASE 8192 #endif +#if (_WIN32_IE >= 0x0400) +#define TBSTYLE_REGISTERDROP 0x4000 +#define TBSTYLE_TRANSPARENT 0x8000 +#define TBSTYLE_EX_DRAWDDARROWS 0x00000001 +#endif /* _WIN32_IE >= 0x0400 */ #define TB_ENABLEBUTTON (WM_USER+1) #define TB_CHECKBUTTON (WM_USER+2) #define TB_PRESSBUTTON (WM_USER+3) @@ -307,7 +327,9 @@ extern "C" { #define TBBF_LARGE 1 #define TB_GETBITMAPFLAGS (WM_USER+41) #if _WIN32_IE >= 0x400 -#define TB_SETBUTTONINFO (WM_USER+66) +#define TB_SETBUTTONINFO (WM_USER+66) +#define TB_SETEXTENDEDSTYLE (WM_USER+84) +#define TB_GETEXTENDEDSTYLE (WM_USER+85) #endif #define TBN_GETBUTTONINFOA (TBN_FIRST-0) #define TBN_GETBUTTONINFOW (TBN_FIRST-20) @@ -322,6 +344,12 @@ extern "C" { #define TBN_CUSTHELP (TBN_FIRST-9) #define TTS_ALWAYSTIP 1 #define TTS_NOPREFIX 2 +#if( _WIN32_IE >= 0x0500 ) +#define TTS_NOANIMATE 0x10 +#define TTS_NOFADE 0x20 +#define TTS_BALLOON 0x40 +#define TTS_CLOSE 0x80 +#endif /* _WIN32_IE >= 0x0500 */ #define TTF_IDISHWND 1 #define TTF_CENTERTIP 2 #define TTF_RTLREADING 4 @@ -387,6 +415,9 @@ extern "C" { #define UDS_ARROWKEYS 32 #define UDS_HORZ 64 #define UDS_NOTHOUSANDS 128 +#if ( _WIN32_IE >= 0x0300 ) +#define UDS_HOTTRACK 0x0100 +#endif /* _WIN32_IE >= 0x0300 */ #define UDM_SETRANGE (WM_USER+101) #define UDM_GETRANGE (WM_USER+102) #define UDM_SETPOS (WM_USER+103) @@ -413,6 +444,9 @@ extern "C" { #define SBT_NOBORDERS 256 #define SBT_POPOUT 512 #define SBT_RTLREADING 1024 +#if( _WIN32_IE >= 0x0400 ) +#define SBT_TOOLTIPS 0x0800 +#endif /* _WIN32_IE >= 0x0400 */ #define TBS_AUTOTICKS 1 #define TBS_VERT 2 #define TBS_HORZ 0 @@ -425,6 +459,8 @@ extern "C" { #define TBS_ENABLESELRANGE 32 #define TBS_FIXEDLENGTH 64 #define TBS_NOTHUMB 128 +#define TBS_TOOLTIPS 0x0100 +#define TBS_REVERSED 0x0200 #if _WIN32_IE >= 0x400 #define TBIF_BYINDEX -2147483648 #define TBIF_COMMAND 32 @@ -521,6 +557,10 @@ extern "C" { #define LVS_NOCOLUMNHEADER 0x4000 #define LVS_NOSORTHEADER 0x8000 #if (_WIN32_IE >= 0x0300) +#define HDS_HOTTRACK 0x0004 +#define HDS_DRAGDROP 0x0040 +#define HDS_FULLDRAG 0x0080 +#define HDS_FILTERBAR 0x0100 /* FIXME: missing CDIS_INDETERMINATE,CDIS_MARKED, CDDS_SUBITEM, CDRF_NOTIFYSUBITEMDRAW */ #define CDIS_CHECKED 8 @@ -557,7 +597,19 @@ extern "C" { #define LVS_EX_TWOCLICKACTIVATE 128 #define LVSICF_NOINVALIDATEALL 0x00000001 #define LVSICF_NOSCROLL 0x00000002 -#endif +#if( _WIN32_IE >= 0x0400 ) +#define LVS_EX_FLATSB 0x00000100 +#define LVS_EX_REGIONAL 0x00000200 +#define LVS_EX_INFOTIP 0x00000400 +#define LVS_EX_UNDERLINEHOT 0x00000800 +#define LVS_EX_UNDERLINECOLD 0x00001000 +#define LVS_EX_MULTIWORKAREAS 0x00002000 +#endif /* _WIN32_IE >=0x0400 */ +#if( _WIN32_IE >= 0x0500 ) +#define LVS_EX_LABELTIP 0x00004000 +#define LVS_EX_BORDERSELECT 0x00008000 +#endif /* _WIN32_IE >= 0x0500 */ +#endif /* _WIN32_IE >= 0x0300 */ #define LVSIL_NORMAL 0 #define LVSIL_SMALL 1 #define LVSIL_STATE 2 @@ -721,6 +773,11 @@ extern "C" { #define LVN_SETDISPINFOA (LVN_FIRST-51) #define LVN_SETDISPINFOW (LVN_FIRST-78) #define LVN_KEYDOWN (LVN_FIRST-55) +#if (_WIN32_IE >= 0x0400) +#define LVKF_ALT 0x0001 +#define LVKF_CONTROL 0x0002 +#define LVKF_SHIFT 0x0004 +#endif #define TVS_HASBUTTONS 1 #define TVS_HASLINES 2 #define TVS_LINESATROOT 4 @@ -740,6 +797,9 @@ extern "C" { #define TVS_NOSCROLL 8192 #define TVS_SINGLEEXPAND 1024 #endif +#if( _WIN32_IE >= 0x0500 ) +#define TVS_NOHSCROLL 0x8000 +#endif /* _WIN32_IE >= 0x0500 */ #define TVIF_TEXT 1 #define TVIF_IMAGE 2 #define TVIF_PARAM 4 @@ -747,6 +807,9 @@ extern "C" { #define TVIF_HANDLE 16 #define TVIF_SELECTEDIMAGE 32 #define TVIF_CHILDREN 64 +#if (_WIN32_IE >= 0x0400) +#define TVIF_INTEGRAL 0x0080 +#endif /* _WIN32_IE >= 0x0400 */ #define TVIS_FOCUSED 1 #define TVIS_SELECTED 2 #define TVIS_CUT 4 @@ -881,8 +944,15 @@ extern "C" { #define TCS_BOTTOM 2 #define TCS_RIGHT 2 #define TCS_VERTICAL 128 +#define TCS_SCROLLOPPOSITE 0x0001 #define TCS_HOTTRACK 0x0040 +#define TCS_MULTISELECT 0x0004 #endif +#if( _WIN32_IE >= 0x0400 ) +#define TCS_FLATBUTTONS 0x0008 +#define TCS_EX_FLATSEPARATORS 0x00000001 +#define TCS_EX_REGISTERDROP 0x00000002 +#endif /* _WIN32_IE >= 0x0400 */ #define TCIF_TEXT 1 #define TCIF_IMAGE 2 #define TCIF_RTLREADING 4 @@ -913,6 +983,7 @@ extern "C" { #define TCM_SETTOOLTIPS (TCM_FIRST+46) #define TCM_GETCURFOCUS (TCM_FIRST+47) #define TCM_SETCURFOCUS (TCM_FIRST+48) +#define TCM_GETEXTENDEDSTYLE (TCM_FIRST + 53) #define TCN_KEYDOWN TCN_FIRST #define TCN_SELCHANGE (TCN_FIRST-1) #define TCN_SELCHANGING (TCN_FIRST-2) @@ -970,10 +1041,18 @@ extern "C" { #define DTS_TIMEFORMAT 9 #define DTS_APPCANPARSE 16 #define DTS_RIGHTALIGN 32 +#if ( _WIN32_IE >= 0x500 ) +#define DTS_SHORTDATECENTURYFORMAT 0x000C +#endif /* _WIN32_IE >= 0x500 */ #define MCS_DAYSTATE 1 #define MCS_MULTISELECT 2 #define MCS_WEEKNUMBERS 4 -#define MCS_NOTODAY 8 +#if (_WIN32_IE >= 0x0400) +#define MCS_NOTODAYCIRCLE 0x0008 +#define MCS_NOTODAY 0x0010 +#else /* _WIN32_IE >= 0x0400 */ +#define MCS_NOTODAY 0x0008 +#endif /* _WIN32_IE >= 0x0400 */ #define DTM_GETSYSTEMTIME 0x1001 #define DTM_SETSYSTEMTIME 0x1002 #define DTM_GETRANGE 0x1003 @@ -1146,6 +1225,26 @@ extern "C" { #else #define RB_GETBANDINFO (WM_USER+5) #endif /* _WIN32_IE >= 0x0400 */ +#define CBEM_INSERTITEMA (WM_USER + 1) +#define CBEM_SETIMAGELIST (WM_USER + 2) +#define CBEM_GETIMAGELIST (WM_USER + 3) +#define CBEM_GETITEMA (WM_USER + 4) +#define CBEM_SETITEMA (WM_USER + 5) +#define CBEM_DELETEITEM CB_DELETESTRING +#define CBEM_GETCOMBOCONTROL (WM_USER + 6) +#define CBEM_GETEDITCONTROL (WM_USER + 7) +#define CBEM_SETEXSTYLE (WM_USER + 8) +#define CBEM_GETEXSTYLE (WM_USER + 9) +#if (_WIN32_IE >= 0x0400) +#define CBEM_SETEXTENDEDSTYLE (WM_USER + 14) +#define CBEM_GETEXTENDEDSTYLE (WM_USER + 9) +#define CBEM_SETUNICODEFORMAT CCM_SETUNICODEFORMAT +#define CBEM_GETUNICODEFORMAT CCM_GETUNICODEFORMAT +#endif /* _WIN32_IE >= 0x0400 */ +#define CBEM_HASEDITCHANGED (WM_USER + 10) +#define CBEM_INSERTITEMW (WM_USER + 11) +#define CBEM_SETITEMW (WM_USER + 12) +#define CBEM_GETITEMW (WM_USER + 13) #ifndef RC_INVOKED typedef struct _COLORMAP { @@ -1322,6 +1421,19 @@ typedef struct tagNMTVCUSTOMDRAW { int iLevel; #endif } NMTVCUSTOMDRAW, *LPNMTVCUSTOMDRAW; +#if (_WIN32_IE >= 0x400) +typedef struct tagNMITEMACTIVATE { + NMHDR hdr; + int iItem; + int iSubItem; + UINT uNewState; + UINT uOldState; + UINT uChanged; + POINT ptAction; + LPARAM lParam; + UINT uKeyFlags; +} NMITEMACTIVATE, *LPNMITEMACTIVATE; +#endif /* _WIN32_IE >= 0x0400 */ typedef struct tagTBADDBITMAP { HINSTANCE hInst; UINT nID; @@ -1562,10 +1674,45 @@ typedef struct tagTVITEMW { #define _TV_ITEMW tagTVITEMW #define TV_ITEMW TVITEMW #define LPTV_ITEMW LPTVITEMW +#if (_WIN32_IE >= 0x0400) +typedef struct tagTVITEMEXA { + UINT mask; + HTREEITEM hItem; + UINT state; + UINT stateMask; + LPSTR pszText; + int cchTextMax; + int iImage; + int iSelectedImage; + int cChildren; + LPARAM lParam; + int iIntegral; +} TVITEMEXA, *LPTVITEMEXA; +typedef struct tagTVITEMEXW { + UINT mask; + HTREEITEM hItem; + UINT state; + UINT stateMask; + LPWSTR pszText; + int cchTextMax; + int iImage; + int iSelectedImage; + int cChildren; + LPARAM lParam; + int iIntegral; +} TVITEMEXW, *LPTVITEMEXW; +#endif /* _WIN32_IE >= 0x0400 */ typedef struct tagTVINSERTSTRUCTA { HTREEITEM hParent; HTREEITEM hInsertAfter; +#if (_WIN32_IE >= 0x0400) + _ANONYMOUS_UNION union { + TVITEMEXA itemex; TV_ITEMA item; + } DUMMYUNIONNAME; +#else + TV_ITEMA item; +#endif } TVINSERTSTRUCTA,*LPTVINSERTSTRUCTA; #define _TV_INSERTSTRUCTA tagTVINSERTSTRUCTA #define TV_INSERTSTRUCTA TVINSERTSTRUCTA @@ -1573,7 +1720,14 @@ typedef struct tagTVINSERTSTRUCTA { typedef struct tagTVINSERTSTRUCTW { HTREEITEM hParent; HTREEITEM hInsertAfter; +#if (_WIN32_IE >= 0x0400) + _ANONYMOUS_UNION union { + TVITEMEXW itemex; + TV_ITEMW item; + } DUMMYUNIONNAME; +#else TV_ITEMW item; +#endif } TVINSERTSTRUCTW,*LPTVINSERTSTRUCTW; #define _TV_INSERTSTRUCTW tagTVINSERTSTRUCTW #define TV_INSERTSTRUCTW TVINSERTSTRUCTW @@ -2119,6 +2273,9 @@ typedef TTHITTESTINFOW TTHITTESTINFO,*LPHITTESTINFO; typedef TOOLTIPTEXTW TOOLTIPTEXT,*LPTOOLTIPTEXT; typedef TV_ITEMW TV_ITEM,*LPTV_ITEM; typedef TVITEMW TVITEM,*LPTVITEM; +#if (_WIN32_IE >= 0x0400) +typedef TVITEMEXW TVITEMEX,*LPTVITEMEX; +#endif typedef TV_INSERTSTRUCTW TV_INSERTSTRUCT,*LPTV_INSERTSTRUCT; typedef TVINSERTSTRUCTW TVINSERTSTRUCT,*LPTVINSERTSTRUCT; typedef NM_TREEVIEWW NM_TREEVIEW,*LPNM_TREEVIEW; @@ -2257,6 +2414,9 @@ typedef TTHITTESTINFOA TTHITTESTINFO,*LPHITTESTINFO; typedef TOOLTIPTEXTA TOOLTIPTEXT,*LPTOOLTIPTEXT; typedef TV_ITEMA TV_ITEM,*LPTV_ITEM; typedef TVITEMA TVITEM,*LPTVITEM; +#if (_WIN32_IE >= 0x0400) +typedef TVITEMEXA TVITEMEX,*LPTVITEMEX; +#endif typedef TV_INSERTSTRUCTA TV_INSERTSTRUCT,*LPTV_INSERTSTRUCT; typedef TVINSERTSTRUCTA TVINSERTSTRUCT,*LPTVINSERTSTRUCT; typedef NM_TREEVIEWA NM_TREEVIEW,*LPNM_TREEVIEW; diff --git a/winsup/w32api/include/objbase.h b/winsup/w32api/include/objbase.h index 50ba66e48..b3a5cc968 100644 --- a/winsup/w32api/include/objbase.h +++ b/winsup/w32api/include/objbase.h @@ -145,6 +145,7 @@ WINOLEAPI StgIsStorageFile(const OLECHAR*); WINOLEAPI StgIsStorageILockBytes(ILockBytes*); WINOLEAPI StgSetTimes(OLECHAR const*,FILETIME const*,FILETIME const*,FILETIME const*); WINOLEAPI BindMoniker(LPMONIKER,DWORD,REFIID,PVOID*); +WINOLEAPI CoGetObject(LPCWSTR,BIND_OPTS*,REFIID,void**); WINOLEAPI MkParseDisplayName(LPBC,LPCOLESTR,ULONG*,LPMONIKER*); WINOLEAPI MonikerRelativePathTo(LPMONIKER,LPMONIKER,LPMONIKER*,BOOL); WINOLEAPI MonikerCommonPrefixWith(LPMONIKER,LPMONIKER,LPMONIKER*); diff --git a/winsup/w32api/include/winbase.h b/winsup/w32api/include/winbase.h index 1772c38f0..ebc26873b 100644 --- a/winsup/w32api/include/winbase.h +++ b/winsup/w32api/include/winbase.h @@ -1290,6 +1290,10 @@ BOOL WINAPI ImpersonateSelf(SECURITY_IMPERSONATION_LEVEL); BOOL WINAPI InitAtomTable(DWORD); BOOL WINAPI InitializeAcl(PACL,DWORD,DWORD); VOID WINAPI InitializeCriticalSection(LPCRITICAL_SECTION); +#if (_WIN32_WINNT >= 0x0403) /* Needs NT4, SP3 or later. */ +BOOL WINAPI InitializeCriticalSectionAndSpinCount(LPCRITICAL_SECTION,DWORD); +DWORD WINAPI SetCriticalSectionSpinCount(LPCRITICAL_SECTION,DWORD); +#endif BOOL WINAPI InitializeSecurityDescriptor(PSECURITY_DESCRIPTOR,DWORD); BOOL WINAPI InitializeSid (PSID,PSID_IDENTIFIER_AUTHORITY,BYTE); LONG WINAPI InterlockedCompareExchange(LPLONG,LONG,LONG); @@ -1530,6 +1534,7 @@ BOOL WINAPI UpdateResourceW(HANDLE,LPCWSTR,LPCWSTR,WORD,PVOID,DWORD); BOOL WINAPI VerifyVersionInfoA(LPOSVERSIONINFOEXA,DWORD,DWORDLONG); BOOL WINAPI VerifyVersionInfoW(LPOSVERSIONINFOEXW,DWORD,DWORDLONG); PVOID WINAPI VirtualAlloc(PVOID,DWORD,DWORD,DWORD); +PVOID WINAPI VirtualAllocEx(HANDLE,PVOID,DWORD,DWORD,DWORD); BOOL WINAPI VirtualFree(PVOID,DWORD,DWORD); BOOL WINAPI VirtualFreeEx(HANDLE,PVOID,DWORD,DWORD); BOOL WINAPI VirtualLock(PVOID,DWORD); @@ -1583,7 +1588,7 @@ typedef HW_PROFILE_INFOW HW_PROFILE_INFO,*LPHW_PROFILE_INFO; #define CreateEvent CreateEventW #define CreateFile CreateFileW #define CreateFileMapping CreateFileMappingW -#define CreateCreateHardLink CreateCreateHardLinkW +#define CreateHardLink CreateHardLinkW #define CreateMailslot CreateMailslotW #define CreateMutex CreateMutexW #define CreateNamedPipe CreateNamedPipeW @@ -1719,7 +1724,7 @@ typedef HW_PROFILE_INFOA HW_PROFILE_INFO,*LPHW_PROFILE_INFO; #define CreateEvent CreateEventA #define CreateFile CreateFileA #define CreateFileMapping CreateFileMappingA -#define CreateCreateHardLink CreateCreateHardLinkA +#define CreateHardLink CreateHardLinkA #define CreateMailslot CreateMailslotA #define CreateMutex CreateMutexA #define CreateNamedPipe CreateNamedPipeA diff --git a/winsup/w32api/include/wingdi.h b/winsup/w32api/include/wingdi.h index fd2a5c5de..c938b1d22 100644 --- a/winsup/w32api/include/wingdi.h +++ b/winsup/w32api/include/wingdi.h @@ -9,6 +9,8 @@ extern "C" { #define BI_RLE8 1 #define BI_RLE4 2 #define BI_BITFIELDS 3 +#define BI_JPEG 4 +#define BI_PNG 5 #define LF_FACESIZE 32 #define LF_FULLFACESIZE 64 #define CA_NEGATIVE 1 @@ -239,6 +241,8 @@ extern "C" { #define PFD_NEED_SYSTEM_PALETTE 0x00000100 #define PFD_SWAP_EXCHANGE 0x00000200 #define PFD_SWAP_COPY 0x00000400 +#define PFD_GENERIC_ACCELERATED 0x00001000 +#define PFD_DEPTH_DONTCARE 0x20000000 #define PFD_DOUBLEBUFFER_DONTCARE 0x40000000 #define PFD_STEREO_DONTCARE 0x80000000 #define SP_ERROR (-1) @@ -734,13 +738,15 @@ extern "C" { #define GCP_USEKERNING 8 #define FLI_GLYPHS 0x40000 #define FLI_MASK 0x103b +#define GGO_METRICS 0 #define GGO_BITMAP 1 #define GGO_NATIVE 2 -#define GGO_METRICS 0 +#define GGO_BEZIER 3 #define GGO_GRAY2_BITMAP 4 #define GGO_GRAY4_BITMAP 5 #define GGO_GRAY8_BITMAP 6 #define GGO_GLYPH_INDEX 128 +#define GGO_UNHINTED 256 #define GM_COMPATIBLE 1 #define GM_ADVANCED 2 #define MM_ANISOTROPIC 8 @@ -1147,7 +1153,9 @@ extern "C" { #define WGL_SWAP_UNDERLAY13 0x10000000 #define WGL_SWAP_UNDERLAY14 0x20000000 #define WGL_SWAP_UNDERLAY15 0x40000000 -#define AC_SRC_OVER 0 +#define AC_SRC_OVER 0 +#define LAYOUT_RTL 1 +#define LAYOUT_BITMAPORIENTATIONPRESERVED 8 #ifndef RC_INVOKED typedef struct _ABC { diff --git a/winsup/w32api/include/winnt.h b/winsup/w32api/include/winnt.h index 6c6a49299..49a3c82e8 100644 --- a/winsup/w32api/include/winnt.h +++ b/winsup/w32api/include/winnt.h @@ -565,6 +565,8 @@ typedef BYTE BOOLEAN,*PBOOLEAN; #define PF_ALPHA_BYTE_INSTRUCTIONS 5 #define PF_XMMI_INSTRUCTIONS_AVAILABLE 6 #define PF_3DNOW_INSTRUCTIONS_AVAILABLE 7 +#define PF_RDTSC_INSTRUCTION_AVAILABLE 8 +#define PF_PAE_ENABLED 9 #define PAGE_READONLY 2 #define PAGE_READWRITE 4 #define PAGE_WRITECOPY 8 @@ -629,6 +631,17 @@ typedef BYTE BOOLEAN,*PBOOLEAN; #define MEM_TOP_DOWN 0x100000 #define MEM_4MB_PAGES 0x80000000 #define MEM_IMAGE 16777216 +<<<<<<< winnt.h +#define MEM_MAPPED 262144 +#define MEM_PRIVATE 131072 +#define MEM_DECOMMIT 16384 +#define MEM_RELEASE 32768 +#define MEM_PHYSICAL 0x400000 +#define MEM_RESET 0x80000 /* NT */ +#define MEM_TOP_DOWN 0x100000 /* NT */ +#define MEM_WRITE_WATCH 0x200000 /* 98/Me */ +======= +>>>>>>> 1.42 #define SEC_FILE 0x800000 #define SEC_IMAGE 0x1000000 #define SEC_VLM 0x2000000 diff --git a/winsup/w32api/include/winuser.h b/winsup/w32api/include/winuser.h index 55bbc977e..aeb8a9462 100644 --- a/winsup/w32api/include/winuser.h +++ b/winsup/w32api/include/winuser.h @@ -124,6 +124,8 @@ extern "C" { #define BSM_NETDRIVER 2 #define BSM_VXDS 1 #define BROADCAST_QUERY_DENY 1112363332 +#define ENUM_CURRENT_SETTINGS ((DWORD)-1) +#define ENUM_REGISTRY_SETTINGS ((DWORD)-2) #define DM_BITSPERPEL 0x40000 #define DM_PELSWIDTH 0x80000 #define DM_PELSHEIGHT 0x100000 @@ -305,6 +307,11 @@ extern "C" { #define SS_WHITEFRAME 9 #define SS_WHITERECT 6 #define SS_USERITEM 10 +#define SS_TYPEMASK 0x0000001FL +#define SS_ENDELLIPSIS 0x00004000L +#define SS_PATHELLIPSIS 0x00008000L +#define SS_WORDELLIPSIS 0x0000C000L +#define SS_ELLIPSISMASK 0x0000C000L #define DS_3DLOOK 4 #define DS_ABSALIGN 1 #define DS_CENTER 0x800 @@ -322,13 +329,18 @@ extern "C" { #define WS_EX_ACCEPTFILES 16 #define WS_EX_APPWINDOW 0x40000 #define WS_EX_CLIENTEDGE 512 +#define WS_EX_COMPOSITED 0x2000000 /* XP */ #define WS_EX_CONTEXTHELP 0x400 #define WS_EX_CONTROLPARENT 0x10000 #define WS_EX_DLGMODALFRAME 1 +#define WS_EX_LAYERED 0x80000 /* w2k */ +#define WS_EX_LAYOUTRTL 0x400000 /* w98, w2k */ #define WS_EX_LEFT 0 #define WS_EX_LEFTSCROLLBAR 0x4000 #define WS_EX_LTRREADING 0 #define WS_EX_MDICHILD 64 +#define WS_EX_NOACTIVATE 0x8000000 /* w2k */ +#define WS_EX_NOINHERITLAYOUT 0x100000 /* w2k */ #define WS_EX_NOPARENTNOTIFY 4 #define WS_EX_OVERLAPPEDWINDOW 0x300 #define WS_EX_PALETTEWINDOW 0x188 @@ -939,6 +951,7 @@ extern "C" { #define HWND_TOP ((HWND)0) #define HWND_TOPMOST ((HWND)(-1)) #define HWND_DESKTOP (HWND)0 +#define HWND_MESSAGE ((HWND)(-3)) /* w2k */ #define RDW_ERASE 4 #define RDW_FRAME 1024 #define RDW_INTERNALPAINT 2 @@ -1064,6 +1077,7 @@ extern "C" { #define SPI_SETPOWEROFFTIMEOUT 82 #define SPI_SETSCREENREADER 71 #define SPI_SETSCREENSAVEACTIVE 17 +#define SPI_SETSCREENSAVERRUNNING 97 #define SPI_SETSCREENSAVETIMEOUT 15 #define SPI_SETSERIALKEYS 63 #define SPI_SETSHOWSOUNDS 57 @@ -1858,6 +1872,8 @@ extern "C" { #define MOD_ON_KEYUP 2048 #define MOD_RIGHT 16384 #define MOD_LEFT 32768 +#define LLKHF_ALTDOWN 0x00000020 + #ifndef RC_INVOKED typedef BOOL(CALLBACK *DLGPROC)(HWND,UINT,WPARAM,LPARAM); typedef VOID(CALLBACK *TIMERPROC)(HWND,UINT,UINT,DWORD); @@ -1873,6 +1889,7 @@ typedef LRESULT(CALLBACK *WNDPROC)(HWND,UINT,WPARAM,LPARAM); typedef BOOL(CALLBACK *DRAWSTATEPROC)(HDC,LPARAM,WPARAM,int,int); typedef BOOL(CALLBACK *WNDENUMPROC)(HWND,LPARAM); typedef BOOL(CALLBACK *ENUMWINDOWSPROC)(HWND,LPARAM); +typedef BOOL(CALLBACK* MONITORENUMPROC)(HMONITOR,HDC,LPRECT,LPARAM); typedef BOOL(CALLBACK *NAMEENUMPROCA)(LPSTR,LPARAM); typedef BOOL(CALLBACK *NAMEENUMPROCW)(LPWSTR,LPARAM); typedef NAMEENUMPROCA DESKTOPENUMPROCA; @@ -2537,6 +2554,14 @@ typedef struct tagMONITORINFO { RECT rcWork; DWORD dwFlags; } MONITORINFO,*LPMONITORINFO; +typedef struct tagKBDLLHOOKSTRUCT { + DWORD vkCode; + DWORD scanCode; + DWORD flags; + DWORD time; + DWORD dwExtraInfo; +} KBDLLHOOKSTRUCT, FAR *LPKBDLLHOOKSTRUCT, *PKBDLLHOOKSTRUCT; + #define AnsiToOem CharToOemA #define OemToAnsi OemToCharA @@ -2710,6 +2735,7 @@ UINT WINAPI EnumClipboardFormats(UINT); BOOL WINAPI EnumDesktopsA(HWINSTA,DESKTOPENUMPROCA,LPARAM); BOOL WINAPI EnumDesktopsW(HWINSTA,DESKTOPENUMPROCW,LPARAM); BOOL WINAPI EnumDesktopWindows(HDESK,ENUMWINDOWSPROC,LPARAM); +BOOL WINAPI EnumDisplayMonitors(HDC,LPCRECT,MONITORENUMPROC,LPARAM); BOOL WINAPI EnumDisplaySettingsA(LPCSTR,DWORD,PDEVMODEA); BOOL WINAPI EnumDisplaySettingsW(LPCWSTR,DWORD,PDEVMODEW); int WINAPI EnumPropsA(HWND,PROPENUMPROCA); diff --git a/winsup/w32api/lib/user32.def b/winsup/w32api/lib/user32.def index e8e3628a5..465a912d5 100644 --- a/winsup/w32api/lib/user32.def +++ b/winsup/w32api/lib/user32.def @@ -178,6 +178,7 @@ EnumClipboardFormats@4 EnumDesktopWindows@12 EnumDesktopsA@12 EnumDesktopsW@12 +EnumDisplayMonitors@16 EnumDisplaySettingsA@12 EnumDisplaySettingsW@12 EnumPropsA@8 diff --git a/winsup/w32api/lib/vfw32.def b/winsup/w32api/lib/vfw32.def index 62c2ab4aa..14bcc14fe 100644 --- a/winsup/w32api/lib/vfw32.def +++ b/winsup/w32api/lib/vfw32.def @@ -1,4 +1,4 @@ -LIBRARY VFW32.DLL +LIBRARY MSVFW32.DLL EXPORTS VideoForWindowsVersion@0 StretchDIB@48