Ros-diffs

ros-diffs@reactos.org

81390 discussions

[spetreolle] 49480: [CMAKE] Add keyboards to bootcd.
by spetreolle＠svn.reactos.org 05 Nov '10

05 Nov '10

Author: spetreolle Date: Fri Nov 5 12:08:37 2010 New Revision: 49480 URL: http://svn.reactos.org/svn/reactos?rev=49480&view=rev Log: [CMAKE] Add keyboards to bootcd. Modified: branches/cmake-bringup/dll/keyboard/kbda1/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbda2/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbda3/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdal/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdarme/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdarmw/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdaze/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdazel/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdbe/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdbga/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdbgm/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdbgt/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdblr/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdbr/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdbur/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdcan/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdcr/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdcz/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdcz1/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdda/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbddv/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdes/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdest/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdfc/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdfi/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdgeo/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdgerg/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdgneo/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdgr/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdgrist/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdhe/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdheb/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdhu/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdic/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdinasa/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdinben/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdindev/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdinguj/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdinmal/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdir/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdit/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdja/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdkaz/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdko/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdla/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdlt1/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdlv/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdmac/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdne/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdno/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdpl1/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdpo/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdro/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdru/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdru1/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdsg/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdsk/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdsk1/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdsw/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdtat/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdth0/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdth1/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdth2/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdth3/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdtuf/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdtuq/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbduk/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdur/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdurs/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdus/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdusa/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdusl/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdusr/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdusx/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbduzb/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdvntc/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdycc/CMakeLists.txt branches/cmake-bringup/dll/keyboard/kbdycl/CMakeLists.txt Modified: branches/cmake-bringup/dll/keyboard/kbda1/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbda… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbda1/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbda1/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -8,3 +8,5 @@ set_entrypoint(kbda1 0) add_dependencies(kbda1 psdk buildno_header) + +add_cab_target(kbda1 1) Modified: branches/cmake-bringup/dll/keyboard/kbda2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbda… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbda2/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbda2/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -8,3 +8,5 @@ set_entrypoint(kbda2 0) add_dependencies(kbda2 psdk buildno_header) + +add_cab_target(kbda2 1) Modified: branches/cmake-bringup/dll/keyboard/kbda3/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbda… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbda3/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbda3/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -8,3 +8,5 @@ set_entrypoint(kbda3 0) add_dependencies(kbda3 psdk buildno_header) + +add_cab_target(kbda3 1) Modified: branches/cmake-bringup/dll/keyboard/kbdal/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbda… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdal/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdal/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -8,3 +8,5 @@ set_entrypoint(kbdal 0) add_dependencies(kbdal psdk buildno_header) + +add_cab_target(kbdal 1) Modified: branches/cmake-bringup/dll/keyboard/kbdarme/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbda… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdarme/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdarme/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -8,3 +8,5 @@ set_entrypoint(kbdarme 0) add_dependencies(kbdarme psdk buildno_header) + +add_cab_target(kbdarme 1) Modified: branches/cmake-bringup/dll/keyboard/kbdarmw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbda… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdarmw/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdarmw/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -8,3 +8,5 @@ set_entrypoint(kbdarmw 0) add_dependencies(kbdarmw psdk buildno_header) + +add_cab_target(kbdarmw 1) Modified: branches/cmake-bringup/dll/keyboard/kbdaze/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbda… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdaze/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdaze/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -8,3 +8,5 @@ set_entrypoint(kbdaze 0) add_dependencies(kbdaze psdk buildno_header) + +add_cab_target(kbdaze 1) Modified: branches/cmake-bringup/dll/keyboard/kbdazel/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbda… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdazel/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdazel/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -8,3 +8,5 @@ set_entrypoint(kbdazel 0) add_dependencies(kbdazel psdk buildno_header) + +add_cab_target(kbdazel 1) Modified: branches/cmake-bringup/dll/keyboard/kbdbe/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdb… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdbe/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdbe/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -8,3 +8,5 @@ set_entrypoint(kbdbe 0) add_dependencies(kbdbe psdk buildno_header) + +add_cab_target(kbdbe 1) Modified: branches/cmake-bringup/dll/keyboard/kbdbga/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdb… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdbga/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdbga/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -8,3 +8,5 @@ set_entrypoint(kbdbga 0) add_dependencies(kbdbga psdk buildno_header) + +add_cab_target(kbdbga 1) Modified: branches/cmake-bringup/dll/keyboard/kbdbgm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdb… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdbgm/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdbgm/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -8,3 +8,5 @@ set_entrypoint(kbdbgm 0) add_dependencies(kbdbgm psdk buildno_header) + +add_cab_target(kbdbgm 1) Modified: branches/cmake-bringup/dll/keyboard/kbdbgt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdb… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdbgt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdbgt/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -8,3 +8,5 @@ set_entrypoint(kbdbgt 0) add_dependencies(kbdbgt psdk buildno_header) + +add_cab_target(kbdbgt 1) Modified: branches/cmake-bringup/dll/keyboard/kbdblr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdb… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdblr/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdblr/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -7,6 +7,6 @@ set_entrypoint(kbdblr 0) +add_dependencies(kbdblr psdk buildno_header) - -add_dependencies(kbdblr psdk buildno_header) +add_cab_target(kbdblr 1) Modified: branches/cmake-bringup/dll/keyboard/kbdbr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdb… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdbr/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdbr/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -8,3 +8,5 @@ set_entrypoint(kbdbr 0) add_dependencies(kbdbr psdk buildno_header) + +add_cab_target(kbdbr 1) Modified: branches/cmake-bringup/dll/keyboard/kbdbur/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdb… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdbur/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdbur/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -7,6 +7,6 @@ set_entrypoint(kbdbur 0) +add_dependencies(kbdbur psdk buildno_header) - -add_dependencies(kbdbur psdk buildno_header) +add_cab_target(kbdbur 1) Modified: branches/cmake-bringup/dll/keyboard/kbdcan/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdc… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdcan/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdcan/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -7,6 +7,6 @@ set_entrypoint(kbdcan 0) +add_dependencies(kbdcan psdk buildno_header) - -add_dependencies(kbdcan psdk buildno_header) +add_cab_target(kbdcan 1) Modified: branches/cmake-bringup/dll/keyboard/kbdcr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdc… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdcr/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdcr/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -7,6 +7,6 @@ set_entrypoint(kbdcr 0) +add_dependencies(kbdcr psdk buildno_header) - -add_dependencies(kbdcr psdk buildno_header) +add_cab_target(kbdcr 1) Modified: branches/cmake-bringup/dll/keyboard/kbdcz/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdc… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdcz/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdcz/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -7,6 +7,6 @@ set_entrypoint(kbdcz 0) +add_dependencies(kbdcz psdk buildno_header) - -add_dependencies(kbdcz psdk buildno_header) +add_cab_target(kbdcz 1) Modified: branches/cmake-bringup/dll/keyboard/kbdcz1/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdc… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdcz1/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdcz1/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -7,6 +7,6 @@ set_entrypoint(kbdcz1 0) +add_dependencies(kbdcz1 psdk buildno_header) - -add_dependencies(kbdcz1 psdk buildno_header) +add_cab_target(kbdcz1 1) Modified: branches/cmake-bringup/dll/keyboard/kbdda/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdd… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdda/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdda/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -7,6 +7,6 @@ set_entrypoint(kbdda 0) +add_dependencies(kbdda psdk buildno_header) - -add_dependencies(kbdda psdk buildno_header) +add_cab_target(kbdda 1) Modified: branches/cmake-bringup/dll/keyboard/kbddv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdd… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbddv/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbddv/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -7,6 +7,6 @@ set_entrypoint(kbddv 0) +add_dependencies(kbddv psdk buildno_header) - -add_dependencies(kbddv psdk buildno_header) +add_cab_target(kbddv 1) Modified: branches/cmake-bringup/dll/keyboard/kbdes/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbde… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdes/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdes/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -7,6 +7,6 @@ set_entrypoint(kbdes 0) +add_dependencies(kbdes psdk buildno_header) - -add_dependencies(kbdes psdk buildno_header) +add_cab_target(kbdes 1) Modified: branches/cmake-bringup/dll/keyboard/kbdest/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbde… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdest/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdest/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -7,6 +7,6 @@ set_entrypoint(kbdest 0) +add_dependencies(kbdest psdk buildno_header) - -add_dependencies(kbdest psdk buildno_header) +add_cab_target(kbdest 1) Modified: branches/cmake-bringup/dll/keyboard/kbdfc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdf… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdfc/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdfc/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -7,6 +7,6 @@ set_entrypoint(kbdfc 0) +add_dependencies(kbdfc psdk buildno_header) - -add_dependencies(kbdfc psdk buildno_header) +add_cab_target(kbdfc 1) Modified: branches/cmake-bringup/dll/keyboard/kbdfi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdf… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdfi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdfi/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -7,6 +7,6 @@ set_entrypoint(kbdfi 0) +add_dependencies(kbdfi psdk buildno_header) - -add_dependencies(kbdfi psdk buildno_header) +add_cab_target(kbdfi 1) Modified: branches/cmake-bringup/dll/keyboard/kbdgeo/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdg… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdgeo/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdgeo/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -7,6 +7,6 @@ set_entrypoint(kbdgeo 0) +add_dependencies(kbdgeo psdk buildno_header) - -add_dependencies(kbdgeo psdk buildno_header) +add_cab_target(kbdgeo 1) Modified: branches/cmake-bringup/dll/keyboard/kbdgerg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdg… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdgerg/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdgerg/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -7,6 +7,6 @@ set_entrypoint(kbdgerg 0) +add_dependencies(kbdgerg psdk buildno_header) - -add_dependencies(kbdgerg psdk buildno_header) +add_cab_target(kbdgerg 1) Modified: branches/cmake-bringup/dll/keyboard/kbdgneo/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdg… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdgneo/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdgneo/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -7,6 +7,6 @@ set_entrypoint(kbdgneo 0) +add_dependencies(kbdgneo psdk buildno_header) - -add_dependencies(kbdgneo psdk buildno_header) +add_cab_target(kbdgneo 1) Modified: branches/cmake-bringup/dll/keyboard/kbdgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdg… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdgr/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdgr/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -7,6 +7,6 @@ set_entrypoint(kbdgr 0) +add_dependencies(kbdgr psdk buildno_header) - -add_dependencies(kbdgr psdk buildno_header) +add_cab_target(kbdgr 1) Modified: branches/cmake-bringup/dll/keyboard/kbdgrist/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdg… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdgrist/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdgrist/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -7,6 +7,6 @@ set_entrypoint(kbdgrist 0) +add_dependencies(kbdgrist psdk buildno_header) - -add_dependencies(kbdgrist psdk buildno_header) +add_cab_target(kbdgrist 1) Modified: branches/cmake-bringup/dll/keyboard/kbdhe/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdh… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdhe/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdhe/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -7,6 +7,6 @@ set_entrypoint(kbdhe 0) +add_dependencies(kbdhe psdk buildno_header) - -add_dependencies(kbdhe psdk buildno_header) +add_cab_target(kbdhe 1) Modified: branches/cmake-bringup/dll/keyboard/kbdheb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdh… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdheb/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdheb/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -7,6 +7,6 @@ set_entrypoint(kbdheb 0) +add_dependencies(kbdheb psdk buildno_header) - -add_dependencies(kbdheb psdk buildno_header) +add_cab_target(kbdheb 1) Modified: branches/cmake-bringup/dll/keyboard/kbdhu/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdh… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdhu/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdhu/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -7,6 +7,6 @@ set_entrypoint(kbdhu 0) +add_dependencies(kbdhu psdk buildno_header) - -add_dependencies(kbdhu psdk buildno_header) +add_cab_target(kbdhu 1) Modified: branches/cmake-bringup/dll/keyboard/kbdic/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdi… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdic/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdic/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -7,6 +7,6 @@ set_entrypoint(kbdic 0) +add_dependencies(kbdic psdk buildno_header) - -add_dependencies(kbdic psdk buildno_header) +add_cab_target(kbdic 1) Modified: branches/cmake-bringup/dll/keyboard/kbdinasa/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdi… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdinasa/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdinasa/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -7,6 +7,6 @@ set_entrypoint(kbdinasa 0) +add_dependencies(kbdinasa psdk buildno_header) - -add_dependencies(kbdinasa psdk buildno_header) +add_cab_target(kbdinasa 1) Modified: branches/cmake-bringup/dll/keyboard/kbdinben/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdi… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdinben/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdinben/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -7,6 +7,6 @@ set_entrypoint(kbdinben 0) +add_dependencies(kbdinben psdk buildno_header) - -add_dependencies(kbdinben psdk buildno_header) +add_cab_target(kbdinben 1) Modified: branches/cmake-bringup/dll/keyboard/kbdindev/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdi… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdindev/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdindev/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -7,6 +7,6 @@ set_entrypoint(kbdindev 0) +add_dependencies(kbdindev psdk buildno_header) - -add_dependencies(kbdindev psdk buildno_header) +add_cab_target(kbdindev 1) Modified: branches/cmake-bringup/dll/keyboard/kbdinguj/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdi… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdinguj/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdinguj/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -7,6 +7,6 @@ set_entrypoint(kbdinguj 0) +add_dependencies(kbdinguj psdk buildno_header) - -add_dependencies(kbdinguj psdk buildno_header) +add_cab_target(kbdinguj 1) Modified: branches/cmake-bringup/dll/keyboard/kbdinmal/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdi… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdinmal/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdinmal/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -7,6 +7,6 @@ set_entrypoint(kbdinmal 0) +add_dependencies(kbdinmal psdk buildno_header) - -add_dependencies(kbdinmal psdk buildno_header) +add_cab_target(kbdinmal 1) Modified: branches/cmake-bringup/dll/keyboard/kbdir/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdi… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdir/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdir/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -7,6 +7,6 @@ set_entrypoint(kbdir 0) +add_dependencies(kbdir psdk buildno_header) - -add_dependencies(kbdir psdk buildno_header) +add_cab_target(kbdir 1) Modified: branches/cmake-bringup/dll/keyboard/kbdit/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdi… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdit/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdit/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -7,6 +7,6 @@ set_entrypoint(kbdit 0) +add_dependencies(kbdit psdk buildno_header) - -add_dependencies(kbdit psdk buildno_header) +add_cab_target(kbdit 1) Modified: branches/cmake-bringup/dll/keyboard/kbdja/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdj… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdja/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdja/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -7,6 +7,6 @@ set_entrypoint(kbdja 0) +add_dependencies(kbdja psdk buildno_header) - -add_dependencies(kbdja psdk buildno_header) +add_cab_target(kbdja 1) Modified: branches/cmake-bringup/dll/keyboard/kbdkaz/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdk… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdkaz/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdkaz/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -7,6 +7,6 @@ set_entrypoint(kbdkaz 0) +add_dependencies(kbdkaz psdk buildno_header) - -add_dependencies(kbdkaz psdk buildno_header) +add_cab_target(kbdkaz 1) Modified: branches/cmake-bringup/dll/keyboard/kbdko/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdk… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdko/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdko/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -7,6 +7,6 @@ set_entrypoint(kbdko 0) +add_dependencies(kbdko psdk buildno_header) - -add_dependencies(kbdko psdk buildno_header) +add_cab_target(kbdko 1) Modified: branches/cmake-bringup/dll/keyboard/kbdla/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdl… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdla/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdla/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -7,6 +7,6 @@ set_entrypoint(kbdla 0) +add_dependencies(kbdla psdk buildno_header) - -add_dependencies(kbdla psdk buildno_header) +add_cab_target(kbdla 1) Modified: branches/cmake-bringup/dll/keyboard/kbdlt1/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdl… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdlt1/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdlt1/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -7,6 +7,6 @@ set_entrypoint(kbdlt1 0) +add_dependencies(kbdlt1 psdk buildno_header) - -add_dependencies(kbdlt1 psdk buildno_header) +add_cab_target(kbdlt1 1) Modified: branches/cmake-bringup/dll/keyboard/kbdlv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdl… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdlv/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdlv/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -7,6 +7,6 @@ set_entrypoint(kbdlv 0) +add_dependencies(kbdlv psdk buildno_header) - -add_dependencies(kbdlv psdk buildno_header) +add_cab_target(kbdlv 1) Modified: branches/cmake-bringup/dll/keyboard/kbdmac/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdm… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdmac/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdmac/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -7,6 +7,6 @@ set_entrypoint(kbdmac 0) +add_dependencies(kbdmac psdk buildno_header) - -add_dependencies(kbdmac psdk buildno_header) +add_cab_target(kbdmac 1) Modified: branches/cmake-bringup/dll/keyboard/kbdne/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdn… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdne/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdne/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -7,6 +7,6 @@ set_entrypoint(kbdne 0) +add_dependencies(kbdne psdk buildno_header) - -add_dependencies(kbdne psdk buildno_header) +add_cab_target(kbdne 1) Modified: branches/cmake-bringup/dll/keyboard/kbdno/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdn… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdno/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdno/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -7,6 +7,6 @@ set_entrypoint(kbdno 0) +add_dependencies(kbdno psdk buildno_header) - -add_dependencies(kbdno psdk buildno_header) +add_cab_target(kbdno 1) Modified: branches/cmake-bringup/dll/keyboard/kbdpl1/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdp… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdpl1/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdpl1/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -7,6 +7,6 @@ set_entrypoint(kbdpl1 0) +add_dependencies(kbdpl1 psdk buildno_header) - -add_dependencies(kbdpl1 psdk buildno_header) +add_cab_target(kbdpl1 1) Modified: branches/cmake-bringup/dll/keyboard/kbdpo/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdp… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdpo/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdpo/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -7,6 +7,6 @@ set_entrypoint(kbdpo 0) +add_dependencies(kbdpo psdk buildno_header) - -add_dependencies(kbdpo psdk buildno_header) +add_cab_target(kbdpo 1) Modified: branches/cmake-bringup/dll/keyboard/kbdro/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdr… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdro/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdro/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -7,6 +7,6 @@ set_entrypoint(kbdro 0) +add_dependencies(kbdro psdk buildno_header) - -add_dependencies(kbdro psdk buildno_header) +add_cab_target(kbdro 1) Modified: branches/cmake-bringup/dll/keyboard/kbdru/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdr… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdru/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdru/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -7,6 +7,6 @@ set_entrypoint(kbdru 0) +add_dependencies(kbdru psdk buildno_header) - -add_dependencies(kbdru psdk buildno_header) +add_cab_target(kbdru 1) Modified: branches/cmake-bringup/dll/keyboard/kbdru1/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdr… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdru1/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdru1/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -7,6 +7,6 @@ set_entrypoint(kbdru1 0) +add_dependencies(kbdru1 psdk buildno_header) - -add_dependencies(kbdru1 psdk buildno_header) +add_cab_target(kbdru1 1) Modified: branches/cmake-bringup/dll/keyboard/kbdsg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbds… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdsg/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdsg/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -7,6 +7,6 @@ set_entrypoint(kbdsg 0) +add_dependencies(kbdsg psdk buildno_header) - -add_dependencies(kbdsg psdk buildno_header) +add_cab_target(kbdsg 1) Modified: branches/cmake-bringup/dll/keyboard/kbdsk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbds… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdsk/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdsk/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -7,6 +7,6 @@ set_entrypoint(kbdsk 0) +add_dependencies(kbdsk psdk buildno_header) - -add_dependencies(kbdsk psdk buildno_header) +add_cab_target(kbdsk 1) Modified: branches/cmake-bringup/dll/keyboard/kbdsk1/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbds… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdsk1/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdsk1/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -7,6 +7,6 @@ set_entrypoint(kbdsk1 0) +add_dependencies(kbdsk1 psdk buildno_header) - -add_dependencies(kbdsk1 psdk buildno_header) +add_cab_target(kbdsk1 1) Modified: branches/cmake-bringup/dll/keyboard/kbdsw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbds… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdsw/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdsw/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -7,6 +7,6 @@ set_entrypoint(kbdsw 0) +add_dependencies(kbdsw psdk buildno_header) - -add_dependencies(kbdsw psdk buildno_header) +add_cab_target(kbdsw 1) Modified: branches/cmake-bringup/dll/keyboard/kbdtat/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdt… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdtat/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdtat/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -7,6 +7,6 @@ set_entrypoint(kbdtat 0) +add_dependencies(kbdtat psdk buildno_header) - -add_dependencies(kbdtat psdk buildno_header) +add_cab_target(kbdtat 1) Modified: branches/cmake-bringup/dll/keyboard/kbdth0/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdt… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdth0/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdth0/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -7,6 +7,6 @@ set_entrypoint(kbdth0 0) +add_dependencies(kbdth0 psdk buildno_header) - -add_dependencies(kbdth0 psdk buildno_header) +add_cab_target(kbdth0 1) Modified: branches/cmake-bringup/dll/keyboard/kbdth1/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdt… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdth1/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdth1/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -7,6 +7,6 @@ set_entrypoint(kbdth1 0) +add_dependencies(kbdth1 psdk buildno_header) - -add_dependencies(kbdth1 psdk buildno_header) +add_cab_target(kbdth1 1) Modified: branches/cmake-bringup/dll/keyboard/kbdth2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdt… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdth2/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdth2/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -7,6 +7,6 @@ set_entrypoint(kbdth2 0) +add_dependencies(kbdth2 psdk buildno_header) - -add_dependencies(kbdth2 psdk buildno_header) +add_cab_target(kbdth2 1) Modified: branches/cmake-bringup/dll/keyboard/kbdth3/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdt… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdth3/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdth3/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -7,6 +7,6 @@ set_entrypoint(kbdth3 0) +add_dependencies(kbdth3 psdk buildno_header) - -add_dependencies(kbdth3 psdk buildno_header) +add_cab_target(kbdth3 1) Modified: branches/cmake-bringup/dll/keyboard/kbdtuf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdt… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdtuf/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdtuf/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -7,6 +7,6 @@ set_entrypoint(kbdtuf 0) +add_dependencies(kbdtuf psdk buildno_header) - -add_dependencies(kbdtuf psdk buildno_header) +add_cab_target(kbdtuf 1) Modified: branches/cmake-bringup/dll/keyboard/kbdtuq/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdt… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdtuq/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdtuq/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -7,6 +7,6 @@ set_entrypoint(kbdtuq 0) +add_dependencies(kbdtuq psdk buildno_header) - -add_dependencies(kbdtuq psdk buildno_header) +add_cab_target(kbdtuq 1) Modified: branches/cmake-bringup/dll/keyboard/kbduk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdu… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbduk/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbduk/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -7,6 +7,6 @@ set_entrypoint(kbduk 0) +add_dependencies(kbduk psdk buildno_header) - -add_dependencies(kbduk psdk buildno_header) +add_cab_target(kbduk 1) Modified: branches/cmake-bringup/dll/keyboard/kbdur/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdu… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdur/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdur/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -7,6 +7,6 @@ set_entrypoint(kbdur 0) +add_dependencies(kbdur psdk buildno_header) - -add_dependencies(kbdur psdk buildno_header) +add_cab_target(kbdur 1) Modified: branches/cmake-bringup/dll/keyboard/kbdurs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdu… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdurs/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdurs/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -7,6 +7,6 @@ set_entrypoint(kbdurs 0) +add_dependencies(kbdurs psdk buildno_header) - -add_dependencies(kbdurs psdk buildno_header) +add_cab_target(kbdurs 1) Modified: branches/cmake-bringup/dll/keyboard/kbdus/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdu… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdus/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdus/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -6,7 +6,6 @@ set_entrypoint(kbdus 0) +add_dependencies(kbdus psdk buildno_header) - -add_dependencies(kbdus psdk buildno_header) add_cab_target(kbdus 1) Modified: branches/cmake-bringup/dll/keyboard/kbdusa/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdu… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdusa/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdusa/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -7,6 +7,6 @@ set_entrypoint(kbdusa 0) +add_dependencies(kbdusa psdk buildno_header) - -add_dependencies(kbdusa psdk buildno_header) +add_cab_target(kbdusa 1) Modified: branches/cmake-bringup/dll/keyboard/kbdusl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdu… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdusl/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdusl/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -7,6 +7,6 @@ set_entrypoint(kbdusl 0) +add_dependencies(kbdusl psdk buildno_header) - -add_dependencies(kbdusl psdk buildno_header) +add_cab_target(kbdusl 1) Modified: branches/cmake-bringup/dll/keyboard/kbdusr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdu… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdusr/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdusr/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -7,6 +7,6 @@ set_entrypoint(kbdusr 0) +add_dependencies(kbdusr psdk buildno_header) - -add_dependencies(kbdusr psdk buildno_header) +add_cab_target(kbdusr 1) Modified: branches/cmake-bringup/dll/keyboard/kbdusx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdu… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdusx/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdusx/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -7,6 +7,6 @@ set_entrypoint(kbdusx 0) +add_dependencies(kbdusx psdk buildno_header) - -add_dependencies(kbdusx psdk buildno_header) +add_cab_target(kbdusx 1) Modified: branches/cmake-bringup/dll/keyboard/kbduzb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdu… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbduzb/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbduzb/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -7,6 +7,6 @@ set_entrypoint(kbduzb 0) +add_dependencies(kbduzb psdk buildno_header) - -add_dependencies(kbduzb psdk buildno_header) +add_cab_target(kbduzb 1) Modified: branches/cmake-bringup/dll/keyboard/kbdvntc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdv… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdvntc/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdvntc/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -8,3 +8,5 @@ set_entrypoint(kbdvntc 0) add_dependencies(kbdvntc psdk buildno_header) + +add_cab_target(kbdvntc 1) Modified: branches/cmake-bringup/dll/keyboard/kbdycc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdy… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdycc/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdycc/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -8,3 +8,5 @@ set_entrypoint(kbdycc 0) add_dependencies(kbdycc psdk buildno_header) + +add_cab_target(kbdycc 1) Modified: branches/cmake-bringup/dll/keyboard/kbdycl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdy… ============================================================================== --- branches/cmake-bringup/dll/keyboard/kbdycl/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/keyboard/kbdycl/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:08:37 2010 @@ -8,3 +8,5 @@ set_entrypoint(kbdycl 0) add_dependencies(kbdycl psdk buildno_header) + +add_cab_target(kbdycl 1)

1 0

[akhaldi] 49479: [CMAKE] - Improve most of the static libraries.
by akhaldi＠svn.reactos.org 05 Nov '10

05 Nov '10

Author: akhaldi Date: Fri Nov 5 12:02:12 2010 New Revision: 49479 URL: http://svn.reactos.org/svn/reactos?rev=49479&view=rev Log: [CMAKE] - Improve most of the static libraries. Modified: branches/cmake-bringup/lib/CMakeLists.txt branches/cmake-bringup/lib/epsapi/CMakeLists.txt branches/cmake-bringup/lib/fslib/ext2lib/CMakeLists.txt branches/cmake-bringup/lib/fslib/ntfslib/CMakeLists.txt branches/cmake-bringup/lib/fslib/vfatlib/CMakeLists.txt branches/cmake-bringup/lib/fslib/vfatxlib/CMakeLists.txt branches/cmake-bringup/lib/host/wcsfuncs/CMakeLists.txt branches/cmake-bringup/lib/lsalib/CMakeLists.txt branches/cmake-bringup/lib/nls/idna/CMakeLists.txt branches/cmake-bringup/lib/nls/normalize/CMakeLists.txt branches/cmake-bringup/lib/nls/scripts/CMakeLists.txt branches/cmake-bringup/lib/recyclebin/CMakeLists.txt branches/cmake-bringup/lib/rtl/CMakeLists.txt branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt branches/cmake-bringup/lib/sdk/delayimp/CMakeLists.txt branches/cmake-bringup/lib/sdk/dxguid/CMakeLists.txt branches/cmake-bringup/lib/sdk/ioevent/CMakeLists.txt branches/cmake-bringup/lib/sdk/scrnsave/CMakeLists.txt branches/cmake-bringup/lib/sdk/strmiids/CMakeLists.txt branches/cmake-bringup/lib/sdk/wdmguid/CMakeLists.txt branches/cmake-bringup/lib/tdilib/CMakeLists.txt Modified: branches/cmake-bringup/lib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/CMakeLists.tx… ============================================================================== --- branches/cmake-bringup/lib/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:02:12 2010 @@ -13,7 +13,7 @@ add_subdirectory(epsapi) add_subdirectory(fslib) add_subdirectory(lsalib) -add_subdirectory(nls) +#add_subdirectory(nls) add_subdirectory(ntdllsys) add_subdirectory(ppcmmu) add_subdirectory(pseh) Modified: branches/cmake-bringup/lib/epsapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/epsapi/CMakeL… ============================================================================== --- branches/cmake-bringup/lib/epsapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/epsapi/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:02:12 2010 @@ -1,4 +1,5 @@ -file(GLOB_RECURSE SOURCE "*.c") - -add_library(epsapi ${SOURCE}) +add_library(epsapi + enum/drivers.c + enum/modules.c + enum/processes.c) Modified: branches/cmake-bringup/lib/fslib/ext2lib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/fslib/ext2lib… ============================================================================== --- branches/cmake-bringup/lib/fslib/ext2lib/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/fslib/ext2lib/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:02:12 2010 @@ -1,4 +1,13 @@ -file(GLOB_RECURSE SOURCE "*.c") +list(APPEND SOURCE + Badblock.c + Bitmap.c + Disk.c + Group.c + Inode.c + Memory.c + Mke2fs.c + Super.c + Uuid.c) add_library(ext2lib ${SOURCE}) -add_dependencies(ext2lib psdk) +add_dependencies(ext2lib psdk) Modified: branches/cmake-bringup/lib/fslib/ntfslib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/fslib/ntfslib… ============================================================================== --- branches/cmake-bringup/lib/fslib/ntfslib/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/fslib/ntfslib/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:02:12 2010 @@ -1,3 +1,2 @@ -file(GLOB_RECURSE SOURCE "*.c") -add_library(ntfslib ${SOURCE}) +add_library(ntfslib ntfslib.c) Modified: branches/cmake-bringup/lib/fslib/vfatlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/fslib/vfatlib… ============================================================================== --- branches/cmake-bringup/lib/fslib/vfatlib/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/fslib/vfatlib/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:02:12 2010 @@ -1,4 +1,15 @@ -file(GLOB_RECURSE SOURCE "*.c") +list(APPEND SOURCE + check/boot.c + check/check.c + check/common.c + check/fat.c + check/file.c + check/io.c + check/lfn.c + fat12.c + fat16.c + fat32.c + vfatlib.c) add_library(vfatlib ${SOURCE}) add_dependencies(vfatlib psdk) Modified: branches/cmake-bringup/lib/fslib/vfatxlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/fslib/vfatxli… ============================================================================== --- branches/cmake-bringup/lib/fslib/vfatxlib/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/fslib/vfatxlib/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:02:12 2010 @@ -1,3 +1,2 @@ -file(GLOB_RECURSE SOURCE "*.c") -add_library(vfatxlib ${SOURCE}) +add_library(vfatxlib fatx.c vfatxlib.c) Modified: branches/cmake-bringup/lib/host/wcsfuncs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/host/wcsfuncs… ============================================================================== --- branches/cmake-bringup/lib/host/wcsfuncs/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/host/wcsfuncs/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:02:12 2010 @@ -1,4 +1,2 @@ -file(GLOB_RECURSE SOURCE "*.c") -add_library(host_wcsfuncs ${SOURCE}) - +add_library(host_wcsfuncs wcsfuncs.c) Modified: branches/cmake-bringup/lib/lsalib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/lsalib/CMakeL… ============================================================================== --- branches/cmake-bringup/lib/lsalib/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/lsalib/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:02:12 2010 @@ -1,5 +1,3 @@ + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys) - -file(GLOB_RECURSE SOURCE "*.c") - -add_library(lsalib ${SOURCE}) +add_library(lsalib lsa.c) Modified: branches/cmake-bringup/lib/nls/idna/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/nls/idna/CMak… ============================================================================== --- branches/cmake-bringup/lib/nls/idna/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/nls/idna/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:02:12 2010 @@ -5,6 +5,4 @@ remove_definitions(-DWINVER=0x502) # This removes a top-level definition: The compiler never gets it on the command-line add_definitions(-DWINVER=0x600) # And now we add our own -file(GLOB_RECURSE SOURCE "*.cpp") - -add_library(idna ${SOURCE}) +add_library(idna idna.cpp nameprep.cpp) Modified: branches/cmake-bringup/lib/nls/normalize/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/nls/normalize… ============================================================================== --- branches/cmake-bringup/lib/nls/normalize/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/nls/normalize/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:02:12 2010 @@ -5,6 +5,4 @@ remove_definitions(-DWINVER=0x502) # This removes a top-level definition: The compiler never gets it on the command-line add_definitions(-DWINVER=0x600) # And now we add our own -file(GLOB_RECURSE SOURCE "*.cpp") - -add_library(normalize ${SOURCE}) +add_library(normalize normalize.cpp) Modified: branches/cmake-bringup/lib/nls/scripts/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/nls/scripts/C… ============================================================================== --- branches/cmake-bringup/lib/nls/scripts/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/nls/scripts/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:02:12 2010 @@ -5,6 +5,4 @@ remove_definitions(-DWINVER=0x502) # This removes a top-level definition: The compiler never gets it on the command-line add_definitions(-DWINVER=0x600) # And now we add our own -file(GLOB_RECURSE SOURCE "*.cpp") - -add_library(scripts ${SOURCE}) +add_library(scripts scripts.cpp) Modified: branches/cmake-bringup/lib/recyclebin/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/recyclebin/CM… ============================================================================== --- branches/cmake-bringup/lib/recyclebin/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/recyclebin/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:02:12 2010 @@ -1,3 +1,10 @@ -file(GLOB_RECURSE SOURCE "*.c") +list(APPEND SOURCE + guid.c + recyclebin.c + recyclebin_generic.c + recyclebin_generic_enumerator.c + recyclebin_v5.c + recyclebin_v5_enumerator.c) + add_library(recyclebin ${SOURCE}) Modified: branches/cmake-bringup/lib/rtl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rtl/CMakeList… ============================================================================== --- branches/cmake-bringup/lib/rtl/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rtl/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:02:12 2010 @@ -1,8 +1,9 @@ -add_definitions(-D_NTOSKRNL_) -add_definitions(-DNO_RTL_INLINES) -add_definitions(-D_NTSYSTEM_) -add_definitions(-D_NTDLLBUILD_) +add_definitions( + -D_NTOSKRNL_ + -DNO_RTL_INLINES + -D_NTSYSTEM_ + -D_NTDLLBUILD_) list(APPEND SOURCE access.c @@ -97,6 +98,6 @@ powerpc/thread.c) endif(ARCH MATCHES i386) -add_library(rtl ${SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/rtl_rtl.h.gch) +add_library(rtl ${CMAKE_CURRENT_BINARY_DIR}/rtl_rtl.h.gch ${SOURCE}) add_pch(rtl ${CMAKE_CURRENT_SOURCE_DIR}/rtl.h ${SOURCE}) add_dependencies(rtl psdk) Modified: branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/CMake… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:02:12 2010 @@ -410,7 +410,7 @@ math/amd64/tan.S) endif(ARCH MATCHES amd64) -add_library(crt ${CRT_SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/crt_precomp.h.gch) +add_library(crt ${CMAKE_CURRENT_BINARY_DIR}/crt_precomp.h.gch ${CRT_SOURCE}) set_property(TARGET crt PROPERTY COMPILE_DEFINITIONS __MINGW_IMPORT=extern USE_MSVCRT_PREFIX _MSVCRT_LIB_ _MSVCRT_ _MT) add_pch(crt ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${CRT_SOURCE}) Modified: branches/cmake-bringup/lib/sdk/delayimp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/delayimp/… ============================================================================== --- branches/cmake-bringup/lib/sdk/delayimp/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/delayimp/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:02:12 2010 @@ -1,4 +1,3 @@ add_definitions(-DUNICODE -D_UNICODE) -file(GLOB_RECURSE SOURCE "*.c") -add_library(delayimp ${SOURCE}) +add_library(delayimp delayimp.c) Modified: branches/cmake-bringup/lib/sdk/dxguid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/dxguid/CM… ============================================================================== --- branches/cmake-bringup/lib/sdk/dxguid/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/dxguid/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:02:12 2010 @@ -1,3 +1,2 @@ -file(GLOB_RECURSE SOURCE "*.c") -add_library(dxguid ${SOURCE}) +add_library(dxguid dxguid-mingw.c) Modified: branches/cmake-bringup/lib/sdk/ioevent/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/ioevent/C… ============================================================================== --- branches/cmake-bringup/lib/sdk/ioevent/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/ioevent/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:02:12 2010 @@ -1,3 +1,2 @@ -file(GLOB_RECURSE SOURCE "*.c") -add_library(ioevent ${SOURCE}) +add_library(ioevent ioevent.c) Modified: branches/cmake-bringup/lib/sdk/scrnsave/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/scrnsave/… ============================================================================== --- branches/cmake-bringup/lib/sdk/scrnsave/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/scrnsave/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:02:12 2010 @@ -1,6 +1,4 @@ add_definitions(-DUNICODE -D_UNICODE) -file(GLOB_RECURSE SOURCE "*.c") -add_library(scrnsave ${SOURCE}) - -add_dependencies(scrnsave psdk) +add_library(scrnsave scrnsave.c) +add_dependencies(scrnsave psdk) Modified: branches/cmake-bringup/lib/sdk/strmiids/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/strmiids/… ============================================================================== --- branches/cmake-bringup/lib/sdk/strmiids/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/strmiids/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:02:12 2010 @@ -1,3 +1,2 @@ -file(GLOB_RECURSE SOURCE "*.c") -add_library(strmiids ${SOURCE}) +add_library(strmiids strmiids.c) Modified: branches/cmake-bringup/lib/sdk/wdmguid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/wdmguid/C… ============================================================================== --- branches/cmake-bringup/lib/sdk/wdmguid/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/wdmguid/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:02:12 2010 @@ -1,3 +1,2 @@ -file(GLOB_RECURSE SOURCE "*.c") -add_library(wdmguid ${SOURCE}) +add_library(wdmguid wdmguid.c) Modified: branches/cmake-bringup/lib/tdilib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/tdilib/CMakeL… ============================================================================== --- branches/cmake-bringup/lib/tdilib/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/tdilib/CMakeLists.txt [iso-8859-1] Fri Nov 5 12:02:12 2010 @@ -1,6 +1,5 @@ + # FIXFIX: You guys should move this header in include/reactos/libs/iphlpapi! include_directories(${REACTOS_SOURCE_DIR}/dll/win32/iphlpapi) - -file(GLOB_RECURSE SOURCE "*.c") - -add_library(tdilib ${SOURCE}) +add_library(tdilib enum.c handle.c) +add_dependencies(tdilib psdk)

1 0

[tkreuzer] 49478: Create a branch for audio work
by tkreuzer＠svn.reactos.org 05 Nov '10

05 Nov '10

Author: tkreuzer Date: Fri Nov 5 11:04:48 2010 New Revision: 49478 URL: http://svn.reactos.org/svn/reactos?rev=49478&view=rev Log: Create a branch for audio work Added: branches/audio-bringup/ (props changed) - copied from r49193, trunk/reactos/ Propchange: branches/audio-bringup/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Fri Nov 5 11:04:48 2010 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/audio-bringup/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/audio-bringup/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/audio-bringup/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri Nov 5 11:04:48 2010 @@ -1,0 +1,14 @@ +*.iso +makefile.auto +makefile-*.auto +config-*.rbuild +obj-* +output-* +reactos +reactos.* +RosBE-Logs +*.sln +*.ncb +*.suo +versionreport.xml +config.rbuild Propchange: branches/audio-bringup/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Fri Nov 5 11:04:48 2010 @@ -1,0 +1,4 @@ +/branches/header-work:45691-47721 +/branches/reactos-yarotows:46372,46848,46966,47800,48026,48064 +/branches/ros-amd64-bringup:36852 +/branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 Propchange: branches/audio-bringup/ ------------------------------------------------------------------------------ tsvn:logminsize = 10

1 0

[spetreolle] 49477: [CMAKE] Add base/ modules to bootcd.
by spetreolle＠svn.reactos.org 05 Nov '10

05 Nov '10

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)

1 0

[spetreolle] 49476: [CMAKE] Revert incorrect auto import change and use proper definitions instead.
by spetreolle＠svn.reactos.org 05 Nov '10

05 Nov '10

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:

1 0

[jimtabor] 49475: [Win32k] - Turn off debug prints.
by jimtabor＠svn.reactos.org 05 Nov '10

05 Nov '10

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 */ {

1 0

[tkreuzer] 49474: [CMAKE] Create importlib for advapi32 Link advapi32 to msvcrt, needed for SEH
by tkreuzer＠svn.reactos.org 05 Nov '10

05 Nov '10

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) +

1 0

[tkreuzer] 49473: [CMAKE] Add /SAFESEH:NO to MSVC linker command line to fix unresolved symbol issue.
by tkreuzer＠svn.reactos.org 05 Nov '10

05 Nov '10

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)

1 0

[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 04 Nov '10

04 Nov '10

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();

1 0

[akhaldi] 49471: [CMAKE] - Improve hal, adns and bzip2.
by akhaldi＠svn.reactos.org 04 Nov '10

04 Nov '10

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")

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs