* include/winuser.h (ASFW_ANY, LSFW_LOCK, LSFW_UNLOCK,

	LWA_COLORKEY, LWA_ALPHA): Guard with _WIN32_WINNT,
	_WIN32_WINDOWS, not WINVER.
	(AllowSetForegroundWindow,LockSetForegroundWindow,
	SetLayeredWindowAttributes): Likewise.
	(GetLayeredWindowAttributes,UpdateLayeredWindow): Add prototypes.
	* lib/user32.def (GetLayeredWindowAttributes,UpdateLayeredWindow):
	Add stubs.

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 5130c46..124c123 100644 (file)
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,14 @@
+2003-07-26  Danny Smith <dannysmith@users.sourceforge.net>
+
+       * include/winuser.h (ASFW_ANY, LSFW_LOCK, LSFW_UNLOCK,
+       LWA_COLORKEY, LWA_ALPHA): Guard with _WIN32_WINNT,
+       _WIN32_WINDOWS, not WINVER.
+       (AllowSetForegroundWindow,LockSetForegroundWindow,
+       SetLayeredWindowAttributes): Likewise.
+       (GetLayeredWindowAttributes,UpdateLayeredWindow): Add prototypes.
+       * lib/user32.def (GetLayeredWindowAttributes,UpdateLayeredWindow):
+       Add stubs.
+
 2003-07-26  Eric R. Krause  <ekrause_98@users.sourceforge.net>
 
        * include/objidl.h (IMalloc): Fix typo.

diff --git a/winsup/w32api/include/winuser.h b/winsup/w32api/include/winuser.h
index fc49831..b62b3cc 100644 (file)
--- a/winsup/w32api/include/winuser.h
+++ b/winsup/w32api/include/winuser.h
@@ -1993,10 +1993,12 @@ extern "C" {
 #if(WINVER >= 0x0400)
 #define ENDSESSION_LOGOFF    0x80000000
 #endif /* WINVER >= 0x0400 */
-#if(WINVER >= 0x0500)
+#if (_WIN32_WINNT >= _NT5 || _WIN32_WINDOWS >= _WME)
 #define ASFW_ANY ((DWORD)-1)
 #define LSFW_LOCK 1
 #define LSFW_UNLOCK 2
+#endif
+#if(_WIN32_WINNT >= _NT5)
 #define LWA_COLORKEY 1
 #define LWA_ALPHA 2
 #endif
@@ -3360,12 +3362,17 @@ int WINAPIV wsprintfA(LPSTR,LPCSTR,...);
 int WINAPIV wsprintfW(LPWSTR,LPCWSTR,...);
 int WINAPI wvsprintfA(LPSTR,LPCSTR,va_list arglist);
 int WINAPI wvsprintfW(LPWSTR,LPCWSTR,va_list arglist);
-#if(WINVER >= 0x0500)
+#if(_WIN32_WINNT >= _NT5  || _WIN32_WINDOWS >= _WME)
 BOOL WINAPI AllowSetForegroundWindow(DWORD);
 BOOL WINAPI LockSetForegroundWindow(UINT);
+#endif
+#if(_WIN32_WINNT >= _NT5)
 BOOL WINAPI SetLayeredWindowAttributes(HWND,COLORREF,BYTE,DWORD);
+BOOL WINAPI UpdateLayeredWindow(HWND,HDC,POINT*,SIZE*,HDC,POINT*,COLORREF,BLENDFUNCTION*,DWORD);
+#endif
+#if(_WIN32_WINNT >= _WXP)
+BOOL WINAPI GetLayeredWindowAttributes(HWND,COLORREF*,BYTE*,DWORD*);
 #endif
-
 #ifdef UNICODE
 #define EDITWORDBREAKPROC EDITWORDBREAKPROCW
 #define PROPENUMPROC PROPENUMPROCW

diff --git a/winsup/w32api/lib/user32.def b/winsup/w32api/lib/user32.def
index 6e9cf81..3a42ef3 100644 (file)
--- a/winsup/w32api/lib/user32.def
+++ b/winsup/w32api/lib/user32.def
@@ -257,6 +257,7 @@ GetKeyboardState@4
 GetKeyboardType@4
 GetLastActivePopup@4
 GetLastInputInfo@4
+GetLayeredWindowAttributes@16
 GetListBoxInfo@4
 GetMenu@4
 GetMenuBarInfo@16
@@ -566,6 +567,7 @@ UnpackDDElParam@16
 UnregisterClassA@8
 UnregisterClassW@8
 UnregisterHotKey@8
+UpdateLayeredWindow@36
 UpdateWindow@4
 ValidateRect@8
 ValidateRgn@8