From ae92d98a6645f7821359f1caa59caa2b64bf3aac Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Fri, 24 Dec 2010 18:37:44 +0000 Subject: [PATCH] [CMAKE] - Delete more useless definition files. - Improve more modules. svn path=/branches/cmake-bringup/; revision=50131 --- dll/win32/olepro32/CMakeLists.txt | 13 +- dll/win32/olepro32/olepro32.def | 15 - dll/win32/powrprof/CMakeLists.txt | 6 +- dll/win32/powrprof/powrprof.def | 27 - dll/win32/psapi/CMakeLists.txt | 16 +- dll/win32/psapi/psapi.def | 29 -- dll/win32/riched20/CMakeLists.txt | 4 +- dll/win32/riched20/riched20.def | 13 - dll/win32/riched32/CMakeLists.txt | 14 +- dll/win32/riched32/riched32.def | 5 - dll/win32/rsabase/CMakeLists.txt | 15 +- dll/win32/rsabase/rsabase.def | 31 -- dll/win32/rsaenh/CMakeLists.txt | 15 +- dll/win32/rsaenh/rsaenh.def | 31 -- dll/win32/samsrv/CMakeLists.txt | 15 +- dll/win32/samsrv/samsrv.def | 6 - dll/win32/sensapi/CMakeLists.txt | 13 +- dll/win32/sensapi/sensapi.def | 7 - dll/win32/serialui/CMakeLists.txt | 13 +- dll/win32/serialui/serialui.def | 10 - dll/win32/shfolder/CMakeLists.txt | 14 +- dll/win32/shfolder/shfolder.def | 6 - dll/win32/smdll/CMakeLists.txt | 9 +- dll/win32/smdll/smdll.def | 9 - dll/win32/sndblst/CMakeLists.txt | 17 +- dll/win32/sndblst/sndblst.def | 11 - dll/win32/sti/sti.def | 11 - dll/win32/twain_32/CMakeLists.txt | 13 +- dll/win32/twain_32/twain_32.def | 5 - dll/win32/uext2/CMakeLists.txt | 14 +- dll/win32/uext2/uext2.def | 6 - dll/win32/ufat/CMakeLists.txt | 14 +- dll/win32/ufat/ufat.def | 6 - dll/win32/ufatx/CMakeLists.txt | 6 +- dll/win32/ufatx/ufatx.def | 5 - dll/win32/untfs/CMakeLists.txt | 14 +- dll/win32/untfs/untfs.def | 6 - dll/win32/user32/user32.def | 734 ---------------------------- dll/win32/vdmdbg/CMakeLists.txt | 10 +- dll/win32/vdmdbg/vdmdbg.def | 26 - dll/win32/version/CMakeLists.txt | 14 +- dll/win32/version/version.def | 16 - dll/win32/wdmaud.drv/CMakeLists.txt | 13 +- dll/win32/wdmaud.drv/wdmaud.def | 10 - dll/win32/winfax/CMakeLists.txt | 15 +- dll/win32/winfax/winfax.def | 59 --- 46 files changed, 130 insertions(+), 1231 deletions(-) delete mode 100644 dll/win32/olepro32/olepro32.def delete mode 100644 dll/win32/powrprof/powrprof.def delete mode 100644 dll/win32/psapi/psapi.def delete mode 100644 dll/win32/riched20/riched20.def delete mode 100644 dll/win32/riched32/riched32.def delete mode 100644 dll/win32/rsabase/rsabase.def delete mode 100644 dll/win32/rsaenh/rsaenh.def delete mode 100644 dll/win32/samsrv/samsrv.def delete mode 100644 dll/win32/sensapi/sensapi.def delete mode 100644 dll/win32/serialui/serialui.def delete mode 100644 dll/win32/shfolder/shfolder.def delete mode 100644 dll/win32/smdll/smdll.def delete mode 100644 dll/win32/sndblst/sndblst.def delete mode 100644 dll/win32/sti/sti.def delete mode 100644 dll/win32/twain_32/twain_32.def delete mode 100644 dll/win32/uext2/uext2.def delete mode 100644 dll/win32/ufat/ufat.def delete mode 100644 dll/win32/ufatx/ufatx.def delete mode 100644 dll/win32/untfs/untfs.def delete mode 100644 dll/win32/user32/user32.def delete mode 100644 dll/win32/vdmdbg/vdmdbg.def delete mode 100644 dll/win32/version/version.def delete mode 100644 dll/win32/wdmaud.drv/wdmaud.def delete mode 100644 dll/win32/winfax/winfax.def diff --git a/dll/win32/olepro32/CMakeLists.txt b/dll/win32/olepro32/CMakeLists.txt index 009d8f09d93..6605de3a6b5 100644 --- a/dll/win32/olepro32/CMakeLists.txt +++ b/dll/win32/olepro32/CMakeLists.txt @@ -2,11 +2,14 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -add_library(olepro32 SHARED olepro32stubs.c version.rc olepro32.def) +spec2def(olepro32.dll olepro32.spec) -if(NOT MSVC) - set_source_files_properties(olepro32.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +list(APPEND SOURCE + olepro32stubs.c + version.rc + ${CMAKE_CURRENT_BINARY_DIR}/olepro32.def) + +add_library(olepro32 SHARED ${SOURCE}) set_entrypoint(olepro32 0) @@ -17,4 +20,4 @@ add_importlibs(olepro32 kernel32 ntdll) -add_cab_target(olepro32 1) \ No newline at end of file +add_cab_target(olepro32 1) diff --git a/dll/win32/olepro32/olepro32.def b/dll/win32/olepro32/olepro32.def deleted file mode 100644 index 5454bfc4a3c..00000000000 --- a/dll/win32/olepro32/olepro32.def +++ /dev/null @@ -1,15 +0,0 @@ - -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 diff --git a/dll/win32/powrprof/CMakeLists.txt b/dll/win32/powrprof/CMakeLists.txt index 69d3c5f1b22..79beb82cc3a 100644 --- a/dll/win32/powrprof/CMakeLists.txt +++ b/dll/win32/powrprof/CMakeLists.txt @@ -4,9 +4,9 @@ spec2def(powrprof.dll powrprof.spec) set_unicode() add_library(powrprof SHARED - powrprof.c - powrprof.rc - ${CMAKE_CURRENT_BINARY_DIR}/powrprof.def) + powrprof.c + powrprof.rc + ${CMAKE_CURRENT_BINARY_DIR}/powrprof.def) set_module_type(powrprof win32dll) diff --git a/dll/win32/powrprof/powrprof.def b/dll/win32/powrprof/powrprof.def deleted file mode 100644 index c6b3de880f5..00000000000 --- a/dll/win32/powrprof/powrprof.def +++ /dev/null @@ -1,27 +0,0 @@ - -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 diff --git a/dll/win32/psapi/CMakeLists.txt b/dll/win32/psapi/CMakeLists.txt index c13f086b6b5..fe8bbe01a6d 100644 --- a/dll/win32/psapi/CMakeLists.txt +++ b/dll/win32/psapi/CMakeLists.txt @@ -1,27 +1,19 @@ +spec2def(psapi.dll psapi.spec) + list(APPEND SOURCE malloc.c psapi.c psapi.rc - psapi.def) - -if(NOT MSVC) - set_source_files_properties(psapi.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() + ${CMAKE_CURRENT_BINARY_DIR}/psapi.def) add_library(psapi SHARED ${CMAKE_CURRENT_BINARY_DIR}/psapi_precomp.h.gch ${SOURCE}) set_module_type(psapi win32dll) - -target_link_libraries(psapi - epsapi - ${PSEH_LIB}) - +target_link_libraries(psapi epsapi ${PSEH_LIB}) add_importlibs(psapi msvcrt kernel32 ntdll) add_importlib_target(psapi.spec) - add_pch(psapi ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) - add_cab_target(psapi 1) diff --git a/dll/win32/psapi/psapi.def b/dll/win32/psapi/psapi.def deleted file mode 100644 index ceb8b7f363e..00000000000 --- a/dll/win32/psapi/psapi.def +++ /dev/null @@ -1,29 +0,0 @@ - -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 diff --git a/dll/win32/riched20/CMakeLists.txt b/dll/win32/riched20/CMakeLists.txt index 73eb77f7a6e..6120008cf66 100644 --- a/dll/win32/riched20/CMakeLists.txt +++ b/dll/win32/riched20/CMakeLists.txt @@ -7,7 +7,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(riched20.dll riched20.spec) -add_library(riched20 SHARED +list(APPEND SOURCE caret.c clipboard.c context.c @@ -30,8 +30,8 @@ add_library(riched20 SHARED version.rc ${CMAKE_CURRENT_BINARY_DIR}/riched20.def) +add_library(riched20 SHARED ${SOURCE}) set_module_type(riched20 win32dll) - target_link_libraries(riched20 wine uuid) if(MSVC) diff --git a/dll/win32/riched20/riched20.def b/dll/win32/riched20/riched20.def deleted file mode 100644 index 57a0d86acf7..00000000000 --- a/dll/win32/riched20/riched20.def +++ /dev/null @@ -1,13 +0,0 @@ - -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 diff --git a/dll/win32/riched32/CMakeLists.txt b/dll/win32/riched32/CMakeLists.txt index 0c8cc157bc9..e4117b39837 100644 --- a/dll/win32/riched32/CMakeLists.txt +++ b/dll/win32/riched32/CMakeLists.txt @@ -2,16 +2,16 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -add_library(riched32 SHARED richedit.c version.rc riched32.def) +spec2def(riched32.dll riched32.spec) -if(NOT MSVC) - set_source_files_properties(riched32.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +list(APPEND SOURCE + richedit.c + version.rc + ${CMAKE_CURRENT_BINARY_DIR}/riched32.def) + +add_library(riched32 SHARED ${SOURCE}) set_module_type(riched32 win32dll) - target_link_libraries(riched32 wine) - add_importlibs(riched32 riched20 user32 msvcrt kernel32 ntdll) - add_cab_target(riched32 1) diff --git a/dll/win32/riched32/riched32.def b/dll/win32/riched32/riched32.def deleted file mode 100644 index 81423a37167..00000000000 --- a/dll/win32/riched32/riched32.def +++ /dev/null @@ -1,5 +0,0 @@ - -LIBRARY riched32.dll - -EXPORTS - DllGetVersion@4 @2 PRIVATE diff --git a/dll/win32/rsabase/CMakeLists.txt b/dll/win32/rsabase/CMakeLists.txt index 9483bb4ae34..94f4aa2eba0 100644 --- a/dll/win32/rsabase/CMakeLists.txt +++ b/dll/win32/rsabase/CMakeLists.txt @@ -2,16 +2,15 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -add_library(rsabase SHARED version.rc rsabase.def) +spec2def(rsabase.dll rsabase.spec) -if(NOT MSVC) - set_source_files_properties(rsabase.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +list(APPEND SOURCE + version.rc + ${CMAKE_CURRENT_BINARY_DIR}/rsabase.def) + +add_library(rsabase SHARED ${SOURCE}) set_entrypoint(rsabase 0) - target_link_libraries(rsabase wine) - add_importlibs(rsabase rsaenh ntdll) - -add_cab_target(rsabase 1) \ No newline at end of file +add_cab_target(rsabase 1) diff --git a/dll/win32/rsabase/rsabase.def b/dll/win32/rsabase/rsabase.def deleted file mode 100644 index f43fbd8aa04..00000000000 --- a/dll/win32/rsabase/rsabase.def +++ /dev/null @@ -1,31 +0,0 @@ - -LIBRARY rsabase.dll - -EXPORTS - CPAcquireContext@16=rsaenh.CPAcquireContext @1 - CPCreateHash@20=rsaenh.CPCreateHash @2 - CPDecrypt@28=rsaenh.CPDecrypt @3 - CPDeriveKey@20=rsaenh.CPDeriveKey @4 - CPDestroyHash@8=rsaenh.CPDestroyHash @5 - CPDestroyKey@8=rsaenh.CPDestroyKey @6 - CPDuplicateHash@20=rsaenh.CPDuplicateHash @7 - CPDuplicateKey@20=rsaenh.CPDuplicateKey @8 - CPEncrypt@32=rsaenh.CPEncrypt @9 - CPExportKey@28=rsaenh.CPExportKey @10 - CPGenKey@16=rsaenh.CPGenKey @11 - CPGenRandom@12=rsaenh.CPGenRandom @12 - CPGetHashParam@24=rsaenh.CPGetHashParam @13 - CPGetKeyParam@24=rsaenh.CPGetKeyParam @14 - CPGetProvParam@20=rsaenh.CPGetProvParam @15 - CPGetUserKey@12=rsaenh.CPGetUserKey @16 - CPHashData@20=rsaenh.CPHashData @17 - CPHashSessionKey@16=rsaenh.CPHashSessionKey @18 - CPImportKey@24=rsaenh.CPImportKey @19 - CPReleaseContext@8=rsaenh.CPReleaseContext @20 - CPSetHashParam@20=rsaenh.CPSetHashParam @21 - CPSetKeyParam@20=rsaenh.CPSetKeyParam @22 - CPSetProvParam@16=rsaenh.CPSetProvParam @23 - CPSignHash@28=rsaenh.CPSignHash @24 - CPVerifySignature@28=rsaenh.CPVerifySignature @25 - DllRegisterServer@0=rsaenh.DllRegisterServer @26 PRIVATE - DllUnregisterServer@0=rsaenh.DllUnregisterServer @27 PRIVATE diff --git a/dll/win32/rsaenh/CMakeLists.txt b/dll/win32/rsaenh/CMakeLists.txt index e8c15ec0afd..960abe5cf22 100644 --- a/dll/win32/rsaenh/CMakeLists.txt +++ b/dll/win32/rsaenh/CMakeLists.txt @@ -5,7 +5,9 @@ add_definitions( include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -add_library(rsaenh SHARED +spec2def(rsaenh.dll rsaenh.spec) + +list(APPEND SOURCE aes.c des.c handle.c @@ -18,19 +20,12 @@ add_library(rsaenh SHARED rsaenh.c sha2.c version.rc - rsaenh.def) + ${CMAKE_CURRENT_BINARY_DIR}/rsaenh.def) -if(NOT MSVC) - set_source_files_properties(rsaenh.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +add_library(rsaenh SHARED ${SOURCE}) set_module_type(rsaenh win32dll) - target_link_libraries(rsaenh wine) - add_importlibs(rsaenh msvcrt crypt32 advapi32 kernel32 ntdll) - add_importlib_target(rsaenh.spec) - add_cab_target(rsaenh 1) - diff --git a/dll/win32/rsaenh/rsaenh.def b/dll/win32/rsaenh/rsaenh.def deleted file mode 100644 index d2f92331607..00000000000 --- a/dll/win32/rsaenh/rsaenh.def +++ /dev/null @@ -1,31 +0,0 @@ - -LIBRARY rsaenh.dll - -EXPORTS - CPAcquireContext@16=RSAENH_CPAcquireContext@16 @1 - CPCreateHash@20=RSAENH_CPCreateHash@20 @2 - CPDecrypt@28=RSAENH_CPDecrypt@28 @3 - CPDeriveKey@20=RSAENH_CPDeriveKey@20 @4 - CPDestroyHash@8=RSAENH_CPDestroyHash@8 @5 - CPDestroyKey@8=RSAENH_CPDestroyKey@8 @6 - CPDuplicateHash@20=RSAENH_CPDuplicateHash@20 @7 - CPDuplicateKey@20=RSAENH_CPDuplicateKey@20 @8 - CPEncrypt@32=RSAENH_CPEncrypt@32 @9 - CPExportKey@28=RSAENH_CPExportKey@28 @10 - CPGenKey@16=RSAENH_CPGenKey@16 @11 - CPGenRandom@12=RSAENH_CPGenRandom@12 @12 - CPGetHashParam@24=RSAENH_CPGetHashParam@24 @13 - CPGetKeyParam@24=RSAENH_CPGetKeyParam@24 @14 - CPGetProvParam@20=RSAENH_CPGetProvParam@20 @15 - CPGetUserKey@12=RSAENH_CPGetUserKey@12 @16 - CPHashData@20=RSAENH_CPHashData@20 @17 - CPHashSessionKey@16=RSAENH_CPHashSessionKey@16 @18 - CPImportKey@24=RSAENH_CPImportKey@24 @19 - CPReleaseContext@8=RSAENH_CPReleaseContext@8 @20 - CPSetHashParam@20=RSAENH_CPSetHashParam@20 @21 - CPSetKeyParam@20=RSAENH_CPSetKeyParam@20 @22 - CPSetProvParam@16=RSAENH_CPSetProvParam@16 @23 - CPSignHash@28=RSAENH_CPSignHash@28 @24 - CPVerifySignature@28=RSAENH_CPVerifySignature@28 @25 - DllRegisterServer@0 @26 PRIVATE - DllUnregisterServer@0 @27 PRIVATE diff --git a/dll/win32/samsrv/CMakeLists.txt b/dll/win32/samsrv/CMakeLists.txt index 3824a6f08ba..17e6be95541 100644 --- a/dll/win32/samsrv/CMakeLists.txt +++ b/dll/win32/samsrv/CMakeLists.txt @@ -1,15 +1,16 @@ set_unicode() -add_library(samsrv SHARED samsrv.c samsrv.rc samsrv.def) +spec2def(samsrv.dll samsrv.spec) -if(NOT MSVC) - set_source_files_properties(samsrv.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +list(APPEND SOURCE + samsrv.c + samsrv.rc + ${CMAKE_CURRENT_BINARY_DIR}/samsrv.def) + +add_library(samsrv SHARED ${SOURCE}) set_entrypoint(samsrv 0) - add_importlibs(samsrv kernel32 ntdll) add_dependencies(samsrv psdk buildno_header) - -add_cab_target(samsrv 1) \ No newline at end of file +add_cab_target(samsrv 1) diff --git a/dll/win32/samsrv/samsrv.def b/dll/win32/samsrv/samsrv.def deleted file mode 100644 index d005c750e8e..00000000000 --- a/dll/win32/samsrv/samsrv.def +++ /dev/null @@ -1,6 +0,0 @@ - -LIBRARY samsrv.dll - -EXPORTS - SamIInitialize@0 @1 - SampInitializeRegistry@0 @2 diff --git a/dll/win32/sensapi/CMakeLists.txt b/dll/win32/sensapi/CMakeLists.txt index 6f330ec8067..526c4aad89d 100644 --- a/dll/win32/sensapi/CMakeLists.txt +++ b/dll/win32/sensapi/CMakeLists.txt @@ -2,16 +2,15 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) -add_library(sensapi SHARED sensapi.c sensapi.def) +spec2def(sensapi.dll sensapi.spec) -if(NOT MSVC) - set_source_files_properties(sensapi.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +list(APPEND SOURCE + sensapi.c + ${CMAKE_CURRENT_BINARY_DIR}/sensapi.def) + +add_library(sensapi SHARED ${SOURCE}) set_module_type(sensapi win32dll) - target_link_libraries(sensapi wine) - add_importlibs(sensapi msvcrt kernel32 ntdll) - add_cab_target(sensapi 1) diff --git a/dll/win32/sensapi/sensapi.def b/dll/win32/sensapi/sensapi.def deleted file mode 100644 index d41303d5459..00000000000 --- a/dll/win32/sensapi/sensapi.def +++ /dev/null @@ -1,7 +0,0 @@ - -LIBRARY sensapi.dll - -EXPORTS - IsDestinationReachableA@8 @1 - IsDestinationReachableW@8 @2 - IsNetworkAlive@4 @3 diff --git a/dll/win32/serialui/CMakeLists.txt b/dll/win32/serialui/CMakeLists.txt index 625933c7613..4f4304f8cbf 100644 --- a/dll/win32/serialui/CMakeLists.txt +++ b/dll/win32/serialui/CMakeLists.txt @@ -1,14 +1,15 @@ set_unicode() -add_library(serialui SHARED serialui.c serialui.rc serialui.def) +spec2def(serialui.dll serialui.spec) -if(NOT MSVC) - set_source_files_properties(serialui.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +list(APPEND SOURCE + serialui.c + serialui.rc + ${CMAKE_CURRENT_BINARY_DIR}/serialui.def) + +add_library(serialui SHARED ${SOURCE}) set_module_type(serialui win32dll) - add_importlibs(serialui user32 shlwapi msvcrt kernel32) - add_cab_target(serialui 1) diff --git a/dll/win32/serialui/serialui.def b/dll/win32/serialui/serialui.def deleted file mode 100644 index 55d7e6c027e..00000000000 --- a/dll/win32/serialui/serialui.def +++ /dev/null @@ -1,10 +0,0 @@ - -LIBRARY serialui.dll - -EXPORTS - drvCommConfigDialogA@12 @1 - drvCommConfigDialogW@12 @2 - drvSetDefaultCommConfigA@12 @3 - drvSetDefaultCommConfigW@12 @4 - drvGetDefaultCommConfigA@12 @5 - drvGetDefaultCommConfigW@12 @6 diff --git a/dll/win32/shfolder/CMakeLists.txt b/dll/win32/shfolder/CMakeLists.txt index 6a0927d7328..097fde5a884 100644 --- a/dll/win32/shfolder/CMakeLists.txt +++ b/dll/win32/shfolder/CMakeLists.txt @@ -2,17 +2,17 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) -add_library(shfolder SHARED version.rc shfolder.def) +spec2def(shfolder.dll shfolder.spec) -if(NOT MSVC) - set_source_files_properties(shfolder.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +list(APPEND SOURCE + version.rc + ${CMAKE_CURRENT_BINARY_DIR}/shfolder.def) + +add_library(shfolder SHARED ${SOURCE}) set_entrypoint(shfolder 0) target_link_libraries(shfolder wine) - add_importlibs(shfolder shell32 kernel32 ntdll) add_dependencies(shfolder psdk buildno_header) - -add_cab_target(shfolder 1) \ No newline at end of file +add_cab_target(shfolder 1) diff --git a/dll/win32/shfolder/shfolder.def b/dll/win32/shfolder/shfolder.def deleted file mode 100644 index 3a1f434ab4b..00000000000 --- a/dll/win32/shfolder/shfolder.def +++ /dev/null @@ -1,6 +0,0 @@ - -LIBRARY shfolder.dll - -EXPORTS - SHGetFolderPathA@20=shell32.SHGetFolderPathA @1 - SHGetFolderPathW@20=shell32.SHGetFolderPathW @2 diff --git a/dll/win32/smdll/CMakeLists.txt b/dll/win32/smdll/CMakeLists.txt index 93082f86b97..2d364e895a9 100644 --- a/dll/win32/smdll/CMakeLists.txt +++ b/dll/win32/smdll/CMakeLists.txt @@ -1,16 +1,17 @@ -spec2def(smdll.dll smdll.spec) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys) -add_library(smdll SHARED +spec2def(smdll.dll smdll.spec) + +list(APPEND SOURCE dllmain.c query.c smdll.rc ${CMAKE_CURRENT_BINARY_DIR}/smdll.def) -target_link_libraries(smdll smlib) +add_library(smdll SHARED ${SOURCE}) +target_link_libraries(smdll smlib) add_importlibs(smdll ntdll) add_dependencies(smdll psdk buildno_header) add_cab_target(smdll 1) diff --git a/dll/win32/smdll/smdll.def b/dll/win32/smdll/smdll.def deleted file mode 100644 index c4d702012f5..00000000000 --- a/dll/win32/smdll/smdll.def +++ /dev/null @@ -1,9 +0,0 @@ - -LIBRARY smdll.dll - -EXPORTS - SmCompleteSession@12 @1 - SmConnectApiPort@16 @2 - SmExecuteProgram@8 @3 - SmQueryInformation@20 @4 - SmLookupSubsystem@20 @5 diff --git a/dll/win32/sndblst/CMakeLists.txt b/dll/win32/sndblst/CMakeLists.txt index cbe93322650..b78fc3d5218 100644 --- a/dll/win32/sndblst/CMakeLists.txt +++ b/dll/win32/sndblst/CMakeLists.txt @@ -4,18 +4,15 @@ set_unicode() add_definitions(-DDEBUG_NT4) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound) -add_library(sndblst SHARED sndblst.c sndblst.def) +spec2def(sndblst.dll sndblst.spec) -if(NOT MSVC) - set_source_files_properties(sndblst.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +list(APPEND SOURCE + sndblst.c + ${CMAKE_CURRENT_BINARY_DIR}/sndblst.def) + +add_library(sndblst SHARED ${SOURCE}) set_module_type(sndblst win32dll) - -target_link_libraries(sndblst - mment4 - mmebuddy) - +target_link_libraries(sndblst mment4 mmebuddy) add_importlibs(sndblst user32 winmm advapi32 msvcrt kernel32 ntdll) - add_cab_target(sndblst 1) diff --git a/dll/win32/sndblst/sndblst.def b/dll/win32/sndblst/sndblst.def deleted file mode 100644 index 74ca2307e5f..00000000000 --- a/dll/win32/sndblst/sndblst.def +++ /dev/null @@ -1,11 +0,0 @@ - -LIBRARY sndblst.dll - -EXPORTS - DriverProc@20 @1 - widMessage@20 @2 - wodMessage@20 @3 - midMessage@20 @4 - modMessage@20 @5 - mxdMessage@20 @6 - auxMessage@20 @7 diff --git a/dll/win32/sti/sti.def b/dll/win32/sti/sti.def deleted file mode 100644 index 86f79077839..00000000000 --- a/dll/win32/sti/sti.def +++ /dev/null @@ -1,11 +0,0 @@ - -LIBRARY sti.dll - -EXPORTS - DllCanUnloadNow@0 @1 PRIVATE - DllGetClassObject@12 @2 PRIVATE - DllRegisterServer@0 @3 PRIVATE - DllUnregisterServer@0 @4 PRIVATE - StiCreateInstance@16=StiCreateInstanceW@16 @5 - StiCreateInstanceA@16 @6 - StiCreateInstanceW@16 @7 diff --git a/dll/win32/twain_32/CMakeLists.txt b/dll/win32/twain_32/CMakeLists.txt index be9be44ad4c..a99d4a06f6f 100644 --- a/dll/win32/twain_32/CMakeLists.txt +++ b/dll/win32/twain_32/CMakeLists.txt @@ -1,7 +1,9 @@ add_definitions(-D_DLL -D__USE_CRTIMP) -add_library(twain_32 SHARED +spec2def(twain_32.dll twain_32.spec) + +list(APPEND SOURCE capability.c ds_audio.c ds_ctrl.c @@ -9,16 +11,11 @@ add_library(twain_32 SHARED dsm_ctrl.c twain32_main.c twain_32.rc - twain_32.def) + ${CMAKE_CURRENT_BINARY_DIR}/twain_32.def) -if(NOT MSVC) - set_source_files_properties(twain_32.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +add_library(twain_32 SHARED ${SOURCE}) set_module_type(twain_32 win32dll) - target_link_libraries(twain_32 wine) - add_importlibs(twain_32 msvcrt kernel32 ntdll) - add_cab_target(twain_32 1) diff --git a/dll/win32/twain_32/twain_32.def b/dll/win32/twain_32/twain_32.def deleted file mode 100644 index b8edb16bf9f..00000000000 --- a/dll/win32/twain_32/twain_32.def +++ /dev/null @@ -1,5 +0,0 @@ - -LIBRARY twain_32.dll - -EXPORTS - DSM_Entry@24 @1 diff --git a/dll/win32/uext2/CMakeLists.txt b/dll/win32/uext2/CMakeLists.txt index 890257f8021..624d7e2cfe8 100644 --- a/dll/win32/uext2/CMakeLists.txt +++ b/dll/win32/uext2/CMakeLists.txt @@ -1,14 +1,14 @@ -add_library(uext2 SHARED uext2.c uext2.rc uext2.def) +spec2def(uext2.dll uext2.spec) -if(NOT MSVC) - set_source_files_properties(uext2.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +list(APPEND SOURCE + uext2.c + uext2.rc + ${CMAKE_CURRENT_BINARY_DIR}/uext2.def) + +add_library(uext2 SHARED ${SOURCE}) set_module_type(uext2 win32dll) - target_link_libraries(uext2 ext2lib) - add_importlibs(uext2 msvcrt kernel32 ntdll) - add_cab_target(uext2 1) diff --git a/dll/win32/uext2/uext2.def b/dll/win32/uext2/uext2.def deleted file mode 100644 index 82d215df065..00000000000 --- a/dll/win32/uext2/uext2.def +++ /dev/null @@ -1,6 +0,0 @@ - -LIBRARY uext2.dll - -EXPORTS - ChkdskEx@24=Ext2Chkdsk@24 @1 - FormatEx@24=Ext2Format@24 @2 diff --git a/dll/win32/ufat/CMakeLists.txt b/dll/win32/ufat/CMakeLists.txt index 9fc03eba6dc..6c40b68cea4 100644 --- a/dll/win32/ufat/CMakeLists.txt +++ b/dll/win32/ufat/CMakeLists.txt @@ -1,14 +1,14 @@ -add_library(ufat SHARED ufat.c ufat.rc ufat.def) +spec2def(ufat.dll ufat.spec) -if(NOT MSVC) - set_source_files_properties(ufat.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +list(APPEND SOURCE + ufat.c + ufat.rc + ${CMAKE_CURRENT_BINARY_DIR}/ufat.def) + +add_library(ufat SHARED ${SOURCE}) set_module_type(ufat win32dll) - target_link_libraries(ufat vfatlib) - add_importlibs(ufat msvcrt kernel32 ntdll) - add_cab_target(ufat 1) diff --git a/dll/win32/ufat/ufat.def b/dll/win32/ufat/ufat.def deleted file mode 100644 index a41d0718d64..00000000000 --- a/dll/win32/ufat/ufat.def +++ /dev/null @@ -1,6 +0,0 @@ - -LIBRARY ufat.dll - -EXPORTS - ChkdskEx@24=VfatChkdsk@24 @1 - FormatEx@24=VfatFormat@24 @2 diff --git a/dll/win32/ufatx/CMakeLists.txt b/dll/win32/ufatx/CMakeLists.txt index fd0dc3d7bc9..6f31fa02252 100644 --- a/dll/win32/ufatx/CMakeLists.txt +++ b/dll/win32/ufatx/CMakeLists.txt @@ -1,16 +1,16 @@ spec2def(ufatx.dll ufatx.spec) -add_library(ufatx SHARED +list(APPEND SOURCE ufatx.rc ${CMAKE_CURRENT_BINARY_DIR}/ufatx.def) +add_library(ufatx SHARED ${SOURCE}) + set_entrypoint(ufatx 0) target_link_libraries(ufatx vfatxlib -lgcc) - add_importlibs(ufatx kernel32 ntdll) add_importlib_target(ufatx.spec) - add_dependencies(ufatx psdk buildno_header) add_cab_target(ufatx 1) diff --git a/dll/win32/ufatx/ufatx.def b/dll/win32/ufatx/ufatx.def deleted file mode 100644 index 95b9085e0e8..00000000000 --- a/dll/win32/ufatx/ufatx.def +++ /dev/null @@ -1,5 +0,0 @@ - -LIBRARY ufatx.dll - -EXPORTS - FormatEx@24=VfatxFormat@24 @1 diff --git a/dll/win32/untfs/CMakeLists.txt b/dll/win32/untfs/CMakeLists.txt index 4cbfd4084ec..88094935bbd 100644 --- a/dll/win32/untfs/CMakeLists.txt +++ b/dll/win32/untfs/CMakeLists.txt @@ -1,14 +1,14 @@ -add_library(untfs SHARED untfs.c untfs.rc untfs.def) +spec2def(untfs.dll untfs.spec) -if(NOT MSVC) - set_source_files_properties(untfs.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +list(APPEND SOURCE + untfs.c + untfs.rc + ${CMAKE_CURRENT_BINARY_DIR}/untfs.def) + +add_library(untfs SHARED ${SOURCE}) set_module_type(untfs win32dll) - target_link_libraries(untfs ntfslib) - add_importlibs(untfs msvcrt kernel32 ntdll) - add_cab_target(untfs 1) diff --git a/dll/win32/untfs/untfs.def b/dll/win32/untfs/untfs.def deleted file mode 100644 index 8de2fc76769..00000000000 --- a/dll/win32/untfs/untfs.def +++ /dev/null @@ -1,6 +0,0 @@ - -LIBRARY untfs.dll - -EXPORTS - ChkdskEx@24=NtfsChkdsk@24 @1 - FormatEx@24=NtfsFormat@24 @2 diff --git a/dll/win32/user32/user32.def b/dll/win32/user32/user32.def deleted file mode 100644 index c65d29d2dd2..00000000000 --- a/dll/win32/user32/user32.def +++ /dev/null @@ -1,734 +0,0 @@ - -LIBRARY user32.dll - -EXPORTS - ActivateKeyboardLayout=NtUserActivateKeyboardLayout - AdjustWindowRect - AdjustWindowRectEx - AlignRects - AllowForegroundActivation - AllowSetForegroundWindow - AnimateWindow - AnyPopup - AppendMenuA - AppendMenuW - ArrangeIconicWindows - AttachThreadInput=NtUserAttachThreadInput - BeginDeferWindowPos - BeginPaint=NtUserBeginPaint - BlockInput=NtUserBlockInput - BringWindowToTop - BroadcastSystemMessage=BroadcastSystemMessageA - BroadcastSystemMessageA - BroadcastSystemMessageExA - BroadcastSystemMessageExW - BroadcastSystemMessageW - BuildReasonArray=__wine_stub_user32_dll_22 - CalcMenuBar=__wine_stub_user32_dll_23 - CallMsgFilter=CallMsgFilterA - CallMsgFilterA - CallMsgFilterW - CallNextHookEx - CallWindowProcA - CallWindowProcW - CascadeChildWindows - CascadeWindows - ChangeClipboardChain=NtUserChangeClipboardChain - ChangeDisplaySettingsA - ChangeDisplaySettingsExA - ChangeDisplaySettingsExW - ChangeDisplaySettingsW - ChangeMenuA - ChangeMenuW - CharLowerA - CharLowerBuffA - CharLowerBuffW - CharLowerW - CharNextA - CharNextExA - CharNextW - CharPrevA - CharPrevExA - CharPrevW - CharToOemA - CharToOemBuffA - CharToOemBuffW - CharToOemW - CharUpperA - CharUpperBuffA - CharUpperBuffW - CharUpperW - CheckDlgButton - CheckMenuItem - CheckMenuRadioItem - CheckRadioButton - ChildWindowFromPoint - ChildWindowFromPointEx - CliImmSetHotKey - ClientThreadSetup - ClientToScreen - ClipCursor=NtUserClipCursor - CloseClipboard=NtUserCloseClipboard - CloseDesktop=NtUserCloseDesktop - CloseWindow - CloseWindowStation=NtUserCloseWindowStation - CopyAcceleratorTableA - CopyAcceleratorTableW=NtUserCopyAcceleratorTable - CopyIcon - CopyImage - CopyRect - CountClipboardFormats=NtUserCountClipboardFormats - CreateAcceleratorTableA - CreateAcceleratorTableW=NtUserCreateAcceleratorTable - CreateCaret=NtUserCreateCaret - CreateCursor - CreateDesktopA - CreateDesktopW - CreateDialogIndirectParamA - CreateDialogIndirectParamAorW - CreateDialogIndirectParamW - CreateDialogParamA - CreateDialogParamW - CreateIcon - CreateIconFromResource - CreateIconFromResourceEx - CreateIconIndirect - CreateMDIWindowA - CreateMDIWindowW - CreateMenu - CreatePopupMenu - CreateSystemThreads=__wine_stub_user32_dll_96 - CreateWindowExA - CreateWindowExW - CreateWindowStationA - CreateWindowStationW - CsrBroadcastSystemMessageExW - CtxInitUser32 - DdeAbandonTransaction - DdeAccessData - DdeAddData - DdeClientTransaction - DdeCmpStringHandles - DdeConnect - DdeConnectList - DdeCreateDataHandle - DdeCreateStringHandleA - DdeCreateStringHandleW - DdeDisconnect - DdeDisconnectList - DdeEnableCallback - DdeFreeDataHandle - DdeFreeStringHandle - DdeGetData - DdeGetLastError - DdeGetQualityOfService - DdeImpersonateClient - DdeInitializeA - DdeInitializeW - DdeKeepStringHandle - DdeNameService - DdePostAdvise - DdeQueryConvInfo - DdeQueryNextServer - DdeQueryStringA - DdeQueryStringW - DdeReconnect - DdeSetQualityOfService - DdeSetUserHandle - DdeUnaccessData - DdeUninitialize - DefDlgProcA - DefDlgProcW - DefFrameProcA - DefFrameProcW - DefMDIChildProcA - DefMDIChildProcW - DefRawInputProc - DefWindowProcA - DefWindowProcW - DeferWindowPos - DeleteMenu=NtUserDeleteMenu - DeregisterShellHookWindow - DestroyAcceleratorTable - DestroyCaret - DestroyCursor - DestroyIcon - DestroyMenu=NtUserDestroyMenu - DestroyReasons=__wine_stub_user32_dll_153 - DestroyWindow=NtUserDestroyWindow - DeviceEventWorker=__wine_stub_user32_dll_155 - DialogBoxIndirectParamA - DialogBoxIndirectParamAorW - DialogBoxIndirectParamW - DialogBoxParamA - DialogBoxParamW - DisableProcessWindowsGhosting - DispatchMessageA - DispatchMessageW - DisplayExitWindowsWarnings - DlgDirListA - DlgDirListComboBoxA - DlgDirListComboBoxW - DlgDirListW - DlgDirSelectComboBoxExA - DlgDirSelectComboBoxExW - DlgDirSelectExA - DlgDirSelectExW - DragDetect - DragObject=NtUserDragObject - DrawAnimatedRects=NtUserDrawAnimatedRects - DrawCaption - DrawCaptionTempA - DrawCaptionTempW - DrawEdge - DrawFocusRect - DrawFrame - DrawFrameControl - DrawIcon - DrawIconEx - DrawMenuBar - DrawMenuBarTemp - DrawStateA - DrawStateW - DrawTextA - DrawTextExA - DrawTextExW - DrawTextW - EditWndProc=EditWndProcA - EmptyClipboard=NtUserEmptyClipboard - EnableMenuItem - EnableScrollBar - EnableWindow - EndDeferWindowPos - EndDialog - EndMenu - EndPaint=NtUserEndPaint - EndTask - EnterReaderModeHelper=__wine_stub_user32_dll_203 - EnumChildWindows - EnumClipboardFormats - EnumDesktopWindows - EnumDesktopsA - EnumDesktopsW - EnumDisplayDevicesA - EnumDisplayDevicesW - EnumDisplayMonitors - EnumDisplaySettingsA - EnumDisplaySettingsExA - EnumDisplaySettingsExW - EnumDisplaySettingsW - EnumPropsA - EnumPropsExA - EnumPropsExW - EnumPropsW - EnumThreadWindows - EnumWindowStationsA - EnumWindowStationsW - EnumWindows - EqualRect - ExcludeUpdateRgn=NtUserExcludeUpdateRgn - ExitWindowsEx - FillRect - FindWindowA - FindWindowExA - FindWindowExW - FindWindowW - FlashWindow - FlashWindowEx=NtUserFlashWindowEx - FrameRect - FreeDDElParam - GetActiveWindow - GetAltTabInfo=GetAltTabInfoA - GetAltTabInfoA - GetAltTabInfoW - GetAncestor - GetAppCompatFlags - GetAppCompatFlags2 - GetAsyncKeyState - GetCapture - GetCaretBlinkTime=NtUserGetCaretBlinkTime - GetCaretPos=NtUserGetCaretPos - GetClassInfoA - GetClassInfoExA - GetClassInfoExW - GetClassInfoW - GetClassLongA - GetClassLongW - GetClassNameA - GetClassNameW - GetClassWord - GetClientRect - GetClipCursor=NtUserGetClipCursor - GetClipboardData - GetClipboardFormatNameA - GetClipboardFormatNameW - GetClipboardOwner=NtUserGetClipboardOwner - GetClipboardSequenceNumber=NtUserGetClipboardSequenceNumber - GetClipboardViewer=NtUserGetClipboardViewer - GetComboBoxInfo - GetCursor - GetCursorFrameInfo=__wine_stub_user32_dll_266 - GetCursorInfo=NtUserGetCursorInfo - GetCursorPos - GetDC=NtUserGetDC - GetDCEx=NtUserGetDCEx - GetDesktopWindow - GetDialogBaseUnits - GetDlgCtrlID - GetDlgItem - GetDlgItemInt - GetDlgItemTextA - GetDlgItemTextW - GetDoubleClickTime=NtUserGetDoubleClickTime - GetFocus - GetForegroundWindow=NtUserGetForegroundWindow - GetGUIThreadInfo=NtUserGetGUIThreadInfo - GetGuiResources=NtUserGetGuiResources - GetIconInfo - GetInputDesktop - GetInputState - GetInternalWindowPos - GetKBCodePage - GetKeyNameTextA - GetKeyNameTextW - GetKeyState - GetKeyboardLayout - GetKeyboardLayoutList=NtUserGetKeyboardLayoutList - GetKeyboardLayoutNameA - GetKeyboardLayoutNameW - GetKeyboardState=NtUserGetKeyboardState - GetKeyboardType - GetLastActivePopup - GetLastInputInfo - GetLayeredWindowAttributes=NtUserGetLayeredWindowAttributes - GetListBoxInfo=NtUserGetListBoxInfo - GetMenu - GetMenuBarInfo=NtUserGetMenuBarInfo - GetMenuCheckMarkDimensions - GetMenuContextHelpId - GetMenuDefaultItem - GetMenuInfo - GetMenuItemCount - GetMenuItemID - GetMenuItemInfoA - GetMenuItemInfoW - GetMenuItemRect=NtUserGetMenuItemRect - GetMenuState - GetMenuStringA - GetMenuStringW - GetMessageA - GetMessageExtraInfo - GetMessagePos - GetMessageTime - GetMessageW - GetMonitorInfoA - GetMonitorInfoW - GetMouseMovePointsEx=NtUserGetMouseMovePointsEx - GetNextDlgGroupItem - GetNextDlgTabItem - GetOpenClipboardWindow=NtUserGetOpenClipboardWindow - GetParent - GetPriorityClipboardFormat=NtUserGetPriorityClipboardFormat - GetProcessDefaultLayout - GetProcessWindowStation=NtUserGetProcessWindowStation - GetProgmanWindow - GetPropA - GetPropW - GetQueueStatus - GetRawInputBuffer - GetRawInputData - GetRawInputDeviceInfoA - GetRawInputDeviceInfoW - GetRawInputDeviceList - GetReasonTitleFromReasonCode=__wine_stub_user32_dll_339 - GetRegisteredRawInputDevices - GetScrollBarInfo=NtUserGetScrollBarInfo - GetScrollInfo - GetScrollPos - GetScrollRange - GetShellWindow - GetSubMenu - GetSysColor - GetSysColorBrush - GetSystemMenu - GetSystemMetrics - GetTabbedTextExtentA - GetTabbedTextExtentW - GetTaskmanWindow - GetThreadDesktop - GetTitleBarInfo=NtUserGetTitleBarInfo - GetTopWindow - GetUpdateRect - GetUpdateRgn - GetUserObjectInformationA - GetUserObjectInformationW=NtUserGetObjectInformation - GetUserObjectSecurity - GetWindow - GetWindowContextHelpId - GetWindowDC=NtUserGetWindowDC - GetWindowInfo - GetWindowLongA - GetWindowLongW - GetWindowModuleFileName=GetWindowModuleFileNameA - GetWindowModuleFileNameA - GetWindowModuleFileNameW - GetWindowPlacement=NtUserGetWindowPlacement - GetWindowRect - GetWindowRgn - GetWindowRgnBox - GetWindowTextA - GetWindowTextLengthA - GetWindowTextLengthW - GetWindowTextW - GetWindowThreadProcessId - GetWindowWord - GrayStringA - GrayStringW - HideCaret=NtUserHideCaret - HiliteMenuItem=NtUserHiliteMenuItem - IMPGetIMEA - IMPGetIMEW - IMPQueryIMEA - IMPQueryIMEW - IMPSetIMEA - IMPSetIMEW - ImpersonateDdeClientWindow - InSendMessage - InSendMessageEx - InflateRect - InitializeLpkHooks - InitializeWin32EntryTable=__wine_stub_user32_dll_396 - InsertMenuA - InsertMenuItemA - InsertMenuItemW - InsertMenuW - InternalGetWindowText - IntersectRect - InvalidateRect=NtUserInvalidateRect - InvalidateRgn=NtUserInvalidateRgn - InvertRect - IsCharAlphaA - IsCharAlphaNumericA - IsCharAlphaNumericW - IsCharAlphaW - IsCharLowerA - IsCharLowerW - IsCharUpperA - IsCharUpperW - IsChild - IsClipboardFormatAvailable=NtUserIsClipboardFormatAvailable - IsDialogMessage=IsDialogMessageA - IsDialogMessageA - IsDialogMessageW - IsDlgButtonChecked - IsGUIThread - IsHungAppWindow - IsIconic - IsMenu - IsProcess16Bit=__wine_stub_user32_dll_424 - IsRectEmpty - IsSETEnabled=__wine_stub_user32_dll_426 - IsServerSideWindow - IsWinEventHookInstalled - IsWindow - IsWindowEnabled - IsWindowInDestroy - IsWindowUnicode - IsWindowVisible - IsWow64Message=__wine_stub_user32_dll_434 - IsZoomed - KillSystemTimer - KillTimer=NtUserKillTimer - LoadAcceleratorsA - LoadAcceleratorsW - LoadBitmapA - LoadBitmapW - LoadCursorA - LoadCursorFromFileA - LoadCursorFromFileW - LoadCursorW - LoadIconA - LoadIconW - LoadImageA - LoadImageW - LoadKeyboardLayoutA - LoadKeyboardLayoutEx=__wine_stub_user32_dll_451 - LoadKeyboardLayoutW - LoadLocalFonts - LoadMenuA - LoadMenuIndirectA - LoadMenuIndirectW - LoadMenuW - LoadRemoteFonts - LoadStringA - LoadStringW - LockSetForegroundWindow - LockWindowStation=NtUserLockWindowStation - LockWindowUpdate=NtUserLockWindowUpdate - LockWorkStation=NtUserLockWorkStation - LookupIconIdFromDirectory - LookupIconIdFromDirectoryEx - MBToWCSEx - MB_GetString - MapDialogRect - MapVirtualKeyA - MapVirtualKeyExA - MapVirtualKeyExW - MapVirtualKeyW - MapWindowPoints - MenuItemFromPoint - MenuWindowProcA - MenuWindowProcW - MessageBeep - MessageBoxA - MessageBoxExA - MessageBoxExW - MessageBoxIndirectA - MessageBoxIndirectW - MessageBoxTimeoutA=__wine_stub_user32_dll_484 - MessageBoxTimeoutW=__wine_stub_user32_dll_485 - MessageBoxW - ModifyMenuA - ModifyMenuW - MonitorFromPoint - MonitorFromRect - MonitorFromWindow - MoveWindow=NtUserMoveWindow - MsgWaitForMultipleObjects - MsgWaitForMultipleObjectsEx - NotifyWinEvent - OemKeyScan - OemToCharA - OemToCharBuffA - OemToCharBuffW - OemToCharW - OffsetRect - OpenClipboard - OpenDesktopA - OpenDesktopW - OpenIcon - OpenInputDesktop=NtUserOpenInputDesktop - OpenWindowStationA - OpenWindowStationW - PackDDElParam - PaintDesktop=NtUserPaintDesktop - PaintMenuBar=__wine_stub_user32_dll_511 - PeekMessageA - PeekMessageW - PostMessageA - PostMessageW - PostQuitMessage - PostThreadMessageA - PostThreadMessageW - PrivateExtractIconExA - PrivateExtractIconExW - PrivateExtractIconsA - PrivateExtractIconsW - PtInRect - QuerySendMessage=NtUserQuerySendMessage - RealChildWindowFromPoint - RealGetWindowClass=RealGetWindowClassA - RealGetWindowClassA - RealGetWindowClassW - ReasonCodeNeedsBugID=__wine_stub_user32_dll_529 - ReasonCodeNeedsComment=__wine_stub_user32_dll_530 - RecordShutdownReason=__wine_stub_user32_dll_531 - RedrawWindow=NtUserRedrawWindow - RegisterClassA - RegisterClassExA - RegisterClassExW - RegisterClassW - RegisterClipboardFormatA - RegisterClipboardFormatW - RegisterDeviceNotificationA=RegisterDeviceNotificationW - RegisterDeviceNotificationW - RegisterHotKey=NtUserRegisterHotKey - RegisterLogonProcess - RegisterMessagePumpHook=__wine_stub_user32_dll_543 - RegisterRawInputDevices - RegisterServicesProcess - RegisterShellHookWindow - RegisterSystemThread - RegisterTasklist=NtUserRegisterTasklist - RegisterUserApiHook - RegisterWindowMessageA - RegisterWindowMessageW - ReleaseCapture - ReleaseDC - RemoveMenu=NtUserRemoveMenu - RemovePropA - RemovePropW - ReplyMessage - ReuseDDElParam - ScreenToClient - ScrollChildren - ScrollDC - ScrollWindow - ScrollWindowEx - SendDlgItemMessageA - SendDlgItemMessageW - SendIMEMessageExA - SendIMEMessageExW - SendInput=NtUserSendInput - SendMessageA - SendMessageCallbackA - SendMessageCallbackW - SendMessageTimeoutA - SendMessageTimeoutW - SendMessageW - SendNotifyMessageA - SendNotifyMessageW - SetActiveWindow=NtUserSetActiveWindow - SetCapture=NtUserSetCapture - SetCaretBlinkTime - SetCaretPos - SetClassLongA - SetClassLongW - SetClassWord - SetClipboardData - SetClipboardViewer=NtUserSetClipboardViewer - SetConsoleReserveKeys=__wine_stub_user32_dll_586 - SetCursor=NtUserSetCursor - SetCursorContents=NtUserSetCursorContents - SetCursorPos - SetDebugErrorLevel - SetDeskWallpaper - SetDlgItemInt - SetDlgItemTextA - SetDlgItemTextW - SetDoubleClickTime - SetFocus=NtUserSetFocus - SetForegroundWindow - SetInternalWindowPos=NtUserSetInternalWindowPos - SetKeyboardState=NtUserSetKeyboardState - SetLastErrorEx - SetLayeredWindowAttributes=NtUserSetLayeredWindowAttributes - SetLogonNotifyWindow - SetMenu - SetMenuContextHelpId=NtUserSetMenuContextHelpId - SetMenuDefaultItem=NtUserSetMenuDefaultItem - SetMenuInfo - SetMenuItemBitmaps - SetMenuItemInfoA - SetMenuItemInfoW - SetMessageExtraInfo - SetMessageQueue - SetParent=NtUserSetParent - SetProcessDefaultLayout - SetProcessWindowStation=NtUserSetProcessWindowStation - SetProgmanWindow - SetPropA - SetPropW - SetRect - SetRectEmpty - SetScrollInfo - SetScrollPos - SetScrollRange - SetShellWindow - SetShellWindowEx=NtUserSetShellWindowEx - SetSysColors - SetSysColorsTemp - SetSystemCursor - SetSystemMenu - SetSystemTimer=NtUserSetSystemTimer - SetTaskmanWindow - SetThreadDesktop=NtUserSetThreadDesktop - SetTimer=NtUserSetTimer - SetUserObjectInformationA=NtUserSetObjectInformation - SetUserObjectInformationW=NtUserSetObjectInformation - SetUserObjectSecurity - SetWinEventHook - SetWindowContextHelpId - SetWindowLongA - SetWindowLongW - SetWindowPlacement=NtUserSetWindowPlacement - SetWindowPos=NtUserSetWindowPos - SetWindowRgn - SetWindowStationUser - SetWindowTextA - SetWindowTextW - SetWindowWord - SetWindowsHookA - SetWindowsHookExA - SetWindowsHookExW - SetWindowsHookW - ShowCaret=NtUserShowCaret - ShowCursor - ShowOwnedPopups - ShowScrollBar=NtUserShowScrollBar - ShowStartGlass - ShowWindow=NtUserShowWindow - ShowWindowAsync=NtUserShowWindowAsync - SoftModalMessageBox=__wine_stub_user32_dll_658 - SubtractRect - SwapMouseButton - SwitchDesktop=NtUserSwitchDesktop - SwitchToThisWindow - SystemParametersInfoA - SystemParametersInfoW - TabbedTextOutA - TabbedTextOutW - TileChildWindows - TileWindows - ToAscii - ToAsciiEx - ToUnicode - ToUnicodeEx - TrackMouseEvent - TrackPopupMenu - TrackPopupMenuEx - TranslateAccelerator=TranslateAcceleratorA - TranslateAcceleratorA - TranslateAcceleratorW - TranslateMDISysAccel - TranslateMessage - TranslateMessageEx=__wine_stub_user32_dll_681 - UnhookWinEvent=NtUserUnhookWinEvent - UnhookWindowsHook - UnhookWindowsHookEx=NtUserUnhookWindowsHookEx - UnionRect - UnloadKeyboardLayout=NtUserUnloadKeyboardLayout - UnlockWindowStation=NtUserUnlockWindowStation - UnpackDDElParam - UnregisterClassA - UnregisterClassW - UnregisterDeviceNotification - UnregisterHotKey=NtUserUnregisterHotKey - UnregisterMessagePumpHook=__wine_stub_user32_dll_693 - UnregisterUserApiHook=NtUserUnregisterUserApiHook - UpdateLayeredWindow - UpdateLayeredWindowIndirect - UpdatePerUserSystemParameters - UpdateWindow - User32InitializeImmEntryTable - UserClientDllInitialize=DllMain - UserHandleGrantAccess=NtUserUserHandleGrantAccess - UserLpkPSMTextOut=__wine_stub_user32_dll_702 - UserLpkTabbedTextOut=__wine_stub_user32_dll_703 - UserRealizePalette - UserRegisterWowHandlers - ValidateRect=NtUserValidateRect - ValidateRgn - VkKeyScanA - VkKeyScanExA - VkKeyScanExW - VkKeyScanW - WCSToMBEx - WINNLSEnableIME - WINNLSGetEnableStatus - WINNLSGetIMEHotkey - WaitForInputIdle - WaitMessage=NtUserWaitMessage - Win32PoolAllocationStats=__wine_stub_user32_dll_718 - WinHelpA - WinHelpW - WindowFromDC - WindowFromPoint - WindowFromPhysicalPoint=NtUserWindowFromPhysicalPoint - keybd_event - mouse_event - wsprintfA - wsprintfW - wvsprintfA - wvsprintfW - SetProcessDPIAware diff --git a/dll/win32/vdmdbg/CMakeLists.txt b/dll/win32/vdmdbg/CMakeLists.txt index 3e39992ddee..ddc994f8b7e 100644 --- a/dll/win32/vdmdbg/CMakeLists.txt +++ b/dll/win32/vdmdbg/CMakeLists.txt @@ -1,19 +1,17 @@ set_unicode() -list(APPEND SOURCE vdmdbg.c vdmdbg.def) +spec2def(vdmdbg.dll vdmdbg.spec) -if(NOT MSVC) - set_source_files_properties(vdmdbg.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +list(APPEND SOURCE + vdmdbg.c + ${CMAKE_CURRENT_BINARY_DIR}/vdmdbg.def) add_library(vdmdbg SHARED ${CMAKE_CURRENT_BINARY_DIR}/vdmdbg_vdmdbg.h.gch ${SOURCE}) set_module_type(vdmdbg win32dll) - add_importlibs(vdmdbg msvcrt kernel32 ntdll) add_pch(vdmdbg ${CMAKE_CURRENT_SOURCE_DIR}/vdmdbg.h ${SOURCE}) - add_cab_target(vdmdbg 1) diff --git a/dll/win32/vdmdbg/vdmdbg.def b/dll/win32/vdmdbg/vdmdbg.def deleted file mode 100644 index 9f65d7c91c5..00000000000 --- a/dll/win32/vdmdbg/vdmdbg.def +++ /dev/null @@ -1,26 +0,0 @@ - -LIBRARY vdmdbg.dll - -EXPORTS - VDMBreakThread@8 @1 - VDMDetectWOW@0 @2 - VDMEnumProcessWOW@8 @3 - VDMEnumTaskWOW@12 @4 - VDMEnumTaskWOWEx@12 @5 - VDMGetContext@12 @6 - VDMGetDbgFlags@4 @7 - VDMGetModuleSelector@20 @8 - VDMGetPointer@20 @9 - VDMGetSegmentInfo@16 @10 - VDMGetSelectorModule@32 @11 - VDMGlobalFirst@24 @12 - VDMGlobalNext@24 @13 - VDMIsModuleLoaded@4 @14 - VDMKillWOW@0 @15 - VDMModuleFirst@20 @16 - VDMModuleNext@20 @17 - VDMProcessException@4 @18 - VDMSetContext@12 @19 - VDMSetDbgFlags@8 @20 - VDMStartTaskInWOW@12 @21 - VDMTerminateTaskWOW@8 @22 diff --git a/dll/win32/version/CMakeLists.txt b/dll/win32/version/CMakeLists.txt index c662998a8a4..5c30a96b2f2 100644 --- a/dll/win32/version/CMakeLists.txt +++ b/dll/win32/version/CMakeLists.txt @@ -1,22 +1,22 @@ +add_definitions(-D__WINESRC__) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + spec2def(version.dll version.spec) -add_definitions(-D__WINESRC__) - -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - -add_library(version SHARED +list(APPEND SOURCE info.c install.c resource.c version.rc ${CMAKE_CURRENT_BINARY_DIR}/version.def) +add_library(version SHARED ${SOURCE}) + set_entrypoint(version 0) target_link_libraries(version wine) - add_importlibs(version lz32 kernel32 ntdll) add_dependencies(version psdk buildno_header) add_cab_target(version 1) -add_importlib_target(version.spec) \ No newline at end of file +add_importlib_target(version.spec) diff --git a/dll/win32/version/version.def b/dll/win32/version/version.def deleted file mode 100644 index d98ba3c8c1b..00000000000 --- a/dll/win32/version/version.def +++ /dev/null @@ -1,16 +0,0 @@ - -LIBRARY version.dll - -EXPORTS - GetFileVersionInfoA@16 @1 - GetFileVersionInfoSizeA@8 @2 - GetFileVersionInfoSizeW@8 @3 - GetFileVersionInfoW@16 @4 - VerFindFileA@32 @5 - VerFindFileW@32 @6 - VerInstallFileA@32 @7 - VerInstallFileW@32 @8 - VerLanguageNameA@12=kernel32.VerLanguageNameA @9 - VerLanguageNameW@12=kernel32.VerLanguageNameW @10 - VerQueryValueA@16 @11 - VerQueryValueW@16 @12 diff --git a/dll/win32/wdmaud.drv/CMakeLists.txt b/dll/win32/wdmaud.drv/CMakeLists.txt index 059a789e0d2..b1a3e2c7eef 100644 --- a/dll/win32/wdmaud.drv/CMakeLists.txt +++ b/dll/win32/wdmaud.drv/CMakeLists.txt @@ -9,17 +9,17 @@ include_directories( ${REACTOS_SOURCE_DIR}/lib/drivers/sound/mmixer ${REACTOS_SOURCE_DIR}/lib/3rdparty/libsamplerate) -add_library(wdmaud.drv SHARED +spec2def(wdmaud.drv wdmaud.spec) + +list(APPEND SOURCE wdmaud.c mixer.c mmixer.c legacy.c wdmaud.rc - wdmaud.def) + ${CMAKE_CURRENT_BINARY_DIR}/wdmaud.def) -if(NOT MSVC) - set_source_files_properties(wdmaud.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +add_library(wdmaud.drv SHARED ${SOURCE}) set_module_type(wdmaud.drv win32dll) @@ -31,5 +31,4 @@ target_link_libraries(wdmaud.drv mmixer) add_importlibs(wdmaud.drv user32 winmm advapi32 msvcrt setupapi ksuser kernel32 ntdll) - -add_cab_target(wdmaud.drv 1) \ No newline at end of file +add_cab_target(wdmaud.drv 1) diff --git a/dll/win32/wdmaud.drv/wdmaud.def b/dll/win32/wdmaud.drv/wdmaud.def deleted file mode 100644 index c132a211bab..00000000000 --- a/dll/win32/wdmaud.drv/wdmaud.def +++ /dev/null @@ -1,10 +0,0 @@ - -LIBRARY wdmaud.drv - -EXPORTS - DriverProc@20 @1 - mxdMessage@20 @2 - auxMessage@20 @3 - wodMessage@20 @4 - widMessage@20 @5 - modMessage@20 @6 diff --git a/dll/win32/winfax/CMakeLists.txt b/dll/win32/winfax/CMakeLists.txt index b7dca81910f..9d466ac21ab 100644 --- a/dll/win32/winfax/CMakeLists.txt +++ b/dll/win32/winfax/CMakeLists.txt @@ -1,14 +1,15 @@ -add_library(winfax SHARED winfax.c winfax.rc winfax.def) +spec2def(winfax.dll winfax.spec) -if(NOT MSVC) - set_source_files_properties(winfax.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +list(APPEND SOURCE + winfax.c + winfax.rc + ${CMAKE_CURRENT_BINARY_DIR}/winfax.def) + +add_library(winfax SHARED ${SOURCE}) set_entrypoint(winfax 0) add_importlibs(winfax kernel32 ntdll) - add_dependencies(winfax psdk) - -add_cab_target(winfax 1) \ No newline at end of file +add_cab_target(winfax 1) diff --git a/dll/win32/winfax/winfax.def b/dll/win32/winfax/winfax.def deleted file mode 100644 index 5a7772edd67..00000000000 --- a/dll/win32/winfax/winfax.def +++ /dev/null @@ -1,59 +0,0 @@ - -LIBRARY winfax.dll - -EXPORTS - FaxAbort@8 @1 - FaxAccessCheck@8 @2 - FaxClose@4 @3 - FaxCompleteJobParamsA@8 @4 - FaxCompleteJobParamsW@8 @5 - FaxConnectFaxServerA@8 @6 - FaxConnectFaxServerW@8 @7 - FaxEnableRoutingMethodA@12 @8 - FaxEnableRoutingMethodW@12 @9 - FaxEnumGlobalRoutingInfoA@12 @10 - FaxEnumGlobalRoutingInfoW@12 @11 - FaxEnumJobsA@12 @12 - FaxEnumJobsW@12 @13 - FaxEnumPortsA@12 @14 - FaxEnumPortsW@12 @15 - FaxEnumRoutingMethodsA@12 @16 - FaxEnumRoutingMethodsW@12 @17 - FaxFreeBuffer@4 @18 - FaxGetConfigurationA@8 @19 - FaxGetConfigurationW@8 @20 - FaxGetDeviceStatusA@8 @21 - FaxGetDeviceStatusW@8 @22 - FaxGetJobA@12 @23 - FaxGetJobW@12 @24 - FaxGetLoggingCategoriesA@12 @25 - FaxGetLoggingCategoriesW@12 @26 - FaxGetPageData@24 @27 - FaxGetPortA@8 @28 - FaxGetPortW@8 @29 - FaxGetRoutingInfoA@16 @30 - FaxGetRoutingInfoW@16 @31 - FaxInitializeEventQueue@20 @32 - FaxOpenPort@16 @33 - FaxPrintCoverPageA@8 @34 - FaxPrintCoverPageW@8 @35 - FaxRegisterRoutingExtensionW@24 @36 - FaxRegisterServiceProviderW@16 @37 - FaxSendDocumentA@20 @38 - FaxSendDocumentForBroadcastA@20 @39 - FaxSendDocumentForBroadcastW@20 @40 - FaxSendDocumentW@20 @41 - FaxSetConfigurationA@8 @42 - FaxSetConfigurationW@8 @43 - FaxSetGlobalRoutingInfoA@8 @44 - FaxSetGlobalRoutingInfoW@8 @45 - FaxSetJobA@16 @46 - FaxSetJobW@16 @47 - FaxSetLoggingCategoriesA@12 @48 - FaxSetLoggingCategoriesW@12 @49 - FaxSetPortA@8 @50 - FaxSetPortW@8 @51 - FaxSetRoutingInfoA@16 @52 - FaxSetRoutingInfoW@16 @53 - FaxStartPrintJobA@16 @54 - FaxStartPrintJobW@16 @55