Ros-diffs October 2010

ros-diffs@reactos.org

20 participants
435 discussions

[jimtabor] 48975: [PSDK] - Add more track popup menu types.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Oct 4 15:41:25 2010 New Revision: 48975 URL: http://svn.reactos.org/svn/reactos?rev=48975&view=rev Log: [PSDK] - Add more track popup menu types. Modified: trunk/reactos/include/psdk/winuser.h Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winuser.h [iso-8859-1] Mon Oct 4 15:41:25 2010 @@ -2340,6 +2340,15 @@ #define TPM_HORNEGANIMATION 0x0800 #define TPM_VERPOSANIMATION 0x1000 #define TPM_VERNEGANIMATION 0x2000 +#endif +#if(_WIN32_WINNT >= 0x0500) +#define TPM_NOANIMATION 16384 +#endif +#if (_WIN32_WINNT >= 0x0501) +#define TPM_LAYOUTRTL 32768 +#endif +#if (_WIN32_WINNT >= 0x0601) +#define TPM_WORKAREA 65536 #endif #define HELP_COMMAND 0x102 #define HELP_CONTENTS 3

14 years, 2 months

[akhaldi] 48974: [CMAKE] - Fix bzip2.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Oct 4 07:11:54 2010 New Revision: 48974 URL: http://svn.reactos.org/svn/reactos?rev=48974&view=rev Log: [CMAKE] - Fix bzip2. Modified: branches/cmake-bringup/lib/3rdparty/bzip2/CMakeLists.txt Modified: branches/cmake-bringup/lib/3rdparty/bzip2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/bzip… ============================================================================== --- branches/cmake-bringup/lib/3rdparty/bzip2/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/bzip2/CMakeLists.txt [iso-8859-1] Mon Oct 4 07:11:54 2010 @@ -1,6 +1,21 @@ add_definitions(-DBZ_NO_STDIO -DBZ_DECOMPRESS_ONLY) -file(GLOB_RECURSE SOURCE "*.c") -LIST(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/compress.c ${CMAKE_CURRENT_SOURCE_DIR}/randtable.c ${CMAKE_CURRENT_SOURCE_DIR}/bzip2recover.c ${CMAKE_CURRENT_SOURCE_DIR}/blocksort.c ${CMAKE_CURRENT_SOURCE_DIR}/bzip2.c ${CMAKE_CURRENT_SOURCE_DIR}/dlltest.c ${CMAKE_CURRENT_SOURCE_DIR}/spewG.c ${CMAKE_CURRENT_SOURCE_DIR}/unzcrash.c) +spec2def(bzip2 ${CMAKE_CURRENT_SOURCE_DIR}/unbzip2.spec ${CMAKE_CURRENT_BINARY_DIR}/unbzip2.def) -add_library(bzip2 ${SOURCE}) +list(APPEND SOURCE + bzlib.c + randtable.c + crctable.c + decompress.c + huffman.c + dllmain.c) + +add_library(bzip2 SHARED ${SOURCE}) + +set_target_properties(bzip2 PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--subsystem,native" OUTPUT_NAME "unbzip2") + +target_link_libraries(bzip2 ${CMAKE_CURRENT_BINARY_DIR}/unbzip2.def) + +add_importlibs(bzip2 ntoskrnl) + +add_dependencies(bzip2 bzip2_def bugcodes)

14 years, 2 months

[akhaldi] 48973: [CMAKE] - Add almost all base applications (some are included but disabled too). This is the work of a human being, so no bots BS, no rbuildism, every single module was tested, bui...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Oct 3 22:26:21 2010 New Revision: 48973 URL: http://svn.reactos.org/svn/reactos?rev=48973&view=rev Log: [CMAKE] - Add almost all base applications (some are included but disabled too). This is the work of a human being, so no bots BS, no rbuildism, every single module was tested, built with the new build system mentality (no defines and linked libs redundancy, use of the the available macros, the linked libs are carefully selected, the dependencies are correctly tracked... etc) - Brought to you by Alexey Komarov, with my humble review. Added: branches/cmake-bringup/base/applications/dxdiag/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/kbswitch/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/kbswitch/kbsdll/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/logoff/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/magnify/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/mmc/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/mplay32/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/msconfig/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/mscutils/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/mscutils/devmgmt/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/mscutils/eventvwr/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/mscutils/servman/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/mstsc/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/network/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/network/arp/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/network/dwnl/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/network/finger/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/network/ftp/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/network/ipconfig/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/network/net/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/network/netstat/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/network/nslookup/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/network/ping/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/network/route/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/network/telnet/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/network/tracert/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/network/whois/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/paint/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/regedit/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/regedt32/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/sc/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/shutdown/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/sndrec32/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/sndvol32/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/taskmgr/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/winhlp32/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/winver/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/write/CMakeLists.txt (with props) Modified: branches/cmake-bringup/base/applications/CMakeLists.txt Modified: branches/cmake-bringup/base/applications/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -4,33 +4,33 @@ add_subdirectory(charmap) add_subdirectory(cmdutils) add_subdirectory(control) -#add_subdirectory(dxdiag) +add_subdirectory(dxdiag) add_subdirectory(extrac32) add_subdirectory(fontview) add_subdirectory(games) add_subdirectory(hh) add_subdirectory(iexplore) -#add_subdirectory(kbswitch) -#add_subdirectory(logoff) -#add_subdirectory(magnify) +add_subdirectory(kbswitch) +add_subdirectory(logoff) +add_subdirectory(magnify) #add_subdirectory(mmc) -#add_subdirectory(mplay32) -#add_subdirectory(msconfig) -#add_subdirectory(mscutils) -#add_subdirectory(mstsc) -#add_subdirectory(network) +add_subdirectory(mplay32) +add_subdirectory(msconfig) +add_subdirectory(mscutils) +add_subdirectory(mstsc) +add_subdirectory(network) #add_subdirectory(notepad) -#add_subdirectory(paint) +add_subdirectory(paint) #add_subdirectory(rapps) #add_subdirectory(regedit) -#add_subdirectory(regedt32) -#add_subdirectory(sc) +add_subdirectory(regedt32) +add_subdirectory(sc) #add_subdirectory(screensavers) -#add_subdirectory(shutdown) -#add_subdirectory(sndrec32) -#add_subdirectory(sndvol32) -#add_subdirectory(taskmgr) -#add_subdirectory(winhlp32) -#add_subdirectory(winver) +add_subdirectory(shutdown) +add_subdirectory(sndrec32) +add_subdirectory(sndvol32) +add_subdirectory(taskmgr) +add_subdirectory(winhlp32) +add_subdirectory(winver) #add_subdirectory(wordpad) -#add_subdirectory(write) +add_subdirectory(write) Added: branches/cmake-bringup/base/applications/dxdiag/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/dxdiag/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/dxdiag/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,30 @@ + +set_unicode() + +list(APPEND SOURCE + system.c + display.c + sound.c + music.c + input.c + network.c + help.c + dxdiag.c + dxdiag.rc + ddtest.c + d3dtest.c + d3dtest7.c + d3dtest8.c + d3dtest9.c) + +add_executable(dxdiag + ${CMAKE_CURRENT_BINARY_DIR}/dxdiag_precomp.h.gch + ${SOURCE}) + +add_pch(dxdiag ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) + +set_module_type(dxdiag win32gui) + +target_link_libraries(dxdiag dxguid) + +add_importlibs(dxdiag user32 advapi32 comctl32 dinput8 setupapi dsound ddraw version gdi32 winmm d3d9 msvcrt) Propchange: branches/cmake-bringup/base/applications/dxdiag/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/kbswitch/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/kbswitch/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/kbswitch/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,9 @@ + +set_unicode() + +add_executable(kbswitch kbswitch.c kbswitch.rc) + +set_module_type(kbswitch win32gui) +add_importlibs(kbswitch advapi32 user32 shell32 gdi32 msvcrt) + +add_subdirectory(kbsdll) Propchange: branches/cmake-bringup/base/applications/kbswitch/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/kbswitch/kbsdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/kbswitch/kbsdll/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/kbswitch/kbsdll/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,13 @@ + +set_unicode() + +add_library(kbsdll SHARED kbsdll.c kbsdll.rc) + +spec2def(kbsdll ${CMAKE_CURRENT_SOURCE_DIR}/kbsdll.spec ${CMAKE_CURRENT_BINARY_DIR}/kbsdll.def) + +target_link_libraries(kbsdll ${CMAKE_CURRENT_BINARY_DIR}/kbsdll.def) + +set_module_type(kbsdll win32dll) +add_importlibs(kbsdll user32 comctl32 kernel32) + +add_dependencies(kbsdll kbsdll_def) Propchange: branches/cmake-bringup/base/applications/kbswitch/kbsdll/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/logoff/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/logoff/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/logoff/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,13 @@ + +list(APPEND SOURCE + misc.c + logoff.c + logoff.rc) + +add_executable(logoff ${CMAKE_CURRENT_BINARY_DIR}/logoff_precomp.h.gch ${SOURCE}) + +add_pch(logoff ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) + +set_module_type(logoff win32cui) + +add_importlibs(logoff advapi32 user32 msvcrt) Propchange: branches/cmake-bringup/base/applications/logoff/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/magnify/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/magnify/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/magnify/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,9 @@ + +add_executable(magnify + magnifier.c + settings.c + magnify.rc) + +set_module_type(magnify win32gui) + +add_importlibs(magnify user32 gdi32 advapi32 shell32 msvcrt) Propchange: branches/cmake-bringup/base/applications/magnify/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/mmc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/mmc/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/mmc/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,16 @@ + +set_unicode() + +list(APPEND SOURCE + console.c + misc.c + mmc.c + mmc.rc) + +add_executable(mmcclient ${CMAKE_CURRENT_BINARY_DIR}/mmcclient_precomp.h.gch ${SOURCE}) + +add_pch(mmcclient ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) + +set_module_type(mmcclient win32gui) + +add_importlibs(mmcclient user32 gdi32 comdlg32 advapi32 shell32 comctl32 msvcrt) Propchange: branches/cmake-bringup/base/applications/mmc/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/mplay32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/mplay32/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/mplay32/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,8 @@ + +set_unicode() + +add_executable(mplay32 mplay32.c mplay32.rc) + +set_module_type(mplay32 win32gui) + +add_importlibs(mplay32 advapi32 comctl32 comdlg32 user32 gdi32 winmm shell32 msvcrt) Propchange: branches/cmake-bringup/base/applications/mplay32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/msconfig/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/msconfig/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/msconfig/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,20 @@ + +set_unicode() + +list(APPEND SOURCE + toolspage.c + srvpage.c + systempage.c + startuppage.c + freeldrpage.c + generalpage.c + msconfig.c + msconfig.rc) + +add_executable(msconfig ${CMAKE_CURRENT_BINARY_DIR}/msconfig_precomp.h.gch ${SOURCE}) + +add_pch(msconfig ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) + +set_module_type(msconfig win32gui) + +add_importlibs(msconfig user32 advapi32 version comctl32 shell32 shlwapi msvcrt) Propchange: branches/cmake-bringup/base/applications/msconfig/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/mscutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/mscutils/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/mscutils/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,4 @@ + +add_subdirectory(devmgmt) +add_subdirectory(eventvwr) +add_subdirectory(servman) Propchange: branches/cmake-bringup/base/applications/mscutils/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/mscutils/devmgmt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/mscutils/devmgmt/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/mscutils/devmgmt/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,18 @@ + +set_unicode() + +list(APPEND SOURCE + about.c + devmgmt.c + enumdevices.c + mainwnd.c + misc.c + devmgmt.rc) + +add_executable(devmgmt ${CMAKE_CURRENT_BINARY_DIR}/devmgmt_precomp.h.gch ${SOURCE}) + +add_pch(devmgmt ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) + +set_module_type(devmgmt win32gui) + +add_importlibs(devmgmt setupapi gdi32 user32 comctl32 advapi32 devmgr msvcrt) Propchange: branches/cmake-bringup/base/applications/mscutils/devmgmt/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/mscutils/eventvwr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/mscutils/eventvwr/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/mscutils/eventvwr/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,8 @@ + +set_unicode() + +add_executable(eventvwr eventvwr.c eventvwr.rc) + +set_module_type(eventvwr win32gui) + +add_importlibs(eventvwr user32 comctl32 advapi32 msvcrt) Propchange: branches/cmake-bringup/base/applications/mscutils/eventvwr/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/mscutils/servman/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/mscutils/servman/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/mscutils/servman/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,32 @@ + +set_unicode() + +list(APPEND SOURCE + about.c + control.c + create.c + delete.c + dependencies_tv1.c + dependencies_tv2.c + export.c + listview.c + mainwnd.c + misc.c + progress.c + propsheet.c + propsheet_depends.c + propsheet_general.c + query.c + servman.c + start.c + stop.c + stop_dependencies.c + servman.rc) + +add_executable(servman ${CMAKE_CURRENT_BINARY_DIR}/servman_precomp.h.gch ${SOURCE}) + +add_pch(servman ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) + +set_module_type(servman win32gui) + +add_importlibs(servman user32 gdi32 advapi32 version comctl32 shell32 comdlg32 msvcrt) Propchange: branches/cmake-bringup/base/applications/mscutils/servman/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/mstsc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/mstsc/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/mstsc/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,32 @@ + +set_unicode() + +list(APPEND SOURCE + bitmap.c + bsops.c + cache.c + channels.c + connectdialog.c + iso.c + licence.c + mcs.c + mppc.c + orders.c + pstcache.c + rdp5.c + rdp.c + secure.c + settings.c + ssl_calls.c + tcp.c + uimain.c + win32.c + rdc.rc) + +add_executable(mstsc ${CMAKE_CURRENT_BINARY_DIR}/mstsc_precomp.h.gch ${SOURCE}) + +add_pch(mstsc ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) + +set_module_type(mstsc win32gui) + +add_importlibs(mstsc user32 gdi32 comctl32 ws2_32 advapi32 shell32 ole32 comdlg32 msvcrt) Propchange: branches/cmake-bringup/base/applications/mstsc/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ branches/cmake-bringup/base/applications/network/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,14 @@ + +add_subdirectory(arp) +#add_subdirectory(dwnl) +add_subdirectory(finger) +#add_subdirectory(ftp) +add_subdirectory(ipconfig) +add_subdirectory(net) +add_subdirectory(netstat) +add_subdirectory(nslookup) +add_subdirectory(ping) +#add_subdirectory(route) +add_subdirectory(telnet) +add_subdirectory(tracert) +#add_subdirectory(whois) Propchange: branches/cmake-bringup/base/applications/network/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/network/arp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/arp/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/network/arp/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,6 @@ + +add_executable(arp arp.c arp.rc) + +set_module_type(arp win32cui) + +add_importlibs(arp iphlpapi ws2_32 shlwapi msvcrt) Propchange: branches/cmake-bringup/base/applications/network/arp/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/network/dwnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/dwnl/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/network/dwnl/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,10 @@ + +set_unicode() + +add_executable(dwnl dwnl.c) + +set_module_type(dwnl win32cui) + +target_link_libraries(dwnl uuid) + +add_importlibs(dwnl urlmon wininet uuid msvcrt) Propchange: branches/cmake-bringup/base/applications/network/dwnl/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/network/finger/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/finger/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/network/finger/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,12 @@ +add_definitions(-D__USE_W32_SOCKETS) + +add_executable(finger + finger.c + err.c + getopt.c + net.c + finger.rc) + +set_module_type(finger win32cui) + +add_importlibs(finger ws2_32 msvcrt) Propchange: branches/cmake-bringup/base/applications/network/finger/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/network/ftp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/ftp/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/network/ftp/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,13 @@ +add_executable(ftp + cmds.c + cmdtab.c + domacro.c + fake.c + ftp.c + main.c + ruserpass.c + ftp.rc) + +set_module_type(ftp win32cui) + +add_importlibs(ftp ws2_32 iphlpapi msvcrt) Propchange: branches/cmake-bringup/base/applications/network/ftp/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/network/ipconfig/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/ipconfig/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/network/ipconfig/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,6 @@ + +add_executable(ipconfig ipconfig.c ipconfig.rc) + +set_module_type(ipconfig win32cui) + +add_importlibs(ipconfig user32 iphlpapi advapi32 msvcrt) Propchange: branches/cmake-bringup/base/applications/network/ipconfig/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/network/net/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/net/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/network/net/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,15 @@ + +add_definitions(-D__USE_W32_SOCKETS) + +list(APPEND SOURCE + main.c + cmdstart.c + cmdStop.c + help.c + process.c) + +add_executable(net ${SOURCE}) + +set_module_type(net win32cui) + +add_importlibs(net ws2_32 msvcrt) Propchange: branches/cmake-bringup/base/applications/network/net/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/network/netstat/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/netstat/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/network/netstat/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,6 @@ + +add_executable(netstat netstat.c netstat.rc) + +set_module_type(netstat win32cui) + +add_importlibs(netstat user32 ws2_32 snmpapi iphlpapi msvcrt) Propchange: branches/cmake-bringup/base/applications/network/netstat/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/network/nslookup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/nslookup/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/network/nslookup/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,9 @@ + +add_executable(nslookup + nslookup.c + utility.c + nslookup.rc) + +set_module_type(nslookup win32cui) + +add_importlibs(nslookup user32 ws2_32 snmpapi iphlpapi msvcrt) Propchange: branches/cmake-bringup/base/applications/network/nslookup/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/network/ping/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/ping/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/network/ping/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,7 @@ +add_definitions(-D__USE_W32_SOCKETS) + +add_executable(ping ping.c ping.rc) + +set_module_type(ping win32cui) + +add_importlibs(ping ws2_32 msvcrt) Propchange: branches/cmake-bringup/base/applications/network/ping/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/network/route/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/route/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/network/route/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,7 @@ + +set_unicode() + +add_executable(route route.c route.rc) + +set_module_type(route win32cui) +add_importlibs(route ws2_32 iphlpapi msvcrt) Propchange: branches/cmake-bringup/base/applications/network/route/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/network/telnet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/telnet/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/network/telnet/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,27 @@ +add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE) + +add_executable(telnet + src/ansiprsr.cpp + src/keytrans.cpp + src/tcharmap.cpp + src/tconsole.cpp + src/tkeydef.cpp + src/tkeymap.cpp + src/tmapldr.cpp + src/tmouse.cpp + src/tnclass.cpp + src/tnclip.cpp + src/tncon.cpp + src/tnconfig.cpp + src/tnerror.cpp + src/tnetwork.cpp + src/tnmain.cpp + src/tnmisc.cpp + src/tscript.cpp + src/tscroll.cpp + src/ttelhndl.cpp + telnet.rc) + +set_module_type(telnet win32cui) + +add_importlibs(telnet ws2_32 user32 msvcrt) Propchange: branches/cmake-bringup/base/applications/network/telnet/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/network/tracert/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/tracert/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/network/tracert/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,7 @@ +add_definitions(-D__USE_W32_SOCKETS) + +add_executable(tracert tracert.c tracert.rc) + +set_module_type(tracert win32cui) + +add_importlibs(tracert ws2_32 msvcrt) Propchange: branches/cmake-bringup/base/applications/network/tracert/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/network/whois/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/whois/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/network/whois/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,6 @@ + +add_executable(whois whois.c whois.rc) + +set_module_type(whois win32cui) + +add_importlibs(whois ws2_32 msvcrt) Propchange: branches/cmake-bringup/base/applications/network/whois/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/paint/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/paint/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/paint/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,21 @@ + +set_unicode() + +add_executable(paint + dialogs.c + dib.c + drawing.c + history.c + main.c + mouse.c + palette.c + registry.c + selection.c + sizebox.c + toolsettings.c + winproc.c + rsrc.rc) + +set_module_type(paint win32gui) + +add_importlibs(paint comdlg32 shell32 user32 gdi32 advapi32 comctl32 msvcrt) Propchange: branches/cmake-bringup/base/applications/paint/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/regedit/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/regedit/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/regedit/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,31 @@ + +set_unicode() + +include_directories(BEFORE .) + +list(APPEND SOURCE + about.c + childwnd.c + edit.c + find.c + framewnd.c + hexedit.c + listview.c + main.c + regedit.c + regproc.c + security.c + treeview.c + regedit.rc) + +add_pch(regedit ${CMAKE_CURRENT_SOURCE_DIR}/regedit.h ${SOURCE}) + +add_executable(regedit ${CMAKE_CURRENT_BINARY_DIR}/regedit_regedit.h.gch ${SOURCE}) + +set_module_type(regedit win32gui) + +target_link_libraries(regedit uuid) + +add_importlibs(regedit user32 gdi32 advapi32 ole32 shell32 comctl32 comdlg32 shlwapi msvcrt) + +#add_subdirectory(clb) Propchange: branches/cmake-bringup/base/applications/regedit/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/regedt32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/regedt32/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/regedt32/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,8 @@ + +set_unicode() + +add_executable(regedt32 regedt32.c resource.rc) + +set_module_type(regedt32 win32gui) + +add_importlibs(regedt32 shell32 shlwapi msvcrt) Propchange: branches/cmake-bringup/base/applications/regedt32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/sc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/sc/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/sc/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,22 @@ + +set_unicode() +add_definitions(-DDEFINE_GUID) + +list(APPEND SOURCE + control.c + create.c + delete.c + print.c + query.c + sc.c + start.c + usage.c + sc.rc) + +add_executable(sc ${CMAKE_CURRENT_BINARY_DIR}/sc_sc.h.gch ${SOURCE}) + +add_pch(sc ${CMAKE_CURRENT_SOURCE_DIR}/sc.h ${SOURCE}) + +set_module_type(sc win32cui) + +add_importlibs(sc advapi32 msvcrt) Propchange: branches/cmake-bringup/base/applications/sc/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/shutdown/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/shutdown/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/shutdown/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,13 @@ + +list(APPEND SOURCE + misc.c + shutdown.c + shutdown.rc) + +add_executable(shutdown ${CMAKE_CURRENT_BINARY_DIR}/shutdown_precomp.h.gch ${SOURCE}) + +add_pch(shutdown ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) + +set_module_type(shutdown win32cui) + +add_importlibs(shutdown advapi32 user32 msvcrt) Propchange: branches/cmake-bringup/base/applications/shutdown/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/sndrec32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/sndrec32/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/sndrec32/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,15 @@ + +add_executable(sndrec32 + audio_format.cpp + audio_membuffer.cpp + audio_producer.cpp + audio_receiver.cpp + audio_resampler_acm.cpp + audio_wavein.cpp + audio_waveout.cpp + sndrec32.cpp + rsrc.rc) + +set_module_type(sndrec32 win32gui) + +add_importlibs(sndrec32 winmm user32 msacm32 comctl32 comdlg32 gdi32 msvcrt) Propchange: branches/cmake-bringup/base/applications/sndrec32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/sndvol32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/sndvol32/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/sndvol32/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,16 @@ + +set_unicode() + +list(APPEND SOURCE + misc.c + mixer.c + sndvol32.c + sndvol32.rc) + +add_executable(sndvol32 ${CMAKE_CURRENT_BINARY_DIR}/sndvol32_sndvol32.h.gch ${SOURCE}) + +add_pch(sndvol32 ${CMAKE_CURRENT_SOURCE_DIR}/sndvol32.h ${SOURCE}) + +set_module_type(sndvol32 win32gui) + +add_importlibs(sndvol32 user32 advapi32 gdi32 comctl32 shell32 winmm msvcrt) Propchange: branches/cmake-bringup/base/applications/sndvol32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/taskmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/taskmgr/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/taskmgr/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,31 @@ + +set_unicode() + +list(APPEND SOURCE + about.c + affinity.c + applpage.c + column.c + dbgchnl.c + debug.c + endproc.c + graph.c + optnmenu.c + perfdata.c + perfpage.c + priority.c + procpage.c + proclist.c + run.c + trayicon.c + taskmgr.c + graphctl.c + taskmgr.rc) + +add_executable(taskmgr ${CMAKE_CURRENT_BINARY_DIR}/taskmgr_precomp.h.gch ${SOURCE}) + +add_pch(taskmgr ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) + +set_module_type(taskmgr win32gui) + +add_importlibs(taskmgr advapi32 user32 gdi32 shell32 comctl32 msvcrt) Propchange: branches/cmake-bringup/base/applications/taskmgr/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/winhlp32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/winhlp32/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/winhlp32/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,21 @@ +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_definitions(-D__ROS_LONG64__) +add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE) +add_definitions(-Dfileno=_fileno) +add_definitions(-Disatty=_isatty) + +add_executable(winhlp32 + callback.c + hlpfile.c + macro.c + string.c + winhelp.c + lex.yy.c + rsrc.rc) + +set_module_type(winhlp32 win32gui) + +target_link_libraries(winhlp32 wine) + +add_importlibs(winhlp32 user32 gdi32 shell32 comctl32 comdlg32 msvcrt) Propchange: branches/cmake-bringup/base/applications/winhlp32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/winver/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/winver/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/winver/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,8 @@ + +set_unicode() + +add_executable(winver winver.c) + +set_module_type(winver win32gui) + +add_importlibs(winver shell32 msvcrt) Propchange: branches/cmake-bringup/base/applications/winver/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/write/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/write/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/write/CMakeLists.txt [iso-8859-1] Sun Oct 3 22:26:21 2010 @@ -1,0 +1,8 @@ + +set_unicode() + +add_executable(write write.c rsrc.rc) + +set_module_type(write win32gui) + +add_importlibs(write user32 gdi32 msvcrt) Propchange: branches/cmake-bringup/base/applications/write/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

14 years, 2 months

[akhaldi] 48972: [CMAKE] - Improve win32csr. - Add libdevmgr.a

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Oct 3 21:57:08 2010 New Revision: 48972 URL: http://svn.reactos.org/svn/reactos?rev=48972&view=rev Log: [CMAKE] - Improve win32csr. - Add libdevmgr.a Added: branches/cmake-bringup/importlibs/libdevmgr.a (with props) Modified: branches/cmake-bringup/subsystems/win32/csrss/win32csr/CMakeLists.txt Added: branches/cmake-bringup/importlibs/libdevmgr.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libdev… ============================================================================== Binary file - no diff available. Propchange: branches/cmake-bringup/importlibs/libdevmgr.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: branches/cmake-bringup/subsystems/win32/csrss/win32csr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… ============================================================================== --- branches/cmake-bringup/subsystems/win32/csrss/win32csr/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/subsystems/win32/csrss/win32csr/CMakeLists.txt [iso-8859-1] Sun Oct 3 21:57:08 2010 @@ -1,9 +1,10 @@ -include_directories(BEFORE .) -include_directories(${REACTOS_SOURCE_DIR}/subsystems/win32/csrss/include) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/drivers) -include_directories(${REACTOS_SOURCE_DIR}/dll/cpl/console) +include_directories( + BEFORE . + ${REACTOS_SOURCE_DIR}/subsystems/win32/csrss/include + ${REACTOS_SOURCE_DIR}/include/reactos/subsys + ${REACTOS_SOURCE_DIR}/include/reactos/drivers + ${REACTOS_SOURCE_DIR}/dll/cpl/console) spec2def(win32csr ${CMAKE_CURRENT_SOURCE_DIR}/win32csr.spec ${CMAKE_CURRENT_BINARY_DIR}/win32csr.def) @@ -34,8 +35,8 @@ set_module_type(win32csr win32dll) -add_importlibs(win32csr ntdll user32 gdi32 advapi32 psapi) +add_importlibs(win32csr user32 gdi32 advapi32 psapi kernel32 ntdll) add_pch(win32csr ${CMAKE_CURRENT_SOURCE_DIR}/w32csr.h ${SOURCE}) -add_dependencies(win32csr win32csr_def psdk bugcodes) +add_dependencies(win32csr win32csr_def bugcodes)

14 years, 2 months

[spetreolle] 48971: Merge 48968 to 0.3.12 branch.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Sun Oct 3 21:33:31 2010 New Revision: 48971 URL: http://svn.reactos.org/svn/reactos?rev=48971&view=rev Log: Merge 48968 to 0.3.12 branch. Modified: branches/ros-branch-0_3_12/reactos/drivers/network/ndis/ndis/time.c Modified: branches/ros-branch-0_3_12/reactos/drivers/network/ndis/ndis/time.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_12/reactos/drive… ============================================================================== --- branches/ros-branch-0_3_12/reactos/drivers/network/ndis/ndis/time.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_12/reactos/drivers/network/ndis/ndis/time.c [iso-8859-1] Sun Oct 3 21:33:31 2010 @@ -145,7 +145,7 @@ * - call at IRQL <= DISPATCH_LEVEL */ { - KIRQL OldIrql; + //KIRQL OldIrql; ASSERT_IRQL(DISPATCH_LEVEL); ASSERT(TimerCancelled); @@ -153,6 +153,7 @@ *TimerCancelled = KeCancelTimer (&Timer->Timer); +#if 0 if (*TimerCancelled) { KeAcquireSpinLock(&Timer->Miniport->Lock, &OldIrql); @@ -160,6 +161,7 @@ if (!DequeueMiniportTimer(Timer)) ASSERT(FALSE); KeReleaseSpinLock(&Timer->Miniport->Lock, OldIrql); } +#endif } VOID NTAPI @@ -170,6 +172,7 @@ { PNDIS_MINIPORT_TIMER Timer = DeferredContext; +#if 0 /* Only dequeue if the timer has a period of 0 */ if (!Timer->Timer.Period) { @@ -178,6 +181,7 @@ if (!DequeueMiniportTimer(Timer)) ASSERT(FALSE); KeReleaseSpinLockFromDpcLevel(&Timer->Miniport->Lock); } +#endif Timer->MiniportTimerFunction(Dpc, Timer->MiniportTimerContext, @@ -240,14 +244,15 @@ */ { LARGE_INTEGER Timeout; - KIRQL OldIrql; + //KIRQL OldIrql; ASSERT_IRQL(DISPATCH_LEVEL); ASSERT(Timer); /* relative delays are negative, absolute are positive; resolution is 100ns */ Timeout.QuadPart = Int32x32To64(MillisecondsPeriod, -10000); - + +#if 0 /* Lock the miniport block */ KeAcquireSpinLock(&Timer->Miniport->Lock, &OldIrql); @@ -260,6 +265,7 @@ /* Unlock the miniport block */ KeReleaseSpinLock(&Timer->Miniport->Lock, OldIrql); +#endif KeSetTimerEx(&Timer->Timer, Timeout, MillisecondsPeriod, &Timer->Dpc); } @@ -285,7 +291,7 @@ */ { LARGE_INTEGER Timeout; - KIRQL OldIrql; + //KIRQL OldIrql; ASSERT_IRQL(DISPATCH_LEVEL); ASSERT(Timer); @@ -293,6 +299,7 @@ /* relative delays are negative, absolute are positive; resolution is 100ns */ Timeout.QuadPart = Int32x32To64(MillisecondsToDelay, -10000); +#if 0 /* Lock the miniport block */ KeAcquireSpinLock(&Timer->Miniport->Lock, &OldIrql); @@ -305,6 +312,7 @@ /* Unlock the miniport block */ KeReleaseSpinLock(&Timer->Miniport->Lock, OldIrql); +#endif KeSetTimer(&Timer->Timer, Timeout, &Timer->Dpc); }

14 years, 2 months

[jimtabor] 48970: [Win32k] - Fixed ValidateTimerCallback, always returning true and just spinning in the loop. - Add one more process information flag with a point type and capturing the hit test i...

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sun Oct 3 19:18:19 2010 New Revision: 48970 URL: http://svn.reactos.org/svn/reactos?rev=48970&view=rev Log: [Win32k] - Fixed ValidateTimerCallback, always returning true and just spinning in the loop. - Add one more process information flag with a point type and capturing the hit test in desktop structure. Modified: trunk/reactos/subsystems/win32/win32k/include/timer.h trunk/reactos/subsystems/win32/win32k/include/win32.h trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c trunk/reactos/subsystems/win32/win32k/ntuser/timer.c Modified: trunk/reactos/subsystems/win32/win32k/include/timer.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/timer.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/timer.h [iso-8859-1] Sun Oct 3 19:18:19 2010 @@ -32,7 +32,7 @@ BOOL FASTCALL IntKillTimer(PWINDOW_OBJECT Window, UINT_PTR IDEvent, BOOL SystemTimer); UINT_PTR FASTCALL IntSetTimer(PWINDOW_OBJECT Window, UINT_PTR IDEvent, UINT Elapse, TIMERPROC TimerFunc, INT Type); PTIMER FASTCALL FindSystemTimer(PMSG); -BOOL FASTCALL ValidateTimerCallback(PTHREADINFO,PWINDOW_OBJECT,WPARAM,LPARAM); +BOOL FASTCALL ValidateTimerCallback(PTHREADINFO,LPARAM); VOID CALLBACK SystemTimerProc(HWND,UINT,UINT_PTR,DWORD); UINT_PTR FASTCALL SystemTimerSet(PWINDOW_OBJECT,UINT_PTR,UINT,TIMERPROC); BOOL FASTCALL PostTimerMessages(PWINDOW_OBJECT); Modified: trunk/reactos/subsystems/win32/win32k/include/win32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] Sun Oct 3 19:18:19 2010 @@ -25,6 +25,7 @@ #define W32PF_SCREENSAVER 0x00200000 #define W32PF_IDLESCREENSAVER 0x00400000 #define W32PF_ICONTITLEREGISTERED 0x10000000 +#define W32PF_DPIAWARE 0x20000000 // ReactOS #define W32PF_NOWINDOWGHOSTING (0x01000000) #define W32PF_MANUALGUICHECK (0x02000000) @@ -93,6 +94,7 @@ HANDLE hEventQueueClient; PKEVENT pEventQueueServer; LIST_ENTRY PtiLink; + POINT ptLast; CLIENTTHREADINFO cti; // Used only when no Desktop or pcti NULL. /* ReactOS */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Sun Oct 3 19:18:19 2010 @@ -394,7 +394,7 @@ { if (pMsg->message == WM_TIMER) { - if (ValidateTimerCallback(PsGetCurrentThreadWin32Thread(),Window,pMsg->wParam,pMsg->lParam)) + if (ValidateTimerCallback(PsGetCurrentThreadWin32Thread(),pMsg->lParam)) { KeQueryTickCount(&TickCount); Time = MsqCalculateMessageTime(&TickCount); @@ -963,13 +963,15 @@ } MsgExit: + pti->rpdesk->htEx = HitTest; /* Now set the capture hit. */ + if ( ISITHOOKED(WH_MOUSE) && IS_MOUSE_MESSAGE(Msg->Msg.message)) { - if(!ProcessMouseMessage(&Msg->Msg, HitTest, RemoveMsg)) - { - return FALSE; - } - } + if (!ProcessMouseMessage(&Msg->Msg, HitTest, RemoveMsg)) + { + return FALSE; + } + } if ( ISITHOOKED(WH_KEYBOARD) && IS_KBD_MESSAGE(Msg->Msg.message)) { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] Sun Oct 3 19:18:19 2010 @@ -1125,20 +1125,11 @@ LPARAM lParam) { BOOL Ret = FALSE; - PWINDOW_OBJECT Window = NULL; UserEnterShared(); - if (hWnd) - { - Window = UserGetWindowObject(hWnd); - if (!Window || !Window->Wnd) - goto Exit; - } - - Ret = ValidateTimerCallback(PsGetCurrentThreadWin32Thread(), Window, wParam, lParam); - -Exit: + Ret = ValidateTimerCallback(PsGetCurrentThreadWin32Thread(), lParam); + UserLeave(); return Ret; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] Sun Oct 3 19:18:19 2010 @@ -167,11 +167,10 @@ BOOL FASTCALL ValidateTimerCallback(PTHREADINFO pti, - PWINDOW_OBJECT Window, - WPARAM wParam, LPARAM lParam) { PLIST_ENTRY pLE; + BOOL Ret = FALSE; PTIMER pTmr = FirstpTmr; if (!pTmr) return FALSE; @@ -180,18 +179,18 @@ do { if ( (lParam == (LPARAM)pTmr->pfn) && - (pTmr->flags & (TMRF_SYSTEM|TMRF_RIT)) && + !(pTmr->flags & (TMRF_SYSTEM|TMRF_RIT)) && (pTmr->pti->ppi == pti->ppi) ) + { + Ret = TRUE; break; - + } pLE = pTmr->ptmrList.Flink; pTmr = CONTAINING_RECORD(pLE, TIMER, ptmrList); } while (pTmr != FirstpTmr); TimerLeave(); - if (!pTmr) return FALSE; - - return TRUE; + return Ret; } UINT_PTR FASTCALL @@ -616,8 +615,7 @@ DPRINT("Enter NtUserSetSystemTimer\n"); - // This is wrong, lpTimerFunc is NULL! - RETURN(IntSetTimer(UserGetWindowObject(hWnd), nIDEvent, uElapse, lpTimerFunc, TMRF_SYSTEM)); + RETURN(IntSetTimer(UserGetWindowObject(hWnd), nIDEvent, uElapse, NULL, TMRF_SYSTEM)); CLEANUP: DPRINT("Leave NtUserSetSystemTimer, ret=%i\n", _ret_);

14 years, 2 months

[dreimer] 48969: Merge 48915 and 48923 to 0.3.12 branch.

by dreimer＠svn.reactos.org

Author: dreimer Date: Sun Oct 3 17:02:54 2010 New Revision: 48969 URL: http://svn.reactos.org/svn/reactos?rev=48969&view=rev Log: Merge 48915 and 48923 to 0.3.12 branch. Modified: branches/ros-branch-0_3_12/reactos/base/setup/usetup/lang/et-EE.h branches/ros-branch-0_3_12/reactos/base/setup/usetup/lang/uk-UA.h Modified: branches/ros-branch-0_3_12/reactos/base/setup/usetup/lang/et-EE.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_12/reactos/base/… ============================================================================== --- branches/ros-branch-0_3_12/reactos/base/setup/usetup/lang/et-EE.h [iso-8859-1] (original) +++ branches/ros-branch-0_3_12/reactos/base/setup/usetup/lang/et-EE.h [iso-8859-1] Sun Oct 3 17:02:54 2010 @@ -985,13 +985,13 @@ { 8, 12, - "Install bootloader on the harddisk (MBR and VBR).", + "Paigalda alglaadur kävakettale (MBR ja VBR).", TEXT_STYLE_NORMAL }, { 8, 13, - "Install bootloader on the harddisk (VBR only).", + "Paigalda alglaadur kävakettale (ainult VBR).", TEXT_STYLE_NORMAL }, { Modified: branches/ros-branch-0_3_12/reactos/base/setup/usetup/lang/uk-UA.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_12/reactos/base/… ============================================================================== --- branches/ros-branch-0_3_12/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] (original) +++ branches/ros-branch-0_3_12/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] Sun Oct 3 17:02:54 2010 @@ -985,31 +985,31 @@ { 6, 8, - "áâ ®¢«î¢ ç ¢áâ ®¢«îó boot loader", + "áâ ®¢«î¢ ç ¢áâ ®¢«îó § ¢ â ¦ã¢ ç", TEXT_STYLE_NORMAL }, { 8, 12, - "áâ ®¢¨â¨ § ¢ â ¦ã¢ ç ¦®àáâª¨© ¤¨áª (MBR i VBR).", + "áâ ®¢¨â¨ § ¢ â ¦ã¢ ç ¦®àáâª¨© ¤¨áª (MBR i VBR).", TEXT_STYLE_NORMAL }, { 8, 13, - "áâ ®¢¨â¨ § ¢ â ¦ã¢ ç ¦®àáâª¨© ¤¨áª («¨è¥ VBR).", + "áâ ®¢¨â¨ § ¢ â ¦ã¢ ç ¦®àáâª¨© ¤¨áª («¨è¥ VBR).", TEXT_STYLE_NORMAL }, { 8, 14, - "áâ ®¢¨â¨ § ¢ â ¦ã¢ ç ¤¨áª¥âã.", + "áâ ®¢¨â¨ § ¢ â ¦ã¢ ç ¤¨áª¥âã.", TEXT_STYLE_NORMAL }, { 8, 15, - "¥ ¢áâ ®¢«î¢ â¨ § ¢ â ¦ã¢ ç.", + "¥ ¢áâ ®¢«î¢ â¨ § ¢ â ¦ã¢ ç.", TEXT_STYLE_NORMAL }, {

14 years, 2 months

[cgutman] 48968: [NDIS] - Disable timer queuing code (hackfix for various network driver failures) - Also needs to be merged into 0.3.12

by cgutman＠svn.reactos.org

Author: cgutman Date: Sun Oct 3 15:18:57 2010 New Revision: 48968 URL: http://svn.reactos.org/svn/reactos?rev=48968&view=rev Log: [NDIS] - Disable timer queuing code (hackfix for various network driver failures) - Also needs to be merged into 0.3.12 Modified: trunk/reactos/drivers/network/ndis/ndis/time.c Modified: trunk/reactos/drivers/network/ndis/ndis/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/time.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/time.c [iso-8859-1] Sun Oct 3 15:18:57 2010 @@ -145,7 +145,7 @@ * - call at IRQL <= DISPATCH_LEVEL */ { - KIRQL OldIrql; + //KIRQL OldIrql; ASSERT_IRQL(DISPATCH_LEVEL); ASSERT(TimerCancelled); @@ -153,6 +153,7 @@ *TimerCancelled = KeCancelTimer (&Timer->Timer); +#if 0 if (*TimerCancelled) { KeAcquireSpinLock(&Timer->Miniport->Lock, &OldIrql); @@ -160,6 +161,7 @@ if (!DequeueMiniportTimer(Timer)) ASSERT(FALSE); KeReleaseSpinLock(&Timer->Miniport->Lock, OldIrql); } +#endif } VOID NTAPI @@ -170,6 +172,7 @@ { PNDIS_MINIPORT_TIMER Timer = DeferredContext; +#if 0 /* Only dequeue if the timer has a period of 0 */ if (!Timer->Timer.Period) { @@ -178,6 +181,7 @@ if (!DequeueMiniportTimer(Timer)) ASSERT(FALSE); KeReleaseSpinLockFromDpcLevel(&Timer->Miniport->Lock); } +#endif Timer->MiniportTimerFunction(Dpc, Timer->MiniportTimerContext, @@ -240,14 +244,15 @@ */ { LARGE_INTEGER Timeout; - KIRQL OldIrql; + //KIRQL OldIrql; ASSERT_IRQL(DISPATCH_LEVEL); ASSERT(Timer); /* relative delays are negative, absolute are positive; resolution is 100ns */ Timeout.QuadPart = Int32x32To64(MillisecondsPeriod, -10000); - + +#if 0 /* Lock the miniport block */ KeAcquireSpinLock(&Timer->Miniport->Lock, &OldIrql); @@ -260,6 +265,7 @@ /* Unlock the miniport block */ KeReleaseSpinLock(&Timer->Miniport->Lock, OldIrql); +#endif KeSetTimerEx(&Timer->Timer, Timeout, MillisecondsPeriod, &Timer->Dpc); } @@ -285,7 +291,7 @@ */ { LARGE_INTEGER Timeout; - KIRQL OldIrql; + //KIRQL OldIrql; ASSERT_IRQL(DISPATCH_LEVEL); ASSERT(Timer); @@ -293,6 +299,7 @@ /* relative delays are negative, absolute are positive; resolution is 100ns */ Timeout.QuadPart = Int32x32To64(MillisecondsToDelay, -10000); +#if 0 /* Lock the miniport block */ KeAcquireSpinLock(&Timer->Miniport->Lock, &OldIrql); @@ -305,6 +312,7 @@ /* Unlock the miniport block */ KeReleaseSpinLock(&Timer->Miniport->Lock, OldIrql); +#endif KeSetTimer(&Timer->Timer, Timeout, &Timer->Dpc); }

14 years, 2 months

[akhaldi] 48967: [CMAKE] - Improve some dlls.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Oct 2 22:19:59 2010 New Revision: 48967 URL: http://svn.reactos.org/svn/reactos?rev=48967&view=rev Log: [CMAKE] - Improve some dlls. Modified: branches/cmake-bringup/dll/win32/cfgmgr32/CMakeLists.txt branches/cmake-bringup/dll/win32/clusapi/CMakeLists.txt branches/cmake-bringup/dll/win32/compstui/CMakeLists.txt branches/cmake-bringup/dll/win32/credui/CMakeLists.txt branches/cmake-bringup/dll/win32/crtdll/CMakeLists.txt branches/cmake-bringup/dll/win32/crypt32/CMakeLists.txt branches/cmake-bringup/dll/win32/cryptdll/CMakeLists.txt branches/cmake-bringup/dll/win32/dbghelp/CMakeLists.txt branches/cmake-bringup/dll/win32/dciman32/CMakeLists.txt branches/cmake-bringup/dll/win32/dhcpcsvc/CMakeLists.txt branches/cmake-bringup/dll/win32/dnsapi/CMakeLists.txt branches/cmake-bringup/dll/win32/dwmapi/CMakeLists.txt branches/cmake-bringup/dll/win32/faultrep/CMakeLists.txt branches/cmake-bringup/dll/win32/fmifs/CMakeLists.txt branches/cmake-bringup/dll/win32/fusion/CMakeLists.txt branches/cmake-bringup/dll/win32/gdi32/CMakeLists.txt branches/cmake-bringup/dll/win32/getuname/CMakeLists.txt branches/cmake-bringup/dll/win32/hid/CMakeLists.txt branches/cmake-bringup/dll/win32/httpapi/CMakeLists.txt branches/cmake-bringup/dll/win32/iccvid/CMakeLists.txt branches/cmake-bringup/dll/win32/icmp/CMakeLists.txt branches/cmake-bringup/dll/win32/imaadp32.acm/CMakeLists.txt branches/cmake-bringup/dll/win32/imagehlp/CMakeLists.txt branches/cmake-bringup/dll/win32/imm32/CMakeLists.txt branches/cmake-bringup/dll/win32/initpki/CMakeLists.txt branches/cmake-bringup/dll/win32/iphlpapi/CMakeLists.txt branches/cmake-bringup/dll/win32/itircl/CMakeLists.txt branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt branches/cmake-bringup/dll/win32/loadperf/CMakeLists.txt branches/cmake-bringup/dll/win32/lpk/CMakeLists.txt branches/cmake-bringup/dll/win32/lz32/CMakeLists.txt branches/cmake-bringup/dll/win32/mapi32/CMakeLists.txt branches/cmake-bringup/dll/win32/mciavi32/CMakeLists.txt branches/cmake-bringup/dll/win32/mcicda/CMakeLists.txt branches/cmake-bringup/dll/win32/mciqtz32/CMakeLists.txt branches/cmake-bringup/dll/win32/mciseq/CMakeLists.txt branches/cmake-bringup/gcc.cmake branches/cmake-bringup/msc.cmake Modified: branches/cmake-bringup/dll/win32/cfgmgr32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/cfgmgr3… ============================================================================== --- branches/cmake-bringup/dll/win32/cfgmgr32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/cfgmgr32/CMakeLists.txt [iso-8859-1] Sat Oct 2 22:19:59 2010 @@ -1,12 +1,10 @@ - -set(CMAKE_RC_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") spec2def(cfgmgr32 ${CMAKE_CURRENT_SOURCE_DIR}/cfgmgr32.spec ${CMAKE_CURRENT_BINARY_DIR}/cfgmgr32.def) add_library(cfgmgr32 SHARED cfgmgr32.rc) -set_target_properties(cfgmgr32 PROPERTIES LINK_FLAGS "-Wl,-entry,0") +set_entrypoint(cfgmgr32 0) target_link_libraries(cfgmgr32 ${CMAKE_CURRENT_BINARY_DIR}/cfgmgr32.def) -add_dependencies(cfgmgr32 cfgmgr32_def psdk) +add_dependencies(cfgmgr32 cfgmgr32_def psdk buildno_header) Modified: branches/cmake-bringup/dll/win32/clusapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/clusapi… ============================================================================== --- branches/cmake-bringup/dll/win32/clusapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/clusapi/CMakeLists.txt [iso-8859-1] Sat Oct 2 22:19:59 2010 @@ -1,5 +1,3 @@ - - add_definitions(-D__WINESRC__) @@ -9,11 +7,11 @@ add_library(clusapi SHARED clusapi.c) -set_target_properties(clusapi PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(clusapi win32dll) target_link_libraries(clusapi ${CMAKE_CURRENT_BINARY_DIR}/clusapi.def - wine - mingw_common) + wine) -add_dependencies(clusapi clusapi_def psdk) +add_importlibs(clusapi kernel32 ntdll) +add_dependencies(clusapi clusapi_def) Modified: branches/cmake-bringup/dll/win32/compstui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/compstu… ============================================================================== --- branches/cmake-bringup/dll/win32/compstui/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/compstui/CMakeLists.txt [iso-8859-1] Sat Oct 2 22:19:59 2010 @@ -1,5 +1,3 @@ - - add_definitions(-D__WINESRC__) @@ -9,11 +7,11 @@ add_library(compstui SHARED compstui_main.c) -set_target_properties(compstui PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(compstui win32dll) target_link_libraries(compstui ${CMAKE_CURRENT_BINARY_DIR}/compstui.def - wine - mingw_common) + wine) -add_dependencies(compstui compstui_def psdk) +add_importlibs(compstui kernel32 ntdll) +add_dependencies(compstui compstui_def) Modified: branches/cmake-bringup/dll/win32/credui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/credui/… ============================================================================== --- branches/cmake-bringup/dll/win32/credui/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/credui/CMakeLists.txt [iso-8859-1] Sat Oct 2 22:19:59 2010 @@ -1,5 +1,3 @@ - - add_definitions(-D__WINESRC__) @@ -9,14 +7,11 @@ add_library(credui SHARED credui_main.c credui.rc) -set_target_properties(credui PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(credui win32dll) target_link_libraries(credui ${CMAKE_CURRENT_BINARY_DIR}/credui.def - wine - mingw_common - -ladvapi32 - -luser32 - -lcomctl32) + wine) -add_dependencies(credui credui_def psdk) +add_importlibs(credui advapi32 user32 comctl32 kernel32 ntdll) +add_dependencies(credui credui_def) Modified: branches/cmake-bringup/dll/win32/crtdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/crtdll/… ============================================================================== --- branches/cmake-bringup/dll/win32/crtdll/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/crtdll/CMakeLists.txt [iso-8859-1] Sat Oct 2 22:19:59 2010 @@ -1,13 +1,12 @@ - - -add_definitions(-DUSE_MSVCRT_PREFIX) -add_definitions(-D_MSVCRT_LIB_) -add_definitions(-D_MSVCRT_) -add_definitions(-DCRTDLL) -add_definitions(-D_CTYPE_DISABLE_MACROS) -add_definitions(-D_NO_INLINING) -add_definitions(-D__MINGW_IMPORT="") +add_definitions( + -DUSE_MSVCRT_PREFIX + -D_MSVCRT_LIB_ + -D_MSVCRT_ + -DCRTDLL + -D_CTYPE_DISABLE_MACROS + -D_NO_INLINING + -D__MINGW_IMPORT="") include_directories(${REACTOS_SOURCE_DIR}/lib/sdk/crt/include) @@ -19,14 +18,13 @@ ${CMAKE_CURRENT_BINARY_DIR}/crtdll_precomp.h.gch ${SOURCE}) -set_target_properties(crtdll PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(crtdll win32dll) target_link_libraries(crtdll ${CMAKE_CURRENT_BINARY_DIR}/crtdll.def wine - crt - -lkernel32 - -lntdll) + crt) +add_importlibs(crtdll kernel32 ntdll) add_pch(crtdll ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) -add_dependencies(crtdll crtdll_def psdk) +add_dependencies(crtdll crtdll_def) Modified: branches/cmake-bringup/dll/win32/crypt32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/crypt32… ============================================================================== --- branches/cmake-bringup/dll/win32/crypt32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/crypt32/CMakeLists.txt [iso-8859-1] Sat Oct 2 22:19:59 2010 @@ -1,13 +1,12 @@ - - -add_definitions(-D__WINESRC__) -add_definitions(-D_DLL -D__USE_CRTIMP) -add_definitions(-D_WINE) +add_definitions( + -D__WINESRC__ + -D_DLL + -D__USE_CRTIMP + -D_WINE) remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) @@ -41,15 +40,13 @@ crypt32.rc version.rc) -set_target_properties(crypt32 PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(crypt32 win32dll) target_link_libraries(crypt32 ${CMAKE_CURRENT_BINARY_DIR}/crypt32.def wine pseh - mingw_common - -luser32 - -ladvapi32 - -lmsvcrt) + mingw_common) -add_dependencies(crypt32 crypt32_def psdk) +add_importlibs(crypt32 user32 advapi32 msvcrt) +add_dependencies(crypt32 crypt32_def) Modified: branches/cmake-bringup/dll/win32/cryptdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/cryptdl… ============================================================================== --- branches/cmake-bringup/dll/win32/cryptdll/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/cryptdll/CMakeLists.txt [iso-8859-1] Sat Oct 2 22:19:59 2010 @@ -1,5 +1,3 @@ - - add_definitions(-D__WINESRC__) @@ -9,11 +7,11 @@ add_library(cryptdll SHARED cryptdll.c) -set_target_properties(cryptdll PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(cryptdll win32dll) target_link_libraries(cryptdll ${CMAKE_CURRENT_BINARY_DIR}/cryptdll.def - wine - mingw_common) + wine) -add_dependencies(cryptdll cryptdll_def psdk) +add_importlibs(cryptdll kernel32 ntdll) +add_dependencies(cryptdll cryptdll_def) Modified: branches/cmake-bringup/dll/win32/dbghelp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/dbghelp… ============================================================================== --- branches/cmake-bringup/dll/win32/dbghelp/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/dbghelp/CMakeLists.txt [iso-8859-1] Sat Oct 2 22:19:59 2010 @@ -1,12 +1,11 @@ - - -add_definitions(-D__WINESRC__) -add_definitions(-D_DLL -D__USE_CRTIMP) -add_definitions(-D_WINE) - -add_definitions(-DHAVE_REGEX_H) -add_definitions(-D_IMAGEHLP_SOURCE_) +add_definitions( + -D__WINESRC__ + -D_DLL + -D__USE_CRTIMP + -D_WINE + -DHAVE_REGEX_H + -D_IMAGEHLP_SOURCE_) if(ARCH MATCHES amd64) add_definitions(-DUNW_FLAG_NHANDLER=0 -DUNW_FLAG_EHANDLER=1 -DUNW_FLAG_UHANDLER=2 -DUNW_FLAG_CHAININFO=3) @@ -42,15 +41,13 @@ type.c version.rc) -set_target_properties(dbghelp PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(dbghelp win32dll) target_link_libraries(dbghelp ${CMAKE_CURRENT_BINARY_DIR}/dbghelp.def wine mingw_common - -lpsapi - -lversion - pseh - -lmsvcrt) + pseh) -add_dependencies(dbghelp dbghelp_def psdk) +add_importlibs(dbghelp psapi version msvcrt) +add_dependencies(dbghelp dbghelp_def) Modified: branches/cmake-bringup/dll/win32/dciman32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/dciman3… ============================================================================== --- branches/cmake-bringup/dll/win32/dciman32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/dciman32/CMakeLists.txt [iso-8859-1] Sat Oct 2 22:19:59 2010 @@ -1,5 +1,3 @@ - - add_definitions(-D__WINESRC__) @@ -9,11 +7,11 @@ add_library(dciman32 SHARED dciman_main.c) -set_target_properties(dciman32 PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(dciman32 win32dll) target_link_libraries(dciman32 ${CMAKE_CURRENT_BINARY_DIR}/dciman32.def - wine - mingw_common) + wine) -add_dependencies(dciman32 dciman32_def psdk) +add_importlibs(dciman32 kernel32 ntdll) +add_dependencies(dciman32 dciman32_def) Modified: branches/cmake-bringup/dll/win32/dhcpcsvc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/dhcpcsv… ============================================================================== --- branches/cmake-bringup/dll/win32/dhcpcsvc/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/dhcpcsvc/CMakeLists.txt [iso-8859-1] Sat Oct 2 22:19:59 2010 @@ -1,5 +1,5 @@ - +add_definitions(-Dtzset=_tzset) include_directories(include) @@ -25,17 +25,10 @@ ${CMAKE_CURRENT_BINARY_DIR}/dhcpcsvc_rosdhcp.h.gch ${SOURCE}) -set_target_properties(dhcpcsvc PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(dhcpcsvc win32dll) -target_link_libraries(dhcpcsvc - ${CMAKE_CURRENT_BINARY_DIR}/dhcpcsvc.def - -lmsvcrt - -lws2_32 - -liphlpapi - -ladvapi32 - oldnames - -lkernel32 - -lntdll) +target_link_libraries(dhcpcsvc ${CMAKE_CURRENT_BINARY_DIR}/dhcpcsvc.def) +add_importlibs(dhcpcsvc ws2_32 iphlpapi advapi32 msvcrt kernel32 ntdll) add_pch(dhcpcsvc ${CMAKE_CURRENT_SOURCE_DIR}/include/rosdhcp.h ${SOURCE}) -add_dependencies(dhcpcsvc dhcpcsvc_def psdk) +add_dependencies(dhcpcsvc dhcpcsvc_def) Modified: branches/cmake-bringup/dll/win32/dnsapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/dnsapi/… ============================================================================== --- branches/cmake-bringup/dll/win32/dnsapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/dnsapi/CMakeLists.txt [iso-8859-1] Sat Oct 2 22:19:59 2010 @@ -1,9 +1,8 @@ - - -include_directories(include) -include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/adns/src) -include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/adns/adns_win32) +include_directories( + include + ${REACTOS_SOURCE_DIR}/lib/3rdparty/adns/src + ${REACTOS_SOURCE_DIR}/lib/3rdparty/adns/adns_win32) add_definitions(-D_DLL -D__USE_CRTIMP) add_definitions(-DADNS_JGAA_WIN32) @@ -24,17 +23,12 @@ ${CMAKE_CURRENT_BINARY_DIR}/dnsapi_precomp.h.gch ${SOURCE}) -set_target_properties(dnsapi PROPERTIES LINK_FLAGS "-Wl,-entry,0") +set_entrypoint(dnsapi 0) target_link_libraries(dnsapi ${CMAKE_CURRENT_BINARY_DIR}/dnsapi.def - adns - -luser32 - -lws2_32 - -lmsvcrt - -liphlpapi - -lkernel32 - -lntdll) + adns) +add_importlibs(dnsapi user32 ws2_32 iphlpapi msvcrt kernel32 ntdll) add_pch(dnsapi ${CMAKE_CURRENT_SOURCE_DIR}/dnsapi/precomp.h ${SOURCE}) -add_dependencies(dnsapi dnsapi_def psdk) +add_dependencies(dnsapi dnsapi_def psdk buildno_header) Modified: branches/cmake-bringup/dll/win32/dwmapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/dwmapi/… ============================================================================== --- branches/cmake-bringup/dll/win32/dwmapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/dwmapi/CMakeLists.txt [iso-8859-1] Sat Oct 2 22:19:59 2010 @@ -1,5 +1,3 @@ - - add_definitions(-D__WINESRC__) @@ -9,11 +7,11 @@ add_library(dwmapi SHARED dwmapi_main.c version.rc) -set_target_properties(dwmapi PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(dwmapi win32dll) target_link_libraries(dwmapi ${CMAKE_CURRENT_BINARY_DIR}/dwmapi.def - wine - mingw_common) + wine) -add_dependencies(dwmapi dwmapi_def psdk) +add_importlibs(dwmapi kernel32 ntdll) +add_dependencies(dwmapi dwmapi_def) Modified: branches/cmake-bringup/dll/win32/faultrep/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/faultre… ============================================================================== --- branches/cmake-bringup/dll/win32/faultrep/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/faultrep/CMakeLists.txt [iso-8859-1] Sat Oct 2 22:19:59 2010 @@ -1,5 +1,3 @@ - - add_definitions(-D__WINESRC__) @@ -9,12 +7,11 @@ add_library(faultrep SHARED faultrep.c) -set_target_properties(faultrep PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(faultrep win32dll) target_link_libraries(faultrep ${CMAKE_CURRENT_BINARY_DIR}/faultrep.def - wine - mingw_common - -ladvapi32) + wine) -add_dependencies(faultrep faultrep_def psdk) +add_importlibs(faultrep advapi32 kernel32 ntdll) +add_dependencies(faultrep faultrep_def) Modified: branches/cmake-bringup/dll/win32/fmifs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/fmifs/C… ============================================================================== --- branches/cmake-bringup/dll/win32/fmifs/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/fmifs/CMakeLists.txt [iso-8859-1] Sat Oct 2 22:19:59 2010 @@ -1,5 +1,3 @@ - - spec2def(fmifs ${CMAKE_CURRENT_SOURCE_DIR}/fmifs.spec ${CMAKE_CURRENT_BINARY_DIR}/fmifs.def) @@ -16,12 +14,10 @@ add_library(fmifs SHARED ${SOURCE}) -set_target_properties(fmifs PROPERTIES LINK_FLAGS "-Wl,-entry,_InitializeFmIfs@12") +set_entrypoint(fmifs InitializeFmIfs@12) -target_link_libraries(fmifs - ${CMAKE_CURRENT_BINARY_DIR}/fmifs.def - -lkernel32 - -lntdll) +target_link_libraries(fmifs ${CMAKE_CURRENT_BINARY_DIR}/fmifs.def) +add_importlibs(fmifs kernel32 ntdll) add_pch(fmifs ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) -add_dependencies(fmifs fmifs_def psdk) +add_dependencies(fmifs fmifs_def psdk buildno_header) Modified: branches/cmake-bringup/dll/win32/fusion/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/fusion/… ============================================================================== --- branches/cmake-bringup/dll/win32/fusion/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/fusion/CMakeLists.txt [iso-8859-1] Sat Oct 2 22:19:59 2010 @@ -1,5 +1,3 @@ - - add_definitions(-D__WINESRC__) @@ -15,15 +13,11 @@ fusion.c fusion_main.c) -set_target_properties(fusion PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(fusion win32dll) target_link_libraries(fusion ${CMAKE_CURRENT_BINARY_DIR}/fusion.def - wine - mingw_common - -lshlwapi - -ladvapi32 - -ldbghelp - -luser32) + wine) -add_dependencies(fusion fusion_def psdk) +add_importlibs(fusion shlwapi advapi32 dbghelp user32 kernel32 ntdll) +add_dependencies(fusion fusion_def) Modified: branches/cmake-bringup/dll/win32/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/gdi32/C… ============================================================================== --- branches/cmake-bringup/dll/win32/gdi32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/gdi32/CMakeLists.txt [iso-8859-1] Sat Oct 2 22:19:59 2010 @@ -1,30 +1,54 @@ +set_unicode() - -add_definitions(-DUNICODE -D_UNICODE) add_definitions(-D_DLL -D__USE_CRTIMP) add_definitions(-DLANGPACK) include_directories(include) -file(GLOB_RECURSE SOURCE *.c) +list(APPEND SOURCE + main/dllmain.c + misc/heap.c + misc/gdientry.c + misc/hacks.c + misc/historic.c + misc/misc.c + misc/stubs.c + misc/stubsa.c + misc/stubsw.c + misc/wingl.c + objects/arc.c + objects/bitmap.c + objects/brush.c + objects/coord.c + objects/dc.c + objects/eng.c + objects/enhmfile.c + objects/font.c + objects/icm.c + objects/linedda.c + objects/metafile.c + objects/painting.c + objects/printdrv.c + objects/palette.c + objects/pen.c + objects/region.c + objects/text.c + objects/utils.c + objects/path.c + gdi32.rc) add_library(gdi32 SHARED - ${SOURCE} - ${CMAKE_CURRENT_SOURCE_DIR}/gdi32.rc - ${CMAKE_CURRENT_BINARY_DIR}/gdi32_precomp.h.gch) + ${CMAKE_CURRENT_BINARY_DIR}/gdi32_precomp.h.gch + ${SOURCE}) -set_target_properties(gdi32 PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(gdi32 win32dll) target_link_libraries(gdi32 ${CMAKE_CURRENT_SOURCE_DIR}/gdi32.def - -luser32 - -ladvapi32 win32ksys dxguid - pseh - -lkernel32 - -lntdll) - + pseh) + +add_importlibs(gdi32 user32 advapi32 kernel32 ntdll) add_pch(gdi32 ${CMAKE_CURRENT_SOURCE_DIR}/include/precomp.h ${SOURCE}) -add_dependencies(gdi32 psdk) Modified: branches/cmake-bringup/dll/win32/getuname/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/getunam… ============================================================================== --- branches/cmake-bringup/dll/win32/getuname/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/getuname/CMakeLists.txt [iso-8859-1] Sat Oct 2 22:19:59 2010 @@ -1,7 +1,5 @@ - - -add_definitions(-DUNICODE -D_UNICODE) +set_unicode() include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) @@ -9,11 +7,9 @@ add_library(getuname SHARED getuname.c getuname.rc) -set_target_properties(getuname PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(getuname win32dll) -target_link_libraries(getuname - ${CMAKE_CURRENT_BINARY_DIR}/getuname.def - -lkernel32 - -lntdll) +target_link_libraries(getuname ${CMAKE_CURRENT_BINARY_DIR}/getuname.def) -add_dependencies(getuname getuname_def psdk) +add_importlibs(getuname kernel32 ntdll) +add_dependencies(getuname getuname_def) Modified: branches/cmake-bringup/dll/win32/hid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/hid/CMa… ============================================================================== --- branches/cmake-bringup/dll/win32/hid/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/hid/CMakeLists.txt [iso-8859-1] Sat Oct 2 22:19:59 2010 @@ -1,22 +1,18 @@ - - -add_definitions(-DUNICODE -D_UNICODE) +set_unicode() list(APPEND SOURCE hid.c stubs.c hid.rc) spec2def(hid ${CMAKE_CURRENT_SOURCE_DIR}/hid.spec ${CMAKE_CURRENT_BINARY_DIR}/hid.def) add_library(hid SHARED - ${SOURCE} - ${CMAKE_CURRENT_BINARY_DIR}/hid_precomp.h.gch) + ${CMAKE_CURRENT_BINARY_DIR}/hid_precomp.h.gch + ${SOURCE}) -set_target_properties(hid PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(hid win32dll) -target_link_libraries(hid - ${CMAKE_CURRENT_BINARY_DIR}/hid.def - -lkernel32 - -lntdll) +target_link_libraries(hid ${CMAKE_CURRENT_BINARY_DIR}/hid.def) +add_importlibs(hid kernel32 ntdll) add_pch(hid ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) -add_dependencies(hid hid_def psdk) +add_dependencies(hid hid_def) Modified: branches/cmake-bringup/dll/win32/httpapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/httpapi… ============================================================================== --- branches/cmake-bringup/dll/win32/httpapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/httpapi/CMakeLists.txt [iso-8859-1] Sat Oct 2 22:19:59 2010 @@ -1,5 +1,3 @@ - - add_definitions(-D__WINESRC__) @@ -9,11 +7,11 @@ add_library(httpapi SHARED httpapi_main.c) -set_target_properties(httpapi PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(httpapi win32dll) target_link_libraries(httpapi ${CMAKE_CURRENT_BINARY_DIR}/httpapi.def - wine - mingw_common) + wine) -add_dependencies(httpapi httpapi_def psdk) +add_importlibs(httpapi kernel32 ntdll) +add_dependencies(httpapi httpapi_def) Modified: branches/cmake-bringup/dll/win32/iccvid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/iccvid/… ============================================================================== --- branches/cmake-bringup/dll/win32/iccvid/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/iccvid/CMakeLists.txt [iso-8859-1] Sat Oct 2 22:19:59 2010 @@ -1,5 +1,3 @@ - - add_definitions(-D__WINESRC__) @@ -9,12 +7,11 @@ add_library(iccvid SHARED iccvid.c rsrc.rc) -set_target_properties(iccvid PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(iccvid win32dll) target_link_libraries(iccvid ${CMAKE_CURRENT_BINARY_DIR}/iccvid.def - wine - -luser32 - mingw_common) + wine) -add_dependencies(iccvid iccvid_def psdk) +add_importlibs(iccvid user32 kernel32 ntdll) +add_dependencies(iccvid iccvid_def) Modified: branches/cmake-bringup/dll/win32/icmp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/icmp/CM… ============================================================================== --- branches/cmake-bringup/dll/win32/icmp/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/icmp/CMakeLists.txt [iso-8859-1] Sat Oct 2 22:19:59 2010 @@ -1,5 +1,3 @@ - - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) @@ -7,12 +5,11 @@ add_library(icmp SHARED icmp_main.c icmp.rc) -set_target_properties(icmp PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(icmp win32dll) target_link_libraries(icmp ${CMAKE_CURRENT_BINARY_DIR}/icmp.def - wine - -lws2_32 - mingw_common) + wine) +add_importlibs(icmp ws2_32 kernel32 ntdll) add_dependencies(icmp icmp_def psdk) Modified: branches/cmake-bringup/dll/win32/imaadp32.acm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/imaadp3… ============================================================================== --- branches/cmake-bringup/dll/win32/imaadp32.acm/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/imaadp32.acm/CMakeLists.txt [iso-8859-1] Sat Oct 2 22:19:59 2010 @@ -1,8 +1,5 @@ - - add_definitions(-D_DLL -D__USE_CRTIMP) - add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) @@ -16,14 +13,12 @@ add_library(imaadp32.acm SHARED imaadp32.c) -set_target_properties(imaadp32.acm PROPERTIES LINK_FLAGS "-Wl,-entry,0" SUFFIX "") +set_entrypoint(imaadp32.acm 0) +set_target_properties(imaadp32.acm PROPERTIES SUFFIX "") target_link_libraries(imaadp32.acm ${CMAKE_CURRENT_BINARY_DIR}/imaadp32.acm.def - wine - -lwinmm - -luser32 - mingw_common - -lmsvcrt) + wine) -add_dependencies(imaadp32.acm imaadp32.acm_def psdk) +add_importlibs(imaadp32.acm winmm user32 msvcrt kernel32 ntdll) +add_dependencies(imaadp32.acm imaadp32.acm_def psdk buildno_header) Modified: branches/cmake-bringup/dll/win32/imagehlp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/imagehl… ============================================================================== --- branches/cmake-bringup/dll/win32/imagehlp/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/imagehlp/CMakeLists.txt [iso-8859-1] Sat Oct 2 22:19:59 2010 @@ -1,5 +1,3 @@ - - add_definitions(-D_DLL -D__USE_CRTIMP) add_definitions(-D_IMAGEHLP_SOURCE_) @@ -19,14 +17,12 @@ ${CMAKE_CURRENT_BINARY_DIR}/imagehlp_precomp.h.gch ${SOURCE}) -set_target_properties(imagehlp PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(imagehlp win32dll) target_link_libraries(imagehlp ${CMAKE_CURRENT_BINARY_DIR}/imagehlp.def - wine - -ldbghelp - mingw_common - -lmsvcrt) + wine) +add_importlibs(imagehlp dbghelp kernel32 ntdll) add_pch(imagehlp ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) -add_dependencies(imagehlp imagehlp_def psdk) +add_dependencies(imagehlp imagehlp_def) Modified: branches/cmake-bringup/dll/win32/imm32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/imm32/C… ============================================================================== --- branches/cmake-bringup/dll/win32/imm32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/imm32/CMakeLists.txt [iso-8859-1] Sat Oct 2 22:19:59 2010 @@ -1,5 +1,3 @@ - - add_definitions(-D__WINESRC__) @@ -12,13 +10,11 @@ add_library(imm32 SHARED imm.c version.rc) -set_target_properties(imm32 PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(imm32 win32dll) target_link_libraries(imm32 ${CMAKE_CURRENT_BINARY_DIR}/imm32.def - wine - -ladvapi32 - -luser32 - mingw_common) + wine) -add_dependencies(imm32 imm32_def psdk) +add_importlibs(imm32 advapi32 user32 kernel32 ntdll) +add_dependencies(imm32 imm32_def) Modified: branches/cmake-bringup/dll/win32/initpki/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/initpki… ============================================================================== --- branches/cmake-bringup/dll/win32/initpki/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/initpki/CMakeLists.txt [iso-8859-1] Sat Oct 2 22:19:59 2010 @@ -1,19 +1,16 @@ - - add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(initpki ${CMAKE_CURRENT_SOURCE_DIR}/initpki.spec ${CMAKE_CURRENT_BINARY_DIR}/initpki.def) add_library(initpki SHARED main.c) -set_target_properties(initpki PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(initpki win32dll) target_link_libraries(initpki ${CMAKE_CURRENT_BINARY_DIR}/initpki.def - wine - mingw_common) + wine) -add_dependencies(initpki initpki_def psdk) +add_importlibs(initpki kernel32 ntdll) +add_dependencies(initpki initpki_def) Modified: branches/cmake-bringup/dll/win32/iphlpapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/iphlpap… ============================================================================== --- branches/cmake-bringup/dll/win32/iphlpapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/iphlpapi/CMakeLists.txt [iso-8859-1] Sat Oct 2 22:19:59 2010 @@ -1,12 +1,12 @@ - +set_unicode() add_definitions(-D_DLL -D__USE_CRTIMP) -add_definitions(-DUNICODE -D_UNICODE) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -include_directories(${REACTOS_SOURCE_DIR}/dll/win32/dhcpcsvc/include) -include_directories(${REACTOS_SOURCE_DIR}/lib/tdilib) +include_directories( + ${REACTOS_SOURCE_DIR}/include/reactos/wine + ${REACTOS_SOURCE_DIR}/dll/win32/dhcpcsvc/include + ${REACTOS_SOURCE_DIR}/lib/tdilib) spec2def(iphlpapi ${CMAKE_CURRENT_SOURCE_DIR}/iphlpapi.spec ${CMAKE_CURRENT_BINARY_DIR}/iphlpapi.def) @@ -21,16 +21,12 @@ route_reactos.c iphlpapi.rc) -set_target_properties(iphlpapi PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(iphlpapi win32dll) target_link_libraries(iphlpapi ${CMAKE_CURRENT_BINARY_DIR}/iphlpapi.def wine - tdilib - -ldhcpcsvc - -ladvapi32 - -lws2_32 - mingw_common - -lmsvcrt) + tdilib) -add_dependencies(iphlpapi iphlpapi_def psdk) +add_importlibs(iphlpapi dhcpcsvc advapi32 ws2_32 msvcrt kernel32 ntdll) +add_dependencies(iphlpapi iphlpapi_def) Modified: branches/cmake-bringup/dll/win32/itircl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/itircl/… ============================================================================== --- branches/cmake-bringup/dll/win32/itircl/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/itircl/CMakeLists.txt [iso-8859-1] Sat Oct 2 22:19:59 2010 @@ -1,19 +1,16 @@ - - add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(itircl ${CMAKE_CURRENT_SOURCE_DIR}/itircl.spec ${CMAKE_CURRENT_BINARY_DIR}/itircl.def) add_library(itircl SHARED itircl_main.c) -set_target_properties(itircl PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(itircl win32dll) target_link_libraries(itircl ${CMAKE_CURRENT_BINARY_DIR}/itircl.def - wine - mingw_common) + wine) +add_importlibs(itircl kernel32 ntdll) add_dependencies(itircl itircl_def psdk) Modified: branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… ============================================================================== --- branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] Sat Oct 2 22:19:59 2010 @@ -1,5 +1,3 @@ - - add_definitions(-D_KERNEL32_) @@ -94,20 +92,28 @@ thread/fls.c thread/thread.c thread/tls.c - thread/${ARCH}/fiber.S - thread/${ARCH}/thread.S kernel32.rc kernel32_stubs.c) +if(ARCH MATCHES i386) +list(APPEND SOURCE + thread/i386/fiber.S + thread/i386/thread.S) +elseif(ARCH MATCHES amd64) +list(APPEND SOURCE + thread/amd64/fiber.S + thread/amd64/thread.S) +endif(ARCH MATCHES i386) + add_library(kernel32 SHARED - ${SOURCE} - ${CMAKE_CURRENT_BINARY_DIR}/kernel32_k32.h.gch) + ${CMAKE_CURRENT_BINARY_DIR}/kernel32_k32.h.gch + ${SOURCE}) -set_target_properties(kernel32 PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(kernel32 win32dll) target_link_libraries(kernel32 ${CMAKE_CURRENT_SOURCE_DIR}/kernel32.def - pseh - -lntdll) + pseh) +add_importlibs(kernel32 ntdll) add_pch(kernel32 ${CMAKE_CURRENT_SOURCE_DIR}/k32.h ${SOURCE}) -add_dependencies(kernel32 errcodes version) +add_dependencies(kernel32 errcodes) Modified: branches/cmake-bringup/dll/win32/loadperf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/loadper… ============================================================================== --- branches/cmake-bringup/dll/win32/loadperf/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/loadperf/CMakeLists.txt [iso-8859-1] Sat Oct 2 22:19:59 2010 @@ -1,19 +1,16 @@ - - add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(loadperf ${CMAKE_CURRENT_SOURCE_DIR}/loadperf.spec ${CMAKE_CURRENT_BINARY_DIR}/loadperf.def) add_library(loadperf SHARED loadperf_main.c) -set_target_properties(loadperf PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(loadperf win32dll) target_link_libraries(loadperf ${CMAKE_CURRENT_BINARY_DIR}/loadperf.def - wine - mingw_common) + wine) -add_dependencies(loadperf loadperf_def psdk) +add_importlibs(loadperf kernel32 ntdll) +add_dependencies(loadperf loadperf_def) Modified: branches/cmake-bringup/dll/win32/lpk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/lpk/CMa… ============================================================================== --- branches/cmake-bringup/dll/win32/lpk/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/lpk/CMakeLists.txt [iso-8859-1] Sat Oct 2 22:19:59 2010 @@ -1,22 +1,16 @@ - +set_unicode() add_definitions(-DLANGPACK) -add_definitions(-DUNICODE -D_UNICODE) - include_directories(include) spec2def(lpk ${CMAKE_CURRENT_SOURCE_DIR}/lpk.spec ${CMAKE_CURRENT_BINARY_DIR}/lpk.def) add_library(lpk SHARED dllmain.c stub.c lpk.rc) -set_target_properties(lpk PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(lpk win32dll) -target_link_libraries(lpk - ${CMAKE_CURRENT_BINARY_DIR}/lpk.def - -luser32 - -lusp10 - -lkernel32 - -lntdll) +target_link_libraries(lpk ${CMAKE_CURRENT_BINARY_DIR}/lpk.def) -add_dependencies(lpk lpk_def psdk) +add_importlibs(lpk user32 usp10 kernel32 ntdll) +add_dependencies(lpk lpk_def) Modified: branches/cmake-bringup/dll/win32/lz32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/lz32/CM… ============================================================================== --- branches/cmake-bringup/dll/win32/lz32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/lz32/CMakeLists.txt [iso-8859-1] Sat Oct 2 22:19:59 2010 @@ -1,19 +1,16 @@ - -set(CMAKE_RC_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(lz32 ${CMAKE_CURRENT_SOURCE_DIR}/lz32.spec ${CMAKE_CURRENT_BINARY_DIR}/lz32.def) add_library(lz32 SHARED version.rc) -set_target_properties(lz32 PROPERTIES LINK_FLAGS "-Wl,-entry,0") +set_entrypoint(lz32 0) target_link_libraries(lz32 ${CMAKE_CURRENT_BINARY_DIR}/lz32.def - wine - mingw_common) + wine) -add_dependencies(lz32 lz32_def psdk) +add_importlibs(lz32 kernel32 ntdll) +add_dependencies(lz32 lz32_def psdk buildno_header) Modified: branches/cmake-bringup/dll/win32/mapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mapi32/… ============================================================================== --- branches/cmake-bringup/dll/win32/mapi32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mapi32/CMakeLists.txt [iso-8859-1] Sat Oct 2 22:19:59 2010 @@ -1,8 +1,5 @@ - - add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(mapi32 ${CMAKE_CURRENT_SOURCE_DIR}/mapi32.spec ${CMAKE_CURRENT_BINARY_DIR}/mapi32.def) @@ -15,16 +12,12 @@ util.c version.rc) -set_target_properties(mapi32 PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(mapi32 win32dll) target_link_libraries(mapi32 ${CMAKE_CURRENT_BINARY_DIR}/mapi32.def wine - -lshlwapi - -lshell32 - -luuid - mingw_common - -luser32 - -ladvapi32) + uuid) -add_dependencies(mapi32 mapi32_def psdk) +add_importlibs(mapi32 shlwapi shell32 user32 advapi32 kernel32 ntdll) +add_dependencies(mapi32 mapi32_def) Modified: branches/cmake-bringup/dll/win32/mciavi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mciavi3… ============================================================================== --- branches/cmake-bringup/dll/win32/mciavi32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mciavi32/CMakeLists.txt [iso-8859-1] Sat Oct 2 22:19:59 2010 @@ -1,8 +1,5 @@ - - add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(mciavi32 ${CMAKE_CURRENT_SOURCE_DIR}/mciavi32.spec ${CMAKE_CURRENT_BINARY_DIR}/mciavi32.def) @@ -14,15 +11,11 @@ wnd.c mciavi_res.rc) -set_target_properties(mciavi32 PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(mciavi32 win32dll) target_link_libraries(mciavi32 ${CMAKE_CURRENT_BINARY_DIR}/mciavi32.def - wine - -lmsvfw32 - -lwinmm - mingw_common - -luser32 - -lgdi32) + wine) -add_dependencies(mciavi32 mciavi32_def psdk) +add_importlibs(mciavi32 msvfw32 winmm user32 gdi32 kernel32 ntdll) +add_dependencies(mciavi32 mciavi32_def) Modified: branches/cmake-bringup/dll/win32/mcicda/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mcicda/… ============================================================================== --- branches/cmake-bringup/dll/win32/mcicda/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mcicda/CMakeLists.txt [iso-8859-1] Sat Oct 2 22:19:59 2010 @@ -1,21 +1,16 @@ - - add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(mcicda ${CMAKE_CURRENT_SOURCE_DIR}/mcicda.spec ${CMAKE_CURRENT_BINARY_DIR}/mcicda.def) add_library(mcicda SHARED mcicda.c) -set_target_properties(mcicda PROPERTIES LINK_FLAGS "-Wl,-entry,0") +set_entrypoint(mcicda 0) target_link_libraries(mcicda ${CMAKE_CURRENT_BINARY_DIR}/mcicda.def - wine - -lwinmm - mingw_common - -luser32) + wine) -add_dependencies(mcicda mcicda_def psdk) +add_importlibs(mcicda winmm user32 kernel32 ntdll) +add_dependencies(mcicda mcicda_def psdk buildno_header) Modified: branches/cmake-bringup/dll/win32/mciqtz32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mciqtz3… ============================================================================== --- branches/cmake-bringup/dll/win32/mciqtz32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mciqtz32/CMakeLists.txt [iso-8859-1] Sat Oct 2 22:19:59 2010 @@ -1,25 +1,17 @@ - - add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(mciqtz32 ${CMAKE_CURRENT_SOURCE_DIR}/mciqtz32.spec ${CMAKE_CURRENT_BINARY_DIR}/mciqtz32.def) add_library(mciqtz32 SHARED mciqtz.c version.rc) -set_target_properties(mciqtz32 PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(mciqtz32 win32dll) target_link_libraries(mciqtz32 ${CMAKE_CURRENT_BINARY_DIR}/mciqtz32.def wine - -lwinmm - -loleaut32 - -lole32 - strmiids - mingw_common - -luser32 - -lgdi32) + strmiids) -add_dependencies(mciqtz32 mciqtz32_def psdk) +add_importlibs(mciqtz32 winmm oleaut32 ole32 user32 gdi32 kernel32 ntdll) +add_dependencies(mciqtz32 mciqtz32_def) Modified: branches/cmake-bringup/dll/win32/mciseq/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mciseq/… ============================================================================== --- branches/cmake-bringup/dll/win32/mciseq/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mciseq/CMakeLists.txt [iso-8859-1] Sat Oct 2 22:19:59 2010 @@ -1,21 +1,16 @@ - - add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(mciseq ${CMAKE_CURRENT_SOURCE_DIR}/mciseq.spec ${CMAKE_CURRENT_BINARY_DIR}/mciseq.def) add_library(mciseq SHARED mcimidi.c) -set_target_properties(mciseq PROPERTIES LINK_FLAGS "-Wl,-entry,0") +set_entrypoint(mciseq 0) target_link_libraries(mciseq ${CMAKE_CURRENT_BINARY_DIR}/mciseq.def - wine - -lwinmm - mingw_common - -luser32) + wine) -add_dependencies(mciseq mciseq_def psdk) +add_importlibs(mciseq winmm user32 kernel32 ntdll) +add_dependencies(mciseq mciseq_def psdk buildno_header) Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=489… ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Sat Oct 2 22:19:59 2010 @@ -18,6 +18,8 @@ set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") +set(CMAKE_RC_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") + # Debugging (Note: DWARF-4 on 4.5.1 when we ship) add_definitions(-gdwarf-2 -g2 -femit-struct-debug-detailed=none -feliminate-unused-debug-types) @@ -30,15 +32,12 @@ # Optimizations add_definitions(-Os -fno-strict-aliasing -ftracer -momit-leaf-frame-pointer -mpreferred-stack-boundary=2 -fno-set-stack-executable -fno-optimize-sibling-calls) -# C++ Flags -#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions -fno-rtti") - # Macros macro(set_entrypoint MODULE ENTRYPOINT) if(${ENTRYPOINT} STREQUAL "0") - set(NEW_LINKER_FLAGS "-Wl,-entry,0") + set(NEW_LINKER_FLAGS "-Wl,-entry,0") else() - set(NEW_LINKER_FLAGS "-Wl,-entry,_${ENTRYPOINT}") + set(NEW_LINKER_FLAGS "-Wl,-entry,_${ENTRYPOINT}") endif() get_target_property(LINKER_FLAGS ${MODULE} LINK_FLAGS) if(LINKER_FLAGS) Modified: branches/cmake-bringup/msc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/msc.cmake?rev=489… ============================================================================== --- branches/cmake-bringup/msc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/msc.cmake [iso-8859-1] Sat Oct 2 22:19:59 2010 @@ -16,9 +16,9 @@ macro(set_entrypoint MODULE ENTRYPOINT) if(${ENTRYPOINT} STREQUAL "0") - set(NEW_LINKER_FLAGS "/ENTRY:0") + set(NEW_LINKER_FLAGS "/ENTRY:0") else() - set(NEW_LINKER_FLAGS "/ENTRY:${ENTRYPOINT}") + set(NEW_LINKER_FLAGS "/ENTRY:${ENTRYPOINT}") endif() get_target_property(LINKER_FLAGS ${MODULE} LINK_FLAGS) if(LINKER_FLAGS)

14 years, 2 months

[akhaldi] 48966: [CMAKE] - Introduce the case where entry point is 0. - Improve some dlls.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Oct 2 19:08:06 2010 New Revision: 48966 URL: http://svn.reactos.org/svn/reactos?rev=48966&view=rev Log: [CMAKE] - Introduce the case where entry point is 0. - Improve some dlls. Modified: branches/cmake-bringup/dll/win32/aclui/CMakeLists.txt branches/cmake-bringup/dll/win32/activeds/CMakeLists.txt branches/cmake-bringup/dll/win32/advapi32/CMakeLists.txt branches/cmake-bringup/dll/win32/advpack/CMakeLists.txt branches/cmake-bringup/dll/win32/authz/CMakeLists.txt branches/cmake-bringup/dll/win32/avicap32/CMakeLists.txt branches/cmake-bringup/dll/win32/batt/CMakeLists.txt branches/cmake-bringup/dll/win32/beepmidi/CMakeLists.txt branches/cmake-bringup/dll/win32/cabinet/CMakeLists.txt branches/cmake-bringup/dll/win32/cards/CMakeLists.txt branches/cmake-bringup/gcc.cmake branches/cmake-bringup/msc.cmake Modified: branches/cmake-bringup/dll/win32/aclui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/aclui/C… ============================================================================== --- branches/cmake-bringup/dll/win32/aclui/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/aclui/CMakeLists.txt [iso-8859-1] Sat Oct 2 19:08:06 2010 @@ -3,28 +3,24 @@ add_definitions(-DSUPPORT_UXTHEME) -file(GLOB_RECURSE SOURCE *.c) +list(APPEND SOURCE + aclui.c + checklist.c + guid.c + misc.c + sidcache.c + aclui.rc) spec2def(aclui ${CMAKE_CURRENT_SOURCE_DIR}/aclui.spec ${CMAKE_CURRENT_BINARY_DIR}/aclui.def) add_library(aclui SHARED - ${SOURCE} - ${CMAKE_CURRENT_SOURCE_DIR}/aclui.rc - ${CMAKE_CURRENT_BINARY_DIR}/aclui_precomp.h.gch) + ${CMAKE_CURRENT_BINARY_DIR}/aclui_precomp.h.gch + ${SOURCE}) -set_target_properties(aclui PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(aclui win32dll) -target_link_libraries(aclui - ${CMAKE_CURRENT_BINARY_DIR}/aclui.def - -luser32 - -lgdi32 - -lcomctl32 - -lole32 - -loleaut32 - -ladvapi32 - -luxtheme - -lkernel32 - -lntdll) +target_link_libraries(aclui ${CMAKE_CURRENT_BINARY_DIR}/aclui.def) +add_importlibs(aclui user32 gdi32 comctl32 ole32 oleaut32 advapi32 uxtheme kernel32 ntdll) add_pch(aclui ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) -add_dependencies(aclui aclui_def psdk buildno_header) +add_dependencies(aclui aclui_def) Modified: branches/cmake-bringup/dll/win32/activeds/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/actived… ============================================================================== --- branches/cmake-bringup/dll/win32/activeds/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/activeds/CMakeLists.txt [iso-8859-1] Sat Oct 2 19:08:06 2010 @@ -1,5 +1,3 @@ - - add_definitions(-D__WINESRC__) @@ -9,11 +7,12 @@ add_library(activeds SHARED activeds_main.c) -set_target_properties(activeds PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(activeds win32dll) target_link_libraries(activeds ${CMAKE_CURRENT_BINARY_DIR}/activeds.def - wine - mingw_common) + wine) -add_dependencies(activeds activeds_def psdk buildno_header) +add_importlibs(activeds kernel32 ntdll) + +add_dependencies(activeds activeds_def) Modified: branches/cmake-bringup/dll/win32/advapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/advapi3… ============================================================================== --- branches/cmake-bringup/dll/win32/advapi32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/advapi32/CMakeLists.txt [iso-8859-1] Sat Oct 2 19:08:06 2010 @@ -1,7 +1,6 @@ +set_unicode() - -add_definitions(-DUNICODE -D_UNICODE) add_definitions(-D_ADVAPI32_) remove_definitions(-D_WIN32_WINNT=0x502) @@ -9,29 +8,53 @@ include_directories(${REACTOS_BINARY_DIR}/include/reactos/idl) -file(GLOB_RECURSE SOURCE *.c) - -set_source_files_properties(${REACTOS_BINARY_DIR}/include/reactos/idl/svcctl_c.c - ${REACTOS_BINARY_DIR}/include/reactos/idl/lsa_c.c - ${REACTOS_BINARY_DIR}/include/reactos/idl/eventlogrpc_c.c - PROPERTIES GENERATED TRUE) +list(APPEND SOURCE + crypt/crypt.c + crypt/crypt_arc4.c + crypt/crypt_des.c + crypt/crypt_lmhash.c + crypt/crypt_md4.c + crypt/crypt_md5.c + crypt/crypt_sha.c + misc/dllmain.c + misc/hwprofiles.c + misc/logon.c + misc/msi.c + misc/shutdown.c + misc/sysfunc.c + misc/trace.c + reg/reg.c + sec/ac.c + sec/audit.c + sec/cred.c + sec/lsa.c + sec/misc.c + sec/sec.c + sec/sid.c + sec/trustee.c + service/eventlog.c + service/rpc.c + service/scm.c + service/sctrl.c + token/privilege.c + token/token.c + advapi32_stubs.c + advapi32.rc) add_library(advapi32 SHARED - ${SOURCE} - ${CMAKE_CURRENT_SOURCE_DIR}/advapi32.rc ${CMAKE_CURRENT_BINARY_DIR}/advapi32_advapi32.h.gch - ${REACTOS_BINARY_DIR}/include/reactos/idl/svcctl_c.c - ${REACTOS_BINARY_DIR}/include/reactos/idl/lsa_c.c - ${REACTOS_BINARY_DIR}/include/reactos/idl/eventlogrpc_c.c) + ${SOURCE}) -set_target_properties(advapi32 PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(advapi32 win32dll) -target_link_libraries(advapi32 ${CMAKE_CURRENT_SOURCE_DIR}/advapi32.def +target_link_libraries(advapi32 + ${CMAKE_CURRENT_SOURCE_DIR}/advapi32.def + svcctl_client + lsa_client + eventlogrpc_client wine - pseh - rpcrt4 - -lkernel32 - -lntdll) + pseh) + +add_importlibs(advapi32 rpcrt4 kernel32 ntdll) add_pch(advapi32 ${CMAKE_CURRENT_SOURCE_DIR}/advapi32.h ${SOURCE}) -add_dependencies(advapi32 svcctl_client lsa_client eventlogrpc_client version) Modified: branches/cmake-bringup/dll/win32/advpack/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/advpack… ============================================================================== --- branches/cmake-bringup/dll/win32/advpack/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/advpack/CMakeLists.txt [iso-8859-1] Sat Oct 2 19:08:06 2010 @@ -1,25 +1,23 @@ - - add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -file(GLOB_RECURSE SOURCE *.c) +list(APPEND SOURCE + advpack.c + files.c + install.c + reg.c) spec2def(advpack ${CMAKE_CURRENT_SOURCE_DIR}/advpack.spec ${CMAKE_CURRENT_BINARY_DIR}/advpack.def) add_library(advpack SHARED ${SOURCE}) -set_target_properties(advpack PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(advpack win32dll) target_link_libraries(advpack ${CMAKE_CURRENT_BINARY_DIR}/advpack.def - wine - mingw_common - -lole32 - -lsetupapi - -lversion - -ladvapi32) + wine) -add_dependencies(advpack advpack_def psdk buildno_header) +add_importlibs(advpack ole32 setupapi version advapi32 kernel32 ntdll) +add_dependencies(advpack advpack_def) Modified: branches/cmake-bringup/dll/win32/authz/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/authz/C… ============================================================================== --- branches/cmake-bringup/dll/win32/authz/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/authz/CMakeLists.txt [iso-8859-1] Sat Oct 2 19:08:06 2010 @@ -1,24 +1,22 @@ +set_unicode() - -add_definitions(-DUNICODE -D_UNICODE) - -file(GLOB_RECURSE SOURCE *.c) +list(APPEND SOURCE + authz.c + clictx.c + resman.c + authz.rc) spec2def(authz ${CMAKE_CURRENT_SOURCE_DIR}/authz.spec ${CMAKE_CURRENT_BINARY_DIR}/authz.def) add_library(authz SHARED - ${SOURCE} - ${CMAKE_CURRENT_SOURCE_DIR}/authz.rc - ${CMAKE_CURRENT_BINARY_DIR}/authz_precomp.h.gch) + ${CMAKE_CURRENT_BINARY_DIR}/authz_precomp.h.gch + ${SOURCE}) -set_target_properties(authz PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(authz win32dll) -target_link_libraries(authz - ${CMAKE_CURRENT_BINARY_DIR}/authz.def - -ladvapi32 - -lkernel32 - -lntdll) +target_link_libraries(authz ${CMAKE_CURRENT_BINARY_DIR}/authz.def) add_pch(authz ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) -add_dependencies(authz authz_def psdk buildno_header) +add_importlibs(authz advapi32 kernel32 ntdll) +add_dependencies(authz authz_def) Modified: branches/cmake-bringup/dll/win32/avicap32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/avicap3… ============================================================================== --- branches/cmake-bringup/dll/win32/avicap32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/avicap32/CMakeLists.txt [iso-8859-1] Sat Oct 2 19:08:06 2010 @@ -1,22 +1,15 @@ - - -add_definitions(-DUNICODE -D_UNICODE) +set_unicode() spec2def(avicap32 ${CMAKE_CURRENT_SOURCE_DIR}/avicap32.spec ${CMAKE_CURRENT_BINARY_DIR}/avicap32.def) -add_library(avicap32 SHARED - ${CMAKE_CURRENT_SOURCE_DIR}/avicap32.c - ${CMAKE_CURRENT_SOURCE_DIR}/avicap32.rc) +add_library(avicap32 SHARED avicap32.c avicap32.rc) -set_target_properties(avicap32 PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(avicap32 win32dll) target_link_libraries(avicap32 ${CMAKE_CURRENT_BINARY_DIR}/avicap32.def - -ladvapi32 - -luser32 - wine - mingw_common - -lversion) + wine) -add_dependencies(avicap32 avicap32_def psdk) +add_importlibs(avicap32 advapi32 user32 version kernel32 ntdll) +add_dependencies(avicap32 avicap32_def) Modified: branches/cmake-bringup/dll/win32/batt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/batt/CM… ============================================================================== --- branches/cmake-bringup/dll/win32/batt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/batt/CMakeLists.txt [iso-8859-1] Sat Oct 2 19:08:06 2010 @@ -1,18 +1,13 @@ - - -add_definitions(-DUNICODE -D_UNICODE) +set_unicode() spec2def(batt ${CMAKE_CURRENT_SOURCE_DIR}/batt.spec ${CMAKE_CURRENT_BINARY_DIR}/batt.def) -add_library(batt SHARED - ${CMAKE_CURRENT_SOURCE_DIR}/batt.c - ${CMAKE_CURRENT_SOURCE_DIR}/batt.rc) +add_library(batt SHARED batt.c batt.rc) -set_target_properties(batt PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(batt win32dll) -target_link_libraries(batt - ${CMAKE_CURRENT_BINARY_DIR}/batt.def - -lkernel32) +target_link_libraries(batt ${CMAKE_CURRENT_BINARY_DIR}/batt.def) -add_dependencies(batt batt_def psdk) +add_importlibs(batt kernel32) +add_dependencies(batt batt_def) Modified: branches/cmake-bringup/dll/win32/beepmidi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/beepmid… ============================================================================== --- branches/cmake-bringup/dll/win32/beepmidi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/beepmidi/CMakeLists.txt [iso-8859-1] Sat Oct 2 19:08:06 2010 @@ -1,18 +1,13 @@ - - -add_definitions(-DUNICODE -D_UNICODE) +set_unicode() spec2def(beepmidi ${CMAKE_CURRENT_SOURCE_DIR}/beepmidi.spec ${CMAKE_CURRENT_BINARY_DIR}/beepmidi.def) add_library(beepmidi SHARED beepmidi.c) -set_target_properties(beepmidi PROPERTIES LINK_FLAGS "-Wl,-entry,0") +set_entrypoint(beepmidi 0) -target_link_libraries(beepmidi - ${CMAKE_CURRENT_BINARY_DIR}/beepmidi.def - -lwinmm - -lkernel32 - -lntdll) +target_link_libraries(beepmidi ${CMAKE_CURRENT_BINARY_DIR}/beepmidi.def) +add_importlibs(beepmidi winmm kernel32 ntdll) add_dependencies(beepmidi beepmidi_def psdk) Modified: branches/cmake-bringup/dll/win32/cabinet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/cabinet… ============================================================================== --- branches/cmake-bringup/dll/win32/cabinet/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/cabinet/CMakeLists.txt [iso-8859-1] Sat Oct 2 19:08:06 2010 @@ -1,5 +1,3 @@ - - add_definitions(-D__WINESRC__) @@ -7,17 +5,19 @@ spec2def(cabinet ${CMAKE_CURRENT_SOURCE_DIR}/cabinet.spec ${CMAKE_CURRENT_BINARY_DIR}/cabinet.def) -file(GLOB_RECURSE SOURCE *.c) +list(APPEND SOURCE + cabinet_main.c + fci.c + fdi.c + cabinet.rc) -add_library(cabinet SHARED - ${SOURCE} - ${CMAKE_CURRENT_SOURCE_DIR}/cabinet.rc) +add_library(cabinet SHARED ${SOURCE}) -set_target_properties(cabinet PROPERTIES LINK_FLAGS "-Wl,-entry,0") +set_entrypoint(cabinet 0) target_link_libraries(cabinet ${CMAKE_CURRENT_BINARY_DIR}/cabinet.def - wine - mingw_common) + wine) -add_dependencies(cabinet cabinet_def psdk) +add_importlibs(cabinet kernel32 ntdll) +add_dependencies(cabinet cabinet_def psdk buildno_header) Modified: branches/cmake-bringup/dll/win32/cards/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/cards/C… ============================================================================== --- branches/cmake-bringup/dll/win32/cards/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/cards/CMakeLists.txt [iso-8859-1] Sat Oct 2 19:08:06 2010 @@ -1,20 +1,16 @@ - - -add_definitions(-DUNICODE -D_UNICODE) +set_unicode() # Possible definitions: CARDSTYLE_DEFAULT or CARDSTYLE_BAVARIAN add_definitions(-DCARDSTYLE_DEFAULT) spec2def(cards ${CMAKE_CURRENT_SOURCE_DIR}/cards.spec ${CMAKE_CURRENT_BINARY_DIR}/cards.def) -add_library(cards SHARED ${CMAKE_CURRENT_SOURCE_DIR}/cards.c ${CMAKE_CURRENT_SOURCE_DIR}/cards.rc) +add_library(cards SHARED cards.c cards.rc) -set_target_properties(cards PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") +set_module_type(cards win32dll) -target_link_libraries(cards - ${CMAKE_CURRENT_BINARY_DIR}/cards.def - -luser32 - -lgdi32) +target_link_libraries(cards ${CMAKE_CURRENT_BINARY_DIR}/cards.def) -add_dependencies(cards cards_def psdk) +add_importlibs(cards user32 gdi32) +add_dependencies(cards cards_def) Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=489… ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Sat Oct 2 19:08:06 2010 @@ -35,7 +35,11 @@ # Macros macro(set_entrypoint MODULE ENTRYPOINT) + if(${ENTRYPOINT} STREQUAL "0") + set(NEW_LINKER_FLAGS "-Wl,-entry,0") + else() set(NEW_LINKER_FLAGS "-Wl,-entry,_${ENTRYPOINT}") + endif() get_target_property(LINKER_FLAGS ${MODULE} LINK_FLAGS) if(LINKER_FLAGS) set(NEW_LINKER_FLAGS "${LINKER_FLAGS} ${NEW_LINKER_FLAGS}") Modified: branches/cmake-bringup/msc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/msc.cmake?rev=489… ============================================================================== --- branches/cmake-bringup/msc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/msc.cmake [iso-8859-1] Sat Oct 2 19:08:06 2010 @@ -15,7 +15,11 @@ add_definitions(-Dinline=__inline -D__STDC__=1) macro(set_entrypoint MODULE ENTRYPOINT) + if(${ENTRYPOINT} STREQUAL "0") + set(NEW_LINKER_FLAGS "/ENTRY:0") + else() set(NEW_LINKER_FLAGS "/ENTRY:${ENTRYPOINT}") + endif() get_target_property(LINKER_FLAGS ${MODULE} LINK_FLAGS) if(LINKER_FLAGS) set(NEW_LINKER_FLAGS "${LINKER_FLAGS} ${NEW_LINKER_FLAGS}")

14 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2010