[ros-diffs] [akhaldi] 49450: [CMAKE] - Move more dlls with no stubs into using def files instead of spec files.

akhaldi at svn.reactos.org akhaldi at svn.reactos.org
Tue Nov 2 20:23:57 UTC 2010


Author: akhaldi
Date: Tue Nov  2 20:23:56 2010
New Revision: 49450

URL: http://svn.reactos.org/svn/reactos?rev=49450&view=rev
Log:
[CMAKE]
- Move more dlls with no stubs into using def files instead of spec files.

Added:
    branches/cmake-bringup/dll/win32/rsabase/rsabase.def   (with props)
    branches/cmake-bringup/dll/win32/rsaenh/rsaenh.def   (with props)
    branches/cmake-bringup/dll/win32/samsrv/samsrv.def   (with props)
    branches/cmake-bringup/dll/win32/sensapi/sensapi.def   (with props)
    branches/cmake-bringup/dll/win32/serialui/serialui.def   (with props)
    branches/cmake-bringup/dll/win32/shfolder/shfolder.def   (with props)
    branches/cmake-bringup/dll/win32/smdll/smdll.def   (with props)
    branches/cmake-bringup/dll/win32/sndblst/sndblst.def   (with props)
    branches/cmake-bringup/dll/win32/sti/sti.def   (with props)
    branches/cmake-bringup/dll/win32/twain_32/twain_32.def   (with props)
    branches/cmake-bringup/dll/win32/uext2/uext2.def   (with props)
    branches/cmake-bringup/dll/win32/ufat/ufat.def   (with props)
    branches/cmake-bringup/dll/win32/ufatx/ufatx.def   (with props)
    branches/cmake-bringup/dll/win32/untfs/untfs.def   (with props)
    branches/cmake-bringup/dll/win32/vdmdbg/vdmdbg.def   (with props)
    branches/cmake-bringup/dll/win32/version/version.def   (with props)
    branches/cmake-bringup/dll/win32/wdmaud.drv/wdmaud.def   (with props)
    branches/cmake-bringup/dll/win32/winfax/winfax.def   (with props)
    branches/cmake-bringup/dll/win32/wing32/wing32.def   (with props)
    branches/cmake-bringup/dll/win32/winhttp/winhttp.def   (with props)
    branches/cmake-bringup/dll/win32/winsta/winsta.def   (with props)
    branches/cmake-bringup/dll/win32/wmi/wmi.def   (with props)
    branches/cmake-bringup/dll/win32/ws2_32_new/ws2_32.def   (with props)
    branches/cmake-bringup/dll/win32/ws2help/ws2help.def   (with props)
    branches/cmake-bringup/dll/win32/wshirda/wshirda.def   (with props)
    branches/cmake-bringup/dll/win32/wshtcpip/wshtcpip.def   (with props)
    branches/cmake-bringup/dll/win32/wuapi/wuapi.def   (with props)
    branches/cmake-bringup/dll/win32/xinput1_1/xinput1_1.def   (with props)
    branches/cmake-bringup/dll/win32/xinput1_2/xinput1_2.def   (with props)
    branches/cmake-bringup/dll/win32/xinput1_3/xinput1_3.def   (with props)
    branches/cmake-bringup/dll/win32/xinput9_1_0/xinput9_1_0.def   (with props)
Modified:
    branches/cmake-bringup/dll/win32/rsabase/CMakeLists.txt
    branches/cmake-bringup/dll/win32/rsaenh/CMakeLists.txt
    branches/cmake-bringup/dll/win32/samsrv/CMakeLists.txt
    branches/cmake-bringup/dll/win32/sensapi/CMakeLists.txt
    branches/cmake-bringup/dll/win32/serialui/CMakeLists.txt
    branches/cmake-bringup/dll/win32/shfolder/CMakeLists.txt
    branches/cmake-bringup/dll/win32/smdll/CMakeLists.txt
    branches/cmake-bringup/dll/win32/sndblst/CMakeLists.txt
    branches/cmake-bringup/dll/win32/sti/CMakeLists.txt
    branches/cmake-bringup/dll/win32/twain_32/CMakeLists.txt
    branches/cmake-bringup/dll/win32/uext2/CMakeLists.txt
    branches/cmake-bringup/dll/win32/ufat/CMakeLists.txt
    branches/cmake-bringup/dll/win32/ufatx/CMakeLists.txt
    branches/cmake-bringup/dll/win32/untfs/CMakeLists.txt
    branches/cmake-bringup/dll/win32/vdmdbg/CMakeLists.txt
    branches/cmake-bringup/dll/win32/version/CMakeLists.txt
    branches/cmake-bringup/dll/win32/wdmaud.drv/CMakeLists.txt
    branches/cmake-bringup/dll/win32/winfax/CMakeLists.txt
    branches/cmake-bringup/dll/win32/wing32/CMakeLists.txt
    branches/cmake-bringup/dll/win32/winhttp/CMakeLists.txt
    branches/cmake-bringup/dll/win32/winsta/CMakeLists.txt
    branches/cmake-bringup/dll/win32/wmi/CMakeLists.txt
    branches/cmake-bringup/dll/win32/ws2_32_new/CMakeLists.txt
    branches/cmake-bringup/dll/win32/ws2help/CMakeLists.txt
    branches/cmake-bringup/dll/win32/wshirda/CMakeLists.txt
    branches/cmake-bringup/dll/win32/wshtcpip/CMakeLists.txt
    branches/cmake-bringup/dll/win32/wuapi/CMakeLists.txt
    branches/cmake-bringup/dll/win32/xinput1_1/CMakeLists.txt
    branches/cmake-bringup/dll/win32/xinput1_2/CMakeLists.txt
    branches/cmake-bringup/dll/win32/xinput1_3/CMakeLists.txt
    branches/cmake-bringup/dll/win32/xinput9_1_0/CMakeLists.txt

Modified: branches/cmake-bringup/dll/win32/rsabase/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/rsabase/CMakeLists.txt?rev=49450&r1=49449&r2=49450&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/rsabase/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/rsabase/CMakeLists.txt [iso-8859-1] Tue Nov  2 20:23:56 2010
@@ -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)
 

Added: branches/cmake-bringup/dll/win32/rsabase/rsabase.def
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/rsabase/rsabase.def?rev=49450&view=auto
==============================================================================
--- branches/cmake-bringup/dll/win32/rsabase/rsabase.def (added)
+++ branches/cmake-bringup/dll/win32/rsabase/rsabase.def [iso-8859-1] Tue Nov  2 20:23:56 2010
@@ -1,0 +1,31 @@
+
+LIBRARY rsabase.dll
+
+EXPORTS
+  CPAcquireContext at 16=rsaenh.CPAcquireContext @1
+  CPCreateHash at 20=rsaenh.CPCreateHash @2
+  CPDecrypt at 28=rsaenh.CPDecrypt @3
+  CPDeriveKey at 20=rsaenh.CPDeriveKey @4
+  CPDestroyHash at 8=rsaenh.CPDestroyHash @5
+  CPDestroyKey at 8=rsaenh.CPDestroyKey @6
+  CPDuplicateHash at 20=rsaenh.CPDuplicateHash @7
+  CPDuplicateKey at 20=rsaenh.CPDuplicateKey @8
+  CPEncrypt at 32=rsaenh.CPEncrypt @9
+  CPExportKey at 28=rsaenh.CPExportKey @10
+  CPGenKey at 16=rsaenh.CPGenKey @11
+  CPGenRandom at 12=rsaenh.CPGenRandom @12
+  CPGetHashParam at 24=rsaenh.CPGetHashParam @13
+  CPGetKeyParam at 24=rsaenh.CPGetKeyParam @14
+  CPGetProvParam at 20=rsaenh.CPGetProvParam @15
+  CPGetUserKey at 12=rsaenh.CPGetUserKey @16
+  CPHashData at 20=rsaenh.CPHashData @17
+  CPHashSessionKey at 16=rsaenh.CPHashSessionKey @18
+  CPImportKey at 24=rsaenh.CPImportKey @19
+  CPReleaseContext at 8=rsaenh.CPReleaseContext @20
+  CPSetHashParam at 20=rsaenh.CPSetHashParam @21
+  CPSetKeyParam at 20=rsaenh.CPSetKeyParam @22
+  CPSetProvParam at 16=rsaenh.CPSetProvParam @23
+  CPSignHash at 28=rsaenh.CPSignHash @24
+  CPVerifySignature at 28=rsaenh.CPVerifySignature @25
+  DllRegisterServer at 0=rsaenh.DllRegisterServer @26 PRIVATE
+  DllUnregisterServer at 0=rsaenh.DllUnregisterServer @27 PRIVATE

Propchange: branches/cmake-bringup/dll/win32/rsabase/rsabase.def
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/cmake-bringup/dll/win32/rsaenh/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/rsaenh/CMakeLists.txt?rev=49450&r1=49449&r2=49450&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/rsaenh/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/rsaenh/CMakeLists.txt [iso-8859-1] Tue Nov  2 20:23:56 2010
@@ -1,10 +1,9 @@
 
-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
@@ -19,7 +18,11 @@
     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 @@
 
 add_importlibs(rsaenh msvcrt crypt32 advapi32 kernel32 ntdll)
 
-
 add_cab_target(rsaenh 1)

Added: branches/cmake-bringup/dll/win32/rsaenh/rsaenh.def
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/rsaenh/rsaenh.def?rev=49450&view=auto
==============================================================================
--- branches/cmake-bringup/dll/win32/rsaenh/rsaenh.def (added)
+++ branches/cmake-bringup/dll/win32/rsaenh/rsaenh.def [iso-8859-1] Tue Nov  2 20:23:56 2010
@@ -1,0 +1,31 @@
+
+LIBRARY rsaenh.dll
+
+EXPORTS
+  CPAcquireContext at 16=RSAENH_CPAcquireContext at 16 @1
+  CPCreateHash at 20=RSAENH_CPCreateHash at 20 @2
+  CPDecrypt at 28=RSAENH_CPDecrypt at 28 @3
+  CPDeriveKey at 20=RSAENH_CPDeriveKey at 20 @4
+  CPDestroyHash at 8=RSAENH_CPDestroyHash at 8 @5
+  CPDestroyKey at 8=RSAENH_CPDestroyKey at 8 @6
+  CPDuplicateHash at 20=RSAENH_CPDuplicateHash at 20 @7
+  CPDuplicateKey at 20=RSAENH_CPDuplicateKey at 20 @8
+  CPEncrypt at 32=RSAENH_CPEncrypt at 32 @9
+  CPExportKey at 28=RSAENH_CPExportKey at 28 @10
+  CPGenKey at 16=RSAENH_CPGenKey at 16 @11
+  CPGenRandom at 12=RSAENH_CPGenRandom at 12 @12
+  CPGetHashParam at 24=RSAENH_CPGetHashParam at 24 @13
+  CPGetKeyParam at 24=RSAENH_CPGetKeyParam at 24 @14
+  CPGetProvParam at 20=RSAENH_CPGetProvParam at 20 @15
+  CPGetUserKey at 12=RSAENH_CPGetUserKey at 12 @16
+  CPHashData at 20=RSAENH_CPHashData at 20 @17
+  CPHashSessionKey at 16=RSAENH_CPHashSessionKey at 16 @18
+  CPImportKey at 24=RSAENH_CPImportKey at 24 @19
+  CPReleaseContext at 8=RSAENH_CPReleaseContext at 8 @20
+  CPSetHashParam at 20=RSAENH_CPSetHashParam at 20 @21
+  CPSetKeyParam at 20=RSAENH_CPSetKeyParam at 20 @22
+  CPSetProvParam at 16=RSAENH_CPSetProvParam at 16 @23
+  CPSignHash at 28=RSAENH_CPSignHash at 28 @24
+  CPVerifySignature at 28=RSAENH_CPVerifySignature at 28 @25
+  DllRegisterServer at 0 @26 PRIVATE
+  DllUnregisterServer at 0 @27 PRIVATE

Propchange: branches/cmake-bringup/dll/win32/rsaenh/rsaenh.def
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/cmake-bringup/dll/win32/samsrv/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/samsrv/CMakeLists.txt?rev=49450&r1=49449&r2=49450&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/samsrv/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/samsrv/CMakeLists.txt [iso-8859-1] Tue Nov  2 20:23:56 2010
@@ -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)
 

Added: branches/cmake-bringup/dll/win32/samsrv/samsrv.def
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/samsrv/samsrv.def?rev=49450&view=auto
==============================================================================
--- branches/cmake-bringup/dll/win32/samsrv/samsrv.def (added)
+++ branches/cmake-bringup/dll/win32/samsrv/samsrv.def [iso-8859-1] Tue Nov  2 20:23:56 2010
@@ -1,0 +1,6 @@
+
+LIBRARY samsrv.dll
+
+EXPORTS
+  SamIInitialize at 0 @1
+  SampInitializeRegistry at 0 @2

Propchange: branches/cmake-bringup/dll/win32/samsrv/samsrv.def
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/cmake-bringup/dll/win32/sensapi/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/sensapi/CMakeLists.txt?rev=49450&r1=49449&r2=49450&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/sensapi/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/sensapi/CMakeLists.txt [iso-8859-1] Tue Nov  2 20:23:56 2010
@@ -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)
 

Added: branches/cmake-bringup/dll/win32/sensapi/sensapi.def
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/sensapi/sensapi.def?rev=49450&view=auto
==============================================================================
--- branches/cmake-bringup/dll/win32/sensapi/sensapi.def (added)
+++ branches/cmake-bringup/dll/win32/sensapi/sensapi.def [iso-8859-1] Tue Nov  2 20:23:56 2010
@@ -1,0 +1,7 @@
+
+LIBRARY sensapi.dll
+
+EXPORTS
+  IsDestinationReachableA at 8 @1
+  IsDestinationReachableW at 8 @2
+  IsNetworkAlive at 4 @3

Propchange: branches/cmake-bringup/dll/win32/sensapi/sensapi.def
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/cmake-bringup/dll/win32/serialui/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/serialui/CMakeLists.txt?rev=49450&r1=49449&r2=49450&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/serialui/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/serialui/CMakeLists.txt [iso-8859-1] Tue Nov  2 20:23:56 2010
@@ -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)
 

Added: branches/cmake-bringup/dll/win32/serialui/serialui.def
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/serialui/serialui.def?rev=49450&view=auto
==============================================================================
--- branches/cmake-bringup/dll/win32/serialui/serialui.def (added)
+++ branches/cmake-bringup/dll/win32/serialui/serialui.def [iso-8859-1] Tue Nov  2 20:23:56 2010
@@ -1,0 +1,10 @@
+
+LIBRARY serialui.dll
+
+EXPORTS
+  drvCommConfigDialogA at 12 @1
+  drvCommConfigDialogW at 12 @2
+  drvSetDefaultCommConfigA at 12 @3
+  drvSetDefaultCommConfigW at 12 @4
+  drvGetDefaultCommConfigA at 12 @5
+  drvGetDefaultCommConfigW at 12 @6

Propchange: branches/cmake-bringup/dll/win32/serialui/serialui.def
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/cmake-bringup/dll/win32/shfolder/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shfolder/CMakeLists.txt?rev=49450&r1=49449&r2=49450&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/shfolder/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/shfolder/CMakeLists.txt [iso-8859-1] Tue Nov  2 20:23:56 2010
@@ -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)
 

Added: branches/cmake-bringup/dll/win32/shfolder/shfolder.def
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shfolder/shfolder.def?rev=49450&view=auto
==============================================================================
--- branches/cmake-bringup/dll/win32/shfolder/shfolder.def (added)
+++ branches/cmake-bringup/dll/win32/shfolder/shfolder.def [iso-8859-1] Tue Nov  2 20:23:56 2010
@@ -1,0 +1,6 @@
+
+LIBRARY shfolder.dll
+
+EXPORTS
+  SHGetFolderPathA at 20=shell32.SHGetFolderPathA @1
+  SHGetFolderPathW at 20=shell32.SHGetFolderPathW @2

Propchange: branches/cmake-bringup/dll/win32/shfolder/shfolder.def
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/cmake-bringup/dll/win32/smdll/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/smdll/CMakeLists.txt?rev=49450&r1=49449&r2=49450&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/smdll/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/smdll/CMakeLists.txt [iso-8859-1] Tue Nov  2 20:23:56 2010
@@ -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)
 

Added: branches/cmake-bringup/dll/win32/smdll/smdll.def
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/smdll/smdll.def?rev=49450&view=auto
==============================================================================
--- branches/cmake-bringup/dll/win32/smdll/smdll.def (added)
+++ branches/cmake-bringup/dll/win32/smdll/smdll.def [iso-8859-1] Tue Nov  2 20:23:56 2010
@@ -1,0 +1,9 @@
+
+LIBRARY smdll.dll
+
+EXPORTS
+  SmCompleteSession at 12 @1
+  SmConnectApiPort at 16 @2
+  SmExecuteProgram at 8 @3
+  SmQueryInformation at 20 @4
+  SmLookupSubsystem at 20 @5

Propchange: branches/cmake-bringup/dll/win32/smdll/smdll.def
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/cmake-bringup/dll/win32/sndblst/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/sndblst/CMakeLists.txt?rev=49450&r1=49449&r2=49450&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/sndblst/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/sndblst/CMakeLists.txt [iso-8859-1] Tue Nov  2 20:23:56 2010
@@ -4,9 +4,11 @@
 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)
 

Added: branches/cmake-bringup/dll/win32/sndblst/sndblst.def
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/sndblst/sndblst.def?rev=49450&view=auto
==============================================================================
--- branches/cmake-bringup/dll/win32/sndblst/sndblst.def (added)
+++ branches/cmake-bringup/dll/win32/sndblst/sndblst.def [iso-8859-1] Tue Nov  2 20:23:56 2010
@@ -1,0 +1,11 @@
+
+LIBRARY sndblst.dll
+
+EXPORTS
+  DriverProc at 20 @1
+  widMessage at 20 @2
+  wodMessage at 20 @3
+  midMessage at 20 @4
+  modMessage at 20 @5
+  mxdMessage at 20 @6
+  auxMessage at 20 @7

Propchange: branches/cmake-bringup/dll/win32/sndblst/sndblst.def
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/cmake-bringup/dll/win32/sti/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/sti/CMakeLists.txt?rev=49450&r1=49449&r2=49450&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/sti/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/sti/CMakeLists.txt [iso-8859-1] Tue Nov  2 20:23:56 2010
@@ -10,14 +10,16 @@
 
 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 @@
     kernel32
     ntdll)
 
-
-
 rpcproxy(sti sti_wia.idl)
 add_cab_target(sti 1)

Added: branches/cmake-bringup/dll/win32/sti/sti.def
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/sti/sti.def?rev=49450&view=auto
==============================================================================
--- branches/cmake-bringup/dll/win32/sti/sti.def (added)
+++ branches/cmake-bringup/dll/win32/sti/sti.def [iso-8859-1] Tue Nov  2 20:23:56 2010
@@ -1,0 +1,11 @@
+
+LIBRARY sti.dll
+
+EXPORTS
+  DllCanUnloadNow at 0 @1 PRIVATE
+  DllGetClassObject at 12 @2 PRIVATE
+  DllRegisterServer at 0 @3 PRIVATE
+  DllUnregisterServer at 0 @4 PRIVATE
+  StiCreateInstance at 16=StiCreateInstanceW at 16 @5
+  StiCreateInstanceA at 16 @6
+  StiCreateInstanceW at 16 @7

Propchange: branches/cmake-bringup/dll/win32/sti/sti.def
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/cmake-bringup/dll/win32/twain_32/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/twain_32/CMakeLists.txt?rev=49450&r1=49449&r2=49450&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/twain_32/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/twain_32/CMakeLists.txt [iso-8859-1] Tue Nov  2 20:23:56 2010
@@ -1,7 +1,5 @@
 
 add_definitions(-D_DLL -D__USE_CRTIMP)
-
-spec2def(twain_32.dll twain_32.spec)
 
 add_library(twain_32 SHARED
     capability.c
@@ -11,7 +9,11 @@
     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)
 

Added: branches/cmake-bringup/dll/win32/twain_32/twain_32.def
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/twain_32/twain_32.def?rev=49450&view=auto
==============================================================================
--- branches/cmake-bringup/dll/win32/twain_32/twain_32.def (added)
+++ branches/cmake-bringup/dll/win32/twain_32/twain_32.def [iso-8859-1] Tue Nov  2 20:23:56 2010
@@ -1,0 +1,5 @@
+
+LIBRARY twain_32.dll
+
+EXPORTS
+  DSM_Entry at 24 @1

Propchange: branches/cmake-bringup/dll/win32/twain_32/twain_32.def
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/cmake-bringup/dll/win32/uext2/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/uext2/CMakeLists.txt?rev=49450&r1=49449&r2=49450&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/uext2/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/uext2/CMakeLists.txt [iso-8859-1] Tue Nov  2 20:23:56 2010
@@ -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)
 

Added: branches/cmake-bringup/dll/win32/uext2/uext2.def
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/uext2/uext2.def?rev=49450&view=auto
==============================================================================
--- branches/cmake-bringup/dll/win32/uext2/uext2.def (added)
+++ branches/cmake-bringup/dll/win32/uext2/uext2.def [iso-8859-1] Tue Nov  2 20:23:56 2010
@@ -1,0 +1,6 @@
+
+LIBRARY uext2.dll
+
+EXPORTS
+  ChkdskEx at 24=Ext2Chkdsk at 24 @1
+  FormatEx at 24=Ext2Format at 24 @2

Propchange: branches/cmake-bringup/dll/win32/uext2/uext2.def
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/cmake-bringup/dll/win32/ufat/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ufat/CMakeLists.txt?rev=49450&r1=49449&r2=49450&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/ufat/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/ufat/CMakeLists.txt [iso-8859-1] Tue Nov  2 20:23:56 2010
@@ -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)
 

Added: branches/cmake-bringup/dll/win32/ufat/ufat.def
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ufat/ufat.def?rev=49450&view=auto
==============================================================================
--- branches/cmake-bringup/dll/win32/ufat/ufat.def (added)
+++ branches/cmake-bringup/dll/win32/ufat/ufat.def [iso-8859-1] Tue Nov  2 20:23:56 2010
@@ -1,0 +1,6 @@
+
+LIBRARY ufat.dll
+
+EXPORTS
+  ChkdskEx at 24=VfatChkdsk at 24 @1
+  FormatEx at 24=VfatFormat at 24 @2

Propchange: branches/cmake-bringup/dll/win32/ufat/ufat.def
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/cmake-bringup/dll/win32/ufatx/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ufatx/CMakeLists.txt?rev=49450&r1=49449&r2=49450&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/ufatx/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/ufatx/CMakeLists.txt [iso-8859-1] Tue Nov  2 20:23:56 2010
@@ -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)
 

Added: branches/cmake-bringup/dll/win32/ufatx/ufatx.def
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ufatx/ufatx.def?rev=49450&view=auto
==============================================================================
--- branches/cmake-bringup/dll/win32/ufatx/ufatx.def (added)
+++ branches/cmake-bringup/dll/win32/ufatx/ufatx.def [iso-8859-1] Tue Nov  2 20:23:56 2010
@@ -1,0 +1,5 @@
+
+LIBRARY ufatx.dll
+
+EXPORTS
+  FormatEx at 24=VfatxFormat at 24 @1

Propchange: branches/cmake-bringup/dll/win32/ufatx/ufatx.def
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/cmake-bringup/dll/win32/untfs/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/untfs/CMakeLists.txt?rev=49450&r1=49449&r2=49450&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/untfs/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/untfs/CMakeLists.txt [iso-8859-1] Tue Nov  2 20:23:56 2010
@@ -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)
 

Added: branches/cmake-bringup/dll/win32/untfs/untfs.def
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/untfs/untfs.def?rev=49450&view=auto
==============================================================================
--- branches/cmake-bringup/dll/win32/untfs/untfs.def (added)
+++ branches/cmake-bringup/dll/win32/untfs/untfs.def [iso-8859-1] Tue Nov  2 20:23:56 2010
@@ -1,0 +1,6 @@
+
+LIBRARY untfs.dll
+
+EXPORTS
+  ChkdskEx at 24=NtfsChkdsk at 24 @1
+  FormatEx at 24=NtfsFormat at 24 @2

Propchange: branches/cmake-bringup/dll/win32/untfs/untfs.def
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/cmake-bringup/dll/win32/vdmdbg/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/vdmdbg/CMakeLists.txt?rev=49450&r1=49449&r2=49450&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/vdmdbg/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/vdmdbg/CMakeLists.txt [iso-8859-1] Tue Nov  2 20:23:56 2010
@@ -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

Added: branches/cmake-bringup/dll/win32/vdmdbg/vdmdbg.def
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/vdmdbg/vdmdbg.def?rev=49450&view=auto
==============================================================================
--- branches/cmake-bringup/dll/win32/vdmdbg/vdmdbg.def (added)
+++ branches/cmake-bringup/dll/win32/vdmdbg/vdmdbg.def [iso-8859-1] Tue Nov  2 20:23:56 2010
@@ -1,0 +1,26 @@
+
+LIBRARY vdmdbg.dll
+
+EXPORTS
+  VDMBreakThread at 8 @1
+  VDMDetectWOW at 0 @2
+  VDMEnumProcessWOW at 8 @3
+  VDMEnumTaskWOW at 12 @4
+  VDMEnumTaskWOWEx at 12 @5
+  VDMGetContext at 12 @6
+  VDMGetDbgFlags at 4 @7
+  VDMGetModuleSelector at 20 @8
+  VDMGetPointer at 20 @9
+  VDMGetSegmentInfo at 16 @10
+  VDMGetSelectorModule at 32 @11
+  VDMGlobalFirst at 24 @12
+  VDMGlobalNext at 24 @13
+  VDMIsModuleLoaded at 4 @14
+  VDMKillWOW at 0 @15
+  VDMModuleFirst at 20 @16
+  VDMModuleNext at 20 @17
+  VDMProcessException at 4 @18
+  VDMSetContext at 12 @19
+  VDMSetDbgFlags at 8 @20
+  VDMStartTaskInWOW at 12 @21
+  VDMTerminateTaskWOW at 8 @22

Propchange: branches/cmake-bringup/dll/win32/vdmdbg/vdmdbg.def
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/cmake-bringup/dll/win32/version/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/version/CMakeLists.txt?rev=49450&r1=49449&r2=49450&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/version/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/version/CMakeLists.txt [iso-8859-1] Tue Nov  2 20:23:56 2010
@@ -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 @@
     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)
 

Added: branches/cmake-bringup/dll/win32/version/version.def
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/version/version.def?rev=49450&view=auto
==============================================================================
--- branches/cmake-bringup/dll/win32/version/version.def (added)
+++ branches/cmake-bringup/dll/win32/version/version.def [iso-8859-1] Tue Nov  2 20:23:56 2010
@@ -1,0 +1,16 @@
+
+LIBRARY version.dll
+
+EXPORTS
+  GetFileVersionInfoA at 16 @1
+  GetFileVersionInfoSizeA at 8 @2
+  GetFileVersionInfoSizeW at 8 @3
+  GetFileVersionInfoW at 16 @4
+  VerFindFileA at 32 @5
+  VerFindFileW at 32 @6
+  VerInstallFileA at 32 @7
+  VerInstallFileW at 32 @8
+  VerLanguageNameA at 12=kernel32.VerLanguageNameA @9
+  VerLanguageNameW at 12=kernel32.VerLanguageNameW @10
+  VerQueryValueA at 16 @11
+  VerQueryValueW at 16 @12

Propchange: branches/cmake-bringup/dll/win32/version/version.def
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/cmake-bringup/dll/win32/wdmaud.drv/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wdmaud.drv/CMakeLists.txt?rev=49450&r1=49449&r2=49450&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/wdmaud.drv/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/wdmaud.drv/CMakeLists.txt [iso-8859-1] Tue Nov  2 20:23:56 2010
@@ -9,17 +9,20 @@
     ${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 @@
     mmixer)
 
 add_importlibs(wdmaud.drv user32 winmm advapi32 msvcrt setupapi ksuser kernel32 ntdll)
-

Added: branches/cmake-bringup/dll/win32/wdmaud.drv/wdmaud.def
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wdmaud.drv/wdmaud.def?rev=49450&view=auto
==============================================================================
--- branches/cmake-bringup/dll/win32/wdmaud.drv/wdmaud.def (added)
+++ branches/cmake-bringup/dll/win32/wdmaud.drv/wdmaud.def [iso-8859-1] Tue Nov  2 20:23:56 2010
@@ -1,0 +1,10 @@
+
+LIBRARY wdmaud.drv
+
+EXPORTS
+  DriverProc at 20 @1
+  mxdMessage at 20 @2
+  auxMessage at 20 @3
+  wodMessage at 20 @4
+  widMessage at 20 @5
+  modMessage at 20 @6

Propchange: branches/cmake-bringup/dll/win32/wdmaud.drv/wdmaud.def
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/cmake-bringup/dll/win32/winfax/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winfax/CMakeLists.txt?rev=49450&r1=49449&r2=49450&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/winfax/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/winfax/CMakeLists.txt [iso-8859-1] Tue Nov  2 20:23:56 2010
@@ -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_importlibs(winfax kernel32 ntdll)
 add_dependencies(winfax psdk)

Added: branches/cmake-bringup/dll/win32/winfax/winfax.def
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winfax/winfax.def?rev=49450&view=auto
==============================================================================
--- branches/cmake-bringup/dll/win32/winfax/winfax.def (added)
+++ branches/cmake-bringup/dll/win32/winfax/winfax.def [iso-8859-1] Tue Nov  2 20:23:56 2010
@@ -1,0 +1,59 @@
+
+LIBRARY winfax.dll
+
+EXPORTS
+  FaxAbort at 8 @1
+  FaxAccessCheck at 8 @2
+  FaxClose at 4 @3
+  FaxCompleteJobParamsA at 8 @4
+  FaxCompleteJobParamsW at 8 @5
+  FaxConnectFaxServerA at 8 @6
+  FaxConnectFaxServerW at 8 @7
+  FaxEnableRoutingMethodA at 12 @8
+  FaxEnableRoutingMethodW at 12 @9
+  FaxEnumGlobalRoutingInfoA at 12 @10
+  FaxEnumGlobalRoutingInfoW at 12 @11
+  FaxEnumJobsA at 12 @12
+  FaxEnumJobsW at 12 @13
+  FaxEnumPortsA at 12 @14
+  FaxEnumPortsW at 12 @15
+  FaxEnumRoutingMethodsA at 12 @16
+  FaxEnumRoutingMethodsW at 12 @17
+  FaxFreeBuffer at 4 @18
+  FaxGetConfigurationA at 8 @19
+  FaxGetConfigurationW at 8 @20
+  FaxGetDeviceStatusA at 8 @21
+  FaxGetDeviceStatusW at 8 @22
+  FaxGetJobA at 12 @23
+  FaxGetJobW at 12 @24
+  FaxGetLoggingCategoriesA at 12 @25
+  FaxGetLoggingCategoriesW at 12 @26
+  FaxGetPageData at 24 @27
+  FaxGetPortA at 8 @28
+  FaxGetPortW at 8 @29
+  FaxGetRoutingInfoA at 16 @30
+  FaxGetRoutingInfoW at 16 @31
+  FaxInitializeEventQueue at 20 @32
+  FaxOpenPort at 16 @33
+  FaxPrintCoverPageA at 8 @34
+  FaxPrintCoverPageW at 8 @35
+  FaxRegisterRoutingExtensionW at 24 @36
+  FaxRegisterServiceProviderW at 16 @37
+  FaxSendDocumentA at 20 @38
+  FaxSendDocumentForBroadcastA at 20 @39
+  FaxSendDocumentForBroadcastW at 20 @40
+  FaxSendDocumentW at 20 @41
+  FaxSetConfigurationA at 8 @42
+  FaxSetConfigurationW at 8 @43
+  FaxSetGlobalRoutingInfoA at 8 @44
+  FaxSetGlobalRoutingInfoW at 8 @45
+  FaxSetJobA at 16 @46
+  FaxSetJobW at 16 @47
+  FaxSetLoggingCategoriesA at 12 @48
+  FaxSetLoggingCategoriesW at 12 @49
+  FaxSetPortA at 8 @50
+  FaxSetPortW at 8 @51
+  FaxSetRoutingInfoA at 16 @52
+  FaxSetRoutingInfoW at 16 @53
+  FaxStartPrintJobA at 16 @54
+  FaxStartPrintJobW at 16 @55

Propchange: branches/cmake-bringup/dll/win32/winfax/winfax.def
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/cmake-bringup/dll/win32/wing32/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wing32/CMakeLists.txt?rev=49450&r1=49449&r2=49450&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/wing32/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/wing32/CMakeLists.txt [iso-8859-1] Tue Nov  2 20:23:56 2010
@@ -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)

Added: branches/cmake-bringup/dll/win32/wing32/wing32.def
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wing32/wing32.def?rev=49450&view=auto
==============================================================================
--- branches/cmake-bringup/dll/win32/wing32/wing32.def (added)
+++ branches/cmake-bringup/dll/win32/wing32/wing32.def [iso-8859-1] Tue Nov  2 20:23:56 2010
@@ -1,0 +1,14 @@
+
+LIBRARY wing32.dll
+
+EXPORTS
+  WinGBitBlt at 32 @1
+  WinGCreateBitmap at 12 @2
+  WinGCreateDC at 0 @3
+  WinGCreateHalfToneBrush at 12 @4
+  WinGCreateHalfTonePalette at 0 @5
+  WinGGetDIBColorTable at 16 @6
+  WinGGetDIBPointer at 8 @7
+  WinGRecommendDIBFormat at 4 @8
+  WinGSetDIBColorTable at 16 @9
+  WinGStretchBlt at 40 @10

Propchange: branches/cmake-bringup/dll/win32/wing32/wing32.def
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/cmake-bringup/dll/win32/winhttp/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winhttp/CMakeLists.txt?rev=49450&r1=49449&r2=49450&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/winhttp/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/winhttp/CMakeLists.txt [iso-8859-1] Tue Nov  2 20:23:56 2010
@@ -1,8 +1,6 @@
 
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
-
-spec2def(winhttp.dll winhttp.spec)
 
 add_library(winhttp SHARED
     cookie.c
@@ -12,7 +10,11 @@
     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)
 

Added: branches/cmake-bringup/dll/win32/winhttp/winhttp.def
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winhttp/winhttp.def?rev=49450&view=auto
==============================================================================
--- branches/cmake-bringup/dll/win32/winhttp/winhttp.def (added)
+++ branches/cmake-bringup/dll/win32/winhttp/winhttp.def [iso-8859-1] Tue Nov  2 20:23:56 2010
@@ -1,0 +1,35 @@
+
+LIBRARY winhttp.dll
+
+EXPORTS
+  DllCanUnloadNow at 0 @1 PRIVATE
+  DllGetClassObject at 12 @2 PRIVATE
+  DllRegisterServer at 0 @3 PRIVATE
+  DllUnregisterServer at 0 @4 PRIVATE
+  WinHttpAddRequestHeaders at 16 @5
+  WinHttpCheckPlatform at 0 @6
+  WinHttpCloseHandle at 4 @7
+  WinHttpConnect at 16 @8
+  WinHttpCrackUrl at 16 @9
+  WinHttpCreateUrl at 16 @10
+  WinHttpDetectAutoProxyConfigUrl at 8 @11
+  WinHttpGetDefaultProxyConfiguration at 4 @12
+  WinHttpGetIEProxyConfigForCurrentUser at 4 @13
+  WinHttpGetProxyForUrl at 16 @14
+  WinHttpOpen at 20 @15
+  WinHttpOpenRequest at 28 @16
+  WinHttpQueryAuthSchemes at 16 @17
+  WinHttpQueryDataAvailable at 8 @18
+  WinHttpQueryHeaders at 24 @19
+  WinHttpQueryOption at 16 @20
+  WinHttpReadData at 16 @21
+  WinHttpReceiveResponse at 8 @22
+  WinHttpSendRequest at 28 @23
+  WinHttpSetCredentials at 24 @24
+  WinHttpSetDefaultProxyConfiguration at 4 @25
+  WinHttpSetOption at 16 @26
+  WinHttpSetStatusCallback at 16 @27
+  WinHttpSetTimeouts at 20 @28
+  WinHttpTimeFromSystemTime at 8 @29
+  WinHttpTimeToSystemTime at 8 @30
+  WinHttpWriteData at 16 @31

Propchange: branches/cmake-bringup/dll/win32/winhttp/winhttp.def
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/cmake-bringup/dll/win32/winsta/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winsta/CMakeLists.txt?rev=49450&r1=49449&r2=49450&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/winsta/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/winsta/CMakeLists.txt [iso-8859-1] Tue Nov  2 20:23:56 2010
@@ -1,5 +1,3 @@
-
-spec2def(winsta.dll winsta.spec)
 
 list(APPEND SOURCE
     logon.c
@@ -10,7 +8,11 @@
     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

Added: branches/cmake-bringup/dll/win32/winsta/winsta.def
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winsta/winsta.def?rev=49450&view=auto
==============================================================================
--- branches/cmake-bringup/dll/win32/winsta/winsta.def (added)
+++ branches/cmake-bringup/dll/win32/winsta/winsta.def [iso-8859-1] Tue Nov  2 20:23:56 2010
@@ -1,0 +1,124 @@
+
+LIBRARY winsta.dll
+
+EXPORTS
+  LogonIdFromWinStationNameA at 12 @1
+  LogonIdFromWinStationNameW at 12 @2
+  RemoteAssistancePrepareSystemRestore at 4 @3
+  ServerGetInternetConnectorStatus at 12 @4
+  ServerLicensingClose at 4 @5
+  ServerLicensingDeactivateCurrentPolicy at 4 @6
+  ServerLicensingFreePolicyInformation at 4 @7
+  ServerLicensingGetAvailablePolicyIds at 12 @8
+  ServerLicensingGetPolicy at 8 @9
+  ServerLicensingGetPolicyInformationA at 16 @10
+  ServerLicensingGetPolicyInformationW at 16 @11
+  ServerLicensingLoadPolicy at 8 @12
+  ServerLicensingOpenA at 4 @13
+  ServerLicensingOpenW at 4 @14
+  ServerLicensingSetPolicy at 12 @15
+  ServerLicensingUnloadPolicy at 8 @16
+  ServerQueryInetConnectorInformationA at 16 @17
+  ServerQueryInetConnectorInformationW at 16 @18
+  ServerSetInternetConnectorStatus at 12 @19
+  WinStationActivateLicense at 16 @20
+  WinStationAutoReconnect at 4 @21
+  WinStationBroadcastSystemMessage at 40 @22
+  WinStationCheckAccess at 12 @23
+  WinStationCheckLoopBack at 16 @24
+  WinStationCloseServer at 16 @25
+  WinStationConnectA at 4 @26
+  WinStationConnectCallback at 20 @27
+  WinStationConnectEx at 8 @28
+  WinStationConnectW at 20 @29
+  WinStationDisconnect at 12 @30
+  WinStationDynVirtualChanRead at 20 @31
+  WinStationDynVirtualChanWrite at 16 @32
+  WinStationEnumerateA at 12 @33
+  WinStationEnumerateLicenses at 12 @34
+  WinStationEnumerateProcesses at 8 @35
+  WinStationEnumerateW at 12 @36
+  WinStationEnumerate_IndexedA at 20 @37
+  WinStationEnumerate_IndexedW at 20 @38
+  WinStationFreeGAPMemory at 12 @39
+  WinStationFreeMemory at 4 @40
+  WinStationFreeUserCertificates at 4 @41
+  WinStationFreeUserCredentials at 4 @42
+  WinStationGenerateLicense at 16 @43
+  WinStationGetAllProcesses at 16 @44
+  WinStationGetConnectionProperty at 12 @45
+  WinStationGetInitialApplication at 20 @46
+  WinStationGetLanAdapterNameA at 24 @47
+  WinStationGetLanAdapterNameW at 24 @48
+  WinStationGetLoggedOnCount at 8 @49
+  WinStationGetMachinePolicy at 8 @50
+  WinStationGetProcessSid at 24 @51
+  WinStationGetTermSrvCountersValue at 12 @52
+  WinStationGetUserCertificates at 4 @53
+  WinStationGetUserCredentials at 4 @54
+  WinStationGetUserProfile at 16 @55
+  WinStationInstallLicense at 12 @56
+  WinStationIsHelpAssistantSession at 8 @57
+  WinStationIsSessionPermitted at 0 @58
+  WinStationNameFromLogonIdA at 12 @59
+  WinStationNameFromLogonIdW at 12 @60
+  WinStationNtsdDebug at 20 @61
+  WinStationOpenServerA at 4 @62
+  WinStationOpenServerW at 4 @63
+  WinStationQueryAllowConcurrentConnections at 0 @64
+  WinStationQueryEnforcementCore at 24 @65
+  WinStationQueryInformationA at 24 @66
+  WinStationQueryInformationW at 24 @67
+  WinStationQueryLicense at 12 @68
+  WinStationQueryLogonCredentialsW at 4 @69
+  WinStationQueryUpdateRequired at 8 @70
+  WinStationRegisterConsoleNotification at 12 @71
+  WinStationRegisterConsoleNotificationEx at 16 @72
+  WinStationRegisterNotificationEvent at 16 @73
+  WinStationRemoveLicense at 12 @74
+  WinStationRenameA at 12 @75
+  WinStationRenameW at 12 @76
+  WinStationRequestSessionsList at 12 @77
+  WinStationReset at 12 @78
+  WinStationSendMessageA at 40 @79
+  WinStationSendMessageW at 40 @80
+  WinStationSendWindowMessage at 32 @81
+  WinStationServerPing at 4 @82
+  WinStationSetInformationA at 20 @83
+  WinStationSetInformationW at 20 @84
+  WinStationSetPoolCount at 12 @85
+  WinStationShadow at 20 @86
+  WinStationShadowStop at 12 @87
+  WinStationShutdownSystem at 8 @88
+  WinStationSwitchToServicesSession at 0 @89
+  WinStationSystemShutdownStarted at 0 @90
+  WinStationSystemShutdownWait at 8 @91
+  WinStationTerminateProcess at 12 @92
+  WinStationUnRegisterConsoleNotification at 8 @93
+  WinStationUnRegisterNotificationEvent at 4 @94
+  WinStationUserLoginAccessCheck at 16 @95
+  WinStationVirtualOpen at 12 @96
+  WinStationVirtualOpenEx at 16 @97
+  WinStationWaitSystemEvent at 12 @98
+  _NWLogonQueryAdmin at 12 @99
+  _NWLogonSetAdmin at 12 @100
+  _WinStationAnnoyancePopup at 8 @101
+  _WinStationBeepOpen at 12 @102
+  _WinStationBreakPoint at 12 @103
+  _WinStationCallback at 12 @104
+  _WinStationCheckForApplicationName at 48 @105
+  _WinStationFUSCanRemoteUserDisconnect at 12 @106
+  _WinStationGetApplicationInfo at 16 @107
+  _WinStationNotifyDisconnectPipe at 0 @108
+  _WinStationNotifyLogoff at 0 @109
+  _WinStationNotifyLogon at 32 @110
+  _WinStationNotifyNewSession at 8 @111
+  _WinStationReInitializeSecurity at 4 @112
+  _WinStationReadRegistry at 4 @113
+  _WinStationSessionInitialized at 0 @114
+  _WinStationShadowTarget at 40 @115
+  _WinStationShadowTargetSetup at 8 @116
+  _WinStationUpdateClientCachedCredentials at 28 @117
+  _WinStationUpdateSettings at 12 @118
+  _WinStationUpdateUserConfig at 4 @119
+  _WinStationWaitForConnect at 0 @120

Propchange: branches/cmake-bringup/dll/win32/winsta/winsta.def
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/cmake-bringup/dll/win32/wmi/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wmi/CMakeLists.txt?rev=49450&r1=49449&r2=49450&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/wmi/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/wmi/CMakeLists.txt [iso-8859-1] Tue Nov  2 20:23:56 2010
@@ -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)
 

Added: branches/cmake-bringup/dll/win32/wmi/wmi.def
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wmi/wmi.def?rev=49450&view=auto
==============================================================================
--- branches/cmake-bringup/dll/win32/wmi/wmi.def (added)
+++ branches/cmake-bringup/dll/win32/wmi/wmi.def [iso-8859-1] Tue Nov  2 20:23:56 2010
@@ -1,0 +1,49 @@
+
+LIBRARY wmi.dll
+
+EXPORTS
+  CloseTrace at 4=advapi32.CloseTrace @1
+  ControlTraceA at 16=advapi32.ControlTraceA @2
+  ControlTraceW at 16=advapi32.ControlTraceW @3
+  CreateTraceInstanceId at 8=advapi32.CreateTraceInstanceId @4
+  EnableTrace at 20=advapi32.EnableTrace @5
+  GetTraceEnableFlags at 4=advapi32.GetTraceEnableFlags @6
+  GetTraceEnableLevel at 4=advapi32.GetTraceEnableLevel @7
+  GetTraceLoggerHandle at 4=advapi32.GetTraceLoggerHandle @8
+  OpenTraceA at 4=advapi32.OpenTraceA @9
+  OpenTraceW at 4=advapi32.OpenTraceW @10
+  ProcessTrace at 16=advapi32.ProcessTrace @11
+  QueryAllTracesA at 12=advapi32.QueryAllTracesA @12
+  QueryAllTracesW at 12=advapi32.QueryAllTracesW @13
+  RegisterTraceGuidsA at 32=advapi32.RegisterTraceGuidsA @14
+  RegisterTraceGuidsW at 32=advapi32.RegisterTraceGuidsW @15
+  RemoveTraceCallback at 4=advapi32.RemoveTraceCallback @16
+  SetTraceCallback at 8=advapi32.SetTraceCallback @17
+  StartTraceA at 12=advapi32.StartTraceA @18
+  StartTraceW at 12=advapi32.StartTraceW @19
+  TraceEvent at 8=advapi32.TraceEvent @20
+  TraceEventInstance at 16=advapi32.TraceEventInstance @21
+  UnregisterTraceGuids at 4=advapi32.UnregisterTraceGuids @22
+  WmiCloseBlock at 0=advapi32.WmiCloseBlock @23
+  WmiDevInstToInstanceNameA at 0=advapi32.WmiDevInstToInstanceNameA @24
+  WmiDevInstToInstanceNameW at 0=advapi32.WmiDevInstToInstanceNameW @25
+  WmiEnumerateGuids at 0=advapi32.WmiEnumerateGuids @26
+  WmiExecuteMethodA at 0=advapi32.WmiExecuteMethodA @27
+  WmiExecuteMethodW at 0=advapi32.WmiExecuteMethodW @28
+  WmiFileHandleToInstanceNameA at 0=advapi32.WmiFileHandleToInstanceNameA @29
+  WmiFileHandleToInstanceNameW at 0=advapi32.WmiFileHandleToInstanceNameW @30
+  WmiFreeBuffer at 0=advapi32.WmiFreeBuffer @31
+  WmiMofEnumerateResourcesA at 0=advapi32.WmiMofEnumerateResourcesA @32
+  WmiMofEnumerateResourcesW at 0=advapi32.WmiMofEnumerateResourcesW @33
+  WmiNotificationRegistrationA at 0=advapi32.WmiNotificationRegistrationA @34
+  WmiNotificationRegistrationW at 0=advapi32.WmiNotificationRegistrationW @35
+  WmiOpenBlock at 0=advapi32.WmiOpenBlock @36
+  WmiQueryAllDataA at 0=advapi32.WmiQueryAllDataA @37
+  WmiQueryAllDataW at 0=advapi32.WmiQueryAllDataW @38
+  WmiQueryGuidInformation at 0=advapi32.WmiQueryGuidInformation @39
+  WmiQuerySingleInstanceA at 0=advapi32.WmiQuerySingleInstanceA @40
+  WmiQuerySingleInstanceW at 0=advapi32.WmiQuerySingleInstanceW @41
+  WmiSetSingleInstanceA at 0=advapi32.WmiSetSingleInstanceA @42
+  WmiSetSingleInstanceW at 0=advapi32.WmiSetSingleInstanceW @43
+  WmiSetSingleItemA at 0=advapi32.WmiSetSingleItemA @44
+  WmiSetSingleItemW at 0=advapi32.WmiSetSingleItemW @45

Propchange: branches/cmake-bringup/dll/win32/wmi/wmi.def
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/cmake-bringup/dll/win32/ws2_32_new/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ws2_32_new/CMakeLists.txt?rev=49450&r1=49449&r2=49450&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/ws2_32_new/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/ws2_32_new/CMakeLists.txt [iso-8859-1] Tue Nov  2 20:23:56 2010
@@ -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 @@
     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)
 

Added: branches/cmake-bringup/dll/win32/ws2_32_new/ws2_32.def
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ws2_32_new/ws2_32.def?rev=49450&view=auto
==============================================================================
--- branches/cmake-bringup/dll/win32/ws2_32_new/ws2_32.def (added)
+++ branches/cmake-bringup/dll/win32/ws2_32_new/ws2_32.def [iso-8859-1] Tue Nov  2 20:23:56 2010
@@ -1,0 +1,121 @@
+
+LIBRARY ws2_32_new.dll
+
+EXPORTS
+  WEP at 0 @500
+  WPUCompleteOverlappedRequest at 20 @24
+  WSAAccept at 20 @25
+  WSAAddressToStringA at 20 @26
+  WSAAddressToStringW at 20 @27
+  WSAAsyncGetHostByAddr at 28 @102
+  WSAAsyncGetHostByName at 20 @103
+  WSAAsyncGetProtoByName at 20 @105
+  WSAAsyncGetProtoByNumber at 20 @104
+  WSAAsyncGetServByName at 24 @107
+  WSAAsyncGetServByPort at 24 @106
+  WSAAsyncSelect at 16 @101
+  WSACancelAsyncRequest at 4 @108
+  WSACancelBlockingCall at 0 @113
+  WSACleanup at 0 @116
+  WSACloseEvent at 4 @28
+  WSAConnect at 28 @29
+  WSACreateEvent at 0 @30
+  WSADuplicateSocketA at 12 @31
+  WSADuplicateSocketW at 12 @32
+  WSAEnumNameSpaceProvidersA at 8 @33
+  WSAEnumNameSpaceProvidersW at 8 @34
+  WSAEnumNetworkEvents at 12 @35
+  WSAEnumProtocolsA at 12 @36
+  WSAEnumProtocolsW at 12 @37
+  WSAEventSelect at 12 @38
+  WSAGetLastError at 0 @111
+  WSAGetOverlappedResult at 20 @39
+  WSAGetQOSByName at 12 @40
+  WSAGetServiceClassInfoA at 16 @41
+  WSAGetServiceClassInfoW at 16 @42
+  WSAGetServiceClassNameByClassIdA at 12 @43
+  WSAGetServiceClassNameByClassIdW at 12 @44
+  WSAHtonl at 12 @45
+  WSAHtons at 12 @46
+  WSAInstallServiceClassA at 4 @47
+  WSAInstallServiceClassW at 4 @48
+  WSAIoctl at 36 @49
+  WSAIsBlocking at 0 @114
+  WSAJoinLeaf at 32 @50
+  WSALookupServiceBeginA at 12 @58
+  WSALookupServiceBeginW at 12 @59
+  WSALookupServiceEnd at 4 @60
+  WSALookupServiceNextA at 16 @61
+  WSALookupServiceNextW at 16 @62
+  WSANSPIoctl at 32 @63
+  WSANtohl at 12 @64
+  WSANtohs at 12 @65
+  WSAProviderConfigChange at 12 @66
+  WSARecv at 28 @67
+  WSARecvDisconnect at 8 @68
+  WSARecvFrom at 36 @69
+  WSARemoveServiceClass at 4 @70
+  WSAResetEvent at 4 @71
+  WSASend at 28 @72
+  WSASendDisconnect at 8 @73
+  WSASendTo at 36 @74
+  WSASetBlockingHook at 4 @109
+  WSASetEvent at 4 @75
+  WSASetLastError at 4 @112
+  WSASetServiceA at 12 @76
+  WSASetServiceW at 12 @77
+  WSASocketA at 24 @78
+  WSASocketW at 24 @79
+  WSAStartup at 8 @115
+  WSAStringToAddressA at 20 @80
+  WSAStringToAddressW at 20 @81
+  WSAUnhookBlockingHook at 0 @110
+  WSAWaitForMultipleEvents at 20 @82
+  WSApSetPostRoutine at 4 @83
+  FreeAddrInfoW at 4=freeaddrinfo at 4 @84
+  WSCDeinstallProvider at 8 @85
+  WSCEnableNSProvider at 8 @86
+  WSCEnumProtocols at 16 @87
+  WSCGetProviderPath at 16 @88
+  WSCInstallNameSpace at 20 @89
+  WSCInstallProvider at 20 @90
+  WSCUnInstallNameSpace at 4 @91
+  WSCUpdateProvider at 20 @92
+  WSCWriteNameSpaceOrder at 8 @93
+  WSCWriteProviderOrder at 8 @94
+  __WSAFDIsSet at 8 @151
+  accept at 12 @1
+  bind at 12 @2
+  closesocket at 4 @3
+  connect at 12 @4
+  freeaddrinfo at 4 @95
+  getaddrinfo at 16 @96
+  gethostbyaddr at 12 @51
+  gethostbyname at 4 @52
+  gethostname at 8 @57
+  getnameinfo at 28 @97
+  getpeername at 12 @5
+  getprotobyname at 4 @53
+  getprotobynumber at 4 @54
+  getservbyname at 8 @55
+  getservbyport at 8 @56
+  getsockname at 12 @6
+  getsockopt at 20 @7
+  htonl at 4 @8
+  htons at 4 @9
+  inet_addr at 4 @11
+  inet_ntoa at 4 @12
+  ioctlsocket at 12 @10
+  listen at 8 @13
+  ntohl at 4 @14
+  ntohs at 4 @15
+  recv at 16 @16
+  recvfrom at 24 @17
+  select at 20 @18
+  send at 16 @19
+  sendto at 24 @20
+  setsockopt at 20 @21
+  shutdown at 8 @22
+  socket at 12 @23
+  GetAddrInfoW at 16 @98
+  GetNameInfoW at 28 @99

Propchange: branches/cmake-bringup/dll/win32/ws2_32_new/ws2_32.def
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/cmake-bringup/dll/win32/ws2help/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ws2help/CMakeLists.txt?rev=49450&r1=49449&r2=49450&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/ws2help/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/ws2help/CMakeLists.txt [iso-8859-1] Tue Nov  2 20:23:56 2010
@@ -1,7 +1,5 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/winsock)
-
-spec2def(ws2help.dll ws2help.spec)
 
 add_library(ws2help SHARED
     apc.c
@@ -9,7 +7,11 @@
     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)
 

Added: branches/cmake-bringup/dll/win32/ws2help/ws2help.def
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ws2help/ws2help.def?rev=49450&view=auto
==============================================================================
--- branches/cmake-bringup/dll/win32/ws2help/ws2help.def (added)
+++ branches/cmake-bringup/dll/win32/ws2help/ws2help.def [iso-8859-1] Tue Nov  2 20:23:56 2010
@@ -1,0 +1,27 @@
+
+LIBRARY ws2help.dll
+
+EXPORTS
+  WahCloseApcHelper at 4 @1
+  WahCloseHandleHelper at 4 @2
+  WahCloseNotificationHandleHelper at 4 @3
+  WahCloseSocketHandle at 8 @4
+  WahCloseThread at 8 @5
+  WahCompleteRequest at 20 @6
+  WahCreateHandleContextTable at 4 @7
+  WahCreateNotificationHandle at 8 @8
+  WahCreateSocketHandle at 8 @9
+  WahDestroyHandleContextTable at 4 @10
+  WahDisableNonIFSHandleSupport at 0 @11
+  WahEnableNonIFSHandleSupport at 0 @12
+  WahEnumerateHandleContexts at 12 @13
+  WahInsertHandleContext at 8 @14
+  WahNotifyAllProcesses at 4 @15
+  WahOpenApcHelper at 4 @16
+  WahOpenCurrentThread at 8 @17
+  WahOpenHandleHelper at 4 @18
+  WahOpenNotificationHandleHelper at 4 @19
+  WahQueueUserApc at 16 @20
+  WahReferenceContextByHandle at 8 @21
+  WahRemoveHandleContext at 8 @22
+  WahWaitForNotification at 16 @23

Propchange: branches/cmake-bringup/dll/win32/ws2help/ws2help.def
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/cmake-bringup/dll/win32/wshirda/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wshirda/CMakeLists.txt?rev=49450&r1=49449&r2=49450&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/wshirda/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/wshirda/CMakeLists.txt [iso-8859-1] Tue Nov  2 20:23:56 2010
@@ -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)
 

Added: branches/cmake-bringup/dll/win32/wshirda/wshirda.def
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wshirda/wshirda.def?rev=49450&view=auto
==============================================================================
--- branches/cmake-bringup/dll/win32/wshirda/wshirda.def (added)
+++ branches/cmake-bringup/dll/win32/wshirda/wshirda.def [iso-8859-1] Tue Nov  2 20:23:56 2010
@@ -1,0 +1,15 @@
+
+LIBRARY wshirda.dll
+
+EXPORTS
+  WSHEnumProtocols at 16 @1
+  WSHGetProviderGuid at 8 @2
+  WSHGetSockaddrType at 12 @3
+  WSHGetSocketInformation at 32 @4
+  WSHGetWSAProtocolInfo at 12 @5
+  WSHGetWildcardSockaddr at 12 @6
+  WSHGetWinsockMapping at 8 @7
+  WSHIoctl at 52 @8
+  WSHNotify at 20 @9
+  WSHOpenSocket at 24 @10
+  WSHSetSocketInformation at 32 @11

Propchange: branches/cmake-bringup/dll/win32/wshirda/wshirda.def
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/cmake-bringup/dll/win32/wshtcpip/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wshtcpip/CMakeLists.txt?rev=49450&r1=49449&r2=49450&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/wshtcpip/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/wshtcpip/CMakeLists.txt [iso-8859-1] Tue Nov  2 20:23:56 2010
@@ -3,10 +3,11 @@
 
 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)
 

Added: branches/cmake-bringup/dll/win32/wshtcpip/wshtcpip.def
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wshtcpip/wshtcpip.def?rev=49450&view=auto
==============================================================================
--- branches/cmake-bringup/dll/win32/wshtcpip/wshtcpip.def (added)
+++ branches/cmake-bringup/dll/win32/wshtcpip/wshtcpip.def [iso-8859-1] Tue Nov  2 20:23:56 2010
@@ -1,0 +1,20 @@
+
+LIBRARY wshtcpip.dll
+
+EXPORTS
+  WSHAddressToString at 20 @1
+  WSHEnumProtocols at 16 @2
+  WSHGetBroadcastSockaddr at 12 @3
+  WSHGetProviderGuid at 8 @4
+  WSHGetSockaddrType at 12 @5
+  WSHGetSocketInformation at 32 @6
+  WSHGetWildcardSockaddr at 12 @7
+  WSHGetWinsockMapping at 8 @8
+  WSHGetWSAProtocolInfo at 12 @9
+  WSHIoctl at 52 @10
+  WSHJoinLeaf at 52 @11
+  WSHNotify at 20 @12
+  WSHOpenSocket at 24 @13
+  WSHOpenSocket2 at 32 @14
+  WSHSetSocketInformation at 32 @15
+  WSHStringToAddress at 20 @16

Propchange: branches/cmake-bringup/dll/win32/wshtcpip/wshtcpip.def
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/cmake-bringup/dll/win32/wuapi/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wuapi/CMakeLists.txt?rev=49450&r1=49449&r2=49450&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/wuapi/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/wuapi/CMakeLists.txt [iso-8859-1] Tue Nov  2 20:23:56 2010
@@ -5,8 +5,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
@@ -16,7 +14,11 @@
     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)
 

Added: branches/cmake-bringup/dll/win32/wuapi/wuapi.def
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wuapi/wuapi.def?rev=49450&view=auto
==============================================================================
--- branches/cmake-bringup/dll/win32/wuapi/wuapi.def (added)
+++ branches/cmake-bringup/dll/win32/wuapi/wuapi.def [iso-8859-1] Tue Nov  2 20:23:56 2010
@@ -1,0 +1,8 @@
+
+LIBRARY wuapi.dll
+
+EXPORTS
+  DllCanUnloadNow at 0 @1 PRIVATE
+  DllGetClassObject at 12 @2 PRIVATE
+  DllRegisterServer at 0 @3 PRIVATE
+  DllUnregisterServer at 0 @4 PRIVATE

Propchange: branches/cmake-bringup/dll/win32/wuapi/wuapi.def
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/cmake-bringup/dll/win32/xinput1_1/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/xinput1_1/CMakeLists.txt?rev=49450&r1=49449&r2=49450&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/xinput1_1/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/xinput1_1/CMakeLists.txt [iso-8859-1] Tue Nov  2 20:23:56 2010
@@ -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)
 

Added: branches/cmake-bringup/dll/win32/xinput1_1/xinput1_1.def
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/xinput1_1/xinput1_1.def?rev=49450&view=auto
==============================================================================
--- branches/cmake-bringup/dll/win32/xinput1_1/xinput1_1.def (added)
+++ branches/cmake-bringup/dll/win32/xinput1_1/xinput1_1.def [iso-8859-1] Tue Nov  2 20:23:56 2010
@@ -1,0 +1,9 @@
+
+LIBRARY xinput1_1.dll
+
+EXPORTS
+  XInputEnable at 4=xinput1_3.XInputEnable @1
+  XInputGetCapabilities at 12=xinput1_3.XInputGetCapabilities @2
+  XInputGetDSoundAudioDeviceGuids at 12=xinput1_3.XInputGetDSoundAudioDeviceGuids @3
+  XInputSetState at 8=xinput1_3.XInputSetState @4
+  XInputGetState at 8=xinput1_3.XInputGetState @5

Propchange: branches/cmake-bringup/dll/win32/xinput1_1/xinput1_1.def
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/cmake-bringup/dll/win32/xinput1_2/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/xinput1_2/CMakeLists.txt?rev=49450&r1=49449&r2=49450&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/xinput1_2/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/xinput1_2/CMakeLists.txt [iso-8859-1] Tue Nov  2 20:23:56 2010
@@ -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)
 

Added: branches/cmake-bringup/dll/win32/xinput1_2/xinput1_2.def
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/xinput1_2/xinput1_2.def?rev=49450&view=auto
==============================================================================
--- branches/cmake-bringup/dll/win32/xinput1_2/xinput1_2.def (added)
+++ branches/cmake-bringup/dll/win32/xinput1_2/xinput1_2.def [iso-8859-1] Tue Nov  2 20:23:56 2010
@@ -1,0 +1,9 @@
+
+LIBRARY xinput1_2.dll
+
+EXPORTS
+  XInputEnable at 4=xinput1_3.XInputEnable @1
+  XInputGetCapabilities at 12=xinput1_3.XInputGetCapabilities @2
+  XInputGetDSoundAudioDeviceGuids at 12=xinput1_3.XInputGetDSoundAudioDeviceGuids @3
+  XInputSetState at 8=xinput1_3.XInputSetState @4
+  XInputGetState at 8=xinput1_3.XInputGetState @5

Propchange: branches/cmake-bringup/dll/win32/xinput1_2/xinput1_2.def
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/cmake-bringup/dll/win32/xinput1_3/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/xinput1_3/CMakeLists.txt?rev=49450&r1=49449&r2=49450&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/xinput1_3/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/xinput1_3/CMakeLists.txt [iso-8859-1] Tue Nov  2 20:23:56 2010
@@ -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 @@
 
 add_importlibs(xinput1_3 msvcrt kernel32 ntdll)
 
-
 add_cab_target(xinput1_3 1)

Added: branches/cmake-bringup/dll/win32/xinput1_3/xinput1_3.def
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/xinput1_3/xinput1_3.def?rev=49450&view=auto
==============================================================================
--- branches/cmake-bringup/dll/win32/xinput1_3/xinput1_3.def (added)
+++ branches/cmake-bringup/dll/win32/xinput1_3/xinput1_3.def [iso-8859-1] Tue Nov  2 20:23:56 2010
@@ -1,0 +1,12 @@
+
+LIBRARY xinput1_3.dll
+
+EXPORTS
+  DllMain at 12 @1
+  XInputGetState at 8 @2
+  XInputSetState at 8 @3
+  XInputGetCapabilities at 12 @4
+  XInputEnable at 4 @5
+  XInputGetDSoundAudioDeviceGuids at 12 @6
+  XInputGetBatteryInformation at 12 @7
+  XInputGetKeystroke at 12 @8

Propchange: branches/cmake-bringup/dll/win32/xinput1_3/xinput1_3.def
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/cmake-bringup/dll/win32/xinput9_1_0/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/xinput9_1_0/CMakeLists.txt?rev=49450&r1=49449&r2=49450&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/xinput9_1_0/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/xinput9_1_0/CMakeLists.txt [iso-8859-1] Tue Nov  2 20:23:56 2010
@@ -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)
 

Added: branches/cmake-bringup/dll/win32/xinput9_1_0/xinput9_1_0.def
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/xinput9_1_0/xinput9_1_0.def?rev=49450&view=auto
==============================================================================
--- branches/cmake-bringup/dll/win32/xinput9_1_0/xinput9_1_0.def (added)
+++ branches/cmake-bringup/dll/win32/xinput9_1_0/xinput9_1_0.def [iso-8859-1] Tue Nov  2 20:23:56 2010
@@ -1,0 +1,8 @@
+
+LIBRARY xinput9_1_0.dll
+
+EXPORTS
+  XInputGetCapabilities at 12=xinput1_3.XInputGetCapabilities @1
+  XInputGetDSoundAudioDeviceGuids at 12=xinput1_3.XInputGetDSoundAudioDeviceGuids @2
+  XInputSetState at 8=xinput1_3.XInputSetState @3
+  XInputGetState at 8=xinput1_3.XInputGetState @4

Propchange: branches/cmake-bringup/dll/win32/xinput9_1_0/xinput9_1_0.def
------------------------------------------------------------------------------
    svn:eol-style = native




More information about the Ros-diffs mailing list