[CMAKE]

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

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

dll/win32/iccvid/CMakeLists.txt

@@ -1,11 +1,12 @@
 
 add_definitions(-D__WINESRC__)
-
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(iccvid.dll iccvid.spec)
+add_library(iccvid SHARED iccvid.c rsrc.rc iccvid.def)
 
-add_library(iccvid SHARED iccvid.c rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/iccvid.def)
+if(NOT MSVC)
+    set_source_files_properties(iccvid.def PROPERTIES EXTERNAL_OBJECT TRUE)
+endif()
 
 set_module_type(iccvid win32dll)
 

dll/win32/iccvid/iccvid.def

@@ -0,0 +1,5 @@
+
+LIBRARY iccvid.dll
+
+EXPORTS
+  DriverProc@20=ICCVID_DriverProc@20 @1 PRIVATE

dll/win32/imaadp32.acm/CMakeLists.txt

@@ -4,10 +4,11 @@ add_definitions(-D__WINESRC__)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(imaadp32.acm imaadp32.acm.spec)
+add_library(imaadp32.acm SHARED imaadp32.c imaadp32.def)
 
-add_library(imaadp32.acm SHARED imaadp32.c
+if(NOT MSVC)
-    ${CMAKE_CURRENT_BINARY_DIR}/imaadp32.def)
+    set_source_files_properties(imaadp32.def PROPERTIES EXTERNAL_OBJECT TRUE)
+endif()
 
 set_entrypoint(imaadp32.acm 0)
 set_target_properties(imaadp32.acm PROPERTIES SUFFIX ".acm")

dll/win32/imaadp32.acm/imaadp32.def

@@ -0,0 +1,5 @@
+
+LIBRARY imaadp32.acm
+
+EXPORTS
+  DriverProc@20=ADPCM_DriverProc@20 @1 PRIVATE

dll/win32/iprtprio/CMakeLists.txt

@@ -1,15 +0,0 @@
-
-add_definitions(-D__WINESRC__)
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
-
-spec2def(itircl.dll itircl.spec)
-
-add_library(itircl SHARED itircl_main.c ${CMAKE_CURRENT_BINARY_DIR}/itircl.def)
-
-set_module_type(itircl win32dll)
-
-target_link_libraries(itircl wine)
-
-add_importlibs(itircl kernel32 ntdll)
-add_dependencies(itircl psdk)
-add_cab_target(itircl 1)

dll/win32/jscript/CMakeLists.txt

