From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Tue, 2 Nov 2010 20:23:56 +0000 (+0000)
Subject: [CMAKE]
X-Git-Tag: backups/GSoC_2011/GSoC_Themes@51550~615
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=2f6d499617a5fe43aeb36d02a2d25684d8f608c6

[CMAKE]
- Move more dlls with no stubs into using def files instead of spec files.

svn path=/branches/cmake-bringup/; revision=49450
---

diff --git a/dll/win32/rsabase/CMakeLists.txt b/dll/win32/rsabase/CMakeLists.txt
index a2bfad2eddc..9483bb4ae34 100644
--- a/dll/win32/rsabase/CMakeLists.txt
+++ b/dll/win32/rsabase/CMakeLists.txt
@@ -2,10 +2,11 @@
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(rsabase.dll rsabase.spec)
+add_library(rsabase SHARED version.rc rsabase.def)
 
-add_library(rsabase SHARED version.rc
-    ${CMAKE_CURRENT_BINARY_DIR}/rsabase.def)
+if(NOT MSVC)
+    set_source_files_properties(rsabase.def PROPERTIES EXTERNAL_OBJECT TRUE)
+endif()
 
 set_entrypoint(rsabase 0)
 
diff --git a/dll/win32/rsabase/rsabase.def b/dll/win32/rsabase/rsabase.def
new file mode 100644
index 00000000000..f43fbd8aa04
--- /dev/null
+++ b/dll/win32/rsabase/rsabase.def
@@ -0,0 +1,31 @@
+
+LIBRARY rsabase.dll
+
+EXPORTS
+  CPAcquireContext@16=rsaenh.CPAcquireContext @1
+  CPCreateHash@20=rsaenh.CPCreateHash @2
+  CPDecrypt@28=rsaenh.CPDecrypt @3
+  CPDeriveKey@20=rsaenh.CPDeriveKey @4
+  CPDestroyHash@8=rsaenh.CPDestroyHash @5
+  CPDestroyKey@8=rsaenh.CPDestroyKey @6
+  CPDuplicateHash@20=rsaenh.CPDuplicateHash @7
+  CPDuplicateKey@20=rsaenh.CPDuplicateKey @8
+  CPEncrypt@32=rsaenh.CPEncrypt @9
+  CPExportKey@28=rsaenh.CPExportKey @10
+  CPGenKey@16=rsaenh.CPGenKey @11
+  CPGenRandom@12=rsaenh.CPGenRandom @12
+  CPGetHashParam@24=rsaenh.CPGetHashParam @13
+  CPGetKeyParam@24=rsaenh.CPGetKeyParam @14
+  CPGetProvParam@20=rsaenh.CPGetProvParam @15
+  CPGetUserKey@12=rsaenh.CPGetUserKey @16
+  CPHashData@20=rsaenh.CPHashData @17
+  CPHashSessionKey@16=rsaenh.CPHashSessionKey @18
+  CPImportKey@24=rsaenh.CPImportKey @19
+  CPReleaseContext@8=rsaenh.CPReleaseContext @20
+  CPSetHashParam@20=rsaenh.CPSetHashParam @21
+  CPSetKeyParam@20=rsaenh.CPSetKeyParam @22
+  CPSetProvParam@16=rsaenh.CPSetProvParam @23
+  CPSignHash@28=rsaenh.CPSignHash @24
+  CPVerifySignature@28=rsaenh.CPVerifySignature @25
+  DllRegisterServer@0=rsaenh.DllRegisterServer @26 PRIVATE
+  DllUnregisterServer@0=rsaenh.DllUnregisterServer @27 PRIVATE
diff --git a/dll/win32/rsaenh/CMakeLists.txt b/dll/win32/rsaenh/CMakeLists.txt
index ddf1c992094..95353dbd0bf 100644
--- a/dll/win32/rsaenh/CMakeLists.txt
+++ b/dll/win32/rsaenh/CMakeLists.txt
@@ -1,11 +1,10 @@
 
-add_definitions(-D__WINESRC__)
-add_definitions(-D_DLL -D__USE_CRTIMP)
+add_definitions(
+    -D__WINESRC__
+    -D_DLL -D__USE_CRTIMP)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(rsaenh.dll rsaenh.spec)
-
 add_library(rsaenh SHARED
     aes.c
     des.c
@@ -19,7 +18,11 @@ add_library(rsaenh SHARED
     rsaenh.c
     sha2.c
     version.rc
-    ${CMAKE_CURRENT_BINARY_DIR}/rsaenh.def)
+    rsaenh.def)
+
+if(NOT MSVC)
+    set_source_files_properties(rsaenh.def PROPERTIES EXTERNAL_OBJECT TRUE)
+endif()
 
 set_module_type(rsaenh win32dll)
 
@@ -27,5 +30,4 @@ target_link_libraries(rsaenh wine)
 
 add_importlibs(rsaenh msvcrt crypt32 advapi32 kernel32 ntdll)
 
-
 add_cab_target(rsaenh 1)
diff --git a/dll/win32/rsaenh/rsaenh.def b/dll/win32/rsaenh/rsaenh.def
new file mode 100644
index 00000000000..d2f92331607
--- /dev/null
+++ b/dll/win32/rsaenh/rsaenh.def
@@ -0,0 +1,31 @@
+
+LIBRARY rsaenh.dll
+
+EXPORTS
+  CPAcquireContext@16=RSAENH_CPAcquireContext@16 @1
+  CPCreateHash@20=RSAENH_CPCreateHash@20 @2
+  CPDecrypt@28=RSAENH_CPDecrypt@28 @3
+  CPDeriveKey@20=RSAENH_CPDeriveKey@20 @4
+  CPDestroyHash@8=RSAENH_CPDestroyHash@8 @5
+  CPDestroyKey@8=RSAENH_CPDestroyKey@8 @6
+  CPDuplicateHash@20=RSAENH_CPDuplicateHash@20 @7
+  CPDuplicateKey@20=RSAENH_CPDuplicateKey@20 @8
+  CPEncrypt@32=RSAENH_CPEncrypt@32 @9
+  CPExportKey@28=RSAENH_CPExportKey@28 @10
+  CPGenKey@16=RSAENH_CPGenKey@16 @11
+  CPGenRandom@12=RSAENH_CPGenRandom@12 @12
+  CPGetHashParam@24=RSAENH_CPGetHashParam@24 @13
+  CPGetKeyParam@24=RSAENH_CPGetKeyParam@24 @14
+  CPGetProvParam@20=RSAENH_CPGetProvParam@20 @15
+  CPGetUserKey@12=RSAENH_CPGetUserKey@12 @16
+  CPHashData@20=RSAENH_CPHashData@20 @17
+  CPHashSessionKey@16=RSAENH_CPHashSessionKey@16 @18
+  CPImportKey@24=RSAENH_CPImportKey@24 @19
+  CPReleaseContext@8=RSAENH_CPReleaseContext@8 @20
+  CPSetHashParam@20=RSAENH_CPSetHashParam@20 @21
+  CPSetKeyParam@20=RSAENH_CPSetKeyParam@20 @22
+  CPSetProvParam@16=RSAENH_CPSetProvParam@16 @23
+  CPSignHash@28=RSAENH_CPSignHash@28 @24
+  CPVerifySignature@28=RSAENH_CPVerifySignature@28 @25
+  DllRegisterServer@0 @26 PRIVATE
+  DllUnregisterServer@0 @27 PRIVATE
diff --git a/dll/win32/samsrv/CMakeLists.txt b/dll/win32/samsrv/CMakeLists.txt
index c7e4fefa7ec..eec34520e73 100644
--- a/dll/win32/samsrv/CMakeLists.txt
+++ b/dll/win32/samsrv/CMakeLists.txt
@@ -1,10 +1,11 @@
 
 set_unicode()
 
-spec2def(samsrv.dll samsrv.spec)
+add_library(samsrv SHARED samsrv.c samsrv.rc samsrv.def)
 
-add_library(samsrv SHARED samsrv.c samsrv.rc
-    ${CMAKE_CURRENT_BINARY_DIR}/samsrv.def)
+if(NOT MSVC)
+    set_source_files_properties(samsrv.def PROPERTIES EXTERNAL_OBJECT TRUE)
+endif()
 
 set_entrypoint(samsrv 0)
 
diff --git a/dll/win32/samsrv/samsrv.def b/dll/win32/samsrv/samsrv.def
new file mode 100644
index 00000000000..d005c750e8e
--- /dev/null
+++ b/dll/win32/samsrv/samsrv.def
@@ -0,0 +1,6 @@
+
+LIBRARY samsrv.dll
+
+EXPORTS
+  SamIInitialize@0 @1
+  SampInitializeRegistry@0 @2
diff --git a/dll/win32/sensapi/CMakeLists.txt b/dll/win32/sensapi/CMakeLists.txt
index d1fe0bc77c4..49f7bd7975f 100644
--- a/dll/win32/sensapi/CMakeLists.txt
+++ b/dll/win32/sensapi/CMakeLists.txt
@@ -2,9 +2,11 @@
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 add_definitions(-D__WINESRC__)
 
