Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dreimer] 43071: Add AMD64 Branch SVN Tree Creation Support to ssvn.
by dreimer＠svn.reactos.org 18 Sep '09

18 Sep '09

Author: dreimer Date: Fri Sep 18 11:27:27 2009 New Revision: 43071 URL: http://svn.reactos.org/svn/reactos?rev=43071&view=rev Log: Add AMD64 Branch SVN Tree Creation Support to ssvn. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 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] Fri Sep 18 11:27:27 2009 @@ -11,7 +11,11 @@ $OFFSVN = IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' info" | select-string "Revision:" $OFFSVN = $OFFSVN -replace "(.*)Revision: ",'' $OFFSVN = [CONVERT]::ToInt32($OFFSVN,10) - $ONSVN = IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' info svn://svn.reactos.org/reactos/trunk/reactos" | select-string "Revision:" + if ("$ENV:ROS_ARCH" -eq "amd64") { + $ONSVN = IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' info svn://svn.reactos.org/reactos/branches/ros-amd64-bringup/reactos" | select-string "Revision:" + } else { + $ONSVN = IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' info svn://svn.reactos.org/reactos/trunk/reactos" | select-string "Revision:" + } $ONSVN = $ONSVN -replace "(.*)Revision: ",'' $ONSVN = [CONVERT]::ToInt32($ONSVN,10) "Local Revision: $OFFSVN" @@ -98,7 +102,11 @@ $null = (Remove-Item "$_ROSBE_LOGDIR" -recurse -force) $dir = get-childitem if ("$dir" -eq "") { - IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' checkout svn://svn.reactos.org/reactos/trunk/reactos ." + if ("$ENV:ROS_ARCH" -eq "amd64") { + IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' checkout svn://svn.reactos.org/reactos/branches/ros-amd64-bringup/reactos ." + } else { + IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' checkout svn://svn.reactos.org/reactos/trunk/reactos ." + } } else { "ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED" } @@ -117,7 +125,11 @@ Set-Location modules\rosapps $dir = get-childitem if ("$dir" -eq "") { - IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' checkout svn://svn.reactos.org/reactos/trunk/rosapps ." + if ("$ENV:ROS_ARCH" -eq "amd64") { + IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' checkout svn://svn.reactos.org/reactos/branches/ros-amd64-bringup/rosapps ." + } else { + IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' checkout svn://svn.reactos.org/reactos/trunk/rosapps ." + } } else { "ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED" } @@ -137,7 +149,11 @@ Set-Location modules\rostests $dir = get-childitem if ("$dir" -eq "") { - IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' checkout svn://svn.reactos.org/reactos/trunk/rostests ." + if ("$ENV:ROS_ARCH" -eq "amd64") { + IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' checkout svn://svn.reactos.org/reactos/branches/ros-amd64-bringup/rostests ." + } else { + IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' checkout svn://svn.reactos.org/reactos/trunk/rostests ." + } } else { "ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED" } 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] Fri Sep 18 11:27:27 2009 @@ -47,7 +47,11 @@ rd /s /q "%_ROSBE_LOGDIR%" 1> NUL 2> NUL dir /b 2>nul | findstr "." >nul if errorlevel 1 ( - "%_ROSBE_BASEDIR%\Tools\svn.exe" checkout svn://svn.reactos.org/reactos/trunk/reactos . + if "%ROS_ARCH%" == "amd64" ( + "%_ROSBE_BASEDIR%\Tools\svn.exe" checkout svn://svn.reactos.org/reactos/branches/ros-amd64-bringup/reactos . + ) else ( + "%_ROSBE_BASEDIR%\Tools\svn.exe" checkout svn://svn.reactos.org/reactos/trunk/reactos . + ) ) else ( echo ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED ) @@ -67,7 +71,11 @@ cd modules\rosapps dir /b 2>nul | findstr "." >nul if errorlevel 1 ( - "%_ROSBE_BASEDIR%\Tools\svn.exe" checkout svn://svn.reactos.org/reactos/trunk/rosapps . + if "%ROS_ARCH%" == "amd64" ( + "%_ROSBE_BASEDIR%\Tools\svn.exe" checkout svn://svn.reactos.org/reactos/branches/ros-amd64-bringup/rosapps . + ) else ( + "%_ROSBE_BASEDIR%\Tools\svn.exe" checkout svn://svn.reactos.org/reactos/trunk/rosapps . + ) ) else ( echo ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED ) @@ -88,7 +96,11 @@ cd modules\rostests dir /b 2>nul | findstr "." >nul if errorlevel 1 ( - "%_ROSBE_BASEDIR%\Tools\svn.exe" checkout svn://svn.reactos.org/reactos/trunk/rostests . + if "%ROS_ARCH%" == "amd64" ( + "%_ROSBE_BASEDIR%\Tools\svn.exe" checkout svn://svn.reactos.org/reactos/branches/ros-amd64-bringup/rostests . + ) else ( + "%_ROSBE_BASEDIR%\Tools\svn.exe" checkout svn://svn.reactos.org/reactos/trunk/rostests . + ) ) else ( echo ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED ) @@ -112,7 +124,11 @@ :UP for /f "usebackq tokens=2" %%i in (`""%_ROSBE_BASEDIR%\Tools\svn.exe" info | find "Revision:""`) do set OFFSVN=%%i - for /f "usebackq tokens=2" %%j in (`""%_ROSBE_BASEDIR%\Tools\svn.exe" info svn://svn.reactos.org/reactos/trunk/reactos | find "Revision:""`) do set ONSVN=%%j + if "%ROS_ARCH%" == "amd64" ( + for /f "usebackq tokens=2" %%j in (`""%_ROSBE_BASEDIR%\Tools\svn.exe" info svn://svn.reactos.org/reactos/branches/ros-amd64-bringup/reactos | find "Revision:""`) do set ONSVN=%%j + ) else ( + for /f "usebackq tokens=2" %%j in (`""%_ROSBE_BASEDIR%\Tools\svn.exe" info svn://svn.reactos.org/reactos/trunk/reactos | find "Revision:""`) do set ONSVN=%%j + ) echo Local Revision: !OFFSVN! echo Online HEAD Revision: !ONSVN!

