From 21d105b7c607fb6de4b44289423e26c684e92223 Mon Sep 17 00:00:00 2001 From: Chris Sutcliffe Date: Fri, 20 Nov 2009 23:46:05 +0000 Subject: [PATCH] 2009-20-10 Michael James * include/wingdi.h (CLEARTYPE_QUALITY): Define. * include/winuser.h (WM_KEYLAST): Alternative definition when _WIN32_WINNT >= 0x0501. (WM_UNICHAR,UNICODE_NOCHAR): Define. * lib/comctl32.def (DefSubclassProc@16,GetWindowSubclass@16, RemoveWindowSubclass@12): Add exports. * lib/gdi32.def (GetDCBrushColor@4,GetDCPenColor@4): Add exports. --- winsup/w32api/ChangeLog | 10 ++++++++++ winsup/w32api/include/wingdi.h | 5 ++++- winsup/w32api/include/winuser.h | 6 ++++++ winsup/w32api/lib/comctl32.def | 3 +++ 4 files changed, 23 insertions(+), 1 deletion(-) diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 2b78a909b..68824248b 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,13 @@ +2009-20-10 Michael James + + * include/wingdi.h (CLEARTYPE_QUALITY): Define. + * include/winuser.h (WM_KEYLAST): Alternative definition when _WIN32_WINNT + >= 0x0501. + (WM_UNICHAR,UNICODE_NOCHAR): Define. + * lib/comctl32.def (DefSubclassProc@16,GetWindowSubclass@16, + RemoveWindowSubclass@12): Add exports. + * lib/gdi32.def (GetDCBrushColor@4,GetDCPenColor@4): Add exports. + 2009-20-10 Jarkko Sakkinen * include/winuser.h (WM_TOUCHMOVE, WM_TOUCHDOWN, WM_TOUCHUP, diff --git a/winsup/w32api/include/wingdi.h b/winsup/w32api/include/wingdi.h index c62111da2..6b5ce9c3a 100644 --- a/winsup/w32api/include/wingdi.h +++ b/winsup/w32api/include/wingdi.h @@ -358,7 +358,7 @@ extern "C" { #define OUT_RASTER_PRECIS 6 #define OUT_TT_ONLY_PRECIS 7 #define OUT_OUTLINE_PRECIS 8 -//http://www.pinvoke.net/default.aspx/Structures/LOGFONT.html +/* http://www.pinvoke.net/default.aspx/Structures/LOGFONT.html */ #define OUT_PS_ONLY_PRECIS 10 #define CLIP_DEFAULT_PRECIS 0 #define CLIP_CHARACTER_PRECIS 1 @@ -372,6 +372,9 @@ extern "C" { #define PROOF_QUALITY 2 #define NONANTIALIASED_QUALITY 3 #define ANTIALIASED_QUALITY 4 +#if _WIN32_WINNT >= 0x0500 +#define CLEARTYPE_QUALITY 5 +#endif #define DEFAULT_PITCH 0 #define FIXED_PITCH 1 #define VARIABLE_PITCH 2 diff --git a/winsup/w32api/include/winuser.h b/winsup/w32api/include/winuser.h index 675e62fc0..29b787048 100644 --- a/winsup/w32api/include/winuser.h +++ b/winsup/w32api/include/winuser.h @@ -1554,7 +1554,13 @@ extern "C" { #define WM_WINDOWPOSCHANGING 70 #define WM_WININICHANGE 26 #define WM_KEYFIRST 256 +#if _WIN32_WINNT >= 0x0501 +#define WM_KEYLAST 265 +#define WM_UNICHAR 265 +#define UNICODE_NOCHAR 0xffff +#else #define WM_KEYLAST 264 +#endif #define WM_SYNCPAINT 136 #define WM_MOUSEACTIVATE 33 #define WM_MOUSEMOVE 512 diff --git a/winsup/w32api/lib/comctl32.def b/winsup/w32api/lib/comctl32.def index 99d5112fe..04dbc66ee 100644 --- a/winsup/w32api/lib/comctl32.def +++ b/winsup/w32api/lib/comctl32.def @@ -40,6 +40,7 @@ DSA_GetItem@12 DSA_GetItemPtr@8 DSA_InsertItem@12 DSA_SetItem@12 +DefSubclassProc@16 DelMRUString@8 DestroyPropertySheetPage@4 DrawInsert@12 @@ -55,6 +56,7 @@ Free@4 FreeMRUList@4 GetEffectiveClientRect@12 GetSize@4 +GetWindowSubclass@16 ImageList_Add@12 ImageList_AddIcon@8 ImageList_AddMasked@12 @@ -101,6 +103,7 @@ PropertySheet@4 PropertySheetA@4 PropertySheetW@4 ReAlloc@8 +RemoveWindowSubclass@12 SendNotify@16 SendNotifyEx@20 SetWindowSubclass@16