-spec2def(sensapi.dll sensapi.spec)
+add_library(sensapi SHARED sensapi.c sensapi.def)
 
-add_library(sensapi SHARED sensapi.c ${CMAKE_CURRENT_BINARY_DIR}/sensapi.def)
+if(NOT MSVC)
+    set_source_files_properties(sensapi.def PROPERTIES EXTERNAL_OBJECT TRUE)
+endif()
 
 set_module_type(sensapi win32dll)
 
diff --git a/dll/win32/sensapi/sensapi.def b/dll/win32/sensapi/sensapi.def
new file mode 100644
index 00000000000..d41303d5459
--- /dev/null
+++ b/dll/win32/sensapi/sensapi.def
@@ -0,0 +1,7 @@
+
+LIBRARY sensapi.dll
+
+EXPORTS
+  IsDestinationReachableA@8 @1
+  IsDestinationReachableW@8 @2
+  IsNetworkAlive@4 @3
diff --git a/dll/win32/serialui/CMakeLists.txt b/dll/win32/serialui/CMakeLists.txt
index 008a2f1b95f..f6132c38f32 100644
--- a/dll/win32/serialui/CMakeLists.txt
+++ b/dll/win32/serialui/CMakeLists.txt
@@ -1,9 +1,11 @@
 
 set_unicode()
 
-spec2def(serialui.dll serialui.spec)
+add_library(serialui SHARED serialui.c serialui.rc serialui.def)
 
-add_library(serialui SHARED serialui.c serialui.rc ${CMAKE_CURRENT_BINARY_DIR}/serialui.def)
+if(NOT MSVC)
+    set_source_files_properties(serialui.def PROPERTIES EXTERNAL_OBJECT TRUE)
+endif()
 
 set_module_type(serialui win32dll)
 
diff --git a/dll/win32/serialui/serialui.def b/dll/win32/serialui/serialui.def
new file mode 100644
index 00000000000..55d7e6c027e
--- /dev/null
+++ b/dll/win32/serialui/serialui.def
@@ -0,0 +1,10 @@
+
+LIBRARY serialui.dll
+
+EXPORTS
+  drvCommConfigDialogA@12 @1
+  drvCommConfigDialogW@12 @2
+  drvSetDefaultCommConfigA@12 @3
+  drvSetDefaultCommConfigW@12 @4
+  drvGetDefaultCommConfigA@12 @5
+  drvGetDefaultCommConfigW@12 @6
diff --git a/dll/win32/shfolder/CMakeLists.txt b/dll/win32/shfolder/CMakeLists.txt
index 6f6e399e4d9..40828461d15 100644
--- a/dll/win32/shfolder/CMakeLists.txt
+++ b/dll/win32/shfolder/CMakeLists.txt
@@ -2,10 +2,11 @@
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 add_definitions(-D__WINESRC__)
 
-spec2def(shfolder.dll shfolder.spec)
+add_library(shfolder SHARED version.rc shfolder.def)
 
-add_library(shfolder SHARED version.rc
-    ${CMAKE_CURRENT_BINARY_DIR}/shfolder.def)
+if(NOT MSVC)
+    set_source_files_properties(shfolder.def PROPERTIES EXTERNAL_OBJECT TRUE)
+endif()
 
 set_entrypoint(shfolder 0)
 
diff --git a/dll/win32/shfolder/shfolder.def b/dll/win32/shfolder/shfolder.def
new file mode 100644
index 00000000000..3a1f434ab4b
--- /dev/null
+++ b/dll/win32/shfolder/shfolder.def
@@ -0,0 +1,6 @@
+
+LIBRARY shfolder.dll
+
+EXPORTS
+  SHGetFolderPathA@20=shell32.SHGetFolderPathA @1
+  SHGetFolderPathW@20=shell32.SHGetFolderPathW @2
diff --git a/dll/win32/smdll/CMakeLists.txt b/dll/win32/smdll/CMakeLists.txt
index 33535ff507a..aaa5fe674d0 100644
--- a/dll/win32/smdll/CMakeLists.txt
+++ b/dll/win32/smdll/CMakeLists.txt
@@ -1,13 +1,15 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys)
 
-spec2def(smdll.dll smdll.spec)
-
 add_library(smdll SHARED
     dllmain.c
     query.c
     smdll.rc
-    ${CMAKE_CURRENT_BINARY_DIR}/smdll.def)
+    smdll.def)
+
+if(NOT MSVC)
+    set_source_files_properties(smdll.def PROPERTIES EXTERNAL_OBJECT TRUE)
+endif()
 
 target_link_libraries(smdll smlib)
 
diff --git a/dll/win32/smdll/smdll.def b/dll/win32/smdll/smdll.def
new file mode 100644
index 00000000000..c4d702012f5
--- /dev/null
+++ b/dll/win32/smdll/smdll.def
@@ -0,0 +1,9 @@
+
+LIBRARY smdll.dll
+
+EXPORTS
+  SmCompleteSession@12 @1
+  SmConnectApiPort@16 @2
+  SmExecuteProgram@8 @3
+  SmQueryInformation@20 @4
+  SmLookupSubsystem@20 @5
diff --git a/dll/win32/sndblst/CMakeLists.txt b/dll/win32/sndblst/CMakeLists.txt
index e5c4bb9d829..43b54508a70 100644
--- a/dll/win32/sndblst/CMakeLists.txt
+++ b/dll/win32/sndblst/CMakeLists.txt
@@ -4,9 +4,11 @@ set_unicode()
 add_definitions(-DDEBUG_NT4)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound)
 
-spec2def(sndblst.dll sndblst.spec)
+add_library(sndblst SHARED sndblst.c sndblst.def)
 
-add_library(sndblst SHARED sndblst.c ${CMAKE_CURRENT_BINARY_DIR}/sndblst.def)
+if(NOT MSVC)
+    set_source_files_properties(sndblst.def PROPERTIES EXTERNAL_OBJECT TRUE)
+endif()
 
 set_module_type(sndblst win32dll)
 
diff --git a/dll/win32/sndblst/sndblst.def b/dll/win32/sndblst/sndblst.def
new file mode 100644
index 00000000000..74ca2307e5f
--- /dev/null
+++ b/dll/win32/sndblst/sndblst.def
@@ -0,0 +1,11 @@
+
+LIBRARY sndblst.dll
+
+EXPORTS
+  DriverProc@20 @1
+  widMessage@20 @2
+  wodMessage@20 @3
+  midMessage@20 @4
+  modMessage@20 @5
+  mxdMessage@20 @6
+  auxMessage@20 @7
diff --git a/dll/win32/sti/CMakeLists.txt b/dll/win32/sti/CMakeLists.txt
index 940e7699cfe..68a351c51bd 100644
--- a/dll/win32/sti/CMakeLists.txt
+++ b/dll/win32/sti/CMakeLists.txt
@@ -10,14 +10,16 @@ add_definitions(
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(sti.dll sti.spec)
-
 add_library(sti SHARED
     regsvr.c
     sti.c
     sti_main.c
     sti_wia.idl
-    ${CMAKE_CURRENT_BINARY_DIR}/sti.def)
+    sti.def)
+
+if(NOT MSVC)
+    set_source_files_properties(sti.def PROPERTIES EXTERNAL_OBJECT TRUE)
+endif()
 
 set_entrypoint(sti 0)
 
@@ -35,7 +37,5 @@ add_importlibs(sti
     kernel32
     ntdll)
 
-
-
 rpcproxy(sti sti_wia.idl)
 add_cab_target(sti 1)
diff --git a/dll/win32/sti/sti.def b/dll/win32/sti/sti.def
new file mode 100644
index 00000000000..86f79077839
--- /dev/null
+++ b/dll/win32/sti/sti.def
@@ -0,0 +1,11 @@
+
+LIBRARY sti.dll
+
+EXPORTS
+  DllCanUnloadNow@0 @1 PRIVATE
+  DllGetClassObject@12 @2 PRIVATE
+  DllRegisterServer@0 @3 PRIVATE
+  DllUnregisterServer@0 @4 PRIVATE
+  StiCreateInstance@16=StiCreateInstanceW@16 @5
+  StiCreateInstanceA@16 @6
+  StiCreateInstanceW@16 @7
diff --git a/dll/win32/twain_32/CMakeLists.txt b/dll/win32/twain_32/CMakeLists.txt
index d414c808784..be9be44ad4c 100644
--- a/dll/win32/twain_32/CMakeLists.txt
+++ b/dll/win32/twain_32/CMakeLists.txt
@@ -1,8 +1,6 @@
 
 add_definitions(-D_DLL -D__USE_CRTIMP)
 
