* include/winuser.h (DeregisterShellHookWindow): Add function.

* include/winuser.h [_WIN32_WINNT >= 0x0500] (EndTask): Add function.
* lib/user32.def (EndTask): Add function.
* include/winuser.h (WINVER, _WIN32_WINNT): It's better (?) to use _WIN32_WINNT instead of WINVER to test for Windows 2000.
* include/winable.h: Reorder target macros.
* lib/*.def: Cleanup.

23 files changed, 60 insertions, 39 deletions

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 7342a9486..b48502863 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,5 +1,20 @@
 2003-09-25  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
 
+	* include/winuser.h (DeregisterShellHookWindow): Add function.
+
+	* include/winuser.h [_WIN32_WINNT >= 0x0500] (EndTask): Add function.
+
+	* lib/user32.def (EndTask): Add function.
+
+	* include/winuser.h (WINVER, _WIN32_WINNT): It's better (?) to
+	use _WIN32_WINNT instead of WINVER to test for Windows 2000.
+
+	* include/winable.h: Reorder target macros.
+
+	* lib/*.def: Cleanup.
+
+2003-09-25  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
+
 	* include/winuser.h [WINVER >= 0x0500] (AnimateWindow): Add
 	function.
 
diff --git a/winsup/w32api/include/winable.h b/winsup/w32api/include/winable.h
index 83f003ae7..75af57c28 100644
--- a/winsup/w32api/include/winable.h
+++ b/winsup/w32api/include/winable.h
@@ -8,12 +8,12 @@
 extern "C" {
 #endif
 
+#if (WINVER < 0x0500)
 #if (_WIN32_WINNT < 0x0403)
 #define INPUT_MOUSE 0
 #define INPUT_KEYBOARD 1
 #define INPUT_HARDWARE 2
 #endif /* (_WIN32_WINNT < 0x04030) */
-#if (WINVER < 0x0500)
 #define CHILDID_SELF 0
 #define OBJID_WINDOW 0x00000000
 #define OBJID_SYSMENU 0xFFFFFFFF
diff --git a/winsup/w32api/include/winuser.h b/winsup/w32api/include/winuser.h
index 73891ba11..b556bb7f8 100644
--- a/winsup/w32api/include/winuser.h
+++ b/winsup/w32api/include/winuser.h
@@ -460,7 +460,7 @@ extern "C" {
 #if (WINVER >= 0x0500)
 #define DFCS_TRANSPARENT	0x800
 #define DFCS_HOT	0x1000
-#endif /* WINVER >= 0x0500 */
+#endif /* (WINVER >= 0x0500) */
 #define DFCS_ADJUSTRECT	0x2000
 #define DFCS_FLAT	0x4000
 #define DFCS_MONO	0x8000
@@ -555,7 +555,7 @@ extern "C" {
 #define EWX_POWEROFF 8
 #define EWX_REBOOT 2
 #define EWX_SHUTDOWN 1
-#if(_WIN32_WINNT >= 0x0500)
+#if (_WIN32_WINNT >= 0x0500)
 #define EWX_FORCEIFHUNG 16
 #endif
 #define CS_BYTEALIGNCLIENT 4096
@@ -724,12 +724,12 @@ extern "C" {
 #define IDYES 6
 #define IDNO 7
 #if (WINVER >= 0x0400)
-#  define IDCLOSE 8
-#  define IDHELP 9
+#define IDCLOSE 8
+#define IDHELP 9
 #endif
 #if (WINVER >= 0x0500)
-#  define IDTRYAGAIN 10
-#  define IDCONTINUE 11
+#define IDTRYAGAIN 10
+#define IDCONTINUE 11
 #endif
 
 #define GWL_EXSTYLE (-20)
@@ -902,9 +902,9 @@ extern "C" {
 #define SM_CMONITORS 80
 #define SM_SAMEDISPLAYFORMAT 81
 #if (_WIN32_WINNT < 0x0400)
-#define SM_CMETRICS 76
+# define SM_CMETRICS 76
 #else
-#define SM_CMETRICS 83
+# define SM_CMETRICS 83
 #endif
 #define ARW_BOTTOMLEFT 0
 #define ARW_BOTTOMRIGHT 1
@@ -933,7 +933,7 @@ extern "C" {
 #define LR_SHARED 32768
 #define KEYEVENTF_EXTENDEDKEY 0x00000001
 #define KEYEVENTF_KEYUP 00000002
-#if(_WIN32_WINNT >= 0x0500)
+#if (_WIN32_WINNT >= 0x0500)
 #define KEYEVENTF_UNICODE 0x00000004
 #define KEYEVENTF_SCANCODE 0x00000008
 #endif
@@ -1263,7 +1263,7 @@ extern "C" {
 #define WM_MDISETMENU 560
 #define WM_MDITILE 550
 #define WM_MEASUREITEM 44
-#if(WINVER >= 0x0500)
+#if (WINVER >= 0x0500)
 #define WM_MENURBUTTONUP 290
 #endif
 #define WM_MENUCHAR 288
@@ -1365,7 +1365,7 @@ extern "C" {
 #define WM_MOUSELAST 522
 #define WM_MOUSEHOVER	0x2A1
 #define WM_MOUSELEAVE	0x2A3
-#if(_WIN32_WINNT >= 0x0400)
+#if (_WIN32_WINNT >= 0x0400)
 #define WHEEL_DELTA 120
 #define GET_WHEEL_DELTA_WPARAM(wparam) ((short)HIWORD (wparam))
 #define WHEEL_PAGESCROLL UINT_MAX
@@ -2038,8 +2038,8 @@ extern "C" {
 #define INPUT_HARDWARE 2
 #define CURSOR_SHOWING 0x00000001
 #if (WINVER >= 0x0400)
-#define ENDSESSION_LOGOFF    0x80000000
-#endif /* WINVER >= 0x0400 */
+#define ENDSESSION_LOGOFF 0x80000000
+#endif /* (WINVER >= 0x0400) */
 #if (WINVER >= 0x0500)
 #define CHILDID_SELF 0
 #define OBJID_WINDOW 0x00000000
@@ -2804,7 +2804,7 @@ typedef struct tagKBDLLHOOKSTRUCT {
 	DWORD time;
 	DWORD dwExtraInfo;
 } KBDLLHOOKSTRUCT, FAR *LPKBDLLHOOKSTRUCT, *PKBDLLHOOKSTRUCT;
-#if(WINVER >= 0x0500)
+#if (WINVER >= 0x0500)
 typedef struct {
   UINT  cbSize;
   HWND  hwnd;
@@ -2883,9 +2883,9 @@ typedef struct tagGUITHREADINFO {
 HKL WINAPI ActivateKeyboardLayout(HKL,UINT);
 BOOL WINAPI AdjustWindowRect(LPRECT,DWORD,BOOL);
 BOOL WINAPI AdjustWindowRectEx(LPRECT,DWORD,BOOL,DWORD);
-#if (WINVER >= 0x0500)
+#if (_WIN32_WINNT >= 0x0500)
 BOOL WINAPI AnimateWindow(HWND,DWORD,DWORD);
-#endif /* (WINVER >= 0x0500) */
+#endif /* (_WIN32_WINNT >= 0x0500) */
 BOOL WINAPI AnyPopup(void);
 BOOL WINAPI AppendMenuA(HMENU,UINT,UINT_PTR,LPCSTR);
 BOOL WINAPI AppendMenuW(HMENU,UINT,UINT_PTR,LPCWSTR);
@@ -2989,6 +2989,7 @@ LRESULT WINAPI DefMDIChildProcW(HWND,UINT,WPARAM,LPARAM);
 LRESULT WINAPI DefWindowProcA(HWND,UINT,WPARAM,LPARAM);
 LRESULT WINAPI DefWindowProcW(HWND,UINT,WPARAM,LPARAM);
 BOOL WINAPI DeleteMenu(HMENU,UINT,UINT);
+BOOL WINAPI DeregisterShellHookWindow(HWND);
 BOOL WINAPI DestroyAcceleratorTable(HACCEL);
 BOOL WINAPI DestroyCaret(void);
 BOOL WINAPI DestroyCursor(HCURSOR);
@@ -3037,6 +3038,9 @@ BOOL WINAPI EndDeferWindowPos(HDWP);
 BOOL WINAPI EndDialog(HWND,int);
 BOOL WINAPI EndMenu(VOID);
 BOOL WINAPI EndPaint(HWND,const PAINTSTRUCT*);
+#if (_WIN32_WINNT >= 0x0500)
+BOOL WINAPI EndTask(HWND,BOOL,BOOL);
+#endif
 BOOL WINAPI EnumChildWindows(HWND,ENUMWINDOWSPROC,LPARAM);
 UINT WINAPI EnumClipboardFormats(UINT);
 BOOL WINAPI EnumDesktopsA(HWINSTA,DESKTOPENUMPROCA,LPARAM);
@@ -3454,17 +3458,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(_WIN32_WINNT >= 0x0500  || _WIN32_WINDOWS >= 0x0490)
+#if (_WIN32_WINNT >= 0x0500  || _WIN32_WINDOWS >= 0x0490)
 BOOL WINAPI AllowSetForegroundWindow(DWORD);
 BOOL WINAPI LockSetForegroundWindow(UINT);
 #endif
-#if(_WIN32_WINNT >= 0x0500)
+#if (_WIN32_WINNT >= 0x0500)
 BOOL WINAPI SetLayeredWindowAttributes(HWND,COLORREF,BYTE,DWORD);
 #ifndef NOGDI
 BOOL WINAPI UpdateLayeredWindow(HWND,HDC,POINT*,SIZE*,HDC,POINT*,COLORREF,BLENDFUNCTION*,DWORD);
 #endif
 #endif
-#if(_WIN32_WINNT >= 0x0501)
+#if (_WIN32_WINNT >= 0x0501)
 BOOL WINAPI GetLayeredWindowAttributes(HWND,COLORREF*,BYTE*,DWORD*);
 #endif
 #ifdef UNICODE
diff --git a/winsup/w32api/lib/advapi32.def b/winsup/w32api/lib/advapi32.def
index 0c75d8efe..bf2f2edd0 100644
--- a/winsup/w32api/lib/advapi32.def
+++ b/winsup/w32api/lib/advapi32.def
@@ -1,4 +1,4 @@
-LIBRARY "ADVAPI32.DLL"
+LIBRARY ADVAPI32.DLL
 EXPORTS
 AbortSystemShutdownA@4
 AbortSystemShutdownW@4
diff --git a/winsup/w32api/lib/cap.def b/winsup/w32api/lib/cap.def
index f34d9f7e7..8732ca0cc 100644
--- a/winsup/w32api/lib/cap.def
+++ b/winsup/w32api/lib/cap.def
@@ -1,4 +1,4 @@
-LIBRARY "CAP.DLL"
+LIBRARY CAP.DLL
 EXPORTS
 DumpCAP@0
 StartCAP@0
diff --git a/winsup/w32api/lib/comctl32.def b/winsup/w32api/lib/comctl32.def
index 7fd9b4a3d..00f5d52d8 100644
--- a/winsup/w32api/lib/comctl32.def
+++ b/winsup/w32api/lib/comctl32.def
@@ -1,4 +1,4 @@
-LIBRARY "COMCTL32.DLL"
+LIBRARY COMCTL32.DLL
 EXPORTS
 _TrackMouseEvent@4
 AddMRUData@12
diff --git a/winsup/w32api/lib/comdlg32.def b/winsup/w32api/lib/comdlg32.def
index bad754df6..82806aa03 100644
--- a/winsup/w32api/lib/comdlg32.def
+++ b/winsup/w32api/lib/comdlg32.def
@@ -1,4 +1,4 @@
-LIBRARY "COMDLG32.DLL"
+LIBRARY COMDLG32.DLL
 EXPORTS
 ChooseColorA@4
 ChooseColorW@4
diff --git a/winsup/w32api/lib/crypt32.def b/winsup/w32api/lib/crypt32.def
index fca58fd89..c778f1d06 100644
--- a/winsup/w32api/lib/crypt32.def
+++ b/winsup/w32api/lib/crypt32.def
@@ -1,4 +1,4 @@
-LIBRARY "CRYPT32.DLL"
+LIBRARY CRYPT32.DLL
 EXPORTS
 CertFreeCertificateChain@4
 CertGetCertificateChain@32
diff --git a/winsup/w32api/lib/d3dim.def b/winsup/w32api/lib/d3dim.def
index 3956d1552..4cdfbb6e9 100644
--- a/winsup/w32api/lib/d3dim.def
+++ b/winsup/w32api/lib/d3dim.def
@@ -1,5 +1,5 @@
 ; from DirectX 6.1
-LIBRARY "d3dim.dll"
+LIBRARY d3dim.dll
 EXPORTS
 Direct3DCreate@12
 Direct3D_HALCleanUp@8
diff --git a/winsup/w32api/lib/d3drm.def b/winsup/w32api/lib/d3drm.def
index f55c4fd63..2dd1693b5 100644
--- a/winsup/w32api/lib/d3drm.def
+++ b/winsup/w32api/lib/d3drm.def
@@ -1,5 +1,5 @@
 ; from DirectX 6.1
-LIBRARY "d3drm.dll"
+LIBRARY d3drm.dll
 EXPORTS
 D3DRMColorGetAlpha@4
 D3DRMColorGetBlue@4
diff --git a/winsup/w32api/lib/d3dxof.def b/winsup/w32api/lib/d3dxof.def
index d12e2048b..e2b9b9aa6 100644
--- a/winsup/w32api/lib/d3dxof.def
+++ b/winsup/w32api/lib/d3dxof.def
@@ -1,4 +1,4 @@
 ; from DirectX 6.1
-LIBRARY "d3dxof.dll"
+LIBRARY d3dxof.dll
 EXPORTS
 DirectXFileCreate@4
diff --git a/winsup/w32api/lib/ddraw.def b/winsup/w32api/lib/ddraw.def
index ea49045c1..9e0ee0c44 100644
--- a/winsup/w32api/lib/ddraw.def
+++ b/winsup/w32api/lib/ddraw.def
@@ -1,5 +1,5 @@
 ; from DirectX 6.1
-LIBRARY "DDRAW.dll"
+LIBRARY DDRAW.dll
 EXPORTS
 D3DParseUnknownCommand@8
 DDHAL32_VidMemAlloc@16
diff --git a/winsup/w32api/lib/dinput.def b/winsup/w32api/lib/dinput.def
index 2cb2207cf..db8c2c187 100644
--- a/winsup/w32api/lib/dinput.def
+++ b/winsup/w32api/lib/dinput.def
@@ -1,5 +1,5 @@
 ; from DirectX 6.1
-LIBRARY "DINPUT.dll"
+LIBRARY DINPUT.dll
 EXPORTS
 DirectInputCreateA@16
 DirectInputCreateW@16
diff --git a/winsup/w32api/lib/dplayx.def b/winsup/w32api/lib/dplayx.def
index 058e00db7..0166ed161 100644
--- a/winsup/w32api/lib/dplayx.def
+++ b/winsup/w32api/lib/dplayx.def
@@ -1,5 +1,5 @@
 ; from DirectX 6.1
-LIBRARY "DPLAYX.dll"
+LIBRARY DPLAYX.dll
 EXPORTS
 DirectPlayCreate@12
 DirectPlayEnumerate@8
diff --git a/winsup/w32api/lib/dsetup.def b/winsup/w32api/lib/dsetup.def
index b417432ca..f5a6054a6 100644
--- a/winsup/w32api/lib/dsetup.def
+++ b/winsup/w32api/lib/dsetup.def
@@ -1,5 +1,5 @@
 ; from DirectX 6.1
-LIBRARY "DSETUP.dll"
+LIBRARY DSETUP.dll
 EXPORTS
 DirectXDeviceDriverSetupA@16
 DirectXDeviceDriverSetupW@16
diff --git a/winsup/w32api/lib/dsound.def b/winsup/w32api/lib/dsound.def
index 68ebdf6f6..1e11cffe5 100644
--- a/winsup/w32api/lib/dsound.def
+++ b/winsup/w32api/lib/dsound.def
@@ -1,5 +1,5 @@
 ; from DirectX 6.1
-LIBRARY "DSOUND.dll"
+LIBRARY DSOUND.dll
 EXPORTS
 DirectSoundCaptureCreate@12
 DirectSoundCaptureEnumerateA@8
diff --git a/winsup/w32api/lib/iphlpapi.def b/winsup/w32api/lib/iphlpapi.def
index f4b088888..33342e195 100644
--- a/winsup/w32api/lib/iphlpapi.def
+++ b/winsup/w32api/lib/iphlpapi.def
@@ -1,4 +1,4 @@
-LIBRARY "IPHLPAPI.DLL"
+LIBRARY IPHLPAPI.DLL
 EXPORTS
 AddIPAddress@20
 CreateIpForwardEntry@4
diff --git a/winsup/w32api/lib/rasdlg.def b/winsup/w32api/lib/rasdlg.def
index f724acb04..099c1a777 100644
--- a/winsup/w32api/lib/rasdlg.def
+++ b/winsup/w32api/lib/rasdlg.def
@@ -1,4 +1,4 @@
-LIBRARY "RASDLG.DLL"
+LIBRARY RASDLG.DLL
 EXPORTS
 RasDialDlgA@16
 RasDialDlgW@16
diff --git a/winsup/w32api/lib/shfolder.def b/winsup/w32api/lib/shfolder.def
index d4f1306f0..edcf7060b 100644
--- a/winsup/w32api/lib/shfolder.def
+++ b/winsup/w32api/lib/shfolder.def
@@ -1,4 +1,4 @@
-LIBRARY "SHFOLDER.DLL"
+LIBRARY SHFOLDER.DLL
 EXPORTS
 SHGetFolderPathA@20
 SHGetFolderPathW@20
diff --git a/winsup/w32api/lib/user32.def b/winsup/w32api/lib/user32.def
index c28ae0cb2..0e1cad44b 100644
--- a/winsup/w32api/lib/user32.def
+++ b/winsup/w32api/lib/user32.def
@@ -131,6 +131,7 @@ DefWindowProcA@16
 DefWindowProcW@16
 DeferWindowPos@32
 DeleteMenu@12
+DeregisterShellHookWindow@4
 DestroyAcceleratorTable@4
 DestroyCaret@0
 DestroyCursor@4
@@ -177,6 +178,7 @@ EndDeferWindowPos@4
 EndDialog@8
 EndMenu@0
 EndPaint@8
+EndTask@12
 EnumChildWindows@12
 EnumClipboardFormats@4
 EnumDesktopWindows@12
diff --git a/winsup/w32api/lib/version.def b/winsup/w32api/lib/version.def
index 35a087e5d..8e3a92ebc 100644
--- a/winsup/w32api/lib/version.def
+++ b/winsup/w32api/lib/version.def
@@ -1,4 +1,4 @@
-LIBRARY "VERSION.dll"
+LIBRARY VERSION.dll
 EXPORTS
 GetFileVersionInfoA@16
 GetFileVersionInfoSizeA@8
diff --git a/winsup/w32api/lib/winspool.def b/winsup/w32api/lib/winspool.def
index 367869c6a..66d315a28 100644
--- a/winsup/w32api/lib/winspool.def
+++ b/winsup/w32api/lib/winspool.def
@@ -1,4 +1,4 @@
-LIBRARY "WINSPOOL.DRV"
+LIBRARY WINSPOOL.DRV
 EXPORTS
 ADVANCEDSETUPDIALOG@16
 AbortPrinter@4
diff --git a/winsup/w32api/lib/ws2_32.def b/winsup/w32api/lib/ws2_32.def
index 50e68b32b..2146d83bf 100644
--- a/winsup/w32api/lib/ws2_32.def
+++ b/winsup/w32api/lib/ws2_32.def
@@ -1,4 +1,4 @@
-LIBRARY "WS2_32.DLL"
+LIBRARY WS2_32.DLL
 EXPORTS
 WEP@0
 WPUCompleteOverlappedRequest@20