Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 50131: [CMAKE] - Delete more useless definition files. - Improve more modules.
by akhaldi＠svn.reactos.org 24 Dec '10

24 Dec '10

Author: akhaldi Date: Fri Dec 24 18:37:44 2010 New Revision: 50131 URL: http://svn.reactos.org/svn/reactos?rev=50131&view=rev Log: [CMAKE] - Delete more useless definition files. - Improve more modules. Removed: branches/cmake-bringup/dll/win32/olepro32/olepro32.def branches/cmake-bringup/dll/win32/powrprof/powrprof.def branches/cmake-bringup/dll/win32/psapi/psapi.def branches/cmake-bringup/dll/win32/riched20/riched20.def branches/cmake-bringup/dll/win32/riched32/riched32.def branches/cmake-bringup/dll/win32/rsabase/rsabase.def branches/cmake-bringup/dll/win32/rsaenh/rsaenh.def branches/cmake-bringup/dll/win32/samsrv/samsrv.def branches/cmake-bringup/dll/win32/sensapi/sensapi.def branches/cmake-bringup/dll/win32/serialui/serialui.def branches/cmake-bringup/dll/win32/shfolder/shfolder.def branches/cmake-bringup/dll/win32/smdll/smdll.def branches/cmake-bringup/dll/win32/sndblst/sndblst.def branches/cmake-bringup/dll/win32/sti/sti.def branches/cmake-bringup/dll/win32/twain_32/twain_32.def branches/cmake-bringup/dll/win32/uext2/uext2.def branches/cmake-bringup/dll/win32/ufat/ufat.def branches/cmake-bringup/dll/win32/ufatx/ufatx.def branches/cmake-bringup/dll/win32/untfs/untfs.def branches/cmake-bringup/dll/win32/user32/user32.def branches/cmake-bringup/dll/win32/vdmdbg/vdmdbg.def branches/cmake-bringup/dll/win32/version/version.def branches/cmake-bringup/dll/win32/wdmaud.drv/wdmaud.def branches/cmake-bringup/dll/win32/winfax/winfax.def Modified: branches/cmake-bringup/dll/win32/olepro32/CMakeLists.txt branches/cmake-bringup/dll/win32/powrprof/CMakeLists.txt branches/cmake-bringup/dll/win32/psapi/CMakeLists.txt branches/cmake-bringup/dll/win32/riched20/CMakeLists.txt branches/cmake-bringup/dll/win32/riched32/CMakeLists.txt branches/cmake-bringup/dll/win32/rsabase/CMakeLists.txt branches/cmake-bringup/dll/win32/rsaenh/CMakeLists.txt branches/cmake-bringup/dll/win32/samsrv/CMakeLists.txt branches/cmake-bringup/dll/win32/sensapi/CMakeLists.txt branches/cmake-bringup/dll/win32/serialui/CMakeLists.txt branches/cmake-bringup/dll/win32/shfolder/CMakeLists.txt branches/cmake-bringup/dll/win32/smdll/CMakeLists.txt branches/cmake-bringup/dll/win32/sndblst/CMakeLists.txt branches/cmake-bringup/dll/win32/twain_32/CMakeLists.txt branches/cmake-bringup/dll/win32/uext2/CMakeLists.txt branches/cmake-bringup/dll/win32/ufat/CMakeLists.txt branches/cmake-bringup/dll/win32/ufatx/CMakeLists.txt branches/cmake-bringup/dll/win32/untfs/CMakeLists.txt branches/cmake-bringup/dll/win32/vdmdbg/CMakeLists.txt branches/cmake-bringup/dll/win32/version/CMakeLists.txt branches/cmake-bringup/dll/win32/wdmaud.drv/CMakeLists.txt branches/cmake-bringup/dll/win32/winfax/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/olepro32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/olepro3… ============================================================================== --- branches/cmake-bringup/dll/win32/olepro32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/olepro32/CMakeLists.txt [iso-8859-1] Fri Dec 24 18:37:44 2010 @@ -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 @@ kernel32 ntdll) -add_cab_target(olepro32 1) +add_cab_target(olepro32 1) Removed: branches/cmake-bringup/dll/win32/olepro32/olepro32.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/olepro3… ============================================================================== --- branches/cmake-bringup/dll/win32/olepro32/olepro32.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/olepro32/olepro32.def (removed) @@ -1,15 +1,0 @@ - -LIBRARY olepro32.dll - -EXPORTS - OleIconToCursor(a)8=oleaut32.OleIconToCursor @248 - OleCreatePropertyFrameIndirect(a)4=oleaut32.OleCreatePropertyFrameIndirect @249 - OleCreatePropertyFrame(a)44=oleaut32.OleCreatePropertyFrame @250 - OleLoadPicture(a)20=oleaut32.OleLoadPicture @251 - OleCreatePictureIndirect(a)16=oleaut32.OleCreatePictureIndirect @252 - OleCreateFontIndirect(a)12=oleaut32.OleCreateFontIndirect @253 - OleTranslateColor(a)12=oleaut32.OleTranslateColor @254 - DllCanUnloadNow@0 @255 PRIVATE - DllGetClassObject@12 @256 PRIVATE - DllRegisterServer@0 @257 PRIVATE - DllUnregisterServer@0 @258 PRIVATE Modified: branches/cmake-bringup/dll/win32/powrprof/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/powrpro… ============================================================================== --- branches/cmake-bringup/dll/win32/powrprof/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/powrprof/CMakeLists.txt [iso-8859-1] Fri Dec 24 18:37:44 2010 @@ -4,9 +4,9 @@ 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) Removed: branches/cmake-bringup/dll/win32/powrprof/powrprof.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/powrpro… ============================================================================== --- branches/cmake-bringup/dll/win32/powrprof/powrprof.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/powrprof/powrprof.def (removed) @@ -1,27 +1,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 Modified: branches/cmake-bringup/dll/win32/psapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/psapi/C… ============================================================================== --- branches/cmake-bringup/dll/win32/psapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/psapi/CMakeLists.txt [iso-8859-1] Fri Dec 24 18:37:44 2010 @@ -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) Removed: branches/cmake-bringup/dll/win32/psapi/psapi.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/psapi/p… ============================================================================== --- branches/cmake-bringup/dll/win32/psapi/psapi.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/psapi/psapi.def (removed) @@ -1,29 +1,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 Modified: branches/cmake-bringup/dll/win32/riched20/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/riched2… ============================================================================== --- branches/cmake-bringup/dll/win32/riched20/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/riched20/CMakeLists.txt [iso-8859-1] Fri Dec 24 18:37:44 2010 @@ -7,7 +7,7 @@ spec2def(riched20.dll riched20.spec) -add_library(riched20 SHARED +list(APPEND SOURCE caret.c clipboard.c context.c @@ -30,8 +30,8 @@ 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) Removed: branches/cmake-bringup/dll/win32/riched20/riched20.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/riched2… ============================================================================== --- branches/cmake-bringup/dll/win32/riched20/riched20.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/riched20/riched20.def (removed) @@ -1,13 +1,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 Modified: branches/cmake-bringup/dll/win32/riched32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/riched3… ============================================================================== --- branches/cmake-bringup/dll/win32/riched32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/riched32/CMakeLists.txt [iso-8859-1] Fri Dec 24 18:37:44 2010 @@ -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) Removed: branches/cmake-bringup/dll/win32/riched32/riched32.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/riched3… ============================================================================== --- branches/cmake-bringup/dll/win32/riched32/riched32.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/riched32/riched32.def (removed) @@ -1,5 +1,0 @@ - -LIBRARY riched32.dll - -EXPORTS - DllGetVersion@4 @2 PRIVATE Modified: branches/cmake-bringup/dll/win32/rsabase/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/rsabase… ============================================================================== --- branches/cmake-bringup/dll/win32/rsabase/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/rsabase/CMakeLists.txt [iso-8859-1] Fri Dec 24 18:37:44 2010 @@ -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) +add_cab_target(rsabase 1) Removed: branches/cmake-bringup/dll/win32/rsabase/rsabase.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/rsabase… ============================================================================== --- branches/cmake-bringup/dll/win32/rsabase/rsabase.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/rsabase/rsabase.def (removed) @@ -1,31 +1,0 @@ - -LIBRARY rsabase.dll - -EXPORTS - CPAcquireContext(a)16=rsaenh.CPAcquireContext @1 - CPCreateHash(a)20=rsaenh.CPCreateHash @2 - CPDecrypt(a)28=rsaenh.CPDecrypt @3 - CPDeriveKey(a)20=rsaenh.CPDeriveKey @4 - CPDestroyHash(a)8=rsaenh.CPDestroyHash @5 - CPDestroyKey(a)8=rsaenh.CPDestroyKey @6 - CPDuplicateHash(a)20=rsaenh.CPDuplicateHash @7 - CPDuplicateKey(a)20=rsaenh.CPDuplicateKey @8 - CPEncrypt(a)32=rsaenh.CPEncrypt @9 - CPExportKey(a)28=rsaenh.CPExportKey @10 - CPGenKey(a)16=rsaenh.CPGenKey @11 - CPGenRandom(a)12=rsaenh.CPGenRandom @12 - CPGetHashParam(a)24=rsaenh.CPGetHashParam @13 - CPGetKeyParam(a)24=rsaenh.CPGetKeyParam @14 - CPGetProvParam(a)20=rsaenh.CPGetProvParam @15 - CPGetUserKey(a)12=rsaenh.CPGetUserKey @16 - CPHashData(a)20=rsaenh.CPHashData @17 - CPHashSessionKey(a)16=rsaenh.CPHashSessionKey @18 - CPImportKey(a)24=rsaenh.CPImportKey @19 - CPReleaseContext(a)8=rsaenh.CPReleaseContext @20 - CPSetHashParam(a)20=rsaenh.CPSetHashParam @21 - CPSetKeyParam(a)20=rsaenh.CPSetKeyParam @22 - CPSetProvParam(a)16=rsaenh.CPSetProvParam @23 - CPSignHash(a)28=rsaenh.CPSignHash @24 - CPVerifySignature(a)28=rsaenh.CPVerifySignature @25 - DllRegisterServer(a)0=rsaenh.DllRegisterServer @26 PRIVATE - DllUnregisterServer(a)0=rsaenh.DllUnregisterServer @27 PRIVATE Modified: branches/cmake-bringup/dll/win32/rsaenh/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/rsaenh/… ============================================================================== --- branches/cmake-bringup/dll/win32/rsaenh/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/rsaenh/CMakeLists.txt [iso-8859-1] Fri Dec 24 18:37:44 2010 @@ -5,7 +5,9 @@ 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 @@ 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) - Removed: branches/cmake-bringup/dll/win32/rsaenh/rsaenh.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/rsaenh/… ============================================================================== --- branches/cmake-bringup/dll/win32/rsaenh/rsaenh.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/rsaenh/rsaenh.def (removed) @@ -1,31 +1,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 Modified: branches/cmake-bringup/dll/win32/samsrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/samsrv/… ============================================================================== --- branches/cmake-bringup/dll/win32/samsrv/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/samsrv/CMakeLists.txt [iso-8859-1] Fri Dec 24 18:37:44 2010 @@ -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) +add_cab_target(samsrv 1) Removed: branches/cmake-bringup/dll/win32/samsrv/samsrv.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/samsrv/… ============================================================================== --- branches/cmake-bringup/dll/win32/samsrv/samsrv.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/samsrv/samsrv.def (removed) @@ -1,6 +1,0 @@ - -LIBRARY samsrv.dll - -EXPORTS - SamIInitialize@0 @1 - SampInitializeRegistry@0 @2 Modified: branches/cmake-bringup/dll/win32/sensapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/sensapi… ============================================================================== --- branches/cmake-bringup/dll/win32/sensapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/sensapi/CMakeLists.txt [iso-8859-1] Fri Dec 24 18:37:44 2010 @@ -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) Removed: branches/cmake-bringup/dll/win32/sensapi/sensapi.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/sensapi… ============================================================================== --- branches/cmake-bringup/dll/win32/sensapi/sensapi.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/sensapi/sensapi.def (removed) @@ -1,7 +1,0 @@ - -LIBRARY sensapi.dll - -EXPORTS - IsDestinationReachableA@8 @1 - IsDestinationReachableW@8 @2 - IsNetworkAlive@4 @3 Modified: branches/cmake-bringup/dll/win32/serialui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/serialu… ============================================================================== --- branches/cmake-bringup/dll/win32/serialui/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/serialui/CMakeLists.txt [iso-8859-1] Fri Dec 24 18:37:44 2010 @@ -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) Removed: branches/cmake-bringup/dll/win32/serialui/serialui.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/serialu… ============================================================================== --- branches/cmake-bringup/dll/win32/serialui/serialui.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/serialui/serialui.def (removed) @@ -1,10 +1,0 @@ - -LIBRARY serialui.dll - -EXPORTS - drvCommConfigDialogA@12 @1 - drvCommConfigDialogW@12 @2 - drvSetDefaultCommConfigA@12 @3 - drvSetDefaultCommConfigW@12 @4 - drvGetDefaultCommConfigA@12 @5 - drvGetDefaultCommConfigW@12 @6 Modified: branches/cmake-bringup/dll/win32/shfolder/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shfolde… ============================================================================== --- branches/cmake-bringup/dll/win32/shfolder/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shfolder/CMakeLists.txt [iso-8859-1] Fri Dec 24 18:37:44 2010 @@ -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) +add_cab_target(shfolder 1) Removed: branches/cmake-bringup/dll/win32/shfolder/shfolder.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shfolde… ============================================================================== --- branches/cmake-bringup/dll/win32/shfolder/shfolder.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shfolder/shfolder.def (removed) @@ -1,6 +1,0 @@ - -LIBRARY shfolder.dll - -EXPORTS - SHGetFolderPathA(a)20=shell32.SHGetFolderPathA @1 - SHGetFolderPathW(a)20=shell32.SHGetFolderPathW @2 Modified: branches/cmake-bringup/dll/win32/smdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/smdll/C… ============================================================================== --- branches/cmake-bringup/dll/win32/smdll/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/smdll/CMakeLists.txt [iso-8859-1] Fri Dec 24 18:37:44 2010 @@ -1,16 +1,17 @@ + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys) spec2def(smdll.dll smdll.spec) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys) - -add_library(smdll SHARED +list(APPEND SOURCE dllmain.c query.c smdll.rc ${CMAKE_CURRENT_BINARY_DIR}/smdll.def) +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) Removed: branches/cmake-bringup/dll/win32/smdll/smdll.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/smdll/s… ============================================================================== --- branches/cmake-bringup/dll/win32/smdll/smdll.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/smdll/smdll.def (removed) @@ -1,9 +1,0 @@ - -LIBRARY smdll.dll - -EXPORTS - SmCompleteSession@12 @1 - SmConnectApiPort@16 @2 - SmExecuteProgram@8 @3 - SmQueryInformation@20 @4 - SmLookupSubsystem@20 @5 Modified: branches/cmake-bringup/dll/win32/sndblst/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/sndblst… ============================================================================== --- branches/cmake-bringup/dll/win32/sndblst/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/sndblst/CMakeLists.txt [iso-8859-1] Fri Dec 24 18:37:44 2010 @@ -4,18 +4,15 @@ 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) Removed: branches/cmake-bringup/dll/win32/sndblst/sndblst.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/sndblst… ============================================================================== --- branches/cmake-bringup/dll/win32/sndblst/sndblst.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/sndblst/sndblst.def (removed) @@ -1,11 +1,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 Removed: branches/cmake-bringup/dll/win32/sti/sti.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/sti/sti… ============================================================================== --- branches/cmake-bringup/dll/win32/sti/sti.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/sti/sti.def (removed) @@ -1,11 +1,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 Modified: branches/cmake-bringup/dll/win32/twain_32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/twain_3… ============================================================================== --- branches/cmake-bringup/dll/win32/twain_32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/twain_32/CMakeLists.txt [iso-8859-1] Fri Dec 24 18:37:44 2010 @@ -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 @@ 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) Removed: branches/cmake-bringup/dll/win32/twain_32/twain_32.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/twain_3… ============================================================================== --- branches/cmake-bringup/dll/win32/twain_32/twain_32.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/twain_32/twain_32.def (removed) @@ -1,5 +1,0 @@ - -LIBRARY twain_32.dll - -EXPORTS - DSM_Entry@24 @1 Modified: branches/cmake-bringup/dll/win32/uext2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/uext2/C… ============================================================================== --- branches/cmake-bringup/dll/win32/uext2/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/uext2/CMakeLists.txt [iso-8859-1] Fri Dec 24 18:37:44 2010 @@ -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) Removed: branches/cmake-bringup/dll/win32/uext2/uext2.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/uext2/u… ============================================================================== --- branches/cmake-bringup/dll/win32/uext2/uext2.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/uext2/uext2.def (removed) @@ -1,6 +1,0 @@ - -LIBRARY uext2.dll - -EXPORTS - ChkdskEx@24=Ext2Chkdsk@24 @1 - FormatEx@24=Ext2Format@24 @2 Modified: branches/cmake-bringup/dll/win32/ufat/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ufat/CM… ============================================================================== --- branches/cmake-bringup/dll/win32/ufat/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/ufat/CMakeLists.txt [iso-8859-1] Fri Dec 24 18:37:44 2010 @@ -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) Removed: branches/cmake-bringup/dll/win32/ufat/ufat.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ufat/uf… ============================================================================== --- branches/cmake-bringup/dll/win32/ufat/ufat.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/ufat/ufat.def (removed) @@ -1,6 +1,0 @@ - -LIBRARY ufat.dll - -EXPORTS - ChkdskEx@24=VfatChkdsk@24 @1 - FormatEx@24=VfatFormat@24 @2 Modified: branches/cmake-bringup/dll/win32/ufatx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ufatx/C… ============================================================================== --- branches/cmake-bringup/dll/win32/ufatx/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/ufatx/CMakeLists.txt [iso-8859-1] Fri Dec 24 18:37:44 2010 @@ -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) Removed: branches/cmake-bringup/dll/win32/ufatx/ufatx.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ufatx/u… ============================================================================== --- branches/cmake-bringup/dll/win32/ufatx/ufatx.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/ufatx/ufatx.def (removed) @@ -1,5 +1,0 @@ - -LIBRARY ufatx.dll - -EXPORTS - FormatEx@24=VfatxFormat@24 @1 Modified: branches/cmake-bringup/dll/win32/untfs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/untfs/C… ============================================================================== --- branches/cmake-bringup/dll/win32/untfs/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/untfs/CMakeLists.txt [iso-8859-1] Fri Dec 24 18:37:44 2010 @@ -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) Removed: branches/cmake-bringup/dll/win32/untfs/untfs.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/untfs/u… ============================================================================== --- branches/cmake-bringup/dll/win32/untfs/untfs.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/untfs/untfs.def (removed) @@ -1,6 +1,0 @@ - -LIBRARY untfs.dll - -EXPORTS - ChkdskEx@24=NtfsChkdsk@24 @1 - FormatEx@24=NtfsFormat@24 @2 Removed: branches/cmake-bringup/dll/win32/user32/user32.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/user32/… ============================================================================== --- branches/cmake-bringup/dll/win32/user32/user32.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/user32/user32.def (removed) @@ -1,734 +1,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 Modified: branches/cmake-bringup/dll/win32/vdmdbg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/vdmdbg/… ============================================================================== --- branches/cmake-bringup/dll/win32/vdmdbg/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/vdmdbg/CMakeLists.txt [iso-8859-1] Fri Dec 24 18:37:44 2010 @@ -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) Removed: branches/cmake-bringup/dll/win32/vdmdbg/vdmdbg.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/vdmdbg/… ============================================================================== --- branches/cmake-bringup/dll/win32/vdmdbg/vdmdbg.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/vdmdbg/vdmdbg.def (removed) @@ -1,26 +1,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 Modified: branches/cmake-bringup/dll/win32/version/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/version… ============================================================================== --- branches/cmake-bringup/dll/win32/version/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/version/CMakeLists.txt [iso-8859-1] Fri Dec 24 18:37:44 2010 @@ -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) +add_importlib_target(version.spec) Removed: branches/cmake-bringup/dll/win32/version/version.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/version… ============================================================================== --- branches/cmake-bringup/dll/win32/version/version.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/version/version.def (removed) @@ -1,16 +1,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(a)12=kernel32.VerLanguageNameA @9 - VerLanguageNameW(a)12=kernel32.VerLanguageNameW @10 - VerQueryValueA@16 @11 - VerQueryValueW@16 @12 Modified: branches/cmake-bringup/dll/win32/wdmaud.drv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wdmaud.… ============================================================================== --- branches/cmake-bringup/dll/win32/wdmaud.drv/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wdmaud.drv/CMakeLists.txt [iso-8859-1] Fri Dec 24 18:37:44 2010 @@ -9,17 +9,17 @@ ${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 @@ mmixer) add_importlibs(wdmaud.drv user32 winmm advapi32 msvcrt setupapi ksuser kernel32 ntdll) - -add_cab_target(wdmaud.drv 1) +add_cab_target(wdmaud.drv 1) Removed: branches/cmake-bringup/dll/win32/wdmaud.drv/wdmaud.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wdmaud.… ============================================================================== --- branches/cmake-bringup/dll/win32/wdmaud.drv/wdmaud.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wdmaud.drv/wdmaud.def (removed) @@ -1,10 +1,0 @@ - -LIBRARY wdmaud.drv - -EXPORTS - DriverProc@20 @1 - mxdMessage@20 @2 - auxMessage@20 @3 - wodMessage@20 @4 - widMessage@20 @5 - modMessage@20 @6 Modified: branches/cmake-bringup/dll/win32/winfax/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winfax/… ============================================================================== --- branches/cmake-bringup/dll/win32/winfax/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/winfax/CMakeLists.txt [iso-8859-1] Fri Dec 24 18:37:44 2010 @@ -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) +add_cab_target(winfax 1) Removed: branches/cmake-bringup/dll/win32/winfax/winfax.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winfax/… ============================================================================== --- branches/cmake-bringup/dll/win32/winfax/winfax.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/winfax/winfax.def (removed) @@ -1,59 +1,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

