* 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.

winsup/w32api/ChangeLog

@@ -1,3 +1,18 @@
+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

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

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
@@ -2039,7 +2039,7 @@ extern "C" {
 #define CURSOR_SHOWING 0x00000001
 #if (WINVER >= 0x0400)
 #define ENDSESSION_LOGOFF 0x80000000
-#endif /* WINVER >= 0x0400 */
+#endif /* (WINVER >= 0x0400) */
 #if (WINVER >= 0x0500)
 #define CHILDID_SELF 0
 #define OBJID_WINDOW 0x00000000
@@ -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);

winsup/w32api/lib/advapi32.def

@@ -1,4 +1,4 @@
-LIBRARY "ADVAPI32.DLL"
+LIBRARY ADVAPI32.DLL
 EXPORTS
 AbortSystemShutdownA@4
 AbortSystemShutdownW@4

winsup/w32api/lib/cap.def

@@ -1,4 +1,4 @@
-LIBRARY "CAP.DLL"
+LIBRARY CAP.DLL
 EXPORTS
 DumpCAP@0
 StartCAP@0

winsup/w32api/lib/comctl32.def

@@ -1,4 +1,4 @@
-LIBRARY "COMCTL32.DLL"
+LIBRARY COMCTL32.DLL
 EXPORTS
 _TrackMouseEvent@4
 AddMRUData@12

winsup/w32api/lib/comdlg32.def

@@ -1,4 +1,4 @@
-LIBRARY "COMDLG32.DLL"
+LIBRARY COMDLG32.DLL
 EXPORTS
 ChooseColorA@4
 ChooseColorW@4

winsup/w32api/lib/crypt32.def

@@ -1,4 +1,4 @@
-LIBRARY "CRYPT32.DLL"
+LIBRARY CRYPT32.DLL
 EXPORTS
 CertFreeCertificateChain@4
 CertGetCertificateChain@32

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

winsup/w32api/lib/d3drm.def

@@ -1,5 +1,5 @@
 ; from DirectX 6.1
-LIBRARY "d3drm.dll"
+LIBRARY d3drm.dll
 EXPORTS
 D3DRMColorGetAlpha@4
 D3DRMColorGetBlue@4

winsup/w32api/lib/d3dxof.def

@@ -1,4 +1,4 @@
 ; from DirectX 6.1
-LIBRARY "d3dxof.dll"
+LIBRARY d3dxof.dll
 EXPORTS
 DirectXFileCreate@4

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

winsup/w32api/lib/dinput.def

@@ -1,5 +1,5 @@
 ; from DirectX 6.1
-LIBRARY "DINPUT.dll"
+LIBRARY DINPUT.dll
 EXPORTS
 DirectInputCreateA@16
 DirectInputCreateW@16

winsup/w32api/lib/dplayx.def

@@ -1,5 +1,5 @@
 ; from DirectX 6.1
-LIBRARY "DPLAYX.dll"
+LIBRARY DPLAYX.dll
 EXPORTS
 DirectPlayCreate@12
 DirectPlayEnumerate@8

winsup/w32api/lib/dsetup.def

@@ -1,5 +1,5 @@
 ; from DirectX 6.1
-LIBRARY "DSETUP.dll"
+LIBRARY DSETUP.dll
 EXPORTS
 DirectXDeviceDriverSetupA@16
 DirectXDeviceDriverSetupW@16

winsup/w32api/lib/dsound.def

@@ -1,5 +1,5 @@
 ; from DirectX 6.1
-LIBRARY "DSOUND.dll"
+LIBRARY DSOUND.dll
 EXPORTS
 DirectSoundCaptureCreate@12
 DirectSoundCaptureEnumerateA@8

winsup/w32api/lib/iphlpapi.def

@@ -1,4 +1,4 @@
-LIBRARY "IPHLPAPI.DLL"
+LIBRARY IPHLPAPI.DLL
 EXPORTS
 AddIPAddress@20
 CreateIpForwardEntry@4

winsup/w32api/lib/rasdlg.def

@@ -1,4 +1,4 @@
-LIBRARY "RASDLG.DLL"
+LIBRARY RASDLG.DLL
 EXPORTS
 RasDialDlgA@16
 RasDialDlgW@16

winsup/w32api/lib/shfolder.def

@@ -1,4 +1,4 @@
-LIBRARY "SHFOLDER.DLL"
+LIBRARY SHFOLDER.DLL
 EXPORTS
 SHGetFolderPathA@20
 SHGetFolderPathW@20

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

winsup/w32api/lib/version.def

@@ -1,4 +1,4 @@
-LIBRARY "VERSION.dll"
+LIBRARY VERSION.dll
 EXPORTS
 GetFileVersionInfoA@16
 GetFileVersionInfoSizeA@8

winsup/w32api/lib/winspool.def

@@ -1,4 +1,4 @@
-LIBRARY "WINSPOOL.DRV"
+LIBRARY WINSPOOL.DRV
 EXPORTS
 ADVANCEDSETUPDIALOG@16
 AbortPrinter@4

winsup/w32api/lib/ws2_32.def

@@ -1,4 +1,4 @@
-LIBRARY "WS2_32.DLL"
+LIBRARY WS2_32.DLL
 EXPORTS
 WEP@0
 WPUCompleteOverlappedRequest@20