-spec2def(twain_32.dll twain_32.spec)
-
 add_library(twain_32 SHARED
     capability.c
     ds_audio.c
@@ -11,7 +9,11 @@ add_library(twain_32 SHARED
     dsm_ctrl.c
     twain32_main.c
     twain_32.rc
-    ${CMAKE_CURRENT_BINARY_DIR}/twain_32.def)
+    twain_32.def)
+
+if(NOT MSVC)
+    set_source_files_properties(twain_32.def PROPERTIES EXTERNAL_OBJECT TRUE)
+endif()
 
 set_module_type(twain_32 win32dll)
 
diff --git a/dll/win32/twain_32/twain_32.def b/dll/win32/twain_32/twain_32.def
new file mode 100644
index 00000000000..b8edb16bf9f
--- /dev/null
+++ b/dll/win32/twain_32/twain_32.def
@@ -0,0 +1,5 @@
+
+LIBRARY twain_32.dll
+
+EXPORTS
+  DSM_Entry@24 @1
diff --git a/dll/win32/uext2/CMakeLists.txt b/dll/win32/uext2/CMakeLists.txt
index 874a18f5410..4ddf3788249 100644
--- a/dll/win32/uext2/CMakeLists.txt
+++ b/dll/win32/uext2/CMakeLists.txt
@@ -1,10 +1,9 @@
 
-spec2def(uext2.dll uext2.spec)
+add_library(uext2 SHARED uext2.c uext2.rc uext2.def)
 
-add_library(uext2 SHARED
-    uext2.c
-    uext2.rc
-    ${CMAKE_CURRENT_BINARY_DIR}/uext2.def)
+if(NOT MSVC)
+    set_source_files_properties(uext2.def PROPERTIES EXTERNAL_OBJECT TRUE)
+endif()
 
 set_module_type(uext2 win32dll)
 
diff --git a/dll/win32/uext2/uext2.def b/dll/win32/uext2/uext2.def
new file mode 100644
index 00000000000..82d215df065
--- /dev/null
+++ b/dll/win32/uext2/uext2.def
@@ -0,0 +1,6 @@
+
+LIBRARY uext2.dll
+
+EXPORTS
+  ChkdskEx@24=Ext2Chkdsk@24 @1
+  FormatEx@24=Ext2Format@24 @2
diff --git a/dll/win32/ufat/CMakeLists.txt b/dll/win32/ufat/CMakeLists.txt
index 9f798e1777d..6062e865d03 100644
--- a/dll/win32/ufat/CMakeLists.txt
+++ b/dll/win32/ufat/CMakeLists.txt
@@ -1,10 +1,9 @@
 
-spec2def(ufat.dll ufat.spec)
+add_library(ufat SHARED ufat.c ufat.rc ufat.def)
 
-add_library(ufat SHARED
-    ufat.c
-    ufat.rc
-    ${CMAKE_CURRENT_BINARY_DIR}/ufat.def)
+if(NOT MSVC)
+    set_source_files_properties(ufat.def PROPERTIES EXTERNAL_OBJECT TRUE)
+endif()
 
 set_module_type(ufat win32dll)
 
diff --git a/dll/win32/ufat/ufat.def b/dll/win32/ufat/ufat.def
new file mode 100644
index 00000000000..a41d0718d64
--- /dev/null
+++ b/dll/win32/ufat/ufat.def
@@ -0,0 +1,6 @@
+
+LIBRARY ufat.dll
+
+EXPORTS
+  ChkdskEx@24=VfatChkdsk@24 @1
+  FormatEx@24=VfatFormat@24 @2
diff --git a/dll/win32/ufatx/CMakeLists.txt b/dll/win32/ufatx/CMakeLists.txt
index c4914b6228a..1d5dc839260 100644
--- a/dll/win32/ufatx/CMakeLists.txt
+++ b/dll/win32/ufatx/CMakeLists.txt
@@ -1,8 +1,9 @@
 
-spec2def(ufatx.dll ufatx.spec)
+add_library(ufatx SHARED ufatx.rc ufatx.def)
 
-add_library(ufatx SHARED ufatx.rc
-    ${CMAKE_CURRENT_BINARY_DIR}/ufatx.def)
+if(NOT MSVC)
+    set_source_files_properties(ufatx.def PROPERTIES EXTERNAL_OBJECT TRUE)
+endif()
 
 set_entrypoint(ufatx 0)
 
diff --git a/dll/win32/ufatx/ufatx.def b/dll/win32/ufatx/ufatx.def
new file mode 100644
index 00000000000..95b9085e0e8
--- /dev/null
+++ b/dll/win32/ufatx/ufatx.def
@@ -0,0 +1,5 @@
+
+LIBRARY ufatx.dll
+
+EXPORTS
+  FormatEx@24=VfatxFormat@24 @1
diff --git a/dll/win32/untfs/CMakeLists.txt b/dll/win32/untfs/CMakeLists.txt
index 3d3aae80e97..a14208e7662 100644
--- a/dll/win32/untfs/CMakeLists.txt
+++ b/dll/win32/untfs/CMakeLists.txt
@@ -1,10 +1,9 @@
 
-spec2def(untfs.dll untfs.spec)
+add_library(untfs SHARED untfs.c untfs.rc untfs.def)
 
-add_library(untfs SHARED
-    untfs.c
-    untfs.rc
-    ${CMAKE_CURRENT_BINARY_DIR}/untfs.def)
+if(NOT MSVC)
+    set_source_files_properties(untfs.def PROPERTIES EXTERNAL_OBJECT TRUE)
+endif()
 
 set_module_type(untfs win32dll)
 
diff --git a/dll/win32/untfs/untfs.def b/dll/win32/untfs/untfs.def
new file mode 100644
index 00000000000..8de2fc76769
--- /dev/null
+++ b/dll/win32/untfs/untfs.def
@@ -0,0 +1,6 @@
+
+LIBRARY untfs.dll
+
+EXPORTS
+  ChkdskEx@24=NtfsChkdsk@24 @1
+  FormatEx@24=NtfsFormat@24 @2
diff --git a/dll/win32/vdmdbg/CMakeLists.txt b/dll/win32/vdmdbg/CMakeLists.txt
index 70299875e05..4b0104d3911 100644
--- a/dll/win32/vdmdbg/CMakeLists.txt
+++ b/dll/win32/vdmdbg/CMakeLists.txt
@@ -1,11 +1,11 @@
 
 set_unicode()
 
-spec2def(vdmdbg.dll vdmdbg.spec)
+list(APPEND SOURCE vdmdbg.c vdmdbg.def)
 
-list(APPEND SOURCE
-    vdmdbg.c
-    ${CMAKE_CURRENT_BINARY_DIR}/vdmdbg.def)
+if(NOT MSVC)
+    set_source_files_properties(vdmdbg.def PROPERTIES EXTERNAL_OBJECT TRUE)
+endif()
 
 add_library(vdmdbg SHARED
     ${CMAKE_CURRENT_BINARY_DIR}/vdmdbg_vdmdbg.h.gch
diff --git a/dll/win32/vdmdbg/vdmdbg.def b/dll/win32/vdmdbg/vdmdbg.def
new file mode 100644
index 00000000000..9f65d7c91c5
--- /dev/null
+++ b/dll/win32/vdmdbg/vdmdbg.def
@@ -0,0 +1,26 @@
+
+LIBRARY vdmdbg.dll
+
+EXPORTS
+  VDMBreakThread@8 @1
+  VDMDetectWOW@0 @2
+  VDMEnumProcessWOW@8 @3
+  VDMEnumTaskWOW@12 @4
+  VDMEnumTaskWOWEx@12 @5
+  VDMGetContext@12 @6
+  VDMGetDbgFlags@4 @7
+  VDMGetModuleSelector@20 @8
+  VDMGetPointer@20 @9
+  VDMGetSegmentInfo@16 @10
+  VDMGetSelectorModule@32 @11
+  VDMGlobalFirst@24 @12
+  VDMGlobalNext@24 @13
+  VDMIsModuleLoaded@4 @14
+  VDMKillWOW@0 @15
+  VDMModuleFirst@20 @16
+  VDMModuleNext@20 @17
+  VDMProcessException@4 @18
+  VDMSetContext@12 @19
+  VDMSetDbgFlags@8 @20
+  VDMStartTaskInWOW@12 @21
+  VDMTerminateTaskWOW@8 @22
diff --git a/dll/win32/version/CMakeLists.txt b/dll/win32/version/CMakeLists.txt
index 617801b83f7..104e463f358 100644
--- a/dll/win32/version/CMakeLists.txt
+++ b/dll/win32/version/CMakeLists.txt
@@ -1,6 +1,5 @@
 
 add_definitions(-D__WINESRC__)
-spec2def(version.dll version.spec)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
@@ -9,7 +8,11 @@ add_library(version SHARED
     install.c
     resource.c
     version.rc
-    ${CMAKE_CURRENT_BINARY_DIR}/version.def)
+    version.def)
+
+if(NOT MSVC)
+    set_source_files_properties(version.def PROPERTIES EXTERNAL_OBJECT TRUE)
+endif()
 
 set_entrypoint(version 0)
 