1 0

[akhaldi] 50130: [CMAKE] - Delete some useless definition files. - Improve some modules.
by akhaldi＠svn.reactos.org 24 Dec '10

24 Dec '10

Author: akhaldi Date: Fri Dec 24 18:12:56 2010 New Revision: 50130 URL: http://svn.reactos.org/svn/reactos?rev=50130&view=rev Log: [CMAKE] - Delete some useless definition files. - Improve some modules. Removed: branches/cmake-bringup/dll/win32/actxprxy/actxprxy.def branches/cmake-bringup/dll/win32/advapi32/advapi32.def branches/cmake-bringup/dll/win32/advpack/advpack.def branches/cmake-bringup/dll/win32/avifil32/avifil32.def branches/cmake-bringup/dll/win32/beepmidi/beepmidi.pdef branches/cmake-bringup/dll/win32/comcat/comcat.def branches/cmake-bringup/dll/win32/compstui/compstui.def branches/cmake-bringup/dll/win32/gdi32/gdi32.pdef branches/cmake-bringup/dll/win32/hid/hid.def branches/cmake-bringup/dll/win32/hnetcfg/hnetcfg.def branches/cmake-bringup/dll/win32/iccvid/iccvid.def branches/cmake-bringup/dll/win32/imaadp32.acm/imaadp32.def branches/cmake-bringup/dll/win32/jscript/jscript.def branches/cmake-bringup/dll/win32/localui/localui.pdef branches/cmake-bringup/dll/win32/lpk/lpk.pdef branches/cmake-bringup/dll/win32/lz32/lz32.def branches/cmake-bringup/dll/win32/mciavi32/mciavi32.def branches/cmake-bringup/dll/win32/mcicda/mcicda.def branches/cmake-bringup/dll/win32/mciqtz32/mciqtz32.def branches/cmake-bringup/dll/win32/mciseq/mciseq.def branches/cmake-bringup/dll/win32/mciwave/mciwave.def branches/cmake-bringup/dll/win32/mmdrv/mmdrv.def branches/cmake-bringup/dll/win32/msadp32.acm/msadp32.def branches/cmake-bringup/dll/win32/msafd/msafd.def branches/cmake-bringup/dll/win32/msg711.acm/msg711.def branches/cmake-bringup/dll/win32/msgsm32.acm/msgsm32.def branches/cmake-bringup/dll/win32/msimg32/msimg32.def branches/cmake-bringup/dll/win32/msisys.ocx/msisys.def branches/cmake-bringup/dll/win32/msrle32/msrle32.def branches/cmake-bringup/dll/win32/msvcrt/msvcrt.def branches/cmake-bringup/dll/win32/msvidc32/msvidc32.def branches/cmake-bringup/dll/win32/mswsock/mswsock.def branches/cmake-bringup/dll/win32/ntmarta/ntmarta.def branches/cmake-bringup/dll/win32/objsel/objsel.def branches/cmake-bringup/dll/win32/oledlg/oledlg.def Modified: branches/cmake-bringup/dll/win32/msisys.ocx/CMakeLists.txt branches/cmake-bringup/dll/win32/msrle32/CMakeLists.txt branches/cmake-bringup/dll/win32/msvcrt/CMakeLists.txt branches/cmake-bringup/dll/win32/msvidc32/CMakeLists.txt branches/cmake-bringup/dll/win32/mswsock/CMakeLists.txt branches/cmake-bringup/dll/win32/netid/CMakeLists.txt branches/cmake-bringup/dll/win32/ntmarta/CMakeLists.txt branches/cmake-bringup/dll/win32/objsel/CMakeLists.txt branches/cmake-bringup/dll/win32/oledlg/CMakeLists.txt [This mail would be too long, it was shortened to contain the URLs only.] Removed: branches/cmake-bringup/dll/win32/actxprxy/actxprxy.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/actxprx… Removed: branches/cmake-bringup/dll/win32/advapi32/advapi32.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/advapi3… Removed: branches/cmake-bringup/dll/win32/advpack/advpack.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/advpack… Removed: branches/cmake-bringup/dll/win32/avifil32/avifil32.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/avifil3… Removed: branches/cmake-bringup/dll/win32/beepmidi/beepmidi.pdef URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/beepmid… Removed: branches/cmake-bringup/dll/win32/comcat/comcat.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/comcat/… Removed: branches/cmake-bringup/dll/win32/compstui/compstui.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/compstu… Removed: branches/cmake-bringup/dll/win32/gdi32/gdi32.pdef URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/gdi32/g… Removed: branches/cmake-bringup/dll/win32/hid/hid.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/hid/hid… Removed: branches/cmake-bringup/dll/win32/hnetcfg/hnetcfg.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/hnetcfg… Removed: branches/cmake-bringup/dll/win32/iccvid/iccvid.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/iccvid/… Removed: branches/cmake-bringup/dll/win32/imaadp32.acm/imaadp32.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/imaadp3… Removed: branches/cmake-bringup/dll/win32/jscript/jscript.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/jscript… Removed: branches/cmake-bringup/dll/win32/localui/localui.pdef URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/localui… Removed: branches/cmake-bringup/dll/win32/lpk/lpk.pdef URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/lpk/lpk… Removed: branches/cmake-bringup/dll/win32/lz32/lz32.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/lz32/lz… Removed: branches/cmake-bringup/dll/win32/mciavi32/mciavi32.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mciavi3… Removed: branches/cmake-bringup/dll/win32/mcicda/mcicda.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mcicda/… Removed: branches/cmake-bringup/dll/win32/mciqtz32/mciqtz32.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mciqtz3… Removed: branches/cmake-bringup/dll/win32/mciseq/mciseq.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mciseq/… Removed: branches/cmake-bringup/dll/win32/mciwave/mciwave.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mciwave… Removed: branches/cmake-bringup/dll/win32/mmdrv/mmdrv.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mmdrv/m… Removed: branches/cmake-bringup/dll/win32/msadp32.acm/msadp32.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msadp32… Removed: branches/cmake-bringup/dll/win32/msafd/msafd.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msafd/m… Removed: branches/cmake-bringup/dll/win32/msg711.acm/msg711.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msg711.… Removed: branches/cmake-bringup/dll/win32/msgsm32.acm/msgsm32.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msgsm32… Removed: branches/cmake-bringup/dll/win32/msimg32/msimg32.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msimg32… Modified: branches/cmake-bringup/dll/win32/msisys.ocx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msisys.… Removed: branches/cmake-bringup/dll/win32/msisys.ocx/msisys.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msisys.… Modified: branches/cmake-bringup/dll/win32/msrle32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msrle32… Removed: branches/cmake-bringup/dll/win32/msrle32/msrle32.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msrle32… Modified: branches/cmake-bringup/dll/win32/msvcrt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvcrt/… Removed: branches/cmake-bringup/dll/win32/msvcrt/msvcrt.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvcrt/… Modified: branches/cmake-bringup/dll/win32/msvidc32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvidc3… Removed: branches/cmake-bringup/dll/win32/msvidc32/msvidc32.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvidc3… Modified: branches/cmake-bringup/dll/win32/mswsock/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mswsock… Removed: branches/cmake-bringup/dll/win32/mswsock/mswsock.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mswsock… Modified: branches/cmake-bringup/dll/win32/netid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/netid/C… Modified: branches/cmake-bringup/dll/win32/ntmarta/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ntmarta… Removed: branches/cmake-bringup/dll/win32/ntmarta/ntmarta.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ntmarta… Modified: branches/cmake-bringup/dll/win32/objsel/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/objsel/… Removed: branches/cmake-bringup/dll/win32/objsel/objsel.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/objsel/… Modified: branches/cmake-bringup/dll/win32/oledlg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/oledlg/… Removed: branches/cmake-bringup/dll/win32/oledlg/oledlg.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/oledlg/…