@@ -11,8 +11,6 @@ add_definitions(
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(jscript.dll jscript.spec)
-
 add_library(jscript SHARED
     activex.c
     date.c
@@ -34,7 +32,11 @@ add_library(jscript SHARED
     function.c
     global.c
     rsrc.rc
-    ${CMAKE_CURRENT_BINARY_DIR}/jscript.def)
+    jscript.def)
+
+if(NOT MSVC)
+    set_source_files_properties(jscript.def PROPERTIES EXTERNAL_OBJECT TRUE)
+endif()
 
 set_module_type(jscript win32dll)
 

dll/win32/jscript/jscript.def

@@ -0,0 +1,8 @@
+
+LIBRARY jscript.dll
+
+EXPORTS
+  DllCanUnloadNow@0 @1 PRIVATE
+  DllGetClassObject@12 @2 PRIVATE
+  DllRegisterServer@0 @3 PRIVATE
+  DllUnregisterServer@0 @4 PRIVATE

dll/win32/localui/CMakeLists.txt

@@ -2,9 +2,11 @@
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(localui.dll localui.spec)
+add_library(localui SHARED localui.c localui.rc localui.def)
 
-add_library(localui SHARED localui.c localui.rc ${CMAKE_CURRENT_BINARY_DIR}/localui.def)
+if(NOT MSVC)
+    set_source_files_properties(localui.def PROPERTIES EXTERNAL_OBJECT TRUE)
+endif()
 
 set_module_type(localui win32dll)
 

dll/win32/localui/localui.def

@@ -0,0 +1,5 @@
+
+LIBRARY localui.dll
+
+EXPORTS
+  InitializePrintMonitorUI@0 @1

dll/win32/lpk/CMakeLists.txt

@@ -4,9 +4,11 @@ set_unicode()
 add_definitions(-DLANGPACK)
 include_directories(include)
 
-spec2def(lpk.dll lpk.spec)
+add_library(lpk SHARED dllmain.c stub.c lpk.rc lpk.def)
 
-add_library(lpk SHARED dllmain.c stub.c lpk.rc ${CMAKE_CURRENT_BINARY_DIR}/lpk.def)
+if(NOT MSVC)
+    set_source_files_properties(lpk.def PROPERTIES EXTERNAL_OBJECT TRUE)
+endif()
 
 set_module_type(lpk win32dll)
 

dll/win32/lpk/lpk.def

@@ -0,0 +1,15 @@
+
+LIBRARY lpk.dll
+
+EXPORTS
+  LpkInitialize@4 @1
+  LpkTabbedTextOut@48 @2
+  LpkDllInitialize@12 @3
+  LpkDrawTextEx@40 @4
+  LpkEditControl @5 DATA
+  LpkExtTextOut@36 @6
+  LpkGetCharacterPlacement@28 @7
+  LpkGetTextExtentExPoint@36 @8
+  LpkPSMTextOut@24 @9
+  LpkUseGDIWidthCache@20 @10
+  ftsWordBreak@20 @11

dll/win32/lz32/CMakeLists.txt

@@ -2,10 +2,11 @@
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(lz32.dll lz32.spec)
+add_library(lz32 SHARED version.rc lz32.def)
 
-add_library(lz32 SHARED version.rc
+if(NOT MSVC)
-    ${CMAKE_CURRENT_BINARY_DIR}/lz32.def)
+    set_source_files_properties(lz32.def PROPERTIES EXTERNAL_OBJECT TRUE)
+endif()
 
 set_entrypoint(lz32 0)
 

dll/win32/lz32/lz32.def

@@ -0,0 +1,16 @@
+
+LIBRARY lz32.dll
+
+EXPORTS
+  CopyLZFile@8=kernel32.CopyLZFile @1
+  GetExpandedNameA@8=kernel32.GetExpandedNameA @2
+  GetExpandedNameW@8=kernel32.GetExpandedNameW @3
+  LZClose@4=kernel32.LZClose @4
+  LZCopy@8=kernel32.LZCopy @5
+  LZDone@0=kernel32.LZDone @6
+  LZInit@4=kernel32.LZInit @7
+  LZOpenFileA@12=kernel32.LZOpenFileA @8
+  LZOpenFileW@12=kernel32.LZOpenFileW @9
+  LZRead@12=kernel32.LZRead @10
+  LZSeek@12=kernel32.LZSeek @11
+  LZStart@0=kernel32.LZStart @12

dll/win32/mciavi32/CMakeLists.txt

@@ -2,15 +2,17 @@
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(mciavi32.dll mciavi32.spec)
-
 add_library(mciavi32 SHARED
     info.c
     mciavi.c
     mmoutput.c
     wnd.c
     mciavi_res.rc
-    ${CMAKE_CURRENT_BINARY_DIR}/mciavi32.def)
+    mciavi32.def)
+
+if(NOT MSVC)
+    set_source_files_properties(mciavi32.def PROPERTIES EXTERNAL_OBJECT TRUE)
+endif()
 
 set_module_type(mciavi32 win32dll)
 

dll/win32/mciavi32/mciavi32.def

@@ -0,0 +1,5 @@
+
+LIBRARY mciavi32.dll
+
+EXPORTS
+  DriverProc@20=MCIAVI_DriverProc@20 @1 PRIVATE

dll/win32/mcicda/CMakeLists.txt

@@ -2,10 +2,11 @@
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(mcicda.dll mcicda.spec)
+add_library(mcicda SHARED mcicda.c mcicda.def)
 
-add_library(mcicda SHARED mcicda.c
+if(NOT MSVC)
-    ${CMAKE_CURRENT_BINARY_DIR}/mcicda.def)
+    set_source_files_properties(mcicda.def PROPERTIES EXTERNAL_OBJECT TRUE)
+endif()
 
 set_entrypoint(mcicda 0)
 

dll/win32/mcicda/mcicda.def

@@ -0,0 +1,5 @@
+
+LIBRARY mcicda.dll
+
+EXPORTS
+  DriverProc@20=MCICDA_DriverProc@20 @1 PRIVATE

dll/win32/mciqtz32/CMakeLists.txt

@@ -2,9 +2,11 @@
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(mciqtz32.dll mciqtz32.spec)
+add_library(mciqtz32 SHARED mciqtz.c version.rc mciqtz32.def)
 
-add_library(mciqtz32 SHARED mciqtz.c version.rc ${CMAKE_CURRENT_BINARY_DIR}/mciqtz32.def)
+if(NOT MSVC)
+    set_source_files_properties(mciqtz32.def PROPERTIES EXTERNAL_OBJECT TRUE)
+endif()
 
 set_module_type(mciqtz32 win32dll)
 

dll/win32/mciqtz32/mciqtz32.def

