[CMAKE]
authorAmine Khaldi <amine.khaldi@reactos.org>
Fri, 24 Dec 2010 19:07:09 +0000 (19:07 +0000)
committerAmine Khaldi <amine.khaldi@reactos.org>
Fri, 24 Dec 2010 19:07:09 +0000 (19:07 +0000)
- Delete more useless definition files.
- Improve more modules.

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

29 files changed:
dll/win32/wing32/CMakeLists.txt
dll/win32/wing32/wing32.def [deleted file]
dll/win32/winhttp/CMakeLists.txt
dll/win32/winhttp/winhttp.def [deleted file]
dll/win32/winspool/CMakeLists.txt
dll/win32/winspool/winspool_winspool.auto.def [deleted file]
dll/win32/winspool/winspool_winspool.stubs.c [deleted file]
dll/win32/winsta/CMakeLists.txt
dll/win32/winsta/winsta.def [deleted file]
dll/win32/wmi/CMakeLists.txt
dll/win32/wmi/wmi.def [deleted file]
dll/win32/ws2_32_new/CMakeLists.txt
dll/win32/ws2_32_new/ws2_32.def [deleted file]
dll/win32/ws2help/CMakeLists.txt
dll/win32/ws2help/ws2help.def [deleted file]
dll/win32/wshirda/CMakeLists.txt
dll/win32/wshirda/wshirda.def [deleted file]
dll/win32/wshtcpip/CMakeLists.txt
dll/win32/wshtcpip/wshtcpip.def [deleted file]
dll/win32/wuapi/CMakeLists.txt
dll/win32/wuapi/wuapi.def [deleted file]
dll/win32/xinput1_1/CMakeLists.txt
dll/win32/xinput1_1/xinput1_1.def [deleted file]
dll/win32/xinput1_2/CMakeLists.txt
dll/win32/xinput1_2/xinput1_2.def [deleted file]
dll/win32/xinput1_3/CMakeLists.txt
dll/win32/xinput1_3/xinput1_3.def [deleted file]
dll/win32/xinput9_1_0/CMakeLists.txt
dll/win32/xinput9_1_0/xinput9_1_0.def [deleted file]

index 3e5abbb..d0f6b07 100644 (file)
@@ -1,14 +1,16 @@
 
 set_unicode()
 
-add_library(wing32 SHARED wing32.c wing32.def)
+spec2def(wing32.dll wing32.spec)
 
-if(NOT MSVC)
-    set_source_files_properties(wing32.def PROPERTIES EXTERNAL_OBJECT TRUE)
-endif()
+list(APPEND SOURCE
+    wing32.c
+    ${CMAKE_CURRENT_BINARY_DIR}/wing32.def)
+
+add_library(wing32 SHARED ${SOURCE})
 
 set_entrypoint(wing32 0)
+
 add_importlibs(wing32 user32 gdi32)
 add_dependencies(wing32 psdk)
-
-add_cab_target(wing32 1)
\ No newline at end of file
+add_cab_target(wing32 1)
diff --git a/dll/win32/wing32/wing32.def b/dll/win32/wing32/wing32.def
deleted file mode 100644 (file)
index 00090e0..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-
-LIBRARY wing32.dll
-
-EXPORTS
-  WinGBitBlt@32 @1
-  WinGCreateBitmap@12 @2
-  WinGCreateDC@0 @3
-  WinGCreateHalfToneBrush@12 @4
-  WinGCreateHalfTonePalette@0 @5
-  WinGGetDIBColorTable@16 @6
-  WinGGetDIBPointer@8 @7
-  WinGRecommendDIBFormat@4 @8
-  WinGSetDIBColorTable@16 @9
-  WinGStretchBlt@40 @10
index af19e7e..ddd3ca8 100644 (file)
@@ -4,7 +4,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 spec2def(winhttp.dll winhttp.spec)
 
-add_library(winhttp SHARED
+list(APPEND SOURCE
     cookie.c
     handle.c
     main.c
@@ -14,6 +14,8 @@ add_library(winhttp SHARED
     url.c
     ${CMAKE_CURRENT_BINARY_DIR}/winhttp.def)
 
+add_library(winhttp SHARED ${SOURCE})
+
 set_module_type(winhttp win32dll)
 target_link_libraries(winhttp wine)
 add_importlibs(winhttp shlwapi wininet ws2_32 msvcrt crypt32 advapi32 kernel32 ntdll)
diff --git a/dll/win32/winhttp/winhttp.def b/dll/win32/winhttp/winhttp.def
deleted file mode 100644 (file)
index 13913a0..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-
-LIBRARY winhttp.dll
-
-EXPORTS
-  DllCanUnloadNow@0 @1 PRIVATE
-  DllGetClassObject@12 @2 PRIVATE
-  DllRegisterServer@0 @3 PRIVATE
-  DllUnregisterServer@0 @4 PRIVATE
-  WinHttpAddRequestHeaders@16 @5
-  WinHttpCheckPlatform@0 @6
-  WinHttpCloseHandle@4 @7
-  WinHttpConnect@16 @8
-  WinHttpCrackUrl@16 @9
-  WinHttpCreateUrl@16 @10
-  WinHttpDetectAutoProxyConfigUrl@8 @11
-  WinHttpGetDefaultProxyConfiguration@4 @12
-  WinHttpGetIEProxyConfigForCurrentUser@4 @13
-  WinHttpGetProxyForUrl@16 @14
-  WinHttpOpen@20 @15
-  WinHttpOpenRequest@28 @16
-  WinHttpQueryAuthSchemes@16 @17
-  WinHttpQueryDataAvailable@8 @18
-  WinHttpQueryHeaders@24 @19
-  WinHttpQueryOption@16 @20
-  WinHttpReadData@16 @21
-  WinHttpReceiveResponse@8 @22
-  WinHttpSendRequest@28 @23
-  WinHttpSetCredentials@24 @24
-  WinHttpSetDefaultProxyConfiguration@4 @25
-  WinHttpSetOption@16 @26
-  WinHttpSetStatusCallback@16 @27
-  WinHttpSetTimeouts@20 @28
-  WinHttpTimeFromSystemTime@8 @29
-  WinHttpTimeToSystemTime@8 @30
-  WinHttpWriteData@16 @31
index 7b6d5b1..b121222 100644 (file)
@@ -1,12 +1,12 @@
 
-spec2def(winspool.drv winspool.spec)
-
 set_unicode()
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 set_rc_compiler()
 
+spec2def(winspool.drv winspool.spec)
+
 list(APPEND SOURCE
     info.c
     stubs.c
@@ -16,11 +16,9 @@ list(APPEND SOURCE
 add_library(winspool SHARED ${SOURCE})
 
 set_target_properties(winspool PROPERTIES SUFFIX ".drv")
-set_module_type(winspool win32dll)
 
+set_module_type(winspool win32dll)
 target_link_libraries(winspool wine)
-
 add_importlibs(winspool advapi32 shlwapi msvcrt kernel32 ntdll)
-
 add_cab_target(winspool 1)
 add_importlib_target(winspool.spec winspool.drv)
diff --git a/dll/win32/winspool/winspool_winspool.auto.def b/dll/win32/winspool/winspool_winspool.auto.def
deleted file mode 100644 (file)
index 3ae0e19..0000000
+++ /dev/null
@@ -1,197 +0,0 @@
-; File generated automatically from dll\win32\winspool\winspool.spec; do not edit!
-
-LIBRARY winspool.drv
-
-EXPORTS
-  EnumPrinterPropertySheets=__wine_stub_winspool_drv_100 @100 NONAME
-  ClusterSplOpen=__wine_stub_winspool_drv_101 @101 NONAME
-  ClusterSplClose=__wine_stub_winspool_drv_102 @102 NONAME
-  ClusterSplIsAlive=__wine_stub_winspool_drv_103 @103 NONAME
-  PerfClose=__wine_stub_winspool_drv_104 @104
-  PerfCollect=__wine_stub_winspool_drv_105 @105
-  PerfOpen=__wine_stub_winspool_drv_106 @106
-  GetDefaultPrinterA@8 @201
-  SetDefaultPrinterA@4 @202
-  GetDefaultPrinterW@8 @203
-  SetDefaultPrinterW@4 @204
-  SplReadPrinter=__wine_stub_winspool_drv_205 @205 NONAME
-  AddPerMachineConnectionA=__wine_stub_winspool_drv_206 @206 NONAME
-  AddPerMachineConnectionW=__wine_stub_winspool_drv_207 @207 NONAME
-  DeletePerMachineConnectionA=__wine_stub_winspool_drv_208 @208 NONAME
-  DeletePerMachineConnectionW=__wine_stub_winspool_drv_209 @209 NONAME
-  EnumPerMachineConnectionsA=__wine_stub_winspool_drv_210 @210 NONAME
-  EnumPerMachineConnectionsW=__wine_stub_winspool_drv_211 @211 NONAME
-  LoadPrinterDriver=__wine_stub_winspool_drv_212 @212 NONAME
-  RefCntLoadDriver=__wine_stub_winspool_drv_213 @213 NONAME
-  RefCntUnloadDriver=__wine_stub_winspool_drv_214 @214 NONAME
-  ForceUnloadDriver=__wine_stub_winspool_drv_215 @215 NONAME
-  PublishPrinterA=__wine_stub_winspool_drv_216 @216 NONAME
-  PublishPrinterW=__wine_stub_winspool_drv_217 @217 NONAME
-  CallCommonPropertySheetUI=__wine_stub_winspool_drv_218 @218 NONAME
-  PrintUIQueueCreate=__wine_stub_winspool_drv_219 @219 NONAME
-  PrintUIPrinterPropPages=__wine_stub_winspool_drv_220 @220 NONAME
-  PrintUIDocumentDefaults=__wine_stub_winspool_drv_221 @221 NONAME
-  SendRecvBidiData=__wine_stub_winspool_drv_222 @222 NONAME
-  RouterFreeBidiResponseContainer=__wine_stub_winspool_drv_223 @223 NONAME
-  ExternalConnectToLd64In32Server=__wine_stub_winspool_drv_224 @224 NONAME
-  PrintUIWebPnpEntry=__wine_stub_winspool_drv_226 @226 NONAME
-  PrintUIWebPnpPostEntry=__wine_stub_winspool_drv_227 @227 NONAME
-  PrintUICreateInstance=__wine_stub_winspool_drv_228 @228 NONAME
-  PrintUIDocumentPropertiesWrap=__wine_stub_winspool_drv_229 @229 NONAME
-  PrintUIPrinterSetup=__wine_stub_winspool_drv_230 @230 NONAME
-  PrintUIServerPropPages=__wine_stub_winspool_drv_231 @231 NONAME
-  AddDriverCatalog=__wine_stub_winspool_drv_232 @232 NONAME
-  ADVANCEDSETUPDIALOG=__wine_stub_winspool_drv_107 @107
-  AbortPrinter@4 @108
-  AddFormA@12 @109
-  AddFormW@12 @110
-  AddJobA@20 @111
-  AddJobW@20 @112
-  AddMonitorA@12 @113
-  AddMonitorW@12 @114
-  AddPortA@12 @115
-  AddPortExA@16 @116
-  AddPortExW@16 @117
-  AddPortW@12 @118
-  AddPrinterA@12 @119
-  AddPrinterConnectionA@4 @120
-  AddPrinterConnectionW@4 @121
-  AddPrinterDriverA@12 @122
-  AddPrinterDriverExA@16 @123
-  AddPrinterDriverExW@16 @124
-  AddPrinterDriverW@12 @125
-  AddPrinterW@12 @126
-  AddPrintProcessorA@16 @127
-  AddPrintProcessorW@16 @128
-  AddPrintProvidorA@12 @129
-  AddPrintProvidorW@12 @130
-  AdvancedDocumentPropertiesA@20 @131
-  AdvancedDocumentPropertiesW@20 @132
-  AdvancedSetupDialog=__wine_stub_winspool_drv_133 @133
-  ClosePrinter@4 @134
-  CloseSpoolFileHandle=__wine_stub_winspool_drv_135 @135
-  ConfigurePortA@12 @136
-  ConfigurePortW@12 @137
-  ConnectToPrinterDlg@8 @138
-  ConvertAnsiDevModeToUnicodeDevMode=__wine_stub_winspool_drv_139 @139
-  ConvertUnicodeDevModeToAnsiDevMode=__wine_stub_winspool_drv_140 @140
-  CommitSpoolData=__wine_stub_winspool_drv_141 @141
-  CreatePrinterIC=__wine_stub_winspool_drv_142 @142
-  DEVICECAPABILITIES=__wine_stub_winspool_drv_143 @143
-  DEVICEMODE=__wine_stub_winspool_drv_144 @144
-  DeleteFormA@8 @145
-  DeleteFormW@8 @146
-  DeleteMonitorA@12 @147
-  DeleteMonitorW@12 @148
-  DeletePortA@12 @149
-  DeletePortW@12 @150
-  DeletePrinter@4 @151
-  DeletePrinterConnectionA@4 @152
-  DeletePrinterConnectionW@4 @153
-  DeletePrinterDataExA@12 @154
-  DeletePrinterDataExW@12 @155
-  DeletePrinterDataA@8 @156
-  DeletePrinterDataW@8 @157
-  DeletePrinterDriverA@12 @158
-  DeletePrinterDriverExA@20 @159
-  DeletePrinterDriverExW@20 @160
-  DeletePrinterDriverW@12 @161
-  DeletePrinterIC=__wine_stub_winspool_drv_162 @162
-  DevQueryPrint=__wine_stub_winspool_drv_163 @163
-  DeletePrintProcessorA@12 @164
-  DeletePrintProcessorW@12 @165
-  DeletePrintProvidorA@12 @166
-  DeletePrintProvidorW@12 @167
-  DeviceCapabilitiesA@20 @168
-  DeviceCapabilitiesW@20 @169
-  DeviceMode=__wine_stub_winspool_drv_170 @170
-  DocumentEvent=__wine_stub_winspool_drv_171 @171
-  DllMain@12 @172
-  DocumentPropertiesA@24 @173
-  DocumentPropertiesW@24 @174
-  EXTDEVICEMODE=__wine_stub_winspool_drv_175 @175
-  EndDocPrinter@4 @176
-  EndPagePrinter@4 @177
-  EnumFormsA@24 @178
-  EnumFormsW@24 @179
-  EnumJobsA@32 @180
-  EnumJobsW@32 @181
-  EnumMonitorsA@24 @182
-  EnumMonitorsW@24 @183
-  EnumPortsA@24 @184
-  EnumPortsW@24 @185
-  EnumPrinterDataA@36 @186
-  EnumPrinterDataExA@24 @187
-  EnumPrinterDataExW@24 @188
-  EnumPrinterDataW@36 @189
-  EnumPrinterDriversA@28 @190
-  EnumPrinterDriversW@28 @191
-  EnumPrintersA@28 @192
-  EnumPrintersW@28 @193
-  EnumPrinterKeyA@20 @194
-  EnumPrinterKeyW@20 @195
-  ExtDeviceMode@32 @196
-  EnumPrintProcessorDatatypesA@28 @197
-  EnumPrintProcessorDatatypesW@28 @198
-  EnumPrintProcessorsA@28 @199
-  EnumPrintProcessorsW@28 @200
-  FindClosePrinterChangeNotification@4 @225
-  FindFirstPrinterChangeNotification@16 @233
-  FindNextPrinterChangeNotification@16 @234
-  FreePrinterNotifyInfo@4 @235
-  GetFormA@24 @236
-  GetFormW@24 @237
-  GetJobA@24 @238
-  GetJobW@24 @239
-  GetPrinterA@20 @240
-  GetPrinterDataA@24 @241
-  GetPrinterDataExA@28 @242
-  GetPrinterDataExW@28 @243
-  GetPrinterDataW@24 @244
-  GetPrinterDriverA@24 @245
-  GetPrinterDriverDirectoryA@24 @246
-  GetPrinterDriverDirectoryW@24 @247
-  GetPrinterDriverW@24 @248
-  GetPrinterW@20 @249
-  GetPrintProcessorDirectoryA@24 @250
-  GetPrintProcessorDirectoryW@24 @251
-  GetSpoolFileHandle=__wine_stub_winspool_drv_252 @252
-  IsValidDevmodeA=__wine_stub_winspool_drv_253 @253
-  IsValidDevmodeW=__wine_stub_winspool_drv_254 @254
-  OpenPrinterA@12 @255
-  OpenPrinterW@12 @256
-  PlayGdiScriptOnPrinterIC=__wine_stub_winspool_drv_257 @257
-  PrinterMessageBoxA@24 @258
-  PrinterMessageBoxW@24 @259
-  PrinterProperties@8 @260
-  QueryColorProfile=__wine_stub_winspool_drv_261 @261
-  QuerySpoolMode=__wine_stub_winspool_drv_262 @262
-  QueryRemoteFonts=__wine_stub_winspool_drv_263 @263
-  ReadPrinter@16 @264
-  ResetPrinterA@8 @265
-  ResetPrinterW@8 @266
-  ScheduleJob@8 @267
-  SeekPrinter=__wine_stub_winspool_drv_268 @268
-  SetAllocFailCount=__wine_stub_winspool_drv_269 @269
-  SetFormA@16 @270
-  SetFormW@16 @271
-  SetJobA@20 @272
-  SetJobW@20 @273
-  SetPrinterA@16 @274
-  SetPrinterDataA@20 @275
-  SetPrinterDataExA@24 @276
-  SetPrinterDataExW@24 @277
-  SetPrinterDataW@20 @278
-  SetPrinterW@16 @279
-  SplDriverUnloadComplete=__wine_stub_winspool_drv_280 @280
-  SpoolerDevQueryPrintW=__wine_stub_winspool_drv_281 @281
-  SpoolerInit@0 @282
-  SpoolerPrinterEvent=__wine_stub_winspool_drv_283 @283
-  StartDocDlgA=__wine_stub_winspool_drv_284 @284
-  StartDocDlgW=__wine_stub_winspool_drv_285 @285
-  StartDocPrinterA@12 @286
-  StartDocPrinterW@12 @287
-  StartPagePrinter@4 @288
-  WaitForPrinterChange@8 @289
-  WritePrinter@16 @290
-  XcvDataW@32 @291
diff --git a/dll/win32/winspool/winspool_winspool.stubs.c b/dll/win32/winspool/winspool_winspool.stubs.c
deleted file mode 100644 (file)
index 6d088da..0000000
+++ /dev/null
@@ -1,82 +0,0 @@
-/* File generated automatically from dll\win32\winspool\winspool.spec; do not edit! */
-/* This file can be copied, modified and distributed without restriction. */
-
-#include <stdarg.h>
-#include "windef.h"
-#include "winbase.h"
-#include "wine/config.h"
-#include "wine/exception.h"
-
-void __wine_spec_unimplemented_stub( const char *module, const char *function )
-{
-    ULONG_PTR args[2];
-
-    args[0] = (ULONG_PTR)module;
-    args[1] = (ULONG_PTR)function;
-    RaiseException( EXCEPTION_WINE_STUB, EH_NONCONTINUABLE, 2, args );
-}
-
-static const char __wine_spec_file_name[] = "winspool.drv";
-
-void __wine_stub_winspool_drv_100(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "EnumPrinterPropertySheets"); }
-void __wine_stub_winspool_drv_101(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "ClusterSplOpen"); }
-void __wine_stub_winspool_drv_102(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "ClusterSplClose"); }
-void __wine_stub_winspool_drv_103(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "ClusterSplIsAlive"); }
-void __wine_stub_winspool_drv_104(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "PerfClose"); }
-void __wine_stub_winspool_drv_105(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "PerfCollect"); }
-void __wine_stub_winspool_drv_106(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "PerfOpen"); }
-void __wine_stub_winspool_drv_205(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "SplReadPrinter"); }
-void __wine_stub_winspool_drv_206(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "AddPerMachineConnectionA"); }
-void __wine_stub_winspool_drv_207(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "AddPerMachineConnectionW"); }
-void __wine_stub_winspool_drv_208(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "DeletePerMachineConnectionA"); }
-void __wine_stub_winspool_drv_209(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "DeletePerMachineConnectionW"); }
-void __wine_stub_winspool_drv_210(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "EnumPerMachineConnectionsA"); }
-void __wine_stub_winspool_drv_211(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "EnumPerMachineConnectionsW"); }
-void __wine_stub_winspool_drv_212(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "LoadPrinterDriver"); }
-void __wine_stub_winspool_drv_213(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "RefCntLoadDriver"); }
-void __wine_stub_winspool_drv_214(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "RefCntUnloadDriver"); }
-void __wine_stub_winspool_drv_215(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "ForceUnloadDriver"); }
-void __wine_stub_winspool_drv_216(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "PublishPrinterA"); }
-void __wine_stub_winspool_drv_217(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "PublishPrinterW"); }
-void __wine_stub_winspool_drv_218(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "CallCommonPropertySheetUI"); }
-void __wine_stub_winspool_drv_219(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "PrintUIQueueCreate"); }
-void __wine_stub_winspool_drv_220(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "PrintUIPrinterPropPages"); }
-void __wine_stub_winspool_drv_221(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "PrintUIDocumentDefaults"); }
-void __wine_stub_winspool_drv_222(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "SendRecvBidiData"); }
-void __wine_stub_winspool_drv_223(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "RouterFreeBidiResponseContainer"); }
-void __wine_stub_winspool_drv_224(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "ExternalConnectToLd64In32Server"); }
-void __wine_stub_winspool_drv_226(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "PrintUIWebPnpEntry"); }
-void __wine_stub_winspool_drv_227(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "PrintUIWebPnpPostEntry"); }
-void __wine_stub_winspool_drv_228(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "PrintUICreateInstance"); }
-void __wine_stub_winspool_drv_229(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "PrintUIDocumentPropertiesWrap"); }
-void __wine_stub_winspool_drv_230(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "PrintUIPrinterSetup"); }
-void __wine_stub_winspool_drv_231(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "PrintUIServerPropPages"); }
-void __wine_stub_winspool_drv_232(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "AddDriverCatalog"); }
-void __wine_stub_winspool_drv_107(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "ADVANCEDSETUPDIALOG"); }
-void __wine_stub_winspool_drv_133(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "AdvancedSetupDialog"); }
-void __wine_stub_winspool_drv_135(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "CloseSpoolFileHandle"); }
-void __wine_stub_winspool_drv_139(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "ConvertAnsiDevModeToUnicodeDevMode"); }
-void __wine_stub_winspool_drv_140(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "ConvertUnicodeDevModeToAnsiDevMode"); }
-void __wine_stub_winspool_drv_141(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "CommitSpoolData"); }
-void __wine_stub_winspool_drv_142(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "CreatePrinterIC"); }
-void __wine_stub_winspool_drv_143(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "DEVICECAPABILITIES"); }
-void __wine_stub_winspool_drv_144(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "DEVICEMODE"); }
-void __wine_stub_winspool_drv_162(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "DeletePrinterIC"); }
-void __wine_stub_winspool_drv_163(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "DevQueryPrint"); }
-void __wine_stub_winspool_drv_170(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "DeviceMode"); }
-void __wine_stub_winspool_drv_171(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "DocumentEvent"); }
-void __wine_stub_winspool_drv_175(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "EXTDEVICEMODE"); }
-void __wine_stub_winspool_drv_252(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "GetSpoolFileHandle"); }
-void __wine_stub_winspool_drv_253(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "IsValidDevmodeA"); }
-void __wine_stub_winspool_drv_254(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "IsValidDevmodeW"); }
-void __wine_stub_winspool_drv_257(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "PlayGdiScriptOnPrinterIC"); }
-void __wine_stub_winspool_drv_261(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "QueryColorProfile"); }
-void __wine_stub_winspool_drv_262(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "QuerySpoolMode"); }
-void __wine_stub_winspool_drv_263(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "QueryRemoteFonts"); }
-void __wine_stub_winspool_drv_268(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "SeekPrinter"); }
-void __wine_stub_winspool_drv_269(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "SetAllocFailCount"); }
-void __wine_stub_winspool_drv_280(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "SplDriverUnloadComplete"); }
-void __wine_stub_winspool_drv_281(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "SpoolerDevQueryPrintW"); }
-void __wine_stub_winspool_drv_283(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "SpoolerPrinterEvent"); }
-void __wine_stub_winspool_drv_284(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "StartDocDlgA"); }
-void __wine_stub_winspool_drv_285(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "StartDocDlgW"); }
index 8408415..c4c04d4 100644 (file)
@@ -1,4 +1,6 @@
 