1 0

[akhaldi] 50129: [CMAKE] - Add new-cc activation flag. Dedicated to arty.
by akhaldi＠svn.reactos.org 24 Dec '10

24 Dec '10

Author: akhaldi Date: Fri Dec 24 18:04:31 2010 New Revision: 50129 URL: http://svn.reactos.org/svn/reactos?rev=50129&view=rev Log: [CMAKE] - Add new-cc activation flag. Dedicated to arty. Modified: branches/cmake-bringup/ntoskrnl/CMakeLists.txt Modified: branches/cmake-bringup/ntoskrnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/CMakeLis… ============================================================================== --- branches/cmake-bringup/ntoskrnl/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/CMakeLists.txt [iso-8859-1] Fri Dec 24 18:04:31 2010 @@ -18,13 +18,35 @@ set_rc_compiler() +set(NEWCC FALSE) + +if(NEWCC) +add_definitions(-DNEWCC) +list(APPEND SOURCE + cache/cachesub.c + cache/copysup.c + cache/fssup.c + cache/lazyrite.c + cache/logsup.c + cache/mdlsup.c + cache/pinsup.c + cache/section/data.c + cache/section/fault.c + cache/section/io.c + cache/section/reqtools.c + cache/section/sptab.c + cache/section/swapout.c) +else() list(APPEND SOURCE cc/cacheman.c cc/copy.c cc/fs.c cc/mdl.c cc/pin.c - cc/view.c + cc/view.c) +endif() + +list(APPEND SOURCE config/cmalloc.c config/cmapi.c config/cmboot.c