@@ -0,0 +1,5 @@
+
+LIBRARY mciqtz32.dll
+
+EXPORTS
+  DriverProc@20=MCIQTZ_DriverProc@20 @1 PRIVATE

dll/win32/mciseq/CMakeLists.txt

@@ -2,10 +2,11 @@
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(mciseq.dll mciseq.spec)
+add_library(mciseq SHARED mcimidi.c mciseq.def)
 
-add_library(mciseq SHARED mcimidi.c
+if(NOT MSVC)
-    ${CMAKE_CURRENT_BINARY_DIR}/mciseq.def)
+    set_source_files_properties(mciseq.def PROPERTIES EXTERNAL_OBJECT TRUE)
+endif()
 
 set_entrypoint(mciseq 0)
 

dll/win32/mciseq/mciseq.def

@@ -0,0 +1,5 @@
+
+LIBRARY mciseq.dll
+
+EXPORTS
+  DriverProc@20=MCIMIDI_DriverProc@20 @1 PRIVATE

dll/win32/mciwave/CMakeLists.txt

@@ -1,14 +1,18 @@
 
-add_definitions(-D__WINESRC__)
+add_definitions(
-add_definitions(-D_DLL -D__USE_CRTIMP)
+    -D__WINESRC__
-add_definitions(-D_WINE)
+    -D_DLL -D__USE_CRTIMP
+    -D_WINE)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 spec2def(mciwave.dll mciwave.spec)
 
-add_library(mciwave SHARED mciwave.c
+add_library(mciwave SHARED mciwave.c mciwave.def)
-    ${CMAKE_CURRENT_BINARY_DIR}/mciwave.def)
+
+if(NOT MSVC)
+    set_source_files_properties(mciwave.def PROPERTIES EXTERNAL_OBJECT TRUE)
+endif()
 
 set_entrypoint(mciwave 0)
 

dll/win32/mciwave/mciwave.def

@@ -0,0 +1,5 @@
+
+LIBRARY mciwave.dll
+
+EXPORTS
+  DriverProc@20=MCIWAVE_DriverProc@20 @1 PRIVATE

dll/win32/mmdrv/CMakeLists.txt

@@ -3,8 +3,6 @@ set_unicode()
 
 add_definitions(-DNDEBUG)
 
-spec2def(mmdrv.dll mmdrv.spec)
-
 add_library(mmdrv SHARED
     entry.c
     mme.c
@@ -13,7 +11,11 @@ add_library(mmdrv SHARED
     common.c
     wave.c
     wave_io.c
-    ${CMAKE_CURRENT_BINARY_DIR}/mmdrv.def)
+    mmdrv.def)
+
+if(NOT MSVC)
+    set_source_files_properties(mmdrv.def PROPERTIES EXTERNAL_OBJECT TRUE)
+endif()
 
 set_entrypoint(mmdrv 0)
 

dll/win32/mmdrv/mmdrv.def

@@ -0,0 +1,6 @@
+
+LIBRARY mmdrv.dll
+
+EXPORTS
+  DriverProc@20 @1
+  wodMessage@20 @2

dll/win32/msadp32.acm/CMakeLists.txt

@@ -4,10 +4,11 @@ add_definitions(-D__WINESRC__)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(msadp32.acm msadp32.acm.spec)
+add_library(msadp32.acm SHARED msadp32.c msadp32.def)
 
-add_library(msadp32.acm SHARED msadp32.c
+if(NOT MSVC)
-    ${CMAKE_CURRENT_BINARY_DIR}/msadp32.def)
+    set_source_files_properties(msadp32.def PROPERTIES EXTERNAL_OBJECT TRUE)
+endif()
 
 set_entrypoint(msadp32.acm 0)
 set_target_properties(msadp32.acm PROPERTIES SUFFIX "")

dll/win32/msadp32.acm/msadp32.def

@@ -0,0 +1,5 @@
+
+LIBRARY msadp32.acm
+
+EXPORTS
+  DriverProc@20=ADPCM_DriverProc@20 @1 PRIVATE

dll/win32/msafd/CMakeLists.txt

@@ -1,10 +1,9 @@
 
 set_unicode()
 
-include_directories(BEFORE include)
+include_directories(
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/drivers)
+    BEFORE include
-
+    ${REACTOS_SOURCE_DIR}/include/reactos/drivers)
-spec2def(msafd.dll msafd.spec)
 
 list(APPEND SOURCE
     msafd.rc
@@ -13,7 +12,11 @@ list(APPEND SOURCE
     misc/helpers.c
     misc/sndrcv.c
     misc/stubs.c
-    ${CMAKE_CURRENT_BINARY_DIR}/msafd.def)
+    msafd.def)
+
+if(NOT MSVC)
+    set_source_files_properties(msafd.def PROPERTIES EXTERNAL_OBJECT TRUE)
+endif()
 
 add_library(msafd SHARED
     ${CMAKE_CURRENT_BINARY_DIR}/msafd_msafd.h.gch

dll/win32/msafd/msafd.def

@@ -0,0 +1,5 @@
+
+LIBRARY msafd.dll
+
+EXPORTS
+  WSPStartup@76 @1

dll/win32/msg711.acm/CMakeLists.txt

@@ -1,13 +1,15 @@
 
-add_definitions(-D_DLL -D__USE_CRTIMP)
+add_definitions(
-add_definitions(-D__WINESRC__)
+    -D_DLL -D__USE_CRTIMP
+    -D__WINESRC__)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(msg711.acm msg711.acm.spec)
+add_library(msg711.acm SHARED msg711.c msg711.def)
 
-add_library(msg711.acm SHARED msg711.c
+if(NOT MSVC)
-    ${CMAKE_CURRENT_BINARY_DIR}/msg711.def)
+    set_source_files_properties(msg711.def PROPERTIES EXTERNAL_OBJECT TRUE)
+endif()
 
 set_entrypoint(msg711.acm 0)
 set_target_properties(msg711.acm PROPERTIES SUFFIX "")

dll/win32/msg711.acm/msg711.def

@@ -0,0 +1,5 @@
+
+LIBRARY msg711.acm
+
+EXPORTS
+  DriverProc@20=G711_DriverProc@20 @1 PRIVATE

dll/win32/msgsm32.acm/CMakeLists.txt

@@ -1,13 +1,15 @@
 
-add_definitions(-D_DLL -D__USE_CRTIMP)
+add_definitions(
-add_definitions(-D__WINESRC__)
+    -D_DLL -D__USE_CRTIMP
+    -D__WINESRC__)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(msgsm32.acm msgsm32.acm.spec)
+add_library(msgsm32.acm SHARED msgsm32.c msgsm32.def)
 
-add_library(msgsm32.acm SHARED msgsm32.c
+if(NOT MSVC)
-    ${CMAKE_CURRENT_BINARY_DIR}/msgsm32.def)
+    set_source_files_properties(msgsm32.def PROPERTIES EXTERNAL_OBJECT TRUE)
+endif()
 
 set_entrypoint(msgsm32.acm 0)
 set_target_properties(msgsm32.acm PROPERTIES SUFFIX "")

dll/win32/msgsm32.acm/msgsm32.def

@@ -0,0 +1,5 @@
+
+LIBRARY msgsm32.acm
+
+EXPORTS
+  DriverProc@20=GSM_DriverProc@20 @1 PRIVATE

dll/win32/mshtml.tlb/CMakeLists.txt

@@ -6,11 +6,7 @@ add_definitions(-D__WINESRC__)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(mshtml.tlb mshtml.tlb.spec)
+add_library(mshtml.tlb SHARED rsrc.rc)
-
-add_library(mshtml.tlb SHARED
-    rsrc.rc
-    ${CMAKE_CURRENT_BINARY_DIR}/mshtml.def)
 
 set_entrypoint(mshtml.tlb 0)
 set_target_properties(mshtml.tlb PROPERTIES SUFFIX "")

dll/win32/msimg32/CMakeLists.txt

@@ -2,9 +2,11 @@
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 add_definitions(-D__WINESRC__)
 
-spec2def(msimg32.dll msimg32.spec)
+add_library(msimg32 SHARED msimg32_main.c msimg32.def)
 
-add_library(msimg32 SHARED msimg32_main.c ${CMAKE_CURRENT_BINARY_DIR}/msimg32.def)
+if(NOT MSVC)
+    set_source_files_properties(msimg32.def PROPERTIES EXTERNAL_OBJECT TRUE)
+endif()
 
 set_module_type(msimg32 win32dll)
 

dll/win32/msimg32/msimg32.def

@@ -0,0 +1,9 @@
+
+LIBRARY msimg32.dll
+
+EXPORTS
+  AlphaBlend@44=gdi32.GdiAlphaBlend @1
+  DllInitialize@12=DllMain@12 @2 PRIVATE
+  GradientFill@24=gdi32.GdiGradientFill @3
+  TransparentBlt@44=gdi32.GdiTransparentBlt @4
+  vSetDdrawflag@0 @5

dll/win32/msisys.ocx/CMakeLists.txt

@@ -2,10 +2,11 @@
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(msisys.ocx msisys.ocx.spec)
+add_library(msisys SHARED msisys.c msisys.def)
 
-add_library(msisys SHARED msisys.c
+if(NOT MSVC)
-    ${CMAKE_CURRENT_BINARY_DIR}/msisys.def)
+    set_source_files_properties(msisys.def PROPERTIES EXTERNAL_OBJECT TRUE)
+endif()
 
 set_module_type(msisys win32ocx)
 

dll/win32/msisys.ocx/msisys.def

@@ -0,0 +1,8 @@
+
+LIBRARY msisys.ocx
+
+EXPORTS
+  DllCanUnloadNow@0 @1 PRIVATE
+  DllGetClassObject@12 @2 PRIVATE
+  DllRegisterServer@0 @3 PRIVATE
+  DllUnregisterServer@0 @4 PRIVATE

dll/win32/msrle32/CMakeLists.txt

@@ -1,12 +1,15 @@
 
-add_definitions(-D__WINESRC__)
+add_definitions(
-add_definitions(-D_DLL -D__USE_CRTIMP)
+    -D__WINESRC__
+    -D_DLL -D__USE_CRTIMP)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(msrle32.dll msrle32.spec)
+add_library(msrle32 SHARED msrle32.c rsrc.rc msrle32.def)
 
-add_library(msrle32 SHARED msrle32.c rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/msrle32.def)
+if(NOT MSVC)
+    set_source_files_properties(msrle32.def PROPERTIES EXTERNAL_OBJECT TRUE)
+endif()
 
 set_module_type(msrle32 win32dll)
 

dll/win32/msrle32/msrle32.def

@@ -0,0 +1,5 @@
+
+LIBRARY msrle32.dll
+
+EXPORTS
+  DriverProc@20=MSRLE32_DriverProc@20 @1 PRIVATE

dll/win32/msvidc32/CMakeLists.txt

@@ -1,12 +1,15 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-add_definitions(-D__WINESRC__)
+add_definitions(
-add_definitions(-D_WINE)
+    -D__WINESRC__
+    -D_WINE)
 
-spec2def(msvidc32.dll msvidc32.spec)
+add_library(msvidc32 SHARED msvideo1.c rsrc.rc msvidc32.def)
 
-add_library(msvidc32 SHARED msvideo1.c rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/msvidc32.def)
+if(NOT MSVC)
+    set_source_files_properties(msvidc32.def PROPERTIES EXTERNAL_OBJECT TRUE)
+endif()
 
 set_module_type(msvidc32 win32dll)
 

dll/win32/msvidc32/msvidc32.def

@@ -0,0 +1,5 @@
+
+LIBRARY msvidc32.dll
+
+EXPORTS
+  DriverProc@20=CRAM_DriverProc@20 @1 PRIVATE

dll/win32/mswsock/CMakeLists.txt

@@ -10,7 +10,11 @@ add_library(mswsock SHARED
     extensions.c
     stubs.c
     mswsock.rc
-    ${CMAKE_CURRENT_BINARY_DIR}/mswsock.def)
+    mswsock.def)
+
+if(NOT MSVC)
+    set_source_files_properties(mswsock.def PROPERTIES EXTERNAL_OBJECT TRUE)
+endif()
 
 set_module_type(mswsock win32dll)
 

dll/win32/mswsock/mswsock.def

@@ -0,0 +1,36 @@
+
+LIBRARY mswsock.dll
+
+EXPORTS
+  AcceptEx@32 @1
+  EnumProtocolsA@12=ws2_32.WSAEnumProtocolsA @2
+  EnumProtocolsW@12=ws2_32.WSAEnumProtocolsW @3
+  GetAcceptExSockaddrs@32 @4
+  GetAddressByNameA@40 @5
+  GetAddressByNameW@40 @6
+  GetNameByTypeA@12 @7
+  GetNameByTypeW@12 @8
+  GetServiceA@28 @9
+  GetServiceW@28 @10
+  GetTypeByNameA@8 @11
+  GetTypeByNameW@8 @12
+  MigrateWinsockConfiguration@12 @13
+  NPLoadNameSpaces@12 @14
+  NSPStartup@8 @15
+  ServiceMain@8 @16
+  SetServiceA@24 @17
+  SetServiceW@24 @18
+  StartWsdpService@0 @19
+  StopWsdpService@0 @20
+  SvchostPushServiceGlobals@4 @21
+  TransmitFile@28 @22
+  WSARecvEx@16 @23
+  WSPStartup@76 @24
+  dn_expand@20 @25
+  getnetbyname@4 @26
+  inet_network@4 @27
+  rcmd@24 @28
+  rexec@24 @29
+  rresvport@4 @30
+  s_perror@4 @31
+  sethostname@8 @32

dll/win32/netid/CMakeLists.txt

@@ -1,7 +1,9 @@
 
-spec2def(netid.dll netid.spec)
+add_library(netid SHARED netid.c netid.rc netid.def)
 
-add_library(netid SHARED netid.c netid.rc ${CMAKE_CURRENT_BINARY_DIR}/netid.def)
+if(NOT MSVC)
+    set_source_files_properties(netid.def PROPERTIES EXTERNAL_OBJECT TRUE)
+endif()
 
 set_module_type(netid win32dll)
 

dll/win32/netid/netid.def

@@ -0,0 +1,5 @@
+
+LIBRARY netid.dll
+
+EXPORTS
+  CreateNetIDPropertyPage@0 @1

dll/win32/ntmarta/CMakeLists.txt

@@ -2,12 +2,15 @@
 set_unicode()
 
 add_definitions(-D__WINESRC__)
+
 remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)
 
-spec2def(ntmarta.dll ntmarta.spec)
+add_library(ntmarta SHARED ntmarta.c ntmarta.rc ntmarta.def)
 
-add_library(ntmarta SHARED ntmarta.c ntmarta.rc ${CMAKE_CURRENT_BINARY_DIR}/ntmarta.def)
+if(NOT MSVC)
+    set_source_files_properties(ntmarta.def PROPERTIES EXTERNAL_OBJECT TRUE)
+endif()
 
 set_module_type(ntmarta win32dll)
 
@@ -17,5 +20,4 @@ add_importlibs(ntmarta
     kernel32
     ntdll)
 
-
 add_cab_target(ntmarta 1)

dll/win32/ntmarta/ntmarta.def

@@ -0,0 +1,13 @@
+
+LIBRARY ntmarta.dll
+
+EXPORTS
+  AccFreeIndexArray@12 @1
+  AccGetInheritanceSource@40 @2
+  AccRewriteGetExplicitEntriesFromAcl@12 @3
+  AccRewriteGetHandleRights@32 @4
+  AccRewriteGetNamedRights@32 @5
+  AccRewriteSetEntriesInAcl@16 @6
+  AccRewriteSetHandleRights@16 @7
+  AccRewriteSetNamedRights@16 @8
+  AccTreeResetNamedSecurityInfo@44 @9

dll/win32/objsel/CMakeLists.txt

@@ -6,14 +6,16 @@ add_definitions(-D_WIN32_WINNT=0x600)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(objsel.dll objsel.spec)
-
 add_library(objsel SHARED
     factory.c
     objsel.c
     regsvr.c
     objsel.rc
-    ${CMAKE_CURRENT_BINARY_DIR}/objsel.def)
+    objsel.def)
+
+if(NOT MSVC)
+    set_source_files_properties(objsel.def PROPERTIES EXTERNAL_OBJECT TRUE)
+endif()
 
 set_module_type(objsel win32dll)
 
@@ -28,5 +30,4 @@ add_importlibs(objsel
     kernel32
     ntdll)
 
-
 add_cab_target(objsel 1)

dll/win32/objsel/objsel.def

@@ -0,0 +1,8 @@
+
+LIBRARY objsel.dll
+
+EXPORTS
+  DllCanUnloadNow@0 @1 PRIVATE
+  DllGetClassObject@12 @2 PRIVATE
+  DllRegisterServer@0 @3 PRIVATE
+  DllUnregisterServer@0 @4 PRIVATE

dll/win32/oledlg/CMakeLists.txt

@@ -2,14 +2,16 @@
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 add_definitions(-D__WINESRC__)
 
-spec2def(oledlg.dll oledlg.spec)
-
 add_library(oledlg SHARED
     insobjdlg.c
     oledlg_main.c
     pastespl.c
     rsrc.rc
-    ${CMAKE_CURRENT_BINARY_DIR}/oledlg.def)
+    oledlg.def)
+
+if(NOT MSVC)
+    set_source_files_properties(oledlg.def PROPERTIES EXTERNAL_OBJECT TRUE)
+endif()
 
 set_module_type(oledlg win32dll)
 

dll/win32/oledlg/oledlg.def

@@ -0,0 +1,27 @@
+
+LIBRARY oledlg.dll
+
+EXPORTS
+  OleUIAddVerbMenuA@36 @1
+  OleUICanConvertOrActivateAs@12 @2
+  OleUIInsertObjectA@4 @3
+  OleUIPasteSpecialA@4 @4
+  OleUIEditLinksA@4 @5
+  OleUIChangeIconA@4 @6
+  OleUIConvertA@4 @7
+  OleUIBusyA@4 @8
+  OleUIUpdateLinksA@16 @9
+  OleUIPromptUserA @10
+  OleUIObjectPropertiesA@4 @11
+  OleUIChangeSourceA@4 @12
+  OleUIPromptUserW @13
+  OleUIAddVerbMenuW@36 @14
+  OleUIBusyW@4 @15
+  OleUIChangeIconW@4 @16
+  OleUIChangeSourceW@4 @17
+  OleUIConvertW@4 @18
+  OleUIEditLinksW@4 @19
+  OleUIInsertObjectW@4 @20
+  OleUIObjectPropertiesW@4 @21
+  OleUIPasteSpecialW@4 @22
+  OleUIUpdateLinksW@16 @23

dll/win32/olepro32/CMakeLists.txt

@@ -2,20 +2,19 @@
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(olepro32.dll olepro32.spec)
+add_library(olepro32 SHARED olepro32stubs.c version.rc olepro32.def)
 
-add_library(olepro32 SHARED olepro32stubs.c version.rc
+if(NOT MSVC)
-    ${CMAKE_CURRENT_BINARY_DIR}/olepro32.def)
+    set_source_files_properties(olepro32.def PROPERTIES EXTERNAL_OBJECT TRUE)
+endif()
 
 set_entrypoint(olepro32 0)
 
-target_link_libraries(olepro32
+target_link_libraries(olepro32 wine)
-    wine)
 
 add_importlibs(olepro32
     oleaut32
     kernel32
     ntdll)
 
-
 add_cab_target(olepro32 1)

dll/win32/olepro32/olepro32.def

@@ -0,0 +1,15 @@
+
+LIBRARY olepro32.dll
+
+EXPORTS
+  OleIconToCursor@8=oleaut32.OleIconToCursor @248
+  OleCreatePropertyFrameIndirect@4=oleaut32.OleCreatePropertyFrameIndirect @249
+  OleCreatePropertyFrame@44=oleaut32.OleCreatePropertyFrame @250
+  OleLoadPicture@20=oleaut32.OleLoadPicture @251
+  OleCreatePictureIndirect@16=oleaut32.OleCreatePictureIndirect @252
+  OleCreateFontIndirect@12=oleaut32.OleCreateFontIndirect @253
+  OleTranslateColor@12=oleaut32.OleTranslateColor @254
+  DllCanUnloadNow@0 @255 PRIVATE
+  DllGetClassObject@12 @256 PRIVATE
+  DllRegisterServer@0 @257 PRIVATE
+  DllUnregisterServer@0 @258 PRIVATE

dll/win32/powrprof/CMakeLists.txt

@@ -1,9 +1,11 @@
 
 set_unicode()
 
-spec2def(powrprof.dll powrprof.spec)
+add_library(powrprof SHARED powrprof.c powrprof.rc powrprof.def)
 
-add_library(powrprof SHARED powrprof.c powrprof.rc ${CMAKE_CURRENT_BINARY_DIR}/powrprof.def)
+if(NOT MSVC)
+    set_source_files_properties(powrprof.def PROPERTIES EXTERNAL_OBJECT TRUE)
+endif()
 
 set_module_type(powrprof win32dll)
 

dll/win32/powrprof/powrprof.def

@@ -0,0 +1,27 @@
+
+LIBRARY powrprof.dll
+
+EXPORTS
+  CallNtPowerInformation@20 @1
+  CanUserWritePwrScheme@0 @2
+  DeletePwrScheme@4 @3
+  EnumPwrSchemes@8 @4
+  GetActivePwrScheme@4 @5
+  GetCurrentPowerPolicies@8 @6
+  GetPwrCapabilities@4 @7
+  GetPwrDiskSpindownRange@8 @8
+  IsAdminOverrideActive@4 @9
+  IsPwrHibernateAllowed@0 @10
+  IsPwrShutdownAllowed@0 @11
+  IsPwrSuspendAllowed@0 @12
+  PowerGetActiveScheme@8 @13
+  PowerReadDCValue@28 @14
+  ReadGlobalPwrPolicy@4 @15
+  ReadProcessorPwrScheme@8 @16
+  ReadPwrScheme@8 @17
+  SetActivePwrScheme@12 @18
+  SetSuspendState@12 @19
+  WriteGlobalPwrPolicy@4 @20
+  WriteProcessorPwrScheme@8 @21
+  WritePwrScheme@16 @22
+  ValidatePowerPolicies@8 @23

dll/win32/psapi/CMakeLists.txt

@@ -1,11 +1,13 @@
 
-spec2def(psapi.dll psapi.spec)
-
 list(APPEND SOURCE
     malloc.c
     psapi.c
     psapi.rc
-    ${CMAKE_CURRENT_BINARY_DIR}/psapi.def)
+    psapi.def)
+
+if(NOT MSVC)
+    set_source_files_properties(psapi.def PROPERTIES EXTERNAL_OBJECT TRUE)
+endif()
 
 add_library(psapi SHARED
     ${CMAKE_CURRENT_BINARY_DIR}/psapi_precomp.h.gch

dll/win32/psapi/psapi.def

@@ -0,0 +1,29 @@
+
+LIBRARY psapi.dll
+
+EXPORTS
+  EmptyWorkingSet@4 @1
+  EnumDeviceDrivers@12 @2
+  EnumPageFilesA@8 @3
+  EnumPageFilesW@8 @4
+  EnumProcessModules@16 @5
+  EnumProcesses@12 @6
+  GetDeviceDriverBaseNameA@12 @7
+  GetDeviceDriverBaseNameW@12 @8
+  GetDeviceDriverFileNameA@12 @9
+  GetDeviceDriverFileNameW@12 @10
+  GetMappedFileNameA@16 @11
+  GetMappedFileNameW@16 @12
+  GetModuleBaseNameA@16 @13
+  GetModuleBaseNameW@16 @14
+  GetModuleFileNameExA@16 @15
+  GetModuleFileNameExW@16 @16
+  GetModuleInformation@16 @17
+  GetPerformanceInfo@8 @18
+  GetProcessImageFileNameA@12 @19
+  GetProcessImageFileNameW@12 @20
+  GetProcessMemoryInfo@12 @21
+  GetWsChanges@12 @22
+  InitializeProcessForWsWatch@4 @23
+  QueryWorkingSet@12 @24
+  QueryWorkingSetEx@12 @25

dll/win32/riched20/CMakeLists.txt

@@ -1,11 +1,10 @@
 
-add_definitions(-D__WINESRC__)
+add_definitions(
-add_definitions(-D_DLL -D__USE_CRTIMP)
+    -D__WINESRC__
+    -D_DLL -D__USE_CRTIMP)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(riched20.dll riched20.spec)
-
 add_library(riched20 SHARED
     caret.c
     clipboard.c
@@ -27,7 +26,11 @@ add_library(riched20 SHARED
     wrap.c
     writer.c
     version.rc
-    ${CMAKE_CURRENT_BINARY_DIR}/riched20.def)
+    riched20.def)
+
+if(NOT MSVC)
+    set_source_files_properties(riched20.def PROPERTIES EXTERNAL_OBJECT TRUE)
+endif()
 
 set_module_type(riched20 win32dll)
 
@@ -49,5 +52,4 @@ add_importlibs(riched20
     kernel32
     ntdll)
 
-
 add_cab_target(riched20 1)

dll/win32/riched20/riched20.def

@@ -0,0 +1,13 @@
+
+LIBRARY riched20.dll
+
+EXPORTS
+  IID_IRichEditOle @2 DATA
+  IID_IRichEditOleCallback @3 DATA
+  CreateTextServices@12 @4
+  IID_ITextServices @5 DATA
+  IID_ITextHost @6 DATA
+  IID_ITextHost2 @7 DATA
+  REExtendedRegisterClass@0 @8
+  RichEdit10ANSIWndProc@16 @9
+  RichEditANSIWndProc@16 @10

dll/win32/riched32/CMakeLists.txt

@@ -2,9 +2,11 @@
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(riched32.dll riched32.spec)
+add_library(riched32 SHARED richedit.c version.rc riched32.def)
 
-add_library(riched32 SHARED richedit.c version.rc ${CMAKE_CURRENT_BINARY_DIR}/riched32.def)
+if(NOT MSVC)
+    set_source_files_properties(riched32.def PROPERTIES EXTERNAL_OBJECT TRUE)
+endif()
 
 set_module_type(riched32 win32dll)
 

dll/win32/riched32/riched32.def

@@ -0,0 +1,5 @@
+
+LIBRARY riched32.dll
+
+EXPORTS
+  DllGetVersion@4 @2 PRIVATE

dll/win32/wsock32/CMakeLists.txt

@@ -1,10 +1,13 @@
 
 set_unicode()
 
-add_library(wsock32 SHARED stubs.c wsock32.rc)
+add_library(wsock32 SHARED stubs.c wsock32.rc wsock32.def)
+
+if(NOT MSVC)
+    set_source_files_properties(wsock32.def PROPERTIES EXTERNAL_OBJECT TRUE)
+endif()
 
 set_module_type(wsock32 win32dll)
 
-target_link_libraries(wsock32 ${CMAKE_CURRENT_SOURCE_DIR}/wsock32.def)
 add_importlibs(wsock32 ws2_32 kernel32 ntdll)
 add_cab_target(wsock32 1)