From b639ac2b93e78549b8b49c86a5cc34e9942f5907 Mon Sep 17 00:00:00 2001 From: Danny Smith Date: Mon, 15 Sep 2003 10:21:57 +0000 Subject: 2003-09-15 Danny Smith * include/ws2spi.h (LPWSPBIND): Change CONST LPSOCKADDR to const struct sockaddr*. (LPWSPCONNECT): Likewise. (LPWSPJOINLEAF): Likewise. (LPWSPSENDTO): Likewise. Tanks to Sebastian Nowak 2003-09-15 Filip Navara * include/commctrl.h (TCIS_BUTTONPRESSED, TCIS_HIGHLIGHTED): Add definitions. 2003-09-15 Sascha Brawer * include/winuser.h (DISPLAY_DEVICE_ATTACHED_TO_DESKTOP, DISPLAY_DEVICE_PRIMARY_DEVICE, DISPLAY_DEVICE_MIRRORING_DRIVER, DISPLAY_DEVICE_VGA_COMPATIBLE, DISPLAY_DEVICE_REMOVABLE, DISPLAY_DEVICE_MODESPRUNED): Define constants. (ChangeDisplaySettingsEx[A,W]): Add prototype. * lib/user32.def (ChangeDisplaySettingsEx[A,W]): Add exports. (EnumDisplayDevices[A,W]): Likewise. 2003-09-15 Danny Smith * include.commctrl.h (_WIN32_WINNT): Change _WXP to 0x0501, throughout. --- winsup/w32api/ChangeLog | 30 ++++++++++++++++++++++++++++++ winsup/w32api/include/commctrl.h | 22 +++++++++++++--------- winsup/w32api/include/winuser.h | 14 ++++++++++++-- winsup/w32api/include/ws2spi.h | 12 ++++++------ winsup/w32api/lib/user32.def | 4 ++++ 5 files changed, 65 insertions(+), 17 deletions(-) diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index bb0798cee..528e23d24 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,33 @@ +2003-09-15 Danny Smith + + * include/ws2spi.h (LPWSPBIND): Change CONST LPSOCKADDR to + const struct sockaddr*. + (LPWSPCONNECT): Likewise. + (LPWSPJOINLEAF): Likewise. + (LPWSPSENDTO): Likewise. + Tanks to Sebastian Nowak + +2003-09-15 Filip Navara + + * include/commctrl.h (TCIS_BUTTONPRESSED, TCIS_HIGHLIGHTED): + Add definitions. + +2003-09-15 Sascha Brawer + + * include/winuser.h (DISPLAY_DEVICE_ATTACHED_TO_DESKTOP, + DISPLAY_DEVICE_PRIMARY_DEVICE, DISPLAY_DEVICE_MIRRORING_DRIVER, + DISPLAY_DEVICE_VGA_COMPATIBLE, DISPLAY_DEVICE_REMOVABLE, + DISPLAY_DEVICE_MODESPRUNED): Define constants. + (ChangeDisplaySettingsEx[A,W]): Add prototype. + + * lib/user32.def (ChangeDisplaySettingsEx[A,W]): Add exports. + (EnumDisplayDevices[A,W]): Likewise. + +2003-09-15 Danny Smith + + * include.commctrl.h (_WIN32_WINNT): Change _WXP to 0x0501, + throughout. + 2003-09-13 Danny Smith * include/olectl.h (TEXTMETRICOLE, LPERRORLOG, LPPROPERTYBAG, diff --git a/winsup/w32api/include/commctrl.h b/winsup/w32api/include/commctrl.h index 0804be50d..15f2d24d2 100644 --- a/winsup/w32api/include/commctrl.h +++ b/winsup/w32api/include/commctrl.h @@ -440,9 +440,9 @@ extern "C" { #define TBSTYLE_EX_MIXEDBUTTONS 8 #define TBSTYLE_EX_HIDECLIPPEDBUTTONS 16 #endif /* _WIN32_IE >= 0x0501 */ -#if (_WIN32_WINNT >= _WXP) +#if (_WIN32_WINNT >= 0x0501) #define TBSTYLE_EX_DOUBLEBUFFER 0x80 -#endif /* _WIN32_WINNT >= _WXP */ +#endif /* _WIN32_WINNT >= 0x0501 */ #if (_WIN32_IE >= 0x0500) #define BTNS_BUTTON TBSTYLE_BUTTON #define BTNS_SEP TBSTYLE_SEP @@ -914,7 +914,7 @@ extern "C" { #define CDIS_SELECTED 1 #define CDIS_MARKED 128 #define CDIS_INDETERMINATE 256 -#if (_WIN32_WINNT >= _WXP) +#if (_WIN32_WINNT >= 0x0501) #define CDIS_SHOWKEYBOARDCUES 512 #endif #define CDDS_POSTERASE 4 @@ -990,7 +990,7 @@ extern "C" { #define LVIF_INDENT 16 #define LVIF_NORECOMPUTE 2048 #endif -#if (_WIN32_WINNT >= _WXP) +#if (_WIN32_WINNT >= 0x0501) #define LVIF_GROUPID 128 #define LVIF_COLUMNS 256 #endif @@ -1374,6 +1374,10 @@ extern "C" { #if (_WIN32_IE >= 0x0400) #define TCIF_STATE 16 #endif +#define TCIS_BUTTONPRESSED 1 +#if (_WIN32_IE >= 0x0400) +#define TCIS_HIGHLIGHTED 2 +#endif #define TCM_FIRST 0x1300 #define TCM_GETIMAGELIST (TCM_FIRST+2) #define TCM_SETIMAGELIST (TCM_FIRST+3) @@ -1441,7 +1445,7 @@ extern "C" { #define CCM_SETVERSION 0x2007 #define CCM_GETVERSION 0x2008 #define CCM_SETNOTIFYWINDOW 0x2009 -#if (_WIN32_WINNT >= _WXP) +#if (_WIN32_WINNT >= 0x0501) #define CCM_SETWINDOWTHEME 0x200b #define CCM_DPISCALE 0x200c #endif @@ -2119,7 +2123,7 @@ typedef struct _NMTBCUSTOMDRAW { RECT rcText; int nStringBkMode; int nHLStringBkMode; -#if (_WIN32_WINNT >= _WXP) +#if (_WIN32_WINNT >= 0x0501) int iListGap; #endif } NMTBCUSTOMDRAW, * LPNMTBCUSTOMDRAW; @@ -2275,7 +2279,7 @@ typedef struct _LVITEMA { #if (_WIN32_IE >= 0x0300) int iIndent; #endif -#if (_WIN32_WINNT >= _WXP) +#if (_WIN32_WINNT >= 0x0501) int iGroupId; UINT cColumns; PUINT puColumns; @@ -2296,7 +2300,7 @@ typedef struct _LVITEMW { #if (_WIN32_IE >= 0x0300) int iIndent; #endif -#if (_WIN32_WINNT >= _WXP) +#if (_WIN32_WINNT >= 0x0501) int iGroupId; UINT cColumns; PUINT puColumns; @@ -2700,7 +2704,7 @@ typedef struct tagIMAGELISTDRAWPARAMS { COLORREF rgbFg; UINT fStyle; DWORD dwRop; -#if (_WIN32_WINNT >= _WXP) +#if (_WIN32_WINNT >= 0x0501) DWORD fState; DWORD Frame; COLORREF crEffect; diff --git a/winsup/w32api/include/winuser.h b/winsup/w32api/include/winuser.h index 01b0a6727..35f5643bf 100644 --- a/winsup/w32api/include/winuser.h +++ b/winsup/w32api/include/winuser.h @@ -151,6 +151,12 @@ extern "C" { #define DISP_CHANGE_FAILED (-1) #define DISP_CHANGE_BADMODE (-2) #define DISP_CHANGE_NOTUPDATED (-3) +#define DISPLAY_DEVICE_ATTACHED_TO_DESKTOP 0x01 +#define DISPLAY_DEVICE_PRIMARY_DEVICE 0x04 +#define DISPLAY_DEVICE_MIRRORING_DRIVER 0x08 +#define DISPLAY_DEVICE_VGA_COMPATIBLE 0x10 +#define DISPLAY_DEVICE_REMOVABLE 0x20 +#define DISPLAY_DEVICE_MODESPRUNED 0x08000000 #define BST_CHECKED 1 #define BST_INDETERMINATE 2 #define BST_UNCHECKED 0 @@ -2857,6 +2863,8 @@ BOOL WINAPI ChangeClipboardChain(HWND,HWND); #ifndef NOGDI LONG WINAPI ChangeDisplaySettingsA(PDEVMODEA,DWORD); LONG WINAPI ChangeDisplaySettingsW(PDEVMODEW,DWORD); +LONG WINAPI ChangeDisplaySettingsExA(LPCSTR,LPDEVMODEA,HWND,DWORD,LPVOID); +LONG WINAPI ChangeDisplaySettingsExW(LPCWSTR,LPDEVMODEW,HWND,DWORD,LPVOID); #endif BOOL WINAPI ChangeMenuA(HMENU,UINT,LPCSTR,UINT,UINT); BOOL WINAPI ChangeMenuW(HMENU,UINT,LPCWSTR,UINT,UINT); @@ -3566,9 +3574,10 @@ typedef MONITORINFOEXW MONITORINFOEX, *LPMONITORINFOEX; typedef ICONMETRICSW ICONMETRICS,*LPICONMETRICS; typedef NONCLIENTMETRICSW NONCLIENTMETRICS,*LPNONCLIENTMETRICS; #define ChangeDisplaySettings ChangeDisplaySettingsW +#define ChangeDisplaySettingsEx ChangeDisplaySettingsExW #define CreateDesktop CreateDesktopW #define EnumDisplaySettings EnumDisplaySettingsW -#define EnumDisplayDevices EnumDisplayDevicesW +#define EnumDisplayDevices EnumDisplayDevicesW #endif /* NOGDI */ #else /* UNICODE */ #define EDITWORDBREAKPROC EDITWORDBREAKPROCA @@ -3723,9 +3732,10 @@ typedef MONITORINFOEXA MONITORINFOEX, *LPMONITORINFOEX; typedef ICONMETRICSA ICONMETRICS,*LPICONMETRICS; typedef NONCLIENTMETRICSA NONCLIENTMETRICS,*LPNONCLIENTMETRICS; #define ChangeDisplaySettings ChangeDisplaySettingsA +#define ChangeDisplaySettingsEx ChangeDisplaySettingsExA #define CreateDesktop CreateDesktopA #define EnumDisplaySettings EnumDisplaySettingsA -#define EnumDisplayDevices EnumDisplayDevicesA +#define EnumDisplayDevices EnumDisplayDevicesA #endif /* NOGDI */ #endif /* UNICODE */ #endif /* RC_INVOKED */ diff --git a/winsup/w32api/include/ws2spi.h b/winsup/w32api/include/ws2spi.h index d721352f7..49b7c4afc 100644 --- a/winsup/w32api/include/ws2spi.h +++ b/winsup/w32api/include/ws2spi.h @@ -46,11 +46,11 @@ typedef VOID (CALLBACK FAR *LPWSAUSERAPC)(DWORD); typedef SOCKET (WSPAPI *LPWSPACCEPT)(SOCKET,LPSOCKADDR,LPINT,LPCONDITIONPROC,DWORD,LPINT); typedef INT (WSPAPI *LPWSPADDRESSTOSTRING)(LPSOCKADDR,DWORD,LPWSAPROTOCOL_INFOW,LPWSTR,LPDWORD,LPINT); typedef INT (WSPAPI *LPWSPASYNCSELECT)(SOCKET,HWND,UINT,LONG,LPINT); -typedef INT (WSPAPI *LPWSPBIND)(SOCKET,CONST LPSOCKADDR,INT,LPINT); +typedef INT (WSPAPI *LPWSPBIND)(SOCKET,const struct sockaddr*,INT,LPINT); typedef INT (WSPAPI *LPWSPCANCELBLOCKINGCALL)(LPINT); typedef INT (WSPAPI *LPWSPCLEANUP)(LPINT); typedef INT (WSPAPI *LPWSPCLOSESOCKET)(SOCKET,LPINT); -typedef INT (WSPAPI *LPWSPCONNECT)(SOCKET,CONST LPSOCKADDR,INT,LPWSABUF,LPWSABUF,LPQOS,LPQOS,LPINT); +typedef INT (WSPAPI *LPWSPCONNECT)(SOCKET,const struct sockaddr*,INT,LPWSABUF,LPWSABUF,LPQOS,LPQOS,LPINT); typedef INT (WSPAPI *LPWSPDUPLICATESOCKET)(SOCKET,DWORD,LPWSAPROTOCOL_INFOW,LPINT); typedef INT (WSPAPI *LPWSPENUMNETWORKEVENTS)(SOCKET,WSAEVENT,LPWSANETWORKEVENTS,LPINT); typedef INT (WSPAPI *LPWSPEVENTSELECT)(SOCKET,WSAEVENT,LONG,LPINT); @@ -60,8 +60,8 @@ typedef BOOL (WSPAPI *LPWSPGETQOSBYNAME)(SOCKET,LPWSABUF,LPQOS,LPINT); typedef INT (WSPAPI *LPWSPGETSOCKNAME)(SOCKET,LPSOCKADDR,LPINT,LPINT); typedef INT (WSPAPI *LPWSPGETSOCKOPT)(SOCKET,INT,INT,CHAR FAR*,LPINT,LPINT); typedef INT (WSPAPI *LPWSPIOCTL)(SOCKET,DWORD,LPVOID,DWORD,LPVOID,DWORD,LPDWORD, -LPWSAOVERLAPPED,LPWSAOVERLAPPED_COMPLETION_ROUTINE,LPWSATHREADID,LPINT); -typedef SOCKET (WSPAPI *LPWSPJOINLEAF)(SOCKET,CONST LPSOCKADDR,INT,LPWSABUF,LPWSABUF,LPQOS,LPQOS,DWORD,LPINT); + LPWSAOVERLAPPED,LPWSAOVERLAPPED_COMPLETION_ROUTINE,LPWSATHREADID,LPINT); +typedef SOCKET (WSPAPI *LPWSPJOINLEAF)(SOCKET,const struct sockaddr*,INT,LPWSABUF,LPWSABUF,LPQOS,LPQOS,DWORD,LPINT); typedef INT (WSPAPI *LPWSPLISTEN)(SOCKET,INT,LPINT); typedef INT (WSPAPI *LPWSPRECV)(SOCKET,LPWSABUF,DWORD,LPDWORD,LPDWORD, LPWSAOVERLAPPED,LPWSAOVERLAPPED_COMPLETION_ROUTINE,LPWSATHREADID,LPINT); @@ -72,8 +72,8 @@ typedef INT (WSPAPI *LPWSPSELECT)(INT,LPFD_SET,LPFD_SET,LPFD_SET,CONST LPTIMEVAL typedef INT (WSPAPI *LPWSPSEND)(SOCKET,LPWSABUF,DWORD,LPDWORD,DWORD, LPWSAOVERLAPPED,LPWSAOVERLAPPED_COMPLETION_ROUTINE,LPWSATHREADID,LPINT); typedef INT (WSPAPI *LPWSPSENDDISCONNECT)(SOCKET,LPWSABUF,LPINT); -typedef INT (WSPAPI *LPWSPSENDTO)(SOCKET,LPWSABUF,DWORD,LPDWORD,DWORD,CONST LPSOCKADDR, -INT,LPWSAOVERLAPPED,LPWSAOVERLAPPED_COMPLETION_ROUTINE,LPWSATHREADID,LPINT); +typedef INT (WSPAPI *LPWSPSENDTO)(SOCKET,LPWSABUF,DWORD,LPDWORD,DWORD,const struct sockaddr*, + INT,LPWSAOVERLAPPED,LPWSAOVERLAPPED_COMPLETION_ROUTINE,LPWSATHREADID,LPINT); typedef INT (WSPAPI *LPWSPSETSOCKOPT)(SOCKET,INT,INT,CONST CHAR FAR*,INT,LPINT); typedef INT (WSPAPI *LPWSPSHUTDOWN)(SOCKET,INT,LPINT); typedef SOCKET (WSPAPI *LPWSPSOCKET)(INT,INT,INT,LPWSAPROTOCOL_INFOW,GROUP,DWORD,LPINT); diff --git a/winsup/w32api/lib/user32.def b/winsup/w32api/lib/user32.def index 3a42ef395..140841b45 100644 --- a/winsup/w32api/lib/user32.def +++ b/winsup/w32api/lib/user32.def @@ -25,6 +25,8 @@ CascadeWindows@20 ChangeClipboardChain@8 ChangeDisplaySettingsA@8 ChangeDisplaySettingsW@8 +ChangeDisplaySettingsExA@20 +ChangeDisplaySettingsExW@20 ChangeMenuA@20 ChangeMenuW@20 CharLowerA@4 @@ -179,6 +181,8 @@ EnumClipboardFormats@4 EnumDesktopWindows@12 EnumDesktopsA@12 EnumDesktopsW@12 +EnumDisplayDevicesA@16 +EnumDisplayDevicesW@16 EnumDisplayMonitors@16 EnumDisplaySettingsA@12 EnumDisplaySettingsW@12 -- cgit v1.2.3