1 0

[janderwald] 43070: - Allow creating a copy of a file residing in the same directory - Free the correct the buffer - Romanian language needs to be updated See issue #4846 for more details.
by janderwald＠svn.reactos.org 18 Sep '09

18 Sep '09

Author: janderwald Date: Fri Sep 18 02:48:47 2009 New Revision: 43070 URL: http://svn.reactos.org/svn/reactos?rev=43070&view=rev Log: - Allow creating a copy of a file residing in the same directory - Free the correct the buffer - Romanian language needs to be updated See issue #4846 for more details. Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc trunk/reactos/dll/win32/shell32/lang/ca-ES.rc trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc trunk/reactos/dll/win32/shell32/lang/da-DK.rc trunk/reactos/dll/win32/shell32/lang/de-DE.rc trunk/reactos/dll/win32/shell32/lang/el-GR.rc trunk/reactos/dll/win32/shell32/lang/en-GB.rc trunk/reactos/dll/win32/shell32/lang/en-US.rc trunk/reactos/dll/win32/shell32/lang/es-ES.rc trunk/reactos/dll/win32/shell32/lang/fi-FI.rc trunk/reactos/dll/win32/shell32/lang/fr-FR.rc trunk/reactos/dll/win32/shell32/lang/hu-HU.rc trunk/reactos/dll/win32/shell32/lang/it-IT.rc trunk/reactos/dll/win32/shell32/lang/ja-JP.rc trunk/reactos/dll/win32/shell32/lang/ko-KR.rc trunk/reactos/dll/win32/shell32/lang/nl-NL.rc trunk/reactos/dll/win32/shell32/lang/no-NO.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc trunk/reactos/dll/win32/shell32/lang/pt-BR.rc trunk/reactos/dll/win32/shell32/lang/pt-PT.rc trunk/reactos/dll/win32/shell32/lang/ru-RU.rc trunk/reactos/dll/win32/shell32/lang/sk-SK.rc trunk/reactos/dll/win32/shell32/lang/sl-SI.rc trunk/reactos/dll/win32/shell32/lang/sv-SE.rc trunk/reactos/dll/win32/shell32/lang/tr-TR.rc trunk/reactos/dll/win32/shell32/lang/uk-UA.rc trunk/reactos/dll/win32/shell32/lang/zh-CN.rc trunk/reactos/dll/win32/shell32/lang/zh-TW.rc trunk/reactos/dll/win32/shell32/precomp.h trunk/reactos/dll/win32/shell32/shfldr_desktop.c trunk/reactos/dll/win32/shell32/shfldr_fs.c trunk/reactos/dll/win32/shell32/shresdef.h trunk/reactos/dll/win32/shell32/shv_def_cmenu.c trunk/reactos/dll/win32/shell32/undocshell.h Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/bg-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] Fri Sep 18 02:48:47 2009 @@ -749,8 +749,9 @@ IDS_INSTALLNEWFONT "Ñëàãàíå íà íîâ øðèôò..." IDS_DEFAULT_CLUSTER_SIZE "Ïîäðàçáèðàí ðàçïðåäåëèòåëåí ðàçìåð" -END - - - - + IDS_COPY_OF "Copy of" +END + + + + Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ca-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] Fri Sep 18 02:48:47 2009 @@ -748,4 +748,5 @@ IDS_INSTALLNEWFONT "Install New Font..." IDS_DEFAULT_CLUSTER_SIZE "Default allocation size" -END + IDS_COPY_OF "Copy of" +END Modified: trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/cs-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] Fri Sep 18 02:48:47 2009 @@ -749,4 +749,5 @@ IDS_INSTALLNEWFONT "Install New Font..." IDS_DEFAULT_CLUSTER_SIZE "Default allocation size" -END + IDS_COPY_OF "Copy of" +END Modified: trunk/reactos/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/da-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] Fri Sep 18 02:48:47 2009 @@ -737,4 +737,5 @@ IDS_INSTALLNEWFONT "Install New Font..." IDS_DEFAULT_CLUSTER_SIZE "Default allocation size" -END + IDS_COPY_OF "Copy of" +END Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] Fri Sep 18 02:48:47 2009 @@ -752,4 +752,5 @@ IDS_INSTALLNEWFONT "Neue Schriftart installieren..." IDS_DEFAULT_CLUSTER_SIZE "Standardgröße" -END + IDS_COPY_OF "Kopie von" +END Modified: trunk/reactos/dll/win32/shell32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/el-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] Fri Sep 18 02:48:47 2009 @@ -749,4 +749,5 @@ IDS_INSTALLNEWFONT "Install New Font..." IDS_DEFAULT_CLUSTER_SIZE "Default allocation size" -END + IDS_COPY_OF "Copy of" +END Modified: trunk/reactos/dll/win32/shell32/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] Fri Sep 18 02:48:47 2009 @@ -748,4 +748,5 @@ IDS_INSTALLNEWFONT "Install New Font..." IDS_DEFAULT_CLUSTER_SIZE "Default allocation size" -END + IDS_COPY_OF "Copy of" +END Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] Fri Sep 18 02:48:47 2009 @@ -748,4 +748,5 @@ IDS_INSTALLNEWFONT "Install New Font..." IDS_DEFAULT_CLUSTER_SIZE "Default allocation size" -END + IDS_COPY_OF "Copy of" +END Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] Fri Sep 18 02:48:47 2009 @@ -751,4 +751,5 @@ IDS_INSTALLNEWFONT "Instalar Nueva Fuente..." IDS_DEFAULT_CLUSTER_SIZE "Tamaño asignado por defecto" -END + IDS_COPY_OF "Copy of" +END Modified: trunk/reactos/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fi-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] Fri Sep 18 02:48:47 2009 @@ -748,4 +748,5 @@ IDS_INSTALLNEWFONT "Install New Font..." IDS_DEFAULT_CLUSTER_SIZE "Default allocation size" -END + IDS_COPY_OF "Copy of" +END Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] Fri Sep 18 02:48:47 2009 @@ -752,4 +752,5 @@ IDS_INSTALLNEWFONT "Installer une nouvelle police..." IDS_DEFAULT_CLUSTER_SIZE "Taille d'allocation par défaut" -END + IDS_COPY_OF "Copy of" +END Modified: trunk/reactos/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/hu-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] Fri Sep 18 02:48:47 2009 @@ -751,4 +751,5 @@ IDS_INSTALLNEWFONT "Install New Font..." IDS_DEFAULT_CLUSTER_SIZE "Default allocation size" -END + IDS_COPY_OF "Copy of" +END Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] Fri Sep 18 02:48:47 2009 @@ -749,4 +749,5 @@ IDS_INSTALLNEWFONT "Installazione nuovi Font..." IDS_DEFAULT_CLUSTER_SIZE "Dimensione predefinita di allocazione" -END + IDS_COPY_OF "Copy of" +END Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ja-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] Fri Sep 18 02:48:47 2009 @@ -749,4 +749,5 @@ IDS_INSTALLNEWFONT "Vµ¢tHgÌCXg[..." IDS_DEFAULT_CLUSTER_SIZE "ftHg AP[V TCY" -END + IDS_COPY_OF "Copy of" +END Modified: trunk/reactos/dll/win32/shell32/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] Fri Sep 18 02:48:47 2009 @@ -748,4 +748,5 @@ IDS_INSTALLNEWFONT "Install New Font..." IDS_DEFAULT_CLUSTER_SIZE "Default allocation size" -END + IDS_COPY_OF "Copy of" +END Modified: trunk/reactos/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] Fri Sep 18 02:48:47 2009 @@ -748,4 +748,5 @@ IDS_INSTALLNEWFONT "Install New Font..." IDS_DEFAULT_CLUSTER_SIZE "Default allocation size" -END + IDS_COPY_OF "Copy of" +END Modified: trunk/reactos/dll/win32/shell32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/no-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] Fri Sep 18 02:48:47 2009 @@ -751,5 +751,5 @@ IDS_INSTALLNEWFONT "Installere nye skrifttyper..." IDS_DEFAULT_CLUSTER_SIZE "Standard tildelingsstørrelse" - -END + IDS_COPY_OF "Copy of" +END Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] Fri Sep 18 02:48:47 2009 @@ -755,4 +755,5 @@ IDS_INSTALLNEWFONT "Zainstaluj Now¹ Czcionkê..." IDS_DEFAULT_CLUSTER_SIZE "Domylny rozmiar jednostki alokacji" -END + IDS_COPY_OF "Copy of" +END Modified: trunk/reactos/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] Fri Sep 18 02:48:47 2009 @@ -750,4 +750,5 @@ IDS_INSTALLNEWFONT "Install New Font..." IDS_DEFAULT_CLUSTER_SIZE "Default allocation size" -END + IDS_COPY_OF "Copy of" +END Modified: trunk/reactos/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] Fri Sep 18 02:48:47 2009 @@ -750,4 +750,5 @@ IDS_INSTALLNEWFONT "Install New Font..." IDS_DEFAULT_CLUSTER_SIZE "Default allocation size" -END + IDS_COPY_OF "Copy of" +END Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] Fri Sep 18 02:48:47 2009 @@ -747,4 +747,5 @@ IDS_INSTALLNEWFONT "Óñòàíîâèòü íîâûé øðèôò..." IDS_DEFAULT_CLUSTER_SIZE "Âûäåëÿåìûé ïî óìîë÷àíèþ ðàçìåð" -END + IDS_COPY_OF "Copy of" +END Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] Fri Sep 18 02:48:47 2009 @@ -754,4 +754,5 @@ IDS_INSTALLNEWFONT "&Naintalova nové písmo..." IDS_DEFAULT_CLUSTER_SIZE "Predvolená alokaèná ve¾kos" //Default allocation size -END + IDS_COPY_OF "Copy of" +END Modified: trunk/reactos/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] Fri Sep 18 02:48:47 2009 @@ -748,4 +748,5 @@ IDS_INSTALLNEWFONT "Install New Font..." IDS_DEFAULT_CLUSTER_SIZE "Default allocation size" -END + IDS_COPY_OF "Copy of" +END Modified: trunk/reactos/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sv-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] Fri Sep 18 02:48:47 2009 @@ -748,4 +748,5 @@ IDS_INSTALLNEWFONT "Install New Font..." IDS_DEFAULT_CLUSTER_SIZE "Default allocation size" -END + IDS_COPY_OF "Copy of" +END Modified: trunk/reactos/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/tr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] Fri Sep 18 02:48:47 2009 @@ -748,4 +748,5 @@ IDS_INSTALLNEWFONT "Install New Font..." IDS_DEFAULT_CLUSTER_SIZE "Default allocation size" -END + IDS_COPY_OF "Copy of" +END Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] Fri Sep 18 02:48:47 2009 @@ -749,4 +749,5 @@ IDS_INSTALLNEWFONT "²íñòàëþâàòè íîâèé øðèôò..." IDS_DEFAULT_CLUSTER_SIZE "Ðîçì³ð êëàñòåðà çà ïðîìîâ÷àííÿì" -END + IDS_COPY_OF "Copy of" +END Modified: trunk/reactos/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] Fri Sep 18 02:48:47 2009 @@ -736,5 +736,6 @@ IDS_INSTALLNEWFONT "Install New Font..." IDS_DEFAULT_CLUSTER_SIZE "Default allocation size" -END - + IDS_COPY_OF "Copy of" +END + Modified: trunk/reactos/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] Fri Sep 18 02:48:47 2009 @@ -749,7 +749,7 @@ IDS_INSTALLNEWFONT "Install New Font..." IDS_DEFAULT_CLUSTER_SIZE "Default allocation size" - + IDS_COPY_OF "Copy of" END #pragma code_page(default) Modified: trunk/reactos/dll/win32/shell32/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/precomp.… ============================================================================== --- trunk/reactos/dll/win32/shell32/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/precomp.h [iso-8859-1] Fri Sep 18 02:48:47 2009 @@ -60,6 +60,7 @@ #include "version.h" #include "shellfolder.h" #include "xdg.h" +#include "shellapi.h" #include "wine/debug.h" #include "wine/unicode.h" Modified: trunk/reactos/dll/win32/shell32/shfldr_desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_d… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr_desktop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shfldr_desktop.c [iso-8859-1] Fri Sep 18 02:48:47 2009 @@ -1289,8 +1289,8 @@ WCHAR szTargetPath[MAX_PATH]; SHFILEOPSTRUCTW op; LPITEMIDLIST pidl; - LPWSTR pszSrc, pszTarget, pszSrcList, pszTargetList; - int res; + LPWSTR pszSrc, pszTarget, pszSrcList, pszTargetList, pszFileName; + int res, length; STRRET strRet; IGenericSFImpl *This = impl_from_ISFHelper(iface); @@ -1377,8 +1377,28 @@ res = SHFileOperationW(&op); - HeapFree(GetProcessHeap(), 0, pszSrc); - HeapFree(GetProcessHeap(), 0, pszTarget); + if (res == DE_SAMEFILE) + { + length = wcslen(szTargetPath); + + + pszFileName = wcsrchr(pszSrcList, '\\'); + pszFileName++; + + if (LoadStringW(shell32_hInstance, IDS_COPY_FROM, pszTarget, MAX_PATH - length)) + { + wcscat(szTargetPath, L" "); + } + + wcscat(szTargetPath, pszFileName); + op.pTo = szTargetPath; + + res = SHFileOperationW(&op); + } + + + HeapFree(GetProcessHeap(), 0, pszSrcList); + HeapFree(GetProcessHeap(), 0, pszTargetList); if (res) return E_FAIL; Modified: trunk/reactos/dll/win32/shell32/shfldr_fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_f… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr_fs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shfldr_fs.c [iso-8859-1] Fri Sep 18 02:48:47 2009 @@ -1260,16 +1260,17 @@ WCHAR szTargetPath[MAX_PATH]; SHFILEOPSTRUCTW op; LPITEMIDLIST pidl; - LPWSTR pszSrc, pszTarget, pszSrcList, pszTargetList; - int res; + LPWSTR pszSrc, pszTarget, pszSrcList, pszTargetList, pszFileName; + int res, length; + HRESULT hr; STRRET strRet; IGenericSFImpl *This = impl_from_ISFHelper(iface); TRACE ("(%p)->(%p,%u,%p)\n", This, pSFFrom, cidl, apidl); - IShellFolder_QueryInterface (pSFFrom, &IID_IPersistFolder2, (LPVOID *) & ppf2); - if (ppf2) + hr = IShellFolder_QueryInterface (pSFFrom, &IID_IPersistFolder2, (LPVOID *) & ppf2); + if (SUCCEEDED(hr)) { if (FAILED(IPersistFolder2_GetCurFolder (ppf2, &pidl))) { @@ -1349,8 +1350,26 @@ res = SHFileOperationW(&op); - HeapFree(GetProcessHeap(), 0, pszSrc); - HeapFree(GetProcessHeap(), 0, pszTarget); + if (res == DE_SAMEFILE) + { + length = wcslen(szTargetPath); + + pszFileName = wcsrchr(pszSrcList, '\\'); + pszFileName++; + + if (LoadStringW(shell32_hInstance, IDS_COPY_FROM, pszTarget, MAX_PATH - length)) + { + wcscat(szTargetPath, L" "); + } + + wcscat(szTargetPath, pszFileName); + op.pTo = szTargetPath; + + res = SHFileOperationW(&op); + } + + HeapFree(GetProcessHeap(), 0, pszSrcList); + HeapFree(GetProcessHeap(), 0, pszTargetList); if (res) return E_FAIL; Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef… ============================================================================== --- trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] Fri Sep 18 02:48:47 2009 @@ -168,6 +168,7 @@ #define IDS_RENAME 328 #define IDS_INSERT 329 #define IDS_DESCRIPTION 330 +#define IDS_COPY_OF 331 /* Note: this string is referenced from the registry */ #define IDS_RECYCLEBIN_FOLDER_NAME 8964 Modified: trunk/reactos/dll/win32/shell32/shv_def_cmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_def_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_def_cmenu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shv_def_cmenu.c [iso-8859-1] Fri Sep 18 02:48:47 2009 @@ -1052,7 +1052,12 @@ return E_FAIL; } - if (FAILED(IShellFolder_BindToObject(psfDesktop, pidl, NULL, &IID_IShellFolder, (LPVOID*)&psfFrom))) + if (_ILIsDesktop(pidl)) + { + /* use desktop shellfolder */ + psfFrom = psfDesktop; + } + else if (FAILED(IShellFolder_BindToObject(psfDesktop, pidl, NULL, &IID_IShellFolder, (LPVOID*)&psfFrom))) { ERR("no IShellFolder\n"); Modified: trunk/reactos/dll/win32/shell32/undocshell.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/undocshe… ============================================================================== --- trunk/reactos/dll/win32/shell32/undocshell.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/undocshell.h [iso-8859-1] Fri Sep 18 02:48:47 2009 @@ -81,6 +81,8 @@ #define RFF_NOLABEL 0x08 #define RFF_NOSEPARATEMEM 0x20 /* NT only */ +#define DE_SAMEFILE 0x71 + /* RunFileFlg notification structure */ typedef struct {

1 0

[cgutman] 43069: - Use proper object attributes and share access when opening the file object - Fixes a rare INVALID_KERNEL_HANDLE BSOD and debug log handle warnings from AFD when using Firefox - See bug #4796
by cgutman＠svn.reactos.org 17 Sep '09

17 Sep '09

Author: cgutman Date: Fri Sep 18 01:09:16 2009 New Revision: 43069 URL: http://svn.reactos.org/svn/reactos?rev=43069&view=rev Log: - Use proper object attributes and share access when opening the file object - Fixes a rare INVALID_KERNEL_HANDLE BSOD and debug log handle warnings from AFD when using Firefox - See bug #4796 Modified: trunk/reactos/drivers/network/afd/afd/tdi.c Modified: trunk/reactos/drivers/network/afd/afd/tdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/td… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/tdi.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/tdi.c [iso-8859-1] Fri Sep 18 01:09:16 2009 @@ -112,7 +112,8 @@ InitializeObjectAttributes(&Attr, /* Attribute buffer */ DeviceName, /* Device name */ - OBJ_CASE_INSENSITIVE, /* Attributes */ + OBJ_CASE_INSENSITIVE | /* Attributes */ + OBJ_KERNEL_HANDLE, NULL, /* Root directory */ NULL); /* Security descriptor */ @@ -122,7 +123,7 @@ &Iosb, /* IO status */ 0, /* Initial allocation size */ FILE_ATTRIBUTE_NORMAL, /* File attributes */ - FILE_SHARE_READ | FILE_SHARE_WRITE, /* Share access */ + 0, /* Share access */ FILE_OPEN_IF, /* Create disposition */ 0, /* Create options */ EaInfo, /* EA buffer */

1 0

[janderwald] 43068: - Implement ISFHelper_fnCopyItems for desktop shellfolder - Check if the target folder desktop - Fixes copying of files to desktop See issue #4845 for more details.
by janderwald＠svn.reactos.org 17 Sep '09

17 Sep '09

Author: janderwald Date: Fri Sep 18 00:57:50 2009 New Revision: 43068 URL: http://svn.reactos.org/svn/reactos?rev=43068&view=rev Log: - Implement ISFHelper_fnCopyItems for desktop shellfolder - Check if the target folder desktop - Fixes copying of files to desktop See issue #4845 for more details. Modified: trunk/reactos/dll/win32/shell32/shfldr_desktop.c trunk/reactos/dll/win32/shell32/shv_def_cmenu.c Modified: trunk/reactos/dll/win32/shell32/shfldr_desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_d… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr_desktop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shfldr_desktop.c [iso-8859-1] Fri Sep 18 00:57:50 2009 @@ -1284,10 +1284,108 @@ static HRESULT WINAPI ISF_Desktop_ISFHelper_fnCopyItems (ISFHelper * iface, IShellFolder * pSFFrom, UINT cidl, LPCITEMIDLIST * apidl) { + IPersistFolder2 *ppf2 = NULL; + WCHAR szSrcPath[MAX_PATH]; + WCHAR szTargetPath[MAX_PATH]; + SHFILEOPSTRUCTW op; + LPITEMIDLIST pidl; + LPWSTR pszSrc, pszTarget, pszSrcList, pszTargetList; + int res; + STRRET strRet; IGenericSFImpl *This = impl_from_ISFHelper(iface); TRACE ("(%p)->(%p,%u,%p)\n", This, pSFFrom, cidl, apidl); - return E_NOTIMPL; + + IShellFolder_QueryInterface (pSFFrom, &IID_IPersistFolder2, (LPVOID *) & ppf2); + if (ppf2) + { + if (FAILED(IPersistFolder2_GetCurFolder (ppf2, &pidl))) + { + IPersistFolder2_Release(ppf2); + return E_FAIL; + } + IPersistFolder2_Release(ppf2); + + if (FAILED(IShellFolder_GetDisplayNameOf(pSFFrom, pidl, SHGDN_FORPARSING, &strRet))) + { + SHFree (pidl); + return E_FAIL; + } + + if (FAILED(StrRetToBufW(&strRet, pidl, szSrcPath, MAX_PATH))) + { + SHFree (pidl); + return E_FAIL; + } + SHFree (pidl); + + pszSrc = PathAddBackslashW (szSrcPath); + + wcscpy(szTargetPath, This->sPathTarget); + pszTarget = PathAddBackslashW (szTargetPath); + + pszSrcList = build_paths_list(szSrcPath, cidl, apidl); + pszTargetList = build_paths_list(szTargetPath, cidl, apidl); + + if (!pszSrcList || !pszTargetList) + { + if (pszSrcList) + HeapFree(GetProcessHeap(), 0, pszSrcList); + + if (pszTargetList) + HeapFree(GetProcessHeap(), 0, pszTargetList); + + SHFree (pidl); + IPersistFolder2_Release (ppf2); + return E_OUTOFMEMORY; + } + ZeroMemory(&op, sizeof(op)); + if (!pszSrcList[0]) + { + /* remove trailing backslash */ + pszSrc--; + pszSrc[0] = L'\0'; + op.pFrom = szSrcPath; + } + else + { + op.pFrom = pszSrcList; + } + + if (!pszTargetList[0]) + { + /* remove trailing backslash */ + if (pszTarget - szTargetPath > 3) + { + pszTarget--; + pszTarget[0] = L'\0'; + } + else + { + pszTarget[1] = L'\0'; + } + + op.pTo = szTargetPath; + } + else + { + op.pTo = pszTargetList; + } + op.hwnd = GetActiveWindow(); + op.wFunc = FO_COPY; + op.fFlags = FOF_ALLOWUNDO | FOF_NOCONFIRMMKDIR; + + res = SHFileOperationW(&op); + + HeapFree(GetProcessHeap(), 0, pszSrc); + HeapFree(GetProcessHeap(), 0, pszTarget); + + if (res) + return E_FAIL; + else + return S_OK; + } + return E_FAIL; } static const ISFHelperVtbl vt_FSFldr_ISFHelper = Modified: trunk/reactos/dll/win32/shell32/shv_def_cmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_def_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_def_cmenu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shv_def_cmenu.c [iso-8859-1] Fri Sep 18 00:57:50 2009 @@ -1083,9 +1083,18 @@ IPersistFolder2_Release(ppf2); if (SUCCEEDED(hr)) { - hr = IShellFolder_BindToObject(psfDesktop, pidl, NULL, &IID_IShellFolder, (LPVOID*)&psfTarget); + if (_ILIsDesktop(pidl)) + { + /* use desktop shellfolder */ + psfTarget = psfDesktop; + } + else + { + /* retrieve target desktop folder */ + hr = IShellFolder_BindToObject(psfDesktop, pidl, NULL, &IID_IShellFolder, (LPVOID*)&psfTarget); + } + TRACE("psfTarget %x %p, Desktop %u\n", hr, psfTarget, _ILIsDesktop(pidl)); ILFree(pidl); - TRACE("psfTarget %p\n", psfTarget); } } } @@ -1146,7 +1155,7 @@ _ILFreeaPidl(apidl, lpcida->cidl); ReleaseStgMedium(&medium); IDataObject_Release(pda); -ERR("CP result %x\n",hr); + TRACE("CP result %x\n",hr); return S_OK; }

1 0

[sginsberg] 43067: - Fix kernel build regression for MSVC from 43014
by sginsberg＠svn.reactos.org 17 Sep '09

17 Sep '09

Author: sginsberg Date: Thu Sep 17 20:28:26 2009 New Revision: 43067 URL: http://svn.reactos.org/svn/reactos?rev=43067&view=rev Log: - Fix kernel build regression for MSVC from 43014 Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb.c?rev=43… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb.c [iso-8859-1] Thu Sep 17 20:28:26 2009 @@ -1228,7 +1228,7 @@ /*!\brief Calls the main loop ... */ static VOID -KdbpCallMainLoop() +KdbpCallMainLoop(VOID) { KdbpCliMainLoop(KdbEnteredOnSingleStep); }

1 0

[arty] 43066: Patch by maxime vernier (bugzilla bug 4661). Fix the ghost bug and the graphical glitch with process id 0
by arty＠svn.reactos.org 17 Sep '09

17 Sep '09

Author: arty Date: Thu Sep 17 18:07:37 2009 New Revision: 43066 URL: http://svn.reactos.org/svn/reactos?rev=43066&view=rev Log: Patch by maxime vernier (bugzilla bug 4661). Fix the ghost bug and the graphical glitch with process id 0 Modified: trunk/reactos/base/applications/taskmgr/procpage.c Modified: trunk/reactos/base/applications/taskmgr/procpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/procpage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/procpage.c [iso-8859-1] Thu Sep 17 18:07:37 2009 @@ -29,6 +29,7 @@ typedef struct { ULONG Index; + ULONG ProcessId; } PROCESS_PAGE_LIST_ITEM, *LPPROCESS_PAGE_LIST_ITEM; HWND hProcessPage; /* Process List Property Page */ @@ -51,6 +52,7 @@ void ProcessPageShowContextMenu(DWORD dwProcessId); BOOL PerfDataGetText(ULONG Index, ULONG ColumnIndex, LPTSTR lpText, int nMaxCount); DWORD WINAPI ProcessPageRefreshThread(void *lpParameter); +int ProcessRunning(ULONG ProcessId); DWORD GetSelectedProcessId(void) { @@ -411,12 +413,9 @@ void UpdateProcesses() { int i; - BOOL found = FALSE; ULONG l; - ULONG pid; LV_ITEM item; LPPROCESS_PAGE_LIST_ITEM pData; - PPERFDATA pPerfData; /* Remove old processes */ for (i = 0; i < ListView_GetItemCount(hProcessPageListCtrl); i++) @@ -426,19 +425,9 @@ item.iItem = i; (void)ListView_GetItem(hProcessPageListCtrl, &item); pData = (LPPROCESS_PAGE_LIST_ITEM)item.lParam; - (void)PerfDataGet(pData->Index, &pPerfData); - pid = PerfDataGetProcessId(pData->Index); - for (l = 0; l < PerfDataGetProcessCount(); l++) + if (!ProcessRunning(pData->ProcessId)) { - if (PerfDataGetProcessId(l) == pid) - { - found = TRUE; - break; - } - } - if (!found) - { - (void)ListView_DeleteItem(hApplicationPageListCtrl, i); + (void)ListView_DeleteItem(hProcessPageListCtrl, i); HeapFree(GetProcessHeap(), 0, pData); } } @@ -450,6 +439,29 @@ { (void)ListView_SortItems(hProcessPageListCtrl, ProcessPageCompareFunc, NULL); } +} + +BOOL ProcessRunning(ULONG ProcessId) +{ + HANDLE hProcess; + DWORD exitCode; + + if (ProcessId == 0) { + return TRUE; + } + + hProcess = OpenProcess(PROCESS_ALL_ACCESS, FALSE, ProcessId); + if (hProcess == NULL) { + return FALSE; + } + + if (GetExitCodeProcess(hProcess, &exitCode)) { + CloseHandle(hProcess); + return (exitCode == STILL_ACTIVE); + } + + CloseHandle(hProcess); + return FALSE; } void AddProcess(ULONG Index) @@ -480,7 +492,8 @@ { pData = (LPPROCESS_PAGE_LIST_ITEM)HeapAlloc(GetProcessHeap(), 0, sizeof(PROCESS_PAGE_LIST_ITEM)); pData->Index = Index; - + pData->ProcessId = pid; + /* Add the item to the list */ memset(&item, 0, sizeof(LV_ITEM)); item.mask = LVIF_TEXT|LVIF_PARAM;

1 0

[sginsberg] 43065: - Use __MINGW_NOTHROW instead of __attribute__
by sginsberg＠svn.reactos.org 17 Sep '09

17 Sep '09

Author: sginsberg Date: Thu Sep 17 17:47:35 2009 New Revision: 43065 URL: http://svn.reactos.org/svn/reactos?rev=43065&view=rev Log: - Use __MINGW_NOTHROW instead of __attribute__ Modified: trunk/reactos/include/crt/float.h trunk/reactos/include/crt/setjmp.h Modified: trunk/reactos/include/crt/float.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/float.h?rev=43… ============================================================================== --- trunk/reactos/include/crt/float.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/float.h [iso-8859-1] Thu Sep 17 17:47:35 2009 @@ -104,12 +104,12 @@ /* Set the FPU control word as cw = (cw & ~unMask) | (unNew & unMask), * i.e. change the bits in unMask to have the values they have in unNew, * leaving other bits unchanged. */ -_CRTIMP unsigned int __cdecl __attribute__ ((__nothrow__)) _controlfp (unsigned int unNew, unsigned int unMask); -_CRTIMP unsigned int __cdecl __attribute__ ((__nothrow__)) _control87 (unsigned int unNew, unsigned int unMask); +_CRTIMP unsigned int __cdecl __MINGW_NOTHROW _controlfp (unsigned int unNew, unsigned int unMask); +_CRTIMP unsigned int __cdecl __MINGW_NOTHROW _control87 (unsigned int unNew, unsigned int unMask); -_CRTIMP unsigned int __cdecl __attribute__ ((__nothrow__)) _clearfp (void); /* Clear the FPU status word */ -_CRTIMP unsigned int __cdecl __attribute__ ((__nothrow__)) _statusfp (void); /* Report the FPU status word */ +_CRTIMP unsigned int __cdecl __MINGW_NOTHROW _clearfp (void); /* Clear the FPU status word */ +_CRTIMP unsigned int __cdecl __MINGW_NOTHROW _statusfp (void); /* Report the FPU status word */ #define _clear87 _clearfp #define _status87 _statusfp @@ -123,11 +123,11 @@ per fninit. To use the MSVCRT.dll _fpreset, include CRT_fp8.o when building your application. */ -void __cdecl __attribute__ ((__nothrow__)) _fpreset (void); -void __cdecl __attribute__ ((__nothrow__)) fpreset (void); +void __cdecl __MINGW_NOTHROW _fpreset (void); +void __cdecl __MINGW_NOTHROW fpreset (void); /* Global 'variable' for the current floating point error code. */ -_CRTIMP int * __cdecl __attribute__ ((__nothrow__)) __fpecode(void); +_CRTIMP int * __cdecl __MINGW_NOTHROW __fpecode(void); #define _fpecode (*(__fpecode())) /* @@ -135,15 +135,15 @@ * but they really belong in math.h. */ -_CRTIMP double __cdecl __attribute__ ((__nothrow__)) _chgsign (double); -_CRTIMP double __cdecl __attribute__ ((__nothrow__)) _copysign (double, double); -_CRTIMP double __cdecl __attribute__ ((__nothrow__)) _logb (double); -_CRTIMP double __cdecl __attribute__ ((__nothrow__)) _nextafter (double, double); -_CRTIMP double __cdecl __attribute__ ((__nothrow__)) _scalb (double, long); +_CRTIMP double __cdecl __MINGW_NOTHROW _chgsign (double); +_CRTIMP double __cdecl __MINGW_NOTHROW _copysign (double, double); +_CRTIMP double __cdecl __MINGW_NOTHROW _logb (double); +_CRTIMP double __cdecl __MINGW_NOTHROW _nextafter (double, double); +_CRTIMP double __cdecl __MINGW_NOTHROW _scalb (double, long); -_CRTIMP int __cdecl __attribute__ ((__nothrow__)) _finite (double); -_CRTIMP int __cdecl __attribute__ ((__nothrow__)) _fpclass (double); -_CRTIMP int __cdecl __attribute__ ((__nothrow__)) _isnan (double); +_CRTIMP int __cdecl __MINGW_NOTHROW _finite (double); +_CRTIMP int __cdecl __MINGW_NOTHROW _fpclass (double); +_CRTIMP int __cdecl __MINGW_NOTHROW _isnan (double); #ifdef __cplusplus } Modified: trunk/reactos/include/crt/setjmp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/setjmp.h?rev=4… ============================================================================== --- trunk/reactos/include/crt/setjmp.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/setjmp.h [iso-8859-1] Thu Sep 17 17:47:35 2009 @@ -130,27 +130,27 @@ #define _JMP_BUF_DEFINED #endif - void * __cdecl __attribute__ ((__nothrow__)) mingw_getsp(void); + void * __cdecl __MINGW_NOTHROW mingw_getsp(void); #ifdef USE_MINGW_SETJMP_TWO_ARGS #ifndef _INC_SETJMPEX #define setjmp(BUF) _setjmp((BUF),mingw_getsp()) - int __cdecl __attribute__ ((__nothrow__)) _setjmp(jmp_buf _Buf,void *_Ctx); + int __cdecl __MINGW_NOTHROW _setjmp(jmp_buf _Buf,void *_Ctx); #else #undef setjmp #define setjmp(BUF) _setjmpex((BUF),mingw_getsp()) #define setjmpex(BUF) _setjmpex((BUF),mingw_getsp()) - int __cdecl __attribute__ ((__nothrow__)) _setjmpex(jmp_buf _Buf,void *_Ctx); + int __cdecl __MINGW_NOTHROW _setjmpex(jmp_buf _Buf,void *_Ctx); #endif #else #ifndef _INC_SETJMPEX #define setjmp _setjmp #endif - int __cdecl __attribute__ ((__nothrow__)) setjmp(jmp_buf _Buf); + int __cdecl __MINGW_NOTHROW setjmp(jmp_buf _Buf); #endif - __declspec(noreturn) __attribute__ ((__nothrow__)) void __cdecl ms_longjmp(jmp_buf _Buf,int _Value)/* throw(...)*/; - __declspec(noreturn) __attribute__ ((__nothrow__)) void __cdecl longjmp(jmp_buf _Buf,int _Value); + __declspec(noreturn) __MINGW_NOTHROW void __cdecl ms_longjmp(jmp_buf _Buf,int _Value)/* throw(...)*/; + __declspec(noreturn) __MINGW_NOTHROW void __cdecl longjmp(jmp_buf _Buf,int _Value); #ifdef __cplusplus }

1 0

[sginsberg] 43064: - Fix uninitialized variable usage in DefWindowProcA/W - Don't inline EnableScrollBar as a forwarder for NtUserEnableScrollBar when it is implemented differently. Also define EXTINLINE compatibly for MSVC.
by sginsberg＠svn.reactos.org 17 Sep '09

17 Sep '09

Author: sginsberg Date: Thu Sep 17 17:46:24 2009 New Revision: 43064 URL: http://svn.reactos.org/svn/reactos?rev=43064&view=rev Log: - Fix uninitialized variable usage in DefWindowProcA/W - Don't inline EnableScrollBar as a forwarder for NtUserEnableScrollBar when it is implemented differently. Also define EXTINLINE compatibly for MSVC. Modified: trunk/reactos/dll/win32/user32/include/ntwrapper.h trunk/reactos/dll/win32/user32/windows/defwnd.c Modified: trunk/reactos/dll/win32/user32/include/ntwrapper.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/n… ============================================================================== --- trunk/reactos/dll/win32/user32/include/ntwrapper.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/ntwrapper.h [iso-8859-1] Thu Sep 17 17:46:24 2009 @@ -1,10 +1,10 @@ +#if defined(__GNUC__) #define EXTINLINE extern inline __attribute__((always_inline)) - -EXTINLINE BOOL WINAPI -EnableScrollBar(HWND hWnd, UINT wSBflags, UINT wArrows) -{ - return NtUserEnableScrollBar(hWnd, wSBflags, wArrows); -} +#elif defined(_MSC_VER) +#define EXTINLINE extern __forceinline +#else +#error +#endif EXTINLINE BOOL WINAPI GetScrollBarInfo(HWND hWnd, LONG idObject, PSCROLLBARINFO psbi) Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] Thu Sep 17 17:46:24 2009 @@ -2181,7 +2181,7 @@ WPARAM wParam, LPARAM lParam) { - BOOL Hook, msgOverride; + BOOL Hook, msgOverride = FALSE; LRESULT Result = 0; LOADUSERAPIHOOK @@ -2214,7 +2214,7 @@ WPARAM wParam, LPARAM lParam) { - BOOL Hook, msgOverride; + BOOL Hook, msgOverride = FALSE; LRESULT Result = 0; LOADUSERAPIHOOK

1 0

[janderwald] 43063: - Fix 2 user32 winstation test failures (patch by Giannis Adamopoulos johnyadams (_AT_)hotmail (D-O-T) com - Test results verified by Amine Khaldi
by janderwald＠svn.reactos.org 17 Sep '09

17 Sep '09

Author: janderwald Date: Thu Sep 17 17:25:36 2009 New Revision: 43063 URL: http://svn.reactos.org/svn/reactos?rev=43063&view=rev Log: - Fix 2 user32 winstation test failures (patch by Giannis Adamopoulos johnyadams (_AT_)hotmail (D-O-T) com - Test results verified by Amine Khaldi Modified: trunk/reactos/dll/win32/user32/misc/winsta.c Modified: trunk/reactos/dll/win32/user32/misc/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/wins… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/winsta.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/winsta.c [iso-8859-1] Thu Sep 17 17:25:36 2009 @@ -88,8 +88,7 @@ */ if (NULL == WindowStation && Desktops) { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; + WindowStation = GetProcessWindowStation(); } /*

1 0

[janderwald] 43062: - Fix 2 user32 winstation test failures (patch by Giannis Adamopoulos johnyadams (_AT_)hotmail (D-O-T) com - Revert hack from 43061 and fix it properly - Test results verified by Amine Khaldi
by janderwald＠svn.reactos.org 17 Sep '09

17 Sep '09

Author: janderwald Date: Thu Sep 17 17:20:24 2009 New Revision: 43062 URL: http://svn.reactos.org/svn/reactos?rev=43062&view=rev Log: - Fix 2 user32 winstation test failures (patch by Giannis Adamopoulos johnyadams (_AT_)hotmail (D-O-T) com - Revert hack from 43061 and fix it properly - Test results verified by Amine Khaldi Modified: trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c [iso-8859-1] Thu Sep 17 17:20:24 2009 @@ -1152,7 +1152,7 @@ WinSta = UserGetProcessWindowStation(); - Status = IntValidateWindowStationHandle(WinSta, UserMode, 0 /*WINSTA_ACCESSCLIPBOARD*/, &WinStaObj); + Status = IntValidateWindowStationHandle(WinSta, KernelMode, WINSTA_ACCESSCLIPBOARD, &WinStaObj); if (!NT_SUCCESS(Status)) { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] Thu Sep 17 17:20:24 2009 @@ -630,14 +630,14 @@ InitializeObjectAttributes( &ObjectAttributes, &WindowStationName, - 0, + OBJ_CASE_INSENSITIVE, NULL, NULL); Status = ObOpenObjectByName( &ObjectAttributes, ExWindowStationObjectType, - UserMode, + KernelMode, NULL, dwDesiredAccess, NULL, @@ -686,6 +686,11 @@ NTSTATUS Status; DPRINT("About to close window station handle (0x%X)\n", hWinSta); + + if (hWinSta == UserGetProcessWindowStation()) + { + return FALSE; + } Status = IntValidateWindowStationHandle( hWinSta,

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs