Ros-diffs July 2010

ros-diffs@reactos.org

17 participants
467 discussions

[gadamopoulos] 48358: Revert 48355
by gadamopoulos＠svn.reactos.org 29 Jul '10

29 Jul '10

Author: gadamopoulos Date: Thu Jul 29 16:05:54 2010 New Revision: 48358 URL: http://svn.reactos.org/svn/reactos?rev=48358&view=rev Log: Revert 48355 Modified: trunk/reactos/dll/win32/browseui/shellbrowser.cpp trunk/reactos/include/psdk/basetsd.h Modified: trunk/reactos/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/shellbr… ============================================================================== --- trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Thu Jul 29 16:05:54 2010 @@ -122,6 +122,10 @@ "processorArchitecture='*' "\ "publicKeyToken='6595b64144ccf1df' "\ "language='*'\"") +#endif // __GNUC__ + +#ifdef __GNUC__ +#define SHANDLE_PTR LONG #endif // __GNUC__ struct categoryCacheHeader Modified: trunk/reactos/include/psdk/basetsd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/basetsd.h?rev… ============================================================================== --- trunk/reactos/include/psdk/basetsd.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/basetsd.h [iso-8859-1] Thu Jul 29 16:05:54 2010 @@ -126,7 +126,6 @@ typedef unsigned __int64 HANDLE_PTR; typedef unsigned int UHALF_PTR, *PUHALF_PTR; typedef int HALF_PTR, *PHALF_PTR; -typedef __int64 SHANDLE_PTR; #if !defined(__midl) && !defined(__WIDL__) static inline unsigned long HandleToUlong(const void* h ) @@ -175,7 +174,6 @@ typedef unsigned short UHALF_PTR, *PUHALF_PTR; typedef short HALF_PTR, *PHALF_PTR; -typedef long SHANDLE_PTR; #ifndef HANDLE_PTR_DEFINED #define HANDLE_PTR_DEFINED

1 0

[akhaldi] 48357: [CMAKE] - mingw_common : set_property -> set_target_properties. - crt : fix target properties.
by akhaldi＠svn.reactos.org 29 Jul '10

29 Jul '10

Author: akhaldi Date: Thu Jul 29 15:52:00 2010 New Revision: 48357 URL: http://svn.reactos.org/svn/reactos?rev=48357&view=rev Log: [CMAKE] - mingw_common : set_property -> set_target_properties. - crt : fix target properties. Modified: branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt Modified: branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/ming… ============================================================================== --- branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt [iso-8859-1] Thu Jul 29 15:52:00 2010 @@ -37,7 +37,7 @@ add_library(mingw_common ${MINGW_COMMON_SOURCE}) target_link_libraries(mingw_common oldnames) -set_property(TARGET mingw_common PROPERTY COMPILE_DEFINITIONS _M_CEE_PURE) +set_target_properties(mingw_common PROPERTIES COMPILE_DEFINITIONS _M_CEE_PURE) add_dependencies(mingw_common 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] Thu Jul 29 15:52:00 2010 @@ -9,7 +9,7 @@ LIST(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/string/strtold.c) add_library(crt ${CRT_SOURCE}) -set_property(TARGET crt PROPERTY COMPILE_DEFINITIONS -D__MINGW_IMPORT=extern -DUSE_MSVCRT_PREFIX -D_MSVCRT_LIB_ -D_MSVCRT_ -D_MT) +set_property(TARGET crt PROPERTY COMPILE_DEFINITIONS __MINGW_IMPORT=extern USE_MSVCRT_PREFIX _MSVCRT_LIB_ _MSVCRT_ _MT) add_dependencies(crt psdk) get_directory_property(defines COMPILE_DEFINITIONS)

1 0

[akhaldi] 48356: [CMAKE] - Export more native tools. - Fix ntdllsys dependency.
by akhaldi＠svn.reactos.org 29 Jul '10

29 Jul '10

Author: akhaldi Date: Thu Jul 29 15:34:21 2010 New Revision: 48356 URL: http://svn.reactos.org/svn/reactos?rev=48356&view=rev Log: [CMAKE] - Export more native tools. - Fix ntdllsys dependency. Modified: branches/cmake-bringup/CMakeLists.txt branches/cmake-bringup/lib/ntdllsys/CMakeLists.txt Modified: branches/cmake-bringup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeLists.txt?re… ============================================================================== --- branches/cmake-bringup/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/CMakeLists.txt [iso-8859-1] Thu Jul 29 15:34:21 2010 @@ -16,7 +16,7 @@ add_subdirectory(tools) add_subdirectory(lib) -export(TARGETS widl winebuild wmc nci FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) +export(TARGETS widl winebuild wmc wrc nci pefixup rsym FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) else() Modified: branches/cmake-bringup/lib/ntdllsys/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/ntdllsys/CMak… ============================================================================== --- branches/cmake-bringup/lib/ntdllsys/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/ntdllsys/CMakeLists.txt [iso-8859-1] Thu Jul 29 15:34:21 2010 @@ -10,4 +10,4 @@ set_source_files_properties(${REACTOS_BINARY_DIR}/lib/ntdllsys/ntdll.S PROPERTIES GENERATED TRUE) add_library(ntdllsys ${REACTOS_BINARY_DIR}/lib/ntdllsys/ntdll.S) -add_dependencies(ntdllsys ntdllsys_S) +add_dependencies(ntdllsys ntdll_S)

1 0

[gadamopoulos] 48355: [basetsd.h] -define SHANDLE_PTR [browseui] -do not define SHANDLE_PTR locally. Using ms psdk isn't the same with compiling with msvc
by gadamopoulos＠svn.reactos.org 29 Jul '10

29 Jul '10

Author: gadamopoulos Date: Thu Jul 29 14:40:21 2010 New Revision: 48355 URL: http://svn.reactos.org/svn/reactos?rev=48355&view=rev Log: [basetsd.h] -define SHANDLE_PTR [browseui] -do not define SHANDLE_PTR locally. Using ms psdk isn't the same with compiling with msvc Modified: trunk/reactos/dll/win32/browseui/shellbrowser.cpp trunk/reactos/include/psdk/basetsd.h Modified: trunk/reactos/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/shellbr… ============================================================================== --- trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Thu Jul 29 14:40:21 2010 @@ -122,10 +122,6 @@ "processorArchitecture='*' "\ "publicKeyToken='6595b64144ccf1df' "\ "language='*'\"") -#endif // __GNUC__ - -#ifdef __GNUC__ -#define SHANDLE_PTR LONG #endif // __GNUC__ struct categoryCacheHeader Modified: trunk/reactos/include/psdk/basetsd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/basetsd.h?rev… ============================================================================== --- trunk/reactos/include/psdk/basetsd.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/basetsd.h [iso-8859-1] Thu Jul 29 14:40:21 2010 @@ -126,6 +126,7 @@ typedef unsigned __int64 HANDLE_PTR; typedef unsigned int UHALF_PTR, *PUHALF_PTR; typedef int HALF_PTR, *PHALF_PTR; +typedef __int64 SHANDLE_PTR; #if !defined(__midl) && !defined(__WIDL__) static inline unsigned long HandleToUlong(const void* h ) @@ -174,6 +175,7 @@ typedef unsigned short UHALF_PTR, *PUHALF_PTR; typedef short HALF_PTR, *PHALF_PTR; +typedef long SHANDLE_PTR; #ifndef HANDLE_PTR_DEFINED #define HANDLE_PTR_DEFINED

1 0

[dreimer] 48354: oops, forgot to rename make to mingw32-make again to make cmake happy. Started the PS Part of this Support Update.
by dreimer＠svn.reactos.org 29 Jul '10

29 Jul '10

Author: dreimer Date: Thu Jul 29 13:52:49 2010 New Revision: 48354 URL: http://svn.reactos.org/svn/reactos?rev=48354&view=rev Log: oops, forgot to rename make to mingw32-make again to make cmake happy. Started the PS Part of this Support Update. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/version.ps1 trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd trunk/tools/RosBE/RosBE-Windows/Root/CMake-Shared.cmd trunk/tools/RosBE/RosBE-Windows/Root/version.cmd trunk/tools/RosBE/RosBE-Windows/RosBE.nsi Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] Thu Jul 29 13:52:49 2010 @@ -58,9 +58,9 @@ New-Item -path "$_ROSBE_LOGDIR" -type directory } $file = "$_ROSBE_LOGDIR\BuildLog-$ENV:ROS_ARCH-$DATENAME-$TIMENAME.txt" - &{IEX "&'make.exe' -j $MAKE_JOBS $($args)"} $($args) 2>&1 | tee-object $file + &{IEX "&'mingw32-make.exe' -j $MAKE_JOBS $($args)"} $($args) 2>&1 | tee-object $file } else { - &{IEX "&'make.exe' -j $MAKE_JOBS $($args)"} $($args) + &{IEX "&'mingw32-make.exe' -j $MAKE_JOBS $($args)"} $($args) } if ($_ROSBE_SHOWTIME -eq 1) { $sw.Stop() Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] Thu Jul 29 13:52:49 2010 @@ -125,8 +125,21 @@ } set-alias HELP "$_ROSBE_BASEDIR\Help.ps1" -scope Global - set-alias MAKE "$_ROSBE_BASEDIR\Build.ps1" -scope Global - function global:MAKEX {IEX "&'$_ROSBE_BASEDIR\Build.ps1' multi $args"} + function global:MAKE { + if (Test-Path ".\CMakeLists.txt") { + IEX "&'$_ROSBE_BASEDIR\CBuild.ps1'" + } else { + IEX "&'$_ROSBE_BASEDIR\Build.ps1'" + } + } + + function global:MAKEX { + if (Test-Path ".\CMakeLists.txt") { + IEX "&'$_ROSBE_BASEDIR\CBuild.ps1' multi $args" + } else { + IEX "&'$_ROSBE_BASEDIR\Build.ps1' multi $args" + } + } if (Test-Path "$_ROSBE_BASEDIR\playwav.ps1") { set-alias PLAYWAV "$_ROSBE_BASEDIR\playwav.ps1" -scope Global Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/version.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/version.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/version.ps1 [iso-8859-1] Thu Jul 29 13:52:49 2010 @@ -29,4 +29,4 @@ & bison '--version' | select-string "GNU Bison" $fver = (& flex '--version') -replace ".*version ((\d|\.)+).*",'$1' "flex $fver" -& make.exe -v | & find "GNU Make" +& mingw32-make.exe -v | & find "GNU Make" Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Bui… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd [iso-8859-1] Thu Jul 29 13:52:49 2010 @@ -55,9 +55,9 @@ if not exist "%_ROSBE_LOGDIR%\." ( mkdir "%_ROSBE_LOGDIR%" 1> NUL 2> NUL ) - %BUILDTIME_COMMAND% make.exe -j %MAKE_JOBS% %* 2>&1 | tee.exe "%_ROSBE_LOGDIR%\BuildLog-%ROS_ARCH%-%datename%-%timename%.txt" + %BUILDTIME_COMMAND% mingw32-make.exe -j %MAKE_JOBS% %* 2>&1 | tee.exe "%_ROSBE_LOGDIR%\BuildLog-%ROS_ARCH%-%datename%-%timename%.txt" ) else ( - %BUILDTIME_COMMAND% make.exe -j %MAKE_JOBS% %* + %BUILDTIME_COMMAND% mingw32-make.exe -j %MAKE_JOBS% %* ) :EOC Modified: trunk/tools/RosBE/RosBE-Windows/Root/CMake-Shared.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/CMa… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/CMake-Shared.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/CMake-Shared.cmd [iso-8859-1] Thu Jul 29 13:52:49 2010 @@ -42,9 +42,9 @@ cd build cmake.exe -G "MinGW Makefiles" ..\..\ if %_ROSBE_WRITELOG% == 1 ( - %BUILDTIME_COMMAND% make.exe -j %MAKE_JOBS% %* 2>&1 | tee.exe "%_ROSBE_LOGDIR%\BuildToolLog-%ROS_ARCH%-%datename%-%timename%.txt" + %BUILDTIME_COMMAND% mingw32-make.exe -j %MAKE_JOBS% %* 2>&1 | tee.exe "%_ROSBE_LOGDIR%\BuildToolLog-%ROS_ARCH%-%datename%-%timename%.txt" ) else ( - %BUILDTIME_COMMAND% make.exe -j %MAKE_JOBS% %* + %BUILDTIME_COMMAND% mingw32-make.exe -j %MAKE_JOBS% %* ) cd.. @@ -54,9 +54,9 @@ cd build-ros cmake.exe -G "MinGW Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain-mingw32.cmake ..\..\ if %_ROSBE_WRITELOG% == 1 ( - %BUILDTIME_COMMAND% make.exe -j %MAKE_JOBS% %* 2>&1 | tee.exe "%_ROSBE_LOGDIR%\BuildROSLog-%ROS_ARCH%-%datename%-%timename%.txt" + %BUILDTIME_COMMAND% mingw32-make.exe -j %MAKE_JOBS% %* 2>&1 | tee.exe "%_ROSBE_LOGDIR%\BuildROSLog-%ROS_ARCH%-%datename%-%timename%.txt" ) else ( - %BUILDTIME_COMMAND% make.exe -j %MAKE_JOBS% %* + %BUILDTIME_COMMAND% mingw32-make.exe -j %MAKE_JOBS% %* ) cd.. Modified: trunk/tools/RosBE/RosBE-Windows/Root/version.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/ver… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/version.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/version.cmd [iso-8859-1] Thu Jul 29 13:52:49 2010 @@ -32,4 +32,4 @@ :: Bison, Flex and Make bison --version | find "GNU Bison" flex --version -make.exe -v | find "GNU Make" +mingw32-make.exe -v | find "GNU Make" Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.ns… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] Thu Jul 29 13:52:49 2010 @@ -120,6 +120,7 @@ File /r Root\LICENSE.txt File /r Root\Basedir.cmd File /r Root\Build-Shared.cmd + File /r Root\CMake-Shared.cmd File /r Root\charch.cmd File /r Root\chdefgcc.cmd File /r Root\Clean.cmd @@ -276,6 +277,7 @@ SetOutPath "$INSTDIR" SetOverwrite try File /r Components\Powershell\Build.ps1 + File /r Components\Powershell\CBuild.ps1 File /r Components\Powershell\RosBE.ps1 File /r Components\Powershell\rosbe-gcc-env.ps1 File /r Components\Powershell\Help.ps1 @@ -406,7 +408,9 @@ NO_SHORTCUTS: Delete /REBOOTOK "$INSTDIR\Basedir.cmd" Delete /REBOOTOK "$INSTDIR\Build.ps1" + Delete /REBOOTOK "$INSTDIR\CBuild.ps1" Delete /REBOOTOK "$INSTDIR\Build-Shared.cmd" + Delete /REBOOTOK "$INSTDIR\CMake-Shared.cmd" Delete /REBOOTOK "$INSTDIR\chdefdir.cmd" Delete /REBOOTOK "$INSTDIR\chdefdir.ps1" Delete /REBOOTOK "$INSTDIR\charch.cmd"

1 0

[dreimer] 48353: Add CMake Support to RosBE. It detects if you are inside the CMake Branch and behaves accordingly. Just use make/makex as you did before. PS Version will come later today.
by dreimer＠svn.reactos.org 29 Jul '10

29 Jul '10

Author: dreimer Date: Thu Jul 29 13:37:03 2010 New Revision: 48353 URL: http://svn.reactos.org/svn/reactos?rev=48353&view=rev Log: Add CMake Support to RosBE. It detects if you are inside the CMake Branch and behaves accordingly. Just use make/makex as you did before. PS Version will come later today. Added: trunk/tools/RosBE/RosBE-Windows/Root/CMake-Shared.cmd (with props) Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd trunk/tools/RosBE/RosBE-Windows/Root/Make.cmd trunk/tools/RosBE/RosBE-Windows/Root/Makex.cmd trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Bui… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd [iso-8859-1] Thu Jul 29 13:37:03 2010 @@ -2,7 +2,7 @@ :: PROJECT: RosBE - ReactOS Build Environment for Windows :: LICENSE: GNU General Public License v2. (see LICENSE.txt) :: FILE: Root/Build-Shared.cmd -:: PURPOSE: Perform the build of ReactOS. +:: PURPOSE: Perform the build of ReactOS - Shared commands. :: COPYRIGHT: Copyright 2010 Daniel Reimer <reimer.daniel(a)freenet.de> :: Colin Finck <colin(a)reactos.org> :: Peter Ward <dralnix(a)gmail.com> Added: trunk/tools/RosBE/RosBE-Windows/Root/CMake-Shared.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/CMa… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/CMake-Shared.cmd (added) +++ trunk/tools/RosBE/RosBE-Windows/Root/CMake-Shared.cmd [iso-8859-1] Thu Jul 29 13:37:03 2010 @@ -1,0 +1,75 @@ +:: +:: PROJECT: RosBE - ReactOS Build Environment for Windows +:: LICENSE: GNU General Public License v2. (see LICENSE.txt) +:: FILE: Root/CMake-Shared.cmd +:: PURPOSE: Perform the CMake build of ReactOS - Shared commands. +:: COPYRIGHT: Copyright 2010 Daniel Reimer <reimer.daniel(a)freenet.de> +:: + +@echo off +if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 +if %_ROSBE_DEBUG% == 1 ( + @echo on +) + +if %_ROSBE_WRITELOG% == 1 ( + if not exist "%_ROSBE_LOGDIR%\." ( + mkdir "%_ROSBE_LOGDIR%" 1> NUL 2> NUL + ) +) + +if not exist "output-%ROS_ARCH%\." ( + mkdir "output-%ROS_ARCH%" 1> NUL 2> NUL +) + +cd "output-%ROS_ARCH%" + +:: Get the current date and time for use in in our build log's file name. +call "%_ROSBE_BASEDIR%\TimeDate.cmd" + +title '%TITLE_COMMAND%' cmake build started: %TIMERAW% (%ROS_ARCH%) + +:: Do the actual building +if %_ROSBE_SHOWTIME% == 1 ( + set BUILDTIME_COMMAND=buildtime.exe +) else ( + set BUILDTIME_COMMAND= +) + +if not exist "build\." ( + mkdir "build" 1> NUL 2> NUL +) +cd build +cmake.exe -G "MinGW Makefiles" ..\..\ +if %_ROSBE_WRITELOG% == 1 ( + %BUILDTIME_COMMAND% make.exe -j %MAKE_JOBS% %* 2>&1 | tee.exe "%_ROSBE_LOGDIR%\BuildToolLog-%ROS_ARCH%-%datename%-%timename%.txt" +) else ( + %BUILDTIME_COMMAND% make.exe -j %MAKE_JOBS% %* +) +cd.. + +if not exist "build-ros\." ( + mkdir "build-ros" 1> NUL 2> NUL +) +cd build-ros +cmake.exe -G "MinGW Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain-mingw32.cmake ..\..\ +if %_ROSBE_WRITELOG% == 1 ( + %BUILDTIME_COMMAND% make.exe -j %MAKE_JOBS% %* 2>&1 | tee.exe "%_ROSBE_LOGDIR%\BuildROSLog-%ROS_ARCH%-%datename%-%timename%.txt" +) else ( + %BUILDTIME_COMMAND% make.exe -j %MAKE_JOBS% %* +) +cd.. + +cd.. +:EOC +:: Highlight the fact that building has ended. + +if !errorlevel! GEQ 1 ( + playwav.exe error.wav +) else ( + playwav.exe notification.wav +) + +flash.exe + +title ReactOS Build Environment %_ROSBE_VERSION% Propchange: trunk/tools/RosBE/RosBE-Windows/Root/CMake-Shared.cmd ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/tools/RosBE/RosBE-Windows/Root/Make.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Mak… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Make.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Make.cmd [iso-8859-1] Thu Jul 29 13:37:03 2010 @@ -3,7 +3,7 @@ :: LICENSE: GNU General Public License v2. (see LICENSE.txt) :: FILE: Root/Make.cmd :: PURPOSE: Perform a uniprocessor build -:: COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> +:: COPYRIGHT: Copyright 2010 Daniel Reimer <reimer.daniel(a)freenet.de> :: Colin Finck <colin(a)reactos.org> :: Peter Ward <dralnix(a)gmail.com> :: @@ -20,5 +20,9 @@ set MAKE_JOBS=1 set TITLE_COMMAND=make %* -call "%_ROSBE_BASEDIR%\Build-Shared.cmd" %* +if exist "CMakeLists.txt" ( + call "%_ROSBE_BASEDIR%\CMake-Shared.cmd" %* +) else ( + call "%_ROSBE_BASEDIR%\Build-Shared.cmd" %* +) endlocal Modified: trunk/tools/RosBE/RosBE-Windows/Root/Makex.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Mak… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Makex.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Makex.cmd [iso-8859-1] Thu Jul 29 13:37:03 2010 @@ -3,7 +3,7 @@ :: LICENSE: GNU General Public License v2. (see LICENSE.txt) :: FILE: Root/Makex.cmd :: PURPOSE: Perform a multiprocessor build -:: COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> +:: COPYRIGHT: Copyright 2010 Daniel Reimer <reimer.daniel(a)freenet.de> :: Colin Finck <colin(a)reactos.org> :: Peter Ward <dralnix(a)gmail.com> :: @@ -20,5 +20,9 @@ set MAKE_JOBS=%_ROSBE_MAKEX_JOBS% set TITLE_COMMAND=makex %* -call "%_ROSBE_BASEDIR%\Build-Shared.cmd" %* +if exist "CMakeLists.txt" ( + call "%_ROSBE_BASEDIR%\CMake-Shared.cmd" %* +) else ( + call "%_ROSBE_BASEDIR%\Build-Shared.cmd" %* +) endlocal Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] Thu Jul 29 13:37:03 2010 @@ -41,12 +41,12 @@ set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\%ROS_ARCH% set _BUILDBOT_SVNSKIPMAINTRUNK=0 -set _ROSBE_ORIGINALPATH=%_ROSBE_BASEDIR%;%_ROSBE_BASEDIR%\Tools;%_ROSBE_BASEDIR%\samples;%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\System32\Wbem" +set _ROSBE_ORIGINALPATH=%_ROSBE_BASEDIR%;%_ROSBE_BASEDIR%\Tools;%_ROSBE_BASEDIR%\samples;%PATH% :: -:: Enable this one, if you want to use the System Path Var inside RosBE. +:: Enable this one, if you don't want to use the System Path Var inside RosBE. :: -REM set _ROSBE_ORIGINALPATH=%_ROSBE_BASEDIR%;%_ROSBE_BASEDIR%\Tools;%_ROSBE_BASEDIR%\samples;%PATH% +REM set _ROSBE_ORIGINALPATH=%_ROSBE_BASEDIR%;%_ROSBE_BASEDIR%\Tools;%_ROSBE_BASEDIR%\samples;%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\System32\Wbem" :: Fix Bison package path (just in case RosBE is installed in a path which contains spaces) set BISON_PKGDATADIR=%~ds0%~sp0%i386\share\bison

1 0

[gadamopoulos] 48352: - Fix setjmp for msvc
by gadamopoulos＠svn.reactos.org 29 Jul '10

29 Jul '10

Author: gadamopoulos Date: Thu Jul 29 12:23:03 2010 New Revision: 48352 URL: http://svn.reactos.org/svn/reactos?rev=48352&view=rev Log: - Fix setjmp for msvc Modified: trunk/reactos/include/crt/setjmp.h Modified: trunk/reactos/include/crt/setjmp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/setjmp.h?rev=4… ============================================================================== --- trunk/reactos/include/crt/setjmp.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/setjmp.h [iso-8859-1] Thu Jul 29 12:23:03 2010 @@ -136,29 +136,18 @@ #define _JMP_BUF_DEFINED #endif -static inline __attribute__((always_inline)) void * mingw_getsp(void) -{ - void *value; -#if defined(__x86_64) #ifdef _MSC_VER - __asm {mov value, rsp} +int __cdecl __MINGW_NOTHROW setjmp(jmp_buf _Buf); #else - __asm__ __volatile__("movq %%rsp, %[value]" : [value] "=r" (value) ); -#endif -#elif defined(_X86_) -#ifdef _MSC_VER - __asm {mov value, esp} -#else - __asm__ __volatile__("movql %%esp, %[value]" : [value] "=r" (value) ); -#endif -#else - #error mingw_getsp unimplemented -#endif - return value; -} - #ifdef USE_MINGW_SETJMP_TWO_ARGS #ifndef _INC_SETJMPEX +#if defined(__x86_64) +# define mingw_getsp() \ + ({ void* value; __asm__ __volatile__("movq %%rsp, %[value]" : [value] "=r" (value)); value; }) +#elif defined(_X86_) +# define mingw_getsp() \ + ({ void* value; __asm__ __volatile__("movl %%esp, %[value]" : [value] "=r" (value)); value; }) +#endif #define setjmp(BUF) _setjmp((BUF),mingw_getsp()) int __cdecl __MINGW_NOTHROW _setjmp(jmp_buf _Buf,void *_Ctx); #else @@ -173,6 +162,7 @@ #endif int __cdecl __MINGW_NOTHROW setjmp(jmp_buf _Buf); #endif +#endif __declspec(noreturn) __MINGW_NOTHROW void __cdecl ms_longjmp(jmp_buf _Buf,int _Value)/* throw(...)*/; __declspec(noreturn) __MINGW_NOTHROW void __cdecl longjmp(jmp_buf _Buf,int _Value);

1 0

[tkreuzer] 48351: [NTOS] - Move initializing the ZeroPageThreadEvent out of architecture specific code - Move setting MmHyperSpaceEnd to a different position
by tkreuzer＠svn.reactos.org 29 Jul '10

29 Jul '10

Author: tkreuzer Date: Thu Jul 29 11:29:25 2010 New Revision: 48351 URL: http://svn.reactos.org/svn/reactos?rev=48351&view=rev Log: [NTOS] - Move initializing the ZeroPageThreadEvent out of architecture specific code - Move setting MmHyperSpaceEnd to a different position Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/i386/init.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/mminit.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/i386/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] Thu Jul 29 11:29:25 2010 @@ -43,9 +43,6 @@ /* Force the non paged pool to be 2MB so we can reduce RAM usage */ MmSizeOfNonPagedPoolInBytes = 2 * _1MB; } - - /* Hyperspace ends here */ - MmHyperSpaceEnd = (PVOID)((ULONG_PTR)MmSystemCacheWorkingSetList - 1); /* Check if the user gave a ridicuously large nonpaged pool RAM size */ if ((MmSizeOfNonPagedPoolInBytes >> PAGE_SHIFT) > (FreePages * 7 / 8)) @@ -145,8 +142,6 @@ } } -extern KEVENT ZeroPageThreadEvent; - NTSTATUS NTAPI MiInitMachineDependent(IN PLOADER_PARAMETER_BLOCK LoaderBlock) @@ -242,8 +237,12 @@ // We need some recalculations here // DPRINT1("Paged pool is too big!\n"); - } - + ASSERT(FALSE); + } + + /* Hyperspace ends here */ + MmHyperSpaceEnd = (PVOID)((ULONG_PTR)MmSystemCacheWorkingSetList - 1); + // // Normally, the PFN database should start after the loader images. // This is already the case in ReactOS, but for now we want to co-exist @@ -354,9 +353,6 @@ MiInitializeNonPagedPool(); MiInitializeNonPagedPoolThresholds(); - /* ReactOS Stuff */ - KeInitializeEvent(&ZeroPageThreadEvent, NotificationEvent, TRUE); - /* Build the PFN Database */ MiInitializePfnDatabase(LoaderBlock); MmInitializeBalancer(MmAvailablePages, 0); Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/mminit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] Thu Jul 29 11:29:25 2010 @@ -15,6 +15,8 @@ #line 15 "ARMÂ³::INIT" #define MODULE_INVOLVED_IN_ARM3 #include "miarm.h" + +extern KEVENT ZeroPageThreadEvent; /* GLOBALS ********************************************************************/ @@ -1806,8 +1808,10 @@ MiSessionImagePteStart = MiAddressToPte(MiSessionImageStart); MiSessionImagePteEnd = MiAddressToPte(MiSessionImageEnd); MiSessionBasePte = MiAddressToPte(MmSessionBase); - MiSessionLastPte = MiAddressToPte(MiSessionSpaceEnd); - + + /* ReactOS Stuff */ + KeInitializeEvent(&ZeroPageThreadEvent, NotificationEvent, TRUE); + /* Initialize the user mode image list */ InitializeListHead(&MmLoadedUserImageList);

1 0

[tkreuzer] 48350: [NTOS] - Move more code out of the architecture specific file - Remove checks, whether the pages from a MAD are above MmHighestPhysicalPage, because that was set from the highest page in the MADs.
by tkreuzer＠svn.reactos.org 29 Jul '10

29 Jul '10

Author: tkreuzer Date: Thu Jul 29 10:41:00 2010 New Revision: 48350 URL: http://svn.reactos.org/svn/reactos?rev=48350&view=rev Log: [NTOS] - Move more code out of the architecture specific file - Remove checks, whether the pages from a MAD are above MmHighestPhysicalPage, because that was set from the highest page in the MADs. Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/i386/init.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/mminit.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/i386/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] Thu Jul 29 10:41:00 2010 @@ -158,28 +158,6 @@ ULONG OldCount; KIRQL OldIrql; - /* Check for kernel stack size that's too big */ - if (MmLargeStackSize > (KERNEL_LARGE_STACK_SIZE / _1KB)) - { - /* Sanitize to default value */ - MmLargeStackSize = KERNEL_LARGE_STACK_SIZE; - } - else - { - /* Take the registry setting, and convert it into bytes */ - MmLargeStackSize *= _1KB; - - /* Now align it to a page boundary */ - MmLargeStackSize = PAGE_ROUND_UP(MmLargeStackSize); - - /* Sanity checks */ - ASSERT(MmLargeStackSize <= KERNEL_LARGE_STACK_SIZE); - ASSERT((MmLargeStackSize & (PAGE_SIZE - 1)) == 0); - - /* Make sure it's not too low */ - if (MmLargeStackSize < KERNEL_STACK_SIZE) MmLargeStackSize = KERNEL_STACK_SIZE; - } - /* Check for global bit */ #if 0 if (KeFeatureBits & KF_GLOBAL_PAGE) @@ -376,28 +354,13 @@ MiInitializeNonPagedPool(); MiInitializeNonPagedPoolThresholds(); - /* Map the PFN database pages */ - MiMapPfnDatabase(LoaderBlock); - - /* Initialize the color tables */ - MiInitializeColorTables(); - /* ReactOS Stuff */ KeInitializeEvent(&ZeroPageThreadEvent, NotificationEvent, TRUE); - /* Hide the pages, that we already used from the descriptor */ - MxFreeDescriptor->BasePage = MiEarlyAllocBase; - MxFreeDescriptor->PageCount = MiEarlyAllocCount; - /* Build the PFN Database */ MiInitializePfnDatabase(LoaderBlock); MmInitializeBalancer(MmAvailablePages, 0); - // - // Reset the descriptor back so we can create the correct memory blocks - // - *MxFreeDescriptor = MxOldFreeDescriptor; - // // Initialize the nonpaged pool // Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/mminit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] Thu Jul 29 10:41:00 2010 @@ -872,24 +872,6 @@ PageCount = MdBlock->PageCount; PageFrameIndex = MdBlock->BasePage; - /* Don't allow memory above what the PFN database is mapping */ - if (PageFrameIndex > MmHighestPhysicalPage) - { - /* Since they are ordered, everything past here will be larger */ - break; - } - - /* On the other hand, the end page might be higher up... */ - if ((PageFrameIndex + PageCount) > (MmHighestPhysicalPage + 1)) - { - /* In which case we'll trim the descriptor to go as high as we can */ - PageCount = MmHighestPhysicalPage + 1 - PageFrameIndex; - MdBlock->PageCount = PageCount; - - /* But if there's nothing left to trim, we got too high, so quit */ - if (!PageCount) break; - } - /* Now check the descriptor type */ switch (MdBlock->MemoryType) { @@ -1017,6 +999,16 @@ NTAPI MiInitializePfnDatabase(IN PLOADER_PARAMETER_BLOCK LoaderBlock) { + /* Map the PFN database pages */ + MiMapPfnDatabase(LoaderBlock); + + /* Initialize the color tables */ + MiInitializeColorTables(); + + /* Hide the pages, that we already used from the descriptor */ + MxFreeDescriptor->BasePage = MiEarlyAllocBase; + MxFreeDescriptor->PageCount = MiEarlyAllocCount; + /* Scan memory and start setting up PFN entries */ MiBuildPfnDatabaseFromPages(LoaderBlock); @@ -1025,7 +1017,10 @@ /* Scan the loader block and build the rest of the PFN database */ MiBuildPfnDatabaseFromLoaderBlock(LoaderBlock); - + + /* Reset the descriptor back so we can create the correct memory blocks */ + *MxFreeDescriptor = MxOldFreeDescriptor; + /* Finally add the pages for the PFN database itself */ MiBuildPfnDatabaseSelf(); } @@ -1909,7 +1904,29 @@ MmAllocationFragment = max(MmAllocationFragment, MI_MIN_ALLOCATION_FRAGMENT); } - + + /* Check for kernel stack size that's too big */ + if (MmLargeStackSize > (KERNEL_LARGE_STACK_SIZE / _1KB)) + { + /* Sanitize to default value */ + MmLargeStackSize = KERNEL_LARGE_STACK_SIZE; + } + else + { + /* Take the registry setting, and convert it into bytes */ + MmLargeStackSize *= _1KB; + + /* Now align it to a page boundary */ + MmLargeStackSize = PAGE_ROUND_UP(MmLargeStackSize); + + /* Sanity checks */ + ASSERT(MmLargeStackSize <= KERNEL_LARGE_STACK_SIZE); + ASSERT((MmLargeStackSize & (PAGE_SIZE - 1)) == 0); + + /* Make sure it's not too low */ + if (MmLargeStackSize < KERNEL_STACK_SIZE) MmLargeStackSize = KERNEL_STACK_SIZE; + } + /* Initialize the platform-specific parts */ MiInitMachineDependent(LoaderBlock);

1 0

[gadamopoulos] 48349: [win32csr] - Fix compilation with msvc
by gadamopoulos＠svn.reactos.org 29 Jul '10

29 Jul '10

Author: gadamopoulos Date: Thu Jul 29 10:20:41 2010 New Revision: 48349 URL: http://svn.reactos.org/svn/reactos?rev=48349&view=rev Log: [win32csr] - Fix compilation with msvc Modified: trunk/reactos/subsystems/win32/csrss/win32csr/coninput.c trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/coninput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/coninput.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/coninput.c [iso-8859-1] Thu Jul 29 10:20:41 2010 @@ -179,6 +179,8 @@ ConioProcessChar(PCSRSS_CONSOLE Console, PINPUT_RECORD InputEvent) { + ConsoleInput *ConInRec; + /* Check for pause or unpause */ if (InputEvent->EventType == KEY_EVENT && InputEvent->Event.KeyEvent.bKeyDown) { @@ -207,7 +209,7 @@ } /* add event to the queue */ - ConsoleInput *ConInRec = RtlAllocateHeap(Win32CsrApiHeap, 0, sizeof(ConsoleInput)); + ConInRec = RtlAllocateHeap(Win32CsrApiHeap, 0, sizeof(ConsoleInput)); if (ConInRec == NULL) return STATUS_INSUFFICIENT_RESOURCES; ConInRec->InputEvent = *InputEvent; Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c [iso-8859-1] Thu Jul 29 10:20:41 2010 @@ -1500,11 +1500,13 @@ { PCSRSS_CONSOLE Console; PGUI_CONSOLE_DATA GuiData; + DWORD windx, windy; + GuiConsoleGetDataPointers(hWnd, &Console, &GuiData); if((Console == NULL)|| (GuiData == NULL)) return; - DWORD windx = CONGUI_MIN_WIDTH * GuiData->CharWidth + 2 * (GetSystemMetrics(SM_CXFRAME) + GetSystemMetrics(SM_CXEDGE)); - DWORD windy = CONGUI_MIN_HEIGHT * GuiData->CharHeight + 2 * (GetSystemMetrics(SM_CYFRAME) + GetSystemMetrics(SM_CYEDGE)) + GetSystemMetrics(SM_CYCAPTION); + windx = CONGUI_MIN_WIDTH * GuiData->CharWidth + 2 * (GetSystemMetrics(SM_CXFRAME) + GetSystemMetrics(SM_CXEDGE)); + windy = CONGUI_MIN_HEIGHT * GuiData->CharHeight + 2 * (GetSystemMetrics(SM_CYFRAME) + GetSystemMetrics(SM_CYEDGE)) + GetSystemMetrics(SM_CYCAPTION); minMaxInfo->ptMinTrackSize.x = windx; minMaxInfo->ptMinTrackSize.y = windy; @@ -1529,18 +1531,19 @@ if ((GuiData->WindowSizeLock == FALSE) && (wParam == SIZE_RESTORED || wParam == SIZE_MAXIMIZED || wParam == SIZE_MINIMIZED)) { PCSRSS_SCREEN_BUFFER Buff = Console->ActiveBuffer; + DWORD windx, windy, charx, chary; GuiData->WindowSizeLock = TRUE; - DWORD windx = LOWORD(lParam); - DWORD windy = HIWORD(lParam); + windx = LOWORD(lParam); + windy = HIWORD(lParam); // Compensate for existing scroll bars (because lParam values do not accommodate scroll bar) if(Console->Size.X < Buff->MaxX) windy += GetSystemMetrics(SM_CYHSCROLL); // window currently has a horizontal scrollbar if(Console->Size.Y < Buff->MaxY) windx += GetSystemMetrics(SM_CXVSCROLL); // window currently has a vertical scrollbar - DWORD charx = windx / GuiData->CharWidth; - DWORD chary = windy / GuiData->CharHeight; + charx = windx / GuiData->CharWidth; + chary = windy / GuiData->CharHeight; // Character alignment (round size up or down) if((windx % GuiData->CharWidth) >= (GuiData->CharWidth / 2)) ++charx;

1 0

← Newer
1
2
3
4
5
6
7
...
47
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2010