diff options
| author | Danny Smith <dannysmith@users.sourceforge.net> | 2004-11-22 02:55:55 +0300 |
|---|---|---|
| committer | Danny Smith <dannysmith@users.sourceforge.net> | 2004-11-22 02:55:55 +0300 |
| commit | 7e33b8b32f74b4a7cd9865f5df144533343c1723 (patch) | |
| tree | ba1c3895d6caeb4fe5e1f6b224b81f22e27ed888 /winsup/w32api | |
| parent | d11206f65ba5d49ab804b7a39dbbbec1d17765d0 (diff) | |
2004-11-21 Benoit Blanchon <bblanchon@users.sourceforge.net>
* include/wingdi.h (AC_SRC_ALPHA, AC_SRC_NO_ALPHA,
AC_DST_NO_ALPHA, ...): Add defines.
* include/winuser.h (ULW_COLORKEY,ULW_ALPHA,
ULW_OPAQUE): Add defines.
Change email address in ChangleLog to sourceforge alias
Diffstat (limited to 'winsup/w32api')
| -rw-r--r-- | winsup/w32api/ChangeLog | 13 | ||||
| -rw-r--r-- | winsup/w32api/include/wingdi.h | 7 | ||||
| -rw-r--r-- | winsup/w32api/include/winuser.h | 7 |
3 files changed, 21 insertions, 6 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index a99cd407a..86ce89ccb 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,10 @@ +2004-11-21 Benoit Blanchon <bblanchon@users.sourceforge.net> + + * include/wingdi.h (AC_SRC_ALPHA, AC_SRC_NO_ALPHA, + AC_DST_NO_ALPHA, ...): Add defines. + * include/winuser.h (ULW_COLORKEY,ULW_ALPHA, + ULW_OPAQUE): Add defines. + 2004-11-21 Danny Smith <dannysmith@users.sourceforge.net> * include/winnt.h (VerSetConditionMask): Correct typo in _WIN32_WINNT @@ -33,7 +40,7 @@ Add defines. (LLKHF_ALTDOWN): Define based on KF_ALTDOWN, -2004-11-19 Benoit Blanchon <benoit.blanchon@free.fr> +2004-11-19 Benoit Blanchon <bblanchon@users.sourceforge.net> * include/shellapi.h (NIF_GUID): Add another define. @@ -78,7 +85,7 @@ * include/shellapi.h (NIF_INFO): Add define. (NIIF_*) Add defines.. - Thanks to: Benoit Blanchon <benoit.blanchon@free.fr> + Thanks to: Benoit Blanchon <bblanchon@users.sourceforge.net> (NIF_*): Convert constants to hex. 2004-11-02 Danny Smith <dannysmith@users.sourceforge.net> @@ -417,7 +424,7 @@ * include/winnt.h (PROCESSOR_ARCHITECTURE_MSIL): Correct define. (PROCESSOR_ARCHITECTURE_AMD64, PROCESSOR_ARCHITECTURE_IA32_ON_WIN64): Add defines. - Thanks to Benoit Blanchon <benoit.blanchon@free.fr> + Thanks to Benoit Blanchon <bblanchon@users.sourceforge.net> 2004-04-24 Justin Forest <vhex@users.sourceforge.net> diff --git a/winsup/w32api/include/wingdi.h b/winsup/w32api/include/wingdi.h index 8845f6954..1b91ba945 100644 --- a/winsup/w32api/include/wingdi.h +++ b/winsup/w32api/include/wingdi.h @@ -1165,7 +1165,12 @@ 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 0x00 +#define AC_SRC_ALPHA 0x01 +#define AC_SRC_NO_PREMULT_ALPHA 0x01 +#define AC_SRC_NO_ALPHA 0x02 +#define AC_DST_NO_PREMULT_ALPHA 0x10 +#define AC_DST_NO_ALPHA 0x20 #define LAYOUT_RTL 1 #define LAYOUT_BITMAPORIENTATIONPRESERVED 8 #if (WINVER > 0x400) diff --git a/winsup/w32api/include/winuser.h b/winsup/w32api/include/winuser.h index e26edb6da..9d58acb5f 100644 --- a/winsup/w32api/include/winuser.h +++ b/winsup/w32api/include/winuser.h @@ -2248,8 +2248,11 @@ extern "C" { #define LSFW_UNLOCK 2 #endif #if (_WIN32_WINNT >= 0x0500) -#define LWA_COLORKEY 1 -#define LWA_ALPHA 2 +#define LWA_COLORKEY 0x01 +#define LWA_ALPHA 0x02 +#define ULW_COLORKEY 0x01 +#define ULW_ALPHA 0x02 +#define ULW_OPAQUE 0x04 #endif #define GA_PARENT 1 #define GA_ROOT 2 |