diff --git a/dll/win32/version/version.def b/dll/win32/version/version.def
new file mode 100644
index 00000000000..d98ba3c8c1b
--- /dev/null
+++ b/dll/win32/version/version.def
@@ -0,0 +1,16 @@
+
+LIBRARY version.dll
+
+EXPORTS
+  GetFileVersionInfoA@16 @1
+  GetFileVersionInfoSizeA@8 @2
+  GetFileVersionInfoSizeW@8 @3
+  GetFileVersionInfoW@16 @4
+  VerFindFileA@32 @5
+  VerFindFileW@32 @6
+  VerInstallFileA@32 @7
+  VerInstallFileW@32 @8
+  VerLanguageNameA@12=kernel32.VerLanguageNameA @9
+  VerLanguageNameW@12=kernel32.VerLanguageNameW @10
+  VerQueryValueA@16 @11
+  VerQueryValueW@16 @12
diff --git a/dll/win32/wdmaud.drv/CMakeLists.txt b/dll/win32/wdmaud.drv/CMakeLists.txt
index f5f86d2d466..befe27e4d3a 100644
--- a/dll/win32/wdmaud.drv/CMakeLists.txt
+++ b/dll/win32/wdmaud.drv/CMakeLists.txt
@@ -9,17 +9,20 @@ include_directories(
     ${REACTOS_SOURCE_DIR}/lib/drivers/sound/mmixer
     ${REACTOS_SOURCE_DIR}/lib/3rdparty/libsamplerate)
 
-spec2def(wdmaud.drv wdmaud.spec)
-
 add_library(wdmaud.drv SHARED
     wdmaud.c
     mixer.c
     mmixer.c
     legacy.c
     wdmaud.rc
-    ${CMAKE_CURRENT_BINARY_DIR}/wdmaud.def)
+    wdmaud.def)
+
+if(NOT MSVC)
+    set_source_files_properties(wdmaud.def PROPERTIES EXTERNAL_OBJECT TRUE)
+endif()
 
 set_module_type(wdmaud.drv win32dll)
