summaryrefslogtreecommitdiffstats
path: root/winsup/w32api/include/winuser.h
diff options
context:
space:
mode:
authorDanny Smith <dannysmith@users.sourceforge.net>2003-07-26 11:58:24 +0000
committerDanny Smith <dannysmith@users.sourceforge.net>2003-07-26 11:58:24 +0000
commite816a74f802e8d7491f6a887612e0879c84c4cdf (patch)
tree7a609ee4c3ef780c9ef9bf91155a3335213dfe27 /winsup/w32api/include/winuser.h
parent035df9eff5ad116d40599db4ebf9dd8e51734b9c (diff)
downloadcygnal-e816a74f802e8d7491f6a887612e0879c84c4cdf.tar.gz
cygnal-e816a74f802e8d7491f6a887612e0879c84c4cdf.tar.bz2
cygnal-e816a74f802e8d7491f6a887612e0879c84c4cdf.zip
* 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.
Diffstat (limited to 'winsup/w32api/include/winuser.h')
-rw-r--r--winsup/w32api/include/winuser.h13
1 files changed, 10 insertions, 3 deletions
diff --git a/winsup/w32api/include/winuser.h b/winsup/w32api/include/winuser.h
index fc49831ae..b62b3cc74 100644
--- 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