Ros-diffs November 2010

ros-diffs@reactos.org

16 participants
491 discussions

[spetreolle] 49477: [CMAKE] Add base/ modules to bootcd.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Fri Nov 5 10:37:10 2010 New Revision: 49477 URL: http://svn.reactos.org/svn/reactos?rev=49477&view=rev Log: [CMAKE] Add base/ modules to bootcd. Modified: branches/cmake-bringup/base/applications/cacls/CMakeLists.txt branches/cmake-bringup/base/applications/calc/CMakeLists.txt branches/cmake-bringup/base/applications/charmap/CMakeLists.txt branches/cmake-bringup/base/applications/cmdutils/dbgprint/CMakeLists.txt branches/cmake-bringup/base/applications/cmdutils/doskey/CMakeLists.txt branches/cmake-bringup/base/applications/cmdutils/find/CMakeLists.txt branches/cmake-bringup/base/applications/cmdutils/hostname/CMakeLists.txt branches/cmake-bringup/base/applications/cmdutils/lodctr/CMakeLists.txt branches/cmake-bringup/base/applications/cmdutils/more/CMakeLists.txt branches/cmake-bringup/base/applications/cmdutils/reg/CMakeLists.txt branches/cmake-bringup/base/applications/cmdutils/xcopy/CMakeLists.txt branches/cmake-bringup/base/applications/control/CMakeLists.txt branches/cmake-bringup/base/applications/dxdiag/CMakeLists.txt branches/cmake-bringup/base/applications/extrac32/CMakeLists.txt branches/cmake-bringup/base/applications/fontview/CMakeLists.txt branches/cmake-bringup/base/applications/games/solitaire/CMakeLists.txt branches/cmake-bringup/base/applications/games/spider/CMakeLists.txt branches/cmake-bringup/base/applications/games/winmine/CMakeLists.txt branches/cmake-bringup/base/applications/hh/CMakeLists.txt branches/cmake-bringup/base/applications/iexplore/CMakeLists.txt branches/cmake-bringup/base/applications/kbswitch/CMakeLists.txt branches/cmake-bringup/base/applications/logoff/CMakeLists.txt branches/cmake-bringup/base/applications/magnify/CMakeLists.txt branches/cmake-bringup/base/applications/mplay32/CMakeLists.txt branches/cmake-bringup/base/applications/msconfig/CMakeLists.txt branches/cmake-bringup/base/applications/mscutils/devmgmt/CMakeLists.txt branches/cmake-bringup/base/applications/mscutils/eventvwr/CMakeLists.txt branches/cmake-bringup/base/applications/mscutils/servman/CMakeLists.txt branches/cmake-bringup/base/applications/mstsc/CMakeLists.txt branches/cmake-bringup/base/applications/notepad/CMakeLists.txt branches/cmake-bringup/base/applications/paint/CMakeLists.txt branches/cmake-bringup/base/applications/rapps/CMakeLists.txt branches/cmake-bringup/base/applications/regedit/CMakeLists.txt branches/cmake-bringup/base/applications/regedt32/CMakeLists.txt branches/cmake-bringup/base/applications/sc/CMakeLists.txt branches/cmake-bringup/base/applications/screensavers/3dtext/CMakeLists.txt branches/cmake-bringup/base/applications/screensavers/logon/CMakeLists.txt branches/cmake-bringup/base/applications/sndvol32/CMakeLists.txt branches/cmake-bringup/base/applications/taskmgr/CMakeLists.txt branches/cmake-bringup/base/applications/winver/CMakeLists.txt branches/cmake-bringup/base/applications/wordpad/CMakeLists.txt branches/cmake-bringup/base/applications/write/CMakeLists.txt branches/cmake-bringup/base/services/tcpsvcs/CMakeLists.txt branches/cmake-bringup/base/services/telnetd/CMakeLists.txt branches/cmake-bringup/base/shell/cmd/CMakeLists.txt branches/cmake-bringup/base/system/bootok/CMakeLists.txt branches/cmake-bringup/base/system/expand/CMakeLists.txt branches/cmake-bringup/base/system/format/CMakeLists.txt branches/cmake-bringup/base/system/msiexec/CMakeLists.txt branches/cmake-bringup/base/system/regsvr32/CMakeLists.txt branches/cmake-bringup/base/system/runonce/CMakeLists.txt Modified: branches/cmake-bringup/base/applications/cacls/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cacls/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cacls/CMakeLists.txt [iso-8859-1] Fri Nov 5 10:37:10 2010 @@ -11,3 +11,5 @@ set_module_type(cacls win32cui) add_importlibs(cacls advapi32 user32 shell32 msvcrt kernel32) + +add_cab_target(cacls 1) Modified: branches/cmake-bringup/base/applications/calc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/calc/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/calc/CMakeLists.txt [iso-8859-1] Fri Nov 5 10:37:10 2010 @@ -14,3 +14,5 @@ set_module_type(calc win32gui) add_importlibs(calc advapi32 user32 gdi32 msvcrt kernel32) + +add_cab_target(calc 1) Modified: branches/cmake-bringup/base/applications/charmap/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/charmap/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/charmap/CMakeLists.txt [iso-8859-1] Fri Nov 5 10:37:10 2010 @@ -17,3 +17,5 @@ set_module_type(charmap win32gui) add_importlibs(charmap user32 gdi32 comctl32 kernel32 msvcrt) + +add_cab_target(charmap 1) Modified: branches/cmake-bringup/base/applications/cmdutils/dbgprint/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/dbgprint/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/dbgprint/CMakeLists.txt [iso-8859-1] Fri Nov 5 10:37:10 2010 @@ -3,3 +3,5 @@ set_module_type(dbgprint win32cui) add_importlibs(dbgprint msvcrt kernel32) + +add_cab_target(dbgprint 1) Modified: branches/cmake-bringup/base/applications/cmdutils/doskey/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/doskey/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/doskey/CMakeLists.txt [iso-8859-1] Fri Nov 5 10:37:10 2010 @@ -5,3 +5,5 @@ set_module_type(doskey win32cui) add_importlibs(doskey user32 msvcrt kernel32) + +add_cab_target(doskey 1) Modified: branches/cmake-bringup/base/applications/cmdutils/find/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/find/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/find/CMakeLists.txt [iso-8859-1] Fri Nov 5 10:37:10 2010 @@ -4,3 +4,5 @@ set_module_type(find win32cui) add_importlibs(find user32 msvcrt kernel32) + +add_cab_target(find 1) Modified: branches/cmake-bringup/base/applications/cmdutils/hostname/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/hostname/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/hostname/CMakeLists.txt [iso-8859-1] Fri Nov 5 10:37:10 2010 @@ -4,3 +4,5 @@ set_module_type(hostname win32cui) add_importlibs(hostname msvcrt kernel32) + +add_cab_target(hostname 1) Modified: branches/cmake-bringup/base/applications/cmdutils/lodctr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/lodctr/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/lodctr/CMakeLists.txt [iso-8859-1] Fri Nov 5 10:37:10 2010 @@ -5,3 +5,5 @@ set_module_type(lodctr win32cui) add_importlibs(lodctr loadperf msvcrt kernel32) + +add_cab_target(lodctr 1) Modified: branches/cmake-bringup/base/applications/cmdutils/more/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/more/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/more/CMakeLists.txt [iso-8859-1] Fri Nov 5 10:37:10 2010 @@ -3,3 +3,5 @@ set_module_type(more win32cui) add_importlibs(more user32 msvcrt kernel32) + +add_cab_target(more 1) Modified: branches/cmake-bringup/base/applications/cmdutils/reg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/reg/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/reg/CMakeLists.txt [iso-8859-1] Fri Nov 5 10:37:10 2010 @@ -8,3 +8,5 @@ set_module_type(reg win32cui) add_importlibs(reg advapi32 user32 msvcrt kernel32) + +add_cab_target(reg 1) Modified: branches/cmake-bringup/base/applications/cmdutils/xcopy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/xcopy/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/xcopy/CMakeLists.txt [iso-8859-1] Fri Nov 5 10:37:10 2010 @@ -7,3 +7,5 @@ set_module_type(xcopy win32cui) add_importlibs(xcopy shell32 user32 msvcrt kernel32 ntdll) + +add_cab_target(xcopy 1) Modified: branches/cmake-bringup/base/applications/control/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/control/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/control/CMakeLists.txt [iso-8859-1] Fri Nov 5 10:37:10 2010 @@ -5,3 +5,5 @@ set_module_type(control win32gui) add_importlibs(control advapi32 shell32 msvcrt kernel32) + +add_cab_target(control 1) Modified: 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 [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/dxdiag/CMakeLists.txt [iso-8859-1] Fri Nov 5 10:37:10 2010 @@ -28,3 +28,5 @@ target_link_libraries(dxdiag dxguid) add_importlibs(dxdiag user32 advapi32 comctl32 dinput8 setupapi dsound ddraw version gdi32 winmm d3d9 msvcrt kernel32) + +add_cab_target(dxdiag 1) Modified: branches/cmake-bringup/base/applications/extrac32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/extrac32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/extrac32/CMakeLists.txt [iso-8859-1] Fri Nov 5 10:37:10 2010 @@ -7,3 +7,5 @@ set_module_type(extrac32 win32gui) add_importlibs(extrac32 shell32 setupapi shlwapi user32 msvcrt kernel32 ntdll) + +add_cab_target(extrac32 1) Modified: branches/cmake-bringup/base/applications/fontview/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/fontview/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/fontview/CMakeLists.txt [iso-8859-1] Fri Nov 5 10:37:10 2010 @@ -6,3 +6,5 @@ set_module_type(fontview win32gui) add_importlibs(fontview gdi32 shell32 user32 msvcrt kernel32) + +add_cab_target(fontview 1) Modified: branches/cmake-bringup/base/applications/games/solitaire/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/games/solitaire/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/games/solitaire/CMakeLists.txt [iso-8859-1] Fri Nov 5 10:37:10 2010 @@ -15,3 +15,5 @@ set_module_type(sol win32gui) add_importlibs(sol advapi32 comctl32 user32 gdi32 kernel32 msvcrt) + +add_cab_target(sol 1) Modified: branches/cmake-bringup/base/applications/games/spider/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/games/spider/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/games/spider/CMakeLists.txt [iso-8859-1] Fri Nov 5 10:37:10 2010 @@ -15,4 +15,6 @@ set_module_type(spider win32gui) -add_importlibs(spider advapi32 comctl32 user32 gdi32 kernel32 msvcrt) +add_importlibs(spider advapi32 comctl32 user32 gdi32 kernel32 msvcrt) + +add_cab_target(spider 1) Modified: branches/cmake-bringup/base/applications/games/winmine/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/games/winmine/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/games/winmine/CMakeLists.txt [iso-8859-1] Fri Nov 5 10:37:10 2010 @@ -11,3 +11,5 @@ set_module_type(winmine win32gui) target_link_libraries(winmine wine) add_importlibs(winmine user32 gdi32 advapi32 shell32 msvcrt kernel32 ntdll) + +add_cab_target(winmine 1) Modified: branches/cmake-bringup/base/applications/hh/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/hh/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/hh/CMakeLists.txt [iso-8859-1] Fri Nov 5 10:37:10 2010 @@ -3,3 +3,5 @@ set_module_type(hh win32gui) add_importlibs(hh gdi32 user32 msvcrt kernel32) + +add_cab_target(hh 4) Modified: branches/cmake-bringup/base/applications/iexplore/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/iexplore/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/iexplore/CMakeLists.txt [iso-8859-1] Fri Nov 5 10:37:10 2010 @@ -3,3 +3,5 @@ set_module_type(iexplore win32gui) add_importlibs(iexplore shdocvw msvcrt kernel32) + +add_cab_target(iexplore 4) Modified: 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 [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/kbswitch/CMakeLists.txt [iso-8859-1] Fri Nov 5 10:37:10 2010 @@ -6,4 +6,5 @@ set_module_type(kbswitch win32gui) add_importlibs(kbswitch advapi32 user32 shell32 gdi32 msvcrt kernel32) +add_cab_target(kbswitch 1) add_subdirectory(kbsdll) Modified: 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 [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/logoff/CMakeLists.txt [iso-8859-1] Fri Nov 5 10:37:10 2010 @@ -12,3 +12,5 @@ set_module_type(logoff win32cui) add_importlibs(logoff advapi32 user32 msvcrt kernel32) + +add_cab_target(logoff 1) Modified: 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 [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/magnify/CMakeLists.txt [iso-8859-1] Fri Nov 5 10:37:10 2010 @@ -7,3 +7,5 @@ set_module_type(magnify win32gui) add_importlibs(magnify user32 gdi32 advapi32 shell32 msvcrt kernel32) + +add_cab_target(magnify 1) Modified: 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 [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/mplay32/CMakeLists.txt [iso-8859-1] Fri Nov 5 10:37:10 2010 @@ -6,3 +6,5 @@ set_module_type(mplay32 win32gui) add_importlibs(mplay32 advapi32 comctl32 comdlg32 user32 gdi32 winmm shell32 msvcrt kernel32) + +add_cab_target(mplay32 1) Modified: 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 [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/msconfig/CMakeLists.txt [iso-8859-1] Fri Nov 5 10:37:10 2010 @@ -18,3 +18,5 @@ set_module_type(msconfig win32gui) add_importlibs(msconfig user32 advapi32 version comctl32 shell32 shlwapi msvcrt kernel32) + +add_cab_target(msconfig 1) Modified: 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 [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/mscutils/devmgmt/CMakeLists.txt [iso-8859-1] Fri Nov 5 10:37:10 2010 @@ -16,3 +16,5 @@ set_module_type(devmgmt win32gui) add_importlibs(devmgmt setupapi gdi32 user32 comctl32 advapi32 devmgr msvcrt kernel32) + +add_cab_target(devmgmt 1) Modified: 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 [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/mscutils/eventvwr/CMakeLists.txt [iso-8859-1] Fri Nov 5 10:37:10 2010 @@ -6,3 +6,5 @@ set_module_type(eventvwr win32gui) add_importlibs(eventvwr user32 comctl32 advapi32 msvcrt kernel32) + +add_cab_target(eventvwr 1) Modified: 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 [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/mscutils/servman/CMakeLists.txt [iso-8859-1] Fri Nov 5 10:37:10 2010 @@ -30,3 +30,5 @@ set_module_type(servman win32gui) add_importlibs(servman user32 gdi32 advapi32 version comctl32 shell32 comdlg32 msvcrt kernel32) + +add_cab_target(servman 1) Modified: 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 [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/mstsc/CMakeLists.txt [iso-8859-1] Fri Nov 5 10:37:10 2010 @@ -30,3 +30,5 @@ set_module_type(mstsc win32gui) add_importlibs(mstsc user32 gdi32 comctl32 ws2_32 advapi32 shell32 ole32 comdlg32 msvcrt kernel32) + +add_cab_target(mstsc 1) Modified: branches/cmake-bringup/base/applications/notepad/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/notepad/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/notepad/CMakeLists.txt [iso-8859-1] Fri Nov 5 10:37:10 2010 @@ -14,3 +14,5 @@ set_module_type(notepad win32gui) add_importlibs(notepad user32 gdi32 comctl32 comdlg32 advapi32 shell32 msvcrt kernel32) + +add_cab_target(notepad 1) Modified: 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 [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/paint/CMakeLists.txt [iso-8859-1] Fri Nov 5 10:37:10 2010 @@ -19,3 +19,5 @@ set_module_type(paint win32gui) add_importlibs(paint comdlg32 shell32 user32 gdi32 advapi32 comctl32 msvcrt kernel32) + +add_cab_target(paint 1) Modified: branches/cmake-bringup/base/applications/rapps/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/rapps/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/rapps/CMakeLists.txt [iso-8859-1] Fri Nov 5 10:37:10 2010 @@ -61,3 +61,4 @@ MACRO_ADD_MESSAGE_HEADERS(rappsmsg.mc) +add_cab_target(rapps 1) Modified: 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 [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/regedit/CMakeLists.txt [iso-8859-1] Fri Nov 5 10:37:10 2010 @@ -30,3 +30,5 @@ add_importlibs(regedit user32 gdi32 advapi32 ole32 shell32 comctl32 comdlg32 shlwapi msvcrt kernel32) #add_subdirectory(clb) + +add_cab_target(regedit 4) Modified: 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 [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/regedt32/CMakeLists.txt [iso-8859-1] Fri Nov 5 10:37:10 2010 @@ -6,3 +6,5 @@ set_module_type(regedt32 win32gui) add_importlibs(regedt32 shell32 shlwapi msvcrt kernel32) + +add_cab_target(regedt32 1) Modified: 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 [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/sc/CMakeLists.txt [iso-8859-1] Fri Nov 5 10:37:10 2010 @@ -20,3 +20,5 @@ set_module_type(sc win32cui) add_importlibs(sc advapi32 msvcrt kernel32) + +add_cab_target(sc 1) Modified: branches/cmake-bringup/base/applications/screensavers/3dtext/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/screensavers/3dtext/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/screensavers/3dtext/CMakeLists.txt [iso-8859-1] Fri Nov 5 10:37:10 2010 @@ -11,4 +11,6 @@ set_target_properties(3dtext PROPERTIES SUFFIX ".scr") target_link_libraries(3dtext scrnsave) -add_importlibs(3dtext user32 gdi32 opengl32 glu32 advapi32 msvcrt kernel32) +add_importlibs(3dtext user32 gdi32 opengl32 glu32 advapi32 msvcrt kernel32) + +add_cab_target(3dtext 1) Modified: branches/cmake-bringup/base/applications/screensavers/logon/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/screensavers/logon/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/screensavers/logon/CMakeLists.txt [iso-8859-1] Fri Nov 5 10:37:10 2010 @@ -9,4 +9,6 @@ set_target_properties(logon PROPERTIES SUFFIX ".scr") target_link_libraries(logon scrnsave) -add_importlibs(logon user32 gdi32 msvcrt kernel32) +add_importlibs(logon user32 gdi32 msvcrt kernel32) + +add_cab_target(logon 1) Modified: 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 [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/sndvol32/CMakeLists.txt [iso-8859-1] Fri Nov 5 10:37:10 2010 @@ -15,3 +15,5 @@ set_module_type(sndvol32 win32gui) add_importlibs(sndvol32 user32 advapi32 gdi32 comctl32 shell32 winmm msvcrt kernel32 ntdll) + +add_cab_target(sndvol32 1) Modified: 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 [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/taskmgr/CMakeLists.txt [iso-8859-1] Fri Nov 5 10:37:10 2010 @@ -29,3 +29,5 @@ set_module_type(taskmgr win32gui) add_importlibs(taskmgr advapi32 user32 gdi32 shell32 comctl32 msvcrt kernel32 ntdll) + +add_cab_target(taskmgr 1) Modified: 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 [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/winver/CMakeLists.txt [iso-8859-1] Fri Nov 5 10:37:10 2010 @@ -6,3 +6,5 @@ set_module_type(winver win32gui) add_importlibs(winver shell32 msvcrt kernel32) + +add_cab_target(winver 1) Modified: branches/cmake-bringup/base/applications/wordpad/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/wordpad/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/wordpad/CMakeLists.txt [iso-8859-1] Fri Nov 5 10:37:10 2010 @@ -19,3 +19,5 @@ target_link_libraries(wordpad wine uuid) add_importlibs(wordpad comdlg32 ole32 shell32 user32 gdi32 advapi32 comctl32 msvcrt kernel32 ntdll) + +add_cab_target(wordpad 1) Modified: 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 [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/write/CMakeLists.txt [iso-8859-1] Fri Nov 5 10:37:10 2010 @@ -6,3 +6,5 @@ set_module_type(write win32gui) add_importlibs(write user32 gdi32 msvcrt kernel32) + +add_cab_target(write 1) Modified: branches/cmake-bringup/base/services/tcpsvcs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/tcp… ============================================================================== --- branches/cmake-bringup/base/services/tcpsvcs/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/services/tcpsvcs/CMakeLists.txt [iso-8859-1] Fri Nov 5 10:37:10 2010 @@ -18,3 +18,6 @@ set_module_type(tcpsvcs win32cui) add_importlibs(tcpsvcs ws2_32 advapi32 msvcrt kernel32 ntdll) + +add_cab_target(tcpsvcs 1) +add_cab(${CMAKE_CURRENT_SOURCE_DIR}/quotes 5) Modified: branches/cmake-bringup/base/services/telnetd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/tel… ============================================================================== --- branches/cmake-bringup/base/services/telnetd/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/services/telnetd/CMakeLists.txt [iso-8859-1] Fri Nov 5 10:37:10 2010 @@ -10,3 +10,4 @@ set_module_type(telnetd win32cui) add_importlibs(telnetd advapi32 ws2_32 msvcrt kernel32 ntdll) +add_cab_target(telnetd 1) Modified: branches/cmake-bringup/base/shell/cmd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/cmd/CM… ============================================================================== --- branches/cmake-bringup/base/shell/cmd/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/shell/cmd/CMakeLists.txt [iso-8859-1] Fri Nov 5 10:37:10 2010 @@ -75,4 +75,5 @@ add_pch(cmd ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h SOURCE) set_module_type(cmd win32cui) -add_importlibs(cmd advapi32 user32 msvcrt kernel32 ntdll) +add_importlibs(cmd advapi32 user32 msvcrt kernel32 ntdll) +add_cab_target(cmd 1) Modified: branches/cmake-bringup/base/system/bootok/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/booto… ============================================================================== --- branches/cmake-bringup/base/system/bootok/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/system/bootok/CMakeLists.txt [iso-8859-1] Fri Nov 5 10:37:10 2010 @@ -7,3 +7,5 @@ set_module_type(bootok win32cui) add_importlibs(bootok advapi32 msvcrt kernel32 ntdll) + +add_cab_target(bootok 1) Modified: branches/cmake-bringup/base/system/expand/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/expan… ============================================================================== --- branches/cmake-bringup/base/system/expand/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/system/expand/CMakeLists.txt [iso-8859-1] Fri Nov 5 10:37:10 2010 @@ -7,3 +7,5 @@ set_module_type(expand win32cui) add_importlibs(expand lz32 setupapi user32 msvcrt kernel32 ntdll) + +add_cab_target(expand 1) Modified: branches/cmake-bringup/base/system/format/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/forma… ============================================================================== --- branches/cmake-bringup/base/system/format/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/system/format/CMakeLists.txt [iso-8859-1] Fri Nov 5 10:37:10 2010 @@ -8,3 +8,5 @@ set_module_type(format win32cui) add_importlibs(format ntdll user32 fmifs msvcrt kernel32 ntdll) + +add_cab_target(format 1) Modified: branches/cmake-bringup/base/system/msiexec/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/msiex… ============================================================================== --- branches/cmake-bringup/base/system/msiexec/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/system/msiexec/CMakeLists.txt [iso-8859-1] Fri Nov 5 10:37:10 2010 @@ -14,3 +14,4 @@ add_importlibs(msiexec user32 advapi32 ole32 msi msvcrt kernel32 ntdll) +add_cab_target(msiexec 1) Modified: branches/cmake-bringup/base/system/regsvr32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/regsv… ============================================================================== --- branches/cmake-bringup/base/system/regsvr32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/system/regsvr32/CMakeLists.txt [iso-8859-1] Fri Nov 5 10:37:10 2010 @@ -9,3 +9,5 @@ set_module_type(regsvr32 win32gui) add_importlibs(regsvr32 user32 shell32 ole32 msvcrt kernel32 ntdll) + +add_cab_target(regsvr32 1) Modified: branches/cmake-bringup/base/system/runonce/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/runon… ============================================================================== --- branches/cmake-bringup/base/system/runonce/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/system/runonce/CMakeLists.txt [iso-8859-1] Fri Nov 5 10:37:10 2010 @@ -6,3 +6,5 @@ set_module_type(runonce win32gui) add_importlibs(runonce advapi32 user32 msvcrt kernel32 ntdll) + +add_cab_target(runonce 1)

13 years, 11 months

[spetreolle] 49476: [CMAKE] Revert incorrect auto import change and use proper definitions instead.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Fri Nov 5 09:38:42 2010 New Revision: 49476 URL: http://svn.reactos.org/svn/reactos?rev=49476&view=rev Log: [CMAKE] Revert incorrect auto import change and use proper definitions instead. Modified: branches/cmake-bringup/base/applications/cmdutils/find/CMakeLists.txt branches/cmake-bringup/base/applications/cmdutils/hostname/CMakeLists.txt branches/cmake-bringup/base/applications/logoff/CMakeLists.txt branches/cmake-bringup/base/applications/network/dwnl/CMakeLists.txt branches/cmake-bringup/base/applications/network/finger/CMakeLists.txt branches/cmake-bringup/base/applications/network/ftp/CMakeLists.txt branches/cmake-bringup/base/applications/network/route/CMakeLists.txt branches/cmake-bringup/base/applications/network/whois/CMakeLists.txt branches/cmake-bringup/base/applications/regedit/CMakeLists.txt branches/cmake-bringup/base/applications/shutdown/CMakeLists.txt branches/cmake-bringup/base/applications/sndvol32/CMakeLists.txt branches/cmake-bringup/base/applications/wordpad/CMakeLists.txt branches/cmake-bringup/base/services/telnetd/CMakeLists.txt branches/cmake-bringup/base/system/bootok/CMakeLists.txt branches/cmake-bringup/base/system/expand/CMakeLists.txt branches/cmake-bringup/base/system/format/CMakeLists.txt branches/cmake-bringup/base/system/msiexec/CMakeLists.txt branches/cmake-bringup/base/system/regsvr32/CMakeLists.txt branches/cmake-bringup/dll/3rdparty/CMakeLists.txt branches/cmake-bringup/gcc.cmake branches/cmake-bringup/lib/smlib/CMakeLists.txt branches/cmake-bringup/subsystems/win32/csrss/win32csr/CMakeLists.txt branches/cmake-bringup/toolchain-mingw32.cmake Modified: branches/cmake-bringup/base/applications/cmdutils/find/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/find/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/find/CMakeLists.txt [iso-8859-1] Fri Nov 5 09:38:42 2010 @@ -1,3 +1,4 @@ +add_definitions(-D_DLL -D__USE_CRTIMP) add_executable(find find.c find.rc) Modified: branches/cmake-bringup/base/applications/cmdutils/hostname/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/hostname/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/hostname/CMakeLists.txt [iso-8859-1] Fri Nov 5 09:38:42 2010 @@ -1,3 +1,4 @@ +add_definitions(-D_DLL -D__USE_CRTIMP) add_executable(hostname hostname.c hostname.rc) Modified: 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 [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/logoff/CMakeLists.txt [iso-8859-1] Fri Nov 5 09:38:42 2010 @@ -1,3 +1,4 @@ +add_definitions(-D_DLL -D__USE_CRTIMP) list(APPEND SOURCE misc.c Modified: 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 [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/network/dwnl/CMakeLists.txt [iso-8859-1] Fri Nov 5 09:38:42 2010 @@ -1,3 +1,4 @@ +add_definitions(-D_DLL -D__USE_CRTIMP) set_unicode() Modified: 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 [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/network/finger/CMakeLists.txt [iso-8859-1] Fri Nov 5 09:38:42 2010 @@ -1,4 +1,5 @@ add_definitions(-D__USE_W32_SOCKETS) +add_definitions(-D_DLL -D__USE_CRTIMP) add_executable(finger finger.c Modified: 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 [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/network/ftp/CMakeLists.txt [iso-8859-1] Fri Nov 5 09:38:42 2010 @@ -1,3 +1,5 @@ +add_definitions(-D_DLL -D__USE_CRTIMP) + add_executable(ftp cmds.c cmdtab.c Modified: 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 [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/network/route/CMakeLists.txt [iso-8859-1] Fri Nov 5 09:38:42 2010 @@ -1,3 +1,4 @@ +add_definitions(-D_DLL -D__USE_CRTIMP) set_unicode() Modified: 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 [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/network/whois/CMakeLists.txt [iso-8859-1] Fri Nov 5 09:38:42 2010 @@ -1,3 +1,4 @@ +add_definitions(-D_DLL -D__USE_CRTIMP) add_executable(whois whois.c whois.rc) Modified: 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 [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/regedit/CMakeLists.txt [iso-8859-1] Fri Nov 5 09:38:42 2010 @@ -1,3 +1,4 @@ +add_definitions(-D_DLL -D__USE_CRTIMP) set_unicode() Modified: 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 [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/shutdown/CMakeLists.txt [iso-8859-1] Fri Nov 5 09:38:42 2010 @@ -1,3 +1,4 @@ +add_definitions(-D_DLL -D__USE_CRTIMP) list(APPEND SOURCE misc.c Modified: 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 [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/sndvol32/CMakeLists.txt [iso-8859-1] Fri Nov 5 09:38:42 2010 @@ -1,3 +1,4 @@ +add_definitions(-D_DLL -D__USE_CRTIMP) set_unicode() Modified: branches/cmake-bringup/base/applications/wordpad/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/wordpad/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/wordpad/CMakeLists.txt [iso-8859-1] Fri Nov 5 09:38:42 2010 @@ -5,7 +5,10 @@ wordpad.c rsrc.rc) -add_definitions(-D__ROS_LONG64__) +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine) set_rc_compiler() Modified: branches/cmake-bringup/base/services/telnetd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/tel… ============================================================================== --- branches/cmake-bringup/base/services/telnetd/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/services/telnetd/CMakeLists.txt [iso-8859-1] Fri Nov 5 09:38:42 2010 @@ -1,3 +1,4 @@ +add_definitions(-D_DLL -D__USE_CRTIMP) add_executable(telnetd telnetd.c Modified: branches/cmake-bringup/base/system/bootok/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/booto… ============================================================================== --- branches/cmake-bringup/base/system/bootok/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/system/bootok/CMakeLists.txt [iso-8859-1] Fri Nov 5 09:38:42 2010 @@ -1,3 +1,4 @@ +add_definitions(-D_DLL -D__USE_CRTIMP) set_unicode() Modified: branches/cmake-bringup/base/system/expand/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/expan… ============================================================================== --- branches/cmake-bringup/base/system/expand/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/system/expand/CMakeLists.txt [iso-8859-1] Fri Nov 5 09:38:42 2010 @@ -1,3 +1,4 @@ +add_definitions(-D_DLL -D__USE_CRTIMP) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) Modified: branches/cmake-bringup/base/system/format/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/forma… ============================================================================== --- branches/cmake-bringup/base/system/format/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/system/format/CMakeLists.txt [iso-8859-1] Fri Nov 5 09:38:42 2010 @@ -1,3 +1,4 @@ +add_definitions(-D_DLL -D__USE_CRTIMP) include_directories(.) set_rc_compiler() Modified: branches/cmake-bringup/base/system/msiexec/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/msiex… ============================================================================== --- branches/cmake-bringup/base/system/msiexec/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/system/msiexec/CMakeLists.txt [iso-8859-1] Fri Nov 5 09:38:42 2010 @@ -1,3 +1,4 @@ +add_definitions(-D_DLL -D__USE_CRTIMP) include_directories(${REACTOS_SOURCE_DIR}/include/wine) add_definitions(-D__WINESRC__) Modified: branches/cmake-bringup/base/system/regsvr32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/regsv… ============================================================================== --- branches/cmake-bringup/base/system/regsvr32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/system/regsvr32/CMakeLists.txt [iso-8859-1] Fri Nov 5 09:38:42 2010 @@ -1,3 +1,4 @@ +add_definitions(-D_DLL -D__USE_CRTIMP) set_unicode() include_directories(.) Modified: branches/cmake-bringup/dll/3rdparty/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/3rdparty/CMak… ============================================================================== --- branches/cmake-bringup/dll/3rdparty/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/3rdparty/CMakeLists.txt [iso-8859-1] Fri Nov 5 09:38:42 2010 @@ -4,6 +4,6 @@ endif() add_subdirectory(libjpeg) add_subdirectory(libpng) -add_subdirectory(libtiff) +#add_subdirectory(libtiff)#FIXME : unresolved symbol _pei386_runtime_relocator add_subdirectory(libxslt) add_subdirectory(mesa32) Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=494… ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Fri Nov 5 09:38:42 2010 @@ -11,7 +11,7 @@ link_directories("${REACTOS_SOURCE_DIR}/importlibs" ${REACTOS_BINARY_DIR}/lib/3rdparty/mingw) set(CMAKE_C_LINK_EXECUTABLE "<CMAKE_C_COMPILER> <FLAGS> <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>") set(CMAKE_CXX_LINK_EXECUTABLE "<CMAKE_CXX_COMPILER> <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>") -set(CMAKE_EXE_LINKER_FLAGS "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--kill-at -Wl,--enable-auto-import") +set(CMAKE_EXE_LINKER_FLAGS "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--kill-at") # -Wl,-T,${REACTOS_SOURCE_DIR}/global.lds # Compiler Core Modified: branches/cmake-bringup/lib/smlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/smlib/CMakeLi… ============================================================================== --- branches/cmake-bringup/lib/smlib/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/smlib/CMakeLists.txt [iso-8859-1] Fri Nov 5 09:38:42 2010 @@ -1,3 +1,4 @@ +add_definitions(-D_DLL -D__USE_CRTIMP) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys) 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] Fri Nov 5 09:38:42 2010 @@ -1,3 +1,4 @@ +add_definitions(-D_DLL -D__USE_CRTIMP) include_directories( BEFORE . Modified: branches/cmake-bringup/toolchain-mingw32.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/toolchain-mingw32… ============================================================================== --- branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] Fri Nov 5 09:38:42 2010 @@ -38,10 +38,10 @@ set(CMAKE_CXX_STANDARD_LIBRARIES "" CACHE STRING "Standard C++ Libraries") if(ARCH MATCHES i386) -set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--enable-stdcall-fixup -Wl,--kill-at -Wl,--enable-auto-import") +set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--enable-stdcall-fixup -Wl,--kill-at") #-Wl,-T,${REACTOS_SOURCE_DIR}/global.lds elseif(ARCH MATCHES amd64) -set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--enable-stdcall-fixup -Wl,--kill-at -Wl,--enable-auto-import") +set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--enable-stdcall-fixup -Wl,--kill-at") endif(ARCH MATCHES i386) # adjust the default behaviour of the FIND_XXX() commands:

13 years, 11 months

[jimtabor] 49475: [Win32k] - Turn off debug prints.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Fri Nov 5 00:37:30 2010 New Revision: 49475 URL: http://svn.reactos.org/svn/reactos?rev=49475&view=rev Log: [Win32k] - Turn off debug prints. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callback.c trunk/reactos/subsystems/win32/win32k/ntuser/hook.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] Fri Nov 5 00:37:30 2010 @@ -361,7 +361,7 @@ DPRINT1("WH_CBT HCBT_CREATEWND wParam bad hWnd!\n"); goto Fault_Exit; } - DPRINT1("HCBT_CREATEWND AnsiCreator %s, AnsiHook %s\n", pWnd->state & WNDS_ANSICREATOR ? "True" : "False", Ansi ? "True" : "False"); + DPRINT("HCBT_CREATEWND AnsiCreator %s, AnsiHook %s\n", pWnd->state & WNDS_ANSICREATOR ? "True" : "False", Ansi ? "True" : "False"); // Due to KsStudio.exe, just pass the callers original pointers // except class which point to kernel space if not an atom. // Found by, Olaf Siejka Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] Fri Nov 5 00:37:30 2010 @@ -1406,7 +1406,7 @@ Hook->Proc = HookProc; Hook->Ansi = Ansi; - DPRINT1("Set Hook Desk 0x%x DeskInfo 0x%x Handle Desk 0x%x\n",pti->rpdesk, pti->pDeskInfo,Hook->head.rpdesk); + DPRINT("Set Hook Desk 0x%x DeskInfo 0x%x Handle Desk 0x%x\n",pti->rpdesk, pti->pDeskInfo,Hook->head.rpdesk); if (ThreadId) /* thread-local hook */ {

13 years, 11 months

[tkreuzer] 49474: [CMAKE] Create importlib for advapi32 Link advapi32 to msvcrt, needed for SEH

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Nov 5 00:12:47 2010 New Revision: 49474 URL: http://svn.reactos.org/svn/reactos?rev=49474&view=rev Log: [CMAKE] Create importlib for advapi32 Link advapi32 to msvcrt, needed for SEH Modified: branches/cmake-bringup/dll/win32/advapi32/CMakeLists.txt 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] Fri Nov 5 00:12:47 2010 @@ -1,5 +1,7 @@ set_unicode() + +spec2def(advapi32.dll advapi32.spec) add_definitions(-D_ADVAPI32_) @@ -60,7 +62,9 @@ wine ${PSEH_LIB}) -add_importlibs(advapi32 rpcrt4 kernel32 ntdll) +add_importlibs(advapi32 rpcrt4 kernel32 ntdll msvcrt) add_pch(advapi32 ${CMAKE_CURRENT_SOURCE_DIR}/advapi32.h ${SOURCE}) add_cab_target(advapi32 1) +add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/advapi32.def) +

13 years, 11 months

[tkreuzer] 49473: [CMAKE] Add /SAFESEH:NO to MSVC linker command line to fix unresolved symbol issue.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Nov 5 00:08:12 2010 New Revision: 49473 URL: http://svn.reactos.org/svn/reactos?rev=49473&view=rev Log: [CMAKE] Add /SAFESEH:NO to MSVC linker command line to fix unresolved symbol issue. Modified: branches/cmake-bringup/msc.cmake Modified: branches/cmake-bringup/msc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/msc.cmake?rev=494… ============================================================================== --- branches/cmake-bringup/msc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/msc.cmake [iso-8859-1] Fri Nov 5 00:08:12 2010 @@ -12,6 +12,12 @@ add_definitions(/GS- /Zl /Zi) add_definitions(-Dinline=__inline -D__STDC__=1) + +IF(${_MACHINE_ARCH_FLAG} MATCHES X86) + SET (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH:NO") + SET (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SAFESEH:NO") + SET (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /SAFESEH:NO") +ENDIF() link_directories("${REACTOS_BINARY_DIR}/importlibs" ${REACTOS_BINARY_DIR}/lib/3rdparty/mingw)

13 years, 11 months

[jimtabor] 49472: [Win32k|User32] - This hook commit fixes the ros regression testing startup, but consider this a hax fix until more research in Global hooks has completed. More pointed Global hoo...

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Nov 4 23:45:34 2010 New Revision: 49472 URL: http://svn.reactos.org/svn/reactos?rev=49472&view=rev Log: [Win32k|User32] - This hook commit fixes the ros regression testing startup, but consider this a hax fix until more research in Global hooks has completed. More pointed Global hook tests are needed. Misc changes, removed unused storage pointers and reordering. For DosBOX, the mouse low level is now working and the keyboard low level should not be so intermittent as before, now sending messages from system desktop not from thread desktop, see bug 5670 for more details. Modified: trunk/reactos/dll/win32/user32/windows/hook.c trunk/reactos/include/reactos/win32k/callback.h trunk/reactos/subsystems/win32/win32k/main/dllmain.c trunk/reactos/subsystems/win32/win32k/ntuser/callback.c trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/hook.c trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/dll/win32/user32/windows/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/h… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/hook.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/hook.c [iso-8859-1] Thu Nov 4 23:45:34 2010 @@ -154,49 +154,18 @@ LPMSG lpMsg, int nCode) { - BOOL ret = FALSE; - - if (nCode != HCBT_CREATEWND) ret = NtUserCallMsgFilter((LPMSG) lpMsg, nCode); - else + MSG Msg; + if (NtCurrentTeb()->Win32ThreadInfo && IsThreadHooked(GetWin32ClientInfo())) + { + if ( lpMsg->message & ~WM_MAXIMUM ) { - UNICODE_STRING usBuffer; - CBT_CREATEWNDA *cbtcwA = (CBT_CREATEWNDA *)lpMsg->lParam; - CBT_CREATEWNDW cbtcwW; - CREATESTRUCTW csW; - MSG Msg; - - Msg.hwnd = lpMsg->hwnd; - Msg.message = lpMsg->message; - Msg.time = lpMsg->time; - Msg.pt = lpMsg->pt; - Msg.wParam = lpMsg->wParam; - - cbtcwW.lpcs = &csW; - cbtcwW.hwndInsertAfter = cbtcwA->hwndInsertAfter; - csW = *(CREATESTRUCTW *)cbtcwA->lpcs; - - if (HIWORD(cbtcwA->lpcs->lpszName)) - { - RtlCreateUnicodeStringFromAsciiz(&usBuffer,cbtcwA->lpcs->lpszName); - csW.lpszName = usBuffer.Buffer; - } - if (HIWORD(cbtcwA->lpcs->lpszClass)) - { - RtlCreateUnicodeStringFromAsciiz(&usBuffer,cbtcwA->lpcs->lpszClass); - csW.lpszClass = usBuffer.Buffer; - } - Msg.lParam =(LPARAM) &cbtcwW; - - ret = NtUserCallMsgFilter((LPMSG)&Msg, nCode); - - lpMsg->time = Msg.time; - lpMsg->pt = Msg.pt; - - cbtcwA->hwndInsertAfter = cbtcwW.hwndInsertAfter; - if (HIWORD(csW.lpszName)) HeapFree( GetProcessHeap(), 0, (LPWSTR)csW.lpszName ); - if (HIWORD(csW.lpszClass)) HeapFree( GetProcessHeap(), 0, (LPWSTR)csW.lpszClass ); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; } - return ret; + RtlCopyMemory(&Msg, lpMsg, sizeof(MSG)); + return NtUserCallMsgFilter( &Msg, nCode); + } + return FALSE; } @@ -209,7 +178,18 @@ LPMSG lpMsg, int nCode) { - return NtUserCallMsgFilter((LPMSG) lpMsg, nCode); + MSG Msg; + if (NtCurrentTeb()->Win32ThreadInfo && IsThreadHooked(GetWin32ClientInfo())) + { + if ( lpMsg->message & ~WM_MAXIMUM ) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + RtlCopyMemory(&Msg, lpMsg, sizeof(MSG)); + return NtUserCallMsgFilter( &Msg, nCode); + } + return FALSE; } @@ -454,7 +434,7 @@ PHOOKPROC_CBT_CREATEWND_EXTRA_ARGUMENTS CbtCreatewndExtra = NULL; KBDLLHOOKSTRUCT KeyboardLlData, *pKeyboardLlData; MSLLHOOKSTRUCT MouseLlData, *pMouseLlData; - MSG Msg, *pMsg; + MSG *pcMsg, *pMsg; PMOUSEHOOKSTRUCT pMHook; CWPSTRUCT CWP, *pCWP; CWPRETSTRUCT CWPR, *pCWPR; @@ -476,13 +456,12 @@ case HCBT_CREATEWND: CbtCreatewndExtra = (PHOOKPROC_CBT_CREATEWND_EXTRA_ARGUMENTS) ((PCHAR) Common + Common->lParam); - Csw = CbtCreatewndExtra->Cs; - Csw.lpszName = CbtCreatewndExtra->Cs.lpszName; - Csw.lpszClass = CbtCreatewndExtra->Cs.lpszClass; - wParam = Common->wParam; + RtlCopyMemory(&Csw, &CbtCreatewndExtra->Cs, sizeof(CREATESTRUCTW)); CbtCreatewndw.lpcs = &Csw; CbtCreatewndw.hwndInsertAfter = CbtCreatewndExtra->WndInsertAfter; + wParam = Common->wParam; lParam = (LPARAM) &CbtCreatewndw; + ERR("HCBT_CREATEWND: hWnd 0x%x Name 0x%x Class 0x%x\n", Common->wParam, Csw.lpszName, Csw.lpszClass); break; case HCBT_CLICKSKIPPED: pMHook = (PMOUSEHOOKSTRUCT)((PCHAR) Common + Common->lParam); @@ -524,7 +503,7 @@ } else { - ERR("Common = 0x%x, Proc = 0x%x\n",Common,Common->Proc); + ERR("Null Proc! Common = 0x%x, Proc = 0x%x\n",Common,Common->Proc); } switch(Common->Code) { @@ -545,6 +524,7 @@ Result = Common->Proc(Common->Code, Common->wParam, (LPARAM) &KeyboardLlData); break; case WH_MOUSE_LL: + ERR("WH_MOUSE_LL: Code %d, wParam %d\n",Common->Code,Common->wParam); pMouseLlData = (PMSLLHOOKSTRUCT)((PCHAR) Common + Common->lParam); RtlCopyMemory(&MouseLlData, pMouseLlData, sizeof(MSLLHOOKSTRUCT)); Result = Common->Proc(Common->Code, Common->wParam, (LPARAM) &MouseLlData); @@ -562,7 +542,7 @@ _SEH2_END; break; case WH_CALLWNDPROC: - ERR("WH_CALLWNDPROC: Code %d, wParam %d\n",Common->Code,Common->wParam); +// ERR("WH_CALLWNDPROC: Code %d, wParam %d\n",Common->Code,Common->wParam); pCWP = (PCWPSTRUCT)((PCHAR) Common + Common->lParam); RtlCopyMemory(&CWP, pCWP, sizeof(CWPSTRUCT)); Result = Common->Proc(Common->Code, Common->wParam, (LPARAM) &CWP); @@ -573,14 +553,15 @@ Result = Common->Proc(Common->Code, Common->wParam, (LPARAM) &CWPR); break; case WH_MSGFILTER: /* All SEH support */ - ERR("WH_MSGFILTER: Code %d, wParam %d\n",Common->Code,Common->wParam); case WH_SYSMSGFILTER: case WH_GETMESSAGE: pMsg = (PMSG)((PCHAR) Common + Common->lParam); - RtlCopyMemory(&Msg, pMsg, sizeof(MSG)); + pcMsg = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(MSG)); + RtlCopyMemory(pcMsg, pMsg, sizeof(MSG)); +// ERR("pMsg %d pcMsg %d\n",pMsg->message, pcMsg->message); _SEH2_TRY { - Result = Common->Proc(Common->Code, Common->wParam, (LPARAM) &Msg); + Result = Common->Proc(Common->Code, Common->wParam, (LPARAM) pcMsg); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -588,11 +569,14 @@ } _SEH2_END; if (!Hit && Common->HookId == WH_GETMESSAGE) - RtlCopyMemory(pMsg, &Msg, sizeof(MSG)); - break; - case WH_FOREGROUNDIDLE: /* <-- SEH support */ + RtlCopyMemory(pMsg, pcMsg, sizeof(MSG)); + HeapFree( GetProcessHeap(), 0, pcMsg ); + break; case WH_KEYBOARD: case WH_SHELL: + Result = Common->Proc(Common->Code, Common->wParam, Common->lParam); + break; + case WH_FOREGROUNDIDLE: /* <-- SEH support */ _SEH2_TRY { Result = Common->Proc(Common->Code, Common->wParam, Common->lParam); Modified: trunk/reactos/include/reactos/win32k/callback.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/cal… ============================================================================== --- trunk/reactos/include/reactos/win32k/callback.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/callback.h [iso-8859-1] Thu Nov 4 23:45:34 2010 @@ -48,8 +48,6 @@ LPARAM lParam; HOOKPROC Proc; BOOLEAN Ansi; - UINT ModuleNameLength; - WCHAR ModuleName[1]; } HOOKPROC_CALLBACK_ARGUMENTS, *PHOOKPROC_CALLBACK_ARGUMENTS; typedef struct _HOOKPROC_CBT_CREATEWND_EXTRA_ARGUMENTS Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ma… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] Thu Nov 4 23:45:34 2010 @@ -252,17 +252,41 @@ } } } + else + { + DPRINT1("No Desktop handle for this Thread!\n"); + } Win32Thread->TIF_flags &= ~TIF_INCLEANUP; co_IntDestroyCaret(Win32Thread); Win32Thread->ppi = PsGetCurrentProcessWin32Process(); + if (Win32Thread->rpdesk && !Win32Thread->pDeskInfo) + { + Win32Thread->pDeskInfo = Win32Thread->rpdesk->pDeskInfo; + } + Win32Thread->MessageQueue = MsqCreateMessageQueue(Thread); + Win32Thread->KeyboardLayout = W32kGetDefaultKeyLayout(); pTeb = NtCurrentTeb(); if (pTeb) - { - Win32Thread->pClientInfo = (PCLIENTINFO)pTeb->Win32ClientInfo; - Win32Thread->pClientInfo->pClientThreadInfo = NULL; - } - Win32Thread->MessageQueue = MsqCreateMessageQueue(Thread); - Win32Thread->KeyboardLayout = W32kGetDefaultKeyLayout(); + { /* Attempt to startup client support which should have been initialized in IntSetThreadDesktop. */ + PCLIENTINFO pci = (PCLIENTINFO)pTeb->Win32ClientInfo; + Win32Thread->pClientInfo = pci; + pci->pClientThreadInfo = NULL; + pci->ppi = Win32Thread->ppi; + pci->fsHooks = Win32Thread->fsHooks; + if (Win32Thread->KeyboardLayout) pci->hKL = Win32Thread->KeyboardLayout->hkl; + pci->dwTIFlags = Win32Thread->TIF_flags; + /* CI may not have been initialized. */ + if (!pci->pDeskInfo && Win32Thread->pDeskInfo) + { + if (!pci->ulClientDelta) pci->ulClientDelta = DesktopHeapGetUserDelta(); + + pci->pDeskInfo = (PVOID)((ULONG_PTR)Win32Thread->pDeskInfo - pci->ulClientDelta); + } + } + else + { + DPRINT1("No TEB for this Thread!\n"); + } Win32Thread->pEThread = Thread; } else Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] Thu Nov 4 23:45:34 2010 @@ -335,6 +335,7 @@ PHOOKPROC_CBT_CREATEWND_EXTRA_ARGUMENTS CbtCreatewndExtra = NULL; PTHREADINFO pti; PWND pWnd; + PMSG pMsg = NULL; BOOL Hit = FALSE; ASSERT(Proc); @@ -346,8 +347,8 @@ return 0; } - ArgumentLength = sizeof(HOOKPROC_CALLBACK_ARGUMENTS) - sizeof(WCHAR) - + ModuleName->Length; + ArgumentLength = sizeof(HOOKPROC_CALLBACK_ARGUMENTS); + switch(HookId) { case WH_CBT: @@ -360,6 +361,7 @@ DPRINT1("WH_CBT HCBT_CREATEWND wParam bad hWnd!\n"); goto Fault_Exit; } + DPRINT1("HCBT_CREATEWND AnsiCreator %s, AnsiHook %s\n", pWnd->state & WNDS_ANSICREATOR ? "True" : "False", Ansi ? "True" : "False"); // Due to KsStudio.exe, just pass the callers original pointers // except class which point to kernel space if not an atom. // Found by, Olaf Siejka @@ -432,24 +434,20 @@ Common->lParam = lParam; Common->Proc = Proc; Common->Ansi = Ansi; - Common->ModuleNameLength = ModuleName->Length; - if (ModuleName->Buffer) - RtlCopyMemory(Common->ModuleName, ModuleName->Buffer, ModuleName->Length); - Extra = (PCHAR) Common->ModuleName + Common->ModuleNameLength; + Extra = (PCHAR) Common + sizeof(HOOKPROC_CALLBACK_ARGUMENTS); switch(HookId) { case WH_CBT: switch(Code) - { + { // Need to remember this is not the first time through! Call Next Hook? case HCBT_CREATEWND: - Common->lParam = (LPARAM) (Extra - (PCHAR) Common); CbtCreatewndExtra = (PHOOKPROC_CBT_CREATEWND_EXTRA_ARGUMENTS) Extra; RtlCopyMemory( &CbtCreatewndExtra->Cs, CbtCreateWnd->lpcs, sizeof(CREATESTRUCTW) ); CbtCreatewndExtra->WndInsertAfter = CbtCreateWnd->hwndInsertAfter; - CbtCreatewndExtra->Cs.lpszClass = CbtCreateWnd->lpcs->lpszClass; // if Atom + CbtCreatewndExtra->Cs.lpszClass = CbtCreateWnd->lpcs->lpszClass; CbtCreatewndExtra->Cs.lpszName = CbtCreateWnd->lpcs->lpszName; - Extra = (PCHAR) (CbtCreatewndExtra + 1); + Common->lParam = (LPARAM) (Extra - (PCHAR) Common); break; case HCBT_CLICKSKIPPED: RtlCopyMemory(Extra, (PVOID) lParam, sizeof(MOUSEHOOKSTRUCT)); @@ -488,7 +486,8 @@ case WH_MSGFILTER: case WH_SYSMSGFILTER: case WH_GETMESSAGE: - RtlCopyMemory(Extra, (PVOID) lParam, sizeof(MSG)); + pMsg = (PMSG)lParam; + RtlCopyMemory(Extra, (PVOID) pMsg, sizeof(MSG)); Common->lParam = (LPARAM) (Extra - (PCHAR) Common); break; case WH_FOREGROUNDIDLE: @@ -548,9 +547,9 @@ break; // "The GetMsgProc hook procedure can examine or modify the message." case WH_GETMESSAGE: - if (lParam) + if (pMsg) { - RtlCopyMemory((PVOID) lParam, Extra, sizeof(MSG)); + RtlCopyMemory((PVOID) pMsg, Extra, sizeof(MSG)); } break; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] Thu Nov 4 23:45:34 2010 @@ -880,13 +880,23 @@ PUNICODE_STRING lpszDesktopName = NULL; UNICODE_STRING ClassName, MenuName; LARGE_STRING WindowName; + BOOL NoHooks = FALSE; PWND pWnd = NULL; CREATESTRUCTW Cs; INT i; + PTHREADINFO ptiCurrent; DECLARE_RETURN(HDESK); DPRINT("Enter NtUserCreateDesktop: %wZ\n", lpszDesktopName); UserEnterExclusive(); + + ptiCurrent = PsGetCurrentThreadWin32Thread(); + if (ptiCurrent) + { + /* Turn off hooks when calling any CreateWindowEx from inside win32k. */ + NoHooks = (ptiCurrent->TIF_flags & TIF_DISABLEHOOKS); + ptiCurrent->TIF_flags |= TIF_DISABLEHOOKS; + } _SEH2_TRY { @@ -1102,6 +1112,7 @@ RETURN( Desktop); CLEANUP: + if (!NoHooks && ptiCurrent) ptiCurrent->TIF_flags &= ~TIF_DISABLEHOOKS; DPRINT("Leave NtUserCreateDesktop, ret=%i\n",_ret_); UserLeave(); END_CLEANUP; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] Thu Nov 4 23:45:34 2010 @@ -21,6 +21,7 @@ { PHOOK pHk; LPARAM lParam; + PVOID pHookStructs; } HOOKPACK, *PHOOKPACK; /* PRIVATE FUNCTIONS *********************************************************/ @@ -36,6 +37,7 @@ NTSTATUS Status; PTHREADINFO pti; PHOOKPACK pHP; + INT Size; ULONG_PTR uResult = 0; if (Hook->Thread) @@ -48,6 +50,56 @@ pHP->pHk = Hook; pHP->lParam = lParam; + pHP->pHookStructs = NULL; + Size = 0; + +// Once the rest is enabled again, This prevents stack corruption from the caller. + switch(Hook->HookId) + { + case WH_CBT: + switch(Code) + { + case HCBT_CREATEWND: + Size = sizeof(CBT_CREATEWNDW); + break; + case HCBT_MOVESIZE: + Size = sizeof(RECTL); + break; + case HCBT_ACTIVATE: + Size = sizeof(CBTACTIVATESTRUCT); + break; + case HCBT_CLICKSKIPPED: + Size = sizeof(MOUSEHOOKSTRUCT); + break; + } + break; + case WH_KEYBOARD_LL: + Size = sizeof(KBDLLHOOKSTRUCT); + break; + case WH_MOUSE_LL: + Size = sizeof(MSLLHOOKSTRUCT); + break; + case WH_MOUSE: + Size = sizeof(MOUSEHOOKSTRUCT); + break; + case WH_CALLWNDPROC: + Size = sizeof(CWPSTRUCT); + break; + case WH_CALLWNDPROCRET: + Size = sizeof(CWPRETSTRUCT); + break; + case WH_MSGFILTER: + case WH_SYSMSGFILTER: + case WH_GETMESSAGE: + Size = sizeof(MSG); + break; + } + + if (Size) + { + pHP->pHookStructs = ExAllocatePoolWithTag(NonPagedPool, Size, TAG_HOOK); + if (pHP->pHookStructs) RtlCopyMemory(pHP->pHookStructs, (PVOID)lParam, Size); + } /* FIXME should get timeout from * HKEY_CURRENT_USER\Control Panel\Desktop\LowLevelHooksTimeout */ @@ -63,35 +115,12 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Error Hook Call SendMsg. %d Status: 0x%x\n", Hook->HookId, Status); + if (pHP->pHookStructs) ExFreePoolWithTag(pHP->pHookStructs, TAG_HOOK); ExFreePoolWithTag(pHP, TAG_HOOK); } return NT_SUCCESS(Status) ? uResult : 0; } -static -LRESULT -FASTCALL -co_HOOK_CallHookNext( PHOOK Hook, - INT Code, - WPARAM wParam, - LPARAM lParam) -{ - if ( (Hook->Thread != PsGetCurrentThread()) && (Hook->Thread != NULL) ) - { - DPRINT1("Calling Next HOOK from another Thread. %d\n", Hook->HookId); - return IntCallLowLevelHook(Hook, Code, wParam, lParam); - } - - DPRINT("Calling Next HOOK %d\n", Hook->HookId); - - return co_IntCallHookProc( Hook->HookId, - Code, - wParam, - lParam, - Hook->Proc, - Hook->Ansi, - &Hook->ModuleName); -} // // Dispatch MsgQueue Hook Call processor! @@ -108,17 +137,71 @@ PHOOKPACK pHP = (PHOOKPACK)lParam; phk = pHP->pHk; + lParam = pHP->lParam; + + switch(HookId) + { + case WH_CBT: + switch(Code) + { + case HCBT_CREATEWND: + case HCBT_MOVESIZE: + case HCBT_ACTIVATE: + case HCBT_CLICKSKIPPED: + lParam = (LPARAM)pHP->pHookStructs; + break; + } + break; + case WH_KEYBOARD_LL: + case WH_MOUSE_LL: + case WH_MOUSE: + case WH_CALLWNDPROC: + case WH_CALLWNDPROCRET: + case WH_MSGFILTER: + case WH_SYSMSGFILTER: + case WH_GETMESSAGE: + lParam = (LPARAM)pHP->pHookStructs; + break; + } + /* The odds are high for this to be a Global call. */ Result = co_IntCallHookProc( HookId, Code, wParam, - pHP->lParam, + lParam, phk->Proc, phk->Ansi, &phk->ModuleName); + /* The odds so high, no one is waiting for the results. */ + if (pHP->pHookStructs) ExFreePoolWithTag(pHP->pHookStructs, TAG_HOOK); ExFreePoolWithTag(pHP, TAG_HOOK); return Result; +} + +static +LRESULT +FASTCALL +co_HOOK_CallHookNext( PHOOK Hook, + INT Code, + WPARAM wParam, + LPARAM lParam) +{ + if ( (Hook->Thread != PsGetCurrentThread()) && (Hook->Thread != NULL) ) + { + DPRINT1("Calling Next HOOK from another Thread. %d\n", Hook->HookId); + return IntCallLowLevelHook(Hook, Code, wParam, lParam); + } + + DPRINT("Calling Next HOOK %d\n", Hook->HookId); + + return co_IntCallHookProc( Hook->HookId, + Code, + wParam, + lParam, + Hook->Proc, + Hook->Ansi, + &Hook->ModuleName); } LRESULT @@ -704,6 +787,20 @@ return Elem == Table ? NULL : CONTAINING_RECORD(Elem, HOOK, Chain); } +static +PHOOK +FASTCALL +IntGetNextGlobalHook(PHOOK Hook, PDESKTOP pdo) +{ + int HookId = Hook->HookId; + PLIST_ENTRY Elem; + + Elem = Hook->Chain.Flink; + if (Elem != &pdo->pDeskInfo->aphkStart[HOOKID_TO_INDEX(HookId)]) + return CONTAINING_RECORD(Elem, HOOK, Chain); + return NULL; +} + /* find the next hook in the chain */ PHOOK FASTCALL @@ -724,10 +821,7 @@ else { pti = PsGetCurrentThreadWin32Thread(); - - Elem = Hook->Chain.Flink; - if (Elem != &pti->rpdesk->pDeskInfo->aphkStart[HOOKID_TO_INDEX(HookId)]) - return CONTAINING_RECORD(Elem, HOOK, Chain); + return IntGetNextGlobalHook(Hook, pti->rpdesk); } return NULL; } @@ -756,6 +850,7 @@ { INT HookId; PTHREADINFO pti; + PDESKTOP pdo; HookId = Hook->HookId; @@ -783,13 +878,13 @@ { IntFreeHook( Hook); - pti = PsGetCurrentThreadWin32Thread(); - - if ( pti->rpdesk && - pti->rpdesk->pDeskInfo && - IsListEmpty(&pti->rpdesk->pDeskInfo->aphkStart[HOOKID_TO_INDEX(HookId)]) ) - { - pti->rpdesk->pDeskInfo->fsHooks &= ~HOOKID_TO_FLAG(HookId); + pdo = IntGetActiveDesktop(); + + if ( pdo && + pdo->pDeskInfo && + IsListEmpty(&pdo->pDeskInfo->aphkStart[HOOKID_TO_INDEX(HookId)]) ) + { + pdo->pDeskInfo->fsHooks &= ~HOOKID_TO_FLAG(HookId); return TRUE; } } @@ -808,13 +903,13 @@ pti = Thread->Tcb.Win32Thread; pdo = IntGetActiveDesktop(); -DPRINT1("DestroyThreadHooks 1\n"); + if (!pti || !pdo) { DPRINT1("Kill Thread Hooks pti 0x%x pdo 0x%x\n",pti,pdo); return; } - ObReferenceObject(pti->pEThread); + ObReferenceObject(Thread); // Local Thread cleanup. if (pti->fsHooks) @@ -838,7 +933,6 @@ } pti->fsHooks = 0; } -DPRINT1("DestroyThreadHooks 2\n"); // Global search based on Thread and cleanup. if (pdo->pDeskInfo->fsHooks) { @@ -854,7 +948,7 @@ { if (!HookObj) break; if (HookObj->head.pti == pti) - { DPRINT1("Global Hook Removed\n"); + { if (IntRemoveHook(HookObj)) break; } pElem = HookObj->Chain.Flink; @@ -863,8 +957,7 @@ while (pElem != pGLE); } } - ObDereferenceObject(pti->pEThread); -DPRINT1("DestroyThreadHooks 3\n"); + ObDereferenceObject(Thread); return; } @@ -882,6 +975,7 @@ PTHREADINFO pti; PCLIENTINFO ClientInfo; PLIST_ENTRY pLLE, pGLE; + PDESKTOP pdo; BOOL Local = FALSE, Global = FALSE; LRESULT Result = 0; @@ -889,9 +983,20 @@ pti = PsGetCurrentThreadWin32Thread(); if (!pti || !pti->rpdesk || !pti->rpdesk->pDeskInfo) - goto Exit; // Must have a desktop running for hooks. - - if ( pti->TIF_flags & TIF_INCLEANUP) + { + pdo = IntGetActiveDesktop(); + /* If KeyboardThread|MouseThread|(RawInputThread or RIT) aka system threads, + pti->fsHooks most likely, is zero. So process KbT & MsT to "send" the message. + */ + if ( !pti || !pdo || (!(HookId == WH_KEYBOARD_LL) && !(HookId == WH_MOUSE_LL)) ) + goto Exit; + } + else + { + pdo = pti->rpdesk; + } + + if ( pti->TIF_flags & (TIF_INCLEANUP|TIF_DISABLEHOOKS)) goto Exit; if ( ISITHOOKED(HookId) ) @@ -900,7 +1005,7 @@ Local = TRUE; } - if ( pti->rpdesk->pDeskInfo->fsHooks & HOOKID_TO_FLAG(HookId) ) + if ( pdo->pDeskInfo->fsHooks & HOOKID_TO_FLAG(HookId) ) { DPRINT("Global Hooker %d\n", HookId); Global = TRUE; @@ -908,8 +1013,6 @@ if ( !Local && !Global ) goto Exit; // No work! - pLLE = &pti->aphkStart[HOOKID_TO_INDEX(HookId)]; - pGLE = &pti->rpdesk->pDeskInfo->aphkStart[HOOKID_TO_INDEX(HookId)]; Hook = NULL; /* SetWindowHookEx sorts out the Thread issue by placing the Hook to @@ -917,6 +1020,7 @@ */ if ( Local ) { + pLLE = &pti->aphkStart[HOOKID_TO_INDEX(HookId)]; Hook = IntGetFirstHook(pLLE); if (!Hook) { @@ -970,6 +1074,7 @@ { PTHREADINFO ptiHook; + pGLE = &pdo->pDeskInfo->aphkStart[HOOKID_TO_INDEX(HookId)]; Hook = IntGetFirstHook(pGLE); if (!Hook) { @@ -988,10 +1093,11 @@ /* "Global hook monitors messages for all threads in the same desktop * as the calling thread." */ - if ( ptiHook->TIF_flags & TIF_INCLEANUP || - ptiHook->rpdesk != pti->rpdesk) + if ( ptiHook->TIF_flags & (TIF_INCLEANUP|TIF_DISABLEHOOKS) || + ptiHook->rpdesk != pdo) { - Hook = IntGetNextHook(Hook); + DPRINT("Next Hook 0x%x, 0x%x\n",ptiHook->rpdesk,pdo); + Hook = IntGetNextGlobalHook(Hook, pdo); if (!Hook) break; continue; } @@ -999,8 +1105,14 @@ ObReferenceObject(ptiHook->pEThread); if (ptiHook != pti ) { - DPRINT("\nGlobal Hook posting to another Thread! %d\n",HookId ); - Result = IntCallLowLevelHook(Hook, Code, wParam, lParam); + /* This fixed the ros regtest. Wine does this too. Need more time + to investigate this. MSDN "Hooks Overview" can't be wrong? + */ + if (HookId == WH_KEYBOARD_LL || HookId == WH_MOUSE_LL) + { + DPRINT("\nGlobal Hook posting to another Thread! %d\n",HookId ); + Result = IntCallLowLevelHook(Hook, Code, wParam, lParam); + } } else { /* Make the direct call. */ @@ -1014,7 +1126,7 @@ &Hook->ModuleName); } ObDereferenceObject(ptiHook->pEThread); - Hook = IntGetNextHook(Hook); + Hook = IntGetNextGlobalHook(Hook, pdo); } while ( Hook ); DPRINT("Ret: Global HookId %d Result 0x%x\n", HookId,Result); @@ -1248,7 +1360,7 @@ } } else /* system-global hook */ - { + { pti = ptiCurrent; // gptiCurrent; if ( !Mod && (HookId == WH_GETMESSAGE || @@ -1293,6 +1405,8 @@ Hook->phkNext = NULL; /* Dont use as a chain! Use link lists for chaining. */ Hook->Proc = HookProc; Hook->Ansi = Ansi; + + DPRINT1("Set Hook Desk 0x%x DeskInfo 0x%x Handle Desk 0x%x\n",pti->rpdesk, pti->pDeskInfo,Hook->head.rpdesk); if (ThreadId) /* thread-local hook */ { @@ -1343,10 +1457,10 @@ } else { - InsertHeadList(&pti->pDeskInfo->aphkStart[HOOKID_TO_INDEX(HookId)], &Hook->Chain); + InsertHeadList(&pti->rpdesk->pDeskInfo->aphkStart[HOOKID_TO_INDEX(HookId)], &Hook->Chain); Hook->ptiHooked = NULL; //gptiCurrent->pDeskInfo->fsHooks |= HOOKID_TO_FLAG(HookId); - pti->pDeskInfo->fsHooks |= HOOKID_TO_FLAG(HookId); + pti->rpdesk->pDeskInfo->fsHooks |= HOOKID_TO_FLAG(HookId); } RtlInitUnicodeString(&Hook->ModuleName, NULL); @@ -1393,7 +1507,7 @@ else Hook->offPfn = 0; - DPRINT1("Installing: HookId %d Global %s\n", HookId, !ThreadId ? "TRUE" : "FALSE"); + DPRINT("Installing: HookId %d Global %s\n", HookId, !ThreadId ? "TRUE" : "FALSE"); RETURN( Handle); CLEANUP: Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Thu Nov 4 23:45:34 2010 @@ -22,6 +22,8 @@ /* GLOBALS *******************************************************************/ PTHREADINFO ptiRawInput; +PTHREADINFO ptiKeyboard; +PTHREADINFO ptiMouse; PKTIMER MasterTimer = NULL; PATTACHINFO gpai = NULL; @@ -234,6 +236,18 @@ FILE_SYNCHRONOUS_IO_ALERT); } while (!NT_SUCCESS(Status)); + /* Need to setup basic win32k for this thread to process WH_MOUSE_LL messages. */ + Status = Win32kInitWin32Thread(PsGetCurrentThread()); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Win32K: Failed making mouse thread a win32 thread.\n"); + return; //(Status); + } + + ptiMouse = PsGetCurrentThreadWin32Thread(); + ptiMouse->TIF_flags |= TIF_SYSTEMTHREAD; + DPRINT1("\nMouse Thread 0x%x \n", ptiMouse); + KeSetPriorityThread(&PsGetCurrentThread()->Tcb, LOW_REALTIME_PRIORITY + 3); @@ -529,6 +543,10 @@ DPRINT1("Win32K: Failed making keyboard thread a win32 thread.\n"); return; //(Status); } + + ptiKeyboard = PsGetCurrentThreadWin32Thread(); + ptiKeyboard->TIF_flags |= TIF_SYSTEMTHREAD; + DPRINT1("\nKeyboard Thread 0x%x \n", ptiKeyboard); KeSetPriorityThread(&PsGetCurrentThread()->Tcb, LOW_REALTIME_PRIORITY + 3); @@ -890,8 +908,8 @@ } ptiRawInput = PsGetCurrentThreadWin32Thread(); - DPRINT("\nRaw Input Thread 0x%x \n", ptiRawInput); - + ptiRawInput->TIF_flags |= TIF_SYSTEMTHREAD; + DPRINT1("\nRaw Input Thread 0x%x \n", ptiRawInput); KeSetPriorityThread(&PsGetCurrentThread()->Tcb, LOW_REALTIME_PRIORITY + 3); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Thu Nov 4 23:45:34 2010 @@ -1910,9 +1910,9 @@ LRESULT Result; USER_REFERENCE_ENTRY ParentRef, Ref; PTHREADINFO pti; - ANSI_STRING asClassName; DWORD dwShowMode = SW_SHOW; CREATESTRUCTW *pCsw; + PVOID pszClass = NULL, pszName = NULL; DECLARE_RETURN(PWND); /* Get the current window station and reference it */ @@ -1927,7 +1927,6 @@ pCsw = NULL; pCbtCreate = NULL; - RtlInitAnsiString(&asClassName, NULL); /* Get the class and reference it*/ Class = IntGetAndReferenceClass(ClassName, Cs->hInstance); @@ -2008,17 +2007,58 @@ pCsw->dwExStyle = Cs->dwExStyle; dwStyle = Cs->style; // Save it anyway. pCsw->style = Window->style; /* HCBT_CREATEWND needs the real window style */ - - pCsw->lpszName = (LPCWSTR) WindowName->Buffer; - pCsw->lpszClass = (LPCWSTR) ClassName->Buffer; - - if (Window->state & WNDS_ANSICREATOR) - { - if (!IS_ATOM(ClassName->Buffer)) - { - RtlUnicodeStringToAnsiString(&asClassName, ClassName, TRUE); - pCsw->lpszClass = (LPCWSTR) asClassName.Buffer; - } + pCsw->lpszName = Cs->lpszName; + pCsw->lpszClass = Cs->lpszClass; + + // Based on the assumption this is from "unicode source" user32, ReactOS, answer is yes. + if (!IS_ATOM(ClassName->Buffer)) + { + if (Window->state & WNDS_ANSICREATOR) + { + ANSI_STRING AnsiString; + AnsiString.MaximumLength = RtlUnicodeStringToAnsiSize(ClassName)+sizeof(CHAR); + pszClass = UserHeapAlloc(AnsiString.MaximumLength); + RtlZeroMemory(pszClass, AnsiString.MaximumLength); + AnsiString.Buffer = (PCHAR)pszClass; + RtlUnicodeStringToAnsiString(&AnsiString, ClassName, FALSE); + } + else + { + UNICODE_STRING UnicodeString; + UnicodeString.MaximumLength = ClassName->Length + sizeof(UNICODE_NULL); + pszClass = UserHeapAlloc(UnicodeString.MaximumLength); + RtlZeroMemory(pszClass, UnicodeString.MaximumLength); + UnicodeString.Buffer = (PWSTR)pszClass; + RtlCopyUnicodeString(&UnicodeString, ClassName); + } + if (pszClass) pCsw->lpszClass = UserHeapAddressToUser(pszClass); + } + if (WindowName->Length) + { + UNICODE_STRING Name; + Name.Buffer = WindowName->Buffer; + Name.Length = WindowName->Length; + Name.MaximumLength = WindowName->MaximumLength; + + if (Window->state & WNDS_ANSICREATOR) + { + ANSI_STRING AnsiString; + AnsiString.MaximumLength = RtlUnicodeStringToAnsiSize(&Name)+sizeof(CHAR); + pszName = UserHeapAlloc(AnsiString.MaximumLength); + RtlZeroMemory(pszName, AnsiString.MaximumLength); + AnsiString.Buffer = (PCHAR)pszName; + RtlUnicodeStringToAnsiString(&AnsiString, &Name, FALSE); + } + else + { + UNICODE_STRING UnicodeString; + UnicodeString.MaximumLength = Name.Length + sizeof(UNICODE_NULL); + pszName = UserHeapAlloc(UnicodeString.MaximumLength); + RtlZeroMemory(pszName, UnicodeString.MaximumLength); + UnicodeString.Buffer = (PWSTR)pszName; + RtlCopyUnicodeString(&UnicodeString, &Name); + } + if (pszName) pCsw->lpszName = UserHeapAddressToUser(pszName); } pCbtCreate->lpcs = pCsw; @@ -2037,7 +2077,10 @@ Cs->y = pCsw->y; hwndInsertAfter = pCbtCreate->hwndInsertAfter; - Cs->style = dwStyle; /* NCCREATE and WM_NCCALCSIZE need the original values*/ + /* NCCREATE and WM_NCCALCSIZE need the original values */ + Cs->style = dwStyle; + Cs->lpszName = (LPCWSTR) WindowName; + Cs->lpszClass = (LPCWSTR) ClassName; /* Send the WM_GETMINMAXINFO message*/ Size.cx = Cs->cx; @@ -2187,7 +2230,8 @@ if (pCsw) ExFreePoolWithTag(pCsw, TAG_HOOK); if (pCbtCreate) ExFreePoolWithTag(pCbtCreate, TAG_HOOK); - RtlFreeAnsiString(&asClassName); + if (pszName) UserHeapFree(pszName); + if (pszClass) UserHeapFree(pszClass); if (Window) { @@ -2337,10 +2381,11 @@ Cs.cy = nHeight; Cs.x = x; Cs.y = y; -// Cs.lpszName = (LPCWSTR) WindowName->Buffer; -// Cs.lpszClass = (LPCWSTR) ClassName->Buffer; - Cs.lpszName = (LPCWSTR) plstrWindowName; - Cs.lpszClass = (LPCWSTR) &ustrClassName; + Cs.lpszName = (LPCWSTR) plstrWindowName->Buffer; + if (IS_ATOM(plstrClassName)) + Cs.lpszClass = (LPCWSTR) plstrClassName; + else + Cs.lpszClass = (LPCWSTR) plstrClassName->Buffer; Cs.dwExStyle = dwExStyle; UserEnterExclusive();

13 years, 11 months

[akhaldi] 49471: [CMAKE] - Improve hal, adns and bzip2.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Nov 4 21:38:28 2010 New Revision: 49471 URL: http://svn.reactos.org/svn/reactos?rev=49471&view=rev Log: [CMAKE] - Improve hal, adns and bzip2. Modified: branches/cmake-bringup/hal/CMakeLists.txt branches/cmake-bringup/lib/3rdparty/adns/CMakeLists.txt branches/cmake-bringup/lib/3rdparty/bzip2/CMakeLists.txt Modified: branches/cmake-bringup/hal/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/hal/CMakeLists.tx… ============================================================================== --- branches/cmake-bringup/hal/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/hal/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:38:28 2010 @@ -1,11 +1,13 @@ if(ARCH MATCHES i386) -add_definitions(-D_NTHALDLL_) -add_definitions(-D_NTHAL_) +add_definitions( + -D_NTHALDLL_ + -D_NTHAL_) -include_directories(halx86/include) -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) +include_directories( + halx86/include + ${REACTOS_SOURCE_DIR}/ntoskrnl/include) list(APPEND HAL_GENERIC_SOURCE halx86/generic/beep.c @@ -43,8 +45,6 @@ halx86/up/pic.c halx86/up/processor.c) - - list(APPEND HAL_SOURCE ${CMAKE_CURRENT_BINARY_DIR}/hal_hal.h.gch ${HAL_GENERIC_SOURCE} @@ -57,11 +57,14 @@ add_pch(hal ${CMAKE_CURRENT_SOURCE_DIR}/halx86/include/hal.h ${HAL_SOURCE}) add_dependencies(hal psdk bugcodes) -set_target_properties(hal PROPERTIES LINK_FLAGS "-Wl,-entry,_HalInitSystem@8 -Wl,--image-base,0x00010000 -Wl,--subsystem,native") +set_entrypoint(hal HalInitSystem@8) +set_subsystem(hal native) +set_image_base(hal 0x00010000) + +add_importlibs(hal ntoskrnl) target_link_libraries(hal ${CMAKE_CURRENT_SOURCE_DIR}/halx86/hal_i386.def - -lntoskrnl libcntpr) list(APPEND MINI_HAL_SOURCE Modified: branches/cmake-bringup/lib/3rdparty/adns/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/adns… ============================================================================== --- branches/cmake-bringup/lib/3rdparty/adns/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/adns/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:38:28 2010 @@ -1,9 +1,11 @@ -include_directories(src) -include_directories(adns_win32) +include_directories( + src + adns_win32) -add_definitions(-D_DLL -D__USE_CRTIMP) -add_definitions(-DADNS_JGAA_WIN32) +add_definitions( + -D_DLL -D__USE_CRTIMP + -DADNS_JGAA_WIN32) list(APPEND SOURCE adns_win32/adns_unix_calls.c 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] Thu Nov 4 21:38:28 2010 @@ -1,3 +1,4 @@ + add_definitions(-DBZ_NO_STDIO -DBZ_DECOMPRESS_ONLY) spec2def(bzip2 unbzip2.spec) @@ -13,8 +14,7 @@ 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") - +set_module_type(bzip2 kernelmodedriver) add_importlibs(bzip2 ntoskrnl) -add_dependencies(bzip2 bugcodes) +set_target_properties(bzip2 PROPERTIES OUTPUT_NAME "unbzip2")

13 years, 11 months

[akhaldi] 49470: [CMAKE] - Improve the rest of the drivers.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Nov 4 21:31:33 2010 New Revision: 49470 URL: http://svn.reactos.org/svn/reactos?rev=49470&view=rev Log: [CMAKE] - Improve the rest of the drivers. Modified: branches/cmake-bringup/drivers/storage/class/cdrom/CMakeLists.txt branches/cmake-bringup/drivers/storage/class/class2/CMakeLists.txt branches/cmake-bringup/drivers/storage/class/disk/CMakeLists.txt branches/cmake-bringup/drivers/storage/class/ramdisk/CMakeLists.txt branches/cmake-bringup/drivers/storage/classpnp/CMakeLists.txt branches/cmake-bringup/drivers/storage/floppy/CMakeLists.txt branches/cmake-bringup/drivers/storage/ide/atapi/CMakeLists.txt branches/cmake-bringup/drivers/storage/ide/pciide/CMakeLists.txt branches/cmake-bringup/drivers/storage/ide/pciidex/CMakeLists.txt branches/cmake-bringup/drivers/storage/port/buslogic/CMakeLists.txt branches/cmake-bringup/drivers/storage/scsiport/CMakeLists.txt branches/cmake-bringup/drivers/usb/nt4compat/usbdriver/CMakeLists.txt branches/cmake-bringup/drivers/usb/usbd/CMakeLists.txt branches/cmake-bringup/drivers/video/displays/framebuf/CMakeLists.txt branches/cmake-bringup/drivers/video/displays/framebuf_new/CMakeLists.txt branches/cmake-bringup/drivers/video/displays/vga/CMakeLists.txt branches/cmake-bringup/drivers/video/font/bmfd/CMakeLists.txt branches/cmake-bringup/drivers/video/font/ftfd/CMakeLists.txt branches/cmake-bringup/drivers/video/miniport/vbe/CMakeLists.txt branches/cmake-bringup/drivers/video/miniport/vga/CMakeLists.txt branches/cmake-bringup/drivers/video/miniport/vga_new/CMakeLists.txt branches/cmake-bringup/drivers/video/miniport/vmx_svga/CMakeLists.txt branches/cmake-bringup/drivers/video/miniport/xboxvmp/CMakeLists.txt branches/cmake-bringup/drivers/video/videoprt/CMakeLists.txt branches/cmake-bringup/drivers/wdm/audio/backpln/audio_test/CMakeLists.txt branches/cmake-bringup/drivers/wdm/audio/backpln/portcls/CMakeLists.txt branches/cmake-bringup/drivers/wdm/audio/drm/drmk/CMakeLists.txt branches/cmake-bringup/drivers/wdm/audio/filters/kmixer/CMakeLists.txt branches/cmake-bringup/drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt branches/cmake-bringup/drivers/wdm/audio/sysaudio/CMakeLists.txt branches/cmake-bringup/drivers/wmi/CMakeLists.txt Modified: branches/cmake-bringup/drivers/storage/class/cdrom/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/c… ============================================================================== --- branches/cmake-bringup/drivers/storage/class/cdrom/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/class/cdrom/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:31:33 2010 @@ -1,18 +1,14 @@ - - include_directories(..) add_library(cdrom SHARED cdrom.c findscsi.c cdrom.rc) -set_target_properties(cdrom PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") +set_module_type(cdrom kernelmodedriver) +add_importlibs(cdrom + class2 + scsiport + ntoskrnl + hal) -target_link_libraries(cdrom - -lclass2 - -lscsiport - -lntoskrnl - -lhal) - -add_dependencies(cdrom psdk bugcodes) add_minicd_target(cdrom reactos cdrom.sys) -add_livecd_target(cdrom reactos/system32/drivers) +add_livecd_target(cdrom reactos/system32/drivers) Modified: branches/cmake-bringup/drivers/storage/class/class2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/c… ============================================================================== --- branches/cmake-bringup/drivers/storage/class/class2/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/class/class2/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:31:33 2010 @@ -1,17 +1,15 @@ - - include_directories(..) spec2def(class2.sys class2.spec) -add_library(class2 SHARED class2.c class2.rc +add_library(class2 SHARED + class2.c + class2.rc ${CMAKE_CURRENT_BINARY_DIR}/class2.def) set_module_type(class2 kernelmodedriver) - add_importlibs(class2 scsiport ntoskrnl hal) -add_dependencies(class2 psdk bugcodes) add_minicd_target(class2 reactos class2.sys) -add_livecd_target(class2 reactos/system32/drivers) +add_livecd_target(class2 reactos/system32/drivers) Modified: branches/cmake-bringup/drivers/storage/class/disk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/c… ============================================================================== --- branches/cmake-bringup/drivers/storage/class/disk/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/class/disk/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:31:33 2010 @@ -1,18 +1,14 @@ - - include_directories(..) add_library(disk SHARED disk.c disk.rc) -set_target_properties(disk PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") +set_module_type(disk kernelmodedriver) +add_importlibs(disk + class2 + scsiport + ntoskrnl + hal) -target_link_libraries(disk - -lclass2 - -lscsiport - -lntoskrnl - -lhal) - -add_dependencies(disk psdk bugcodes) add_minicd_target(disk reactos disk.sys) -add_livecd_target(disk reactos/system32/drivers) +add_livecd_target(disk reactos/system32/drivers) Modified: branches/cmake-bringup/drivers/storage/class/ramdisk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/c… ============================================================================== --- branches/cmake-bringup/drivers/storage/class/ramdisk/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/class/ramdisk/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:31:33 2010 @@ -1,16 +1,12 @@ - - include_directories(..) add_library(ramdisk SHARED ramdisk.c ramdisk.rc) -set_target_properties(ramdisk PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") +set_module_type(ramdisk kernelmodedriver) +add_importlibs(ramdisk + ntoskrnl + hal) -target_link_libraries(ramdisk - -lntoskrnl - -lhal) - -add_dependencies(ramdisk psdk bugcodes) add_minicd_target(ramdisk reactos ramdisk.sys) -add_livecd_target(ramdisk reactos/system32/drivers) +add_livecd_target(ramdisk reactos/system32/drivers) Modified: branches/cmake-bringup/drivers/storage/classpnp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/c… ============================================================================== --- branches/cmake-bringup/drivers/storage/classpnp/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/classpnp/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:31:33 2010 @@ -7,8 +7,7 @@ -DCLASS_GLOBAL_USE_DELAYED_RETRY=1 -DCLASS_GLOBAL_BUFFERED_DEBUG_PRINT=0 -DCLASS_GLOBAL_BUFFERED_DEBUG_PRINT_BUFFER_SIZE=512 - -DCLASS_GLOBAL_BUFFERED_DEBUG_PRINT_BUFFERS=512 -) + -DCLASS_GLOBAL_BUFFERED_DEBUG_PRINT_BUFFERS=512) if(NOT MSVC) add_definitions(-mrtd -fno-builtin -w) @@ -30,8 +29,7 @@ utils.c xferpkt.c class.rc - ${CMAKE_CURRENT_BINARY_DIR}/class.def -) + ${CMAKE_CURRENT_BINARY_DIR}/class.def) spec2def(classpnp.sys class.spec) @@ -39,8 +37,7 @@ target_link_libraries(classpnp ${PSEH_LIB} libcntpr) set_module_type(classpnp kernelmodedriver) - add_importlibs(classpnp hal ntoskrnl) add_minicd_target(classpnp reactos classpnp.sys) -add_livecd_target(classpnp reactos/system32/drivers) +add_livecd_target(classpnp reactos/system32/drivers) Modified: branches/cmake-bringup/drivers/storage/floppy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/f… ============================================================================== --- branches/cmake-bringup/drivers/storage/floppy/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/floppy/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:31:33 2010 @@ -1,5 +1,3 @@ - - add_library(floppy SHARED csqrtns.c @@ -9,13 +7,10 @@ readwrite.c floppy.rc) -set_target_properties(floppy PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") +target_link_libraries(floppy csq) -target_link_libraries(floppy - csq - -lntoskrnl - -lhal) +set_module_type(floppy kernelmodedriver) +add_importlibs(floppy hal ntoskrnl) -add_dependencies(floppy psdk bugcodes buildno_header) add_minicd_target(floppy reactos floppy.sys) -add_livecd_target(floppy reactos/system32/drivers) +add_livecd_target(floppy reactos/system32/drivers) Modified: branches/cmake-bringup/drivers/storage/ide/atapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/i… ============================================================================== --- branches/cmake-bringup/drivers/storage/ide/atapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/ide/atapi/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:31:33 2010 @@ -1,14 +1,10 @@ - - add_library(atapi SHARED atapi.c atapi.rc) -set_target_properties(atapi PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") +target_link_libraries(atapi libcntpr) -target_link_libraries(atapi - -lscsiport - libcntpr) +set_module_type(atapi kernelmodedriver) +add_importlibs(atapi scsiport) -add_dependencies(atapi psdk bugcodes) add_minicd_target(atapi reactos atapi.sys) -add_livecd_target(atapi reactos/system32/drivers) +add_livecd_target(atapi reactos/system32/drivers) Modified: branches/cmake-bringup/drivers/storage/ide/pciide/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/i… ============================================================================== --- branches/cmake-bringup/drivers/storage/ide/pciide/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/ide/pciide/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:31:33 2010 @@ -1,8 +1,7 @@ add_library(pciide SHARED pciide.c pciide.rc) -set_target_properties(pciide PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") +set_module_type(pciide kernelmodedriver) +add_importlibs(pciide pciidex ntoskrnl) -add_importlibs(pciide pciidex ntoskrnl) -add_dependencies(pciide psdk bugcodes) -add_cab_target(pciide 2) +add_cab_target(pciide 2) Modified: branches/cmake-bringup/drivers/storage/ide/pciidex/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/i… ============================================================================== --- branches/cmake-bringup/drivers/storage/ide/pciidex/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/ide/pciidex/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:31:33 2010 @@ -10,8 +10,7 @@ pciidex.rc ${CMAKE_CURRENT_BINARY_DIR}/pciidex.def) -set_target_properties(pciidex PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--subsystem,native" SUFFIX ".sys") +set_module_type(pciidex kernelmodedriver) +add_importlibs(pciidex ntoskrnl) -add_importlibs(pciidex ntoskrnl) -add_dependencies(pciidex psdk bugcodes) add_cab_target(pciidex 2) Modified: branches/cmake-bringup/drivers/storage/port/buslogic/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/p… ============================================================================== --- branches/cmake-bringup/drivers/storage/port/buslogic/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/port/buslogic/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:31:33 2010 @@ -1,14 +1,10 @@ - - add_library(buslogic SHARED BusLogic958.c BusLogic958.rc) -set_target_properties(buslogic PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") +target_link_libraries(buslogic libcntpr) -target_link_libraries(buslogic - -lscsiport - libcntpr) +set_module_type(buslogic kernelmodedriver) +add_importlibs(buslogic scsiport) -add_dependencies(buslogic psdk bugcodes) add_minicd_target(buslogic reactos buslogic.sys) -add_livecd_target(buslogic reactos/system32/drivers) +add_livecd_target(buslogic reactos/system32/drivers) Modified: branches/cmake-bringup/drivers/storage/scsiport/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/s… ============================================================================== --- branches/cmake-bringup/drivers/storage/scsiport/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/scsiport/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:31:33 2010 @@ -1,15 +1,10 @@ - - add_library(scsiport SHARED scsiport.c stubs.c scsiport.rc) -set_target_properties(scsiport PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols" SUFFIX ".sys") +target_link_libraries(scsiport ${CMAKE_CURRENT_SOURCE_DIR}/scsiport_i386.def) -target_link_libraries(scsiport - ${CMAKE_CURRENT_SOURCE_DIR}/scsiport_i386.def - -lntoskrnl - -lhal) +set_module_type(scsiport kernelmodedriver) +add_importlibs(scsiport ntoskrnl hal) -add_dependencies(scsiport psdk bugcodes) add_minicd_target(scsiport reactos scsiport.sys) -add_livecd_target(scsiport reactos/system32/drivers) +add_livecd_target(scsiport reactos/system32/drivers) Modified: branches/cmake-bringup/drivers/usb/nt4compat/usbdriver/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/usb/nt4co… ============================================================================== --- branches/cmake-bringup/drivers/usb/nt4compat/usbdriver/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/usb/nt4compat/usbdriver/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:31:33 2010 @@ -1,8 +1,9 @@ -add_definitions(-DINCLUDE_EHCI) -add_definitions(-D_MULTI_UHCI) -add_definitions(-D_MULTI_EHCI) -add_definitions(-D_X86) +add_definitions( + -DINCLUDE_EHCI + -D_MULTI_UHCI + -D_MULTI_EHCI + -D_X86) list(APPEND SOURCE ehci.c @@ -26,9 +27,9 @@ add_library(usbdriver SHARED ${CMAKE_CURRENT_BINARY_DIR}/usbdriver_usbdriver.h.gch ${SOURCE}) -set_target_properties(usbdriver PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") +set_module_type(usbdriver kernelmodedriver) +add_importlibs(usbdriver ntoskrnl hal) -add_importlibs(usbdriver ntoskrnl hal) add_pch(usbdriver ${CMAKE_CURRENT_SOURCE_DIR}/usbdriver.h ${SOURCE}) -add_dependencies(usbdriver psdk bugcodes) -add_cab_target(usbdriver 2) + +add_cab_target(usbdriver 2) Modified: branches/cmake-bringup/drivers/usb/usbd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/usb/usbd/… ============================================================================== --- branches/cmake-bringup/drivers/usb/usbd/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/usb/usbd/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:31:33 2010 @@ -1,10 +1,10 @@ spec2def(usbd.sys usbd.spec) -add_library(usbd SHARED usbd.c usbd.rc +add_library(usbd SHARED + usbd.c + usbd.rc ${CMAKE_CURRENT_BINARY_DIR}/usbd.def) -set_target_properties(usbd PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--subsystem,native" SUFFIX ".sys") - +set_module_type(usbd kernelmodedriver) add_importlibs(usbd ntoskrnl hal) -add_dependencies(usbd psdk bugcodes) Modified: branches/cmake-bringup/drivers/video/displays/framebuf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/dis… ============================================================================== --- branches/cmake-bringup/drivers/video/displays/framebuf/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/video/displays/framebuf/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:31:33 2010 @@ -10,8 +10,10 @@ framebuf.rc ${CMAKE_CURRENT_BINARY_DIR}/framebuf.def) -set_target_properties(framebuf PROPERTIES LINK_FLAGS "-Wl,-entry,_DrvEnableDriver@12 -Wl,--image-base,0x00010000 -Wl,--subsystem,native") +set_entrypoint(framebuf DrvEnableDriver@12) +set_subsystem(framebuf native) +set_image_base(framebuf 0x00010000) add_importlibs(framebuf win32k) add_dependencies(framebuf psdk bugcodes) -add_cab_target(framebuf 1) +add_cab_target(framebuf 1) Modified: branches/cmake-bringup/drivers/video/displays/framebuf_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/dis… ============================================================================== --- branches/cmake-bringup/drivers/video/displays/framebuf_new/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/video/displays/framebuf_new/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:31:33 2010 @@ -13,13 +13,14 @@ add_library(framebuf_new SHARED ${CMAKE_CURRENT_BINARY_DIR}/framebuf_new_driver.h.gch ${SOURCE}) if(ARCH MATCHES i386) - if(MSVC) - else() + if(NOT MSVC) set_target_properties(framebuf_new PROPERTIES COMPILE_FLAGS "-mrtd -fno-builtin") endif() endif() -set_target_properties(framebuf_new PROPERTIES LINK_FLAGS "-Wl,-entry,_DrvEnableDriver@12 -Wl,--image-base,0x00010000 -Wl,--subsystem,native") +set_entrypoint(framebuf_new DrvEnableDriver@12) +set_subsystem(framebuf_new native) +set_image_base(framebuf_new 0x00010000) target_link_libraries(framebuf_new libcntpr) Modified: branches/cmake-bringup/drivers/video/displays/vga/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/dis… ============================================================================== --- branches/cmake-bringup/drivers/video/displays/vga/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/video/displays/vga/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:31:33 2010 @@ -15,7 +15,9 @@ vgaddi.rc ${CMAKE_CURRENT_BINARY_DIR}/vgaddi.def) -set_target_properties(vgaddi PROPERTIES LINK_FLAGS "-Wl,-entry,_DrvEnableDriver@12 -Wl,--subsystem,native -Wl,--image-base,0x00010000") +set_entrypoint(vgaddi DrvEnableDriver@12) +set_subsystem(vgaddi native) +set_image_base(vgaddi 0x00010000) add_importlibs(vgaddi win32k) add_dependencies(vgaddi psdk bugcodes) Modified: branches/cmake-bringup/drivers/video/font/bmfd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/fon… ============================================================================== --- branches/cmake-bringup/drivers/video/font/bmfd/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/video/font/bmfd/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:31:33 2010 @@ -4,7 +4,9 @@ font.c glyph.c) -set_target_properties(bmfd PROPERTIES LINK_FLAGS "-Wl,-entry,_BmfdEnableDriver@12 -Wl,--subsystem,native -Wl,--image-base,0x00010000") +set_entrypoint(bmfd BmfdEnableDriver@12) +set_subsystem(bmfd native) +set_image_base(bmfd 0x00010000) target_link_libraries(bmfd libcntpr) Modified: branches/cmake-bringup/drivers/video/font/ftfd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/fon… ============================================================================== --- branches/cmake-bringup/drivers/video/font/ftfd/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/video/font/ftfd/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:31:33 2010 @@ -1,5 +1,3 @@ - - include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/freetype/include) @@ -10,13 +8,14 @@ rosglue.c sprintf.c) -set_target_properties(ftfd PROPERTIES LINK_FLAGS "-Wl,-entry,_FtfdEnableDriver@12 -Wl,--subsystem,native") +set_entrypoint(ftfd FtfdEnableDriver@12) +set_subsystem(ftfd native) target_link_libraries(ftfd ${CMAKE_CURRENT_SOURCE_DIR}/freetype.def - -lwin32k freetype libcntpr) +add_importlibs(ftfd win32k) add_dependencies(ftfd psdk) add_cab_target(ftfd 1) Modified: branches/cmake-bringup/drivers/video/miniport/vbe/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/min… ============================================================================== --- branches/cmake-bringup/drivers/video/miniport/vbe/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/video/miniport/vbe/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:31:33 2010 @@ -4,8 +4,7 @@ vbemp.c vbemp.rc) -set_target_properties(vbemp PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--subsystem,native -Wl,--exclude-all-symbols" SUFFIX ".sys") +set_module_type(vbemp kernelmodedriver) +add_importlibs(vbemp videoprt) -add_importlibs(vbemp videoprt) -add_dependencies(vbemp psdk bugcodes) -add_cab_target(vbemp 2) +add_cab_target(vbemp 2) Modified: branches/cmake-bringup/drivers/video/miniport/vga/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/min… ============================================================================== --- branches/cmake-bringup/drivers/video/miniport/vga/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/video/miniport/vga/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:31:33 2010 @@ -6,9 +6,8 @@ add_library(vgamp SHARED ${CMAKE_CURRENT_BINARY_DIR}/vgamp_vgamp.h.gch ${SOURCE}) -set_target_properties(vgamp PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--subsystem,native -Wl,--exclude-all-symbols" SUFFIX ".sys") +set_module_type(vgamp kernelmodedriver) +add_importlibs(vgamp videoprt) -add_importlibs(vgamp videoprt) add_pch(vgamp ${CMAKE_CURRENT_SOURCE_DIR}/vgamp.h ${SOURCE}) -add_dependencies(vgamp psdk bugcodes) -add_cab_target(vgamp 2) +add_cab_target(vgamp 2) Modified: branches/cmake-bringup/drivers/video/miniport/vga_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/min… ============================================================================== --- branches/cmake-bringup/drivers/video/miniport/vga_new/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/video/miniport/vga_new/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:31:33 2010 @@ -9,11 +9,13 @@ add_library(vga SHARED ${CMAKE_CURRENT_BINARY_DIR}/vga_vga.h.gch ${SOURCE}) -set_target_properties(vga PROPERTIES COMPILE_FLAGS "-mrtd -fno-builtin" LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--subsystem,native -Wl,--exclude-all-symbols" SUFFIX ".sys") - target_link_libraries(vga libcntpr) +set_target_properties(vga PROPERTIES COMPILE_FLAGS "-mrtd -fno-builtin") + +set_module_type(vga kernelmodedriver) add_importlibs(vga videoprt) + add_pch(vga ${CMAKE_CURRENT_SOURCE_DIR}/vga.h ${SOURCE}) -add_dependencies(vga psdk bugcodes) -add_cab_target(vga 2) + +add_cab_target(vga 2) Modified: branches/cmake-bringup/drivers/video/miniport/vmx_svga/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/min… ============================================================================== --- branches/cmake-bringup/drivers/video/miniport/vmx_svga/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/video/miniport/vmx_svga/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:31:33 2010 @@ -3,8 +3,7 @@ add_library(vmx_svga SHARED ${CMAKE_CURRENT_BINARY_DIR}/vmx_svga_precomp.h.gch ${SOURCE}) -set_target_properties(vmx_svga PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--subsystem,native -Wl,--exclude-all-symbols" SUFFIX ".sys") +set_module_type(vmx_svga kernelmodedriver) +add_importlibs(vmx_svga ntoskrnl videoprt) -add_importlibs(vmx_svga ntoskrnl videoprt) add_pch(vmx_svga ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) -add_dependencies(vmx_svga psdk bugcodes) Modified: branches/cmake-bringup/drivers/video/miniport/xboxvmp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/min… ============================================================================== --- branches/cmake-bringup/drivers/video/miniport/xboxvmp/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/video/miniport/xboxvmp/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:31:33 2010 @@ -1,7 +1,4 @@ add_library(xboxvmp SHARED xboxvmp.c xboxvmp.rc) - -set_target_properties(xboxvmp PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--subsystem,native -Wl,--exclude-all-symbols" SUFFIX ".sys") - +set_module_type(xboxvmp kernelmodedriver) add_importlibs(xboxvmp ntoskrnl videoprt) -add_dependencies(xboxvmp psdk bugcodes) Modified: branches/cmake-bringup/drivers/video/videoprt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/vid… ============================================================================== --- branches/cmake-bringup/drivers/video/videoprt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/video/videoprt/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:31:33 2010 @@ -26,9 +26,7 @@ add_library(videoprt SHARED ${CMAKE_CURRENT_BINARY_DIR}/videoprt_videoprt.h.gch ${SOURCE}) set_module_type(videoprt kernelmodedriver) - add_importlibs(videoprt ntoskrnl hal) add_pch(videoprt ${CMAKE_CURRENT_SOURCE_DIR}/videoprt.h ${SOURCE}) -add_dependencies(videoprt psdk bugcodes buildno_header) -add_cab_target(videoprt 2) +add_cab_target(videoprt 2) Modified: branches/cmake-bringup/drivers/wdm/audio/backpln/audio_test/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wdm/audio… ============================================================================== --- branches/cmake-bringup/drivers/wdm/audio/backpln/audio_test/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/wdm/audio/backpln/audio_test/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:31:33 2010 @@ -10,8 +10,7 @@ set_module_type(audio_test win32cui) -target_link_libraries(audio_test - libsamplerate) +target_link_libraries(audio_test libsamplerate) add_importlibs(audio_test setupapi ksuser msvcrt kernel32) add_dependencies(audio_test bugcodes) Modified: branches/cmake-bringup/drivers/wdm/audio/backpln/portcls/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wdm/audio… ============================================================================== --- branches/cmake-bringup/drivers/wdm/audio/backpln/portcls/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/wdm/audio/backpln/portcls/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:31:33 2010 @@ -62,4 +62,3 @@ set_module_type(portcls kernelmodedriver) add_importlibs(portcls ntoskrnl ks drmk hal stdc++ gcc msvcrt) -add_dependencies(portcls psdk bugcodes) Modified: branches/cmake-bringup/drivers/wdm/audio/drm/drmk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wdm/audio… ============================================================================== --- branches/cmake-bringup/drivers/wdm/audio/drm/drmk/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/wdm/audio/drm/drmk/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:31:33 2010 @@ -3,10 +3,10 @@ spec2def(drmk.sys drmk.spec) -add_library(drmk SHARED stubs.cpp drmk.rc +add_library(drmk SHARED + stubs.cpp + drmk.rc ${CMAKE_CURRENT_BINARY_DIR}/drmk.def) set_module_type(drmk kernelmodedriver) - add_importlibs(drmk ntoskrnl) -add_dependencies(drmk psdk bugcodes) Modified: branches/cmake-bringup/drivers/wdm/audio/filters/kmixer/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wdm/audio… ============================================================================== --- branches/cmake-bringup/drivers/wdm/audio/filters/kmixer/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/wdm/audio/filters/kmixer/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:31:33 2010 @@ -6,11 +6,10 @@ filter.c pin.c) -set_target_properties(kmixer PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") +set_module_type(kmixer kernelmodedriver) target_link_libraries(kmixer libcntpr libsamplerate) add_importlibs(kmixer ntoskrnl ks hal) -add_dependencies(kmixer psdk bugcodes) Modified: branches/cmake-bringup/drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wdm/audio… ============================================================================== --- branches/cmake-bringup/drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:31:33 2010 @@ -1,8 +1,9 @@ add_definitions(-D_COMDDK_) -include_directories(${REACTOS_SOURCE_DIR}/lib/drivers/sound/mmixer) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound) +include_directories( + ${REACTOS_SOURCE_DIR}/lib/drivers/sound/mmixer + ${REACTOS_SOURCE_DIR}/include/reactos/libs/sound) add_library(wdmaud SHARED control.c @@ -12,7 +13,7 @@ sup.c wdmaud.rc) -set_target_properties(wdmaud PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") +set_module_type(wdmaud kernelmodedriver) target_link_libraries(wdmaud mmixer @@ -20,4 +21,3 @@ ${PSEH_LIB}) add_importlibs(wdmaud ntoskrnl ks hal) -add_dependencies(wdmaud psdk bugcodes) Modified: branches/cmake-bringup/drivers/wdm/audio/sysaudio/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wdm/audio… ============================================================================== --- branches/cmake-bringup/drivers/wdm/audio/sysaudio/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/wdm/audio/sysaudio/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:31:33 2010 @@ -9,9 +9,8 @@ pin.c sysaudio.rc) -set_target_properties(sysaudio PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") +set_module_type(sysaudio kernelmodedriver) target_link_libraries(sysaudio libcntpr) add_importlibs(sysaudio ntoskrnl ks hal) -add_dependencies(sysaudio psdk bugcodes) Modified: branches/cmake-bringup/drivers/wmi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wmi/CMake… ============================================================================== --- branches/cmake-bringup/drivers/wmi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/wmi/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:31:33 2010 @@ -1,9 +1,10 @@ spec2def(wmilib.sys wmilib.spec) -add_library(wmilib SHARED wmilib.c wmilib.rc +add_library(wmilib SHARED + wmilib.c + wmilib.rc ${CMAKE_CURRENT_BINARY_DIR}/wmilib.def) set_module_type(wmilib kernelmodedriver) - add_importlibs(wmilib ntoskrnl)

13 years, 11 months

[akhaldi] 49469: [CMAKE] - Improve more drivers.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Nov 4 21:06:20 2010 New Revision: 49469 URL: http://svn.reactos.org/svn/reactos?rev=49469&view=rev Log: [CMAKE] - Improve more drivers. Modified: branches/cmake-bringup/drivers/bus/pci/CMakeLists.txt branches/cmake-bringup/drivers/bus/pcix/CMakeLists.txt branches/cmake-bringup/drivers/bus/pcmcia/CMakeLists.txt branches/cmake-bringup/drivers/directx/dxapi/CMakeLists.txt branches/cmake-bringup/drivers/directx/dxg/CMakeLists.txt branches/cmake-bringup/drivers/directx/dxgthk/CMakeLists.txt branches/cmake-bringup/drivers/filesystems/cdfs/CMakeLists.txt branches/cmake-bringup/drivers/filesystems/ext2/CMakeLists.txt branches/cmake-bringup/drivers/filesystems/fastfat/CMakeLists.txt branches/cmake-bringup/drivers/filesystems/fastfat_new/CMakeLists.txt branches/cmake-bringup/drivers/filesystems/fs_rec/CMakeLists.txt branches/cmake-bringup/drivers/filesystems/msfs/CMakeLists.txt branches/cmake-bringup/drivers/filesystems/mup/CMakeLists.txt branches/cmake-bringup/drivers/filesystems/npfs/CMakeLists.txt branches/cmake-bringup/drivers/filesystems/ntfs/CMakeLists.txt branches/cmake-bringup/drivers/input/i8042prt/CMakeLists.txt branches/cmake-bringup/drivers/input/kbdclass/CMakeLists.txt branches/cmake-bringup/drivers/input/mouclass/CMakeLists.txt branches/cmake-bringup/drivers/input/sermouse/CMakeLists.txt branches/cmake-bringup/drivers/ksfilter/ks/CMakeLists.txt branches/cmake-bringup/drivers/network/afd/CMakeLists.txt branches/cmake-bringup/drivers/network/dd/ne2000/CMakeLists.txt branches/cmake-bringup/drivers/network/dd/pcnet/CMakeLists.txt branches/cmake-bringup/drivers/network/ndis/CMakeLists.txt branches/cmake-bringup/drivers/network/tcpip/CMakeLists.txt branches/cmake-bringup/drivers/network/tdi/CMakeLists.txt branches/cmake-bringup/drivers/parallel/parallel/CMakeLists.txt branches/cmake-bringup/drivers/serial/serenum/CMakeLists.txt branches/cmake-bringup/drivers/serial/serial/CMakeLists.txt branches/cmake-bringup/drivers/setup/blue/CMakeLists.txt branches/cmake-bringup/drivers/storage/ide/uniata/CMakeLists.txt Modified: branches/cmake-bringup/drivers/bus/pci/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/pci/C… ============================================================================== --- branches/cmake-bringup/drivers/bus/pci/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/bus/pci/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:06:20 2010 @@ -5,9 +5,8 @@ pdo.c pci.rc) -set_target_properties(pci PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--subsystem,native -Wl,--exclude-all-symbols" SUFFIX ".sys") +set_module_type(pci kernelmodedriver) +add_importlibs(pci ntoskrnl hal) -add_importlibs(pci ntoskrnl hal) -add_dependencies(pci psdk bugcodes buildno_header) add_minicd_target(pci reactos pci.sys) -add_livecd_target(pci reactos/system32/drivers) +add_livecd_target(pci reactos/system32/drivers) Modified: branches/cmake-bringup/drivers/bus/pcix/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/pcix/… ============================================================================== --- branches/cmake-bringup/drivers/bus/pcix/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/bus/pcix/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:06:20 2010 @@ -38,9 +38,8 @@ add_library(pcix SHARED ${CMAKE_CURRENT_BINARY_DIR}/pcix_pci.h.gch ${SOURCE}) -set_target_properties(pcix PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--subsystem,native -Wl,--exclude-all-symbols" SUFFIX ".sys") - +set_module_type(pcix kernelmodedriver) add_importlibs(pcix ntoskrnl hal) add_pch(pcix ${CMAKE_CURRENT_SOURCE_DIR}/pci.h ${SOURCE}) -add_dependencies(pcix psdk pciclass buildno_header) +add_dependencies(pcix pciclass) Modified: branches/cmake-bringup/drivers/bus/pcmcia/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/pcmci… ============================================================================== --- branches/cmake-bringup/drivers/bus/pcmcia/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/bus/pcmcia/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:06:20 2010 @@ -5,9 +5,8 @@ pdo.c pcmcia.rc) -set_target_properties(pcmcia PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--subsystem,native -Wl,--exclude-all-symbols" SUFFIX ".sys") +set_module_type(pcmcia kernelmodedriver) +add_importlibs(pcmcia ntoskrnl hal) -add_importlibs(pcmcia ntoskrnl hal) -add_dependencies(pcmcia psdk bugcodes buildno_header) add_minicd_target(pcmcia reactos pcmcia.sys) -add_livecd_target(pcmcia reactos/system32/drivers) +add_livecd_target(pcmcia reactos/system32/drivers) Modified: branches/cmake-bringup/drivers/directx/dxapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/directx/d… ============================================================================== --- branches/cmake-bringup/drivers/directx/dxapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/directx/dxapi/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:06:20 2010 @@ -3,10 +3,10 @@ spec2def(dxapi.sys dxapi.spec) -add_library(dxapi SHARED main.c dxapi.rc +add_library(dxapi SHARED + main.c + dxapi.rc ${CMAKE_CURRENT_BINARY_DIR}/dxapi.def) -set_target_properties(dxapi PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--subsystem,native" SUFFIX ".sys") - +set_module_type(dxapi kernelmodedriver) add_importlibs(dxapi ntoskrnl hal videoprt) -add_dependencies(dxapi psdk bugcodes) Modified: branches/cmake-bringup/drivers/directx/dxg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/directx/d… ============================================================================== --- branches/cmake-bringup/drivers/directx/dxg/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/directx/dxg/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:06:20 2010 @@ -9,8 +9,5 @@ dxg.rc ${CMAKE_CURRENT_BINARY_DIR}/dxg.def) -set_target_properties(dxg PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--subsystem,native" SUFFIX ".sys") - - +set_module_type(dxg kernelmodedriver) add_importlibs(dxg dxgthk ntoskrnl) -add_dependencies(dxg psdk bugcodes) Modified: branches/cmake-bringup/drivers/directx/dxgthk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/directx/d… ============================================================================== --- branches/cmake-bringup/drivers/directx/dxgthk/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/directx/dxgthk/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:06:20 2010 @@ -1,10 +1,10 @@ spec2def(dxgthk.sys dxgthk.spec) -add_library(dxgthk SHARED main.c dxgthk.rc +add_library(dxgthk SHARED + main.c + dxgthk.rc ${CMAKE_CURRENT_BINARY_DIR}/dxgthk.def) -set_target_properties(dxgthk PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--subsystem,native" SUFFIX ".sys") - +set_module_type(dxgthk kernelmodedriver) add_importlibs(dxgthk win32k) -add_dependencies(dxgthk psdk bugcodes) Modified: branches/cmake-bringup/drivers/filesystems/cdfs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/filesyste… ============================================================================== --- branches/cmake-bringup/drivers/filesystems/cdfs/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/filesystems/cdfs/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:06:20 2010 @@ -1,5 +1,3 @@ - - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/drivers) @@ -21,13 +19,10 @@ add_library(cdfs SHARED ${CMAKE_CURRENT_BINARY_DIR}/cdfs_cdfs.h.gch ${SOURCE}) -set_target_properties(cdfs PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") - -target_link_libraries(cdfs - -lntoskrnl - -lhal) +set_module_type(cdfs kernelmodedriver) +add_importlibs(cdfs ntoskrnl hal) add_pch(cdfs ${CMAKE_CURRENT_SOURCE_DIR}/cdfs.h ${SOURCE}) -add_dependencies(cdfs psdk bugcodes) + add_minicd_target(cdfs reactos cdfs.sys) -add_livecd_target(cdfs reactos/system32/drivers cdfs.sys) +add_livecd_target(cdfs reactos/system32/drivers cdfs.sys) Modified: branches/cmake-bringup/drivers/filesystems/ext2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/filesyste… ============================================================================== --- branches/cmake-bringup/drivers/filesystems/ext2/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/filesystems/ext2/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:06:20 2010 @@ -1,3 +1,4 @@ + include_directories(inc) list(APPEND SOURCE @@ -22,13 +23,8 @@ add_library(ext2fs SHARED ${SOURCE}) -set_target_properties(ext2fs PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") +set_module_type(ext2fs kernelmodedriver) +add_importlibs(ext2fs ntoskrnl hal) - -target_link_libraries(ext2fs - -lntoskrnl - -lhal) - -add_dependencies(ext2fs psdk bugcodes) add_minicd_target(ext2fs reactos ext2.sys) -add_livecd_target(ext2fs reactos/system32/drivers ext2.sys) +add_livecd_target(ext2fs reactos/system32/drivers ext2.sys) Modified: branches/cmake-bringup/drivers/filesystems/fastfat/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/filesyste… ============================================================================== --- branches/cmake-bringup/drivers/filesystems/fastfat/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/filesystems/fastfat/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:06:20 2010 @@ -1,5 +1,3 @@ - - list(APPEND SOURCE blockdev.c @@ -27,13 +25,10 @@ add_library(fastfat SHARED ${CMAKE_CURRENT_BINARY_DIR}/fastfat_vfat.h.gch ${SOURCE}) -set_target_properties(fastfat PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") - -target_link_libraries(fastfat - -lntoskrnl - -lhal) +set_module_type(fastfat kernelmodedriver) +add_importlibs(fastfat ntoskrnl hal) add_pch(fastfat ${CMAKE_CURRENT_SOURCE_DIR}/vfat.h ${SOURCE}) -add_dependencies(fastfat psdk bugcodes) + add_minicd_target(fastfat reactos fastfat.sys) -add_livecd_target(fastfat reactos/system32/drivers) +add_livecd_target(fastfat reactos/system32/drivers) Modified: branches/cmake-bringup/drivers/filesystems/fastfat_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/filesyste… ============================================================================== --- branches/cmake-bringup/drivers/filesystems/fastfat_new/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/filesystems/fastfat_new/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:06:20 2010 @@ -1,6 +1,7 @@ -include_directories(.) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/fullfat) +include_directories( + . + ${REACTOS_SOURCE_DIR}/include/reactos/libs/fullfat) list(APPEND SOURCE cleanup.c @@ -25,7 +26,7 @@ add_library(fastfat_new SHARED ${CMAKE_CURRENT_BINARY_DIR}/fastfat_new_fastfat.h.gch ${SOURCE}) -set_target_properties(fastfat_new PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") +set_module_type(fastfat_new kernelmodedriver) target_link_libraries(fastfat_new ${PSEH_LIB} @@ -34,4 +35,3 @@ add_importlibs(fastfat_new ntoskrnl hal) add_pch(fastfat_new ${CMAKE_CURRENT_SOURCE_DIR}/fastfat.h ${SOURCE}) -add_dependencies(fastfat_new psdk bugcodes) Modified: branches/cmake-bringup/drivers/filesystems/fs_rec/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/filesyste… ============================================================================== --- branches/cmake-bringup/drivers/filesystems/fs_rec/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/filesystems/fs_rec/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:06:20 2010 @@ -9,8 +9,7 @@ udfs.c fs_rec.rc) -set_target_properties(fs_rec PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") +set_module_type(fs_rec kernelmodedriver) +add_importlibs(fs_rec ntoskrnl hal) -add_importlibs(fs_rec ntoskrnl hal) -add_dependencies(fs_rec psdk bugcodes) -add_cab_target(fs_rec 2) +add_cab_target(fs_rec 2) Modified: branches/cmake-bringup/drivers/filesystems/msfs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/filesyste… ============================================================================== --- branches/cmake-bringup/drivers/filesystems/msfs/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/filesystems/msfs/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:06:20 2010 @@ -9,9 +9,9 @@ add_library(msfs SHARED ${CMAKE_CURRENT_BINARY_DIR}/msfs_msfs.h.gch ${SOURCE}) -set_target_properties(msfs PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") +set_module_type(msfs kernelmodedriver) +add_importlibs(msfs ntoskrnl hal) -add_importlibs(msfs ntoskrnl hal) add_pch(msfs ${CMAKE_CURRENT_SOURCE_DIR}/msfs.h ${SOURCE}) -add_dependencies(msfs psdk bugcodes) -add_cab_target(msfs 2) + +add_cab_target(msfs 2) Modified: branches/cmake-bringup/drivers/filesystems/mup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/filesyste… ============================================================================== --- branches/cmake-bringup/drivers/filesystems/mup/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/filesystems/mup/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:06:20 2010 @@ -4,7 +4,5 @@ mup.c mup.rc) -set_target_properties(mup PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") - +set_module_type(mup kernelmodedriver) add_importlibs(mup ntoskrnl hal) -add_dependencies(mup psdk bugcodes) Modified: branches/cmake-bringup/drivers/filesystems/npfs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/filesyste… ============================================================================== --- branches/cmake-bringup/drivers/filesystems/npfs/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/filesystems/npfs/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:06:20 2010 @@ -10,10 +10,9 @@ add_library(npfs SHARED ${CMAKE_CURRENT_BINARY_DIR}/npfs_npfs.h.gch ${SOURCE}) -set_target_properties(npfs PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") - +set_module_type(npfs kernelmodedriver) add_importlibs(npfs ntoskrnl hal) add_pch(npfs ${CMAKE_CURRENT_SOURCE_DIR}/npfs.h ${SOURCE}) -add_dependencies(npfs psdk bugcodes) -add_cab_target(npfs 2) + +add_cab_target(npfs 2) Modified: branches/cmake-bringup/drivers/filesystems/ntfs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/filesyste… ============================================================================== --- branches/cmake-bringup/drivers/filesystems/ntfs/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/filesystems/ntfs/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:06:20 2010 @@ -19,8 +19,7 @@ add_library(ntfs SHARED ${CMAKE_CURRENT_BINARY_DIR}/ntfs_ntfs.h.gch ${SOURCE}) -set_target_properties(ntfs PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") +set_module_type(ntfs kernelmodedriver) +add_importlibs(ntfs ntoskrnl hal) -add_importlibs(ntfs ntoskrnl hal) add_pch(ntfs ${CMAKE_CURRENT_SOURCE_DIR}/ntfs.h ${SOURCE}) -add_dependencies(ntfs psdk bugcodes) Modified: branches/cmake-bringup/drivers/input/i8042prt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/input/i80… ============================================================================== --- branches/cmake-bringup/drivers/input/i8042prt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/input/i8042prt/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:06:20 2010 @@ -1,5 +1,3 @@ - - add_library(i8042prt SHARED createclose.c @@ -15,7 +13,6 @@ i8042prt.rc) set_module_type(i8042prt kernelmodedriver) - add_importlibs(i8042prt ntoskrnl hal) add_minicd_target(i8042prt reactos i8042prt.sys) Modified: branches/cmake-bringup/drivers/input/kbdclass/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/input/kbd… ============================================================================== --- branches/cmake-bringup/drivers/input/kbdclass/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/input/kbdclass/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:06:20 2010 @@ -1,5 +1,3 @@ - - add_library(kbdclass SHARED kbdclass.c Modified: branches/cmake-bringup/drivers/input/mouclass/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/input/mou… ============================================================================== --- branches/cmake-bringup/drivers/input/mouclass/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/input/mouclass/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:06:20 2010 @@ -1,5 +1,3 @@ - - add_library(mouclass SHARED misc.c Modified: branches/cmake-bringup/drivers/input/sermouse/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/input/ser… ============================================================================== --- branches/cmake-bringup/drivers/input/sermouse/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/input/sermouse/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:06:20 2010 @@ -1,5 +1,3 @@ - - add_library(sermouse SHARED createclose.c @@ -11,12 +9,7 @@ sermouse.c sermouse.rc) -set_target_properties(sermouse PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols" SUFFIX ".sys") - -target_link_libraries(sermouse - -lntoskrnl - -lhal) - -add_dependencies(sermouse psdk bugcodes) +set_module_type(sermouse kernelmodedriver) +add_importlibs(sermouse ntoskrnl hal) add_cab_target(sermouse 2) Modified: branches/cmake-bringup/drivers/ksfilter/ks/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/ksfilter/… ============================================================================== --- branches/cmake-bringup/drivers/ksfilter/ks/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/ksfilter/ks/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:06:20 2010 @@ -1,6 +1,7 @@ -add_definitions(-DBUILDING_KS) -add_definitions(-D_COMDDK_) +add_definitions( + -DBUILDING_KS + -D_COMDDK_) add_library(ks SHARED api.c Modified: branches/cmake-bringup/drivers/network/afd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/network/a… ============================================================================== --- branches/cmake-bringup/drivers/network/afd/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/network/afd/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:06:20 2010 @@ -1,6 +1,7 @@ -include_directories(BEFORE include) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/drivers) +include_directories( + BEFORE include + ${REACTOS_SOURCE_DIR}/include/reactos/drivers) list(APPEND SOURCE afd/bind.c @@ -18,15 +19,11 @@ afd.rc) add_library(afd SHARED ${CMAKE_CURRENT_BINARY_DIR}/afd_afd.h.gch ${SOURCE}) +target_link_libraries(afd ${PSEH_LIB}) set_module_type(afd kernelmodedriver) - -target_link_libraries(afd - ${PSEH_LIB} - -lntoskrnl - -lhal) +add_importlibs(afd ntoskrnl hal) add_pch(afd ${CMAKE_CURRENT_SOURCE_DIR}/include/afd.h ${SOURCE}) -add_dependencies(afd psdk bugcodes buildno_header) -add_cab_target(afd 2) +add_cab_target(afd 2) Modified: branches/cmake-bringup/drivers/network/dd/ne2000/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/network/d… ============================================================================== --- branches/cmake-bringup/drivers/network/dd/ne2000/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/network/dd/ne2000/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:06:20 2010 @@ -9,12 +9,6 @@ add_library(ne2000 SHARED ${SOURCE}) set_module_type(ne2000 kernelmodedriver) +add_importlibs(ne2000 ndis ntoskrnl hal) -target_link_libraries(ne2000 - -lndis - -lntoskrnl - -lhal) - -add_dependencies(ne2000 psdk bugcodes buildno_header) - -add_cab_target(ne2000 2) +add_cab_target(ne2000 2) Modified: branches/cmake-bringup/drivers/network/dd/pcnet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/network/d… ============================================================================== --- branches/cmake-bringup/drivers/network/dd/pcnet/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/network/dd/pcnet/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:06:20 2010 @@ -1,8 +1,9 @@ -add_definitions(-DNDIS50_MINIPORT) -add_definitions(-DNDIS_MINIPORT_DRIVER) -add_definitions(-DNDIS_LEGACY_MINIPORT) -add_definitions(-DNDIS51_MINIPORT) +add_definitions( + -DNDIS50_MINIPORT + -DNDIS_MINIPORT_DRIVER + -DNDIS_LEGACY_MINIPORT + -DNDIS51_MINIPORT) list(APPEND SOURCE pcnet.c @@ -12,12 +13,6 @@ add_library(pcnet SHARED ${SOURCE}) set_module_type(pcnet kernelmodedriver) +add_importlibs(pcnet ndis ntoskrnl hal) -target_link_libraries(pcnet - -lndis - -lntoskrnl - -lhal) - -add_dependencies(pcnet psdk bugcodes buildno_header) - -add_cab_target(pcnet 2) +add_cab_target(pcnet 2) Modified: branches/cmake-bringup/drivers/network/ndis/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/network/n… ============================================================================== --- branches/cmake-bringup/drivers/network/ndis/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/network/ndis/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:06:20 2010 @@ -1,13 +1,14 @@ include_directories(BEFORE include) -add_definitions(-DNDIS_WRAPPER) -add_definitions(-DNDIS51) -add_definitions(-DNDIS51_MINIPORT) -add_definitions(-DNDIS_LEGACY_DRIVER) -add_definitions(-DNDIS_LEGACY_MINIPORT) -add_definitions(-DNDIS_LEGACY_PROTOCOL) -add_definitions(-DNDIS_MINIPORT_DRIVER) +add_definitions( + -DNDIS_WRAPPER + -DNDIS51 + -DNDIS51_MINIPORT + -DNDIS_LEGACY_DRIVER + -DNDIS_LEGACY_MINIPORT + -DNDIS_LEGACY_PROTOCOL + -DNDIS_MINIPORT_DRIVER) spec2def(ndis.sys ndis.spec) @@ -36,12 +37,9 @@ add_library(ndis SHARED ${CMAKE_CURRENT_BINARY_DIR}/ndis_ndissys.h.gch ${SOURCE}) -set_target_properties(ndis PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") - -target_link_libraries(ndis - -lntoskrnl - -lhal) +set_module_type(ndis kernelmodedriver) +add_importlibs(ndis ntoskrnl hal) add_pch(ndis ${CMAKE_CURRENT_SOURCE_DIR}/include/ndissys.h ${SOURCE}) -add_dependencies(ndis psdk bugcodes buildno_header) -add_cab_target(ndis 2) + +add_cab_target(ndis 2) Modified: branches/cmake-bringup/drivers/network/tcpip/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/network/t… ============================================================================== --- branches/cmake-bringup/drivers/network/tcpip/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/network/tcpip/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:06:20 2010 @@ -1,9 +1,11 @@ -include_directories(BEFORE include) -include_directories(${REACTOS_SOURCE_DIR}/lib/drivers/oskittcp/include) +include_directories( + BEFORE include + ${REACTOS_SOURCE_DIR}/lib/drivers/oskittcp/include) -add_definitions(-DNDIS40) -add_definitions(-D_NTDRIVER_) +add_definitions( + -DNDIS40 + -D_NTDRIVER_) spec2def(tcpip.sys tcpip.spec) @@ -26,18 +28,15 @@ add_library(tcpip SHARED ${CMAKE_CURRENT_BINARY_DIR}/tcpip_precomp.h.gch ${SOURCE}) -set_module_type(tcpip kernelmodedriver) - target_link_libraries(tcpip ip oskittcp ${PSEH_LIB} - chew - -lndis - -lntoskrnl - -lhal) + chew) + +set_module_type(tcpip kernelmodedriver) +add_importlibs(tcpip ndis ntoskrnl hal) add_pch(tcpip ${CMAKE_CURRENT_SOURCE_DIR}/include/precomp.h ${SOURCE}) -add_dependencies(tcpip psdk bugcodes buildno_header) -add_cab_target(tcpip 2) +add_cab_target(tcpip 2) Modified: branches/cmake-bringup/drivers/network/tdi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/network/t… ============================================================================== --- branches/cmake-bringup/drivers/network/tdi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/network/tdi/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:06:20 2010 @@ -1,9 +1,11 @@ -include_directories(BEFORE include) -include_directories(${REACTOS_SOURCE_DIR}/lib/drivers/oskittcp/include) +include_directories( + BEFORE include + ${REACTOS_SOURCE_DIR}/lib/drivers/oskittcp/include) -add_definitions(-DNDIS40) -add_definitions(-D_NTDRIVER_) +add_definitions( + -DNDIS40 + -D_NTDRIVER_) spec2def(tdi.sys misc/tdi.spec) @@ -21,11 +23,6 @@ add_library(tdi SHARED ${SOURCE}) set_module_type(tdi kernelmodedriver) +add_importlibs(tdi ntoskrnl hal) -target_link_libraries(tdi - -lntoskrnl - -lhal) - -add_dependencies(tdi psdk bugcodes buildno_header) - -add_cab_target(tdi 2) +add_cab_target(tdi 2) Modified: branches/cmake-bringup/drivers/parallel/parallel/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/parallel/… ============================================================================== --- branches/cmake-bringup/drivers/parallel/parallel/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/parallel/parallel/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:06:20 2010 @@ -1,7 +1,5 @@ add_library(parallel SHARED parallel.c parallel.rc) -set_target_properties(parallel PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") - +set_module_type(parallel kernelmodedriver) add_importlibs(parallel ntoskrnl hal) -add_dependencies(parallel psdk bugcodes) Modified: branches/cmake-bringup/drivers/serial/serenum/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/serial/se… ============================================================================== --- branches/cmake-bringup/drivers/serial/serenum/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/serial/serenum/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:06:20 2010 @@ -7,8 +7,7 @@ serenum.c serenum.rc) -set_target_properties(serenum PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") +set_module_type(serenum kernelmodedriver) +add_importlibs(serenum ntoskrnl hal) -add_importlibs(serenum ntoskrnl hal) -add_dependencies(serenum psdk bugcodes) -add_cab_target(serenum 2) +add_cab_target(serenum 2) Modified: branches/cmake-bringup/drivers/serial/serial/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/serial/se… ============================================================================== --- branches/cmake-bringup/drivers/serial/serial/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/serial/serial/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:06:20 2010 @@ -14,8 +14,7 @@ serial.c serial.rc) -set_target_properties(serial PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") +set_module_type(serial kernelmodedriver) +add_importlibs(serial ntoskrnl hal) -add_importlibs(serial ntoskrnl hal) -add_dependencies(serial psdk bugcodes) -add_cab_target(serial 2) +add_cab_target(serial 2) Modified: branches/cmake-bringup/drivers/setup/blue/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/setup/blu… ============================================================================== --- branches/cmake-bringup/drivers/setup/blue/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/setup/blue/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:06:20 2010 @@ -1,16 +1,10 @@ - - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/drivers) add_library(blue SHARED blue.c font.c blue.rc) -set_target_properties(blue PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") +set_module_type(blue kernelmodedriver) +add_importlibs(blue ntoskrnl hal) -target_link_libraries(blue - -lntoskrnl - -lhal) - -add_dependencies(blue psdk bugcodes) add_minicd_target(blue reactos blue.sys) -add_cab_target(blue 2) +add_cab_target(blue 2) Modified: branches/cmake-bringup/drivers/storage/ide/uniata/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/i… ============================================================================== --- branches/cmake-bringup/drivers/storage/ide/uniata/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/ide/uniata/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:06:20 2010 @@ -15,7 +15,6 @@ ros_glue/ros_glue.cpp) set_module_type(uniata kernelmodedriver) - add_importlibs(uniata scsiport ntoskrnl hal) add_minicd_target(uniata reactos uniata.sys)

13 years, 11 months

[akhaldi] 49468: [CMAKE] - Improve base and bus drivers.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Nov 4 20:46:27 2010 New Revision: 49468 URL: http://svn.reactos.org/svn/reactos?rev=49468&view=rev Log: [CMAKE] - Improve base and bus drivers. Modified: branches/cmake-bringup/drivers/base/beep/CMakeLists.txt branches/cmake-bringup/drivers/base/bootvid/CMakeLists.txt branches/cmake-bringup/drivers/base/kdcom/CMakeLists.txt branches/cmake-bringup/drivers/base/kddll/CMakeLists.txt branches/cmake-bringup/drivers/base/nmidebug/CMakeLists.txt branches/cmake-bringup/drivers/base/null/CMakeLists.txt branches/cmake-bringup/drivers/battery/battc/CMakeLists.txt branches/cmake-bringup/drivers/bus/acpi/CMakeLists.txt branches/cmake-bringup/drivers/bus/acpi/cmbatt/CMakeLists.txt branches/cmake-bringup/drivers/bus/acpi/compbatt/CMakeLists.txt branches/cmake-bringup/drivers/bus/isapnp/CMakeLists.txt Modified: branches/cmake-bringup/drivers/base/beep/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/base/beep… ============================================================================== --- branches/cmake-bringup/drivers/base/beep/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/base/beep/CMakeLists.txt [iso-8859-1] Thu Nov 4 20:46:27 2010 @@ -1,13 +1,5 @@ - - add_library(beep SHARED beep.c beep.rc) - -set_target_properties(beep PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols" SUFFIX ".sys") - -target_link_libraries(beep - -lntoskrnl - -lhal) - -add_dependencies(beep psdk bugcodes) -add_cab_target(beep 2) +set_module_type(beep kernelmodedriver) +add_importlibs(beep ntoskrnl hal) +add_cab_target(beep 2) Modified: branches/cmake-bringup/drivers/base/bootvid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/base/boot… ============================================================================== --- branches/cmake-bringup/drivers/base/bootvid/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/base/bootvid/CMakeLists.txt [iso-8859-1] Thu Nov 4 20:46:27 2010 @@ -18,12 +18,11 @@ add_library(bootvid SHARED ${CMAKE_CURRENT_BINARY_DIR}/bootvid_precomp.h.gch ${SOURCE}) -set_target_properties(bootvid PROPERTIES LINK_FLAGS "-Wl,-entry,0 -Wl,--image-base,0x00010000") +set_entrypoint(bootvid 0) +set_subsystem(bootvid native) +set_image_base(bootvid 0x00010000) -target_link_libraries(bootvid - -lntoskrnl - -lhal) - +add_importlibs(bootvid ntoskrnl hal) add_pch(bootvid ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) add_dependencies(bootvid psdk buildno_header bugcodes) add_minicd_target(bootvid reactos bootvid.dll) Modified: branches/cmake-bringup/drivers/base/kdcom/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/base/kdco… ============================================================================== --- branches/cmake-bringup/drivers/base/kdcom/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/base/kdcom/CMakeLists.txt [iso-8859-1] Thu Nov 4 20:46:27 2010 @@ -12,12 +12,12 @@ add_library(kdcom SHARED ${SOURCE}) -set_target_properties(kdcom PROPERTIES LINK_FLAGS "-Wl,-entry,0 -Wl,--image-base,0x00010000") +set_entrypoint(kdcom 0) +set_subsystem(kdcom native) +set_image_base(kdcom 0x00010000) -target_link_libraries(kdcom - -lntoskrnl - -lhal) +add_importlibs(kdcom ntoskrnl hal) add_dependencies(kdcom psdk buildno_header bugcodes) add_minicd_target(kdcom reactos kdcom.dll) -add_livecd_target(kdcom reactos/system32) +add_livecd_target(kdcom reactos/system32) Modified: branches/cmake-bringup/drivers/base/kddll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/base/kddl… ============================================================================== --- branches/cmake-bringup/drivers/base/kddll/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/base/kddll/CMakeLists.txt [iso-8859-1] Thu Nov 4 20:46:27 2010 @@ -7,10 +7,10 @@ kdserial.c ${CMAKE_CURRENT_BINARY_DIR}/kdcom.def) -set_target_properties(kdcom PROPERTIES LINK_FLAGS "-Wl,-entry,0 -Wl,--image-base,0x00010000") +set_entrypoint(kdcom 0) +set_subsystem(kdcom native) +set_image_base(kdcom 0x00010000) -target_link_libraries(kdcom - -lntoskrnl - -lhal) +add_importlibs(kdcom ntoskrnl hal) add_dependencies(kdcom psdk buildno_header bugcodes) Modified: branches/cmake-bringup/drivers/base/nmidebug/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/base/nmid… ============================================================================== --- branches/cmake-bringup/drivers/base/nmidebug/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/base/nmidebug/CMakeLists.txt [iso-8859-1] Thu Nov 4 20:46:27 2010 @@ -1,14 +1,8 @@ - - add_library(nmidebug SHARED nmidebug.c nmidebug.rc) -set_target_properties(nmidebug PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols" SUFFIX ".sys") +set_module_type(nmidebug kernelmodedriver) +add_importlibs(nmidebug ntoskrnl hal) -target_link_libraries(nmidebug - -lntoskrnl - -lhal) - -add_dependencies(nmidebug psdk bugcodes) add_minicd_target(nmidebug reactos) add_cab_target(nmidebug 2) Modified: branches/cmake-bringup/drivers/base/null/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/base/null… ============================================================================== --- branches/cmake-bringup/drivers/base/null/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/base/null/CMakeLists.txt [iso-8859-1] Thu Nov 4 20:46:27 2010 @@ -1,14 +1,9 @@ - - add_library(null SHARED null.c null.rc) -set_target_properties(null PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols" SUFFIX ".sys") +target_link_libraries(null ${PSEH_LIB}) -target_link_libraries(null - ${PSEH_LIB} - -lntoskrnl - -lhal) +set_module_type(null kernelmodedriver) +add_importlibs(null ntoskrnl hal) -add_dependencies(null psdk bugcodes) -add_cab_target(null 2) +add_cab_target(null 2) Modified: branches/cmake-bringup/drivers/battery/battc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/battery/b… ============================================================================== --- branches/cmake-bringup/drivers/battery/battc/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/battery/battc/CMakeLists.txt [iso-8859-1] Thu Nov 4 20:46:27 2010 @@ -1,14 +1,7 @@ - - add_definitions(-D_BATTERYCLASS_) add_library(battc SHARED battc.c battc.rc) -set_target_properties(battc PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") - -target_link_libraries(battc - -lntoskrnl - -lhal) - -add_dependencies(battc psdk bugcodes) +set_module_type(battc kernelmodedriver) +add_importlibs(battc ntoskrnl hal) Modified: branches/cmake-bringup/drivers/bus/acpi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/acpi/… ============================================================================== --- branches/cmake-bringup/drivers/bus/acpi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/bus/acpi/CMakeLists.txt [iso-8859-1] Thu Nov 4 20:46:27 2010 @@ -1,6 +1,7 @@ -include_directories(include) -include_directories(acpica/include) +include_directories( + include + acpica/include) add_library(acpica acpica/dispatcher/dsfield.c @@ -137,14 +138,13 @@ buspdo.c main.c) -set_target_properties(acpi PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") +set_module_type(acpi kernelmodedriver) target_link_libraries(acpi wdmguid acpica) add_importlibs(acpi ntoskrnl hal) -add_dependencies(acpi psdk bugcodes) add_minicd_target(acpi reactos acpi.sys) add_livecd_target(acpi reactos/system32/drivers) Modified: branches/cmake-bringup/drivers/bus/acpi/cmbatt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/acpi/… ============================================================================== --- branches/cmake-bringup/drivers/bus/acpi/cmbatt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/bus/acpi/cmbatt/CMakeLists.txt [iso-8859-1] Thu Nov 4 20:46:27 2010 @@ -8,9 +8,7 @@ add_library(cmbatt SHARED ${CMAKE_CURRENT_BINARY_DIR}/cmbatt_cmbatt.h.gch ${SOURCE}) -set_target_properties(cmbatt PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") - +set_module_type(cmbatt kernelmodedriver) add_importlibs(cmbatt ntoskrnl hal battc wmilib) add_pch(cmbatt ${CMAKE_CURRENT_SOURCE_DIR}/cmbatt.h ${SOURCE}) -add_dependencies(cmbatt psdk bugcodes) Modified: branches/cmake-bringup/drivers/bus/acpi/compbatt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/acpi/… ============================================================================== --- branches/cmake-bringup/drivers/bus/acpi/compbatt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/bus/acpi/compbatt/CMakeLists.txt [iso-8859-1] Thu Nov 4 20:46:27 2010 @@ -7,8 +7,7 @@ add_library(compbatt SHARED ${CMAKE_CURRENT_BINARY_DIR}/compbatt_compbatt.h.gch ${SOURCE}) -set_target_properties(compbatt PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") +set_module_type(compbatt kernelmodedriver) +add_importlibs(compbatt ntoskrnl hal battc) -add_importlibs(compbatt ntoskrnl hal battc) add_pch(compbatt ${CMAKE_CURRENT_SOURCE_DIR}/compbatt.h ${SOURCE}) -add_dependencies(compbatt psdk bugcodes) Modified: branches/cmake-bringup/drivers/bus/isapnp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/isapn… ============================================================================== --- branches/cmake-bringup/drivers/bus/isapnp/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/bus/isapnp/CMakeLists.txt [iso-8859-1] Thu Nov 4 20:46:27 2010 @@ -6,9 +6,8 @@ hardware.c isapnp.rc) -set_target_properties(isapnp PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") +set_module_type(isapnp kernelmodedriver) +add_importlibs(isapnp ntoskrnl hal) -add_importlibs(isapnp ntoskrnl hal) -add_dependencies(isapnp psdk bugcodes buildno_header) add_minicd_target(isapnp reactos isapnp.sys) -add_livecd_target(isapnp reactos/system32/drivers) +add_livecd_target(isapnp reactos/system32/drivers)

13 years, 11 months

← Newer
1
...
38
39
40
41
42
43
44
...
50
Older →

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 November 2010