+spec2def(winsta.dll winsta.spec)
+
 list(APPEND SOURCE
     logon.c
     main.c
@@ -8,21 +10,14 @@ list(APPEND SOURCE
     server.c
     ws.c
     winsta.rc
-    winsta.def)
-
-if(NOT MSVC)
-    set_source_files_properties(winsta.def PROPERTIES EXTERNAL_OBJECT TRUE)
-endif()
+    ${CMAKE_CURRENT_BINARY_DIR}/winsta.def)
 
 add_library(winsta SHARED
     ${CMAKE_CURRENT_BINARY_DIR}/winsta_winsta.h.gch
     ${SOURCE})
     
 set_module_type(winsta win32dll)
-
 target_link_libraries(winsta wine)
-
 add_importlibs(winsta msvcrt kernel32 ntdll)
 add_pch(winsta ${CMAKE_CURRENT_SOURCE_DIR}/winsta.h ${SOURCE})
-
 add_cab_target(winsta 1)
diff --git a/dll/win32/winsta/winsta.def b/dll/win32/winsta/winsta.def
deleted file mode 100644 (file)
index e063385..0000000
+++ /dev/null
@@ -1,124 +0,0 @@
-
-LIBRARY winsta.dll
-
-EXPORTS
-  LogonIdFromWinStationNameA@12 @1
-  LogonIdFromWinStationNameW@12 @2
-  RemoteAssistancePrepareSystemRestore@4 @3
-  ServerGetInternetConnectorStatus@12 @4
-  ServerLicensingClose@4 @5
-  ServerLicensingDeactivateCurrentPolicy@4 @6
-  ServerLicensingFreePolicyInformation@4 @7
-  ServerLicensingGetAvailablePolicyIds@12 @8
-  ServerLicensingGetPolicy@8 @9
-  ServerLicensingGetPolicyInformationA@16 @10
-  ServerLicensingGetPolicyInformationW@16 @11
-  ServerLicensingLoadPolicy@8 @12
-  ServerLicensingOpenA@4 @13
-  ServerLicensingOpenW@4 @14
-  ServerLicensingSetPolicy@12 @15
-  ServerLicensingUnloadPolicy@8 @16
-  ServerQueryInetConnectorInformationA@16 @17
-  ServerQueryInetConnectorInformationW@16 @18
-  ServerSetInternetConnectorStatus@12 @19
-  WinStationActivateLicense@16 @20
-  WinStationAutoReconnect@4 @21
-  WinStationBroadcastSystemMessage@40 @22
-  WinStationCheckAccess@12 @23
-  WinStationCheckLoopBack@16 @24
-  WinStationCloseServer@16 @25
-  WinStationConnectA@4 @26
-  WinStationConnectCallback@20 @27
-  WinStationConnectEx@8 @28
-  WinStationConnectW@20 @29
-  WinStationDisconnect@12 @30
-  WinStationDynVirtualChanRead@20 @31
-  WinStationDynVirtualChanWrite@16 @32
-  WinStationEnumerateA@12 @33
-  WinStationEnumerateLicenses@12 @34
-  WinStationEnumerateProcesses@8 @35
-  WinStationEnumerateW@12 @36
-  WinStationEnumerate_IndexedA@20 @37
-  WinStationEnumerate_IndexedW@20 @38
-  WinStationFreeGAPMemory@12 @39
-  WinStationFreeMemory@4 @40
-  WinStationFreeUserCertificates@4 @41
-  WinStationFreeUserCredentials@4 @42
-  WinStationGenerateLicense@16 @43
-  WinStationGetAllProcesses@16 @44
-  WinStationGetConnectionProperty@12 @45
-  WinStationGetInitialApplication@20 @46
-  WinStationGetLanAdapterNameA@24 @47
-  WinStationGetLanAdapterNameW@24 @48
-  WinStationGetLoggedOnCount@8 @49
-  WinStationGetMachinePolicy@8 @50
-  WinStationGetProcessSid@24 @51
-  WinStationGetTermSrvCountersValue@12 @52
-  WinStationGetUserCertificates@4 @53
-  WinStationGetUserCredentials@4 @54
-  WinStationGetUserProfile@16 @55
-  WinStationInstallLicense@12 @56
-  WinStationIsHelpAssistantSession@8 @57
-  WinStationIsSessionPermitted@0 @58
-  WinStationNameFromLogonIdA@12 @59
-  WinStationNameFromLogonIdW@12 @60
-  WinStationNtsdDebug@20 @61
-  WinStationOpenServerA@4 @62
-  WinStationOpenServerW@4 @63
-  WinStationQueryAllowConcurrentConnections@0 @64
-  WinStationQueryEnforcementCore@24 @65
-  WinStationQueryInformationA@24 @66
-  WinStationQueryInformationW@24 @67
-  WinStationQueryLicense@12 @68
-  WinStationQueryLogonCredentialsW@4 @69
-  WinStationQueryUpdateRequired@8 @70
-  WinStationRegisterConsoleNotification@12 @71
-  WinStationRegisterConsoleNotificationEx@16 @72
-  WinStationRegisterNotificationEvent@16 @73
-  WinStationRemoveLicense@12 @74
-  WinStationRenameA@12 @75
-  WinStationRenameW@12 @76
-  WinStationRequestSessionsList@12 @77
-  WinStationReset@12 @78
-  WinStationSendMessageA@40 @79
-  WinStationSendMessageW@40 @80
-  WinStationSendWindowMessage@32 @81
-  WinStationServerPing@4 @82
-  WinStationSetInformationA@20 @83
-  WinStationSetInformationW@20 @84
-  WinStationSetPoolCount@12 @85
-  WinStationShadow@20 @86
-  WinStationShadowStop@12 @87
-  WinStationShutdownSystem@8 @88
-  WinStationSwitchToServicesSession@0 @89
-  WinStationSystemShutdownStarted@0 @90
-  WinStationSystemShutdownWait@8 @91
-  WinStationTerminateProcess@12 @92
-  WinStationUnRegisterConsoleNotification@8 @93
-  WinStationUnRegisterNotificationEvent@4 @94
-  WinStationUserLoginAccessCheck@16 @95
-  WinStationVirtualOpen@12 @96
-  WinStationVirtualOpenEx@16 @97
-  WinStationWaitSystemEvent@12 @98
-  _NWLogonQueryAdmin@12 @99
-  _NWLogonSetAdmin@12 @100
-  _WinStationAnnoyancePopup@8 @101
-  _WinStationBeepOpen@12 @102
-  _WinStationBreakPoint@12 @103
-  _WinStationCallback@12 @104
-  _WinStationCheckForApplicationName@48 @105
-  _WinStationFUSCanRemoteUserDisconnect@12 @106
-  _WinStationGetApplicationInfo@16 @107
-  _WinStationNotifyDisconnectPipe@0 @108
-  _WinStationNotifyLogoff@0 @109
-  _WinStationNotifyLogon@32 @110
-  _WinStationNotifyNewSession@8 @111
-  _WinStationReInitializeSecurity@4 @112
-  _WinStationReadRegistry@4 @113
-  _WinStationSessionInitialized@0 @114
-  _WinStationShadowTarget@40 @115
-  _WinStationShadowTargetSetup@8 @116
-  _WinStationUpdateClientCachedCredentials@28 @117
-  _WinStationUpdateSettings@12 @118
-  _WinStationUpdateUserConfig@4 @119
-  _WinStationWaitForConnect@0 @120
index f356dc0..3d643a0 100644 (file)
@@ -1,13 +1,14 @@
 
-add_library(wmi SHARED wmi.rc wmi.def)
+spec2def(wmi.dll wmi.spec)
 
-if(NOT MSVC)
-    set_source_files_properties(wmi.def PROPERTIES EXTERNAL_OBJECT TRUE)
-endif()
+list(APPEND SOURCE
+    wmi.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/wmi.def)
+
+add_library(wmi SHARED ${SOURCE})
 
 set_entrypoint(wmi 0)
 
 add_importlibs(wmi advapi32)
 add_dependencies(wmi psdk buildno_header)
-
-add_cab_target(wmi 1)
\ No newline at end of file
+add_cab_target(wmi 1)
diff --git a/dll/win32/wmi/wmi.def b/dll/win32/wmi/wmi.def
deleted file mode 100644 (file)
index ac15dae..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-
-LIBRARY wmi.dll
-
-EXPORTS
-  CloseTrace@4=advapi32.CloseTrace @1
-  ControlTraceA@16=advapi32.ControlTraceA @2
-  ControlTraceW@16=advapi32.ControlTraceW @3
-  CreateTraceInstanceId@8=advapi32.CreateTraceInstanceId @4
-  EnableTrace@20=advapi32.EnableTrace @5
-  GetTraceEnableFlags@4=advapi32.GetTraceEnableFlags @6
-  GetTraceEnableLevel@4=advapi32.GetTraceEnableLevel @7
-  GetTraceLoggerHandle@4=advapi32.GetTraceLoggerHandle @8
-  OpenTraceA@4=advapi32.OpenTraceA @9
-  OpenTraceW@4=advapi32.OpenTraceW @10
-  ProcessTrace@16=advapi32.ProcessTrace @11
-  QueryAllTracesA@12=advapi32.QueryAllTracesA @12
-  QueryAllTracesW@12=advapi32.QueryAllTracesW @13
-  RegisterTraceGuidsA@32=advapi32.RegisterTraceGuidsA @14
-  RegisterTraceGuidsW@32=advapi32.RegisterTraceGuidsW @15
-  RemoveTraceCallback@4=advapi32.RemoveTraceCallback @16
-  SetTraceCallback@8=advapi32.SetTraceCallback @17
-  StartTraceA@12=advapi32.StartTraceA @18
-  StartTraceW@12=advapi32.StartTraceW @19
-  TraceEvent@8=advapi32.TraceEvent @20
-  TraceEventInstance@16=advapi32.TraceEventInstance @21
-  UnregisterTraceGuids@4=advapi32.UnregisterTraceGuids @22
-  WmiCloseBlock@0=advapi32.WmiCloseBlock @23
-  WmiDevInstToInstanceNameA@0=advapi32.WmiDevInstToInstanceNameA @24
-  WmiDevInstToInstanceNameW@0=advapi32.WmiDevInstToInstanceNameW @25
-  WmiEnumerateGuids@0=advapi32.WmiEnumerateGuids @26
-  WmiExecuteMethodA@0=advapi32.WmiExecuteMethodA @27
-  WmiExecuteMethodW@0=advapi32.WmiExecuteMethodW @28
-  WmiFileHandleToInstanceNameA@0=advapi32.WmiFileHandleToInstanceNameA @29
-  WmiFileHandleToInstanceNameW@0=advapi32.WmiFileHandleToInstanceNameW @30
-  WmiFreeBuffer@0=advapi32.WmiFreeBuffer @31
-  WmiMofEnumerateResourcesA@0=advapi32.WmiMofEnumerateResourcesA @32
-  WmiMofEnumerateResourcesW@0=advapi32.WmiMofEnumerateResourcesW @33
-  WmiNotificationRegistrationA@0=advapi32.WmiNotificationRegistrationA @34
-  WmiNotificationRegistrationW@0=advapi32.WmiNotificationRegistrationW @35
-  WmiOpenBlock@0=advapi32.WmiOpenBlock @36
-  WmiQueryAllDataA@0=advapi32.WmiQueryAllDataA @37
-  WmiQueryAllDataW@0=advapi32.WmiQueryAllDataW @38
-  WmiQueryGuidInformation@0=advapi32.WmiQueryGuidInformation @39
-  WmiQuerySingleInstanceA@0=advapi32.WmiQuerySingleInstanceA @40
-  WmiQuerySingleInstanceW@0=advapi32.WmiQuerySingleInstanceW @41
-  WmiSetSingleInstanceA@0=advapi32.WmiSetSingleInstanceA @42
-  WmiSetSingleInstanceW@0=advapi32.WmiSetSingleInstanceW @43
-  WmiSetSingleItemA@0=advapi32.WmiSetSingleItemA @44
-  WmiSetSingleItemW@0=advapi32.WmiSetSingleItemW @45
index d1b05a4..bf03fb4 100644 (file)
@@ -5,7 +5,9 @@ include_directories(
     inc
     ${REACTOS_SOURCE_DIR}/include/reactos/winsock)
 
-add_library(ws2_32_new SHARED
+spec2def(ws2_32_new.dll ws2_32.spec)
+
+list(APPEND SOURCE
     src/addrconv.c
     src/addrinfo.c
     src/async.c
@@ -43,16 +45,11 @@ add_library(ws2_32_new SHARED
     src/startup.c
     src/wsautil.c
     ws2_32.rc
-    ws2_32.def)
+    ${CMAKE_CURRENT_BINARY_DIR}/ws2_32.def)
 
-if(NOT MSVC)
-    set_source_files_properties(ws2_32.def PROPERTIES EXTERNAL_OBJECT TRUE)
-endif()
+add_library(ws2_32_new SHARED ${SOURCE})
 
 set_module_type(ws2_32_new win32dll)
-
 target_link_libraries(ws2_32_new wine)
-
 add_importlibs(ws2_32_new user32 advapi32 dnsapi ws2help msvcrt kernel32 ntdll)
-
 add_cab_target(ws2_32_new 1)
diff --git a/dll/win32/ws2_32_new/ws2_32.def b/dll/win32/ws2_32_new/ws2_32.def
deleted file mode 100644 (file)
index 2b3f8a3..0000000
+++ /dev/null
@@ -1,121 +0,0 @@
-
-LIBRARY ws2_32_new.dll
-
-EXPORTS
-  WEP@0 @500
-  WPUCompleteOverlappedRequest@20 @24
-  WSAAccept@20 @25
-  WSAAddressToStringA@20 @26
-  WSAAddressToStringW@20 @27
-  WSAAsyncGetHostByAddr@28 @102
-  WSAAsyncGetHostByName@20 @103
-  WSAAsyncGetProtoByName@20 @105
-  WSAAsyncGetProtoByNumber@20 @104
-  WSAAsyncGetServByName@24 @107
-  WSAAsyncGetServByPort@24 @106
-  WSAAsyncSelect@16 @101
-  WSACancelAsyncRequest@4 @108
-  WSACancelBlockingCall@0 @113
-  WSACleanup@0 @116
-  WSACloseEvent@4 @28
-  WSAConnect@28 @29
-  WSACreateEvent@0 @30
-  WSADuplicateSocketA@12 @31
-  WSADuplicateSocketW@12 @32
-  WSAEnumNameSpaceProvidersA@8 @33
-  WSAEnumNameSpaceProvidersW@8 @34
-  WSAEnumNetworkEvents@12 @35
-  WSAEnumProtocolsA@12 @36
-  WSAEnumProtocolsW@12 @37
-  WSAEventSelect@12 @38
-  WSAGetLastError@0 @111
-  WSAGetOverlappedResult@20 @39
-  WSAGetQOSByName@12 @40
-  WSAGetServiceClassInfoA@16 @41
-  WSAGetServiceClassInfoW@16 @42
-  WSAGetServiceClassNameByClassIdA@12 @43
-  WSAGetServiceClassNameByClassIdW@12 @44
-  WSAHtonl@12 @45
-  WSAHtons@12 @46
-  WSAInstallServiceClassA@4 @47
-  WSAInstallServiceClassW@4 @48
-  WSAIoctl@36 @49
-  WSAIsBlocking@0 @114
-  WSAJoinLeaf@32 @50
-  WSALookupServiceBeginA@12 @58
-  WSALookupServiceBeginW@12 @59
-  WSALookupServiceEnd@4 @60
-  WSALookupServiceNextA@16 @61
-  WSALookupServiceNextW@16 @62
-  WSANSPIoctl@32 @63
-  WSANtohl@12 @64
-  WSANtohs@12 @65
-  WSAProviderConfigChange@12 @66
-  WSARecv@28 @67
-  WSARecvDisconnect@8 @68
-  WSARecvFrom@36 @69
-  WSARemoveServiceClass@4 @70
-  WSAResetEvent@4 @71
-  WSASend@28 @72
-  WSASendDisconnect@8 @73
-  WSASendTo@36 @74
-  WSASetBlockingHook@4 @109
-  WSASetEvent@4 @75
-  WSASetLastError@4 @112
-  WSASetServiceA@12 @76
-  WSASetServiceW@12 @77
-  WSASocketA@24 @78
-  WSASocketW@24 @79
-  WSAStartup@8 @115
-  WSAStringToAddressA@20 @80
-  WSAStringToAddressW@20 @81
-  WSAUnhookBlockingHook@0 @110
-  WSAWaitForMultipleEvents@20 @82
-  WSApSetPostRoutine@4 @83
-  FreeAddrInfoW@4=freeaddrinfo@4 @84
-  WSCDeinstallProvider@8 @85
-  WSCEnableNSProvider@8 @86
-  WSCEnumProtocols@16 @87
-  WSCGetProviderPath@16 @88
-  WSCInstallNameSpace@20 @89
-  WSCInstallProvider@20 @90
-  WSCUnInstallNameSpace@4 @91
-  WSCUpdateProvider@20 @92
-  WSCWriteNameSpaceOrder@8 @93
-  WSCWriteProviderOrder@8 @94
-  __WSAFDIsSet@8 @151
-  accept@12 @1
-  bind@12 @2
-  closesocket@4 @3
-  connect@12 @4
-  freeaddrinfo@4 @95
-  getaddrinfo@16 @96
-  gethostbyaddr@12 @51
-  gethostbyname@4 @52
-  gethostname@8 @57
-  getnameinfo@28 @97
-  getpeername@12 @5
-  getprotobyname@4 @53
-  getprotobynumber@4 @54
-  getservbyname@8 @55
-  getservbyport@8 @56
-  getsockname@12 @6
-  getsockopt@20 @7
-  htonl@4 @8
-  htons@4 @9
-  inet_addr@4 @11
-  inet_ntoa@4 @12
-  ioctlsocket@12 @10
-  listen@8 @13
-  ntohl@4 @14
-  ntohs@4 @15
-  recv@16 @16
-  recvfrom@24 @17
-  select@20 @18
-  send@16 @19
-  sendto@24 @20
-  setsockopt@20 @21
-  shutdown@8 @22
-  socket@12 @23
-  GetAddrInfoW@16 @98
-  GetNameInfoW@28 @99
index 192fadf..15c4c2a 100644 (file)
@@ -1,9 +1,9 @@
 
-spec2def(ws2help.dll ws2help.spec)
-
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/winsock)
 
-add_library(ws2help SHARED
+spec2def(ws2help.dll ws2help.spec)
+
+list(APPEND SOURCE
     apc.c
     context.c
     dllmain.c
@@ -11,9 +11,9 @@ add_library(ws2help SHARED
     notify.c
     ${CMAKE_CURRENT_BINARY_DIR}/ws2help.def)
 
-set_module_type(ws2help win32dll)
+add_library(ws2help SHARED ${SOURCE})
 
+set_module_type(ws2help win32dll)
 add_importlibs(ws2help advapi32 ws2_32 msvcrt kernel32 ntdll)
-
 add_cab_target(ws2help 1)
 add_importlib_target(ws2help.spec)
diff --git a/dll/win32/ws2help/ws2help.def b/dll/win32/ws2help/ws2help.def
deleted file mode 100644 (file)
index 27721fb..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-
-LIBRARY ws2help.dll
-
-EXPORTS
-  WahCloseApcHelper@4 @1
-  WahCloseHandleHelper@4 @2
-  WahCloseNotificationHandleHelper@4 @3
-  WahCloseSocketHandle@8 @4
-  WahCloseThread@8 @5
-  WahCompleteRequest@20 @6
-  WahCreateHandleContextTable@4 @7
-  WahCreateNotificationHandle@8 @8
-  WahCreateSocketHandle@8 @9
-  WahDestroyHandleContextTable@4 @10
-  WahDisableNonIFSHandleSupport@0 @11
-  WahEnableNonIFSHandleSupport@0 @12
-  WahEnumerateHandleContexts@12 @13
-  WahInsertHandleContext@8 @14
-  WahNotifyAllProcesses@4 @15
-  WahOpenApcHelper@4 @16
-  WahOpenCurrentThread@8 @17
-  WahOpenHandleHelper@4 @18
-  WahOpenNotificationHandleHelper@4 @19
-  WahQueueUserApc@16 @20
-  WahReferenceContextByHandle@8 @21
-  WahRemoveHandleContext@8 @22
-  WahWaitForNotification@16 @23
index 7adc9b3..ca6ab12 100644 (file)
@@ -1,14 +1,15 @@
 
 set_unicode()
 
-add_library(wshirda SHARED wshirda.c wshirda.rc wshirda.def)
+spec2def(wshirda.dll wshirda.spec)
 
-if(NOT MSVC)
-    set_source_files_properties(wshirda.def PROPERTIES EXTERNAL_OBJECT TRUE)
-endif()
+list(APPEND SOURCE
+    wshirda.c
+    wshirda.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/wshirda.def)
 
-set_module_type(wshirda win32dll)
+add_library(wshirda SHARED ${SOURCE})
 
+set_module_type(wshirda win32dll)
 add_importlibs(wshirda ws2_32 msvcrt kernel32 ntdll)
-
 add_cab_target(wshirda 1)
diff --git a/dll/win32/wshirda/wshirda.def b/dll/win32/wshirda/wshirda.def
deleted file mode 100644 (file)
index a1d6666..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-
-LIBRARY wshirda.dll
-
-EXPORTS
-  WSHEnumProtocols@16 @1
-  WSHGetProviderGuid@8 @2
-  WSHGetSockaddrType@12 @3
-  WSHGetSocketInformation@32 @4
-  WSHGetWSAProtocolInfo@12 @5
-  WSHGetWildcardSockaddr@12 @6
-  WSHGetWinsockMapping@8 @7
-  WSHIoctl@52 @8
-  WSHNotify@20 @9
-  WSHOpenSocket@24 @10
-  WSHSetSocketInformation@32 @11
index 28cc35d..5320680 100644 (file)
@@ -3,17 +3,18 @@ set_unicode()
 
 include_directories(${REACTOS_SOURCE_DIR}/lib/tdilib)
 
-add_library(wshtcpip SHARED wshtcpip.c wshtcpip.rc wshtcpip.def)
+spec2def(wshtcpip.dll wshtcpip.spec)
 
-if(NOT MSVC)
-    set_source_files_properties(wshtcpip.def PROPERTIES EXTERNAL_OBJECT TRUE)
-endif()
+list(APPEND SOURCE
+    wshtcpip.c
+    wshtcpip.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/wshtcpip.def)
+
+add_library(wshtcpip SHARED ${SOURCE})
 
 set_entrypoint(wshtcpip 0)
 
 target_link_libraries(wshtcpip tdilib)
-
 add_importlibs(wshtcpip ws2_32 kernel32 ntdll)
 add_dependencies(wshtcpip psdk buildno_header)
-
-add_cab_target(wshtcpip 1)
\ No newline at end of file
+add_cab_target(wshtcpip 1)
diff --git a/dll/win32/wshtcpip/wshtcpip.def b/dll/win32/wshtcpip/wshtcpip.def
deleted file mode 100644 (file)
index 8dc0e3b..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-
-LIBRARY wshtcpip.dll
-
-EXPORTS
-  WSHAddressToString@20 @1
-  WSHEnumProtocols@16 @2
-  WSHGetBroadcastSockaddr@12 @3
-  WSHGetProviderGuid@8 @4
-  WSHGetSockaddrType@12 @5
-  WSHGetSocketInformation@32 @6
-  WSHGetWildcardSockaddr@12 @7
-  WSHGetWinsockMapping@8 @8
-  WSHGetWSAProtocolInfo@12 @9
-  WSHIoctl@52 @10
-  WSHJoinLeaf@52 @11
-  WSHNotify@20 @12
-  WSHOpenSocket@24 @13
-  WSHOpenSocket2@32 @14
-  WSHSetSocketInformation@32 @15
-  WSHStringToAddress@20 @16
index 9d59f78..e54ef79 100644 (file)
@@ -6,7 +6,9 @@ add_definitions(-D_WIN32_WINNT=0x600)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-add_library(wuapi SHARED
+spec2def(wuapi.dll wuapi.spec)
+
+list(APPEND SOURCE
     downloader.c
     installer.c
     main.c
@@ -14,18 +16,11 @@ add_library(wuapi SHARED
     searcher.c
     session.c
     updates.c
-    wuapi.def)
+    ${CMAKE_CURRENT_BINARY_DIR}/wuapi.def)
 
-if(NOT MSVC)
-    set_source_files_properties(wuapi.def PROPERTIES EXTERNAL_OBJECT TRUE)
-endif()
+add_library(wuapi SHARED ${SOURCE})
 
 set_module_type(wuapi win32dll)
-
-target_link_libraries(wuapi
-    wine
-    uuid)
-
+target_link_libraries(wuapi uuid wine)
 add_importlibs(wuapi ole32 advapi32 msvcrt kernel32 ntdll)
-
 add_cab_target(wuapi 1)
diff --git a/dll/win32/wuapi/wuapi.def b/dll/win32/wuapi/wuapi.def
deleted file mode 100644 (file)
index be1e1a9..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-
-LIBRARY wuapi.dll
-
-EXPORTS
-  DllCanUnloadNow@0 @1 PRIVATE
-  DllGetClassObject@12 @2 PRIVATE
-  DllRegisterServer@0 @3 PRIVATE
-  DllUnregisterServer@0 @4 PRIVATE
index c6a6445..21cd477 100644 (file)
@@ -2,14 +2,15 @@
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-add_library(xinput1_1 SHARED xinput1_1_main.c version.rc xinput1_1.def)
+spec2def(xinput1_1.dll xinput1_1.spec)
 
-if(NOT MSVC)
-    set_source_files_properties(xinput1_1.def PROPERTIES EXTERNAL_OBJECT TRUE)
-endif()
+list(APPEND SOURCE
+    xinput1_1_main.c
+    version.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/xinput1_1.def)
 
-set_module_type(xinput1_1 win32dll)
+add_library(xinput1_1 SHARED ${SOURCE})
 
+set_module_type(xinput1_1 win32dll)
 add_importlibs(xinput1_1 msvcrt kernel32)
-
 add_cab_target(xinput1_1 1)
diff --git a/dll/win32/xinput1_1/xinput1_1.def b/dll/win32/xinput1_1/xinput1_1.def
deleted file mode 100644 (file)
index 99b6698..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-
-LIBRARY xinput1_1.dll
-
-EXPORTS
-  XInputEnable@4=xinput1_3.XInputEnable @1
-  XInputGetCapabilities@12=xinput1_3.XInputGetCapabilities @2
-  XInputGetDSoundAudioDeviceGuids@12=xinput1_3.XInputGetDSoundAudioDeviceGuids @3
-  XInputSetState@8=xinput1_3.XInputSetState @4
-  XInputGetState@8=xinput1_3.XInputGetState @5
index 13d0c15..91ab389 100644 (file)
@@ -2,14 +2,15 @@
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-add_library(xinput1_2 SHARED xinput1_2_main.c version.rc xinput1_2.def)
+spec2def(xinput1_2.dll xinput1_2.spec)
 
-if(NOT MSVC)
-    set_source_files_properties(xinput1_2.def PROPERTIES EXTERNAL_OBJECT TRUE)
-endif()
+list(APPEND SOURCE
+    xinput1_2_main.c
+    version.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/xinput1_2.def)
 
-set_module_type(xinput1_2 win32dll)
+add_library(xinput1_2 SHARED ${SOURCE})
 
+set_module_type(xinput1_2 win32dll)
 add_importlibs(xinput1_2 msvcrt kernel32)
-
 add_cab_target(xinput1_2 1)
diff --git a/dll/win32/xinput1_2/xinput1_2.def b/dll/win32/xinput1_2/xinput1_2.def
deleted file mode 100644 (file)
index b094afa..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-
-LIBRARY xinput1_2.dll
-
-EXPORTS
-  XInputEnable@4=xinput1_3.XInputEnable @1
-  XInputGetCapabilities@12=xinput1_3.XInputGetCapabilities @2
-  XInputGetDSoundAudioDeviceGuids@12=xinput1_3.XInputGetDSoundAudioDeviceGuids @3
-  XInputSetState@8=xinput1_3.XInputSetState @4
-  XInputGetState@8=xinput1_3.XInputGetState @5
index d4ce8eb..7f443e7 100644 (file)
@@ -2,16 +2,16 @@
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-add_library(xinput1_3 SHARED xinput1_3_main.c version.rc xinput1_3.def)
+spec2def(xinput1_3.dll xinput1_3.spec)
 
-if(NOT MSVC)
-    set_source_files_properties(xinput1_3.def PROPERTIES EXTERNAL_OBJECT TRUE)
-endif()
+list(APPEND SOURCE
+    xinput1_3_main.c
+    version.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/xinput1_3.def)
 
-set_module_type(xinput1_3 win32dll)
+add_library(xinput1_3 SHARED ${SOURCE})
 
+set_module_type(xinput1_3 win32dll)
 target_link_libraries(xinput1_3 wine)
-
 add_importlibs(xinput1_3 msvcrt kernel32 ntdll)
-
 add_cab_target(xinput1_3 1)
diff --git a/dll/win32/xinput1_3/xinput1_3.def b/dll/win32/xinput1_3/xinput1_3.def
deleted file mode 100644 (file)
index 1d6ae3f..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-
-LIBRARY xinput1_3.dll
-
-EXPORTS
-  DllMain@12 @1
-  XInputGetState@8 @2
-  XInputSetState@8 @3
-  XInputGetCapabilities@12 @4
-  XInputEnable@4 @5
-  XInputGetDSoundAudioDeviceGuids@12 @6
-  XInputGetBatteryInformation@12 @7
-  XInputGetKeystroke@12 @8
index 85e9924..d8057ef 100644 (file)
@@ -2,14 +2,15 @@
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-add_library(xinput9_1_0 SHARED xinput9_1_0_main.c version.rc xinput9_1_0.def)
+spec2def(xinput9_1_0.dll xinput9_1_0.spec)
 
-if(NOT MSVC)
-    set_source_files_properties(xinput9_1_0.def PROPERTIES EXTERNAL_OBJECT TRUE)
-endif()
+list(APPEND SOURCE
+    xinput9_1_0_main.c
+    version.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/xinput9_1_0.def)
 
-set_module_type(xinput9_1_0 win32dll)
+add_library(xinput9_1_0 SHARED ${SOURCE})
 
+set_module_type(xinput9_1_0 win32dll)
 add_importlibs(xinput9_1_0 msvcrt kernel32)
-
 add_cab_target(xinput9_1_0 1)
diff --git a/dll/win32/xinput9_1_0/xinput9_1_0.def b/dll/win32/xinput9_1_0/xinput9_1_0.def
deleted file mode 100644 (file)
index 042954d..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-
-LIBRARY xinput9_1_0.dll
-
-EXPORTS
-  XInputGetCapabilities@12=xinput1_3.XInputGetCapabilities @1
-  XInputGetDSoundAudioDeviceGuids@12=xinput1_3.XInputGetDSoundAudioDeviceGuids @2
-  XInputSetState@8=xinput1_3.XInputSetState @3
-  XInputGetState@8=xinput1_3.XInputGetState @4