1 0

[fireball] 50128: - If RosGdiGetDC is called with a NULL (or non-existing) hwnd, restrict any drawing operations on that DC.
by fireball＠svn.reactos.org 24 Dec '10

24 Dec '10

Author: fireball Date: Fri Dec 24 17:36:07 2010 New Revision: 50128 URL: http://svn.reactos.org/svn/reactos?rev=50128&view=rev Log: - If RosGdiGetDC is called with a NULL (or non-existing) hwnd, restrict any drawing operations on that DC. Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c [iso-8859-1] Fri Dec 24 17:36:07 2010 @@ -635,7 +635,17 @@ pDC = DC_LockDc(physDev); /* Get a pointer to this window */ - pDC->pWindow = SwmFindByHwnd(hwnd); + if (hwnd) + pDC->pWindow = SwmFindByHwnd(hwnd); + + /* Handle situation when drawing is forbidden */ + if (!hwnd || !pDC->pWindow) + { + /* Make up a dummy window object which will have empty visibility */ + pDC->pWindow = ExAllocatePool(PagedPool, sizeof(SWM_WINDOW)); + RtlZeroMemory(pDC->pWindow, sizeof(SWM_WINDOW)); + pDC->pWindow->Visible = create_empty_region(); + } /* Release the object */ DC_UnlockDc(pDC); @@ -650,6 +660,13 @@ /* Get a pointer to the DC */ pDC = DC_LockDc(physDev); + + /* Check if it was a dummy window */ + if (!pDC->pWindow->hwnd) + { + /* Free it */ + ExFreePool(pDC->pWindow); + } /* No window clipping is to be performed */ pDC->pWindow = NULL;

1 0

[fireball] 50127: - Support scenario when GetDC() is performed on an invisible window. Previously, this problem led to getting DC of a whole screen, but the proper solution is to restrict any drawi...
by fireball＠svn.reactos.org 24 Dec '10

24 Dec '10

Author: fireball Date: Fri Dec 24 17:34:14 2010 New Revision: 50127 URL: http://svn.reactos.org/svn/reactos?rev=50127&view=rev Log: - Support scenario when GetDC() is performed on an invisible window. Previously, this problem led to getting DC of a whole screen, but the proper solution is to restrict any drawing to such DC. This fixes drawing issues in GTK based apps. - Add get_device_rect (from Wine source code) and use it to map coordinates in Rectangle implementation. - Silence IsSelectionOwner() debug print. Modified: branches/arwinss/reactos/dll/win32/winent.drv/clipboard.c branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c Modified: branches/arwinss/reactos/dll/win32/winent.drv/clipboard.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/clipboard.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/clipboard.c [iso-8859-1] Fri Dec 24 17:34:14 2010 @@ -2437,7 +2437,7 @@ */ static BOOL NTDRV_CLIPBOARD_IsSelectionOwner(void) { - UNIMPLEMENTED; + //UNIMPLEMENTED; //return selectionAcquired; return TRUE; } Modified: branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] Fri Dec 24 17:34:14 2010 @@ -31,6 +31,38 @@ BOOL CDECL RosDrv_PatBlt( NTDRV_PDEVICE *physDev, INT left, INT top, INT width, INT height, DWORD rop ); +/* get the rectangle in device coordinates, with optional mirroring */ +static RECT get_device_rect( HDC hdc, int left, int top, int right, int bottom ) +{ + RECT rect; + + rect.left = left; + rect.top = top; + rect.right = right; + rect.bottom = bottom; + if (GetLayout( hdc ) & LAYOUT_RTL) + { + /* shift the rectangle so that the right border is included after mirroring */ + /* it would be more correct to do this after LPtoDP but that's not what Windows does */ + rect.left--; + rect.right--; + } + LPtoDP( hdc, (POINT *)&rect, 2 ); + if (rect.left > rect.right) + { + int tmp = rect.left; + rect.left = rect.right; + rect.right = tmp; + } + if (rect.top > rect.bottom) + { + int tmp = rect.top; + rect.top = rect.bottom; + rect.bottom = tmp; + } + return rect; +} + BOOL CDECL RosDrv_AlphaBlend(NTDRV_PDEVICE *physDevDst, INT xDst, INT yDst, INT widthDst, INT heightDst, NTDRV_PDEVICE *physDevSrc, INT xSrc, INT ySrc, INT widthSrc, INT heightSrc, BLENDFUNCTION blendfn) @@ -317,8 +349,6 @@ INT CDECL RosDrv_ExtEscape( NTDRV_PDEVICE *physDev, INT escape, INT in_count, LPCVOID in_data, INT out_count, LPVOID out_data ) { - HWND hwnd; - switch(escape) { case NTDRV_ESCAPE: @@ -333,10 +363,8 @@ RosGdiSetDcRects(physDev->hKernelDC, (RECT*)&data->dc_rect, (RECT*)&data->drawable_rect); - hwnd = GetAncestor(data->hwnd, GA_ROOT); - if (!data->release) - RosGdiGetDC(physDev->hKernelDC, hwnd, data->clip_children); + RosGdiGetDC(physDev->hKernelDC, data->hwnd, data->clip_children); else RosGdiReleaseDC(physDev->hKernelDC); @@ -613,11 +641,7 @@ BOOL CDECL RosDrv_Rectangle(NTDRV_PDEVICE *physDev, INT left, INT top, INT right, INT bottom) { POINT ptBrush; - RECT rc; - - /* Convert coordinates */ - SetRect(&rc, left, top, right, bottom); - LPtoDP(physDev->hUserDC, (POINT*)&rc, 2); + RECT rc = get_device_rect( physDev->hUserDC, left, top, right, bottom ); if ((rc.left == rc.right) || (rc.top == rc.bottom)) return TRUE; Modified: branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] Fri Dec 24 17:34:14 2010 @@ -360,40 +360,13 @@ { struct ntdrv_escape_set_drawable escape; struct ntdrv_win_data *data = NTDRV_get_win_data( hwnd ); + //HWND parent; escape.code = NTDRV_SET_DRAWABLE; escape.clip_children = FALSE; escape.gl_copy = FALSE; - escape.hwnd = hwnd; + escape.hwnd = 0; escape.release = FALSE; - - if (top == hwnd && data && IsIconic( hwnd ) /*&& data->icon_window*/) - { - //escape.drawable = data->icon_window; - } - else if (top == hwnd) - { - //escape.fbconfig_id = data ? data->fbconfig_id : (XID)GetPropA( hwnd, fbconfig_id_prop ); - /* GL draws to the client area even for window DCs */ - /*escape.gl_drawable = data ? data->client_window : X11DRV_get_client_window( hwnd ); - if (flags & DCX_WINDOW) - escape.drawable = data ? data->whole_window : X11DRV_get_whole_window( hwnd ); - else - escape.drawable = escape.gl_drawable;*/ - } - else - { - //escape.drawable = X11DRV_get_client_window( top ); - //escape.fbconfig_id = data ? data->fbconfig_id : (XID)GetPropA( hwnd, fbconfig_id_prop ); - //escape.gl_drawable = data ? data->gl_drawable : (Drawable)GetPropA( hwnd, gl_drawable_prop ); - //escape.pixmap = data ? data->pixmap : (Pixmap)GetPropA( hwnd, pixmap_prop ); - //escape.gl_copy = (escape.gl_drawable != 0); - - if (flags & DCX_CLIPCHILDREN) escape.clip_children = TRUE; - } - - //FIXME("hdc %x, hwnd %x, top %x\n win_rect %s, top_rect %s\n", hdc, hwnd, top, - // wine_dbgstr_rect(win_rect), wine_dbgstr_rect(top_rect)); escape.dc_rect.left = win_rect->left - top_rect->left; escape.dc_rect.top = win_rect->top - top_rect->top; @@ -403,6 +376,69 @@ escape.drawable_rect.top = top_rect->top; escape.drawable_rect.right = top_rect->right; escape.drawable_rect.bottom = top_rect->bottom; + + if (top == hwnd) + { + //if (flags & DCX_WINDOW) + { + if (data) + { + /* SWM window already exists */ + escape.hwnd = hwnd; + } + else + { + /* There is no SWM window for this hwnd. + If this is desktop, it's fine otherwise reject any drawing operations */ + if (hwnd == GetDesktopWindow()) + escape.hwnd = hwnd; + else + escape.hwnd = 0; + } + } + } + else + { +#if 0 + /* find the first ancestor that has a drawable */ + if (data) escape.hwnd = hwnd; + + for (parent = hwnd; parent && parent != top; parent = GetAncestor( parent, GA_PARENT )) + { + data = NTDRV_get_win_data( parent ); + if (data) + { + escape.hwnd = parent; + break; + } + } +FIXME("Found hwnd %x backed by an SWM window\n", escape.hwnd); + if (escape.hwnd) + { + POINT pt = { 0, 0 }; + MapWindowPoints( top, parent, &pt, 1 ); + //OffsetRect( &escape.dc_rect, pt.x, pt.y ); + //OffsetRect( &escape.drawable_rect, -pt.x, -pt.y ); + + FIXME("Offset by (%d, %d)\n", pt.x, pt.y); + } + else + { + if (NTDRV_get_win_data(top) || (top == GetDesktopWindow())) + { + /* SWM window already exists */ + escape.hwnd = top; + } + } +#else + escape.hwnd = GetAncestor(hwnd, GA_ROOT); +#endif + + if (flags & DCX_CLIPCHILDREN) escape.clip_children = TRUE; + } + + TRACE("hdc %x, hwnd %x, top %x\n win_rect %s, top_rect %s\n", hdc, hwnd, top, + wine_dbgstr_rect(win_rect), wine_dbgstr_rect(top_rect)); ExtEscape( hdc, NTDRV_ESCAPE, sizeof(escape), (LPSTR)&escape, 0, NULL ); }

1 0

[akhaldi] 50126: [CMAKE] - Improve some modules.
by akhaldi＠svn.reactos.org 24 Dec '10

24 Dec '10

Author: akhaldi Date: Fri Dec 24 16:12:23 2010 New Revision: 50126 URL: http://svn.reactos.org/svn/reactos?rev=50126&view=rev Log: [CMAKE] - Improve some modules. Modified: branches/cmake-bringup/base/services/rpcss/CMakeLists.txt branches/cmake-bringup/dll/win32/actxprxy/CMakeLists.txt branches/cmake-bringup/dll/win32/oleaut32/CMakeLists.txt branches/cmake-bringup/dll/win32/pstorec/CMakeLists.txt branches/cmake-bringup/dll/win32/stdole2.tlb/CMakeLists.txt branches/cmake-bringup/dll/win32/stdole32.tlb/CMakeLists.txt branches/cmake-bringup/dll/win32/sti/CMakeLists.txt Modified: branches/cmake-bringup/base/services/rpcss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/rpc… ============================================================================== --- branches/cmake-bringup/base/services/rpcss/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/services/rpcss/CMakeLists.txt [iso-8859-1] Fri Dec 24 16:12:23 2010 @@ -6,8 +6,6 @@ irotp.c rpcss_main.c service_main.c - epm.idl - irot.idl rpcss.rc) include_directories(${REACTOS_BINARY_DIR}/include/reactos/wine) Modified: branches/cmake-bringup/dll/win32/actxprxy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/actxprx… ============================================================================== --- branches/cmake-bringup/dll/win32/actxprxy/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/actxprxy/CMakeLists.txt [iso-8859-1] Fri Dec 24 16:12:23 2010 @@ -1,13 +1,14 @@ add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -add_library(actxprxy SHARED usrmarshal.c actxprxy.def) +spec2def(actxprxy.dll actxprxy.spec) -if(NOT MSVC) - set_source_files_properties(actxprxy.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +list(APPEND SOURCE + usrmarshal.c + ${CMAKE_CURRENT_BINARY_DIR}/actxprxy.def) + +add_library(actxprxy SHARED ${SOURCE}) set_entrypoint(actxprxy 0) Modified: branches/cmake-bringup/dll/win32/oleaut32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/oleaut3… ============================================================================== --- branches/cmake-bringup/dll/win32/oleaut32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/oleaut32/CMakeLists.txt [iso-8859-1] Fri Dec 24 16:12:23 2010 @@ -19,7 +19,6 @@ variant.c vartype.c oleaut32.rc - oleaut32_oaidl.idl ${CMAKE_CURRENT_BINARY_DIR}/oleaut32.def) remove_definitions(-D_WIN32_WINNT=0x502) Modified: branches/cmake-bringup/dll/win32/pstorec/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/pstorec… ============================================================================== --- branches/cmake-bringup/dll/win32/pstorec/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/pstorec/CMakeLists.txt [iso-8859-1] Fri Dec 24 16:12:23 2010 @@ -17,5 +17,5 @@ set_module_type(pstorec win32dll) target_link_libraries(pstorec uuid wine) add_importlibs(pstorec msvcrt kernel32 ntdll) -add_dependencies(pstorec pstorec_tlb pstorec_def) +add_dependencies(pstorec pstorec_tlb) add_cab_target(pstorec 1) Modified: branches/cmake-bringup/dll/win32/stdole2.tlb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/stdole2… ============================================================================== --- branches/cmake-bringup/dll/win32/stdole2.tlb/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/stdole2.tlb/CMakeLists.txt [iso-8859-1] Fri Dec 24 16:12:23 2010 @@ -6,8 +6,11 @@ spec2def(stdole2.tlb stdole2.tlb.spec) -add_library(stdole2.tlb SHARED rsrc.rc +list(APPEND SOURCE + rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/stdole2.def) + +add_library(stdole2.tlb SHARED ${SOURCE}) set_entrypoint(stdole2.tlb 0) set_target_properties(stdole2.tlb PROPERTIES SUFFIX "") Modified: branches/cmake-bringup/dll/win32/stdole32.tlb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/stdole3… ============================================================================== --- branches/cmake-bringup/dll/win32/stdole32.tlb/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/stdole32.tlb/CMakeLists.txt [iso-8859-1] Fri Dec 24 16:12:23 2010 @@ -6,9 +6,11 @@ spec2def(stdole32.tlb stdole32.tlb.spec) -add_library(stdole32.tlb SHARED +list(APPEND SOURCE rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/stdole32.def) + +add_library(stdole32.tlb SHARED ${SOURCE}) set_entrypoint(stdole32.tlb 0) set_target_properties(stdole32.tlb PROPERTIES SUFFIX "") Modified: branches/cmake-bringup/dll/win32/sti/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/sti/CMa… ============================================================================== --- branches/cmake-bringup/dll/win32/sti/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/sti/CMakeLists.txt [iso-8859-1] Fri Dec 24 16:12:23 2010 @@ -10,16 +10,15 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -add_library(sti SHARED +spec2def(sti.dll sti.spec) + +list(APPEND SOURCE regsvr.c sti.c sti_main.c - sti_wia.idl - sti.def) + ${CMAKE_CURRENT_BINARY_DIR}/sti.def) -if(NOT MSVC) - set_source_files_properties(sti.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +add_library(sti SHARED ${SOURCE}) set_entrypoint(sti 0)

1 0

[akhaldi] 50125: [CMAKE] - Add msi, qmgr and qmgrprxy to build.
by akhaldi＠svn.reactos.org 24 Dec '10

24 Dec '10

Author: akhaldi Date: Fri Dec 24 14:25:10 2010 New Revision: 50125 URL: http://svn.reactos.org/svn/reactos?rev=50125&view=rev Log: [CMAKE] - Add msi, qmgr and qmgrprxy to build. Added: branches/cmake-bringup/dll/win32/qmgr/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/qmgrprxy/CMakeLists.txt (with props) Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt branches/cmake-bringup/dll/win32/msi/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/CMakeLi… ============================================================================== --- branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] Fri Dec 24 14:25:10 2010 @@ -137,8 +137,8 @@ add_subdirectory(printui) add_subdirectory(psapi) add_subdirectory(pstorec) -#add_subdirectory(qmgr) -#add_subdirectory(qmgrprxy) +add_subdirectory(qmgr) +add_subdirectory(qmgrprxy) add_subdirectory(query) add_subdirectory(rasadhlp) add_subdirectory(rasapi32) Modified: branches/cmake-bringup/dll/win32/msi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msi/CMa… ============================================================================== --- branches/cmake-bringup/dll/win32/msi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msi/CMakeLists.txt [iso-8859-1] Fri Dec 24 14:25:10 2010 @@ -1,84 +1,92 @@ - -spec2def(msi.dll msi.spec) - -if (0) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) -add_library(msi SHARED - action.c - alter.c - appsearch.c - automation.c - classes.c - cond.tab.c - create.c</file> - custom.c</file> - database.c</file> - delete.c</file> - dialog.c</file> - distinct.c</file> - drop.c</file> - events.c</file> - files.c</file> - font.c</file> - format.c</file> - handle.c</file> - helpers.c</file> - insert.c</file> - install.c</file> - join.c</file> - media.c</file> - msi.c</file> - msi_main.c</file> - msiquery.c</file> - package.c</file> - preview.c</file> - record.c</file> - registry.c</file> - regsvr.c</file> - script.c</file> - select.c</file> - source.c</file> - sql.tab.c</file> - storages.c</file> - streams.c</file> - string.c</file> - suminfo.c</file> - table.c</file> - tokenize.c</file> - update.c</file> - upgrade.c</file> - where.c</file> - msi.rc</file> - ${CMAKE_CURRENT_BINARY_DIR}/msi.def) +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) + +spec2def(msi.dll msi.spec) + +add_idl_interface(msiserver.idl) + +list(APPEND SOURCE + action.c + alter.c + appsearch.c + automation.c + classes.c + cond.tab.c + create.c + custom.c + database.c + delete.c + dialog.c + distinct.c + drop.c + events.c + files.c + font.c + format.c + handle.c + helpers.c + insert.c + install.c + join.c + media.c + msi.c + msi_main.c + msiquery.c + package.c + preview.c + record.c + registry.c + regsvr.c + script.c + select.c + source.c + sql.tab.c + storages.c + streams.c + string.c + suminfo.c + table.c + tokenize.c + update.c + upgrade.c + where.c + msi.rc + ${CMAKE_CURRENT_BINARY_DIR}/msiserver_i.c + ${CMAKE_CURRENT_BINARY_DIR}/msi.def) + +add_library(msi SHARED ${SOURCE}) + +add_interface_definitions(msi_idlheader msiserver.idl) + +add_typelib(msi_tlb msiserver.idl) set_module_type(msi win32dll) -target_link_libraries(msi wine uuid PSEH_LIB) +target_link_libraries(msi uuid ${PSEH_LIB} wine) + +add_dependencies(msi msi_idlheader msi_tlb) add_importlibs(msi - kernel32 - urlmon - wininet - comctl32 - shell32 - shlwapi - cabinet - oleaut32 - ole32 - version - user32 - gdi32 - advapi32 - odbccp32 - ntdll) - -# <library>msiserver_interface</library> -# <dependency>msiserver</dependency> -# <dependency>msiheader</dependency> + advapi32 + cabinet + comctl32 + gdi32 + odbccp32 + ole32 + oleaut32 + shell32 + shlwapi + urlmon + user32 + version + wininet + msvcrt + kernel32 + ntdll) add_cab_target(msi 1) -endif() add_importlib_target(msi.spec) Added: branches/cmake-bringup/dll/win32/qmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/qmgr/CM… ============================================================================== --- branches/cmake-bringup/dll/win32/qmgr/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/qmgr/CMakeLists.txt [iso-8859-1] Fri Dec 24 14:25:10 2010 @@ -1,0 +1,30 @@ + +add_definitions(-D__WINESRC__) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_idl_interface(qmgr_local.idl) + +spec2def(qmgr.dll qmgr.spec) + +list(APPEND SOURCE + enum_files.c + enum_jobs.c + factory.c + file.c + job.c + qmgr.c + qmgr_main.c + service.c + rsrc.rc + ${CMAKE_CURRENT_BINARY_DIR}/qmgr_local_i.c + ${CMAKE_CURRENT_BINARY_DIR}/qmgr.def) + +add_library(qmgr SHARED ${SOURCE}) + +add_interface_definitions(qmgr_idlheader qmgr_local.idl) + +set_module_type(qmgr win32dll) +target_link_libraries(qmgr uuid wine) +add_importlibs(qmgr ole32 wininet urlmon advapi32 msvcrt kernel32 ntdll) +add_cab_target(qmgr 1) +add_dependencies(qmgr qmgr_idlheader) Propchange: branches/cmake-bringup/dll/win32/qmgr/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/qmgrprxy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/qmgrprx… ============================================================================== --- branches/cmake-bringup/dll/win32/qmgrprxy/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/qmgrprxy/CMakeLists.txt [iso-8859-1] Fri Dec 24 14:25:10 2010 @@ -1,0 +1,24 @@ + +add_definitions( + -D__WINESRC__ + -DREGISTER_PROXY_DLL) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_idl_interface(qmgrprxy.idl) + +spec2def(qmgrprxy.dll qmgrprxy.spec) + +list(APPEND SOURCE + version.rc + ${CMAKE_CURRENT_BINARY_DIR}/qmgrprxy_i.c + ${CMAKE_CURRENT_BINARY_DIR}/qmgrprxy.def) + +add_library(qmgrprxy SHARED ${SOURCE}) + +rpcproxy(qmgrprxy qmgrprxy.idl) + +set_module_type(qmgrprxy win32dll) +target_link_libraries(qmgrprxy qmgrprxy_proxy ${PSEH_LIB} wine) +add_importlibs(qmgrprxy rpcrt4 msvcrt kernel32 ntdll) +add_cab_target(qmgrprxy 1) Propchange: branches/cmake-bringup/dll/win32/qmgrprxy/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 50124: [CMAKE] - Improve formatting, mainly the uppercase macro names. No functionality change.
by akhaldi＠svn.reactos.org 24 Dec '10

