Ros-diffs May 2010

ros-diffs@reactos.org

21 participants
438 discussions

[ekohl] 47345: [USETUP] Make the required minimum disk space configurable from the txtsetup.sif file.

by ekohl＠svn.reactos.org

Author: ekohl Date: Tue May 25 00:32:23 2010 New Revision: 47345 URL: http://svn.reactos.org/svn/reactos?rev=47345&view=rev Log: [USETUP] Make the required minimum disk space configurable from the txtsetup.sif file. Modified: trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/boot/bootdata/txtsetup.sif Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Tue May 25 00:32:23 2010 @@ -31,8 +31,6 @@ #define NDEBUG #include <debug.h> -/* required free disk space in MB */ -#define MINIMUMDISKSIZE 350 /* GLOBALS ******************************************************************/ @@ -84,6 +82,8 @@ static LANGID LanguageId = 0; +static ULONG RequiredPartitionDiskSpace = ~0; + /* FUNCTIONS ****************************************************************/ static VOID @@ -723,6 +723,7 @@ UINT ErrorLine; ULONG ReturnSize; PGENERIC_LIST_ENTRY ListEntry; + INT IntValue; CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT)); @@ -802,6 +803,22 @@ MUIDisplayError(ERROR_SIGNATURE_TXTSETUPSIF, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; } + + /* Open 'DiskSpaceRequirements' section */ + if (!SetupFindFirstLineW(SetupInf, L"DiskSpaceRequirements", L"FreeSysPartDiskSpace", &Context)) + { + MUIDisplayError(ERROR_CORRUPT_TXTSETUPSIF, Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; + } + + /* Get the 'FreeSysPartDiskSpace' value */ + if (!SetupGetIntField(&Context, 1, &IntValue)) + { + MUIDisplayError(ERROR_CORRUPT_TXTSETUPSIF, Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; + } + + RequiredPartitionDiskSpace = (ULONG)IntValue; /* Start PnP thread */ if (hPnpThread != INVALID_HANDLE_VALUE) @@ -1390,7 +1407,7 @@ /* check for unpartitioned space */ m = PartEntry->UnpartitionedLength; m = (m + (1 << 19)) >> 20; /* in MBytes (rounded) */ - if( m > MINIMUMDISKSIZE) + if( m > RequiredPartitionDiskSpace) { return TRUE; } @@ -1398,7 +1415,7 @@ // check for partitioned space m = PartEntry->PartInfo[0].PartitionLength.QuadPart; m = (m + (1 << 19)) >> 20; /* in MBytes (rounded) */ - if( m < MINIMUMDISKSIZE) + if( m < RequiredPartitionDiskSpace) { /* partition is too small so ask for another partion */ DPRINT1("Partition too small"); Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Tue May 25 00:32:23 2010 @@ -10,6 +10,10 @@ 5 = media 6 = Fonts 7 = bin + +[DiskSpaceRequirements] +; Required free system partition disk space in MB +FreeSysPartDiskSpace=350 [SourceDisksFiles] acpi.sys=,,,,,,,,,,,,4

14 years, 8 months

[dreimer] 47344: Bug 5426 (Patch by Adam Kachwalla, PS Port by Daniel Reimer) This patch adds selection of the branch for sSVN using the ROS_BRANCH variable. For example, setting ROS_BRANCH to "arwinss" (without quotes) will allow sSVN to operate on the ARWINSS branch. If ROS_ARCH is set to "amd64" this will override ROS_BRANCH NOTE: ROS_BRANCH is "recyclable" - by that I mean you can use it for multiple sSVN executions without it being changed, since this new sSVN modifies its own internal _ROS

by dreimer＠svn.reactos.org

Author: dreimer Date: Tue May 25 00:22:13 2010 New Revision: 47344 URL: http://svn.reactos.org/svn/reactos?rev=47344&view=rev Log: Bug 5426 (Patch by Adam Kachwalla, PS Port by Daniel Reimer) This patch adds selection of the branch for sSVN using the ROS_BRANCH variable. For example, setting ROS_BRANCH to "arwinss" (without quotes) will allow sSVN to operate on the ARWINSS branch. If ROS_ARCH is set to "amd64" this will override ROS_BRANCH NOTE: ROS_BRANCH is "recyclable" - by that I mean you can use it for multiple sSVN executions without it being changed, since this new sSVN modifies its own internal _ROS_BRANCH variable. A nice side-effect of this patch is that it also refactors redundant 'if "%ROS_ARCH%" == "amd64" () else ()' style blocks, making the code a little smaller and neater. ----------- Additionally fixed some slipped in brace errors resulting in funny behavior on specific circumstances + some more cleanup. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 trunk/tools/RosBE/RosBE-Windows/Root/LICENSE.txt trunk/tools/RosBE/RosBE-Windows/Root/README.odt trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 [iso-8859-1] Tue May 25 00:22:13 2010 @@ -6,23 +6,31 @@ # COPYRIGHT: Copyright 2010 Daniel Reimer <reimer.daniel(a)freenet.de> # +# Set branch to trunk if one is not already set +if ("$ENV:ROS_BRANCH" -eq "") { + $_ROS_BRANCH = "trunk" +} else { + $_ROS_BRANCH = "branches/$ENV:ROS_BRANCH" +} + +# AMD64 architecture overrides branch that was previously set +if ("$ENV:ROS_ARCH" -eq "amd64") { + $_ROS_BRANCH = "branches/ros-amd64-bringup" +} + $_ROSBE_SSVNSOURCEDIR = "$pwd" function UP($arg) { - $OFFSVN = IEX "& svn.exe info" | select-string "Revision:" - $OFFSVN = $OFFSVN -replace "(.*)Revision: ",'' + $OFFSVN = IEX "& svn.exe info" | select-string "Last Changed Rev:" + $OFFSVN = $OFFSVN -replace "(.*)Last Changed Rev: ",'' $OFFSVN = [CONVERT]::ToInt32($OFFSVN,10) - if ("$ENV:ROS_ARCH" -eq "amd64") { - $ONSVN = IEX "& svn.exe info http://svn.reactos.org/reactos/branches/ros-amd64-bringup/reactos" | select-string "Revision:" - } else { - $ONSVN = IEX "& svn.exe info http://svn.reactos.org/reactos/trunk/reactos" | select-string "Revision:" - } - $ONSVN = $ONSVN -replace "(.*)Revision: ",'' + $ONSVN = IEX "& svn.exe info http://svn.reactos.org/reactos/$_ROS_BRANCH/reactos" | select-string "Last Changed Rev:" + $ONSVN = $ONSVN -replace "(.*)Last Changed Rev: ",'' $ONSVN = [CONVERT]::ToInt32($ONSVN,10) "Local Revision: $OFFSVN" "Online HEAD Revision: $ONSVN" "" - if (($OFFSVN -lt $ONSVN) -or ("$($arg[1])" -ne "")) { + if ($OFFSVN -lt $ONSVN) { if ("$_ROSBE_SSVN_JOB" -eq "status") { "Your tree is not up to date. Do you want to update it?" $UP = Read-Host "Please enter 'yes' or 'no': " @@ -30,65 +38,65 @@ $_ROSBE_SSVN_JOB = "update" } } - if ($OFFSVN -eq $ONSVN) { - "Your tree is up to date." - } - - if ("$_ROSBE_SSVN_JOB" -eq "update") { - if ("$($arg[1])" -ne "") { - $temparg = $arg[1] - - if ($temparg -eq $OFFSVN) { - "Your Local Repository is currently $temparg" - } - if ($temparg -lt $OFFSVN) { - "Downgrading to $temparg ..." - } - if ($temparg -gt $OFFSVN) { - "Updating to $temparg ..." - } - if ("$_BUILDBOT_SVNSKIPMAINTRUNK" -ne "1") { - IEX "& svn.exe update -r $temparg" - } else { - "Skipping ReactOS Trunk update." - } - if (Test-Path "modules\rosapps\.") { - Set-Location "modules\rosapps" - "Updating RosApps..." - IEX "& svn.exe update -r $temparg" - Set-Location "$_ROSBE_SSVNSOURCEDIR" - } - if (Test-Path "modules\rostests\.") { - Set-Location "modules\rostests" - "Updating RosTests..." - IEX "& svn.exe update -r $temparg" - Set-Location "$_ROSBE_SSVNSOURCEDIR" - } - } else { - if ("$_BUILDBOT_SVNSKIPMAINTRUNK" -ne "1") { - IEX "& svn.exe update" - } else { - "Skipping ReactOS Trunk update." - } - if (Test-Path "modules\rosapps\.") { - Set-Location "modules\rosapps" - "Updating RosApps..." - IEX "& svn.exe update" - Set-Location "$_ROSBE_SSVNSOURCEDIR" - } - if (Test-Path "modules\rostests\.") { - Set-Location "modules\rostests" - "Updating RosTests..." - IEX "& svn.exe update" - Set-Location "$_ROSBE_SSVNSOURCEDIR" - } - } - "Do you want to see the changelog?" - $CL = Read-Host "Please enter 'yes' or 'no': " - if (("$CL" -eq "yes") -or ("$CL" -eq "y")) { - $range = "$OFFSVN" + ":" + "$ONSVN" - IEX "& svn.exe log -r $range" - } + } + if ($OFFSVN -eq $ONSVN) { + "Your tree is up to date." + exit + } + if ("$_ROSBE_SSVN_JOB" -eq "update") { + if ("$($arg[1])" -ne "") { + $temparg = $arg[1] + + if ($temparg -eq $OFFSVN) { + "Your Local Repository is currently $temparg" + } + if ($temparg -lt $OFFSVN) { + "Downgrading to $temparg ..." + } + if ($temparg -gt $OFFSVN) { + "Updating to $temparg ..." + } + if ("$_BUILDBOT_SVNSKIPMAINTRUNK" -ne "1") { + IEX "& svn.exe update -r $temparg" + } else { + "Skipping ReactOS Trunk update." + } + if (Test-Path "modules\rosapps\.") { + Set-Location "modules\rosapps" + "Updating RosApps..." + IEX "& svn.exe update -r $temparg" + Set-Location "$_ROSBE_SSVNSOURCEDIR" + } + if (Test-Path "modules\rostests\.") { + Set-Location "modules\rostests" + "Updating RosTests..." + IEX "& svn.exe update -r $temparg" + Set-Location "$_ROSBE_SSVNSOURCEDIR" + } + } else { + if ("$_BUILDBOT_SVNSKIPMAINTRUNK" -ne "1") { + IEX "& svn.exe update" + } else { + "Skipping ReactOS Trunk update." + } + if (Test-Path "modules\rosapps\.") { + Set-Location "modules\rosapps" + "Updating RosApps..." + IEX "& svn.exe update" + Set-Location "$_ROSBE_SSVNSOURCEDIR" + } + if (Test-Path "modules\rostests\.") { + Set-Location "modules\rostests" + "Updating RosTests..." + IEX "& svn.exe update" + Set-Location "$_ROSBE_SSVNSOURCEDIR" + } + } + "Do you want to see the changelog?" + $CL = Read-Host "Please enter 'yes' or 'no': " + if (("$CL" -eq "yes") -or ("$CL" -eq "y")) { + $range = "$OFFSVN" + ":" + "$ONSVN" + IEX "& svn.exe log -r $range" } } } @@ -123,17 +131,9 @@ $dir = get-childitem if ("$dir" -eq "") { if ("$($args[1])" -ne "") { - if ("$ENV:ROS_ARCH" -eq "amd64") { - IEX "& svn.exe -r $($args[1]) checkout http://svn.reactos.org/reactos/branches/ros-amd64-bringup/reactos ." - } else { - IEX "& svn.exe -r $($args[1]) checkout http://svn.reactos.org/reactos/trunk/reactos ." - } - } else { - if ("$ENV:ROS_ARCH" -eq "amd64") { - IEX "& svn.exe checkout http://svn.reactos.org/reactos/branches/ros-amd64-bringup/reactos ." - } else { - IEX "& svn.exe checkout http://svn.reactos.org/reactos/trunk/reactos ." - } + IEX "& svn.exe -r $($args[1]) checkout http://svn.reactos.org/reactos/$_ROS_BRANCH/reactos ." + } else { + IEX "& svn.exe checkout http://svn.reactos.org/reactos/$_ROS_BRANCH/reactos ." } } else { "ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED" @@ -156,13 +156,9 @@ Set-Location "modules\rosapps" $dir = get-childitem if ("$dir" -eq "") { - if("$ENV:ROS_ARCH" -eq "amd64") { - IEX "& svn.exe checkout -r $($args[1]) http://svn.reactos.org/reactos/branches/ros-amd64-bringup/rosapps ." - } else { - IEX "& svn.exe checkout -r $($args[1]) http://svn.reactos.org/reactos/trunk/rosapps ." - } - } else { - "ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED" + IEX "& svn.exe checkout -r $($args[1]) http://svn.reactos.org/reactos/$_ROS_BRANCH/rosapps ." + } else { + "ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED" } } } else { @@ -178,13 +174,9 @@ Set-Location "modules\rosapps" $dir = get-childitem if ("$dir" -eq "") { - if ("$ENV:ROS_ARCH" -eq "amd64") { - IEX "& svn.exe checkout http://svn.reactos.org/reactos/branches/ros-amd64-bringup/rosapps ." - } else { - IEX "& svn.exe checkout http://svn.reactos.org/reactos/trunk/rosapps ." - } - } else { - "ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED" + IEX "& svn.exe checkout http://svn.reactos.org/reactos/$_ROS_BRANCH/rosapps ." + } else { + "ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED" } } } @@ -206,13 +198,9 @@ Set-Location "modules\rostests" $dir = get-childitem if ("$dir" -eq "") { - if("$ENV:ROS_ARCH" -eq "amd64") { - IEX "& svn.exe checkout -r $($args[1]) http://svn.reactos.org/reactos/branches/ros-amd64-bringup/rostests ." - } else { - IEX "& svn.exe checkout -r $($args[1]) http://svn.reactos.org/reactos/trunk/rostests ." - } - } else { - "ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED" + IEX "& svn.exe checkout -r $($args[1]) http://svn.reactos.org/reactos/$_ROS_BRANCH/rostests ." + } else { + "ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED" } } } else { @@ -228,13 +216,9 @@ Set-Location "modules\rostests" $dir = get-childitem if ("$dir" -eq "") { - if ("$ENV:ROS_ARCH" -eq "amd64") { - IEX "& svn.exe checkout http://svn.reactos.org/reactos/branches/ros-amd64-bringup/rostests ." - } else { - IEX "& svn.exe checkout http://svn.reactos.org/reactos/trunk/rostests ." - } - } else { - "ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED" + IEX "& svn.exe checkout http://svn.reactos.org/reactos/$_ROS_BRANCH/rostests ." + } else { + "ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED" } } } Modified: trunk/tools/RosBE/RosBE-Windows/Root/LICENSE.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/LIC… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/LICENSE.txt [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/LICENSE.txt [iso-8859-1] Tue May 25 00:22:13 2010 @@ -1,4 +1,4 @@ -ReactOS Build Environment v1.5.1 +ReactOS Build Environment v1.5.1.1 Various parts of the ReactOS Build Environment are under different license's, the license's are as follows. (The complete text for each license is included in this document excluding Subversion) Modified: trunk/tools/RosBE/RosBE-Windows/Root/README.odt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/REA… ============================================================================== Binary files - no diff available. Modified: trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/sSV… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd [iso-8859-1] Tue May 25 00:22:13 2010 @@ -14,6 +14,17 @@ setlocal enabledelayedexpansion +:: Set branch to trunk if one is not already set +if not defined ROS_BRANCH ( + set _ROS_BRANCH=trunk +) else ( + set _ROS_BRANCH=branches/%ROS_BRANCH% +) +:: AMD64 architecture overrides branch that was previously set +if "%ROS_ARCH%" == "amd64" ( + set _ROS_BRANCH=branches/ros-amd64-bringup +) + set _ROSBE_SSVNSOURCEDIR=%CD% :: Receive the first parameter and decide what to do. @@ -50,17 +61,9 @@ dir /b 2>nul | findstr "." >nul if errorlevel 1 ( if not "%2" == "" ( - if "%ROS_ARCH%" == "amd64" ( - svn.exe checkout -r %2 http://svn.reactos.org/reactos/branches/ros-amd64-bringup/reactos . - ) else ( - svn.exe checkout -r %2 http://svn.reactos.org/reactos/trunk/reactos . - ) - ) else ( - if "%ROS_ARCH%" == "amd64" ( - svn.exe checkout http://svn.reactos.org/reactos/branches/ros-amd64-bringup/reactos . - ) else ( - svn.exe checkout http://svn.reactos.org/reactos/trunk/reactos . - ) + svn.exe checkout -r %2 http://svn.reactos.org/reactos/%_ROS_BRANCH%/reactos . + ) else ( + svn.exe checkout http://svn.reactos.org/reactos/%_ROS_BRANCH%/reactos . ) ) else ( echo ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED @@ -83,11 +86,7 @@ cd "modules\rosapps" dir /b 2>nul | findstr "." >nul if errorlevel 1 ( - if "%ROS_ARCH%" == "amd64" ( - svn.exe checkout -r %2 http://svn.reactos.org/reactos/branches/ros-amd64-bringup/rosapps . - ) else ( - svn.exe checkout -r %2 http://svn.reactos.org/reactos/trunk/rosapps . - ) + svn.exe checkout -r %2 http://svn.reactos.org/reactos/%_ROS_BRANCH%/rosapps . ) else ( echo ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED ) @@ -105,11 +104,7 @@ cd "modules\rosapps" dir /b 2>nul | findstr "." >nul if errorlevel 1 ( - if "%ROS_ARCH%" == "amd64" ( - svn.exe checkout http://svn.reactos.org/reactos/branches/ros-amd64-bringup/rosapps . - ) else ( - svn.exe checkout http://svn.reactos.org/reactos/trunk/rosapps . - ) + svn.exe checkout http://svn.reactos.org/reactos/%_ROS_BRANCH%/rosapps . ) else ( echo ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED ) @@ -134,11 +129,7 @@ cd "modules\rostests" dir /b 2>nul | findstr "." >nul if errorlevel 1 ( - if "%ROS_ARCH%" == "amd64" ( - svn.exe checkout -r %2 http://svn.reactos.org/reactos/branches/ros-amd64-bringup/rostests . - ) else ( - svn.exe checkout -r %2 http://svn.reactos.org/reactos/trunk/rostests . - ) + svn.exe checkout -r %2 http://svn.reactos.org/reactos/%_ROS_BRANCH%/rostests . ) else ( echo ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED ) @@ -156,11 +147,7 @@ cd "modules\rostests" dir /b 2>nul | findstr "." >nul if errorlevel 1 ( - if "%ROS_ARCH%" == "amd64" ( - svn.exe checkout http://svn.reactos.org/reactos/branches/ros-amd64-bringup/rostests . - ) else ( - svn.exe checkout http://svn.reactos.org/reactos/trunk/rostests . - ) + svn.exe checkout http://svn.reactos.org/reactos/%_ROS_BRANCH/rostests . ) else ( echo ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED ) @@ -186,12 +173,8 @@ goto EOC :UP - for /f "usebackq tokens=2" %%i in (`"svn.exe info | find "Revision:""`) do set OFFSVN=%%i - if "%ROS_ARCH%" == "amd64" ( - for /f "usebackq tokens=2" %%j in (`"svn.exe info http://svn.reactos.org/reactos/branches/ros-amd64-bringup/reactos | find "Revision:""`) do set ONSVN=%%j - ) else ( - for /f "usebackq tokens=2" %%j in (`"svn.exe info http://svn.reactos.org/reactos/trunk/reactos | find "Revision:""`) do set ONSVN=%%j - ) + for /f "usebackq tokens=4" %%i in (`"svn.exe info | find "Last Changed Rev:""`) do set OFFSVN=%%i + for /f "usebackq tokens=4" %%j in (`"svn.exe info http://svn.reactos.org/reactos/%_ROS_BRANCH%/reactos | find "Last Changed Rev:""`) do set ONSVN=%%j echo Local Revision: !OFFSVN! echo Online HEAD Revision: !ONSVN! @@ -206,54 +189,54 @@ ) if !OFFSVN! equ !ONSVN! ( echo Your tree is up to date. + goto EOC ) if "!_ROSBE_SSVN_JOB!" == "update" ( - if not "%2" == "" ( - if "%2" == "!OFFSVN!" ( - echo Your Local Repository is currently %2 - ) - if "%2" LSS "!OFFSVN!" ( - echo Downgrading to %2 ... - ) - if "%2" GTR "!OFFSVN!" ( - echo Updating to %2 ... - ) - if not "%_BUILDBOT_SVNSKIPMAINTRUNK%" == "1" ( - svn.exe update -r %2 - ) else ( - echo Skipping ReactOS Trunk update. - ) - if exist "modules\rosapps\." ( - cd "modules\rosapps" - echo Updating RosApps... - svn.exe update -r %2 - cd "%_ROSBE_SSVNSOURCEDIR%" - ) - if exist "modules\rostests\." ( - cd "modules\rostests" - echo Updating RosTests... - svn.exe update -r %2 - cd "%_ROSBE_SSVNSOURCEDIR%" - ) - ) else ( - if not "%_BUILDBOT_SVNSKIPMAINTRUNK%" == "1" ( - svn.exe update - ) else ( - echo Skipping ReactOS Trunk update. - ) - if exist "modules\rosapps\." ( - cd "modules\rosapps" - echo Updating RosApps... - svn.exe update - cd "%_ROSBE_SSVNSOURCEDIR%" - ) - if exist "modules\rostests\." ( - cd "modules\rostests" - echo Updating RosTests... - svn.exe update - cd "%_ROSBE_SSVNSOURCEDIR%" - ) + if not "%2" == "" ( + if "%2" == "!OFFSVN!" ( + echo Your Local Repository is currently %2 + ) + if "%2" LSS "!OFFSVN!" ( + echo Downgrading to %2 ... + ) + if "%2" GTR "!OFFSVN!" ( + echo Updating to %2 ... + ) + if not "%_BUILDBOT_SVNSKIPMAINTRUNK%" == "1" ( + svn.exe update -r %2 + ) else ( + echo Skipping ReactOS Trunk update. + ) + if exist "modules\rosapps\." ( + cd "modules\rosapps" + echo Updating RosApps... + svn.exe update -r %2 + cd "%_ROSBE_SSVNSOURCEDIR%" + ) + if exist "modules\rostests\." ( + cd "modules\rostests" + echo Updating RosTests... + svn.exe update -r %2 + cd "%_ROSBE_SSVNSOURCEDIR%" + ) + ) else ( + if not "%_BUILDBOT_SVNSKIPMAINTRUNK%" == "1" ( + svn.exe update + ) else ( + echo Skipping ReactOS Trunk update. + ) + if exist "modules\rosapps\." ( + cd "modules\rosapps" + echo Updating RosApps... + svn.exe update + cd "%_ROSBE_SSVNSOURCEDIR%" + ) + if exist "modules\rostests\." ( + cd "modules\rostests" + echo Updating RosTests... + svn.exe update + cd "%_ROSBE_SSVNSOURCEDIR%" ) ) echo Do you want to see the changelog?

14 years, 8 months

[ekohl] 47343: [USETUP] Made the 'Copying file...' status line message left aligned like all the other status line messages.

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon May 24 23:43:51 2010 New Revision: 47343 URL: http://svn.reactos.org/svn/reactos?rev=47343&view=rev Log: [USETUP] Made the 'Copying file...' status line message left aligned like all the other status line messages. Modified: trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/lang/bg-BG.h trunk/reactos/base/setup/usetup/lang/cs-CZ.h trunk/reactos/base/setup/usetup/lang/de-DE.h trunk/reactos/base/setup/usetup/lang/el-GR.h trunk/reactos/base/setup/usetup/lang/en-US.h trunk/reactos/base/setup/usetup/lang/es-ES.h trunk/reactos/base/setup/usetup/lang/et-EE.h trunk/reactos/base/setup/usetup/lang/fr-FR.h trunk/reactos/base/setup/usetup/lang/it-IT.h trunk/reactos/base/setup/usetup/lang/ja-JP.h trunk/reactos/base/setup/usetup/lang/lt-LT.h trunk/reactos/base/setup/usetup/lang/nl-NL.h trunk/reactos/base/setup/usetup/lang/pl-PL.h trunk/reactos/base/setup/usetup/lang/ru-RU.h trunk/reactos/base/setup/usetup/lang/sk-SK.h trunk/reactos/base/setup/usetup/lang/sv-SE.h trunk/reactos/base/setup/usetup/lang/uk-UA.h Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Mon May 24 23:43:51 2010 @@ -3163,7 +3163,7 @@ case SPFILENOTIFY_STARTCOPY: /* Display copy message */ - CONSOLE_SetStatusTextAutoFitX (45 , MUIGetString(STRING_COPYING), (PWSTR)Param1); + CONSOLE_SetStatusText(MUIGetString(STRING_COPYING), (PWSTR)Param1); SetupUpdateMemoryInfo(CopyContext, FALSE); break; Modified: trunk/reactos/base/setup/usetup/lang/bg-BG.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/bg-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/bg-BG.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/bg-BG.h [iso-8859-1] Mon May 24 23:43:51 2010 @@ -1632,7 +1632,7 @@ {STRING_TXTSETUPFAILED, "¥ ¡¥ ¬¥à¥ à §¤¥« '%S'\n¢ TXTSETUP.SIF.\n"}, {STRING_COPYING, - "\xB3 ¯¨á ä ©«: %S"}, + " ¯¨á ä ©«: %S"}, {STRING_SETUPCOPYINGFILES, "¥ç¥ § ¯¨á¢ ¥ ä ©«®¢¥â¥..."}, {STRING_REGHIVEUPDATE, Modified: trunk/reactos/base/setup/usetup/lang/cs-CZ.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/cs-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] Mon May 24 23:43:51 2010 @@ -1622,7 +1622,7 @@ {STRING_TXTSETUPFAILED, "Nepodaýilo se naj¡t sekci '%S' v souboru\n TXTSETUP.SIF.\n"}, {STRING_COPYING, - "\xB3 Kop¡ruji soubor: %S"}, + " Kop¡ruji soubor: %S"}, {STRING_SETUPCOPYINGFILES, "Instalace kop¡ruje soubory..."}, {STRING_REGHIVEUPDATE, Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/de-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] Mon May 24 23:43:51 2010 @@ -1621,7 +1621,7 @@ {STRING_TXTSETUPFAILED, "Setup konnte die '%S'-Sektion\nin TXTSETUP.SIF nicht finden.\n"}, {STRING_COPYING, - "\xB3 Kopiere Datei: %S"}, + " Kopiere Datei: %S"}, {STRING_SETUPCOPYINGFILES, "Setup kopiert Dateien..."}, {STRING_REGHIVEUPDATE, Modified: trunk/reactos/base/setup/usetup/lang/el-GR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/el-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/el-GR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/el-GR.h [iso-8859-1] Mon May 24 23:43:51 2010 @@ -1644,7 +1644,7 @@ {STRING_TXTSETUPFAILED, "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"}, {STRING_COPYING, - "\xB3 ¤« ¨á« «¦ ¨®å¦: %S"}, + " ¤« ¨á« «¦ ¨®å¦: %S"}, {STRING_SETUPCOPYINGFILES, " ¡«á©«© ¤« ¨á ¨®å..."}, {STRING_REGHIVEUPDATE, Modified: trunk/reactos/base/setup/usetup/lang/en-US.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/en-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/en-US.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/en-US.h [iso-8859-1] Mon May 24 23:43:51 2010 @@ -1619,7 +1619,7 @@ {STRING_TXTSETUPFAILED, "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"}, {STRING_COPYING, - "\xB3 Copying file: %S"}, + " Copying file: %S"}, {STRING_SETUPCOPYINGFILES, "Setup is copying files..."}, {STRING_REGHIVEUPDATE, Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/es-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] Mon May 24 23:43:51 2010 @@ -1620,7 +1620,7 @@ {STRING_TXTSETUPFAILED, "El instalador fall¢ al buscar la secci¢n\nin TXTSETUP.SIF.\n"}, {STRING_COPYING, - "\xB3 Copiando archivo: %S"}, + " Copiando archivo: %S"}, {STRING_SETUPCOPYINGFILES, "El instalador est copiando archivos..."}, {STRING_REGHIVEUPDATE, Modified: trunk/reactos/base/setup/usetup/lang/et-EE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/et-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/et-EE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/et-EE.h [iso-8859-1] Mon May 24 23:43:51 2010 @@ -1615,9 +1615,9 @@ {STRING_REBOOTCOMPUTER, "ENTER = Taaskivita arvuti"}, {STRING_TXTSETUPFAILED, - "TXTSETUP.SIF failist ei leitud '%S' sektsiooni\n"}, + "TXTSETUP.SIF failist ei leitud '%S' sektsiooni\n"}, {STRING_COPYING, - "\xB3 Kopeerimine: %S"}, + " Kopeerimine: %S"}, {STRING_SETUPCOPYINGFILES, "Failide kopeerimine..."}, {STRING_REGHIVEUPDATE, Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/fr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] Mon May 24 23:43:51 2010 @@ -1633,7 +1633,7 @@ {STRING_TXTSETUPFAILED, "Setup n'a pu trouver la section '%S'\ndans TXTSETUP.SIF.\n"}, {STRING_COPYING, - "\xB3 Copie du fichier: %S"}, + " Copie du fichier: %S"}, {STRING_SETUPCOPYINGFILES, "Setup copie les fichiers..."}, {STRING_REGHIVEUPDATE, Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/it-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] Mon May 24 23:43:51 2010 @@ -1621,7 +1621,7 @@ {STRING_TXTSETUPFAILED, "Setup non ha trovato la sezione '%S' \nin TXTSETUP.SIF.\n"}, {STRING_COPYING, - "\xB3 Copia di: %S"}, + " Copia di: %S"}, {STRING_SETUPCOPYINGFILES, "Copia dei file in corso..."}, {STRING_REGHIVEUPDATE, Modified: trunk/reactos/base/setup/usetup/lang/ja-JP.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ja-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ja-JP.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ja-JP.h [iso-8859-1] Mon May 24 23:43:51 2010 @@ -1620,7 +1620,7 @@ {STRING_TXTSETUPFAILED, "¾¯Ä±¯ÌßÊ TXTSETUP.SIF É '%S' ¾¸¼®ÝÉ ¹Ý¼ÂÆ\n¼¯Êß² ¼Ï¼À¡\n"}, {STRING_COPYING, - "\xB3 ºËß° Á³É Ì§²Ù: %S"}, + " ºËß° Á³É Ì§²Ù: %S"}, {STRING_SETUPCOPYINGFILES, "¾¯Ä±¯ÌßÊ Ì§²Ù¦ ºËß° ¼Ã ²Ï½..."}, {STRING_REGHIVEUPDATE, Modified: trunk/reactos/base/setup/usetup/lang/lt-LT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/lt-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/lt-LT.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/lt-LT.h [iso-8859-1] Mon May 24 23:43:51 2010 @@ -1630,7 +1630,7 @@ {STRING_TXTSETUPFAILED, "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"}, {STRING_COPYING, - "\xB3 Copying file: %S"}, + " Copying file: %S"}, {STRING_SETUPCOPYINGFILES, "Setup is copying files..."}, {STRING_REGHIVEUPDATE, Modified: trunk/reactos/base/setup/usetup/lang/nl-NL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/nl-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/nl-NL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/nl-NL.h [iso-8859-1] Mon May 24 23:43:51 2010 @@ -1648,7 +1648,7 @@ {STRING_TXTSETUPFAILED, "Setup kan de '%S' sectie niet vinden\nin TXTSETUP.SIF.\n"}, {STRING_COPYING, - "\xB3 Kopieeren bestand: %S"}, + " Kopieeren bestand: %S"}, {STRING_SETUPCOPYINGFILES, "Setup is bestand aan het kopieeren..."}, {STRING_REGHIVEUPDATE, Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pl-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] Mon May 24 23:43:51 2010 @@ -1629,7 +1629,7 @@ {STRING_TXTSETUPFAILED, "Instalator nie by w stanie odnale« sekji '%S'\nw pliku TXTSETUP.SIF.\n"}, {STRING_COPYING, - "\xB3 Kopiowanie plik¢w: %S"}, + " Kopiowanie plik¢w: %S"}, {STRING_SETUPCOPYINGFILES, "Instalator kopiuje pliki..."}, {STRING_REGHIVEUPDATE, Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ru-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] Mon May 24 23:43:51 2010 @@ -1621,7 +1621,7 @@ {STRING_TXTSETUPFAILED, "à®£à ¬¬ ãáâ ®¢ª¨ ¥ á¬®£« ©â¨ á¥ªæ¨î '%S'\n¢ ä ©«¥ TXTSETUP.SIF.\n"}, {STRING_COPYING, - "\xB3 ®¯¨à®¢ ¨¥: %S"}, + " ®¯¨à®¢ ¨¥: %S"}, {STRING_SETUPCOPYINGFILES, "à®£à ¬¬ ãáâ ®¢ª¨ ª®¯¨àã¥â ä ©«ë..."}, {STRING_REGHIVEUPDATE, Modified: trunk/reactos/base/setup/usetup/lang/sk-SK.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] Mon May 24 23:43:51 2010 @@ -1631,7 +1631,7 @@ {STRING_TXTSETUPFAILED, "Inçtal tor zlyhal pri hadan¡ sekcie '%S'\nv s£bore TXTSETUP.SIF.\n"}, {STRING_COPYING, - "\xB3 Kop¡ruje sa s£bor: %S"}, + " Kop¡ruje sa s£bor: %S"}, {STRING_SETUPCOPYINGFILES, "Inçtal tor kop¡ruje s£bory..."}, {STRING_REGHIVEUPDATE, Modified: trunk/reactos/base/setup/usetup/lang/sv-SE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sv-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sv-SE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sv-SE.h [iso-8859-1] Mon May 24 23:43:51 2010 @@ -1620,7 +1620,7 @@ {STRING_TXTSETUPFAILED, "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"}, {STRING_COPYING, - "\xB3 Copying file: %S"}, + " Copying file: %S"}, {STRING_SETUPCOPYINGFILES, "Setup is copying files..."}, {STRING_REGHIVEUPDATE, Modified: trunk/reactos/base/setup/usetup/lang/uk-UA.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/uk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] Mon May 24 23:43:51 2010 @@ -1626,7 +1626,7 @@ {STRING_TXTSETUPFAILED, "áâ ®¢«î¢ ç ¥ §¬i£ § ©â¨ á¥ªæiî '%S' \n¢ ä ©«i TXTSETUP.SIF.\n"}, {STRING_COPYING, - "\xB3 ®¯iî¢ ï: %S"}, + " ®¯iî¢ ï: %S"}, {STRING_SETUPCOPYINGFILES, "áâ ®¢«î¢ ç ª®¯iîó ä ©«¨..."}, {STRING_REGHIVEUPDATE,

14 years, 8 months

[ekohl] 47342: [USETUP] - Add german translation of required minimum disk space warning.

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon May 24 23:08:06 2010 New Revision: 47342 URL: http://svn.reactos.org/svn/reactos?rev=47342&view=rev Log: [USETUP] - Add german translation of required minimum disk space warning. Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/de-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] Mon May 24 23:08:06 2010 @@ -1477,7 +1477,13 @@ "Setup konnte den geografischen Standort nicht einstellen.\n" "ENTER = Computer neu starten" }, -{ + { + //ERROR_INSUFFICIENT_DISKSPACE, + "Nicht genug Speicherplatz auf der gewhlten Partition vorhanden.\n" + " * Eine beliebige Taste zum Fortsetzen drcken.", + NULL + }, + { NULL, NULL }

14 years, 8 months

[ilardig] 47341: [USETUP] - Check for required minimum disk space eventually warn the user. - Added Italian and Spanish warnings, the other languages need translation. - Patch by R.T.Sivakumar modified by me. See issue #3302 for more details.

by ilardig＠svn.reactos.org

Author: ilardig Date: Mon May 24 22:53:32 2010 New Revision: 47341 URL: http://svn.reactos.org/svn/reactos?rev=47341&view=rev Log: [USETUP] - Check for required minimum disk space eventually warn the user. - Added Italian and Spanish warnings, the other languages need translation. - Patch by R.T.Sivakumar modified by me. See issue #3302 for more details. Modified: trunk/reactos/base/setup/usetup/errorcode.h trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/lang/bg-BG.h trunk/reactos/base/setup/usetup/lang/en-US.h trunk/reactos/base/setup/usetup/lang/es-ES.h trunk/reactos/base/setup/usetup/lang/et-EE.h trunk/reactos/base/setup/usetup/lang/fr-FR.h trunk/reactos/base/setup/usetup/lang/it-IT.h trunk/reactos/base/setup/usetup/lang/ja-JP.h trunk/reactos/base/setup/usetup/lang/lt-LT.h trunk/reactos/base/setup/usetup/lang/nl-NL.h trunk/reactos/base/setup/usetup/lang/pl-PL.h trunk/reactos/base/setup/usetup/lang/ru-RU.h trunk/reactos/base/setup/usetup/lang/sk-SK.h trunk/reactos/base/setup/usetup/lang/sv-SE.h trunk/reactos/base/setup/usetup/lang/uk-UA.h Modified: trunk/reactos/base/setup/usetup/errorcode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/errorcod… ============================================================================== --- trunk/reactos/base/setup/usetup/errorcode.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/errorcode.h [iso-8859-1] Mon May 24 22:53:32 2010 @@ -65,6 +65,7 @@ ERROR_UPDATE_LOCALESETTINGS, ERROR_ADDING_KBLAYOUTS, ERROR_UPDATE_GEOID, + ERROR_INSUFFICIENT_DISKSPACE, ERROR_LAST_ERROR_CODE }ERROR_NUMBER; Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Mon May 24 22:53:32 2010 @@ -31,6 +31,9 @@ #define NDEBUG #include <debug.h> +/* required free disk space in MB */ +#define MINIMUMDISKSIZE 350 + /* GLOBALS ******************************************************************/ HANDLE ProcessHeap; @@ -1381,6 +1384,31 @@ return DISPLAY_SETTINGS_PAGE; } +static BOOL IsDiskSizeValid(PPARTENTRY PartEntry) +{ + ULONGLONG m; + /* check for unpartitioned space */ + m = PartEntry->UnpartitionedLength; + m = (m + (1 << 19)) >> 20; /* in MBytes (rounded) */ + if( m > MINIMUMDISKSIZE) + { + return TRUE; + } + + // check for partitioned space + m = PartEntry->PartInfo[0].PartitionLength.QuadPart; + m = (m + (1 << 19)) >> 20; /* in MBytes (rounded) */ + if( m < MINIMUMDISKSIZE) + { + /* partition is too small so ask for another partion */ + DPRINT1("Partition too small"); + return FALSE; + } + else + { + return TRUE; + } +} static PAGE_NUMBER SelectPartitionPage(PINPUT_RECORD Ir) @@ -1434,9 +1462,13 @@ { if (AutoPartition) { - PPARTENTRY PartEntry = PartEntry = PartitionList->CurrentPartition; + PPARTENTRY PartEntry = PartitionList->CurrentPartition; ULONG MaxSize = (PartEntry->UnpartitionedLength + (1 << 19)) >> 20; /* in MBytes (rounded) */ - + if(!IsDiskSizeValid(PartitionList->CurrentPartition)) + { + MUIDisplayError(ERROR_INSUFFICIENT_DISKSPACE, Ir, POPUP_WAIT_ANY_KEY); + return SELECT_PARTITION_PAGE; /* let the user select another partition */ + } CreateNewPartition(PartitionList, MaxSize, TRUE); @@ -1446,6 +1478,11 @@ } else { + if(!IsDiskSizeValid(PartitionList->CurrentPartition)) + { + MUIDisplayError(ERROR_INSUFFICIENT_DISKSPACE, Ir, POPUP_WAIT_ANY_KEY); + return SELECT_PARTITION_PAGE; /* let the user select another partition */ + } return(SELECT_FILE_SYSTEM_PAGE); } } @@ -1489,6 +1526,11 @@ } else if (Ir->Event.KeyEvent.wVirtualKeyCode == VK_RETURN) /* ENTER */ { + if(!IsDiskSizeValid(PartitionList->CurrentPartition)) + { + MUIDisplayError(ERROR_INSUFFICIENT_DISKSPACE, Ir, POPUP_WAIT_ANY_KEY); + return SELECT_PARTITION_PAGE; /* let the user select another partition */ + } if (PartitionList->CurrentPartition == NULL || PartitionList->CurrentPartition->Unpartitioned == TRUE) { Modified: trunk/reactos/base/setup/usetup/lang/bg-BG.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/bg-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/bg-BG.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/bg-BG.h [iso-8859-1] Mon May 24 22:53:32 2010 @@ -1482,6 +1482,12 @@ //ERROR_ADDING_KBLAYOUTS, "¥ãá¯¥è® ¤®¡ ¢ï¥ ª« ¢¨ âãà¨â¥ ¯®¤à¥¤¡¨ ¢ à¥£¨áâêà .\n" "ENTER = à¥§ ¯ãáª ¥ ª®¬¯îâêà " + }, + { + //ERROR_INSUFFICIENT_DISKSPACE, + "Not enough free space in the selected partition.\n" + " * â¨á¥â¥ ª« ¢¨è, § ¤ ¯à®¤ê«¦¨â¥.", + NULL }, { //ERROR_UPDATE_GEOID, Modified: trunk/reactos/base/setup/usetup/lang/en-US.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/en-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/en-US.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/en-US.h [iso-8859-1] Mon May 24 22:53:32 2010 @@ -1475,6 +1475,12 @@ //ERROR_UPDATE_GEOID, "Setup could not set the geo id.\n" "ENTER = Reboot computer" + }, + { + //ERROR_INSUFFICIENT_DISKSPACE, + "Not enough free space in the selected partition.\n" + " * Press any key to continue.", + NULL }, { NULL, Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/es-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] Mon May 24 22:53:32 2010 @@ -18,7 +18,7 @@ { 6, 8, - "Selecci¢n de idioma", + "Selecci¢n del idioma", TEXT_STYLE_NORMAL }, { @@ -1471,6 +1471,12 @@ //ERROR_ADDING_KBLAYOUTS, "Setup failed to add keyboard layouts to registry.\n" "ENTER = Reboot computer" + }, + { + //ERROR_INSUFFICIENT_DISKSPACE, + "No hay suficiente espacio disponible en la partici¢n seleccionada.\n" + " * Presione una tecla para continuar.", + NULL }, { //ERROR_UPDATE_GEOID, Modified: trunk/reactos/base/setup/usetup/lang/et-EE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/et-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/et-EE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/et-EE.h [iso-8859-1] Mon May 24 22:53:32 2010 @@ -1467,6 +1467,12 @@ //ERROR_ADDING_KBLAYOUTS, "Klaviatuuriasetusi ei ännestunud registrisse lisada.\n" "ENTER = Taaskivita arvuti" + }, + { + //ERROR_INSUFFICIENT_DISKSPACE, + "Not enough free space in the selected partition.\n" + " * Press any key to continue.", + NULL }, { //ERROR_UPDATE_GEOID, Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/fr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] Mon May 24 22:53:32 2010 @@ -1483,6 +1483,12 @@ //ERROR_ADDING_KBLAYOUTS, "Setup failed to add keyboard layouts to registry.\n" "ENTER = Reboot computer" + }, + { + //ERROR_INSUFFICIENT_DISKSPACE, + "Not enough free space in the selected partition.\n" + " * Press any key to continue.", + NULL }, { //ERROR_UPDATE_GEOID, Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/it-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] Mon May 24 22:53:32 2010 @@ -1471,6 +1471,12 @@ //ERROR_ADDING_KBLAYOUTS, "Impossibile aggiungere le nazionalit di tastiera al registro.\n" "INVIO = Riavviare il computer" + }, + { + //ERROR_INSUFFICIENT_DISKSPACE, + "Lo spazio disponibile nella partizione selezionata insufficiente.\n" + " * Premere un tasto qualsiasi per continuare.", + NULL }, { //ERROR_UPDATE_GEOID, Modified: trunk/reactos/base/setup/usetup/lang/ja-JP.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ja-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ja-JP.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ja-JP.h [iso-8859-1] Mon May 24 22:53:32 2010 @@ -1476,6 +1476,12 @@ //ERROR_UPDATE_GEOID, "¾¯Ä±¯ÌßÊ geo id ¦ ¾¯Ã² ÃÞ·Ï¾Ý ÃÞ¼À¡\n" "ENTER = ºÝËß°ÀÉ »²·ÄÞ³" + }, + { + //ERROR_INSUFFICIENT_DISKSPACE, + "Not enough free space in the selected partition.\n" + " * Press any key to continue.", + NULL }, { NULL, Modified: trunk/reactos/base/setup/usetup/lang/lt-LT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/lt-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/lt-LT.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/lt-LT.h [iso-8859-1] Mon May 24 22:53:32 2010 @@ -1480,6 +1480,12 @@ //ERROR_ADDING_KBLAYOUTS, "Setup failed to add keyboard layouts to registry.\n" "ENTER = Reboot computer" + }, + { + //ERROR_INSUFFICIENT_DISKSPACE, + "Not enough free space in the selected partition.\n" + " * Press any key to continue.", + NULL }, { //ERROR_UPDATE_GEOID, Modified: trunk/reactos/base/setup/usetup/lang/nl-NL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/nl-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/nl-NL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/nl-NL.h [iso-8859-1] Mon May 24 22:53:32 2010 @@ -1498,6 +1498,12 @@ //ERROR_ADDING_KBLAYOUTS, "Setup kan de toetsenbord indelingen niet toevoegen aan de registry.\n" "ENTER = Reboot computer" + }, + { + //ERROR_INSUFFICIENT_DISKSPACE, + "Not enough free space in the selected partition.\n" + " * Press any key to continue.", + NULL }, { //ERROR_UPDATE_GEOID, Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pl-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] Mon May 24 22:53:32 2010 @@ -1479,6 +1479,12 @@ //ERROR_ADDING_KBLAYOUTS, "Instalator nie m¢g doda ukad¢w klawiatury do rejestru.\n" "ENTER = Restart komputera" + }, + { + //ERROR_INSUFFICIENT_DISKSPACE, + "Not enough free space in the selected partition.\n" + " * Press any key to continue.", + NULL }, { //ERROR_UPDATE_GEOID, Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ru-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] Mon May 24 22:53:32 2010 @@ -1471,6 +1471,12 @@ //ERROR_ADDING_KBLAYOUTS, "Setup failed to add keyboard layouts to registry.\n" "ENTER = Reboot computer" + }, + { + //ERROR_INSUFFICIENT_DISKSPACE, + "Not enough free space in the selected partition.\n" + " * Press any key to continue.", + NULL }, { //ERROR_UPDATE_GEOID, Modified: trunk/reactos/base/setup/usetup/lang/sk-SK.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] Mon May 24 22:53:32 2010 @@ -1481,6 +1481,12 @@ //ERROR_ADDING_KBLAYOUTS, "Inçtal tor zlyhal pri prid van¡ rozlo§en¡ kl vesnice do registrov.\n" "ENTER = Reçtart po¡taa" + }, + { + //ERROR_INSUFFICIENT_DISKSPACE, + "Not enough free space in the selected partition.\n" + " * Press any key to continue.", + NULL }, { //ERROR_UPDATE_GEOID, Modified: trunk/reactos/base/setup/usetup/lang/sv-SE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sv-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sv-SE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sv-SE.h [iso-8859-1] Mon May 24 22:53:32 2010 @@ -1471,6 +1471,12 @@ //ERROR_ADDING_KBLAYOUTS, "Setup failed to add keyboard layouts to registry.\n" "ENTER = Reboot computer" + }, + { + //ERROR_INSUFFICIENT_DISKSPACE, + "Not enough free space in the selected partition.\n" + " * Press any key to continue.", + NULL }, { //ERROR_UPDATE_GEOID, Modified: trunk/reactos/base/setup/usetup/lang/uk-UA.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/uk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] Mon May 24 22:53:32 2010 @@ -1477,6 +1477,12 @@ //ERROR_ADDING_KBLAYOUTS, "¥ ¢¤ «®áì ¤®¤ â¨ à®§ª« ¤ª¨ ª« ¢i âãà¨ ¤® à¥óáâàã.\n" "ENTER = ¥à¥§ ¢ â ¦¨â¨ ª®¬¯'îâ¥à" + }, + { + //ERROR_INSUFFICIENT_DISKSPACE, + "Not enough free space in the selected partition.\n" + " * Press any key to continue.", + NULL }, { //ERROR_UPDATE_GEOID,

14 years, 8 months

[tkreuzer] 47340: [WIN32K / WIN32CSR] Get rid of FASTCALL specifier for static functions and functions with no parameters.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon May 24 15:34:08 2010 New Revision: 47340 URL: http://svn.reactos.org/svn/reactos?rev=47340&view=rev Log: [WIN32K / WIN32CSR] Get rid of FASTCALL specifier for static functions and functions with no parameters. Modified: trunk/reactos/subsystems/win32/csrss/win32csr/exitros.c trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c trunk/reactos/subsystems/win32/win32k/include/cursoricon.h trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/exitros.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/exitros.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/exitros.c [iso-8859-1] Mon May 24 15:34:08 2010 @@ -197,7 +197,7 @@ typedef void (WINAPI *INITCOMMONCONTROLS_PROC)(void); -static void FASTCALL +static void CallInitCommonControls() { static BOOL Initialized = FALSE; Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c [iso-8859-1] Mon May 24 15:34:08 2010 @@ -113,7 +113,7 @@ /* FUNCTIONS *****************************************************************/ -static VOID FASTCALL +static VOID GuiConsoleAppendMenuItems(HMENU hMenu, const GUICONSOLE_MENUITEM *Items) { @@ -168,7 +168,7 @@ }while(!(Items[i].uID == 0 && Items[i].SubMenu == NULL && Items[i].wCmdID == 0)); } -static VOID FASTCALL +static VOID GuiConsoleCreateSysMenu(PCSRSS_CONSOLE Console) { HMENU hMenu; @@ -182,14 +182,14 @@ } } -static VOID FASTCALL +static VOID GuiConsoleGetDataPointers(HWND hWnd, PCSRSS_CONSOLE *Console, PGUI_CONSOLE_DATA *GuiData) { *Console = (PCSRSS_CONSOLE) GetWindowLongPtrW(hWnd, GWL_USERDATA); *GuiData = (NULL == *Console ? NULL : (*Console)->PrivateData); } -static BOOL FASTCALL +static BOOL GuiConsoleOpenUserRegistryPathPerProcessId(DWORD ProcessId, PHANDLE hProcHandle, PHKEY hResult, REGSAM samDesired) { HANDLE hProcessToken = NULL; @@ -245,7 +245,7 @@ return TRUE; } -static BOOL FASTCALL +static BOOL GuiConsoleOpenUserSettings(PGUI_CONSOLE_DATA GuiData, DWORD ProcessId, PHKEY hSubKey, REGSAM samDesired, BOOL bCreate) { WCHAR szProcessName[MAX_PATH]; @@ -491,7 +491,7 @@ RegCloseKey(hKey); } -static void FASTCALL +static void GuiConsoleReadUserSettings(HKEY hKey, PCSRSS_CONSOLE Console, PGUI_CONSOLE_DATA GuiData, PCSRSS_SCREEN_BUFFER Buffer) { DWORD dwNumSubKeys = 0; @@ -593,7 +593,7 @@ } } } -static VOID FASTCALL +static VOID GuiConsoleUseDefaults(PCSRSS_CONSOLE Console, PGUI_CONSOLE_DATA GuiData, PCSRSS_SCREEN_BUFFER Buffer) { /* @@ -676,7 +676,7 @@ SWP_NOZORDER | SWP_NOMOVE | SWP_NOACTIVATE); } -static BOOL FASTCALL +static BOOL GuiConsoleHandleNcCreate(HWND hWnd, CREATESTRUCTW *Create) { PCSRSS_CONSOLE Console = (PCSRSS_CONSOLE) Create->lpCreateParams; @@ -797,7 +797,7 @@ Rect->bottom = (SmallRect->Bottom + 1 - Buffer->ShowY) * GuiData->CharHeight; } -static VOID FASTCALL +static VOID GuiConsoleUpdateSelection(PCSRSS_CONSOLE Console, PCOORD coord) { RECT oldRect, newRect; @@ -857,7 +857,7 @@ } -static VOID FASTCALL +static VOID GuiConsolePaint(PCSRSS_CONSOLE Console, PGUI_CONSOLE_DATA GuiData, HDC hDC, @@ -980,7 +980,7 @@ OldFont); } -static VOID FASTCALL +static VOID GuiConsoleHandlePaint(HWND hWnd, HDC hDCPaint) { HDC hDC; @@ -1035,7 +1035,7 @@ EndPaint(hWnd, &ps); } -static VOID FASTCALL +static VOID GuiConsoleHandleKey(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { PCSRSS_CONSOLE Console; @@ -1065,7 +1065,7 @@ InvalidateRect(Console->hWindow, &RegionRect, FALSE); } -static VOID FASTCALL +static VOID GuiInvalidateCell(PCSRSS_CONSOLE Console, UINT x, UINT y) { SMALL_RECT CellRect = { x, y, x, y }; @@ -1165,7 +1165,7 @@ return TRUE; } -static VOID FASTCALL +static VOID GuiConsoleHandleTimer(HWND hWnd) { PCSRSS_CONSOLE Console; @@ -1254,7 +1254,7 @@ } } -static VOID FASTCALL +static VOID GuiConsoleHandleClose(HWND hWnd) { PCSRSS_CONSOLE Console; @@ -1281,7 +1281,7 @@ LeaveCriticalSection(&Console->Lock); } -static VOID FASTCALL +static VOID GuiConsoleHandleNcDestroy(HWND hWnd) { PCSRSS_CONSOLE Console; @@ -1316,7 +1316,7 @@ return Coord; } -static VOID FASTCALL +static VOID GuiConsoleLeftMouseDown(HWND hWnd, LPARAM lParam) { PCSRSS_CONSOLE Console; @@ -1334,7 +1334,7 @@ GuiConsoleUpdateSelection(Console, &Console->Selection.dwSelectionAnchor); } -static VOID FASTCALL +static VOID GuiConsoleLeftMouseUp(HWND hWnd, LPARAM lParam) { PCSRSS_CONSOLE Console; @@ -1354,7 +1354,7 @@ ReleaseCapture(); } -static VOID FASTCALL +static VOID GuiConsoleMouseMove(HWND hWnd, WPARAM wParam, LPARAM lParam) { PCSRSS_CONSOLE Console; @@ -1372,7 +1372,7 @@ GuiConsoleUpdateSelection(Console, &c); } -static VOID FASTCALL +static VOID GuiConsoleRightMouseDown(HWND hWnd) { PCSRSS_CONSOLE Console; @@ -1467,7 +1467,7 @@ CPLFunc(hWnd, CPL_DBLCLK, (LPARAM)&SharedInfo, Defaults); } -static LRESULT FASTCALL +static LRESULT GuiConsoleHandleSysMenuCommand(HWND hWnd, WPARAM wParam, LPARAM lParam, PGUI_CONSOLE_DATA GuiData) { LRESULT Ret = TRUE; @@ -1497,7 +1497,7 @@ return Ret; } -static VOID FASTCALL +static VOID GuiConsoleGetMinMaxInfo(HWND hWnd, PMINMAXINFO minMaxInfo) { PCSRSS_CONSOLE Console; @@ -1520,7 +1520,7 @@ minMaxInfo->ptMaxTrackSize.x = windx; minMaxInfo->ptMaxTrackSize.y = windy; } -static VOID FASTCALL +static VOID GuiConsoleResize(HWND hWnd, WPARAM wParam, LPARAM lParam) { PCSRSS_CONSOLE Console; @@ -1576,6 +1576,7 @@ GuiData->WindowSizeLock = FALSE; } } + VOID FASTCALL GuiConsoleHandleScrollbarMenu() @@ -1694,7 +1695,7 @@ return STATUS_SUCCESS; } -static VOID FASTCALL +static VOID GuiApplyUserSettings(PCSRSS_CONSOLE Console, PGUI_CONSOLE_DATA GuiData, PConsoleInfo pConInfo) { DWORD windx, windy; @@ -2031,7 +2032,7 @@ return 1; } -static BOOL FASTCALL +static BOOL GuiInit(VOID) { WNDCLASSEXW wc; Modified: trunk/reactos/subsystems/win32/win32k/include/cursoricon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/cursoricon.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/cursoricon.h [iso-8859-1] Mon May 24 15:34:08 2010 @@ -69,8 +69,8 @@ BOOL ScreenSaverRunning; } SYSTEM_CURSORINFO, *PSYSTEM_CURSORINFO; -BOOL FASTCALL InitCursorImpl(); -PCURICON_OBJECT FASTCALL IntCreateCurIconHandle(); +BOOL InitCursorImpl(); +PCURICON_OBJECT IntCreateCurIconHandle(); VOID FASTCALL IntCleanupCurIcons(struct _EPROCESS *Process, PPROCESSINFO Win32Process); BOOL UserDrawIconEx(HDC hDc, INT xLeft, INT yTop, PCURICON_OBJECT pIcon, INT cxWidth, @@ -81,8 +81,7 @@ int UserShowCursor(BOOL bShow); -PSYSTEM_CURSORINFO FASTCALL -IntGetSysCursorInfo(); +PSYSTEM_CURSORINFO IntGetSysCursorInfo(); #define IntReleaseCurIconObject(CurIconObj) \ UserDereferenceObject(CurIconObj) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] Mon May 24 15:34:08 2010 @@ -46,7 +46,7 @@ SYSTEM_CURSORINFO gSysCursorInfo; -BOOL FASTCALL +BOOL InitCursorImpl() { ExInitializePagedLookasideList(&gProcessLookasideList, @@ -70,7 +70,7 @@ return TRUE; } -PSYSTEM_CURSORINFO FASTCALL +PSYSTEM_CURSORINFO IntGetSysCursorInfo() { return &gSysCursorInfo; @@ -378,7 +378,7 @@ return NULL; } -PCURICON_OBJECT FASTCALL +PCURICON_OBJECT IntCreateCurIconHandle() { PCURICON_OBJECT CurIcon;

14 years, 8 months

[tkreuzer] 47339: [WIN32K] When destroying a window, generate a mouse move message, so that the underlying window is notified about the mouse position and can update the pointer if neccessary. Fixes bug #4499 and bug #3893 See issue #4499 for more details.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon May 24 14:57:03 2010 New Revision: 47339 URL: http://svn.reactos.org/svn/reactos?rev=47339&view=rev Log: [WIN32K] When destroying a window, generate a mouse move message, so that the underlying window is notified about the mouse position and can update the pointer if neccessary. Fixes bug #4499 and bug #3893 See issue #4499 for more details. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Mon May 24 14:57:03 2010 @@ -2674,6 +2674,7 @@ PWND Wnd; HWND hWnd; PTHREADINFO ti; + MSG msg; ASSERT_REFS_CO(Window); // FIXME: temp hack? @@ -2810,6 +2811,13 @@ } } } + + /* Generate mouse move message for the next window */ + msg.message = WM_MOUSEMOVE; + msg.wParam = IntGetSysCursorInfo()->ButtonsDown; + msg.lParam = MAKELPARAM(gpsi->ptCursor.x, gpsi->ptCursor.y); + msg.pt = gpsi->ptCursor; + MsqInsertSystemMessage(&msg); if (!IntIsWindow(Window->hSelf)) {

14 years, 8 months

[fireball] 47338: - Revert 47310. Please find a way to enable kmtest only when building the testing cd image, not the installation/live one.

by fireball＠svn.reactos.org

Author: fireball Date: Mon May 24 10:51:52 2010 New Revision: 47338 URL: http://svn.reactos.org/svn/reactos?rev=47338&view=rev Log: - Revert 47310. Please find a way to enable kmtest only when building the testing cd image, not the installation/live one. Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Mon May 24 10:51:52 2010 @@ -1076,11 +1076,11 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Fs_Rec","Type",0x00010001,0x00000008 ; Kernel-Mode Tests -HKLM,"SYSTEM\CurrentControlSet\Services\Kmtest","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Kmtest","Group",0x00000000,"Base" -HKLM,"SYSTEM\CurrentControlSet\Services\Kmtest","ImagePath",0x00020000,"system32\drivers\kmtest.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Kmtest","Start",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\Kmtest","Type",0x00010001,0x00000001 +;HKLM,"SYSTEM\CurrentControlSet\Services\Kmtest","ErrorControl",0x00010001,0x00000000 +;HKLM,"SYSTEM\CurrentControlSet\Services\Kmtest","Group",0x00000000,"Base" +;HKLM,"SYSTEM\CurrentControlSet\Services\Kmtest","ImagePath",0x00020000,"system32\drivers\kmtest.sys" +;HKLM,"SYSTEM\CurrentControlSet\Services\Kmtest","Start",0x00010001,0x00000001 +;HKLM,"SYSTEM\CurrentControlSet\Services\Kmtest","Type",0x00010001,0x00000001 ; Keyboard class driver HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","ErrorControl",0x00010001,0x00000000

14 years, 8 months

[jmorlan] 47337: [WIN32CSR] fix tuiconsole

by jmorlan＠svn.reactos.org

Author: jmorlan Date: Mon May 24 02:04:56 2010 New Revision: 47337 URL: http://svn.reactos.org/svn/reactos?rev=47337&view=rev Log: [WIN32CSR] fix tuiconsole Modified: trunk/reactos/subsystems/win32/csrss/win32csr/tuiconsole.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/tuiconsole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/tuiconsole.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/tuiconsole.c [iso-8859-1] Mon May 24 02:04:56 2010 @@ -124,17 +124,17 @@ } static void FASTCALL -TuiCopyRect(char *Dest, PCSRSS_SCREEN_BUFFER Buff, RECT *Region) +TuiCopyRect(char *Dest, PCSRSS_SCREEN_BUFFER Buff, SMALL_RECT *Region) { UINT SrcDelta, DestDelta; LONG i; PBYTE Src, SrcEnd; - Src = ConioCoordToPointer(Buff, Region->left, Region->top); + Src = ConioCoordToPointer(Buff, Region->Left, Region->Top); SrcDelta = Buff->MaxX * 2; SrcEnd = Buff->Buffer + Buff->MaxY * Buff->MaxX * 2; DestDelta = ConioRectWidth(Region) * 2; - for (i = Region->top; i <= Region->bottom; i++) + for (i = Region->Top; i <= Region->Bottom; i++) { memcpy(Dest, Src, DestDelta); Src += SrcDelta; @@ -147,7 +147,7 @@ } static VOID WINAPI -TuiDrawRegion(PCSRSS_CONSOLE Console, RECT *Region) +TuiDrawRegion(PCSRSS_CONSOLE Console, SMALL_RECT *Region) { DWORD BytesReturned; PCSRSS_SCREEN_BUFFER Buff = Console->ActiveBuffer; @@ -167,8 +167,8 @@ DPRINT1("HeapAlloc failed\n"); return; } - ConsoleDraw->X = Region->left; - ConsoleDraw->Y = Region->top; + ConsoleDraw->X = Region->Left; + ConsoleDraw->Y = Region->Top; ConsoleDraw->SizeX = ConioRectWidth(Region); ConsoleDraw->SizeY = ConioRectHeight(Region); ConsoleDraw->CursorX = Buff->CurrentX; @@ -188,7 +188,7 @@ } static VOID WINAPI -TuiWriteStream(PCSRSS_CONSOLE Console, RECT *Region, LONG CursorStartX, LONG CursorStartY, +TuiWriteStream(PCSRSS_CONSOLE Console, SMALL_RECT *Region, LONG CursorStartX, LONG CursorStartY, UINT ScrolledLines, CHAR *Buffer, UINT Length) { DWORD BytesWritten;

14 years, 8 months

[ekohl] 47336: [SMSS] - Add the system environment variables PROCESSOR_LEVEL and PROCESSOR_REVISION.

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon May 24 01:41:16 2010 New Revision: 47336 URL: http://svn.reactos.org/svn/reactos?rev=47336&view=rev Log: [SMSS] - Add the system environment variables PROCESSOR_LEVEL and PROCESSOR_REVISION. Modified: trunk/reactos/base/system/smss/initenv.c Modified: trunk/reactos/base/system/smss/initenv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/initenv.c… ============================================================================== --- trunk/reactos/base/system/smss/initenv.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/initenv.c [iso-8859-1] Mon May 24 01:41:16 2010 @@ -66,20 +66,27 @@ SmSetEnvironmentVariables(VOID) { SYSTEM_BASIC_INFORMATION BasicInformation; - + SYSTEM_PROCESSOR_INFORMATION ProcessorInformation; RTL_QUERY_REGISTRY_TABLE QueryTable[3]; UNICODE_STRING Identifier; UNICODE_STRING VendorIdentifier; WCHAR Buffer[256]; - UNICODE_STRING EnvironmentKeyName; OBJECT_ATTRIBUTES ObjectAttributes; HANDLE EnvironmentKey; UNICODE_STRING VariableName; PWSTR VariableData; - NTSTATUS Status; + Status = NtQuerySystemInformation(SystemProcessorInformation, + &ProcessorInformation, + sizeof(SYSTEM_PROCESSOR_INFORMATION), + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SM: Failed to retrieve system processor information (Status %08lx)", Status); + return Status; + } Status = NtQuerySystemInformation(SystemBasicInformation, &BasicInformation, @@ -149,17 +156,28 @@ RtlInitUnicodeString(&VariableName, L"PROCESSOR_ARCHITECTURE"); -#ifdef _M_IX86 - VariableData = L"x86"; -#elif _M_MD64 - VariableData = L"AMD64"; -#elif _M_ARM - VariableData = L"ARM"; -#elif _M_PPC - VariableData = L"PPC"; -#else - #error "Unsupported Architecture!\n" -#endif + switch (ProcessorInformation.ProcessorArchitecture) + { + case PROCESSOR_ARCHITECTURE_INTEL: + VariableData = L"x86"; + break; + + case PROCESSOR_ARCHITECTURE_PPC: + VariableData = L"PPC"; + break; + + case PROCESSOR_ARCHITECTURE_ARM: + VariableData = L"ARM"; + break; + + case PROCESSOR_ARCHITECTURE_AMD64: + VariableData = L"AMD64"; + break; + + default: + VariableData = L"Unknown"; + break; + } Status = NtSetValueKey(EnvironmentKey, &VariableName, @@ -170,6 +188,42 @@ if (!NT_SUCCESS(Status)) { DPRINT1("SM: Failed to set the PROCESSOR_ARCHITECTURE environment variable (Status %08lx)", Status); + goto done; + } + + /* Set the 'PROCESSOR_LEVEL' system environment variable */ + RtlInitUnicodeString(&VariableName, + L"PROCESSOR_LEVEL"); + + swprintf(Buffer, L"%lu", ProcessorInformation.ProcessorLevel); + + Status = NtSetValueKey(EnvironmentKey, + &VariableName, + 0, + REG_SZ, + Buffer, + (wcslen(Buffer) + 1) * sizeof(WCHAR)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SM: Failed to set the PROCESSOR_LEVEL environment variable (Status %08lx)", Status); + goto done; + } + + /* Set the 'PROCESSOR_REVISION' system environment variable */ + RtlInitUnicodeString(&VariableName, + L"PROCESSOR_REVISION"); + + swprintf(Buffer, L"%04x", ProcessorInformation.ProcessorRevision); + + Status = NtSetValueKey(EnvironmentKey, + &VariableName, + 0, + REG_SZ, + Buffer, + (wcslen(Buffer) + 1) * sizeof(WCHAR)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SM: Failed to set the PROCESSOR_REVISION environment variable (Status %08lx)", Status); goto done; }

14 years, 8 months

← Newer
1
...
14
15
16
17
18
19
20
...
44
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2010