diff options
| -rw-r--r-- | winsup/w32api/ChangeLog | 41 | ||||
| -rw-r--r-- | winsup/w32api/TODO | 3 | ||||
| -rw-r--r-- | winsup/w32api/include/winuser.h | 12 |
3 files changed, 49 insertions, 7 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 6806e5c1f..bc52cabbd 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,44 @@ +2003-09-23 Dimitri Papadopoulos <papadopo@users.sourceforge.net> + + * include/winuser.h (KEYEVENTF_UNICODE, KEYEVENTF_SCANCODE): + Add defines. + +2003-09-23 Dimitri Papadopoulos <papadopo@users.sourceforge.net> + + * include/winable.h [_WIN32_WINNT < 0x0403] (INPUT_MOUSE, + INPUT_KEYBOARD, INPUT_HARDWARE): Duplicate defines in + <winable.h> as seems to be required on older versions of + Windows. + +2003-09-23 Dimitri Papadopoulos <papadopo@users.sourceforge.net> + + * include/winuser.h [WINVER >= 0x0500] (CHILDID_SELF, + GUI_CARETBLINKING, GUI_INMOVESIZE, GUI_INMENUMODE, + GUI_SYSTEMMENUMODE, GUI_POPUPMENUMODE, GUI_16BITTASK): + Add defines, the last one only on Windows XP... + + * include/winable.h [WINVER < 0x0500] (CHILDID_SELF, + GUI_CARETBLINKING, GUI_INMOVESIZE, GUI_INMENUMODE, + GUI_SYSTEMMENUMODE, GUI_POPUPMENUMODE): ...and duplicate + them in <winable.h> as seems to be required on older + versions of Windows. + +2003-09-23 Dimitri Papadopoulos <papadopo@users.sourceforge.net> + + * include/winuser.h [WINVER >= 0x0500] (GUITHREADINFO, + OBJID_WINDOW, OBJID_SYSMENU, OBJID_TITLEBAR, OBJID_MENU, + OBJID_CLIENT, OBJID_VSCROLL, OBJID_HSCROLL, OBJID_SIZEGRIP, + OBJID_CARET, OBJID_CURSOR, OBJID_ALERT, OBJID_SOUND): Bring + back into <winuser.h>... + + * include/winable.h [WINVER < 0x0500] (GUITHREADINFO, + OBJID_WINDOW, OBJID_SYSMENU, OBJID_TITLEBAR, OBJID_MENU, + OBJID_CLIENT, OBJID_VSCROLL, OBJID_HSCROLL, OBJID_SIZEGRIP, + OBJID_CARET, OBJID_CURSOR, OBJID_ALERT, OBJID_SOUND): ...and + comment out in <winable.h>. MSDN may say <winable.h> but this + breaks many programs. It seems it used to be <winable.h> on + older versions of Windows. + 2003-09-17 Danny Smith <dannysmith@users.sourceforge.net> * include/winuser.h (UpdateLayeredWindow): Protect against NOGDI. diff --git a/winsup/w32api/TODO b/winsup/w32api/TODO index 7ad7801b7..9acfbbe71 100644 --- a/winsup/w32api/TODO +++ b/winsup/w32api/TODO @@ -8,9 +8,6 @@ _WIN32_IE issue Missing functions/defines/structs ================================= -CS_ENABLE -CS_DISABLE -CS_DELETE_TRANSFORM ATF_AVAILABLE SERKF_ACTIVE TIMER_ALL_ACCESS,TIMER_MODIFY_STATE (new style Win32 Access Control: accctrl) diff --git a/winsup/w32api/include/winuser.h b/winsup/w32api/include/winuser.h index 01e6ef2d6..d02b50da0 100644 --- a/winsup/w32api/include/winuser.h +++ b/winsup/w32api/include/winuser.h @@ -2025,7 +2025,7 @@ extern "C" { #define MOD_RIGHT 16384 #define MOD_LEFT 32768 #define LLKHF_ALTDOWN 0x00000020 -#if(WINVER >= 0x0500) +#if (WINVER >= 0x0500) #define FLASHW_STOP 0 #define FLASHW_CAPTION 1 #define FLASHW_TRAY 2 @@ -2037,9 +2037,10 @@ extern "C" { #define INPUT_KEYBOARD 1 #define INPUT_HARDWARE 2 #define CURSOR_SHOWING 0x00000001 -#if(WINVER >= 0x0400) +#if (WINVER >= 0x0400) #define ENDSESSION_LOGOFF 0x80000000 #endif /* WINVER >= 0x0400 */ +#if (WINVER >= 0x0500) #define CHILDID_SELF 0 #define OBJID_WINDOW 0x00000000 #define OBJID_SYSMENU 0xFFFFFFFF @@ -2058,15 +2059,16 @@ extern "C" { #define GUI_INMENUMODE 0x00000004 #define GUI_SYSTEMMENUMODE 0x00000008 #define GUI_POPUPMENUMODE 0x00000010 -#if(_WIN32_WINNT >= 0x0501) +#if (_WIN32_WINNT >= 0x0501) #define GUI_16BITTASK 0x00000020 #endif +#endif /* (WINVER >= 0x0500) */ #if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0490) #define ASFW_ANY ((DWORD)-1) #define LSFW_LOCK 1 #define LSFW_UNLOCK 2 #endif -#if(_WIN32_WINNT >= 0x0500) +#if (_WIN32_WINNT >= 0x0500) #define LWA_COLORKEY 1 #define LWA_ALPHA 2 #endif @@ -2836,6 +2838,7 @@ typedef struct tagINPUT { HARDWAREINPUT hi; } DUMMYUNIONNAME; } INPUT, *PINPUT, FAR *LPINPUT; +#if (WINVER >= 0x0500) typedef struct tagGUITHREADINFO { DWORD cbSize; DWORD flags; @@ -2847,6 +2850,7 @@ typedef struct tagGUITHREADINFO { HWND hwndCaret; RECT rcCaret; } GUITHREADINFO,*PGUITHREADINFO; +#endif /* (WINVER >= 0x0500) */ #define AnsiToOem CharToOemA #define OemToAnsi OemToCharA |