24 Dec '10

Author: akhaldi Date: Fri Dec 24 13:38:27 2010 New Revision: 50124 URL: http://svn.reactos.org/svn/reactos?rev=50124&view=rev Log: [CMAKE] - Improve formatting, mainly the uppercase macro names. No functionality change. Modified: branches/cmake-bringup/CMakeMacros.cmake branches/cmake-bringup/dll/win32/atl/CMakeLists.txt branches/cmake-bringup/dll/win32/jscript/CMakeLists.txt branches/cmake-bringup/dll/win32/mshtml.tlb/CMakeLists.txt branches/cmake-bringup/dll/win32/mshtml/CMakeLists.txt branches/cmake-bringup/dll/win32/msxml3/CMakeLists.txt branches/cmake-bringup/dll/win32/ole32/CMakeLists.txt branches/cmake-bringup/dll/win32/pstorec/CMakeLists.txt branches/cmake-bringup/dll/win32/shdocvw/CMakeLists.txt branches/cmake-bringup/dll/win32/stdole2.tlb/CMakeLists.txt branches/cmake-bringup/dll/win32/stdole32.tlb/CMakeLists.txt branches/cmake-bringup/include/dxsdk/CMakeLists.txt branches/cmake-bringup/include/psdk/CMakeLists.txt branches/cmake-bringup/include/reactos/idl/CMakeLists.txt branches/cmake-bringup/include/reactos/wine/CMakeLists.txt Modified: branches/cmake-bringup/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeMacros.cmake… ============================================================================== --- branches/cmake-bringup/CMakeMacros.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/CMakeMacros.cmake [iso-8859-1] Fri Dec 24 13:38:27 2010 @@ -1,8 +1,7 @@ - if (NOT MSVC) -MACRO(CreateBootSectorTarget _target_name _asm_file _object_file) - + +macro(CreateBootSectorTarget _target_name _asm_file _object_file) get_filename_component(OBJECT_PATH ${_object_file} PATH) get_filename_component(OBJECT_NAME ${_object_file} NAME) file(MAKE_DIRECTORY ${OBJECT_PATH}) @@ -11,11 +10,11 @@ foreach(arg ${defines}) set(result_defs ${result_defs} -D${arg}) - endforeach(arg ${defines}) + endforeach() foreach(arg ${includes}) set(result_incs -I${arg} ${result_incs}) - endforeach(arg ${includes}) + endforeach() add_custom_command( OUTPUT ${_object_file} @@ -24,88 +23,91 @@ set_source_files_properties(${_object_file} PROPERTIES GENERATED TRUE) add_custom_target(${_target_name} ALL DEPENDS ${_object_file}) add_minicd(${_object_file} loader ${OBJECT_NAME}) -ENDMACRO(CreateBootSectorTarget _target_name _asm_file _object_file) +endmacro() + else() -MACRO(CreateBootSectorTarget _target_name _asm_file _object_file) -ENDMACRO() + +macro(CreateBootSectorTarget _target_name _asm_file _object_file) +endmacro() + endif() -MACRO(MACRO_IDL_COMPILE_OBJECT OBJECT SOURCE) - GET_PROPERTY(FLAGS SOURCE ${SOURCE} PROPERTY COMPILE_FLAGS) - GET_PROPERTY(DEFINES SOURCE ${SOURCE} PROPERTY COMPILE_DEFINITIONS) - GET_PROPERTY(INCLUDE_DIRECTORIES DIRECTORY PROPERTY INCLUDE_DIRECTORIES) - FOREACH(DIR ${INCLUDE_DIRECTORIES}) - SET(FLAGS "${FLAGS} -I${DIR}") - ENDFOREACH() - - SET(IDL_COMMAND ${CMAKE_IDL_COMPILE_OBJECT}) - STRING(REPLACE "<CMAKE_IDL_COMPILER>" "${CMAKE_IDL_COMPILER}" IDL_COMMAND "${IDL_COMMAND}") - STRING(REPLACE <FLAGS> "${FLAGS}" IDL_COMMAND "${IDL_COMMAND}") - STRING(REPLACE "<DEFINES>" "${DEFINES}" IDL_COMMAND "${IDL_COMMAND}") - STRING(REPLACE "<OBJECT>" "${OBJECT}" IDL_COMMAND "${IDL_COMMAND}") - STRING(REPLACE "<SOURCE>" "${SOURCE}" IDL_COMMAND "${IDL_COMMAND}") - SEPARATE_ARGUMENTS(IDL_COMMAND) - - ADD_CUSTOM_COMMAND( - OUTPUT ${OBJECT} - COMMAND ${IDL_COMMAND} - DEPENDS ${SOURCE} - VERBATIM - ) -ENDMACRO() - -MACRO(ADD_INTERFACE_DEFINITIONS TARGET) - FOREACH(SOURCE ${ARGN}) - GET_FILENAME_COMPONENT(FILE ${SOURCE} NAME_WE) - SET(OBJECT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}.h) - MACRO_IDL_COMPILE_OBJECT(${OBJECT} ${CMAKE_CURRENT_SOURCE_DIR}/${SOURCE}) - LIST(APPEND OBJECTS ${OBJECT}) - ENDFOREACH() - ADD_CUSTOM_TARGET(${TARGET} ALL DEPENDS ${OBJECTS}) -ENDMACRO() - -MACRO(add_minicd_target _targetname _dir) # optional parameter: _nameoncd +macro(idl_compile_object OBJECT SOURCE) + get_property(FLAGS SOURCE ${SOURCE} PROPERTY COMPILE_FLAGS) + get_property(DEFINES SOURCE ${SOURCE} PROPERTY COMPILE_DEFINITIONS) + get_property(INCLUDE_DIRECTORIES DIRECTORY PROPERTY INCLUDE_DIRECTORIES) + + foreach(DIR ${INCLUDE_DIRECTORIES}) + set(FLAGS "${FLAGS} -I${DIR}") + endforeach() + + set(IDL_COMMAND ${CMAKE_IDL_COMPILE_OBJECT}) + string(REPLACE "<CMAKE_IDL_COMPILER>" "${CMAKE_IDL_COMPILER}" IDL_COMMAND "${IDL_COMMAND}") + string(REPLACE <FLAGS> "${FLAGS}" IDL_COMMAND "${IDL_COMMAND}") + string(REPLACE "<DEFINES>" "${DEFINES}" IDL_COMMAND "${IDL_COMMAND}") + string(REPLACE "<OBJECT>" "${OBJECT}" IDL_COMMAND "${IDL_COMMAND}") + string(REPLACE "<SOURCE>" "${SOURCE}" IDL_COMMAND "${IDL_COMMAND}") + separate_arguments(IDL_COMMAND) + + add_custom_command( + OUTPUT ${OBJECT} + COMMAND ${IDL_COMMAND} + DEPENDS ${SOURCE} + VERBATIM) +endmacro() + +macro(add_interface_definitions TARGET) + foreach(SOURCE ${ARGN}) + get_filename_component(FILE ${SOURCE} NAME_WE) + set(OBJECT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}.h) + idl_compile_object(${OBJECT} ${CMAKE_CURRENT_SOURCE_DIR}/${SOURCE}) + list(APPEND OBJECTS ${OBJECT}) + endforeach() + add_custom_target(${TARGET} ALL DEPENDS ${OBJECTS}) +endmacro() + +macro(add_minicd_target _targetname _dir) # optional parameter: _nameoncd if("${ARGN}" STREQUAL "") get_target_property(FILENAME ${_targetname} LOCATION) - get_filename_component(_nameoncd ${FILENAME} NAME) - else() - set(_nameoncd ${ARGN}) + get_filename_component(_nameoncd ${FILENAME} NAME) + else() + set(_nameoncd ${ARGN}) endif() file(APPEND ${REACTOS_BINARY_DIR}/boot/ros_minicd_target.txt "${_targetname}\t${_dir}\t${_nameoncd}\n") -ENDMACRO(add_minicd_target) - -MACRO(add_minicd FILENAME _dir _nameoncd) +endmacro() + +macro(add_minicd FILENAME _dir _nameoncd) file(APPEND ${REACTOS_BINARY_DIR}/boot/ros_minicd.txt "${FILENAME}\t${_dir}\t${_nameoncd}\n") -ENDMACRO(add_minicd) +endmacro() macro(set_cpp) - include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/c++/stlport) - set(IS_CPP 1) - add_definitions( - -DNATIVE_CPP_INCLUDE=${REACTOS_SOURCE_DIR}/include/c++ - -DNATIVE_C_INCLUDE=${REACTOS_SOURCE_DIR}/include/crt) -endmacro() - -MACRO(add_livecd_target _targetname _dir )# optional parameter : _nameoncd + include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/c++/stlport) + set(IS_CPP 1) + add_definitions( + -DNATIVE_CPP_INCLUDE=${REACTOS_SOURCE_DIR}/include/c++ + -DNATIVE_C_INCLUDE=${REACTOS_SOURCE_DIR}/include/crt) +endmacro() + +macro(add_livecd_target _targetname _dir )# optional parameter : _nameoncd if("${ARGN}" STREQUAL "") get_target_property(FILENAME ${_targetname} LOCATION) - get_filename_component(_nameoncd ${FILENAME} NAME) - else() - set(_nameoncd ${ARGN}) + get_filename_component(_nameoncd ${FILENAME} NAME) + else() + set(_nameoncd ${ARGN}) endif() file(APPEND ${REACTOS_BINARY_DIR}/boot/ros_livecd_target.txt "${_targetname}\t${_dir}\t${_nameoncd}\n") -ENDMACRO(add_livecd_target) - -MACRO(add_livecd FILENAME _dir)# optional parameter : _nameoncd +endmacro() + +macro(add_livecd FILENAME _dir)# optional parameter : _nameoncd if("${ARGN}" STREQUAL "") - get_filename_component(_nameoncd ${FILENAME} NAME) - else() - set(_nameoncd ${ARGN}) + get_filename_component(_nameoncd ${FILENAME} NAME) + else() + set(_nameoncd ${ARGN}) endif() file(APPEND ${REACTOS_BINARY_DIR}/boot/ros_livecd.txt "${FILENAME}\t${_dir}\t${_nameoncd}\n") -ENDMACRO(add_livecd) +endmacro() macro(cab_to_dir _dir_num _var_name) # 1 = system32 @@ -137,17 +139,17 @@ endif() endmacro() -MACRO(add_cab_target _targetname _num ) +macro(add_cab_target _targetname _num ) file(APPEND ${REACTOS_BINARY_DIR}/boot/ros_cab_target.txt "${_targetname}\t${_num}\n") cab_to_dir(${_num} _dir) add_livecd_target(${_targetname} ${_dir}) -ENDMACRO(add_cab_target) - -MACRO(add_cab FILENAME _num) +endmacro() + +macro(add_cab FILENAME _num) file(APPEND ${REACTOS_BINARY_DIR}/boot/ros_cab.txt "${FILENAME}\t${_num}\n") cab_to_dir(${_num} _dir) add_livecd(${FILENAME} ${_dir}) -ENDMACRO(add_cab) +endmacro() macro(custom_incdefs) if(NOT DEFINED result_incs) #rpc_defines @@ -156,17 +158,17 @@ foreach(arg ${rpc_defines}) set(result_defs ${result_defs} -D${arg}) - endforeach(arg ${defines}) + endforeach() foreach(arg ${rpc_includes}) set(result_incs -I${arg} ${result_incs}) - endforeach(arg ${includes}) - endif() -endmacro(custom_incdefs) + endforeach() + endif() +endmacro() macro(rpcproxy TARGET) custom_incdefs() - list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c) + list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c) foreach(_in_FILE ${ARGN}) get_filename_component(FILE ${_in_FILE} NAME_WE) @@ -183,7 +185,7 @@ add_custom_target(${TARGET}_${FILE}_p DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.c) #add_dependencies(${TARGET}_proxy ${TARGET}_${FILE}_p) - endforeach(_in_FILE ${ARGN}) + endforeach() add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c @@ -195,9 +197,9 @@ add_library(${TARGET}_proxy ${SOURCE}) add_dependencies(${TARGET}_proxy psdk ${PROXY_DEPENDS}) -endmacro(rpcproxy) - -macro (MACRO_IDL_FILES) +endmacro() + +macro(idl_files) custom_incdefs() foreach(_in_FILE ${ARGN}) get_filename_component(FILE ${_in_FILE} NAME_WE) @@ -220,28 +222,29 @@ PROPERTIES GENERATED TRUE) add_library(${FILE}_client ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.c) add_dependencies(${FILE}_client psdk) - endforeach(_in_FILE ${ARGN}) - -endmacro (MACRO_IDL_FILES) - -macro(ADD_TYPELIB TARGET) - custom_incdefs() - foreach(SOURCE ${ARGN}) - get_filename_component(FILE ${SOURCE} NAME_WE) - set(OBJECT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}.tlb) - add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}.tlb - COMMAND ${IDL_COMPILER} ${result_incs} ${IDL_FLAGS} ${IDL_TYPELIB_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${FILE}.tlb ${CMAKE_CURRENT_SOURCE_DIR}/${SOURCE} - DEPENDS ${SOURCE}) - list(APPEND OBJECTS ${OBJECT}) - endforeach() - add_custom_target(${TARGET} ALL DEPENDS ${OBJECTS}) + endforeach() +endmacro() + +macro(add_typelib TARGET) + custom_incdefs() + foreach(SOURCE ${ARGN}) + get_filename_component(FILE ${SOURCE} NAME_WE) + set(OBJECT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}.tlb) + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}.tlb + COMMAND ${IDL_COMPILER} ${result_incs} ${IDL_FLAGS} ${IDL_TYPELIB_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${FILE}.tlb ${CMAKE_CURRENT_SOURCE_DIR}/${SOURCE} + DEPENDS ${SOURCE}) + list(APPEND OBJECTS ${OBJECT}) + endforeach() + add_custom_target(${TARGET} ALL DEPENDS ${OBJECTS}) endmacro() macro(add_idl_interface IDL_FILE) custom_incdefs() get_filename_component(FILE ${IDL_FILE} NAME_WE) - add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_i.c - COMMAND ${IDL_COMPILER} ${result_incs} ${result_defs} -m32 --win32 -u -U ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_i.c ${CMAKE_CURRENT_SOURCE_DIR}/${IDL_FILE} - DEPENDS ${IDL_FILE}) + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_i.c + COMMAND ${IDL_COMPILER} ${result_incs} ${result_defs} -m32 --win32 -u -U ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_i.c ${CMAKE_CURRENT_SOURCE_DIR}/${IDL_FILE} + DEPENDS ${IDL_FILE}) set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${FILE}_i.c PROPERTIES GENERATED TRUE) endmacro() Modified: branches/cmake-bringup/dll/win32/atl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/atl/CMa… ============================================================================== --- branches/cmake-bringup/dll/win32/atl/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/atl/CMakeLists.txt [iso-8859-1] Fri Dec 24 13:38:27 2010 @@ -6,7 +6,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -ADD_INTERFACE_DEFINITIONS(atl_atliface_header atliface.idl) +add_interface_definitions(atl_atliface_header atliface.idl) set_rc_compiler() spec2def(atl.dll atl.spec) Modified: branches/cmake-bringup/dll/win32/jscript/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/jscript… ============================================================================== --- branches/cmake-bringup/dll/win32/jscript/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/jscript/CMakeLists.txt [iso-8859-1] Fri Dec 24 13:38:27 2010 @@ -1,5 +1,5 @@ -ADD_TYPELIB(jsglobal jsglobal.idl) +add_typelib(jsglobal jsglobal.idl) add_dependencies(jsglobal stdole2) remove_definitions(-D_WIN32_WINNT=0x502) Modified: branches/cmake-bringup/dll/win32/mshtml.tlb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mshtml.… ============================================================================== --- branches/cmake-bringup/dll/win32/mshtml.tlb/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mshtml.tlb/CMakeLists.txt [iso-8859-1] Fri Dec 24 13:38:27 2010 @@ -1,5 +1,5 @@ -ADD_TYPELIB(mshtml_tlb mshtml_tlb.idl) +add_typelib(mshtml_tlb mshtml_tlb.idl) add_dependencies(mshtml_tlb stdole2) add_definitions(-D__WINESRC__) Modified: branches/cmake-bringup/dll/win32/mshtml/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mshtml/… ============================================================================== --- branches/cmake-bringup/dll/win32/mshtml/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mshtml/CMakeLists.txt [iso-8859-1] Fri Dec 24 13:38:27 2010 @@ -9,7 +9,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -ADD_INTERFACE_DEFINITIONS(mshtml_nsiface_header nsiface.idl) +add_interface_definitions(mshtml_nsiface_header nsiface.idl) set_rc_compiler() Modified: branches/cmake-bringup/dll/win32/msxml3/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msxml3/… ============================================================================== --- branches/cmake-bringup/dll/win32/msxml3/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msxml3/CMakeLists.txt [iso-8859-1] Fri Dec 24 13:38:27 2010 @@ -1,4 +1,5 @@ -ADD_TYPELIB(msxml3_v1 msxml3_v1.idl) + +add_typelib(msxml3_v1 msxml3_v1.idl) add_dependencies(msxml3_v1 stdole2) remove_definitions(-D_WIN32_WINNT=0x502) Modified: branches/cmake-bringup/dll/win32/ole32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ole32/C… ============================================================================== --- branches/cmake-bringup/dll/win32/ole32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/ole32/CMakeLists.txt [iso-8859-1] Fri Dec 24 13:38:27 2010 @@ -54,7 +54,8 @@ ${CMAKE_CURRENT_BINARY_DIR} ${REACTOS_SOURCE_DIR}/include/reactos/wine) -ADD_INTERFACE_DEFINITIONS(ole32idl dcom.idl irot.idl) +add_interface_definitions(ole32idl dcom.idl irot.idl) + rpcproxy(ole32 dcom.idl ole32_unknwn.idl Modified: branches/cmake-bringup/dll/win32/pstorec/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/pstorec… ============================================================================== --- branches/cmake-bringup/dll/win32/pstorec/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/pstorec/CMakeLists.txt [iso-8859-1] Fri Dec 24 13:38:27 2010 @@ -1,5 +1,5 @@ -ADD_TYPELIB(pstorec_tlb pstorec_tlb.idl) +add_typelib(pstorec_tlb pstorec_tlb.idl) add_dependencies(pstorec_tlb stdole2) add_definitions(-D__WINESRC__) @@ -15,12 +15,7 @@ add_library(pstorec SHARED ${SOURCE}) set_module_type(pstorec win32dll) - -target_link_libraries(pstorec - uuid - wine) - +target_link_libraries(pstorec uuid wine) add_importlibs(pstorec msvcrt kernel32 ntdll) - add_dependencies(pstorec pstorec_tlb pstorec_def) add_cab_target(pstorec 1) Modified: branches/cmake-bringup/dll/win32/shdocvw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shdocvw… ============================================================================== --- branches/cmake-bringup/dll/win32/shdocvw/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shdocvw/CMakeLists.txt [iso-8859-1] Fri Dec 24 13:38:27 2010 @@ -1,9 +1,8 @@ -ADD_TYPELIB(shdocvw_v1 shdocvw_v1.idl) +add_typelib(shdocvw_v1 shdocvw_v1.idl) add_dependencies(shdocvw_v1 stdole2) add_definitions(-D_SHDOCVW_) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(shdocvw.dll shdocvw.spec) Modified: branches/cmake-bringup/dll/win32/stdole2.tlb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/stdole2… ============================================================================== --- branches/cmake-bringup/dll/win32/stdole2.tlb/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/stdole2.tlb/CMakeLists.txt [iso-8859-1] Fri Dec 24 13:38:27 2010 @@ -1,9 +1,8 @@ add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -ADD_TYPELIB(std_ole_v2 std_ole_v2.idl) +add_typelib(std_ole_v2 std_ole_v2.idl) spec2def(stdole2.tlb stdole2.tlb.spec) @@ -12,8 +11,5 @@ set_entrypoint(stdole2.tlb 0) set_target_properties(stdole2.tlb PROPERTIES SUFFIX "") - - - add_dependencies(stdole2.tlb std_ole_v2) add_cab_target(stdole2.tlb 1) Modified: branches/cmake-bringup/dll/win32/stdole32.tlb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/stdole3… ============================================================================== --- branches/cmake-bringup/dll/win32/stdole32.tlb/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/stdole32.tlb/CMakeLists.txt [iso-8859-1] Fri Dec 24 13:38:27 2010 @@ -1,13 +1,13 @@ add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -ADD_TYPELIB(std_ole_v1 std_ole_v1.idl) +add_typelib(std_ole_v1 std_ole_v1.idl) spec2def(stdole32.tlb stdole32.tlb.spec) -add_library(stdole32.tlb SHARED rsrc.rc +add_library(stdole32.tlb SHARED + rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/stdole32.def) set_entrypoint(stdole32.tlb 0) Modified: branches/cmake-bringup/include/dxsdk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/dxsdk/CMa… ============================================================================== --- branches/cmake-bringup/include/dxsdk/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/include/dxsdk/CMakeLists.txt [iso-8859-1] Fri Dec 24 13:38:27 2010 @@ -1,5 +1,5 @@ -LIST(APPEND SOURCE +list(APPEND SOURCE amstream.idl amvideo.idl austream.idl @@ -24,4 +24,4 @@ #vmrender.idl ) -ADD_INTERFACE_DEFINITIONS(dxsdk ${SOURCE}) +add_interface_definitions(dxsdk ${SOURCE}) Modified: branches/cmake-bringup/include/psdk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/CMak… ============================================================================== --- branches/cmake-bringup/include/psdk/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/include/psdk/CMakeLists.txt [iso-8859-1] Fri Dec 24 13:38:27 2010 @@ -1,5 +1,5 @@ -LIST(APPEND SOURCE +list(APPEND SOURCE # access.idl activaut.idl activdbg.idl @@ -103,10 +103,9 @@ if(NOT MSVC) LIST(APPEND SOURCE wincodec.idl - wuapi.idl -) + wuapi.idl) endif() -ADD_INTERFACE_DEFINITIONS(psdk ${SOURCE}) +add_interface_definitions(psdk ${SOURCE}) -ADD_TYPELIB(stdole2 stdole2.idl) +add_typelib(stdole2 stdole2.idl) Modified: branches/cmake-bringup/include/reactos/idl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/i… ============================================================================== --- branches/cmake-bringup/include/reactos/idl/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/include/reactos/idl/CMakeLists.txt [iso-8859-1] Fri Dec 24 13:38:27 2010 @@ -7,7 +7,9 @@ svcctl.idl wlansvc.idl) -MACRO_IDL_FILES(${SOURCE}) +idl_files(${SOURCE}) + remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) -MACRO_IDL_FILES(pnp.idl) + +idl_files(pnp.idl) Modified: branches/cmake-bringup/include/reactos/wine/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/w… ============================================================================== --- branches/cmake-bringup/include/reactos/wine/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/include/reactos/wine/CMakeLists.txt [iso-8859-1] Fri Dec 24 13:38:27 2010 @@ -1,9 +1,9 @@ -ADD_INTERFACE_DEFINITIONS(wineheaders itss.idl wined3d.idl) +add_interface_definitions(wineheaders itss.idl wined3d.idl) list(APPEND SOURCE epm.idl irot.idl) -MACRO_IDL_FILES(${SOURCE}) -ADD_INTERFACE_DEFINITIONS(winesdk ${SOURCE}) +idl_files(${SOURCE}) +add_interface_definitions(winesdk ${SOURCE})

1 0

[akhaldi] 50123: [CMAKE] - Fix shell32. - Fix and enable mstask.
by akhaldi＠svn.reactos.org 24 Dec '10

24 Dec '10

Author: akhaldi Date: Fri Dec 24 12:23:19 2010 New Revision: 50123 URL: http://svn.reactos.org/svn/reactos?rev=50123&view=rev Log: [CMAKE] - Fix shell32. - Fix and enable mstask. Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt branches/cmake-bringup/dll/win32/mstask/CMakeLists.txt branches/cmake-bringup/dll/win32/shell32/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/CMakeLi… ============================================================================== --- branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] Fri Dec 24 12:23:19 2010 @@ -100,7 +100,7 @@ add_subdirectory(msrle32) add_subdirectory(mssign32) add_subdirectory(mssip32) -#add_subdirectory(mstask) +add_subdirectory(mstask) add_subdirectory(msvcrt) #add_subdirectory(msvcrt20) FIX spec2def #add_subdirectory(msvcrt40) FIX spec2def Modified: branches/cmake-bringup/dll/win32/mstask/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mstask/… ============================================================================== --- branches/cmake-bringup/dll/win32/mstask/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mstask/CMakeLists.txt [iso-8859-1] Fri Dec 24 12:23:19 2010 @@ -5,28 +5,30 @@ add_definitions(-DWINVER=0x600) remove_definitions(-D_WIN32_WINNT=0x502) -add_definitions(-D__WINESRC__) +add_definitions(-D_WIN32_WINNT=0x600) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +add_idl_interface(mstask_local.idl) + spec2def(mstask.dll mstask.spec) -add_library(mstask SHARED +list(APPEND SOURCE factory.c mstask_main.c task.c task_scheduler.c task_trigger.c rsrc.rc + ${CMAKE_CURRENT_BINARY_DIR}/mstask_local_i.c ${CMAKE_CURRENT_BINARY_DIR}/mstask.def) + +add_library(mstask SHARED ${SOURCE}) set_module_type(mstask win32dll) -target_link_libraries(mstask - mstask_local_interface - uuid - wine) +target_link_libraries(mstask uuid wine) -add_importlibs(mstask ole32 ntdll) +add_importlibs(mstask ole32 msvcrt kernel32 ntdll) add_cab_target(mstask 1) Modified: branches/cmake-bringup/dll/win32/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… ============================================================================== --- branches/cmake-bringup/dll/win32/shell32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shell32/CMakeLists.txt [iso-8859-1] Fri Dec 24 12:23:19 2010 @@ -1,3 +1,18 @@ + +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) + +add_definitions( + -D_SHELL32_ + -DCOM_NO_WINDOWS_H + -D_WINE) + +include_directories( + ${REACTOS_SOURCE_DIR}/include/reactos/wine + ${REACTOS_SOURCE_DIR}/lib/recyclebin + ${REACTOS_SOURCE_DIR}) + +add_idl_interface(shobjidl_local.idl) spec2def(shell32.dll shell32.spec) @@ -56,20 +71,8 @@ shv_item_new.c folder_options.c shell32.rc + ${CMAKE_CURRENT_BINARY_DIR}/shobjidl_local_i.c ${CMAKE_CURRENT_BINARY_DIR}/shell32.def) - -remove_definitions(-D_WIN32_WINNT=0x502) -add_definitions(-D_WIN32_WINNT=0x600) - -add_definitions( - -D_SHELL32_ - -DCOM_NO_WINDOWS_H - -D_WINE) - -include_directories( - ${REACTOS_SOURCE_DIR}/include/reactos/wine - ${REACTOS_SOURCE_DIR}/lib/recyclebin - ${REACTOS_SOURCE_DIR}) add_pch(shell32 ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})

1 0

[tkreuzer] 50122: [CMAKE] Don't compile telnet and explorer on MSVC for now
by tkreuzer＠svn.reactos.org 24 Dec '10

24 Dec '10

Author: tkreuzer Date: Fri Dec 24 12:13:17 2010 New Revision: 50122 URL: http://svn.reactos.org/svn/reactos?rev=50122&view=rev Log: [CMAKE] Don't compile telnet and explorer on MSVC for now Modified: branches/cmake-bringup/base/applications/network/CMakeLists.txt branches/cmake-bringup/base/shell/CMakeLists.txt Modified: branches/cmake-bringup/base/applications/network/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/network/CMakeLists.txt [iso-8859-1] Fri Dec 24 12:13:17 2010 @@ -9,6 +9,8 @@ add_subdirectory(nslookup) add_subdirectory(ping) add_subdirectory(route) +if(NOT MSVC) add_subdirectory(telnet) +endif() add_subdirectory(tracert) add_subdirectory(whois) Modified: branches/cmake-bringup/base/shell/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/CMakeL… ============================================================================== --- branches/cmake-bringup/base/shell/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/shell/CMakeLists.txt [iso-8859-1] Fri Dec 24 12:13:17 2010 @@ -1,4 +1,7 @@ add_subdirectory(cmd) +if(NOT MSVC) add_subdirectory(explorer) +endif() add_subdirectory(explorer-new) +

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs