20 files changed, 21 insertions, 19 deletions

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