Ros-diffs August 2010

ros-diffs@reactos.org

14 participants
282 discussions

[dreimer] 48612: - Remove the old ccache from the RosBE-Windows Tree. - First try to make every external config file version specific. This should make it possible to install several RosBE Versions...

by dreimer＠svn.reactos.org

Author: dreimer Date: Mon Aug 23 21:22:55 2010 New Revision: 48612 URL: http://svn.reactos.org/svn/reactos?rev=48612&view=rev Log: - Remove the old ccache from the RosBE-Windows Tree. - First try to make every external config file version specific. This should make it possible to install several RosBE Versions parallel from now on... (should) Removed: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd trunk/tools/RosBE/RosBE-Windows/Root/options.cmd trunk/tools/RosBE/RosBE-Windows/RosBE-ARM.nsi trunk/tools/RosBE/RosBE-Windows/RosBE.nsi trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.c Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 [iso-8859-1] Mon Aug 23 21:22:55 2010 @@ -8,8 +8,8 @@ $host.ui.RawUI.WindowTitle = "ReactOS Build Configurator" -if (!(Test-Path "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG")) { - "-da" > "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG" +if (!(Test-Path "$ENV:APPDATA\RosBE\RBUILDFLAGS-$_ROSBE_VERSION.FLG")) { + "-da" > "$ENV:APPDATA\RosBE\RBUILDFLAGS-$_ROSBE_VERSION.FLG" } function settitle { @@ -21,7 +21,7 @@ "Be verbose." "Default is: no" "" - $VERBOSE_B = (select-string -path "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG" -pattern "-v") + $VERBOSE_B = (select-string -path "$ENV:APPDATA\RosBE\RBUILDFLAGS-$_ROSBE_VERSION.FLG" -pattern "-v") if ("$VERBOSE_B" -eq "") { $VERBOSE_B = "no" } else { @@ -40,7 +40,7 @@ "Delete generated files as soon as they are not needed anymore." "Default is: no" "" - $CLEAN_B = (select-string -path "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG" -pattern "-c") + $CLEAN_B = (select-string -path "$ENV:APPDATA\RosBE\RBUILDFLAGS-$_ROSBE_VERSION.FLG" -pattern "-c") if ("$CLEAN_B" -eq "") { $CLEAN_B = "no" } else { @@ -59,8 +59,8 @@ "Disable/Enable automatic dependencies." "Default is: yes" "" - $DEPENDS_B = (select-string -path "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG" -pattern "-df") - $DEPENDS_B2 = (select-string -path "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG" -pattern "-dd") + $DEPENDS_B = (select-string -path "$ENV:APPDATA\RosBE\RBUILDFLAGS-$_ROSBE_VERSION.FLG" -pattern "-df") + $DEPENDS_B2 = (select-string -path "$ENV:APPDATA\RosBE\RBUILDFLAGS-$_ROSBE_VERSION.FLG" -pattern "-dd") if (!("$DEPENDS_B" -eq "")) { $DEPENDS_B = "full" } elseif (!("$DEPENDS_B2" -eq "")) { @@ -85,7 +85,7 @@ "Use precompiled headers." "Default is: yes" "" - $PRECHEADER_B = (select-string -path "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG" -pattern "-hd") + $PRECHEADER_B = (select-string -path "$ENV:APPDATA\RosBE\RBUILDFLAGS-$_ROSBE_VERSION.FLG" -pattern "-hd") if ("$PRECHEADER_B" -eq "") { $PRECHEADER_B = "yes" } else { @@ -105,7 +105,7 @@ "the directories." "Default is: no" "" - $MAKEDIR_B = (select-string -path "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG" -pattern "-mi") + $MAKEDIR_B = (select-string -path "$ENV:APPDATA\RosBE\RBUILDFLAGS-$_ROSBE_VERSION.FLG" -pattern "-mi") if ("$MAKEDIR_B" -eq "") { $MAKEDIR_B = "no" } else { @@ -124,7 +124,7 @@ "Generate proxy makefiles in source tree instead of the output tree." "Default is: no" "" - $PROXYMAKE_B = (select-string -path "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG" -pattern "-ps") + $PROXYMAKE_B = (select-string -path "$ENV:APPDATA\RosBE\RBUILDFLAGS-$_ROSBE_VERSION.FLG" -pattern "-ps") if ("$PROXYMAKE_B" -eq "") { $PROXYMAKE_B = "no" } else { @@ -143,7 +143,7 @@ "Use compilation units." "Default is: yes" "" - $COMPUNITS_B = (select-string -path "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG" -pattern "-ud") + $COMPUNITS_B = (select-string -path "$ENV:APPDATA\RosBE\RBUILDFLAGS-$_ROSBE_VERSION.FLG" -pattern "-ud") if ("$COMPUNITS_B" -eq "") { $COMPUNITS_B = "yes" } else { @@ -162,7 +162,7 @@ "Input XML." "Default is: no" "" - $XML_B = (select-string -path "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG" -pattern "-r") + $XML_B = (select-string -path "$ENV:APPDATA\RosBE\RBUILDFLAGS-$_ROSBE_VERSION.FLG" -pattern "-r") if ("$XML_B" -eq "") { $XML_B = "no" } else { @@ -177,7 +177,7 @@ $RBUILDFLAGS = "$RBUILDFLAGS" + " -r" } clear-host - "$RBUILDFLAGS" > "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG" + "$RBUILDFLAGS" > "$ENV:APPDATA\RosBE\RBUILDFLAGS-$_ROSBE_VERSION.FLG" $ENV:ROS_RBUILDFLAGS = $RBUILDFLAGS } @@ -193,14 +193,14 @@ } else { "Main Configuration File was not found in ReactOS Source Tree." } - if (Test-Path "$ENV:APPDATA\RosBE\config.rbuild") { - remove-item "$ENV:APPDATA\RosBE\config.rbuild" + if (Test-Path "$ENV:APPDATA\RosBE\config-$_ROSBE_VERSION.rbuild") { + remove-item "$ENV:APPDATA\RosBE\config-$_ROSBE_VERSION.rbuild" "Working Configuration File was found and deleted." } else { "Working Configuration File was not found in ReactOS Source Tree." } - if (Test-Path "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG") { - remove-item "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG" + if (Test-Path "$ENV:APPDATA\RosBE\RBUILDFLAGS-$_ROSBE_VERSION.FLG") { + remove-item "$ENV:APPDATA\RosBE\RBUILDFLAGS-$_ROSBE_VERSION.FLG" $ENV:ROS_RBUILDFLAGS = "" "RBuild Flags File was found and deleted." } else { @@ -217,7 +217,7 @@ if (("$YESNO" -eq "yes") -or ("$YESNO" -eq "y")) { remove-item "$_ROSBE_BASEDIR\*.rbuild" remove-item ".\config.rbuild" - copy-item ".\config.template.rbuild" "$ENV:APPDATA\RosBE\config.rbuild" + copy-item ".\config.template.rbuild" "$ENV:APPDATA\RosBE\config-$_ROSBE_VERSION.rbuild" "Successfully Updated." } settitle @@ -232,8 +232,8 @@ } # Check if config.rbuild already exists. If not, get a working copy. -if (!(Test-Path "$ENV:APPDATA\RosBE\config.rbuild")) { - copy-item ".\config.template.rbuild" "$ENV:APPDATA\RosBE\config.rbuild" +if (!(Test-Path "$ENV:APPDATA\RosBE\config-$_ROSBE_VERSION.rbuild")) { + copy-item ".\config.template.rbuild" "$ENV:APPDATA\RosBE\config-$_ROSBE_VERSION.rbuild" } # Help prevent non-useful bug reports/questions. @@ -258,13 +258,13 @@ "*** previously made settings. ***" "" $YESNO = Read-Host "(yes), (no)" - if (("$YESNO" -eq "yes") -or ("$YESNO" -eq "y")) {remove-item "$ENV:APPDATA\RosBE\*.rbuild" | remove-item ".\config.rbuild" | copy-item ".\config.template.rbuild" "$ENV:APPDATA\RosBE\config.rbuild"} + if (("$YESNO" -eq "yes") -or ("$YESNO" -eq "y")) {remove-item "$ENV:APPDATA\RosBE\config-$_ROSBE_VERSION.rbuild" | remove-item ".\config.rbuild" | copy-item ".\config.template.rbuild" "$ENV:APPDATA\RosBE\config-$_ROSBE_VERSION.rbuild"} else {settitle} } } # Prepare XML Parser. -[xml]$xml = get-content "$ENV:APPDATA\RosBE\config.rbuild" +[xml]$xml = get-content "$ENV:APPDATA\RosBE\config-$_ROSBE_VERSION.rbuild" # Start with reading settings from config.rbuild and let the user edit them. "Sub-Architecture to build for." @@ -422,8 +422,8 @@ $xml.group.property | ? { $_.Name -eq "_WINKD_" } | % { $_.Value = "$WINKD_CH"} $xml.group.property | ? { $_.Name -eq "_ELF_" } | % { $_.Value = "$ELF_CH"} $xml.group.property | ? { $_.Name -eq "BUILD_MP" } | % { $_.Value = "$BUILD_MP_CH"} -$xml.save("$ENV:APPDATA\RosBE\config.rbuild") -copy-item "$ENV:APPDATA\RosBE\config.rbuild" ".\config.rbuild" +$xml.save("$ENV:APPDATA\RosBE\config-$_ROSBE_VERSION.rbuild") +copy-item "$ENV:APPDATA\RosBE\config-$_ROSBE_VERSION.rbuild" ".\config.rbuild" $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" 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] Mon Aug 23 21:22:55 2010 @@ -191,8 +191,8 @@ # Load the user's options if any if ("$args" -eq "") { - if (Test-Path "$ENV:APPDATA\RosBE\rosbe-options.ps1") { - & "$ENV:APPDATA\RosBE\rosbe-options.ps1" + if (Test-Path "$ENV:APPDATA\RosBE\rosbe-options-$_ROSBE_VERSION.ps1") { + & "$ENV:APPDATA\RosBE\rosbe-options-$_ROSBE_VERSION.ps1" } } @@ -200,8 +200,8 @@ & "$ENV:APPDATA\RosBE\rosbe-options-$ENV:ROS_ARCH.ps1" } -if (Test-Path "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG") { - $ENV:ROS_RBUILDFLAGS = get-content "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG" +if (Test-Path "$ENV:APPDATA\RosBE\RBUILDFLAGS-$_ROSBE_VERSION.FLG") { + $ENV:ROS_RBUILDFLAGS = get-content "$ENV:APPDATA\RosBE\RBUILDFLAGS-$_ROSBE_VERSION.FLG" } # Load the doskey macros that serve as our commands. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 [iso-8859-1] Mon Aug 23 21:22:55 2010 @@ -23,8 +23,8 @@ # Refresh all needed Params by recalling the main Path setting CMD File. if ("$ENV:ROS_ARCH" -eq "i386") { - if (Test-Path "$ENV:APPDATA\RosBE\rosbe-options.ps1") { - IEX "& '$ENV:APPDATA\RosBE\rosbe-options.ps1'" + if (Test-Path "$ENV:APPDATA\RosBE\rosbe-options-$_ROSBE_VERSION.ps1") { + IEX "& '$ENV:APPDATA\RosBE\rosbe-options-$_ROSBE_VERSION.ps1'" } } else { if (Test-Path "$ENV:APPDATA\RosBE\rosbe-options-$ENV:ROS_ARCH.ps1") { Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 [iso-8859-1] Mon Aug 23 21:22:55 2010 @@ -13,7 +13,7 @@ $cfgfile ="$ENV:APPDATA\RosBE\rosbe-options-$ENV:ROS_ARCH.ps1" } else { $param = $null - $cfgfile="$ENV:APPDATA\RosBE\rosbe-options.ps1" + $cfgfile="$ENV:APPDATA\RosBE\rosbe-options-$_ROSBE_VERSION.ps1" } # Run options.exe Modified: trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Con… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd [iso-8859-1] Mon Aug 23 21:22:55 2010 @@ -15,8 +15,8 @@ setlocal enabledelayedexpansion title ReactOS Build Configurator -if not exist "%APPDATA%\RosBE\RBUILDFLAGS.FLG" ( - echo -da> "%APPDATA%\RosBE\RBUILDFLAGS.FLG" +if not exist "%APPDATA%\RosBE\RBUILDFLAGS-%_ROSBE_VERSION%.FLG" ( + echo -da> "%APPDATA%\RosBE\RBUILDFLAGS-%_ROSBE_VERSION%.FLG" ) :: Receive the first Parameter and decide what to do. @@ -36,15 +36,15 @@ echo Main Configuration File was not found in ReactOS Source Tree. ) - if exist "%APPDATA%\RosBE\config.rbuild" ( - del "%APPDATA%\RosBE\config.rbuild" + if exist "%APPDATA%\RosBE\config-%_ROSBE_VERSION%.rbuild" ( + del "%APPDATA%\RosBE\config-%_ROSBE_VERSION%.rbuild" echo Working Configuration File was found and deleted. ) else ( echo Working Configuration File was not found in ReactOS Source Tree. ) - if exist "%APPDATA%\RosBE\RBUILDFLAGS.FLG" ( - del "%APPDATA%\RosBE\RBUILDFLAGS.FLG" + if exist "%APPDATA%\RosBE\RBUILDFLAGS-%_ROSBE_VERSION%.FLG" ( + del "%APPDATA%\RosBE\RBUILDFLAGS-%_ROSBE_VERSION%.FLG" echo RBuild Flags File was found and deleted. ) else ( echo RBuild Flags File was not found in ReactOS Source Tree. @@ -65,7 +65,7 @@ :CONT2 del "%_ROSBE_BASEDIR%\*.rbuild" del "config.rbuild" - copy "config.template.rbuild" "%APPDATA%\RosBE\config.rbuild" + copy "config.template.rbuild" "%APPDATA%\RosBE\config-%_ROSBE_VERSION%.rbuild" echo Successfully Updated. goto :NOK ) @@ -228,7 +228,7 @@ set RBUILDFLAGS=!RBUILDFLAGS! -r ) cls - echo !RBUILDFLAGS! > "%APPDATA%\RosBE\RBUILDFLAGS.FLG" + echo !RBUILDFLAGS! > "%APPDATA%\RosBE\RBUILDFLAGS-%_ROSBE_VERSION%.FLG" set ROS_RBUILDFLAGS=!RBUILDFLAGS! goto :NOK ) @@ -239,8 +239,8 @@ ) :: Check if config.rbuild already exists. If not, get a working copy. -if not exist "%APPDATA%\RosBE\config.rbuild" ( - copy "config.template.rbuild" "%APPDATA%\RosBE\config.rbuild" +if not exist "%APPDATA%\RosBE\config-%_ROSBE_VERSION%.rbuild" ( + copy "config.template.rbuild" "%APPDATA%\RosBE\config-%_ROSBE_VERSION%.rbuild" ) :: Help prevent non-useful bug reports/questions. @@ -273,9 +273,9 @@ if /i "!YESNO!"=="y" goto :YES goto :NOK :YES - del "%APPDATA%\RosBE\*.rbuild" + del "%APPDATA%\RosBE\config-%_ROSBE_VERSION%.rbuild" del "config.rbuild" - copy "config.template.rbuild" "%APPDATA%\RosBE\config.rbuild" + copy "config.template.rbuild" "%APPDATA%\RosBE\config-%_ROSBE_VERSION%.rbuild" goto :OK ) ) @@ -285,7 +285,7 @@ echo Sub-Architecture to build for. echo Default is: none echo. -for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\config.rbuild" | find "SARCH" | find "property name""`) do set SARCH=%%i +for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\config-%_ROSBE_VERSION%.rbuild" | find "SARCH" | find "property name""`) do set SARCH=%%i set SARCH=%SARCH:~7,-1% echo Right now: %SARCH% set /p SARCH_CH="(), (xbox)" @@ -302,7 +302,7 @@ echo VIA: c3, c3-2 echo Default is: pentium echo. -for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\config.rbuild" | find "OARCH" | find "property name""`) do set OARCH=%%i +for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\config-%_ROSBE_VERSION%.rbuild" | find "OARCH" | find "property name""`) do set OARCH=%%i set OARCH=%OARCH:~7,-1% echo Right now: %OARCH% set /p OARCH_CH= @@ -316,7 +316,7 @@ echo specified by OARCH. echo Default is: i686 echo. -for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\config.rbuild" | find "TUNE" | find "property name""`) do set TUNE=%%i +for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\config-%_ROSBE_VERSION%.rbuild" | find "TUNE" | find "property name""`) do set TUNE=%%i set TUNE=%TUNE:~7,-1% echo Right now: %TUNE% set /p TUNE_CH= @@ -332,7 +332,7 @@ echo official release builds and debug builds. echo warning : 2,3,4,5 is not tested on ReactOS. Change at own risk. echo. -for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\config.rbuild" | find "OPTIMIZE" | find "property name""`) do set OPTIMIZE=%%i +for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\config-%_ROSBE_VERSION%.rbuild" | find "OPTIMIZE" | find "property name""`) do set OPTIMIZE=%%i set OPTIMIZE=%OPTIMIZE:~7,-1% echo Right now: %OPTIMIZE% set /p OPTIMIZE_CH="(0), (1), (2), (3), (4), (5)" @@ -344,7 +344,7 @@ echo Whether to compile in the integrated kernel debugger. echo Default is: 1 echo. -for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\config.rbuild" | find "KDBG" | find "property name""`) do set KDBG=%%i +for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\config-%_ROSBE_VERSION%.rbuild" | find "KDBG" | find "property name""`) do set KDBG=%%i set KDBG=%KDBG:~7,-1% echo Right now: %KDBG% set /p KDBG_CH="(0), (1)" @@ -357,7 +357,7 @@ echo performed. echo Default is: 1 echo. -for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\config.rbuild" | find "DBG" | find "property name" | find /V "KDBG""`) do set DBG=%%i +for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\config-%_ROSBE_VERSION%.rbuild" | find "DBG" | find "property name" | find /V "KDBG""`) do set DBG=%%i set DBG=%DBG:~7,-1% echo Right now: %DBG% set /p DBG_CH="(0), (1)" @@ -370,7 +370,7 @@ echo don't enable this. echo Default is: 0 echo. -for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\config.rbuild" | find "GDB" | find "property name""`) do set GDB=%%i +for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\config-%_ROSBE_VERSION%.rbuild" | find "GDB" | find "property name""`) do set GDB=%%i set GDB=%GDB:~7,-1% echo Right now: %GDB% set /p GDB_CH="(0), (1)" @@ -385,7 +385,7 @@ echo from the patent owner). echo Default is: 0 echo. -for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\config.rbuild" | find "NSWPAT" | find "property name""`) do set NSWPAT=%%i +for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\config-%_ROSBE_VERSION%.rbuild" | find "NSWPAT" | find "property name""`) do set NSWPAT=%%i set NSWPAT=%NSWPAT:~7,-1% echo Right now: %NSWPAT% set /p NSWPAT_CH="(0), (1)" @@ -402,7 +402,7 @@ echo unless you know what you're doing. echo Default is: 0 echo. -for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\config.rbuild" | find "_WINKD_" | find "property name""`) do set WINKD=%%i +for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\config-%_ROSBE_VERSION%.rbuild" | find "_WINKD_" | find "property name""`) do set WINKD=%%i set WINKD=%WINKD:~7,-1% echo Right now: %WINKD% set /p WINKD_CH="(0), (1)" @@ -415,7 +415,7 @@ echo you're doing. echo Default is: 0 echo. -for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\config.rbuild" | find "_ELF_" | find "property name""`) do set ELF=%%i +for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\config-%_ROSBE_VERSION%.rbuild" | find "_ELF_" | find "property name""`) do set ELF=%%i set ELF=%ELF:~7,-1% echo Right now: %ELF% set /p ELF_CH="(0), (1)" @@ -427,7 +427,7 @@ echo Whether to compile the multi processor versions for ntoskrnl and hal. echo Default is: 1 echo. -for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\config.rbuild" | find "BUILD_MP" | find "property name""`) do set BUILD_MP=%%i +for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\config-%_ROSBE_VERSION%.rbuild" | find "BUILD_MP" | find "property name""`) do set BUILD_MP=%%i set BUILD_MP=%BUILD_MP:~7,-1% echo Right now: %BUILD_MP% set /p BUILD_MP_CH="(0), (1)" @@ -453,9 +453,9 @@ echo ^<property name="BUILD_MP" value="%BUILD_MP_CH%" /^>>>%TEMP%\config.tmp echo ^</group^>>>%TEMP%\config.tmp -copy "%TEMP%\config.tmp" "%APPDATA%\RosBE\config.rbuild" >NUL +copy "%TEMP%\config.tmp" "%APPDATA%\RosBE\config-%_ROSBE_VERSION%.rbuild" >NUL del %TEMP%\config.tmp -copy "%APPDATA%\RosBE\config.rbuild" "config.rbuild" >NUL +copy "%APPDATA%\RosBE\config-%_ROSBE_VERSION%.rbuild" "config.rbuild" >NUL :NOK title ReactOS Build Environment %_ROSBE_VERSION% 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] Mon Aug 23 21:22:55 2010 @@ -74,8 +74,8 @@ ) :: Load the user's options if any if "%ROS_ARCH%" == "i386" ( - if exist "%APPDATA%\RosBE\rosbe-options.cmd" ( - call "%APPDATA%\RosBE\rosbe-options.cmd" + if exist "%APPDATA%\RosBE\rosbe-options-%_ROSBE_VERSION%.cmd" ( + call "%APPDATA%\RosBE\rosbe-options-%_ROSBE_VERSION%.cmd" ) ) @@ -83,8 +83,8 @@ call "%APPDATA%\RosBE\rosbe-options-%1.cmd" ) -if exist "%APPDATA%\RosBE\RBUILDFLAGS.FLG" ( - for /f "usebackq tokens=* delims= " %%i in (`"type "%APPDATA%\RosBE\RBUILDFLAGS.FLG""`) do set ROS_RBUILDFLAGS=%%i +if exist "%APPDATA%\RosBE\RBUILDFLAGS-%_ROSBE_VERSION%.FLG" ( + for /f "usebackq tokens=* delims= " %%i in (`"type "%APPDATA%\RosBE\RBUILDFLAGS-%_ROSBE_VERSION%.FLG""`) do set ROS_RBUILDFLAGS=%%i ) :: Check if RosBE data directory exists, if not, create it. Modified: trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd [iso-8859-1] Mon Aug 23 21:22:55 2010 @@ -33,8 +33,8 @@ :: Refresh all needed Params by recalling the main Path setting CMD File. if /i "%ROS_ARCH%" == "i386" ( - if exist "%APPDATA%\RosBE\rosbe-options.cmd" ( - call "%APPDATA%\RosBE\rosbe-options.cmd" + if exist "%APPDATA%\RosBE\rosbe-options-%_ROSBE_VERSION%.cmd" ( + call "%APPDATA%\RosBE\rosbe-options-%_ROSBE_VERSION%.cmd" ) ) else ( if exist "%APPDATA%\RosBE\rosbe-options-%ROS_ARCH%.cmd" ( Modified: trunk/tools/RosBE/RosBE-Windows/Root/options.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/opt… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/options.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/options.cmd [iso-8859-1] Mon Aug 23 21:22:55 2010 @@ -19,7 +19,7 @@ set cfgfile=%APPDATA%\RosBE\rosbe-options-%ROS_ARCH%.cmd ) else ( set param= - set cfgfile=%APPDATA%\RosBE\rosbe-options.cmd + set cfgfile=%APPDATA%\RosBE\rosbe-options-%_ROSBE_VERSION%.cmd ) :: Run options.exe Modified: trunk/tools/RosBE/RosBE-Windows/RosBE-ARM.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE-AR… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE-ARM.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE-ARM.nsi [iso-8859-1] Mon Aug 23 21:22:55 2010 @@ -129,13 +129,13 @@ CreateDirectory "$SMPROGRAMS\$ICONS_GROUP" SetOutPath $REACTOS_SOURCE_DIRECTORY IfFileExists "$INSTDIR\RosBE.cmd" 0 +2 - CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment - ARM.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd" arm' "$INSTDIR\rosbe.ico" + CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment - ARM - ${PRODUCT_VERSION}.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd" arm' "$INSTDIR\rosbe.ico" IfFileExists "$INSTDIR\RosBE.ps1" 0 +2 - CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment - ARM - Powershell.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1' arm" "$INSTDIR\rosbe.ico" + CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment - ARM - ${PRODUCT_VERSION} - PS.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1' arm" "$INSTDIR\rosbe.ico" IfFileExists "$INSTDIR\Tools\options.exe" 0 +2 - CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Options - ARM.lnk" "$INSTDIR\Tools\options.exe" arm + CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Options - ARM - ${PRODUCT_VERSION}.lnk" "$INSTDIR\Tools\options.exe" arm SetOutPath $INSTDIR - CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Uninstall RosBE - ARM Target.lnk" \ + CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Uninstall RosBE - ARM - ${PRODUCT_VERSION}.lnk" \ "$INSTDIR\Uninstall-ARM-${PRODUCT_VERSION}.exe" !insertmacro MUI_STARTMENU_WRITE_END SectionEnd @@ -148,9 +148,9 @@ ;; SetOutPath $REACTOS_SOURCE_DIRECTORY IfFileExists "$INSTDIR\RosBE.cmd" 0 +2 - CreateShortCut "$DESKTOP\ReactOS Build Environment - ARM.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd" arm' "$INSTDIR\rosbe.ico" + CreateShortCut "$DESKTOP\ReactOS Build Environment - ARM - ${PRODUCT_VERSION}.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd" arm' "$INSTDIR\rosbe.ico" IfFileExists "$INSTDIR\RosBE.ps1" 0 +2 - CreateShortCut "$DESKTOP\ReactOS Build Environment - ARM - Powershell.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1' arm" "$INSTDIR\rosbe.ico" + CreateShortCut "$DESKTOP\ReactOS Build Environment - ARM - ${PRODUCT_VERSION} - PS.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1' arm" "$INSTDIR\rosbe.ico" SectionEnd Section /o "Quick Launch Shortcuts" SEC04 @@ -161,9 +161,9 @@ ;; SetOutPath $REACTOS_SOURCE_DIRECTORY IfFileExists "$INSTDIR\RosBE.cmd" 0 +2 - CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment - ARM.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd" arm' "$INSTDIR\rosbe.ico" + CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment - ARM - ${PRODUCT_VERSION}.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd" arm' "$INSTDIR\rosbe.ico" IfFileExists "$INSTDIR\RosBE.ps1" 0 +2 - CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment - ARM - Powershell.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1' arm" "$INSTDIR\rosbe.ico" + CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment - ARM - ${PRODUCT_VERSION} - PS.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1' arm" "$INSTDIR\rosbe.ico" SectionEnd Section -Post SEC06 @@ -198,10 +198,10 @@ Delete /REBOOTOK "$INSTDIR\Uninstall-${PRODUCT_VERSION}.exe" ;; Whoever dares to change this back into: RMDir /r /REBOOTOK "$INSTDIR" will be KILLED!!! RMDir /REBOOTOK "$INSTDIR" - Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment - ARM.lnk" - Delete /REBOOTOK "$QUICKLAUNCH\ReactOS Build Environment - ARM.lnk" - Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment - ARM - Powershell.lnk" - Delete /REBOOTOK "$QUICKLAUNCH\ReactOS Build Environment - ARM - Powershell.lnk" + Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment - ARM - ${PRODUCT_VERSION}.lnk" + Delete /REBOOTOK "$QUICKLAUNCH\ReactOS Build Environment - ARM - ${PRODUCT_VERSION}.lnk" + Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment - ARM - ${PRODUCT_VERSION} - PS.lnk" + Delete /REBOOTOK "$QUICKLAUNCH\ReactOS Build Environment - ARM - ${PRODUCT_VERSION} - PS.lnk" ;; ;; Clean up the registry. 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] Mon Aug 23 21:22:55 2010 @@ -177,7 +177,7 @@ !insertmacro MUI_STARTMENU_WRITE_BEGIN Application CreateDirectory "$SMPROGRAMS\$ICONS_GROUP" SetOutPath $INSTDIR - CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Options.lnk" \ + CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Options - ${PRODUCT_VERSION}.lnk" \ "$INSTDIR\Tools\options.exe" !insertmacro MUI_STARTMENU_WRITE_END SectionEnd @@ -311,16 +311,16 @@ ;; ;; Add our start menu shortcuts. ;; - IfFileExists "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment.lnk" +13 0 + IfFileExists "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment - ${PRODUCT_VERSION}.lnk" +13 0 !insertmacro MUI_STARTMENU_WRITE_BEGIN Application CreateDirectory "$SMPROGRAMS\$ICONS_GROUP" SetOutPath $REACTOS_SOURCE_DIRECTORY IfFileExists "$INSTDIR\RosBE.cmd" 0 +2 - CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment.lnk" "$SYSDIR\cmd.exe" '/t:0A /k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico" + CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment - ${PRODUCT_VERSION}.lnk" "$SYSDIR\cmd.exe" '/t:0A /k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico" IfFileExists "$INSTDIR\RosBE.ps1" 0 +2 - CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment - Powershell.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1'" "$INSTDIR\rosbe.ico" + CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment - ${PRODUCT_VERSION} - PS.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1'" "$INSTDIR\rosbe.ico" SetOutPath $INSTDIR - CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Uninstall RosBE.lnk" \ + CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Uninstall RosBE - ${PRODUCT_VERSION}.lnk" \ "$INSTDIR\Uninstall-${PRODUCT_VERSION}.exe" CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Readme.lnk" \ "$INSTDIR\README.pdf" @@ -333,12 +333,12 @@ ;; ;; Add our desktop shortcuts. ;; - IfFileExists "$DESKTOP\ReactOS Build Environment.lnk" +6 0 + IfFileExists "$DESKTOP\ReactOS Build Environment - ${PRODUCT_VERSION}.lnk" +6 0 SetOutPath $REACTOS_SOURCE_DIRECTORY IfFileExists "$INSTDIR\RosBE.cmd" 0 +2 - CreateShortCut "$DESKTOP\ReactOS Build Environment.lnk" "$SYSDIR\cmd.exe" '/t:0A /k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico" + CreateShortCut "$DESKTOP\ReactOS Build Environment - ${PRODUCT_VERSION}.lnk" "$SYSDIR\cmd.exe" '/t:0A /k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico" IfFileExists "$INSTDIR\RosBE.ps1" 0 +2 - CreateShortCut "$DESKTOP\ReactOS Build Environment - Powershell.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1'" "$INSTDIR\rosbe.ico" + CreateShortCut "$DESKTOP\ReactOS Build Environment - ${PRODUCT_VERSION} - PS.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1'" "$INSTDIR\rosbe.ico" SectionEnd Section /o "Quick Launch Shortcuts" SEC14 @@ -347,12 +347,12 @@ ;; ;; Add our quick launch shortcuts. ;; - IfFileExists "$QUICKLAUNCH\ReactOS Build Environment.lnk" +6 0 + IfFileExists "$QUICKLAUNCH\ReactOS Build Environment - ${PRODUCT_VERSION}.lnk" +6 0 SetOutPath $REACTOS_SOURCE_DIRECTORY IfFileExists "$INSTDIR\RosBE.cmd" 0 +2 - CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment.lnk" "$SYSDIR\cmd.exe" '/t:0A /k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico" + CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment - ${PRODUCT_VERSION}.lnk" "$SYSDIR\cmd.exe" '/t:0A /k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico" IfFileExists "$INSTDIR\RosBE.ps1" 0 +2 - CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment - Powershell.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1'" "$INSTDIR\rosbe.ico" + CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment - ${PRODUCT_VERSION} - PS.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1'" "$INSTDIR\rosbe.ico" SectionEnd Section -Post SEC15 @@ -387,10 +387,10 @@ MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 \ "Do you want to remove the Shortcuts? If you just want to Update to a new Version of RosBE, keep them. This keeps your previous settings." \ IDNO +5 - Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment.lnk" - Delete /REBOOTOK "$QUICKLAUNCH\ReactOS Build Environment.lnk" - Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment - Powershell.lnk" - Delete /REBOOTOK "$QUICKLAUNCH\ReactOS Build Environment - Powershell.lnk" + Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment - ${PRODUCT_VERSION}.lnk" + Delete /REBOOTOK "$QUICKLAUNCH\ReactOS Build Environment - ${PRODUCT_VERSION}.lnk" + Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment - ${PRODUCT_VERSION} - PS.lnk" + Delete /REBOOTOK "$QUICKLAUNCH\ReactOS Build Environment - ${PRODUCT_VERSION} - PS.lnk" FunctionEnd Section Uninstall Modified: trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE64.… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi [iso-8859-1] Mon Aug 23 21:22:55 2010 @@ -129,13 +129,13 @@ CreateDirectory "$SMPROGRAMS\$ICONS_GROUP" SetOutPath $REACTOS_SOURCE_DIRECTORY IfFileExists "$INSTDIR\RosBE.cmd" 0 +2 - CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment 64-bit.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd" amd64' "$INSTDIR\rosbe.ico" + CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment 64-bit - ${PRODUCT_VERSION}.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd" amd64' "$INSTDIR\rosbe.ico" IfFileExists "$INSTDIR\RosBE.ps1" 0 +2 - CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment 64-bit - Powershell.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1' amd64" "$INSTDIR\rosbe.ico" + CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment 64-bit - ${PRODUCT_VERSION} - PS.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1' amd64" "$INSTDIR\rosbe.ico" IfFileExists "$INSTDIR\Tools\options.exe" 0 +2 - CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Options 64-bit.lnk" "$INSTDIR\Tools\options.exe" amd64 + CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Options 64-bit - ${PRODUCT_VERSION}.lnk" "$INSTDIR\Tools\options.exe" amd64 SetOutPath $INSTDIR - CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Uninstall RosBE - 64 Bit Target.lnk" \ + CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Uninstall RosBE - 64-Bit - ${PRODUCT_VERSION}.lnk" \ "$INSTDIR\Uninstall64-${PRODUCT_VERSION}.exe" !insertmacro MUI_STARTMENU_WRITE_END SectionEnd @@ -148,9 +148,9 @@ ;; SetOutPath $REACTOS_SOURCE_DIRECTORY IfFileExists "$INSTDIR\RosBE.cmd" 0 +2 - CreateShortCut "$DESKTOP\ReactOS Build Environment 64-bit.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd" amd64' "$INSTDIR\rosbe.ico" + CreateShortCut "$DESKTOP\ReactOS Build Environment 64-bit - ${PRODUCT_VERSION}.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd" amd64' "$INSTDIR\rosbe.ico" IfFileExists "$INSTDIR\RosBE.ps1" 0 +2 - CreateShortCut "$DESKTOP\ReactOS Build Environment 64-bit - Powershell.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1' amd64" "$INSTDIR\rosbe.ico" + CreateShortCut "$DESKTOP\ReactOS Build Environment 64-bit - ${PRODUCT_VERSION} - PS.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1' amd64" "$INSTDIR\rosbe.ico" SectionEnd Section /o "Quick Launch Shortcuts" SEC04 @@ -161,9 +161,9 @@ ;; SetOutPath $REACTOS_SOURCE_DIRECTORY IfFileExists "$INSTDIR\RosBE.cmd" 0 +2 - CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment 64-bit.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd" amd64' "$INSTDIR\rosbe.ico" + CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment 64-bit - ${PRODUCT_VERSION}.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd" amd64' "$INSTDIR\rosbe.ico" IfFileExists "$INSTDIR\RosBE.ps1" 0 +2 - CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment 64-bit - Powershell.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1' amd64" "$INSTDIR\rosbe.ico" + CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment 64-bit - ${PRODUCT_VERSION} - PS.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1' amd64" "$INSTDIR\rosbe.ico" SectionEnd Section -Post SEC06 @@ -198,10 +198,10 @@ Delete /REBOOTOK "$INSTDIR\Uninstall-${PRODUCT_VERSION}.exe" ;; Whoever dares to change this back into: RMDir /r /REBOOTOK "$INSTDIR" will be KILLED!!! RMDir /REBOOTOK "$INSTDIR" - Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment 64-bit.lnk" - Delete /REBOOTOK "$QUICKLAUNCH\ReactOS Build Environment 64-bit.lnk" - Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment 64-bit - Powershell.lnk" - Delete /REBOOTOK "$QUICKLAUNCH\ReactOS Build Environment 64-bit - Powershell.lnk" + Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment 64-bit - ${PRODUCT_VERSION}.lnk" + Delete /REBOOTOK "$QUICKLAUNCH\ReactOS Build Environment 64-bit - ${PRODUCT_VERSION}.lnk" + Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment 64-bit - ${PRODUCT_VERSION} - PS.lnk" + Delete /REBOOTOK "$QUICKLAUNCH\ReactOS Build Environment 64-bit - ${PRODUCT_VERSION} - PS.lnk" ;; ;; Clean up the registry. Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.c [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.c [iso-8859-1] Mon Aug 23 21:22:55 2010 @@ -62,9 +62,9 @@ } else { - if ((wcslen(filename) + wcslen(L"\\RosBE\\rosbe-options.cmd")) < MAX_PATH) - { - wcscat(filename, L"\\RosBE\\rosbe-options.cmd"); + if ((wcslen(filename) + wcslen(L"\\RosBE\\rosbe-options-1.6.cmd")) < MAX_PATH) + { + wcscat(filename, L"\\RosBE\\rosbe-options-1.6.cmd"); } } } @@ -80,7 +80,7 @@ } else { - wcscpy(filename, L"rosbe-options.cmd"); + wcscpy(filename, L"rosbe-options-1.6.cmd"); } } return filename; @@ -110,9 +110,9 @@ } else { - if ((wcslen(filename) + wcslen(L"\\RosBE\\rosbe-options.ps1")) < MAX_PATH) - { - wcscat(filename, L"\\RosBE\\rosbe-options.ps1"); + if ((wcslen(filename) + wcslen(L"\\RosBE\\rosbe-options-1.6.ps1")) < MAX_PATH) + { + wcscat(filename, L"\\RosBE\\rosbe-options-1.6.ps1"); } } } @@ -128,7 +128,7 @@ } else { - wcscpy(filename, L"rosbe-options.ps1"); + wcscpy(filename, L"rosbe-options-1.6.ps1"); } } return filename;

14 years, 4 months

[cgutman] 48611: - Revert the change from REG_SZ to REG_MULTI_SZ because it turns out that Windows does it this same way (research fail?)

by cgutman＠svn.reactos.org

Author: cgutman Date: Mon Aug 23 21:11:01 2010 New Revision: 48611 URL: http://svn.reactos.org/svn/reactos?rev=48611&view=rev Log: - Revert the change from REG_SZ to REG_MULTI_SZ because it turns out that Windows does it this same way (research fail?) Modified: trunk/reactos/dll/win32/dhcpcsvc/dhcp/dhclient.c trunk/reactos/dll/win32/iphlpapi/resinfo_reactos.c Modified: trunk/reactos/dll/win32/dhcpcsvc/dhcp/dhclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dhcpcsvc/dhcp/dh… ============================================================================== --- trunk/reactos/dll/win32/dhcpcsvc/dhcp/dhclient.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dhcpcsvc/dhcp/dhclient.c [iso-8859-1] Mon Aug 23 21:11:01 2010 @@ -507,25 +507,24 @@ char *nsbuf; int i, addrs = new_lease->options[DHO_DOMAIN_NAME_SERVERS].len / sizeof(ULONG); - int len = 0; - - nsbuf = malloc( addrs * sizeof(IP_ADDRESS_STRING) + 1 ); + + nsbuf = malloc( addrs * sizeof(IP_ADDRESS_STRING) ); if( nsbuf) { - memset(nsbuf, 0, addrs * sizeof(IP_ADDRESS_STRING) + 1); + nsbuf[0] = 0; for( i = 0; i < addrs; i++ ) { nameserver.len = sizeof(ULONG); memcpy( nameserver.iabuf, new_lease->options[DHO_DOMAIN_NAME_SERVERS].data + (i * sizeof(ULONG)), sizeof(ULONG) ); strcat( nsbuf, piaddr(nameserver) ); - len += strlen(nsbuf) + 1; + if( i != addrs-1 ) strcat( nsbuf, "," ); } DH_DbgPrint(MID_TRACE,("Setting DhcpNameserver: %s\n", nsbuf)); - RegSetValueExA( RegKey, "DhcpNameServer", 0, REG_MULTI_SZ, - (LPBYTE)nsbuf, len + 1 ); + RegSetValueExA( RegKey, "DhcpNameServer", 0, REG_SZ, + (LPBYTE)nsbuf, strlen(nsbuf) + 1 ); free( nsbuf ); } Modified: trunk/reactos/dll/win32/iphlpapi/resinfo_reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/resinfo… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/resinfo_reactos.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/resinfo_reactos.c [iso-8859-1] Mon Aug 23 21:11:01 2010 @@ -122,24 +122,47 @@ void EnumNameServers( HANDLE RegHandle, PWCHAR Interface, PVOID Data, EnumNameServersFunc cb ) { - PWCHAR *NameServerString = - QueryRegistryValueStringMulti(RegHandle, L"DhcpNameServer"); - DWORD i; + PWCHAR NameServerString = + QueryRegistryValueString(RegHandle, L"DhcpNameServer"); if (!NameServerString) - NameServerString = QueryRegistryValueStringMulti(RegHandle, L"NameServer"); - - if (!NameServerString) return; - - for (i = 0; NameServerString[i]; i++) - { - cb(Interface, NameServerString[i], Data); - - HeapFree(GetProcessHeap(), 0, NameServerString[i]); - } - - HeapFree(GetProcessHeap(), 0, NameServerString); -} + NameServerString = QueryRegistryValueString(RegHandle, L"NameServer"); + + if (NameServerString) { + /* Now, count the non-empty comma separated */ + DWORD ch; + DWORD LastNameStart = 0; + for (ch = 0; NameServerString[ch]; ch++) { + if (NameServerString[ch] == ',') { + if (ch - LastNameStart > 0) { /* Skip empty entries */ + PWCHAR NameServer = + malloc(((ch - LastNameStart) + 1) * sizeof(WCHAR)); + if (NameServer) { + memcpy(NameServer,NameServerString + LastNameStart, + (ch - LastNameStart) * sizeof(WCHAR)); + NameServer[ch - LastNameStart] = 0; + cb( Interface, NameServer, Data ); + free(NameServer); + LastNameStart = ch +1; + } + } + LastNameStart = ch + 1; /* The first one after the comma */ + } + } + if (ch - LastNameStart > 0) { /* A last name? */ + PWCHAR NameServer = malloc(((ch - LastNameStart) + 1) * sizeof(WCHAR)); + if (NameServer) { + memcpy(NameServer,NameServerString + LastNameStart, + (ch - LastNameStart) * sizeof(WCHAR)); + NameServer[ch - LastNameStart] = 0; + cb( Interface, NameServer, Data ); + free(NameServer); + } + } + ConsumeRegValueString(NameServerString); + } +} + static void CreateNameServerListEnumNamesFuncCount( PWCHAR Interface, PWCHAR Server, PVOID _Data ) {

14 years, 4 months

[dreimer] 48610: Increase the CCache size by default and make it user customizeable.

by dreimer＠svn.reactos.org

Author: dreimer Date: Mon Aug 23 15:57:46 2010 New Revision: 48610 URL: http://svn.reactos.org/svn/reactos?rev=48610&view=rev Log: Increase the CCache size by default and make it user customizeable. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd 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] Mon Aug 23 15:57:46 2010 @@ -20,6 +20,12 @@ } if ($_ROSBE_USECCACHE -eq 1) { + if ("$_ROSBE_CACHESIZE" -ne "") { + $_ROSBE_CACHESIZEG = "$_ROSBE_CACHESIZE" + "G" + &{IEX "&'ccache.exe' -M $_ROSBE_CACHESIZEG"} + } else { + &{IEX "&'ccache.exe' -M 8G"} + } $_ROSBE_CCACHE = "ccache " } else { $_ROSBE_CCACHE = $null 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] Mon Aug 23 15:57:46 2010 @@ -83,6 +83,8 @@ $ENV:CCACHE_DIR = "$_ROSBE_CCACHE_DIR" } +$global:_ROSBE_CACHESIZE = "4" + $ENV:C_INCLUDE_PATH = $null $ENV:CPLUS_INCLUDE_PATH = $null $ENV:LIBRARY_PATH = $null 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] Mon Aug 23 15:57:46 2010 @@ -29,6 +29,11 @@ ) if "%_ROSBE_USECCACHE%" == "1" ( + if not "%_ROSBE_CACHESIZE%" == "" ( + ccache -M %_ROSBE_CACHESIZE%G + ) else ( + ccache -M 8G + ) set _ROSBE_CCACHE=ccache ) else ( set _ROSBE_CCACHE= 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] Mon Aug 23 15:57:46 2010 @@ -60,6 +60,8 @@ ) else ( set CCACHE_DIR=%_ROSBE_CCACHE_DIR% ) + +set _ROSBE_CACHESIZE=4 set C_INCLUDE_PATH= set CPLUS_INCLUDE_PATH=

14 years, 4 months

[akhaldi] 48609: [CMAKE] - Update user32 now that we have a target named imm32.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Aug 23 15:23:35 2010 New Revision: 48609 URL: http://svn.reactos.org/svn/reactos?rev=48609&view=rev Log: [CMAKE] - Update user32 now that we have a target named imm32. Modified: branches/cmake-bringup/dll/win32/user32/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/user32/… ============================================================================== --- branches/cmake-bringup/dll/win32/user32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/user32/CMakeLists.txt [iso-8859-1] Mon Aug 23 15:23:35 2010 @@ -35,7 +35,7 @@ wine ${REACTOS_SOURCE_DIR}/dll/win32/gdi32/libgdi32.a ${REACTOS_SOURCE_DIR}/dll/win32/advapi32/libadvapi32.a - imm32 + -limm32 win32ksys pseh ${REACTOS_SOURCE_DIR}/dll/win32/kernel32/libkernel32.a

14 years, 4 months

[akhaldi] 48608: [CMAKE] - Add fmifs, fusion, getuname, hid, httpapi, iccvid, icmp, imaadp32.acm, imagehlp, imm32, initpki, iphlpapi, itircl, loadperf, lpk, lz32, mapi32, mciavi32, mcicda and mciqt...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Aug 23 14:40:47 2010 New Revision: 48608 URL: http://svn.reactos.org/svn/reactos?rev=48608&view=rev Log: [CMAKE] - Add fmifs, fusion, getuname, hid, httpapi, iccvid, icmp, imaadp32.acm, imagehlp, imm32, initpki, iphlpapi, itircl, loadperf, lpk, lz32, mapi32, mciavi32, mcicda and mciqtz32 to build. Added: branches/cmake-bringup/dll/win32/fmifs/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/fusion/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/getuname/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/hid/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/httpapi/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/iccvid/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/icmp/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/imaadp32.acm/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/imagehlp/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/imm32/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/initpki/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/iphlpapi/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/itircl/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/loadperf/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/lpk/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/lz32/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/mapi32/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/mciavi32/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/mcicda/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/mciqtz32/CMakeLists.txt (with props) Removed: branches/cmake-bringup/dll/win32/imm32/imm.spec Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/CMakeLi… ============================================================================== --- branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] Mon Aug 23 14:40:47 2010 @@ -23,7 +23,27 @@ add_subdirectory(dnsapi) add_subdirectory(dwmapi) add_subdirectory(faultrep) +add_subdirectory(fmifs) +add_subdirectory(fusion) add_subdirectory(gdi32) +add_subdirectory(getuname) +add_subdirectory(hid) +add_subdirectory(httpapi) +add_subdirectory(iccvid) +add_subdirectory(icmp) +add_subdirectory(imaadp32.acm) +add_subdirectory(imagehlp) +add_subdirectory(imm32) +add_subdirectory(initpki) +add_subdirectory(iphlpapi) +add_subdirectory(itircl) add_subdirectory(kernel32) +add_subdirectory(loadperf) +add_subdirectory(lpk) +add_subdirectory(lz32) +add_subdirectory(mapi32) +add_subdirectory(mciavi32) +add_subdirectory(mcicda) +add_subdirectory(mciqtz32) add_subdirectory(msvcrt) add_subdirectory(user32) Added: branches/cmake-bringup/dll/win32/fmifs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/fmifs/C… ============================================================================== --- branches/cmake-bringup/dll/win32/fmifs/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/fmifs/CMakeLists.txt [iso-8859-1] Mon Aug 23 14:40:47 2010 @@ -1,0 +1,27 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") + +spec2def(fmifs ${CMAKE_CURRENT_SOURCE_DIR}/fmifs.spec ${CMAKE_CURRENT_BINARY_DIR}/fmifs.def) + +list(APPEND SOURCE + chkdsk.c + compress.c + diskcopy.c + extend.c + format.c + init.c + media.c + query.c + fmifs.rc) + +add_library(fmifs SHARED ${SOURCE}) + +set_target_properties(fmifs PROPERTIES LINK_FLAGS "-Wl,-entry,_InitializeFmIfs@12") + +target_link_libraries(fmifs + ${CMAKE_CURRENT_BINARY_DIR}/fmifs.def + ${REACTOS_SOURCE_DIR}/dll/win32/kernel32/libkernel32.a + ${REACTOS_SOURCE_DIR}/dll/ntdll/libntdll.a) + +add_pch(fmifs ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) +add_dependencies(fmifs fmifs_def psdk) Propchange: branches/cmake-bringup/dll/win32/fmifs/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/fusion/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/fusion/… ============================================================================== --- branches/cmake-bringup/dll/win32/fusion/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/fusion/CMakeLists.txt [iso-8859-1] Mon Aug 23 14:40:47 2010 @@ -1,0 +1,29 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(fusion ${CMAKE_CURRENT_SOURCE_DIR}/fusion.spec ${CMAKE_CURRENT_BINARY_DIR}/fusion.def) + +add_library(fusion SHARED + asmcache.c + asmenum.c + asmname.c + assembly.c + fusion.c + fusion_main.c) + +set_target_properties(fusion PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(fusion + ${CMAKE_CURRENT_BINARY_DIR}/fusion.def + wine + mingw_common + -lshlwapi + ${REACTOS_SOURCE_DIR}/dll/win32/advapi32/libadvapi32.a + ${REACTOS_SOURCE_DIR}/dll/win32/dbghelp/libdbghelp.a + ${REACTOS_SOURCE_DIR}/dll/win32/user32/libuser32.a) + +add_dependencies(fusion fusion_def psdk) Propchange: branches/cmake-bringup/dll/win32/fusion/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/getuname/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/getunam… ============================================================================== --- branches/cmake-bringup/dll/win32/getuname/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/getuname/CMakeLists.txt [iso-8859-1] Mon Aug 23 14:40:47 2010 @@ -1,0 +1,19 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") + +add_definitions(-DUNICODE -D_UNICODE) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(getuname ${CMAKE_CURRENT_SOURCE_DIR}/getuname.spec ${CMAKE_CURRENT_BINARY_DIR}/getuname.def) + +add_library(getuname SHARED getuname.c getuname.rc) + +set_target_properties(getuname PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(getuname + ${CMAKE_CURRENT_BINARY_DIR}/getuname.def + ${REACTOS_SOURCE_DIR}/dll/win32/kernel32/libkernel32.a + ${REACTOS_SOURCE_DIR}/dll/ntdll/libntdll.a) + +add_dependencies(getuname getuname_def psdk) Propchange: branches/cmake-bringup/dll/win32/getuname/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/hid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/hid/CMa… ============================================================================== --- branches/cmake-bringup/dll/win32/hid/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/hid/CMakeLists.txt [iso-8859-1] Mon Aug 23 14:40:47 2010 @@ -1,0 +1,22 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") + +add_definitions(-DUNICODE -D_UNICODE) + +list(APPEND SOURCE hid.c stubs.c hid.rc) + +spec2def(hid ${CMAKE_CURRENT_SOURCE_DIR}/hid.spec ${CMAKE_CURRENT_BINARY_DIR}/hid.def) + +add_library(hid SHARED + ${SOURCE} + ${CMAKE_CURRENT_BINARY_DIR}/hid_precomp.h.gch) + +set_target_properties(hid PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(hid + ${CMAKE_CURRENT_BINARY_DIR}/hid.def + ${REACTOS_SOURCE_DIR}/dll/win32/kernel32/libkernel32.a + ${REACTOS_SOURCE_DIR}/dll/ntdll/libntdll.a) + +add_pch(hid ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) +add_dependencies(hid hid_def psdk) Propchange: branches/cmake-bringup/dll/win32/hid/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/httpapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/httpapi… ============================================================================== --- branches/cmake-bringup/dll/win32/httpapi/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/httpapi/CMakeLists.txt [iso-8859-1] Mon Aug 23 14:40:47 2010 @@ -1,0 +1,19 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(httpapi ${CMAKE_CURRENT_SOURCE_DIR}/httpapi.spec ${CMAKE_CURRENT_BINARY_DIR}/httpapi.def) + +add_library(httpapi SHARED httpapi_main.c) + +set_target_properties(httpapi PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(httpapi + ${CMAKE_CURRENT_BINARY_DIR}/httpapi.def + wine + mingw_common) + +add_dependencies(httpapi httpapi_def psdk) Propchange: branches/cmake-bringup/dll/win32/httpapi/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/iccvid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/iccvid/… ============================================================================== --- branches/cmake-bringup/dll/win32/iccvid/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/iccvid/CMakeLists.txt [iso-8859-1] Mon Aug 23 14:40:47 2010 @@ -1,0 +1,20 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(iccvid ${CMAKE_CURRENT_SOURCE_DIR}/iccvid.spec ${CMAKE_CURRENT_BINARY_DIR}/iccvid.def) + +add_library(iccvid SHARED iccvid.c rsrc.rc) + +set_target_properties(iccvid PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(iccvid + ${CMAKE_CURRENT_BINARY_DIR}/iccvid.def + wine + ${REACTOS_SOURCE_DIR}/dll/win32/user32/libuser32.a + mingw_common) + +add_dependencies(iccvid iccvid_def psdk) Propchange: branches/cmake-bringup/dll/win32/iccvid/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/icmp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/icmp/CM… ============================================================================== --- branches/cmake-bringup/dll/win32/icmp/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/icmp/CMakeLists.txt [iso-8859-1] Mon Aug 23 14:40:47 2010 @@ -1,0 +1,18 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(icmp ${CMAKE_CURRENT_SOURCE_DIR}/icmp.spec ${CMAKE_CURRENT_BINARY_DIR}/icmp.def) + +add_library(icmp SHARED icmp_main.c icmp.rc) + +set_target_properties(icmp PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(icmp + ${CMAKE_CURRENT_BINARY_DIR}/icmp.def + wine + -lws2_32 + mingw_common) + +add_dependencies(icmp icmp_def psdk) Propchange: branches/cmake-bringup/dll/win32/icmp/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/imaadp32.acm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/imaadp3… ============================================================================== --- branches/cmake-bringup/dll/win32/imaadp32.acm/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/imaadp32.acm/CMakeLists.txt [iso-8859-1] Mon Aug 23 14:40:47 2010 @@ -1,0 +1,29 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +add_definitions(-D_DLL -D__USE_CRTIMP) + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/imaadp32.acm.def + COMMAND native-winebuild -o ${CMAKE_CURRENT_BINARY_DIR}/imaadp32.acm.def --def -E ${CMAKE_CURRENT_SOURCE_DIR}/imaadp32.acm.spec --filename imaadp32.acm + DEPENDS native-winebuild) +set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/imaadp32.acm.def PROPERTIES GENERATED TRUE) +add_custom_target(imaadp32.acm_def ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/imaadp32.acm.def) + +add_library(imaadp32.acm SHARED imaadp32.c) + +set_target_properties(imaadp32.acm PROPERTIES LINK_FLAGS "-Wl,-entry,0" SUFFIX "") + +target_link_libraries(imaadp32.acm + ${CMAKE_CURRENT_BINARY_DIR}/imaadp32.acm.def + wine + -lwinmm + ${REACTOS_SOURCE_DIR}/dll/win32/user32/libuser32.a + mingw_common + ${REACTOS_SOURCE_DIR}/dll/win32/msvcrt/libmsvcrt.a) + +add_dependencies(imaadp32.acm imaadp32.acm_def psdk) Propchange: branches/cmake-bringup/dll/win32/imaadp32.acm/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/imagehlp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/imagehl… ============================================================================== --- branches/cmake-bringup/dll/win32/imagehlp/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/imagehlp/CMakeLists.txt [iso-8859-1] Mon Aug 23 14:40:47 2010 @@ -1,0 +1,32 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +add_definitions(-D_DLL -D__USE_CRTIMP) +add_definitions(-D_IMAGEHLP_SOURCE_) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(imagehlp ${CMAKE_CURRENT_SOURCE_DIR}/imagehlp.spec ${CMAKE_CURRENT_BINARY_DIR}/imagehlp.def) + +list(APPEND SOURCE + access.c + imagehlp_main.c + integrity.c + modify.c + imagehlp.rc) + +add_library(imagehlp SHARED + ${CMAKE_CURRENT_BINARY_DIR}/imagehlp_precomp.h.gch + ${SOURCE}) + +set_target_properties(imagehlp PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(imagehlp + ${CMAKE_CURRENT_BINARY_DIR}/imagehlp.def + wine + ${REACTOS_SOURCE_DIR}/dll/win32/dbghelp/libdbghelp.a + mingw_common + ${REACTOS_SOURCE_DIR}/dll/win32/msvcrt/libmsvcrt.a) + +add_pch(imagehlp ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) +add_dependencies(imagehlp imagehlp_def psdk) Propchange: branches/cmake-bringup/dll/win32/imagehlp/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/imm32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/imm32/C… ============================================================================== --- branches/cmake-bringup/dll/win32/imm32/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/imm32/CMakeLists.txt [iso-8859-1] Mon Aug 23 14:40:47 2010 @@ -1,0 +1,24 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +add_definitions(-D__WINESRC__) + +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(imm32 ${CMAKE_CURRENT_SOURCE_DIR}/imm32.spec ${CMAKE_CURRENT_BINARY_DIR}/imm32.def) + +add_library(imm32 SHARED imm.c version.rc) + +set_target_properties(imm32 PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(imm32 + ${CMAKE_CURRENT_BINARY_DIR}/imm32.def + wine + ${REACTOS_SOURCE_DIR}/dll/win32/advapi32/libadvapi32.a + ${REACTOS_SOURCE_DIR}/dll/win32/user32/libuser32.a + mingw_common) + +add_dependencies(imm32 imm32_def psdk) Propchange: branches/cmake-bringup/dll/win32/imm32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Removed: branches/cmake-bringup/dll/win32/imm32/imm.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/imm32/i… ============================================================================== --- branches/cmake-bringup/dll/win32/imm32/imm.spec [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/imm32/imm.spec (removed) @@ -1,54 +1,0 @@ -4 stub IMMGETDEFAULTIMEWND -7 stub IMMGETDESCRIPTIONA -8 stub IMMGETIMEFILENAMEA -9 stub IMMGETPROPERTY -11 stub IMMINSTALLIMEA -#15 stub ___EXPORTEDSTUB -17 stub IMMISIME -25 stub IMMGETHOTKEY -26 stub IMMSETHOTKEY -27 stub IMMSIMULATEHOTKEY -35 stub IMMCREATECONTEXT -36 stub IMMDESTROYCONTEXT -37 stub IMMGETCONTEXT -38 stub IMMRELEASECONTEXT -39 stub IMMASSOCIATECONTEXT -41 stub IMMASSOCIATECONTEXTEX -43 stub IMMGETCOMPOSITIONSTRINGA -44 stub IMMSETCOMPOSITIONSTRINGA -45 stub IMMGETCANDIDATELISTCOUNTA -46 stub IMMGETCANDIDATELISTA -47 stub IMMGETGUIDELINEA -51 stub IMMGETCONVERSIONSTATUS -52 stub IMMSETCONVERSIONSTATUS -53 stub IMMGETOPENSTATUS -54 stub IMMSETOPENSTATUS -55 stub IMMGETCOMPOSITIONFONTA -56 stub IMMSETCOMPOSITIONFONTA -61 stub IMMCONFIGUREIMEA -63 stub IMMESCAPEA -64 stub IMMGETCONVERSIONLISTA -65 stub IMMNOTIFYIME -71 stub IMMISUIMESSAGEA -72 stub IMMGENERATEMESSAGE -73 stub IMMGETVIRTUALKEY -87 stub IMMGETSTATUSWINDOWPOS -88 stub IMMSETSTATUSWINDOWPOS -89 stub IMMGETCOMPOSITIONWINDOW -90 stub IMMSETCOMPOSITIONWINDOW -91 stub IMMGETCANDIDATEWINDOW -92 stub IMMSETCANDIDATEWINDOW -95 stub IMMUNINSTALLIMEA -110 stub IMMLOCKIMC -111 stub IMMUNLOCKIMC -112 stub IMMGETIMCLOCKCOUNT -116 stub IMMCREATEIMCC -117 stub IMMDESTROYIMCC -118 stub IMMLOCKIMCC -119 stub IMMUNLOCKIMCC -120 stub IMMGETIMCCLOCKCOUNT -121 stub IMMRESIZEIMCC -122 stub IMMGETIMCCSIZE -#160 stub FT_IMMFTHKTHKCONNECTIONDATA -#161 stub IMM32THKCONNECTIONDATASL -180 stub IMMSYNCCONVERSION Added: branches/cmake-bringup/dll/win32/initpki/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/initpki… ============================================================================== --- branches/cmake-bringup/dll/win32/initpki/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/initpki/CMakeLists.txt [iso-8859-1] Mon Aug 23 14:40:47 2010 @@ -1,0 +1,19 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(initpki ${CMAKE_CURRENT_SOURCE_DIR}/initpki.spec ${CMAKE_CURRENT_BINARY_DIR}/initpki.def) + +add_library(initpki SHARED main.c) + +set_target_properties(initpki PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(initpki + ${CMAKE_CURRENT_BINARY_DIR}/initpki.def + wine + mingw_common) + +add_dependencies(initpki initpki_def psdk) Propchange: branches/cmake-bringup/dll/win32/initpki/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/iphlpapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/iphlpap… ============================================================================== --- branches/cmake-bringup/dll/win32/iphlpapi/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/iphlpapi/CMakeLists.txt [iso-8859-1] Mon Aug 23 14:40:47 2010 @@ -1,0 +1,36 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +add_definitions(-D_DLL -D__USE_CRTIMP) +add_definitions(-DUNICODE -D_UNICODE) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +include_directories(${REACTOS_SOURCE_DIR}/dll/win32/dhcpcsvc/include) +include_directories(${REACTOS_SOURCE_DIR}/lib/tdilib) + +spec2def(iphlpapi ${CMAKE_CURRENT_SOURCE_DIR}/iphlpapi.spec ${CMAKE_CURRENT_BINARY_DIR}/iphlpapi.def) + +add_library(iphlpapi SHARED + dhcp_reactos.c + ifenum_reactos.c + ipstats_reactos.c + iphlpapi_main.c + media.c + registry.c + resinfo_reactos.c + route_reactos.c + iphlpapi.rc) + +set_target_properties(iphlpapi PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(iphlpapi + ${CMAKE_CURRENT_BINARY_DIR}/iphlpapi.def + wine + tdilib + ${REACTOS_SOURCE_DIR}/dll/win32/dhcpcsvc/libdhcpcsvc.a + ${REACTOS_SOURCE_DIR}/dll/win32/advapi32/libadvapi32.a + -lws2_32 + mingw_common + ${REACTOS_SOURCE_DIR}/dll/win32/msvcrt/libmsvcrt.a) + +add_dependencies(iphlpapi iphlpapi_def psdk) Propchange: branches/cmake-bringup/dll/win32/iphlpapi/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/itircl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/itircl/… ============================================================================== --- branches/cmake-bringup/dll/win32/itircl/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/itircl/CMakeLists.txt [iso-8859-1] Mon Aug 23 14:40:47 2010 @@ -1,0 +1,19 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(itircl ${CMAKE_CURRENT_SOURCE_DIR}/itircl.spec ${CMAKE_CURRENT_BINARY_DIR}/itircl.def) + +add_library(itircl SHARED itircl_main.c) + +set_target_properties(itircl PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(itircl + ${CMAKE_CURRENT_BINARY_DIR}/itircl.def + wine + mingw_common) + +add_dependencies(itircl itircl_def psdk) Propchange: branches/cmake-bringup/dll/win32/itircl/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/loadperf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/loadper… ============================================================================== --- branches/cmake-bringup/dll/win32/loadperf/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/loadperf/CMakeLists.txt [iso-8859-1] Mon Aug 23 14:40:47 2010 @@ -1,0 +1,19 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(loadperf ${CMAKE_CURRENT_SOURCE_DIR}/loadperf.spec ${CMAKE_CURRENT_BINARY_DIR}/loadperf.def) + +add_library(loadperf SHARED loadperf_main.c) + +set_target_properties(loadperf PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(loadperf + ${CMAKE_CURRENT_BINARY_DIR}/loadperf.def + wine + mingw_common) + +add_dependencies(loadperf loadperf_def psdk) Propchange: branches/cmake-bringup/dll/win32/loadperf/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/lpk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/lpk/CMa… ============================================================================== --- branches/cmake-bringup/dll/win32/lpk/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/lpk/CMakeLists.txt [iso-8859-1] Mon Aug 23 14:40:47 2010 @@ -1,0 +1,22 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +add_definitions(-DLANGPACK) +add_definitions(-DUNICODE -D_UNICODE) + +include_directories(include) + +spec2def(lpk ${CMAKE_CURRENT_SOURCE_DIR}/lpk.spec ${CMAKE_CURRENT_BINARY_DIR}/lpk.def) + +add_library(lpk SHARED dllmain.c stub.c lpk.rc) + +set_target_properties(lpk PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(lpk + ${CMAKE_CURRENT_BINARY_DIR}/lpk.def + ${REACTOS_SOURCE_DIR}/dll/win32/user32/libuser32.a + -lusp10 + ${REACTOS_SOURCE_DIR}/dll/win32/kernel32/libkernel32.a + ${REACTOS_SOURCE_DIR}/dll/ntdll/libntdll.a) + +add_dependencies(lpk lpk_def psdk) Propchange: branches/cmake-bringup/dll/win32/lpk/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/lz32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/lz32/CM… ============================================================================== --- branches/cmake-bringup/dll/win32/lz32/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/lz32/CMakeLists.txt [iso-8859-1] Mon Aug 23 14:40:47 2010 @@ -1,0 +1,19 @@ + +set(CMAKE_RC_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(lz32 ${CMAKE_CURRENT_SOURCE_DIR}/lz32.spec ${CMAKE_CURRENT_BINARY_DIR}/lz32.def) + +add_library(lz32 SHARED version.rc) + +set_target_properties(lz32 PROPERTIES LINK_FLAGS "-Wl,-entry,0") + +target_link_libraries(lz32 + ${CMAKE_CURRENT_BINARY_DIR}/lz32.def + wine + mingw_common) + +add_dependencies(lz32 lz32_def psdk) Propchange: branches/cmake-bringup/dll/win32/lz32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/mapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mapi32/… ============================================================================== --- branches/cmake-bringup/dll/win32/mapi32/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/mapi32/CMakeLists.txt [iso-8859-1] Mon Aug 23 14:40:47 2010 @@ -1,0 +1,30 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(mapi32 ${CMAKE_CURRENT_SOURCE_DIR}/mapi32.spec ${CMAKE_CURRENT_BINARY_DIR}/mapi32.def) + +add_library(mapi32 SHARED + imalloc.c + mapi32_main.c + prop.c + sendmail.c + util.c + version.rc) + +set_target_properties(mapi32 PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(mapi32 + ${CMAKE_CURRENT_BINARY_DIR}/mapi32.def + wine + -lshlwapi + -lshell32 + -luuid + mingw_common + ${REACTOS_SOURCE_DIR}/dll/win32/user32/libuser32.a + ${REACTOS_SOURCE_DIR}/dll/win32/advapi32/libadvapi32.a) + +add_dependencies(mapi32 mapi32_def psdk) Propchange: branches/cmake-bringup/dll/win32/mapi32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/mciavi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mciavi3… ============================================================================== --- branches/cmake-bringup/dll/win32/mciavi32/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/mciavi32/CMakeLists.txt [iso-8859-1] Mon Aug 23 14:40:47 2010 @@ -1,0 +1,28 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(mciavi32 ${CMAKE_CURRENT_SOURCE_DIR}/mciavi32.spec ${CMAKE_CURRENT_BINARY_DIR}/mciavi32.def) + +add_library(mciavi32 SHARED + info.c + mciavi.c + mmoutput.c + wnd.c + mciavi_res.rc) + +set_target_properties(mciavi32 PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(mciavi32 + ${CMAKE_CURRENT_BINARY_DIR}/mciavi32.def + wine + -lmsvfw32 + -lwinmm + mingw_common + ${REACTOS_SOURCE_DIR}/dll/win32/user32/libuser32.a + ${REACTOS_SOURCE_DIR}/dll/win32/gdi32/libgdi32.a) + +add_dependencies(mciavi32 mciavi32_def psdk) Propchange: branches/cmake-bringup/dll/win32/mciavi32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/mcicda/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mcicda/… ============================================================================== --- branches/cmake-bringup/dll/win32/mcicda/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/mcicda/CMakeLists.txt [iso-8859-1] Mon Aug 23 14:40:47 2010 @@ -1,0 +1,21 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(mcicda ${CMAKE_CURRENT_SOURCE_DIR}/mcicda.spec ${CMAKE_CURRENT_BINARY_DIR}/mcicda.def) + +add_library(mcicda SHARED mcicda.c) + +set_target_properties(mcicda PROPERTIES LINK_FLAGS "-Wl,-entry,0") + +target_link_libraries(mcicda + ${CMAKE_CURRENT_BINARY_DIR}/mcicda.def + wine + -lwinmm + mingw_common + ${REACTOS_SOURCE_DIR}/dll/win32/user32/libuser32.a) + +add_dependencies(mcicda mcicda_def psdk) Propchange: branches/cmake-bringup/dll/win32/mcicda/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/mciqtz32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mciqtz3… ============================================================================== --- branches/cmake-bringup/dll/win32/mciqtz32/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/mciqtz32/CMakeLists.txt [iso-8859-1] Mon Aug 23 14:40:47 2010 @@ -1,0 +1,25 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(mciqtz32 ${CMAKE_CURRENT_SOURCE_DIR}/mciqtz32.spec ${CMAKE_CURRENT_BINARY_DIR}/mciqtz32.def) + +add_library(mciqtz32 SHARED mciqtz.c version.rc) + +set_target_properties(mciqtz32 PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(mciqtz32 + ${CMAKE_CURRENT_BINARY_DIR}/mciqtz32.def + wine + -lwinmm + -loleaut32 + -lole32 + strmiids + mingw_common + ${REACTOS_SOURCE_DIR}/dll/win32/user32/libuser32.a + ${REACTOS_SOURCE_DIR}/dll/win32/gdi32/libgdi32.a) + +add_dependencies(mciqtz32 mciqtz32_def psdk) Propchange: branches/cmake-bringup/dll/win32/mciqtz32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

14 years, 4 months

[akhaldi] 48607: [CMAKE] - Temporarily add libdbghelp.a and libdhcpcsvc.a

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Aug 23 14:34:34 2010 New Revision: 48607 URL: http://svn.reactos.org/svn/reactos?rev=48607&view=rev Log: [CMAKE] - Temporarily add libdbghelp.a and libdhcpcsvc.a Added: branches/cmake-bringup/dll/win32/dbghelp/libdbghelp.a (with props) branches/cmake-bringup/dll/win32/dhcpcsvc/libdhcpcsvc.a (with props) Added: branches/cmake-bringup/dll/win32/dbghelp/libdbghelp.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/dbghelp… ============================================================================== Binary file - no diff available. Propchange: branches/cmake-bringup/dll/win32/dbghelp/libdbghelp.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/cmake-bringup/dll/win32/dhcpcsvc/libdhcpcsvc.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/dhcpcsv… ============================================================================== Binary file - no diff available. Propchange: branches/cmake-bringup/dll/win32/dhcpcsvc/libdhcpcsvc.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

14 years, 4 months

[tkreuzer] 48606: [NTOSKRNL] - Rewrite MiFindEmptyAddressRangeDownTree. The old implementation's "most awesome loop" duplicated both the initialization and the interation steps. It was also overcom...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Aug 23 03:00:03 2010 New Revision: 48606 URL: http://svn.reactos.org/svn/reactos?rev=48606&view=rev Log: [NTOSKRNL] - Rewrite MiFindEmptyAddressRangeDownTree. The old implementation's "most awesome loop" duplicated both the initialization and the interation steps. It was also overcomplicated. The new implementation additionally returns the parent for the following table insertion, so this doesnt need to be done in an extra search. The return value is changed from NTSTATUS to TABLE_SEARCH_RESULT - Modify MiInsertNode to accept a parent and TABLE_SEARCH_RESULT instead of searching for a free location. - Modify MiCreatePebOrTeb to make use of the new features - Handle failed allocation of the PEB/TEB - Fixes a failed assertion that Olaf got - I tested this code quite some time and no problems were found Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/ARM3/procsup.c trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Mon Aug 23 03:00:03 2010 @@ -1050,21 +1050,24 @@ IN PMM_AVL_TABLE Table ); -NTSTATUS +TABLE_SEARCH_RESULT NTAPI MiFindEmptyAddressRangeDownTree( IN SIZE_T Length, IN ULONG_PTR BoundaryAddress, IN ULONG_PTR Alignment, IN PMM_AVL_TABLE Table, - OUT PULONG_PTR Base + OUT PULONG_PTR Base, + OUT PMMADDRESS_NODE *Parent ); VOID NTAPI MiInsertNode( + IN PMM_AVL_TABLE Table, IN PMMADDRESS_NODE NewNode, - IN PMM_AVL_TABLE Table + PMMADDRESS_NODE Parent, + TABLE_SEARCH_RESULT Result ); VOID Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/procsup.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] Mon Aug 23 03:00:03 2010 @@ -55,6 +55,8 @@ ULONG RandomCoeff; ULONG_PTR StartAddress, EndAddress; LARGE_INTEGER CurrentTime; + TABLE_SEARCH_RESULT Result = TableFoundNode; + PMMADDRESS_NODE Parent; /* Allocate a VAD */ Vad = ExAllocatePoolWithTag(NonPagedPool, sizeof(MMVAD_LONG), 'ldaV'); @@ -93,26 +95,29 @@ StartAddress -= RandomCoeff; EndAddress = StartAddress + ROUND_TO_PAGES(Size) - 1; - /* See if this VA range can be obtained */ - if (!MiCheckForConflictingNode(StartAddress >> PAGE_SHIFT, - EndAddress >> PAGE_SHIFT, - &Process->VadRoot)) - { - /* No conflict, use this address */ - *Base = StartAddress; - goto AfterFound; - } - } - - /* For TEBs, or if a PEB location couldn't be found, scan the VAD root */ - Status = MiFindEmptyAddressRangeDownTree(ROUND_TO_PAGES(Size), - (ULONG_PTR)MM_HIGHEST_VAD_ADDRESS + 1, - PAGE_SIZE, - &Process->VadRoot, - Base); - ASSERT(NT_SUCCESS(Status)); - -AfterFound: + /* Try to find something below the random upper margin */ + Result = MiFindEmptyAddressRangeDownTree(ROUND_TO_PAGES(Size), + EndAddress, + PAGE_SIZE, + &Process->VadRoot, + Base, + &Parent); + } + + /* Check for success. TableFoundNode means nothing free. */ + if (Result == TableFoundNode) + { + /* For TEBs, or if a PEB location couldn't be found, scan the VAD root */ + Result = MiFindEmptyAddressRangeDownTree(ROUND_TO_PAGES(Size), + (ULONG_PTR)MM_HIGHEST_VAD_ADDRESS + 1, + PAGE_SIZE, + &Process->VadRoot, + Base, + &Parent); + /* Bail out, if still nothing free was found */ + if (Result == TableFoundNode) return STATUS_NO_MEMORY; + } + /* Validate that it came from the VAD ranges */ ASSERT(*Base >= (ULONG_PTR)MI_LOWEST_VAD_ADDRESS); @@ -132,8 +137,8 @@ /* Insert the VAD */ ASSERT(Vad->EndingVpn >= Vad->StartingVpn); Process->VadRoot.NodeHint = Vad; - MiInsertNode((PVOID)Vad, &Process->VadRoot); - + MiInsertNode(&Process->VadRoot, (PVOID)Vad, Parent, Result); + /* Release the working set */ MiUnlockProcessWorkingSet(Process, Thread); Modified: trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c [iso-8859-1] Mon Aug 23 03:00:03 2010 @@ -4,6 +4,7 @@ * FILE: ntoskrnl/mm/ARM3/vadnode.c * PURPOSE: ARM Memory Manager VAD Node Algorithms * PROGRAMMERS: ReactOS Portable Systems Group + * Timo Kreuzer (timo.kreuzer(a)reactos.org) */ /* INCLUDES *******************************************************************/ @@ -92,19 +93,14 @@ VOID NTAPI -MiInsertNode(IN PMMADDRESS_NODE NewNode, - IN PMM_AVL_TABLE Table) -{ - PMMADDRESS_NODE NodeOrParent = NULL; - TABLE_SEARCH_RESULT Result; - - /* Find the node's parent, and where to insert this node */ - Result = RtlpFindAvlTableNodeOrParent(Table, - (PVOID)NewNode->StartingVpn, - &NodeOrParent); - +MiInsertNode( + IN PMM_AVL_TABLE Table, + IN PMMADDRESS_NODE NewNode, + PMMADDRESS_NODE Parent, + TABLE_SEARCH_RESULT Result) +{ /* Insert it into the tree */ - RtlpInsertAvlTreeNode(Table, NewNode, NodeOrParent, Result); + RtlpInsertAvlTreeNode(Table, NewNode, Parent, Result); } VOID @@ -155,17 +151,18 @@ return NULL; } -NTSTATUS -NTAPI -MiFindEmptyAddressRangeDownTree(IN SIZE_T Length, - IN ULONG_PTR BoundaryAddress, - IN ULONG_PTR Alignment, - IN PMM_AVL_TABLE Table, - OUT PULONG_PTR Base) -{ - PMMADDRESS_NODE Node, PreviousNode; - ULONG_PTR CandidateAddress, EndAddress; - ULONG AlignEndVpn, CandidateVpn, BoundaryVpn, LowestVpn, StartVpn, EndVpn; +TABLE_SEARCH_RESULT +NTAPI +MiFindEmptyAddressRangeDownTree( + IN SIZE_T Length, + IN ULONG_PTR BoundaryAddress, + IN ULONG_PTR Alignment, + IN PMM_AVL_TABLE Table, + OUT PULONG_PTR Base, + OUT PMMADDRESS_NODE *Parent) +{ + PMMADDRESS_NODE Node, LowestNode, Child; + ULONG LowVpn, HighVpn; PFN_NUMBER PageCount; /* Sanity checks */ @@ -174,107 +171,82 @@ /* Compute page length, make sure the boundary address is valid */ Length = PAGE_ROUND_UP(Length); + PageCount = Length >> PAGE_SHIFT; if ((BoundaryAddress + 1) < Length) return STATUS_NO_MEMORY; - - /* Compute the highest address to start at */ - CandidateAddress = ROUND_UP(BoundaryAddress + 1 - Length, Alignment); /* Check if the table is empty */ - if (!Table->NumberGenericTableElements) + if (Table->NumberGenericTableElements == 0) { /* Tree is empty, the candidate address is already the best one */ - *Base = CandidateAddress; - return STATUS_SUCCESS; - } - - /* Starting from the root, go down until the right-most child */ - Node = RtlRightChildAvl(&Table->BalancedRoot); - while (RtlRightChildAvl(Node)) Node = RtlRightChildAvl(Node); - - /* Get the aligned ending address of this VPN */ - EndAddress = ROUND_UP((Node->EndingVpn << PAGE_SHIFT) | (PAGE_SIZE - 1), - Alignment); - - /* Can we fit the address without overflowing into the node? */ - if ((EndAddress < BoundaryAddress) && - ((BoundaryAddress - EndAddress) > Length)) + *Base = ROUND_DOWN(BoundaryAddress + 1 - Length, Alignment); + return TableEmptyTree; + } + + /* Calculate the initial upper margin */ + HighVpn = BoundaryAddress >> PAGE_SHIFT; + + /* Starting from the root, go down until the right-most child, + trying to stay below the boundary. */ + LowestNode = Node = RtlRightChildAvl(&Table->BalancedRoot); + while ( (Child = RtlRightChildAvl(Node)) && + Child->EndingVpn < HighVpn ) Node = Child; + + /* Now loop the Vad nodes */ + while (Node) + { + /* Keep track of the lowest node */ + LowestNode = Node; + + /* Calculate the lower margin */ + LowVpn = ROUND_UP(Node->EndingVpn + 1, Alignment >> PAGE_SHIFT); + + /* Check if the current bounds are suitable */ + if ((HighVpn > LowVpn) && ((HighVpn - LowVpn) >= PageCount)) + { + /* There is enough space to add our node */ + LowVpn = HighVpn - PageCount; + *Base = LowVpn << PAGE_SHIFT; + + /* Can we use the current node as parent? */ + Child = RtlRightChildAvl(Node); + if (!Child) + { + /* Node has no right child, so use it as parent */ + *Parent = Node; + return TableInsertAsRight; + } + else + { + /* Node has a right child, find most left grand child */ + Node = Child; + while ((Child = RtlLeftChildAvl(Node))) Node = Child; + *Parent = Node; + return TableInsertAsLeft; + } + } + + /* Update the upper margin if neccessary */ + if (Node->StartingVpn < HighVpn) HighVpn = Node->StartingVpn; + + /* Go to the next lower node */ + Node = MiGetPreviousNode(Node); + } + + /* Check if there's enough space before the lowest Vad */ + LowVpn = ROUND_UP((ULONG_PTR)MI_LOWEST_VAD_ADDRESS, Alignment) >> PAGE_SHIFT; + if ((HighVpn > LowVpn) && ((HighVpn - LowVpn) >= PageCount)) { /* There is enough space to add our address */ - *Base = ROUND_UP(BoundaryAddress - Length, Alignment); - return STATUS_SUCCESS; - } - - PageCount = Length >> PAGE_SHIFT; - CandidateVpn = CandidateAddress >> PAGE_SHIFT; - BoundaryVpn = BoundaryAddress >> PAGE_SHIFT; - LowestVpn = (ULONG_PTR)MI_LOWEST_VAD_ADDRESS >> PAGE_SHIFT; - - PreviousNode = MiGetPreviousNode(Node); - - StartVpn = Node->StartingVpn; - EndVpn = PreviousNode ? PreviousNode->EndingVpn : 0; - AlignEndVpn = ROUND_UP(EndVpn + 1, Alignment >> PAGE_SHIFT); - - /* Loop until a gap is found */ - for (PageCount = Length >> PAGE_SHIFT, - CandidateVpn = CandidateAddress >> PAGE_SHIFT, - BoundaryVpn = BoundaryAddress >> PAGE_SHIFT, - LowestVpn = (ULONG_PTR)MI_LOWEST_VAD_ADDRESS >> PAGE_SHIFT, - PreviousNode = MiGetPreviousNode(Node), - StartVpn = Node->StartingVpn, - EndVpn = PreviousNode ? PreviousNode->EndingVpn : 0, - AlignEndVpn = ROUND_UP(EndVpn + 1, Alignment >> PAGE_SHIFT); - PreviousNode; - Node = PreviousNode, - PreviousNode = MiGetPreviousNode(Node), - StartVpn = Node->StartingVpn, - EndVpn = PreviousNode ? PreviousNode->EndingVpn : 0, - AlignEndVpn = ROUND_UP(EndVpn + 1, Alignment >> PAGE_SHIFT)) - { - /* Can we fit the address without overflowing into the node? */ - if ((StartVpn < CandidateVpn) && ((StartVpn - AlignEndVpn) >= PageCount)) - { - /* Check if we can get our candidate address */ - if ((CandidateVpn > EndVpn) && (BoundaryVpn < StartVpn)) - { - /* Use it */ - *Base = CandidateAddress; - return STATUS_SUCCESS; - } - - /* Otherwise, can we fit it by changing the start address? */ - if (StartVpn > AlignEndVpn) - { - /* It'll fit, compute the new base address for that to work */ - *Base = ROUND_UP((StartVpn << PAGE_SHIFT) - Length, Alignment); - return STATUS_SUCCESS; - } - } - - PreviousNode = MiGetPreviousNode(Node); - StartVpn = Node->StartingVpn; - EndVpn = PreviousNode ? PreviousNode->EndingVpn : 0; - AlignEndVpn = ROUND_UP(EndVpn + 1, Alignment >> PAGE_SHIFT); - } - - /* See if we could squeeze into the last descriptor */ - if ((StartVpn > LowestVpn) && ((StartVpn - LowestVpn) >= PageCount)) - { - /* Check if we can try our candidate address */ - if (BoundaryVpn < StartVpn) - { - /* Use it */ - *Base = CandidateAddress; - return STATUS_SUCCESS; - } - - /* Otherwise, change the base address to what's needed to fit in */ - *Base = ROUND_UP((StartVpn << PAGE_SHIFT) - Length, Alignment); - return STATUS_SUCCESS; - } - + LowVpn = HighVpn - PageCount; + *Base = LowVpn << PAGE_SHIFT; + *Parent = LowestNode; + return TableInsertAsLeft; + } + /* No address space left at all */ - return STATUS_NO_MEMORY; + *Base = 0; + *Parent = NULL; + return TableFoundNode; } /* EOF */

14 years, 4 months

[tkreuzer] 48605: [WIN32K] Seperate DC_vSetLayout from NtGdiSetLayout and save the old value before setting the new one.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Aug 23 01:41:56 2010 New Revision: 48605 URL: http://svn.reactos.org/svn/reactos?rev=48605&view=rev Log: [WIN32K] Seperate DC_vSetLayout from NtGdiSetLayout and save the old value before setting the new one. Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/coord.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/coord.c [iso-8859-1] Mon Aug 23 01:41:56 2010 @@ -886,6 +886,46 @@ return; } +VOID +NTAPI +DC_vSetLayout( + IN PDC pdc, + IN LONG wox, + IN DWORD dwLayout) +{ + PDC_ATTR pdcattr = pdc->pdcattr; + + pdcattr->dwLayout = dwLayout; + + if (!(dwLayout & LAYOUT_ORIENTATIONMASK)) return; + + if (dwLayout & LAYOUT_RTL) + { + pdcattr->iMapMode = MM_ANISOTROPIC; + } + + pdcattr->szlWindowExt.cy = -pdcattr->szlWindowExt.cy; + pdcattr->ptlWindowOrg.x = -pdcattr->ptlWindowOrg.x; + + if (wox == -1) + IntMirrorWindowOrg(pdc); + else + pdcattr->ptlWindowOrg.x = wox - pdcattr->ptlWindowOrg.x; + + if (!(pdcattr->flTextAlign & TA_CENTER)) pdcattr->flTextAlign |= TA_RIGHT; + + if (pdc->dclevel.flPath & DCPATH_CLOCKWISE) + pdc->dclevel.flPath &= ~DCPATH_CLOCKWISE; + else + pdc->dclevel.flPath |= DCPATH_CLOCKWISE; + + pdcattr->flXform |= (PAGE_EXTENTS_CHANGED | + INVALIDATE_ATTRIBUTES | + DEVICE_TO_WORLD_INVALID); + +// DC_UpdateXforms(pdc); +} + // NtGdiSetLayout // // The default is left to right. This function changes it to right to left, which @@ -901,53 +941,22 @@ IN LONG wox, IN DWORD dwLayout) { - PDC dc; + PDC pdc; PDC_ATTR pdcattr; DWORD oLayout; - dc = DC_LockDc(hdc); - if (!dc) + pdc = DC_LockDc(hdc); + if (!pdc) { SetLastWin32Error(ERROR_INVALID_HANDLE); return GDI_ERROR; } - pdcattr = dc->pdcattr; - - pdcattr->dwLayout = dwLayout; + pdcattr = pdc->pdcattr; + oLayout = pdcattr->dwLayout; - - if (!(dwLayout & LAYOUT_ORIENTATIONMASK)) - { - DC_UnlockDc(dc); - return oLayout; - } - - if (dwLayout & LAYOUT_RTL) - { - pdcattr->iMapMode = MM_ANISOTROPIC; - } - - pdcattr->szlWindowExt.cy = -pdcattr->szlWindowExt.cy; - pdcattr->ptlWindowOrg.x = -pdcattr->ptlWindowOrg.x; - - if (wox == -1) - IntMirrorWindowOrg(dc); - else - pdcattr->ptlWindowOrg.x = wox - pdcattr->ptlWindowOrg.x; - - if (!(pdcattr->flTextAlign & TA_CENTER)) pdcattr->flTextAlign |= TA_RIGHT; - - if (dc->dclevel.flPath & DCPATH_CLOCKWISE) - dc->dclevel.flPath &= ~DCPATH_CLOCKWISE; - else - dc->dclevel.flPath |= DCPATH_CLOCKWISE; - - pdcattr->flXform |= (PAGE_EXTENTS_CHANGED | - INVALIDATE_ATTRIBUTES | - DEVICE_TO_WORLD_INVALID); - -// DC_UpdateXforms(dc); - DC_UnlockDc(dc); + DC_vSetLayout(pdc, wox, dwLayout); + + DC_UnlockDc(pdc); return oLayout; }

14 years, 4 months

[tkreuzer] 48604: [WIN32K] Move the allocation of the vis region of the DC to a later position, so that all mandatory fields are initialized before we try to delete the DC in failure case. Fixes ye...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Aug 23 01:39:28 2010 New Revision: 48604 URL: http://svn.reactos.org/svn/reactos?rev=48604&view=rev Log: [WIN32K] Move the allocation of the vis region of the DC to a later position, so that all mandatory fields are initialized before we try to delete the DC in failure case. Fixes yet another possible crash. Modified: trunk/reactos/subsystems/win32/win32k/objects/dclife.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dclife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] Mon Aug 23 01:39:28 2010 @@ -48,18 +48,6 @@ } hDC = NewDC->BaseObject.hHmgr; - - /* Allocate a Vis region */ - NewDC->prgnVis = IntSysCreateRectpRgn(0, 0, 1, 1); - if (!NewDC->prgnVis) - { - DPRINT1("IntSysCreateRectpRgn failed\n"); - if (!GDIOBJ_FreeObjByHandle(hDC, GDI_OBJECT_TYPE_DC)) - { - ASSERT(FALSE); - } - return NULL; - } NewDC->pdcattr = &NewDC->dcattr; DC_AllocateDcAttr(hDC); @@ -145,6 +133,18 @@ hsurf = (HBITMAP)PrimarySurface.pSurface; // <- what kind of haxx0ry is that? NewDC->dclevel.pSurface = SURFACE_ShareLockSurface(hsurf); + + /* Allocate a Vis region */ + NewDC->prgnVis = IntSysCreateRectpRgn(0, 0, 1, 1); + if (!NewDC->prgnVis) + { + DPRINT1("IntSysCreateRectpRgn failed\n"); + if (!GDIOBJ_FreeObjByHandle(hDC, GDI_OBJECT_TYPE_DC)) + { + ASSERT(FALSE); + } + return NULL; + } return NewDC; }

14 years, 4 months

[tkreuzer] 48603: [NDK] Add LdrProcessRelocationBlockLongLong. Fixes build, sorry.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Aug 23 01:18:09 2010 New Revision: 48603 URL: http://svn.reactos.org/svn/reactos?rev=48603&view=rev Log: [NDK] Add LdrProcessRelocationBlockLongLong. Fixes build, sorry. Modified: trunk/reactos/include/ndk/ldrfuncs.h Modified: trunk/reactos/include/ndk/ldrfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ldrfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/ldrfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/ldrfuncs.h [iso-8859-1] Mon Aug 23 01:18:09 2010 @@ -109,4 +109,13 @@ IN ULONG FileLength ); +PIMAGE_BASE_RELOCATION +NTAPI +LdrProcessRelocationBlockLongLong( + IN ULONG_PTR Address, + IN ULONG Count, + IN PUSHORT TypeOffset, + IN LONGLONG Delta +); + #endif

14 years, 4 months

← Newer
1
...
4
5
6
7
8
9
10
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2010