+
 set_target_properties(wdmaud.drv PROPERTIES SUFFIX "")
 
 target_link_libraries(wdmaud.drv
@@ -28,4 +31,3 @@ target_link_libraries(wdmaud.drv
     mmixer)
 
 add_importlibs(wdmaud.drv user32 winmm advapi32 msvcrt setupapi ksuser kernel32 ntdll)
-
diff --git a/dll/win32/wdmaud.drv/wdmaud.def b/dll/win32/wdmaud.drv/wdmaud.def
new file mode 100644
index 00000000000..c132a211bab
--- /dev/null
+++ b/dll/win32/wdmaud.drv/wdmaud.def
@@ -0,0 +1,10 @@
+
+LIBRARY wdmaud.drv
+
+EXPORTS
+  DriverProc@20 @1
+  mxdMessage@20 @2
+  auxMessage@20 @3
+  wodMessage@20 @4
+  widMessage@20 @5
+  modMessage@20 @6
diff --git a/dll/win32/winfax/CMakeLists.txt b/dll/win32/winfax/CMakeLists.txt
index f0ede6e2abe..a646be3dfef 100644
--- a/dll/win32/winfax/CMakeLists.txt
+++ b/dll/win32/winfax/CMakeLists.txt
@@ -1,12 +1,12 @@
 
-spec2def(winfax.dll winfax.spec)
+add_library(winfax SHARED winfax.c winfax.rc winfax.def)
 
-add_library(winfax SHARED winfax.c winfax.rc
-    ${CMAKE_CURRENT_BINARY_DIR}/winfax.def)
+if(NOT MSVC)
+    set_source_files_properties(winfax.def PROPERTIES EXTERNAL_OBJECT TRUE)
+endif()
 
 set_entrypoint(winfax 0)
 
-
-
 add_importlibs(winfax kernel32 ntdll)
+
 add_dependencies(winfax psdk)
diff --git a/dll/win32/winfax/winfax.def b/dll/win32/winfax/winfax.def
new file mode 100644
index 00000000000..5a7772edd67
--- /dev/null
+++ b/dll/win32/winfax/winfax.def
@@ -0,0 +1,59 @@
+
+LIBRARY winfax.dll
+
+EXPORTS
+  FaxAbort@8 @1
+  FaxAccessCheck@8 @2
+  FaxClose@4 @3
+  FaxCompleteJobParamsA@8 @4
+  FaxCompleteJobParamsW@8 @5
+  FaxConnectFaxServerA@8 @6
+  FaxConnectFaxServerW@8 @7
+  FaxEnableRoutingMethodA@12 @8
+  FaxEnableRoutingMethodW@12 @9
+  FaxEnumGlobalRoutingInfoA@12 @10
+  FaxEnumGlobalRoutingInfoW@12 @11
+  FaxEnumJobsA@12 @12
+  FaxEnumJobsW@12 @13
+  FaxEnumPortsA@12 @14
+  FaxEnumPortsW@12 @15
+  FaxEnumRoutingMethodsA@12 @16
+  FaxEnumRoutingMethodsW@12 @17
+  FaxFreeBuffer@4 @18
+  FaxGetConfigurationA@8 @19
+  FaxGetConfigurationW@8 @20
+  FaxGetDeviceStatusA@8 @21
+  FaxGetDeviceStatusW@8 @22
+  FaxGetJobA@12 @23
+  FaxGetJobW@12 @24
+  FaxGetLoggingCategoriesA@12 @25
+  FaxGetLoggingCategoriesW@12 @26
+  FaxGetPageData@24 @27
+  FaxGetPortA@8 @28
+  FaxGetPortW@8 @29
+  FaxGetRoutingInfoA@16 @30
+  FaxGetRoutingInfoW@16 @31
+  FaxInitializeEventQueue@20 @32
+  FaxOpenPort@16 @33
+  FaxPrintCoverPageA@8 @34
+  FaxPrintCoverPageW@8 @35
+  FaxRegisterRoutingExtensionW@24 @36
+  FaxRegisterServiceProviderW@16 @37
+  FaxSendDocumentA@20 @38
+  FaxSendDocumentForBroadcastA@20 @39
+  FaxSendDocumentForBroadcastW@20 @40
+  FaxSendDocumentW@20 @41
+  FaxSetConfigurationA@8 @42
+  FaxSetConfigurationW@8 @43
+  FaxSetGlobalRoutingInfoA@8 @44
+  FaxSetGlobalRoutingInfoW@8 @45
+  FaxSetJobA@16 @46
+  FaxSetJobW@16 @47
+  FaxSetLoggingCategoriesA@12 @48
+  FaxSetLoggingCategoriesW@12 @49
+  FaxSetPortA@8 @50
+  FaxSetPortW@8 @51
+  FaxSetRoutingInfoA@16 @52
+  FaxSetRoutingInfoW@16 @53
+  FaxStartPrintJobA@16 @54
+  FaxStartPrintJobW@16 @55
diff --git a/dll/win32/wing32/CMakeLists.txt b/dll/win32/wing32/CMakeLists.txt
index cf55a67a27e..a9fafcfebd3 100644
--- a/dll/win32/wing32/CMakeLists.txt
+++ b/dll/win32/wing32/CMakeLists.txt
@@ -1,12 +1,12 @@
 
 set_unicode()
 
-spec2def(wing32.dll wing32.spec)
+add_library(wing32 SHARED wing32.c wing32.def)
 
-add_library(wing32 SHARED wing32.c
-    ${CMAKE_CURRENT_BINARY_DIR}/wing32.def)
+if(NOT MSVC)
+    set_source_files_properties(wing32.def PROPERTIES EXTERNAL_OBJECT TRUE)
+endif()
 
 set_entrypoint(wing32 0)
-
 add_importlibs(wing32 user32 gdi32)
 add_dependencies(wing32 psdk)
diff --git a/dll/win32/wing32/wing32.def b/dll/win32/wing32/wing32.def
new file mode 100644
index 00000000000..00090e08345
--- /dev/null
+++ b/dll/win32/wing32/wing32.def
@@ -0,0 +1,14 @@
+
+LIBRARY wing32.dll
+
+EXPORTS
+  WinGBitBlt@32 @1
+  WinGCreateBitmap@12 @2
+  WinGCreateDC@0 @3
+  WinGCreateHalfToneBrush@12 @4
+  WinGCreateHalfTonePalette@0 @5
+  WinGGetDIBColorTable@16 @6
+  WinGGetDIBPointer@8 @7
+  WinGRecommendDIBFormat@4 @8
+  WinGSetDIBColorTable@16 @9
+  WinGStretchBlt@40 @10
diff --git a/dll/win32/winhttp/CMakeLists.txt b/dll/win32/winhttp/CMakeLists.txt
index bd680d23eb4..ce9cec3dbc3 100644
--- a/dll/win32/winhttp/CMakeLists.txt
+++ b/dll/win32/winhttp/CMakeLists.txt
@@ -2,8 +2,6 @@
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(winhttp.dll winhttp.spec)
-
 add_library(winhttp SHARED
     cookie.c
     handle.c
@@ -12,7 +10,11 @@ add_library(winhttp SHARED
     request.c
     session.c
     url.c
-    ${CMAKE_CURRENT_BINARY_DIR}/winhttp.def)
+    winhttp.def)
+
+if(NOT MSVC)
+    set_source_files_properties(winhttp.def PROPERTIES EXTERNAL_OBJECT TRUE)
+endif()
 
 set_module_type(winhttp win32dll)
 
diff --git a/dll/win32/winhttp/winhttp.def b/dll/win32/winhttp/winhttp.def
new file mode 100644
index 00000000000..13913a03fa4
--- /dev/null
+++ b/dll/win32/winhttp/winhttp.def
@@ -0,0 +1,35 @@
+
+LIBRARY winhttp.dll
+
+EXPORTS
+  DllCanUnloadNow@0 @1 PRIVATE
+  DllGetClassObject@12 @2 PRIVATE
+  DllRegisterServer@0 @3 PRIVATE
+  DllUnregisterServer@0 @4 PRIVATE
+  WinHttpAddRequestHeaders@16 @5
+  WinHttpCheckPlatform@0 @6
+  WinHttpCloseHandle@4 @7
+  WinHttpConnect@16 @8
+  WinHttpCrackUrl@16 @9
+  WinHttpCreateUrl@16 @10
+  WinHttpDetectAutoProxyConfigUrl@8 @11
+  WinHttpGetDefaultProxyConfiguration@4 @12
+  WinHttpGetIEProxyConfigForCurrentUser@4 @13
+  WinHttpGetProxyForUrl@16 @14
+  WinHttpOpen@20 @15
+  WinHttpOpenRequest@28 @16
+  WinHttpQueryAuthSchemes@16 @17
+  WinHttpQueryDataAvailable@8 @18
+  WinHttpQueryHeaders@24 @19
+  WinHttpQueryOption@16 @20
+  WinHttpReadData@16 @21
+  WinHttpReceiveResponse@8 @22
+  WinHttpSendRequest@28 @23
+  WinHttpSetCredentials@24 @24
+  WinHttpSetDefaultProxyConfiguration@4 @25
+  WinHttpSetOption@16 @26
+  WinHttpSetStatusCallback@16 @27
+  WinHttpSetTimeouts@20 @28
+  WinHttpTimeFromSystemTime@8 @29
+  WinHttpTimeToSystemTime@8 @30
+  WinHttpWriteData@16 @31
diff --git a/dll/win32/winsta/CMakeLists.txt b/dll/win32/winsta/CMakeLists.txt
index fbb42ed63da..5de0491a4ce 100644
--- a/dll/win32/winsta/CMakeLists.txt
+++ b/dll/win32/winsta/CMakeLists.txt
@@ -1,6 +1,4 @@
 
-spec2def(winsta.dll winsta.spec)
-
 list(APPEND SOURCE
     logon.c
     main.c
@@ -10,7 +8,11 @@ list(APPEND SOURCE
     server.c
     ws.c
     winsta.rc
-    ${CMAKE_CURRENT_BINARY_DIR}/winsta.def)
+    winsta.def)
+
+if(NOT MSVC)
+    set_source_files_properties(winsta.def PROPERTIES EXTERNAL_OBJECT TRUE)
+endif()
 
 add_library(winsta SHARED
     ${CMAKE_CURRENT_BINARY_DIR}/winsta_winsta.h.gch
diff --git a/dll/win32/winsta/winsta.def b/dll/win32/winsta/winsta.def
new file mode 100644
index 00000000000..e0633858bef
--- /dev/null
+++ b/dll/win32/winsta/winsta.def
@@ -0,0 +1,124 @@
+
+LIBRARY winsta.dll
+
+EXPORTS
+  LogonIdFromWinStationNameA@12 @1
+  LogonIdFromWinStationNameW@12 @2
+  RemoteAssistancePrepareSystemRestore@4 @3
+  ServerGetInternetConnectorStatus@12 @4
+  ServerLicensingClose@4 @5
+  ServerLicensingDeactivateCurrentPolicy@4 @6
+  ServerLicensingFreePolicyInformation@4 @7
+  ServerLicensingGetAvailablePolicyIds@12 @8
+  ServerLicensingGetPolicy@8 @9
+  ServerLicensingGetPolicyInformationA@16 @10
+  ServerLicensingGetPolicyInformationW@16 @11
+  ServerLicensingLoadPolicy@8 @12
+  ServerLicensingOpenA@4 @13
+  ServerLicensingOpenW@4 @14
+  ServerLicensingSetPolicy@12 @15
+  ServerLicensingUnloadPolicy@8 @16
+  ServerQueryInetConnectorInformationA@16 @17
+  ServerQueryInetConnectorInformationW@16 @18
+  ServerSetInternetConnectorStatus@12 @19
+  WinStationActivateLicense@16 @20
+  WinStationAutoReconnect@4 @21
+  WinStationBroadcastSystemMessage@40 @22
+  WinStationCheckAccess@12 @23
+  WinStationCheckLoopBack@16 @24
+  WinStationCloseServer@16 @25
+  WinStationConnectA@4 @26
+  WinStationConnectCallback@20 @27
+  WinStationConnectEx@8 @28
+  WinStationConnectW@20 @29
+  WinStationDisconnect@12 @30
+  WinStationDynVirtualChanRead@20 @31
+  WinStationDynVirtualChanWrite@16 @32
+  WinStationEnumerateA@12 @33
+  WinStationEnumerateLicenses@12 @34
+  WinStationEnumerateProcesses@8 @35
+  WinStationEnumerateW@12 @36
+  WinStationEnumerate_IndexedA@20 @37
+  WinStationEnumerate_IndexedW@20 @38
+  WinStationFreeGAPMemory@12 @39
+  WinStationFreeMemory@4 @40
+  WinStationFreeUserCertificates@4 @41
+  WinStationFreeUserCredentials@4 @42
+  WinStationGenerateLicense@16 @43
+  WinStationGetAllProcesses@16 @44
+  WinStationGetConnectionProperty@12 @45
+  WinStationGetInitialApplication@20 @46
+  WinStationGetLanAdapterNameA@24 @47
+  WinStationGetLanAdapterNameW@24 @48
+  WinStationGetLoggedOnCount@8 @49
+  WinStationGetMachinePolicy@8 @50
+  WinStationGetProcessSid@24 @51
+  WinStationGetTermSrvCountersValue@12 @52
+  WinStationGetUserCertificates@4 @53
+  WinStationGetUserCredentials@4 @54
+  WinStationGetUserProfile@16 @55
+  WinStationInstallLicense@12 @56
+  WinStationIsHelpAssistantSession@8 @57
+  WinStationIsSessionPermitted@0 @58
+  WinStationNameFromLogonIdA@12 @59
+  WinStationNameFromLogonIdW@12 @60
+  WinStationNtsdDebug@20 @61
+  WinStationOpenServerA@4 @62
+  WinStationOpenServerW@4 @63
+  WinStationQueryAllowConcurrentConnections@0 @64
+  WinStationQueryEnforcementCore@24 @65
+  WinStationQueryInformationA@24 @66
+  WinStationQueryInformationW@24 @67
+  WinStationQueryLicense@12 @68
+  WinStationQueryLogonCredentialsW@4 @69
+  WinStationQueryUpdateRequired@8 @70
+  WinStationRegisterConsoleNotification@12 @71
+  WinStationRegisterConsoleNotificationEx@16 @72
+  WinStationRegisterNotificationEvent@16 @73
+  WinStationRemoveLicense@12 @74
+  WinStationRenameA@12 @75
+  WinStationRenameW@12 @76
+  WinStationRequestSessionsList@12 @77
+  WinStationReset@12 @78
+  WinStationSendMessageA@40 @79
+  WinStationSendMessageW@40 @80
+  WinStationSendWindowMessage@32 @81
+  WinStationServerPing@4 @82
+  WinStationSetInformationA@20 @83
+  WinStationSetInformationW@20 @84
+  WinStationSetPoolCount@12 @85
+  WinStationShadow@20 @86
+  WinStationShadowStop@12 @87
+  WinStationShutdownSystem@8 @88
+  WinStationSwitchToServicesSession@0 @89
+  WinStationSystemShutdownStarted@0 @90
+  WinStationSystemShutdownWait@8 @91
+  WinStationTerminateProcess@12 @92
+  WinStationUnRegisterConsoleNotification@8 @93
+  WinStationUnRegisterNotificationEvent@4 @94
+  WinStationUserLoginAccessCheck@16 @95
+  WinStationVirtualOpen@12 @96
+  WinStationVirtualOpenEx@16 @97
+  WinStationWaitSystemEvent@12 @98
+  _NWLogonQueryAdmin@12 @99
+  _NWLogonSetAdmin@12 @100
+  _WinStationAnnoyancePopup@8 @101
+  _WinStationBeepOpen@12 @102
+  _WinStationBreakPoint@12 @103
+  _WinStationCallback@12 @104
+  _WinStationCheckForApplicationName@48 @105
+  _WinStationFUSCanRemoteUserDisconnect@12 @106
+  _WinStationGetApplicationInfo@16 @107
+  _WinStationNotifyDisconnectPipe@0 @108
+  _WinStationNotifyLogoff@0 @109
+  _WinStationNotifyLogon@32 @110
+  _WinStationNotifyNewSession@8 @111
+  _WinStationReInitializeSecurity@4 @112
+  _WinStationReadRegistry@4 @113
+  _WinStationSessionInitialized@0 @114
+  _WinStationShadowTarget@40 @115
+  _WinStationShadowTargetSetup@8 @116
+  _WinStationUpdateClientCachedCredentials@28 @117
+  _WinStationUpdateSettings@12 @118
+  _WinStationUpdateUserConfig@4 @119
+  _WinStationWaitForConnect@0 @120
diff --git a/dll/win32/wmi/CMakeLists.txt b/dll/win32/wmi/CMakeLists.txt
index 5b35997c072..fc115fdd37f 100644
--- a/dll/win32/wmi/CMakeLists.txt
+++ b/dll/win32/wmi/CMakeLists.txt
@@ -1,8 +1,9 @@
 
-spec2def(wmi.dll wmi.spec)
+add_library(wmi SHARED wmi.rc wmi.def)
 
-add_library(wmi SHARED wmi.rc
-    ${CMAKE_CURRENT_BINARY_DIR}/wmi.def)
+if(NOT MSVC)
+    set_source_files_properties(wmi.def PROPERTIES EXTERNAL_OBJECT TRUE)
+endif()
 
 set_entrypoint(wmi 0)
 
diff --git a/dll/win32/wmi/wmi.def b/dll/win32/wmi/wmi.def
new file mode 100644
index 00000000000..ac15dae579a
--- /dev/null
+++ b/dll/win32/wmi/wmi.def
@@ -0,0 +1,49 @@
+
+LIBRARY wmi.dll
+
+EXPORTS
+  CloseTrace@4=advapi32.CloseTrace @1
+  ControlTraceA@16=advapi32.ControlTraceA @2
+  ControlTraceW@16=advapi32.ControlTraceW @3
+  CreateTraceInstanceId@8=advapi32.CreateTraceInstanceId @4
+  EnableTrace@20=advapi32.EnableTrace @5
+  GetTraceEnableFlags@4=advapi32.GetTraceEnableFlags @6
+  GetTraceEnableLevel@4=advapi32.GetTraceEnableLevel @7
+  GetTraceLoggerHandle@4=advapi32.GetTraceLoggerHandle @8
+  OpenTraceA@4=advapi32.OpenTraceA @9
+  OpenTraceW@4=advapi32.OpenTraceW @10
+  ProcessTrace@16=advapi32.ProcessTrace @11
+  QueryAllTracesA@12=advapi32.QueryAllTracesA @12
+  QueryAllTracesW@12=advapi32.QueryAllTracesW @13
+  RegisterTraceGuidsA@32=advapi32.RegisterTraceGuidsA @14
+  RegisterTraceGuidsW@32=advapi32.RegisterTraceGuidsW @15
+  RemoveTraceCallback@4=advapi32.RemoveTraceCallback @16
+  SetTraceCallback@8=advapi32.SetTraceCallback @17
+  StartTraceA@12=advapi32.StartTraceA @18
+  StartTraceW@12=advapi32.StartTraceW @19
+  TraceEvent@8=advapi32.TraceEvent @20
+  TraceEventInstance@16=advapi32.TraceEventInstance @21
+  UnregisterTraceGuids@4=advapi32.UnregisterTraceGuids @22
+  WmiCloseBlock@0=advapi32.WmiCloseBlock @23
+  WmiDevInstToInstanceNameA@0=advapi32.WmiDevInstToInstanceNameA @24
+  WmiDevInstToInstanceNameW@0=advapi32.WmiDevInstToInstanceNameW @25
+  WmiEnumerateGuids@0=advapi32.WmiEnumerateGuids @26
+  WmiExecuteMethodA@0=advapi32.WmiExecuteMethodA @27
+  WmiExecuteMethodW@0=advapi32.WmiExecuteMethodW @28
+  WmiFileHandleToInstanceNameA@0=advapi32.WmiFileHandleToInstanceNameA @29
+  WmiFileHandleToInstanceNameW@0=advapi32.WmiFileHandleToInstanceNameW @30
+  WmiFreeBuffer@0=advapi32.WmiFreeBuffer @31
+  WmiMofEnumerateResourcesA@0=advapi32.WmiMofEnumerateResourcesA @32
+  WmiMofEnumerateResourcesW@0=advapi32.WmiMofEnumerateResourcesW @33
+  WmiNotificationRegistrationA@0=advapi32.WmiNotificationRegistrationA @34
+  WmiNotificationRegistrationW@0=advapi32.WmiNotificationRegistrationW @35
+  WmiOpenBlock@0=advapi32.WmiOpenBlock @36
+  WmiQueryAllDataA@0=advapi32.WmiQueryAllDataA @37
+  WmiQueryAllDataW@0=advapi32.WmiQueryAllDataW @38
+  WmiQueryGuidInformation@0=advapi32.WmiQueryGuidInformation @39
+  WmiQuerySingleInstanceA@0=advapi32.WmiQuerySingleInstanceA @40
+  WmiQuerySingleInstanceW@0=advapi32.WmiQuerySingleInstanceW @41
+  WmiSetSingleInstanceA@0=advapi32.WmiSetSingleInstanceA @42
+  WmiSetSingleInstanceW@0=advapi32.WmiSetSingleInstanceW @43
+  WmiSetSingleItemA@0=advapi32.WmiSetSingleItemA @44
+  WmiSetSingleItemW@0=advapi32.WmiSetSingleItemW @45
diff --git a/dll/win32/ws2_32_new/CMakeLists.txt b/dll/win32/ws2_32_new/CMakeLists.txt
index 8be77c85b98..329226fd115 100644
--- a/dll/win32/ws2_32_new/CMakeLists.txt
+++ b/dll/win32/ws2_32_new/CMakeLists.txt
@@ -1,10 +1,9 @@
 
 add_definitions(-DLE)
 
-include_directories(inc)
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/winsock)
-
-spec2def(ws2_32_new.dll ws2_32.spec)
+include_directories(
+    inc
+    ${REACTOS_SOURCE_DIR}/include/reactos/winsock)
 
 add_library(ws2_32_new SHARED
     src/addrconv.c
@@ -44,7 +43,11 @@ add_library(ws2_32_new SHARED
     src/startup.c
     src/wsautil.c
     ws2_32.rc
-     ${CMAKE_CURRENT_BINARY_DIR}/ws2_32.def)
+    ws2_32.def)
+
+if(NOT MSVC)
+    set_source_files_properties(ws2_32.def PROPERTIES EXTERNAL_OBJECT TRUE)
+endif()
 
 set_module_type(ws2_32_new win32dll)
 
diff --git a/dll/win32/ws2_32_new/ws2_32.def b/dll/win32/ws2_32_new/ws2_32.def
new file mode 100644
index 00000000000..2b3f8a352c4
--- /dev/null
+++ b/dll/win32/ws2_32_new/ws2_32.def
@@ -0,0 +1,121 @@
+
+LIBRARY ws2_32_new.dll
+
+EXPORTS
+  WEP@0 @500
+  WPUCompleteOverlappedRequest@20 @24
+  WSAAccept@20 @25
+  WSAAddressToStringA@20 @26
+  WSAAddressToStringW@20 @27
+  WSAAsyncGetHostByAddr@28 @102
+  WSAAsyncGetHostByName@20 @103
+  WSAAsyncGetProtoByName@20 @105
+  WSAAsyncGetProtoByNumber@20 @104
+  WSAAsyncGetServByName@24 @107
+  WSAAsyncGetServByPort@24 @106
+  WSAAsyncSelect@16 @101
+  WSACancelAsyncRequest@4 @108
+  WSACancelBlockingCall@0 @113
+  WSACleanup@0 @116
+  WSACloseEvent@4 @28
+  WSAConnect@28 @29
+  WSACreateEvent@0 @30
+  WSADuplicateSocketA@12 @31
+  WSADuplicateSocketW@12 @32
+  WSAEnumNameSpaceProvidersA@8 @33
+  WSAEnumNameSpaceProvidersW@8 @34
+  WSAEnumNetworkEvents@12 @35
+  WSAEnumProtocolsA@12 @36
+  WSAEnumProtocolsW@12 @37
+  WSAEventSelect@12 @38
+  WSAGetLastError@0 @111
+  WSAGetOverlappedResult@20 @39
+  WSAGetQOSByName@12 @40
+  WSAGetServiceClassInfoA@16 @41
+  WSAGetServiceClassInfoW@16 @42
+  WSAGetServiceClassNameByClassIdA@12 @43
+  WSAGetServiceClassNameByClassIdW@12 @44
+  WSAHtonl@12 @45
+  WSAHtons@12 @46
+  WSAInstallServiceClassA@4 @47
+  WSAInstallServiceClassW@4 @48
+  WSAIoctl@36 @49
+  WSAIsBlocking@0 @114
+  WSAJoinLeaf@32 @50
+  WSALookupServiceBeginA@12 @58
+  WSALookupServiceBeginW@12 @59
+  WSALookupServiceEnd@4 @60
+  WSALookupServiceNextA@16 @61
+  WSALookupServiceNextW@16 @62
+  WSANSPIoctl@32 @63
+  WSANtohl@12 @64
+  WSANtohs@12 @65
+  WSAProviderConfigChange@12 @66
+  WSARecv@28 @67
+  WSARecvDisconnect@8 @68
+  WSARecvFrom@36 @69
+  WSARemoveServiceClass@4 @70
+  WSAResetEvent@4 @71
+  WSASend@28 @72
+  WSASendDisconnect@8 @73
+  WSASendTo@36 @74
+  WSASetBlockingHook@4 @109
+  WSASetEvent@4 @75
+  WSASetLastError@4 @112
+  WSASetServiceA@12 @76
+  WSASetServiceW@12 @77
+  WSASocketA@24 @78
+  WSASocketW@24 @79
+  WSAStartup@8 @115
+  WSAStringToAddressA@20 @80
+  WSAStringToAddressW@20 @81
+  WSAUnhookBlockingHook@0 @110
+  WSAWaitForMultipleEvents@20 @82
+  WSApSetPostRoutine@4 @83
+  FreeAddrInfoW@4=freeaddrinfo@4 @84
+  WSCDeinstallProvider@8 @85
+  WSCEnableNSProvider@8 @86
+  WSCEnumProtocols@16 @87
+  WSCGetProviderPath@16 @88
+  WSCInstallNameSpace@20 @89
+  WSCInstallProvider@20 @90
+  WSCUnInstallNameSpace@4 @91
+  WSCUpdateProvider@20 @92
+  WSCWriteNameSpaceOrder@8 @93
+  WSCWriteProviderOrder@8 @94
+  __WSAFDIsSet@8 @151
+  accept@12 @1
+  bind@12 @2
+  closesocket@4 @3
+  connect@12 @4
+  freeaddrinfo@4 @95
+  getaddrinfo@16 @96
+  gethostbyaddr@12 @51
+  gethostbyname@4 @52
+  gethostname@8 @57
+  getnameinfo@28 @97
+  getpeername@12 @5
+  getprotobyname@4 @53
+  getprotobynumber@4 @54
+  getservbyname@8 @55
+  getservbyport@8 @56
+  getsockname@12 @6
+  getsockopt@20 @7
+  htonl@4 @8
+  htons@4 @9
+  inet_addr@4 @11
+  inet_ntoa@4 @12
+  ioctlsocket@12 @10
+  listen@8 @13
+  ntohl@4 @14
+  ntohs@4 @15
+  recv@16 @16
+  recvfrom@24 @17
+  select@20 @18
+  send@16 @19
+  sendto@24 @20
+  setsockopt@20 @21
+  shutdown@8 @22
+  socket@12 @23
+  GetAddrInfoW@16 @98
+  GetNameInfoW@28 @99
diff --git a/dll/win32/ws2help/CMakeLists.txt b/dll/win32/ws2help/CMakeLists.txt
index 1d535e08b8d..c58bee67b02 100644
--- a/dll/win32/ws2help/CMakeLists.txt
+++ b/dll/win32/ws2help/CMakeLists.txt
@@ -1,15 +1,17 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/winsock)
 
-spec2def(ws2help.dll ws2help.spec)
-
 add_library(ws2help SHARED
     apc.c
     context.c
     dllmain.c
     handle.c
     notify.c
-    ${CMAKE_CURRENT_BINARY_DIR}/ws2help.def)
+    ws2help.def)
+
+if(NOT MSVC)
+    set_source_files_properties(ws2help.def PROPERTIES EXTERNAL_OBJECT TRUE)
+endif()
 
 set_module_type(ws2help win32dll)
 
diff --git a/dll/win32/ws2help/ws2help.def b/dll/win32/ws2help/ws2help.def
new file mode 100644
index 00000000000..27721fb439b
--- /dev/null
+++ b/dll/win32/ws2help/ws2help.def
@@ -0,0 +1,27 @@
+
+LIBRARY ws2help.dll
+
+EXPORTS
+  WahCloseApcHelper@4 @1
+  WahCloseHandleHelper@4 @2
+  WahCloseNotificationHandleHelper@4 @3
+  WahCloseSocketHandle@8 @4
+  WahCloseThread@8 @5
+  WahCompleteRequest@20 @6
+  WahCreateHandleContextTable@4 @7
+  WahCreateNotificationHandle@8 @8
+  WahCreateSocketHandle@8 @9
+  WahDestroyHandleContextTable@4 @10
+  WahDisableNonIFSHandleSupport@0 @11
+  WahEnableNonIFSHandleSupport@0 @12
+  WahEnumerateHandleContexts@12 @13
+  WahInsertHandleContext@8 @14
+  WahNotifyAllProcesses@4 @15
+  WahOpenApcHelper@4 @16
+  WahOpenCurrentThread@8 @17
+  WahOpenHandleHelper@4 @18
+  WahOpenNotificationHandleHelper@4 @19
+  WahQueueUserApc@16 @20
+  WahReferenceContextByHandle@8 @21
+  WahRemoveHandleContext@8 @22
+  WahWaitForNotification@16 @23
diff --git a/dll/win32/wshirda/CMakeLists.txt b/dll/win32/wshirda/CMakeLists.txt
index 039ba121fd8..a03f4d34ab0 100644
--- a/dll/win32/wshirda/CMakeLists.txt
+++ b/dll/win32/wshirda/CMakeLists.txt
@@ -1,9 +1,11 @@
 
 set_unicode()
 
-spec2def(wshirda.dll wshirda.spec)
+add_library(wshirda SHARED wshirda.c wshirda.rc wshirda.def)
 
-add_library(wshirda SHARED wshirda.c wshirda.rc ${CMAKE_CURRENT_BINARY_DIR}/wshirda.def)
+if(NOT MSVC)
+    set_source_files_properties(wshirda.def PROPERTIES EXTERNAL_OBJECT TRUE)
+endif()
 
 set_module_type(wshirda win32dll)
 
diff --git a/dll/win32/wshirda/wshirda.def b/dll/win32/wshirda/wshirda.def
new file mode 100644
index 00000000000..a1d6666ee54
--- /dev/null
+++ b/dll/win32/wshirda/wshirda.def
@@ -0,0 +1,15 @@
+
+LIBRARY wshirda.dll
+
+EXPORTS
+  WSHEnumProtocols@16 @1
+  WSHGetProviderGuid@8 @2
+  WSHGetSockaddrType@12 @3
+  WSHGetSocketInformation@32 @4
+  WSHGetWSAProtocolInfo@12 @5
+  WSHGetWildcardSockaddr@12 @6
+  WSHGetWinsockMapping@8 @7
+  WSHIoctl@52 @8
+  WSHNotify@20 @9
+  WSHOpenSocket@24 @10
+  WSHSetSocketInformation@32 @11
diff --git a/dll/win32/wshtcpip/CMakeLists.txt b/dll/win32/wshtcpip/CMakeLists.txt
index 875c4df6ec5..27a6bcf401b 100644
--- a/dll/win32/wshtcpip/CMakeLists.txt
+++ b/dll/win32/wshtcpip/CMakeLists.txt
@@ -3,10 +3,11 @@ set_unicode()
 
 include_directories(${REACTOS_SOURCE_DIR}/lib/tdilib)
 
-spec2def(wshtcpip.dll wshtcpip.spec)
+add_library(wshtcpip SHARED wshtcpip.c wshtcpip.rc wshtcpip.def)
 
-add_library(wshtcpip SHARED wshtcpip.c wshtcpip.rc
-    ${CMAKE_CURRENT_BINARY_DIR}/wshtcpip.def)
+if(NOT MSVC)
+    set_source_files_properties(wshtcpip.def PROPERTIES EXTERNAL_OBJECT TRUE)
+endif()
 
 set_entrypoint(wshtcpip 0)
 
diff --git a/dll/win32/wshtcpip/wshtcpip.def b/dll/win32/wshtcpip/wshtcpip.def
new file mode 100644
index 00000000000..8dc0e3bc9e0
--- /dev/null
+++ b/dll/win32/wshtcpip/wshtcpip.def
@@ -0,0 +1,20 @@
+
+LIBRARY wshtcpip.dll
+
+EXPORTS
+  WSHAddressToString@20 @1
+  WSHEnumProtocols@16 @2
+  WSHGetBroadcastSockaddr@12 @3
+  WSHGetProviderGuid@8 @4
+  WSHGetSockaddrType@12 @5
+  WSHGetSocketInformation@32 @6
+  WSHGetWildcardSockaddr@12 @7
+  WSHGetWinsockMapping@8 @8
+  WSHGetWSAProtocolInfo@12 @9
+  WSHIoctl@52 @10
+  WSHJoinLeaf@52 @11
+  WSHNotify@20 @12
+  WSHOpenSocket@24 @13
+  WSHOpenSocket2@32 @14
+  WSHSetSocketInformation@32 @15
+  WSHStringToAddress@20 @16
diff --git a/dll/win32/wuapi/CMakeLists.txt b/dll/win32/wuapi/CMakeLists.txt
index e73c574109f..ed090989b07 100644
--- a/dll/win32/wuapi/CMakeLists.txt
+++ b/dll/win32/wuapi/CMakeLists.txt
@@ -6,8 +6,6 @@ add_definitions(-D_WIN32_WINNT=0x600)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(wuapi.dll wuapi.spec)
-
 add_library(wuapi SHARED
     downloader.c
     installer.c
@@ -16,7 +14,11 @@ add_library(wuapi SHARED
     searcher.c
     session.c
     updates.c
-    ${CMAKE_CURRENT_BINARY_DIR}/wuapi.def)
+    wuapi.def)
+
+if(NOT MSVC)
+    set_source_files_properties(wuapi.def PROPERTIES EXTERNAL_OBJECT TRUE)
+endif()
 
 set_module_type(wuapi win32dll)
 
diff --git a/dll/win32/wuapi/wuapi.def b/dll/win32/wuapi/wuapi.def
new file mode 100644
index 00000000000..be1e1a950af
--- /dev/null
+++ b/dll/win32/wuapi/wuapi.def
@@ -0,0 +1,8 @@
+
+LIBRARY wuapi.dll
+
+EXPORTS
+  DllCanUnloadNow@0 @1 PRIVATE
+  DllGetClassObject@12 @2 PRIVATE
+  DllRegisterServer@0 @3 PRIVATE
+  DllUnregisterServer@0 @4 PRIVATE
diff --git a/dll/win32/xinput1_1/CMakeLists.txt b/dll/win32/xinput1_1/CMakeLists.txt
index 826be84e69b..dc6d6468db6 100644
--- a/dll/win32/xinput1_1/CMakeLists.txt
+++ b/dll/win32/xinput1_1/CMakeLists.txt
@@ -2,9 +2,11 @@
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(xinput1_1.dll xinput1_1.spec)
+add_library(xinput1_1 SHARED xinput1_1_main.c version.rc xinput1_1.def)
 
-add_library(xinput1_1 SHARED xinput1_1_main.c version.rc ${CMAKE_CURRENT_BINARY_DIR}/xinput1_1.def)
+if(NOT MSVC)
+    set_source_files_properties(xinput1_1.def PROPERTIES EXTERNAL_OBJECT TRUE)
+endif()
 
 set_module_type(xinput1_1 win32dll)
 
diff --git a/dll/win32/xinput1_1/xinput1_1.def b/dll/win32/xinput1_1/xinput1_1.def
new file mode 100644
index 00000000000..99b669873d5
--- /dev/null
+++ b/dll/win32/xinput1_1/xinput1_1.def
@@ -0,0 +1,9 @@
+
+LIBRARY xinput1_1.dll
+
+EXPORTS
+  XInputEnable@4=xinput1_3.XInputEnable @1
+  XInputGetCapabilities@12=xinput1_3.XInputGetCapabilities @2
+  XInputGetDSoundAudioDeviceGuids@12=xinput1_3.XInputGetDSoundAudioDeviceGuids @3
+  XInputSetState@8=xinput1_3.XInputSetState @4
+  XInputGetState@8=xinput1_3.XInputGetState @5
diff --git a/dll/win32/xinput1_2/CMakeLists.txt b/dll/win32/xinput1_2/CMakeLists.txt
index c107c2bb4cf..62654293e1d 100644
--- a/dll/win32/xinput1_2/CMakeLists.txt
+++ b/dll/win32/xinput1_2/CMakeLists.txt
@@ -2,9 +2,11 @@
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(xinput1_2.dll xinput1_2.spec)
+add_library(xinput1_2 SHARED xinput1_2_main.c version.rc xinput1_2.def)
 
-add_library(xinput1_2 SHARED xinput1_2_main.c version.rc ${CMAKE_CURRENT_BINARY_DIR}/xinput1_2.def)
+if(NOT MSVC)
+    set_source_files_properties(xinput1_2.def PROPERTIES EXTERNAL_OBJECT TRUE)
+endif()
 
 add_importlibs(xinput1_2 kernel32)
 
diff --git a/dll/win32/xinput1_2/xinput1_2.def b/dll/win32/xinput1_2/xinput1_2.def
new file mode 100644
index 00000000000..b094afa7650
--- /dev/null
+++ b/dll/win32/xinput1_2/xinput1_2.def
@@ -0,0 +1,9 @@
+
+LIBRARY xinput1_2.dll
+
+EXPORTS
+  XInputEnable@4=xinput1_3.XInputEnable @1
+  XInputGetCapabilities@12=xinput1_3.XInputGetCapabilities @2
+  XInputGetDSoundAudioDeviceGuids@12=xinput1_3.XInputGetDSoundAudioDeviceGuids @3
+  XInputSetState@8=xinput1_3.XInputSetState @4
+  XInputGetState@8=xinput1_3.XInputGetState @5
diff --git a/dll/win32/xinput1_3/CMakeLists.txt b/dll/win32/xinput1_3/CMakeLists.txt
index c6cf27bf2f8..d4ce8eb66f8 100644
--- a/dll/win32/xinput1_3/CMakeLists.txt
+++ b/dll/win32/xinput1_3/CMakeLists.txt
@@ -2,9 +2,11 @@
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(xinput1_3.dll xinput1_3.spec)
+add_library(xinput1_3 SHARED xinput1_3_main.c version.rc xinput1_3.def)
 
-add_library(xinput1_3 SHARED xinput1_3_main.c version.rc ${CMAKE_CURRENT_BINARY_DIR}/xinput1_3.def)
+if(NOT MSVC)
+    set_source_files_properties(xinput1_3.def PROPERTIES EXTERNAL_OBJECT TRUE)
+endif()
 
 set_module_type(xinput1_3 win32dll)
 
@@ -12,5 +14,4 @@ target_link_libraries(xinput1_3 wine)
 
 add_importlibs(xinput1_3 msvcrt kernel32 ntdll)
 
-
 add_cab_target(xinput1_3 1)
diff --git a/dll/win32/xinput1_3/xinput1_3.def b/dll/win32/xinput1_3/xinput1_3.def
new file mode 100644
index 00000000000..1d6ae3f6b28
--- /dev/null
+++ b/dll/win32/xinput1_3/xinput1_3.def
@@ -0,0 +1,12 @@
+
+LIBRARY xinput1_3.dll
+
+EXPORTS
+  DllMain@12 @1
+  XInputGetState@8 @2
+  XInputSetState@8 @3
+  XInputGetCapabilities@12 @4
+  XInputEnable@4 @5
+  XInputGetDSoundAudioDeviceGuids@12 @6
+  XInputGetBatteryInformation@12 @7
+  XInputGetKeystroke@12 @8
diff --git a/dll/win32/xinput9_1_0/CMakeLists.txt b/dll/win32/xinput9_1_0/CMakeLists.txt
index 5631c3168ad..c4fe4900d2d 100644
--- a/dll/win32/xinput9_1_0/CMakeLists.txt
+++ b/dll/win32/xinput9_1_0/CMakeLists.txt
@@ -2,9 +2,11 @@
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(xinput9_1_0.dll xinput9_1_0.spec)
+add_library(xinput9_1_0 SHARED xinput9_1_0_main.c version.rc xinput9_1_0.def)
 
-add_library(xinput9_1_0 SHARED xinput9_1_0_main.c version.rc ${CMAKE_CURRENT_BINARY_DIR}/xinput9_1_0.def)
+if(NOT MSVC)
+    set_source_files_properties(xinput9_1_0.def PROPERTIES EXTERNAL_OBJECT TRUE)
+endif()
 
 add_importlibs(xinput9_1_0 kernel32)
 
diff --git a/dll/win32/xinput9_1_0/xinput9_1_0.def b/dll/win32/xinput9_1_0/xinput9_1_0.def
new file mode 100644
index 00000000000..042954d9595
--- /dev/null
+++ b/dll/win32/xinput9_1_0/xinput9_1_0.def
@@ -0,0 +1,8 @@
+
+LIBRARY xinput9_1_0.dll
+
+EXPORTS
+  XInputGetCapabilities@12=xinput1_3.XInputGetCapabilities @1
+  XInputGetDSoundAudioDeviceGuids@12=xinput1_3.XInputGetDSoundAudioDeviceGuids @2
+  XInputSetState@8=xinput1_3.XInputSetState @3
+  XInputGetState@8=xinput1_3.XInputGetState @4