Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dreimer] 40923: Fixed chdefgcc, charch and chdefdir for PS and Batch. Fixed version showing when using charch and chdefdir under PS. Fixed endless loop in update under PS. Fixed variables to TARGET GCC under PS. Thx to Jaykul from #powershell
by dreimer＠svn.reactos.org 14 May '09

14 May '09

Author: dreimer Date: Fri May 15 01:50:20 2009 New Revision: 40923 URL: http://svn.reactos.org/svn/reactos?rev=40923&view=rev Log: Fixed chdefgcc, charch and chdefdir for PS and Batch. Fixed version showing when using charch and chdefdir under PS. Fixed endless loop in update under PS. Fixed variables to TARGET GCC under PS. Thx to Jaykul from #powershell Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/chdefgcc.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/version.ps1 trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 [iso-8859-1] Fri May 15 01:50:20 2009 @@ -86,7 +86,7 @@ } # Prepare XML Parser. -[xml] $XML = get-content "$ENV:APPDATA\RosBE\config.rbuild" +[xml]$xml = get-content "$ENV:APPDATA\RosBE\config.rbuild" # Start with reading settings from config.rbuild and let the user edit them. "Sub-Architecture to build for." Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/chdefgcc.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/chdefgcc.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/chdefgcc.ps1 [iso-8859-1] Fri May 15 01:50:20 2009 @@ -14,7 +14,7 @@ } function EOA { - IEX "&'$_ROSBE_BASEDIR\rosbe-gcc-env.cmd'" + IEX "&'$_ROSBE_BASEDIR\rosbe-gcc-env.ps1'" version settitle } @@ -38,13 +38,15 @@ } # Verify the entered values +$local:ErrorActionPreference = "SilentlyContinue" if (Test-Path "$_ROSBE_BASEDIR\$TOOLPATH\.") { + $ENV:ROS_ARCH = "$TOOLPATH" $TOOLPATH = "$_ROSBE_BASEDIR\$TOOLPATH" } elseif (!(Test-Path "$TOOLPATH\.")) { "ERROR: The path specified doesn't seem to exist." settitle } - +$local:ErrorActionPreference = "Continue" if (!(Test-Path "$TOOLPATH\bin\*gcc.exe")) { "ERROR: No MinGW/GCC found in the specified path." settitle @@ -52,6 +54,9 @@ # Set the values if ($TOOLMODE -eq "target") { + if ($ENV:ROS_ARCH -eq $null) { + $ENV:ROS_ARCH = Read-Host "Please specify the arch: " + } $_ROSBE_TARGET_MINGWPATH = $TOOLPATH "Target Location: $_ROSBE_TARGET_MINGWPATH" EOA Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] Fri May 15 01:50:20 2009 @@ -27,5 +27,5 @@ $ENV:ROSBE_HOST_CFLAGS = "-I""$_ROSBE_HOST_MINGWPATH\include"" -I""$_ROSBE_HOST_MINGWPATH\lib\gcc\$_ROSBE_HOST_GCCTARGET\$_ROSBE_HOST_GCCVERSION\include""" $ENV:ROSBE_HOST_CXXFLAGS = "-I""$_ROSBE_HOST_MINGWPATH\include"" -I""$_ROSBE_HOST_MINGWPATH\include\c++\$_ROSBE_HOST_GCCVERSION"" -I""$_ROSBE_HOST_MINGWPATH\include\c++\$_ROSBE_HOST_GCCVERSION\$_ROSBE_HOST_GCCTARGET"" -I""$_ROSBE_HOST_MINGWPATH\lib\gcc\$_ROSBE_HOST_GCCTARGET\$_ROSBE_HOST_GCCVERSION\include""" -$ENV:ROSBE_TARGET_CFLAGS = "-I""$_ROSBE_TARGET_MINGWPATH\include"" -I""$_ROSBE_TARGET_MINGWPATH\lib\gcc\$_ROSBE_GCCTARGET\$_ROSBE_GCCVERSION\include""" -$ENV:ROSBE_TARGET_CXXFLAGS = "-I""$_ROSBE_TARGET_MINGWPATH\include"" -I""$_ROSBE_TARGET_MINGWPATH\include\c++\$_ROSBE_GCCVERSION"" -I""$_ROSBE_TARGET_MINGWPATH\include\c++\$_ROSBE_GCCVERSION\$_ROSBE_GCCTARGET"" -I""$_ROSBE_TARGET_MINGWPATH\lib\gcc\$_ROSBE_GCCTARGET\$_ROSBE_GCCVERSION\include""" +$ENV:ROSBE_TARGET_CFLAGS = "-I""$_ROSBE_TARGET_MINGWPATH\include"" -I""$_ROSBE_TARGET_MINGWPATH\lib\gcc\$_ROSBE_TARGET_GCCTARGET\$_ROSBE_TARGET_GCCVERSION\include""" +$ENV:ROSBE_TARGET_CXXFLAGS = "-I""$_ROSBE_TARGET_MINGWPATH\include"" -I""$_ROSBE_TARGET_MINGWPATH\include\c++\$_ROSBE_TARGET_GCCVERSION"" -I""$_ROSBE_TARGET_MINGWPATH\include\c++\$_ROSBE_TARGET_GCCVERSION\$_ROSBE_TARGET_GCCTARGET"" -I""$_ROSBE_TARGET_MINGWPATH\lib\gcc\$_ROSBE_TARGET_GCCTARGET\$_ROSBE_TARGET_GCCVERSION\include""" Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 [iso-8859-1] Fri May 15 01:50:20 2009 @@ -76,7 +76,7 @@ # First check for a new Updater. rename-item update.ps1 update2.ps1 get-webfile $_ROSBE_URL/update.ps1 $PWD\update.ps1 -if ((gi .\update.ps1).LastWriteTime -gt (gi .\update2.ps1).LastWriteTime) { +if ((gi .\update.ps1).length -ne (gi .\update2.ps1).length) { clear-host "Updater got updated and needs to be restarted." remove-item update2.ps1 -force Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/version.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/version.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/version.ps1 [iso-8859-1] Fri May 15 01:50:20 2009 @@ -9,14 +9,15 @@ (get-WmiObject Win32_OperatingSystem).caption # GCC +$TARGETGCC = "$ENV:ROS_PREFIX" + "gcc" & $TARGETGCC -v 2> gcctvers.tmp -(select-string -path .\gcctvers.tmp "gcc version") -replace ".*: (.+?)\b",'$1' | % { $str = $_ -replace '^.*14:',''} -$str -"gcc target - $_ROSBE_GCCTARGET" +(select-string -path .\gcctvers.tmp "gcc version") -replace ".*:(.*?)\b",'$1' +"gcc target - $_ROSBE_TARGET_GCCTARGET" remove-item gcctvers.tmp # LD -& "$_ROSBE_TARGET_MINGWPATH\bin\$ENV:ROS_PREFIXld" -v +$run = "$_ROSBE_TARGET_MINGWPATH\bin\$ENV:ROS_PREFIX" + "ld.exe" +& "$run" -v # NASM or YASM if (Test-Path "$_ROSBE_HOST_MINGWPATH\bin\nasm.exe") { Modified: trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/chd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd [iso-8859-1] Fri May 15 01:50:20 2009 @@ -42,6 +42,6 @@ ) :EOC -set _ROSBE_ROSSOURCEDIR=%CD% +set SOURCEDIR=%CD% title ReactOS Build Environment %_ROSBE_VERSION% -endlocal +endlocal & set _ROSBE_ROSSOURCEDIR=%SOURCEDIR% Modified: trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/chd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd [iso-8859-1] Fri May 15 01:50:20 2009 @@ -18,7 +18,7 @@ title Change the current MinGW/GCC Host/Target directory... :: Parse the command line arguments. Ask the user if certain parameters are missing. -if "%1" == "" ( +if .%1. == .. ( set /p TOOLPATH="Please enter a MinGW/GCC directory (don't use quotes): " if "!TOOLPATH!" == "" ( @@ -42,6 +42,7 @@ :: Verify the entered values if exist "%_ROSBE_BASEDIR%\%TOOLPATH%\." ( + set ROS_ARCH=%TOOLPATH% set TOOLPATH=%_ROSBE_BASEDIR%\%TOOLPATH% ) else if not exist "%TOOLPATH%\." ( echo ERROR: The path specified doesn't seem to exist. @@ -55,17 +56,20 @@ :: Set the values if /i "%TOOLMODE%" == "target" ( + if "%ROS_ARCH%" == "i386" ( + set /p ROS_ARCH="Please specify the arch: " + ) echo Target Location: %TOOLPATH% - endlocal & set _ROSBE_TARGET_MINGWPATH=%TOOLPATH% + set _ROSBE_TARGET_MINGWPATH=%TOOLPATH% ) else if /i "%TOOLMODE%" == "host" ( echo Host Location: %TOOLPATH% - endlocal & set _ROSBE_HOST_MINGWPATH=%TOOLPATH% + set _ROSBE_HOST_MINGWPATH=%TOOLPATH% ) else ( echo ERROR: You specified wrong parameters. endlocal goto :EOC ) - +endlocal & set _ROSBE_HOST_MINGWPATH=%_ROSBE_HOST_MINGWPATH%& set _ROSBE_TARGET_MINGWPATH=%_ROSBE_TARGET_MINGWPATH%& set ROS_ARCH=%ROS_ARCH% call "%_ROSBE_BASEDIR%\rosbe-gcc-env.cmd" call "%_ROSBE_BASEDIR%\version.cmd"

1 0

[dchapyshev] 40922: - Add shortcut for Paint
by dchapyshev＠svn.reactos.org 14 May '09

14 May '09

Author: dchapyshev Date: Thu May 14 21:15:55 2009 New Revision: 40922 URL: http://svn.reactos.org/svn/reactos?rev=40922&view=rev Log: - Add shortcut for Paint Modified: trunk/reactos/dll/win32/syssetup/install.c trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc trunk/reactos/dll/win32/syssetup/lang/de-DE.rc trunk/reactos/dll/win32/syssetup/lang/el-GR.rc trunk/reactos/dll/win32/syssetup/lang/en-US.rc trunk/reactos/dll/win32/syssetup/lang/es-ES.rc trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc trunk/reactos/dll/win32/syssetup/lang/id-ID.rc trunk/reactos/dll/win32/syssetup/lang/it-IT.rc trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc trunk/reactos/dll/win32/syssetup/lang/no-NO.rc trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc trunk/reactos/dll/win32/syssetup/resource.h Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] Thu May 14 21:15:55 2009 @@ -776,6 +776,7 @@ CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_RDESKTOP, _T("%SystemRoot%\\system32\\mstsc.exe"), IDS_CMT_RDESKTOP, TRUE); CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_SNAP, _T("%SystemRoot%\\system32\\screenshot.exe"), IDS_CMT_SCREENSHOT, TRUE); CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_WORDPAD, _T("%SystemRoot%\\system32\\wordpad.exe"), IDS_CMT_WORDPAD, TRUE); + CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_PAINT, _T("%SystemRoot%\\system32\\paint.exe"), IDS_CMT_PAINT, TRUE); } /* Create System Tools subfolder and fill if the exe is available */ Modified: trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/bg… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc [iso-8859-1] Thu May 14 21:15:55 2009 @@ -217,6 +217,7 @@ IDS_CMT_RDESKTOP "Ïóñêàíå íà îòäàëå÷åíàòà ðàáîòíà ïëîù" IDS_CMT_EVENTVIEW "Ïóñêàíå íà ïðåãëåäíèêà íà ñúáèòèÿ" IDS_CMT_MSCONFIG "Ïóñêàíå íà ïðèëîæåíèåòî çà íàñòðîéêà íà óðåäáàòà" + IDS_CMT_PAINT "Launch Paint" END @@ -284,6 +285,7 @@ IDS_SHORT_MSCONFIG "Íàñòðîéêà íà óðåäáàòà.lnk" IDS_SHORT_SNDVOL32 "Ñèëà íà çâóêà.lnk" IDS_SHORT_DXDIAG "Ïðåãëåæäàíå íà ÐåàêòÕ.lnk" + IDS_SHORT_PAINT "Paint.lnk" END Modified: trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/cs… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc [iso-8859-1] Thu May 14 21:15:55 2009 @@ -213,6 +213,7 @@ IDS_CMT_RDESKTOP "Spustit Vzdálenou plochu" IDS_CMT_EVENTVIEW "Launch Event Viewer" IDS_CMT_MSCONFIG "Launch System Configuration program" + IDS_CMT_PAINT "Launch Paint" END STRINGTABLE @@ -280,6 +281,7 @@ IDS_SHORT_MPLAY32 "Multimedia Player.lnk" IDS_SHORT_SNDVOL32 "Volume Control.lnk" IDS_SHORT_DXDIAG "ReactX Diagnostic.lnk" + IDS_SHORT_PAINT "Paint.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/de… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/de-DE.rc [iso-8859-1] Thu May 14 21:15:55 2009 @@ -213,6 +213,7 @@ IDS_CMT_RDESKTOP "Starte Remote Desktop" IDS_CMT_EVENTVIEW "Starte Ereignisanzeige" IDS_CMT_MSCONFIG "Starte Systemkonfigurations Programm" + IDS_CMT_PAINT "Launch Paint" END STRINGTABLE @@ -280,6 +281,7 @@ IDS_SHORT_MSCONFIG "Systemkonfiguration.lnk" IDS_SHORT_SNDVOL32 "Volume Control.lnk" IDS_SHORT_DXDIAG "ReactX Diagnostic.lnk" + IDS_SHORT_PAINT "Paint.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/el… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/el-GR.rc [iso-8859-1] Thu May 14 21:15:55 2009 @@ -214,6 +214,7 @@ IDS_CMT_RDESKTOP "Launch Remote Desktop" IDS_CMT_EVENTVIEW "ÐñïâïëÞ ÓõìâÜíôùí" IDS_CMT_MSCONFIG "Âïçèçôéêü ðñüãñáììá ñýèìéóçò ðáñáìÝôñùí" + IDS_CMT_PAINT "Launch Paint" END STRINGTABLE @@ -281,6 +282,7 @@ IDS_SHORT_MSCONFIG "Âïçèçôéêü ðñüãñáììá ñýèìéóçò ðáñáìÝôñùí.lnk" IDS_SHORT_SNDVOL32 "Volume Control.lnk" IDS_SHORT_DXDIAG "ReactX Diagnostic.lnk" + IDS_SHORT_PAINT "Paint.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/en… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/en-US.rc [iso-8859-1] Thu May 14 21:15:55 2009 @@ -214,6 +214,7 @@ IDS_CMT_SCREENSHOT "Take screenshot" IDS_CMT_SERVMAN "Launch Service Manager" IDS_CMT_WORDPAD "Launch Document Editor" + IDS_CMT_PAINT "Launch Paint" END STRINGTABLE @@ -280,6 +281,7 @@ IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" IDS_SHORT_WORDPAD "WordPad.lnk" + IDS_SHORT_PAINT "Paint.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/es… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/es-ES.rc [iso-8859-1] Thu May 14 21:15:55 2009 @@ -223,6 +223,7 @@ IDS_CMT_RDESKTOP "Ejecutar Escritorio remoto" IDS_CMT_EVENTVIEW "Ejecutar Visor de sucesos" IDS_CMT_MSCONFIG "Ejecutar Utilidad de configuración del sistema" + IDS_CMT_PAINT "Launch Paint" END STRINGTABLE @@ -290,6 +291,7 @@ IDS_SHORT_MSCONFIG "Configuración del sistema.lnk" IDS_SHORT_SNDVOL32 "Control de volumen.lnk" IDS_SHORT_DXDIAG "Diagnóstico de ReactX.lnk" + IDS_SHORT_PAINT "Paint.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/fr… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc [iso-8859-1] Thu May 14 21:15:55 2009 @@ -214,6 +214,7 @@ IDS_CMT_RDESKTOP "Lancer le bureau distant" IDS_CMT_EVENTVIEW "Launch Event Viewer" IDS_CMT_MSCONFIG "Launch System Configuration program" + IDS_CMT_PAINT "Launch Paint" END STRINGTABLE @@ -280,6 +281,7 @@ IDS_SHORT_MSCONFIG "System Configuration.lnk" IDS_SHORT_SNDVOL32 "Volume Control.lnk" IDS_SHORT_DXDIAG "ReactX Diagnostic.lnk" + IDS_SHORT_PAINT "Paint.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/hu… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc [iso-8859-1] Thu May 14 21:15:55 2009 @@ -226,6 +226,7 @@ IDS_CMT_RDESKTOP "Launch Remote Desktop" IDS_CMT_EVENTVIEW "Launch Event Viewer" IDS_CMT_MSCONFIG "Launch System Configuration program" + IDS_CMT_PAINT "Launch Paint" END STRINGTABLE @@ -293,6 +294,7 @@ IDS_SHORT_MSCONFIG "System Configuration.lnk" IDS_SHORT_SNDVOL32 "Volume Control.lnk" IDS_SHORT_DXDIAG "ReactX Diagnostic.lnk" + IDS_SHORT_PAINT "Paint.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/id… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/id-ID.rc [iso-8859-1] Thu May 14 21:15:55 2009 @@ -212,6 +212,7 @@ IDS_CMT_RDESKTOP "Launch Remote Desktop" IDS_CMT_EVENTVIEW "Launch Event Viewer" IDS_CMT_MSCONFIG "Launch System Configuration program" + IDS_CMT_PAINT "Launch Paint" END STRINGTABLE @@ -278,6 +279,7 @@ IDS_SHORT_MSCONFIG "System Configuration.lnk" IDS_SHORT_SNDVOL32 "Volume Control.lnk" IDS_SHORT_DXDIAG "ReactX Diagnostic.lnk" + IDS_SHORT_PAINT "Paint.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/it… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/it-IT.rc [iso-8859-1] Thu May 14 21:15:55 2009 @@ -205,6 +205,7 @@ IDS_CMT_RDESKTOP "Avvia il Desktop remoto" IDS_CMT_EVENTVIEW "Lancia il visualizzatore degli eventi" IDS_CMT_MSCONFIG "Lancia il programma di configurazione del sistema" + IDS_CMT_PAINT "Launch Paint" END STRINGTABLE @@ -271,6 +272,7 @@ IDS_SHORT_MSCONFIG "Configuratione del sistema.lnk" IDS_SHORT_SNDVOL32 "Controllo Volume.lnk" IDS_SHORT_DXDIAG "ReactX Diagnostica.lnk" + IDS_SHORT_PAINT "Paint.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ja… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc [iso-8859-1] Thu May 14 21:15:55 2009 @@ -214,6 +214,7 @@ IDS_CMT_SCREENSHOT "XN[VbgðBèÜ·" IDS_CMT_SERVMAN "T[rX }l[WðN®µÜ·" IDS_CMT_WORDPAD "hLgGfB^ðN®µÜ·" + IDS_CMT_PAINT "Launch Paint" END STRINGTABLE @@ -280,6 +281,7 @@ IDS_SHORT_SOLITAIRE "\\eBA.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" IDS_SHORT_WORDPAD "[hpbh.lnk" + IDS_SHORT_PAINT "Paint.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/nl… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc [iso-8859-1] Thu May 14 21:15:55 2009 @@ -214,6 +214,7 @@ IDS_CMT_RDESKTOP "Launch Remote Desktop" IDS_CMT_EVENTVIEW "Launch Event Viewer" IDS_CMT_MSCONFIG "Launch System Configuration program" + IDS_CMT_PAINT "Launch Paint" END STRINGTABLE @@ -280,6 +281,7 @@ IDS_SHORT_MSCONFIG "System Configuration.lnk" IDS_SHORT_SNDVOL32 "Volume Control.lnk" IDS_SHORT_DXDIAG "ReactX Diagnostic.lnk" + IDS_SHORT_PAINT "Paint.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/no… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/no-NO.rc [iso-8859-1] Thu May 14 21:15:55 2009 @@ -217,6 +217,7 @@ IDS_CMT_RDESKTOP "Start Ekstern skrivebord" IDS_CMT_EVENTVIEW "Start Hendelseliste" IDS_CMT_MSCONFIG "Start Systemkonfigurasjon" + IDS_CMT_PAINT "Launch Paint" END STRINGTABLE @@ -283,6 +284,7 @@ IDS_SHORT_MSCONFIG "System Configuration.lnk" IDS_SHORT_SNDVOL32 "Volume Control.lnk" IDS_SHORT_DXDIAG "ReactX Diagnostic.lnk" + IDS_SHORT_PAINT "Paint.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/pl… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc [iso-8859-1] Thu May 14 21:15:55 2009 @@ -222,6 +222,7 @@ IDS_CMT_RDESKTOP "Uruchom Zdalny pulpit" IDS_CMT_EVENTVIEW "Uruchom Podgl¹d Zdarzeñ" IDS_CMT_MSCONFIG "Uruchom Narzêdzie konfiguracji systemu" + IDS_CMT_PAINT "Launch Paint" END @@ -288,6 +289,7 @@ IDS_SHORT_MSCONFIG "Konfiguracja systemowa.lnk" IDS_SHORT_SNDVOL32 "Regulacja g³onoci.lnk" IDS_SHORT_DXDIAG "Program diagnostyczny ReactX.lnk" + IDS_SHORT_PAINT "Paint.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ru… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc [iso-8859-1] Thu May 14 21:15:55 2009 @@ -195,6 +195,7 @@ IDS_CMT_RDESKTOP "Çàïóñòèòü óäàëåííûé ðàáî÷èé ñòîë" IDS_CMT_EVENTVIEW "Çàïóñòèòü ïðîãðàììó ïðîñìîòðà ñîáûòèé" IDS_CMT_MSCONFIG "Çàïóñòèòü ïðîãðàììó íàñòðîéêè ñèñòåìû" + IDS_CMT_PAINT "Çàïóñòèòü Paint" END STRINGTABLE @@ -262,6 +263,7 @@ IDS_SHORT_MSCONFIG "Ïàðàìåòðû ñèñòåìû.lnk" IDS_SHORT_SNDVOL32 "Ãðîìêîñòü.lnk" IDS_SHORT_DXDIAG "Ñðåäñòâî äèàãíîñòèêè ReactX.lnk" + IDS_SHORT_PAINT "Paint.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/sk… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc [iso-8859-1] Thu May 14 21:15:55 2009 @@ -199,6 +199,7 @@ IDS_CMT_RDESKTOP "Spusti Vzdialenú pracovnú plochu" IDS_CMT_EVENTVIEW "Spusti Zobrazovaè udalostí" IDS_CMT_MSCONFIG "Spusti Program na konfiguráciu systému" + IDS_CMT_PAINT "Launch Paint" END STRINGTABLE @@ -266,6 +267,7 @@ IDS_SHORT_MSCONFIG "Program na konfiguráciu systému.lnk" IDS_SHORT_SNDVOL32 "Ovládanie hlasitosti.lnk" //Volume Control IDS_SHORT_DXDIAG "Diagnostika ReactX.lnk" + IDS_SHORT_PAINT "Paint.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/uk… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc [iso-8859-1] Thu May 14 21:15:55 2009 @@ -203,6 +203,7 @@ IDS_CMT_RDESKTOP "Çàïóñòèòè Â³ääàëåíå êåðóâàííÿ ðîáî÷èì ñòîëîì" IDS_CMT_EVENTVIEW "Launch Event Viewer" IDS_CMT_MSCONFIG "Launch System Configuration program" + IDS_CMT_PAINT "Launch Paint" END STRINGTABLE @@ -270,6 +271,7 @@ IDS_SHORT_MSCONFIG "System Configuration.lnk" IDS_SHORT_SNDVOL32 "Volume Control.lnk" IDS_SHORT_DXDIAG "ReactX Diagnostic.lnk" + IDS_SHORT_PAINT "Paint.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/zh… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc [iso-8859-1] Thu May 14 21:15:55 2009 @@ -202,6 +202,7 @@ IDS_CMT_RDESKTOP "Ô¶³Ì×ÀÃæÁ¬½Ó" IDS_CMT_EVENTVIEW "Launch Event Viewer" IDS_CMT_MSCONFIG "Launch System Configuration program" + IDS_CMT_PAINT "Launch Paint" END STRINGTABLE @@ -269,6 +270,7 @@ IDS_SHORT_MSCONFIG "System Configuration.lnk" IDS_SHORT_SNDVOL32 "Volume Control.lnk" IDS_SHORT_DXDIAG "ReactX Diagnostic.lnk" + IDS_SHORT_PAINT "Paint.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/resourc… ============================================================================== --- trunk/reactos/dll/win32/syssetup/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/resource.h [iso-8859-1] Thu May 14 21:15:55 2009 @@ -120,6 +120,7 @@ #define IDS_CMT_WORDPAD 3228 #define IDS_CMT_SNDVOL32 3229 #define IDS_CMT_DXDIAG 3230 +#define IDS_CMT_PAINT 3231 #define IDS_REACTOS_SETUP 3300 #define IDS_UNKNOWN_ERROR 3301 @@ -152,6 +153,7 @@ #define IDS_SHORT_WORDPAD 3418 #define IDS_SHORT_SNDVOL32 3419 #define IDS_SHORT_DXDIAG 3420 +#define IDS_SHORT_PAINT 3421 #define IDS_WZD_NAME 3450 #define IDS_WZD_SETCOMPUTERNAME 3451

1 0

[dchapyshev] 40921: - Add icons for dialogs
by dchapyshev＠svn.reactos.org 14 May '09

14 May '09

Author: dchapyshev Date: Thu May 14 20:53:38 2009 New Revision: 40921 URL: http://svn.reactos.org/svn/reactos?rev=40921&view=rev Log: - Add icons for dialogs Added: trunk/reactos/dll/win32/syssetup/resources/1.ico (with props) trunk/reactos/dll/win32/syssetup/resources/2.ico (with props) trunk/reactos/dll/win32/syssetup/resources/3.ico (with props) trunk/reactos/dll/win32/syssetup/resources/4.ico (with props) trunk/reactos/dll/win32/syssetup/resources/5.ico (with props) Modified: trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc trunk/reactos/dll/win32/syssetup/lang/de-DE.rc trunk/reactos/dll/win32/syssetup/lang/el-GR.rc trunk/reactos/dll/win32/syssetup/lang/en-US.rc trunk/reactos/dll/win32/syssetup/lang/es-ES.rc trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc trunk/reactos/dll/win32/syssetup/lang/id-ID.rc trunk/reactos/dll/win32/syssetup/lang/it-IT.rc trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc trunk/reactos/dll/win32/syssetup/lang/no-NO.rc trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc trunk/reactos/dll/win32/syssetup/resource.h trunk/reactos/dll/win32/syssetup/syssetup.rc Modified: trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/bg… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc [iso-8859-1] Thu May 14 20:53:38 2009 @@ -58,6 +58,7 @@ CAPTION "Íàñòðîéêà íà ÐåàêòÎÑ" FONT 8, "MS Shell Dlg" BEGIN + ICON IDI_ICON2, IDC_STATIC, 21, 7, 20, 20 LTEXT "Íàïèøåòå èìåíàòà ñè è èìåòî íà âàøåòî ïðåäïðèÿòèåòî.", IDC_STATIC, 54, 7, 242, 21 LTEXT "&Èìå:", IDC_STATIC, 54, 37, 44, 8 @@ -72,11 +73,13 @@ CAPTION "Íàñòðîéêà íà ÐåàêòÎÑ" FONT 8, "MS Shell Dlg" BEGIN + ICON IDI_ICON1, IDC_STATIC, 21, 7, 20, 20 LTEXT "Íàïèøåòå íåíàäâèøàâàùî 63 çíàêà èìå íà êîìïþòúðà. "\ "Àêî ñòå â ìðåæà, íèêîé äðóã êîìïþòúð íå òðÿáâà äà èìà ñúùîòî èìå.", IDC_STATIC, 45, 7, 250, 24 LTEXT "Èìå íà &êîìïþòúðà:", IDC_STATIC, 45, 38, 75, 8 EDITTEXT IDC_COMPUTERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE + ICON IDI_ICON5, IDC_STATIC, 21, 57, 20, 20 LTEXT "Íàñòðîéêàòà ùå ñúçäàäå ïîòðåáèòåëñêà ñìåòêà, ïîä èìåòî Administrator. "\ "Ìîæåòå äà èçïîëçâàòå òàçè ñìåòêà, çà äà ïîëó÷èòå ïúëåí äîñòúï äî êîìïþòúðà.", IDC_STATIC, 45, 57, 250, 25 @@ -94,6 +97,7 @@ CAPTION "Íàñòðîéêà íà ÐåàêòÎÑ" FONT 8, "MS Shell Dlg" BEGIN + ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20 LTEXT "Ìåñòíàòà ñòîéíîñò íà óðåäáàòà òðÿáâà äà îòãîâàðÿ íà åçèêà íà ïðèëîæåíèÿòà, "\ "êîèòî ùå èçïîëçâàòå. Ìåñòíàòà ñòîéíîñò îïðåäåëÿ êàê ñå èçîáðàçàâàò "\ "ïàðè÷íèòå ñòîéíîñòè è äàòèòå.", IDC_STATIC, 53, 2, 253, 26 @@ -115,6 +119,7 @@ CAPTION "Íàñòðîéêà íà ÐåàêòÎÑ" FONT 8, "MS Shell Dlg" BEGIN + ICON IDI_ICON3, IDC_STATIC, 21, 10, 20, 20 LTEXT "Äàòà è âðåìå", IDC_STATIC, 53, 7, 253, 8 CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 Modified: trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/cs… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc [iso-8859-1] Thu May 14 20:53:38 2009 @@ -57,6 +57,7 @@ CAPTION "ReactOS Instalátor" FONT 8, "MS Shell Dlg" BEGIN + ICON IDI_ICON2, IDC_STATIC, 21, 7, 20, 20 LTEXT "Napite celé své jméno a jméno firmy nebo organizace.", IDC_STATIC, 54, 7, 242, 21 LTEXT "J&méno:", IDC_STATIC, 54, 37, 44, 8 @@ -71,11 +72,13 @@ CAPTION "ReactOS Instalátor" FONT 8, "MS Shell Dlg" BEGIN + ICON IDI_ICON1, IDC_STATIC, 21, 7, 20, 20 LTEXT "Napite jméno Vaeho poèítaèe o délce 63 znakù nebo ménì. "\ "Pokud je poèítaè pøipojen k síti, musí být jeho jméno unikátní.", IDC_STATIC, 54, 7, 250, 24 LTEXT "&Jméno poèítaèe:", IDC_STATIC, 54, 38, 75, 8 EDITTEXT IDC_COMPUTERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE + ICON IDI_ICON5, IDC_STATIC, 21, 57, 20, 20 LTEXT "Instalátor vytvoøí uivatelský úèet nazvaný Administrator. "\ "Mùete tento úèet pouít, pokud budete potøebovat úplný pøístup k Vaemu poèítaèi.", IDC_STATIC, 54, 57, 250, 25 @@ -93,6 +96,7 @@ CAPTION "ReactOS Instalátor" FONT 8, "MS Shell Dlg" BEGIN + ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20 LTEXT "Lokalizace systému by mìla souhlasit s jazykem aplikací, "\ "které chcete pouívat. Localizace urèí jak budou zobrazena "\ "èísla, mìny a kalendáøní data.", IDC_STATIC, 53, 7, 253, 20 @@ -114,6 +118,7 @@ CAPTION "ReactOS Instalátor" FONT 8, "MS Shell Dlg" BEGIN + ICON IDI_ICON3, IDC_STATIC, 21, 10, 20, 20 LTEXT "Datum a èas", IDC_STATIC, 53, 7, 253, 8 CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 Modified: trunk/reactos/dll/win32/syssetup/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/de… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/de-DE.rc [iso-8859-1] Thu May 14 20:53:38 2009 @@ -57,6 +57,7 @@ CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN + ICON IDI_ICON2, IDC_STATIC, 21, 7, 20, 20 LTEXT "Bitte geben Sie Ihren Namen und den Namen Ihrer Firma ein.", IDC_STATIC, 54, 7, 242, 21 LTEXT "Na&me:", IDC_STATIC, 54, 37, 44, 8 @@ -71,11 +72,13 @@ CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN + ICON IDI_ICON1, IDC_STATIC, 21, 7, 20, 20 LTEXT "Bitte geben sie einen Computernamen ein (maximal 63 Zeichen). "\ "Wenn Sie im Netzwerk sind, muss dieser Name einmalig sein.", IDC_STATIC, 54, 7, 250, 24 LTEXT "&Computername:", IDC_STATIC, 54, 38, 75, 8 EDITTEXT IDC_COMPUTERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE + ICON IDI_ICON5, IDC_STATIC, 21, 57, 20, 20 LTEXT "Das Setup wird ein Administratorkonto erstellen. "\ "Benutzen Sie es, wenn Sie vollen Zugriff auf Ihren Computer benötigen.", IDC_STATIC, 54, 57, 250, 25 @@ -93,6 +96,7 @@ CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN + ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20 LTEXT "Die lokalen Systemeinstellungen sollten mit der Sprache der Anwendungen, "\ "die Sie nutzen wollen übereinstimmen. Die lokalen Nutzereinstellungen geben vor, "\ "wie Nummern, Währungen und Datumsangaben dargestellt werden.", IDC_STATIC, 53, 6, 253, 30 @@ -114,6 +118,7 @@ CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN + ICON IDI_ICON3, IDC_STATIC, 21, 10, 20, 20 LTEXT "Datum und Zeit", IDC_STATIC, 53, 7, 253, 8 CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 Modified: trunk/reactos/dll/win32/syssetup/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/el… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/el-GR.rc [iso-8859-1] Thu May 14 20:53:38 2009 @@ -57,6 +57,7 @@ CAPTION "ÅãêáôÜóôáóç ôïõ ReactOS" FONT 8, "MS Shell Dlg" BEGIN + ICON IDI_ICON2, IDC_STATIC, 21, 7, 20, 20 LTEXT "ÅéóÜãåôå ôï üíïìÜ óáò êáé ôï üíïìá ôçò åôáéñßáò Þ ôïõ ïñãáíéóìïý óáò.", IDC_STATIC, 54, 7, 242, 21 LTEXT "¼&íïìá:", IDC_STATIC, 54, 37, 44, 8 @@ -71,11 +72,13 @@ CAPTION "ÅãêáôÜóôáóç ôïõ ReactOS" FONT 8, "MS Shell Dlg" BEGIN + ICON IDI_ICON1, IDC_STATIC, 21, 7, 20, 20 LTEXT "ÅéóÜãåôå ôï üíïìá ôïõ õðïëïãéóôÞ óáò, ôï ïðïßï äåí ðñÝðåé íá îåðåñíÜ ôïõò 63 ÷áñáêôÞñåò. "\ "¢í ï õðïëïãéóôÞò áíÞêåé óå êÜðïéï äßêôõï, ôï üíïìÜ ôïõ ðñÝðåé íá åßíáé ìïíáäéêü.", IDC_STATIC, 54, 7, 250, 24 LTEXT "&¼íïìá õðïëïãéóôÞ:", IDC_STATIC, 54, 38, 75, 8 EDITTEXT IDC_COMPUTERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE + ICON IDI_ICON5, IDC_STATIC, 21, 57, 20, 20 LTEXT "Ç åãêáôÜóôáóç èá äçìéïõñãÞóåé Ýíá ëïãáñéáñéóìü äéá÷åéñéóôÞ óôïí õðïëïãéóôÞ óáò ìå ôï üíïìá Administrator. "\ "Ìå ôï ëïãéáñéáóìü äéá÷åéñéóôÞ ìðïñåßôå íá áðïêôÞóåôå ôïí ðëÞñç Ýëåã÷ï ôïõ õðïëïãéóôÞ.", IDC_STATIC, 54, 57, 250, 25 @@ -93,6 +96,7 @@ CAPTION "ÅãêáôÜóôáóç ôïõ ReactOS" FONT 8, "MS Shell Dlg" BEGIN + ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20 LTEXT "Ïé ôïðéêÝò ñõèìéóåéò ðñÝðåé íá ôáéñéÜæïõí ìå ôç ãëþóóá ôùí åöáñìïãþí "\ "ðïõ èÝëåôå íá ÷ñçóéìïðïéÞóåôå. Åðßóçò åëÝã÷ïõí ôïí ôñüðï "\ "ìå ôïí ïðïßï èá åìöáíßæïíôáé ïé áñéèìïß, ôá íïìßóìáôá êáé ïé çìåñïìçíßåò.", IDC_STATIC, 53, 7, 253, 31 @@ -114,6 +118,7 @@ CAPTION "ÅãêáôÜóôáóç ôïõ ReactOS" FONT 8, "MS Shell Dlg" BEGIN + ICON IDI_ICON3, IDC_STATIC, 21, 10, 20, 20 LTEXT "Çìåñïìçíßá êáé þñá", IDC_STATIC, 53, 7, 253, 8 CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 Modified: trunk/reactos/dll/win32/syssetup/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/en… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/en-US.rc [iso-8859-1] Thu May 14 20:53:38 2009 @@ -57,6 +57,7 @@ CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN + ICON IDI_ICON2, IDC_STATIC, 21, 7, 20, 20 LTEXT "Type your full name and the name of your company or organization.", IDC_STATIC, 54, 7, 242, 21 LTEXT "Na&me:", IDC_STATIC, 54, 37, 44, 8 @@ -71,11 +72,13 @@ CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN + ICON IDI_ICON1, IDC_STATIC, 21, 7, 20, 20 LTEXT "Type a name for your computer that is 63 characters or less. "\ "If you are on a network, your computer name must be unique.", IDC_STATIC, 54, 7, 250, 24 LTEXT "&Computer Name:", IDC_STATIC, 54, 38, 75, 8 EDITTEXT IDC_COMPUTERNAME, 165, 35, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE + ICON IDI_ICON5, IDC_STATIC, 21, 57, 20, 20 LTEXT "Setup will create a user account on your computer called Administrator. "\ "You can use this account if you need full access to your computer.", IDC_STATIC, 54, 57, 250, 25 @@ -93,6 +96,7 @@ CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN + ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20 LTEXT "The system locale should match the language of the applications "\ "you want to use. The user locale controls how numbers, "\ "currencies, and dates appear.", IDC_STATIC, 53, 7, 253, 20 @@ -114,6 +118,7 @@ CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN + ICON IDI_ICON3, IDC_STATIC, 21, 10, 20, 20 LTEXT "Date and Time:", IDC_STATIC, 53, 7, 253, 8 CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 Modified: trunk/reactos/dll/win32/syssetup/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/es… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/es-ES.rc [iso-8859-1] Thu May 14 20:53:38 2009 @@ -65,6 +65,7 @@ CAPTION "Instalación de ReactOS" FONT 8, "MS Shell Dlg" BEGIN + ICON IDI_ICON2, IDC_STATIC, 21, 7, 20, 20 LTEXT "Escriba su nombre completo y el nombre de su compañia u organización.", IDC_STATIC, 54, 7, 242, 21 LTEXT "No&mbre:", IDC_STATIC, 54, 37, 44, 8 @@ -79,11 +80,13 @@ CAPTION "Instalación de ReactOS" FONT 8, "MS Shell Dlg" BEGIN + ICON IDI_ICON1, IDC_STATIC, 21, 7, 20, 20 LTEXT "Escriba un nombre para su equipo que sea de 63 caracteres o menos. "\ "Si se encuentra conectado a una red, el nombre debe ser único.", IDC_STATIC, 54, 7, 250, 24 LTEXT "Nombre del &Equipo:", IDC_STATIC, 54, 38, 75, 8 EDITTEXT IDC_COMPUTERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE + ICON IDI_ICON5, IDC_STATIC, 21, 57, 20, 20 LTEXT "El instalador creará un perfil de usuario en su equipo llamado Administrator. "\ "Puede utilizar este perfil si necesita acceso completo a su equipo.", IDC_STATIC, 54, 57, 250, 25 @@ -101,6 +104,7 @@ CAPTION "Instalación de ReactOS" FONT 8, "MS Shell Dlg" BEGIN + ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20 LTEXT "Las opciones regionales y de idioma permiten configurar la manera en que se representan "\ "fechas ,número ,monedas y horas. También puede agregar compatibilidad con otros idiomas "\ "y cambiar la configuración de su ubicación.", IDC_STATIC, 53, 6, 253, 30 @@ -123,6 +127,7 @@ CAPTION "Instalación de ReactOS" FONT 8, "MS Shell Dlg" BEGIN + ICON IDI_ICON3, IDC_STATIC, 21, 10, 20, 20 LTEXT "Fecha y Hora", IDC_STATIC, 53, 7, 253, 8 CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 Modified: trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/fr… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc [iso-8859-1] Thu May 14 20:53:38 2009 @@ -58,6 +58,7 @@ CAPTION "Installation de ReactOS" FONT 8, "MS Shell Dlg" BEGIN + ICON IDI_ICON2, IDC_STATIC, 21, 7, 20, 20 LTEXT "Entrez votre nom complet et le nom de votre société.", IDC_STATIC, 54, 7, 242, 21 LTEXT "&Nom :", IDC_STATIC, 54, 37, 44, 8 @@ -72,11 +73,13 @@ CAPTION "Installation de ReactOS" FONT 8, "MS Shell Dlg" BEGIN + ICON IDI_ICON1, IDC_STATIC, 21, 7, 20, 20 LTEXT "Entrez un nom pour votre ordinateur de 63 caractères ou moins. "\ "Si vous êtes sur un réseau, le nom saisi doit être unique.", IDC_STATIC, 54, 7, 250, 24 LTEXT "&Nom de l'ordinateur :", IDC_STATIC, 54, 38, 75, 8 EDITTEXT IDC_COMPUTERNAME, 165, 35, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE + ICON IDI_ICON5, IDC_STATIC, 21, 57, 20, 20 LTEXT "L'assistant va créer un compte utilisateur sur votre ordinateur appelé Administrateur. "\ "Vous pourrez utiliser ce compte pour avoir un accès complet à votre ordinateur.", IDC_STATIC, 54, 57, 250, 25 @@ -94,6 +97,7 @@ CAPTION "Installation de ReactOS" FONT 8, "MS Shell Dlg" BEGIN + ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20 LTEXT "La localisation système correspond à la langue souhaitée "\ "pour les applications. Elle contrôle la manière dont les nombres, "\ "monnaies et dates sont affichées.", IDC_STATIC, 53, 7, 253, 20 @@ -115,6 +119,7 @@ CAPTION "Installation de ReactOS" FONT 8, "MS Shell Dlg" BEGIN + ICON IDI_ICON3, IDC_STATIC, 21, 10, 20, 20 LTEXT "Date et Heure :", IDC_STATIC, 53, 7, 253, 8 CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 Modified: trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/hu… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc [iso-8859-1] Thu May 14 20:53:38 2009 @@ -55,6 +55,7 @@ CAPTION "ReactOS Telepítõ" FONT 8, "MS Shell Dlg" BEGIN + ICON IDI_ICON2, IDC_STATIC, 21, 7, 20, 20 LTEXT "Add meg a neved és ha van ilyen a céged nevét.", IDC_STATIC, 54, 7, 242, 21 LTEXT "&Név:", IDC_STATIC, 54, 37, 44, 8 @@ -69,11 +70,13 @@ CAPTION "ReactOS Telepítõ" FONT 8, "MS Shell Dlg" BEGIN + ICON IDI_ICON1, IDC_STATIC, 21, 7, 20, 20 LTEXT "Adj egy nevet a számítógépednek, ami nem több mint 63 betû. "\ "Ha hálózaton vagy, akkor ennek a névnek egyedinek kell lennie.", IDC_STATIC, 54, 7, 250, 24 LTEXT "&Számítógép név:", IDC_STATIC, 54, 38, 75, 8 EDITTEXT IDC_COMPUTERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE + ICON IDI_ICON5, IDC_STATIC, 21, 57, 20, 20 LTEXT "A telepítõ létrehoz egy felhasználói fiókot, a Rendszergazdát. "\ "Ezzel a fiókkal teljes jogod van a számítógéped felett.", IDC_STATIC, 54, 57, 250, 25 LTEXT "Adj meg egy jelszót, ami nem több mint 14 karakter.", IDC_STATIC, 54, 87, 250, 8 @@ -89,6 +92,7 @@ CAPTION "ReactOS Telepítõ" FONT 8, "MS Shell Dlg" BEGIN + ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20 LTEXT "A rendszer területi beállítása meghatározzák a használni kívánt nyelvet. "\ "A területi beállítások határozzák meg, hogy a számok, "\ "valuta és dátum információk hogyan jelennek meg.", IDC_STATIC, 53, 7, 253, 24 @@ -108,6 +112,7 @@ CAPTION "ReactOS Telepítõ" FONT 8, "MS Shell Dlg" BEGIN + ICON IDI_ICON3, IDC_STATIC, 21, 10, 20, 20 LTEXT "Dátum és idõ", IDC_STATIC, 53, 7, 253, 8 CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 Modified: trunk/reactos/dll/win32/syssetup/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/id… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/id-ID.rc [iso-8859-1] Thu May 14 20:53:38 2009 @@ -55,6 +55,7 @@ CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN + ICON IDI_ICON2, IDC_STATIC, 21, 7, 20, 20 LTEXT "Type your full name and the name of your company or organization.", IDC_STATIC, 54, 7, 242, 21 LTEXT "Na&me:", IDC_STATIC, 54, 37, 44, 8 @@ -69,11 +70,13 @@ CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN + ICON IDI_ICON1, IDC_STATIC, 21, 7, 20, 20 LTEXT "Type a name for your computer that is 63 characters or less. "\ "If you are on a network, your computer name must be unique.", IDC_STATIC, 54, 7, 250, 24 LTEXT "&Computer Name:", IDC_STATIC, 54, 38, 75, 8 EDITTEXT IDC_COMPUTERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE + ICON IDI_ICON5, IDC_STATIC, 21, 57, 20, 20 LTEXT "Setup will create a user account on your computer called Administrator. "\ "You can use this account if you need full access to your computer.", IDC_STATIC, 54, 57, 250, 25 @@ -91,6 +94,7 @@ CAPTION "Setup ReactOS" FONT 8, "MS Shell Dlg" BEGIN + ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20 LTEXT "Lokal sistem harus sama bahasa dari aplikasi "\ "yang ingin anda gunakan. Pengguna lokal mengontrol bagaimana "\ "angka, kurs, dan tampilan tanggal.", IDC_STATIC, 53, 7, 253, 20 @@ -112,6 +116,7 @@ CAPTION "Setup ReactOS" FONT 8, "MS Shell Dlg" BEGIN + ICON IDI_ICON3, IDC_STATIC, 21, 10, 20, 20 LTEXT "Tanggal dan Jam", IDC_STATIC, 53, 7, 253, 8 CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 Modified: trunk/reactos/dll/win32/syssetup/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/it… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/it-IT.rc [iso-8859-1] Thu May 14 20:53:38 2009 @@ -48,11 +48,12 @@ CAPTION "Installazione di ReactOS" FONT 8, "MS Shell Dlg" BEGIN + ICON IDI_ICON2, IDC_STATIC, 21, 7, 20, 20 LTEXT "Scrivere il proprio nome completo e il nome della propria ditta o organizzazione.", - IDC_STATIC, 20, 7, 242, 21 - LTEXT "No&me:", IDC_STATIC, 20, 37, 108, 8 + IDC_STATIC, 54, 7, 242, 21 + LTEXT "No&me:", IDC_STATIC, 26, 39, 90, 8 EDITTEXT IDC_OWNERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Organizzazione:", IDC_STATIC, 20, 57, 108, 8 + LTEXT "&Organizzazione:", IDC_STATIC, 26, 59, 90, 8 EDITTEXT IDC_OWNERORGANIZATION, 132, 55, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL END @@ -62,19 +63,21 @@ CAPTION "Installazione di ReactOS" FONT 8, "MS Shell Dlg" BEGIN + ICON IDI_ICON1, IDC_STATIC, 21, 7, 20, 20 LTEXT "Scrivere un nome per il computer che sia lungo al massimo 63 caratteri.\n"\ "Se si è in rete, il nome del computer deve essere univoco.", - IDC_STATIC, 20, 7, 250, 24 - LTEXT "Nome del &computer:", IDC_STATIC, 20, 38, 75, 8 + IDC_STATIC, 54, 7, 250, 24 + LTEXT "Nome del &computer:", IDC_STATIC, 29, 38, 75, 8 EDITTEXT IDC_COMPUTERNAME, 140, 35, 160, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE + ICON IDI_ICON5, IDC_STATIC, 21, 57, 20, 20 LTEXT "Questa procedura creerà su questo computer un account utente chiamato Administrator. "\ "Si potrà usare questo account se si necessita l'accesso completo al computer.", - IDC_STATIC, 20, 57, 250, 25 + IDC_STATIC, 54, 57, 250, 25 LTEXT "Scrivere una password per Administrator che sia lunga al massimo 14 caratteri.", - IDC_STATIC, 20, 87, 280, 8 - LTEXT "Password per &Administrator:", IDC_STATIC, 20, 105, 95, 8 + IDC_STATIC, 26, 87, 280, 8 + LTEXT "Password per &Administrator:", IDC_STATIC, 29, 105, 95, 8 EDITTEXT IDC_ADMINPASSWORD1, 140, 100, 160, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD - LTEXT "C&onfermare la password:", IDC_STATIC, 20, 125, 95, 8 + LTEXT "C&onfermare la password:", IDC_STATIC, 29, 125, 95, 8 EDITTEXT IDC_ADMINPASSWORD2, 140, 120, 160, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD END @@ -84,10 +87,11 @@ CAPTION "Installazione di ReactOS" FONT 8, "MS Shell Dlg" BEGIN + ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20 LTEXT "Le impostazioni linguistiche del sistema devono coincidere con la lingua degli applicativi "\ "che si desidera usare. Le impostazioni linguistiche dell'utente stabiliscono come appaiono "\ - "i numeri, i valori monetari e le date.", IDC_STATIC, 20, 7, 253, 26 - LTEXT "", IDC_LOCALETEXT, 20, 35, 250, 16 + "i numeri, i valori monetari e le date.", IDC_STATIC, 56, 7, 253, 26 + LTEXT "", IDC_LOCALETEXT, 56, 35, 250, 16 LTEXT "Per cambiare le impostazioni linguistiche del sistema o dell'utente, selezionare Personalizza.", IDC_STATIC, 20, 55, 184, 16 PUSHBUTTON "&Personalizza...", IDC_CUSTOMLOCALE, 240, 55, 60, 16 @@ -105,9 +109,10 @@ CAPTION "Installazione di ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Data e ora", IDC_STATIC, 20, 7, 253, 8 + ICON IDI_ICON3, IDC_STATIC, 21, 10, 20, 20 + LTEXT "Data e ora", IDC_STATIC, 56, 7, 253, 8 CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", - DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 17, 137, 10 + DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 56, 17, 137, 10 CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 10 LTEXT "Fuso orario", IDC_STATIC, 20, 42, 253, 8 Modified: trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ja… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc [iso-8859-1] Thu May 14 20:53:38 2009 @@ -57,6 +57,7 @@ CAPTION "ReactOS ZbgAbv" FONT 9, "MS UI Gothic" BEGIN + ICON IDI_ICON2, IDC_STATIC, 21, 7, 20, 20 LTEXT "¼OÆïÐ¼Ü½ÍgD¼ðüÍµÄ¾³¢B", IDC_STATIC, 54, 7, 242, 21 LTEXT "¼O(&M):", IDC_STATIC, 54, 37, 44, 8 @@ -71,11 +72,13 @@ CAPTION "ReactOS ZbgAbv" FONT 9, "MS UI Gothic" BEGIN + ICON IDI_ICON1, IDC_STATIC, 21, 7, 20, 20 LTEXT "Rs[^¼ð¼p63¶ÈàÅüÍµÄ¾³¢B "\ "Rs[^ªlbg[NãÉ éêÍA¼Oªd¡µÈ¢æ¤ÉµÄ¾³¢B", IDC_STATIC, 54, 7, 250, 24 LTEXT "Rs[^¼(&C):", IDC_STATIC, 54, 38, 75, 8 EDITTEXT IDC_COMPUTERNAME, 165, 35, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE + ICON IDI_ICON5, IDC_STATIC, 21, 57, 20, 20 LTEXT "AdministratorÆÄÎêé[U[AJEgðì¬µÜ·B"\ "Rs[^ÉtANZXªKvÈÆ«A±ÌAJEgðgpµÜ·B", IDC_STATIC, 54, 57, 250, 25 @@ -93,6 +96,7 @@ CAPTION "ReactOS ZbgAbv" FONT 9, "MS UI Gothic" BEGIN + ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20 LTEXT "VXeÌP[ðAAvP[VÅgpµ½¢¾êÉÝèµÄ¾³¢B "\ "[U[P[ÍAlAÊÝAútÌ\\¦û@ð§äµÜ·B "\ "", IDC_STATIC, 53, 7, 253, 20 @@ -114,6 +118,7 @@ CAPTION "ReactOS ZbgAbv" FONT 9, "MS UI Gothic" BEGIN + ICON IDI_ICON3, IDC_STATIC, 21, 10, 20, 20 LTEXT "útÆ:", IDC_STATIC, 53, 7, 253, 8 CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 Modified: trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/nl… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc [iso-8859-1] Thu May 14 20:53:38 2009 @@ -57,6 +57,7 @@ CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN + ICON IDI_ICON2, IDC_STATIC, 21, 7, 20, 20 LTEXT "Geef uw volledige naam en de naam van je bedrijf of organisatie.", IDC_STATIC, 54, 7, 242, 21 LTEXT "N&aam:", IDC_STATIC, 54, 37, 44, 8 @@ -71,11 +72,13 @@ CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN + ICON IDI_ICON1, IDC_STATIC, 21, 7, 20, 20 LTEXT "Geef een naam in voor de computer. "\ "In een netwerk moet je een unieke naam kiezen.", IDC_STATIC, 54, 7, 250, 24 LTEXT "&Computernaam:", IDC_STATIC, 54, 38, 75, 8 EDITTEXT IDC_COMPUTERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE + ICON IDI_ICON5, IDC_STATIC, 21, 57, 20, 20 LTEXT "Setup will create a user account on your computer called Administrator. "\ "You can use this account if you need full access to your computer.", IDC_STATIC, 54, 57, 250, 25 @@ -93,6 +96,7 @@ CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN + ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20 LTEXT "The system locale should match the language of the applications "\ "you want to use. The user locale controls how numbers, "\ "currencies, and dates appear.", IDC_STATIC, 53, 7, 253, 20 @@ -114,6 +118,7 @@ CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN + ICON IDI_ICON3, IDC_STATIC, 21, 10, 20, 20 LTEXT "Date and Time", IDC_STATIC, 53, 7, 253, 8 CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 Modified: trunk/reactos/dll/win32/syssetup/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/no… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/no-NO.rc [iso-8859-1] Thu May 14 20:53:38 2009 @@ -60,6 +60,7 @@ CAPTION "ReactOS installasjon" FONT 8, "MS Shell Dlg" BEGIN + ICON IDI_ICON2, IDC_STATIC, 21, 7, 20, 20 LTEXT "Skriv inn ditt fulle navn og navnet på din bedrift eller organisasjon.", IDC_STATIC, 54, 7, 242, 21 LTEXT "Na&vn:", IDC_STATIC, 54, 37, 44, 8 @@ -74,11 +75,13 @@ CAPTION "ReactOS installasjon" FONT 8, "MS Shell Dlg" BEGIN + ICON IDI_ICON1, IDC_STATIC, 21, 7, 20, 20 LTEXT "Skriv inn et navn for din datamaskin som er 63 karakterer eller mindre. "\ "Hvis du er på et nettverk, så må ditt datamaskin navn være unikt.", IDC_STATIC, 54, 7, 250, 24 LTEXT "&Datamaskin navn:", IDC_STATIC, 54, 38, 75, 8 EDITTEXT IDC_COMPUTERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE + ICON IDI_ICON5, IDC_STATIC, 21, 57, 20, 20 LTEXT "Installasjonen vil lage en brukerkonto som blir kalt Administrator. "\ "Du kan bruke denne kontoen hvis du trenger full adgang til din datamaskin.", IDC_STATIC, 54, 57, 250, 25 @@ -96,6 +99,7 @@ CAPTION "ReactOS installasjon" FONT 8, "MS Shell Dlg" BEGIN + ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20 LTEXT "Systemets språk og region burde samsvare med språket på programmene "\ "du vil bruke. Innstillingene for språk og region kontrollerer hvordan tall, "\ "valutaer, og dato vises.", IDC_STATIC, 55, 7, 259, 24 @@ -117,6 +121,7 @@ CAPTION "ReactOS installasjon" FONT 8, "MS Shell Dlg" BEGIN + ICON IDI_ICON3, IDC_STATIC, 21, 10, 20, 20 LTEXT "Dato og tid", IDC_STATIC, 53, 7, 253, 8 CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 Modified: trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/pl… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc [iso-8859-1] Thu May 14 20:53:38 2009 @@ -65,6 +65,7 @@ CAPTION "Instalator ReactOS" FONT 8, "MS Shell Dlg" BEGIN + ICON IDI_ICON2, IDC_STATIC, 21, 7, 20, 20 LTEXT "Podaj swoje imiê i nazwisko, a tak¿e nazwê Twojej firmy lub organizacji.", IDC_STATIC, 54, 7, 242, 21 LTEXT "Na&zwa:", IDC_STATIC, 54, 37, 44, 8 @@ -79,11 +80,13 @@ CAPTION "Instalator ReactOS" FONT 8, "MS Shell Dlg" BEGIN + ICON IDI_ICON1, IDC_STATIC, 21, 7, 20, 20 LTEXT "Podaj nazwê komputera, nie d³u¿sz¹ ni¿ 63 znaki. "\ "Jeli chcesz pracowaæ w sieci, nazwa musi pozostaæ unikalna.", IDC_STATIC, 54, 7, 250, 24 LTEXT "&Nazwa komputera:", IDC_STATIC, 54, 38, 75, 8 EDITTEXT IDC_COMPUTERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE + ICON IDI_ICON5, IDC_STATIC, 21, 57, 20, 20 LTEXT "Program konfiguracyjny stworzy konto Administrator. "\ "Dziêki niemu uzyskasz, w razie potrzeby, pe³en dostêp do systemu.", IDC_STATIC, 54, 57, 250, 25 @@ -101,6 +104,7 @@ CAPTION "Instalator ReactOS" FONT 8, "MS Shell Dlg" BEGIN + ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20 LTEXT "Lokalizacja systemu powinna byæ zgodna (jêzykowo) z aplikacjami, "\ "których planujesz u¿ywaæ. Lokalizacja odpowiada równie¿ za wywietlanie "\ "danych, liczb i walut.", IDC_STATIC, 53, 7, 238, 25 @@ -122,6 +126,7 @@ CAPTION "Instalator ReactOS" FONT 8, "MS Shell Dlg" BEGIN + ICON IDI_ICON3, IDC_STATIC, 21, 10, 20, 20 LTEXT "Data i czas", IDC_STATIC, 53, 7, 253, 8 CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 Modified: trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ru… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc [iso-8859-1] Thu May 14 20:53:38 2009 @@ -39,6 +39,7 @@ CAPTION "Óñòàíîâêà ReactOS" FONT 8, "MS Shell Dlg" BEGIN + ICON IDI_ICON2, IDC_STATIC, 21, 7, 20, 20 LTEXT "Ââåäèòå âàøå ïîëíîå èìÿ è íàçâàíèå îðãàíèçàöèè.", IDC_STATIC, 54, 7, 242, 21 LTEXT "&Èìÿ:", IDC_STATIC, 54, 37, 44, 8 @@ -53,11 +54,13 @@ CAPTION "Óñòàíîâêà ReactOS" FONT 8, "MS Shell Dlg" BEGIN + ICON IDI_ICON1, IDC_STATIC, 21, 7, 20, 20 LTEXT "Ââåäèòå èìÿ âàøåãî êîìïüþòåðà (íå áîëåå 63 ñèìâîëîâ). "\ "Åñëè âàø êîìïüþòåð ïîäêëþ÷åí ê ñåòè, òî åãî èìÿ äîëæíî áûòü óíèêàëüíî.", IDC_STATIC, 54, 7, 250, 24 LTEXT "&Èìÿ êîìïüþòåðà:", IDC_STATIC, 54, 38, 75, 8 EDITTEXT IDC_COMPUTERNAME, 165, 35, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE + ICON IDI_ICON5, IDC_STATIC, 21, 57, 20, 20 LTEXT "Ïðè óñòàíîâêå áóäåò ñîçäàí ïðîôèëü ïîëüçîâàòåëÿ ñ èìåíåì Administrator "\ "Âû ìîæåòå èñïîëüçîâàòü ýòîò ïðîôèëü, åñëè âàì íóæíî ïîëó÷èòü ïðàâà àäìèíèñòðàòîðà.", IDC_STATIC, 54, 57, 250, 25 @@ -75,6 +78,7 @@ CAPTION "Óñòàíîâêà ReactOS" FONT 8, "MS Shell Dlg" BEGIN + ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20 LTEXT "ßçûê ñèñòåìû óñòàíàâëèâàåòñÿ è äåéñòâóåò âî âñåõ ïðèëîæåíèÿõ. "\ "Ìîæíî âûáðàòü ñèñòåìó èñ÷èñëåíèÿ, ôîðìàò ÷èñåë è äàòû.", IDC_STATIC, 53, 7, 253, 20 LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16 @@ -95,6 +99,7 @@ CAPTION "Óñòàíîâêà ReactOS" FONT 8, "MS Shell Dlg" BEGIN + ICON IDI_ICON3, IDC_STATIC, 21, 10, 20, 20 LTEXT "Äàòà è âðåìÿ:", IDC_STATIC, 53, 7, 253, 8 CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 Modified: trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/sk… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc [iso-8859-1] Thu May 14 20:53:38 2009 @@ -43,6 +43,7 @@ CAPTION "Intalátor systému ReactOS" FONT 8, "MS Shell Dlg" BEGIN + ICON IDI_ICON2, IDC_STATIC, 21, 7, 20, 20 LTEXT "Napíte Vae celé meno a názov Vaej firmy alebo organizácie.", IDC_STATIC, 54, 7, 242, 21 LTEXT "&Meno:", IDC_STATIC, 54, 37, 44, 8 @@ -57,11 +58,13 @@ CAPTION "Intalátor systému ReactOS" FONT 8, "MS Shell Dlg" BEGIN + ICON IDI_ICON1, IDC_STATIC, 21, 7, 20, 20 LTEXT "Napíte názov Váho poèítaèa v dåke 63 znakov alebo menej. "\ "Ak je poèítaè pripojený k sieti, musí bý jeho názov unikátny.", IDC_STATIC, 54, 7, 250, 24 LTEXT "&Názov poèítaèa:", IDC_STATIC, 54, 38, 75, 8 EDITTEXT IDC_COMPUTERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE + ICON IDI_ICON5, IDC_STATIC, 21, 57, 20, 20 LTEXT "Intalátor vytvorí na poèítaèi pouívate¾ský úèet nazvaný Administrator. "\ "Tento úèet môete poui, keï budete potrebova plný prístup k Vámu poèítaèu.", IDC_STATIC, 54, 57, 250, 25 @@ -79,6 +82,7 @@ CAPTION "Intalátor systému ReactOS" FONT 8, "MS Shell Dlg" BEGIN + ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20 LTEXT "Lokalizácia systému by mala súhlasi s jazykom aplikácií, "\ "ktoré chcete pouíva. Lokalizácia urèí ako budú zobrazené "\ "èísla, meny a údaje kalendára.", IDC_STATIC, 53, 7, 253, 20 @@ -100,6 +104,7 @@ CAPTION "Intalátor systému ReactOS" FONT 8, "MS Shell Dlg" BEGIN + ICON IDI_ICON3, IDC_STATIC, 21, 10, 20, 20 LTEXT "Dátum a èas", IDC_STATIC, 53, 7, 253, 8 CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 Modified: trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/uk… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc [iso-8859-1] Thu May 14 20:53:38 2009 @@ -46,6 +46,7 @@ CAPTION "Óñòàíîâêà ReactOS" FONT 8, "MS Shell Dlg" BEGIN + ICON IDI_ICON2, IDC_STATIC, 21, 7, 20, 20 LTEXT "Ââåä³òü ñâîº ïîâíå ³ì'ÿ ³ íàçâó âàøî¿ êîìïàí³¿ àáî îðãàí³çàö³¿.", IDC_STATIC, 54, 7, 242, 21 LTEXT "&²ì'ÿ:", IDC_STATIC, 54, 37, 44, 8 @@ -60,11 +61,13 @@ CAPTION "Óñòàíîâêà ReactOS" FONT 8, "MS Shell Dlg" BEGIN + ICON IDI_ICON1, IDC_STATIC, 21, 7, 20, 20 LTEXT "Ââåä³òü ³ì'ÿ Âàøîãî êîìï'þòåðà äîâæèíîþ äî 63 ñèìâîë³â. "\ "ßêùî Âè ïðàöþº â ìåðåæ³, ³ì'ÿ Âàøîãî êîìï'þòåðà ìàº áóòè óí³êàëüíèì.", IDC_STATIC, 54, 7, 250, 24 LTEXT "&²ì'ÿ êîìï'þòåðà:", IDC_STATIC, 54, 38, 75, 8 EDITTEXT IDC_COMPUTERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE + ICON IDI_ICON5, IDC_STATIC, 21, 57, 20, 20 LTEXT "Ïðîãðàìà óñòàíîâêè ñòâîðèòü îáë³êîâèé çàïèñ êîðèñòóâà÷à 'Àäì³í³ñòðàòîð', "\ "ÿêèé äàº ïîâí³ ïðàâà äîñòóïó äî Âàøîãî êîìï'þòåðà.", IDC_STATIC, 54, 57, 250, 25 @@ -82,6 +85,7 @@ CAPTION "Óñòàíîâêà ReactOS" FONT 8, "MS Shell Dlg" BEGIN + ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20 LTEXT "Ìîâà ñèñòåìè ìàº â³äïîâ³äàòè ìîâ³ äîäàòê³â, ÿê³ âè õî÷åòå "\ "âèêîðèñòîâóâàòè. Ìîâà êîðèñòóâà÷à çàäàº ôîðìàò âèâåäåííÿ, "\ "÷èñåë, ãðîøîâèõ îäèíèöü ³ äàò.", IDC_STATIC, 53, 7, 253, 20 @@ -103,6 +107,7 @@ CAPTION "Óñòàíîâêà ReactOS" FONT 8, "MS Shell Dlg" BEGIN + ICON IDI_ICON3, IDC_STATIC, 21, 10, 20, 20 LTEXT "Äàòà é ÷àñ", IDC_STATIC, 53, 7, 253, 8 CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 Modified: trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/zh… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc [iso-8859-1] Thu May 14 20:53:38 2009 @@ -47,6 +47,7 @@ CAPTION "ReactOS °²×°Ïòµ¼ " FONT 9, "MS Shell Dlg" BEGIN + ICON IDI_ICON2, IDC_STATIC, 21, 7, 20, 20 LTEXT "ÊäÈëÄúµÄÐÕÃûÒÔ¼°¹«Ë¾»òµ¥Î»µÄÃû³Æ¡£",IDC_STATIC, 54, 7, 242, 21 LTEXT "ÐÕÃû(&M):", IDC_STATIC,54,37,44,8 EDITTEXT IDC_OWNERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL @@ -60,11 +61,13 @@ CAPTION "ReactOS °²×°Ïòµ¼ " FONT 9, "MS Shell Dlg" BEGIN + ICON IDI_ICON1, IDC_STATIC, 21, 7, 20, 20 LTEXT "ÇëÊäÈë²»³¬¹ý63¸ö×Ö·ûµÄ¼ÆËã»úÃû¡£"\ "Ã¿Ò»¸öÔÚÄúÍøÂçÉÏµÄ¼ÆËã»ú¶¼±ØÐëÓÐÒ»¸öÎ¨Ò»µÄÃû³Æ¡£", IDC_STATIC, 54, 7, 250, 24 LTEXT "¼ÆËã»úÃû(&C):", IDC_STATIC,54,38,75,8 EDITTEXT IDC_COMPUTERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE + ICON IDI_ICON5, IDC_STATIC, 21, 57, 20, 20 LTEXT "°²×°³ÌÐò»á´´½¨Ò»¸ö³ÆÎª Administrator (ÏµÍ³¹ÜÀíÔ±)µÄÓÃ»§ÕÊ»§¡£"\ "ÐèÒªÍêÈ«¿ØÖÆ¼ÆËã»úÊ±£¬¿ÉÒÔÊ¹ÓÃÕâ¸öÕÊ»§¡£", IDC_STATIC, 54, 57, 250, 25 @@ -82,6 +85,7 @@ CAPTION "ReactOS °²×°Ïòµ¼ " FONT 9, "MS Shell Dlg" BEGIN + ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20 LTEXT "ÏµÍ³ÇøÓòÓÃÓÚÉèÖÃÓ¦ÓÃÊ¹ÓÃµÄÓïÑÔ£¬"\ "ÓÃ»§ÇøÓòÓÃÓÚÉèÖÃÊýÖµ£¬»õ±Ò£¬ÈÕÆÚµÄÏÔÊ¾·½Ê½ ", IDC_STATIC, 53, 7, 253, 20 LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16 @@ -102,6 +106,7 @@ CAPTION "ReactOS °²×°Ïòµ¼ " FONT 9, "MS Shell Dlg" BEGIN + ICON IDI_ICON3, IDC_STATIC, 21, 10, 20, 20 LTEXT "ÈÕÆÚºÍÊ±¼ä", IDC_STATIC,53,7,253,8 CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 Modified: trunk/reactos/dll/win32/syssetup/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/resourc… ============================================================================== --- trunk/reactos/dll/win32/syssetup/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/resource.h [iso-8859-1] Thu May 14 20:53:38 2009 @@ -19,8 +19,14 @@ #ifndef RESOURCE_H #define RESOURCE_H -#define IDB_WATERMARK 100 -#define IDB_HEADER 101 +#define IDB_WATERMARK 100 +#define IDB_HEADER 101 + +#define IDI_ICON1 10 +#define IDI_ICON2 11 +#define IDI_ICON3 12 +#define IDI_ICON4 13 +#define IDI_ICON5 14 #define IDC_STATIC -1 Added: trunk/reactos/dll/win32/syssetup/resources/1.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/resourc… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/syssetup/resources/1.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/syssetup/resources/2.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/resourc… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/syssetup/resources/2.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/syssetup/resources/3.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/resourc… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/syssetup/resources/3.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/syssetup/resources/4.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/resourc… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/syssetup/resources/4.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/syssetup/resources/5.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/resourc… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/syssetup/resources/5.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/dll/win32/syssetup/syssetup.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/syssetu… ============================================================================== --- trunk/reactos/dll/win32/syssetup/syssetup.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/syssetup.rc [iso-8859-1] Thu May 14 20:53:38 2009 @@ -14,6 +14,12 @@ /* Bitmaps */ IDB_WATERMARK BITMAP "resources/watermark.bmp" IDB_HEADER BITMAP "resources/header.bmp" + +IDI_ICON1 ICON "resources/1.ico" +IDI_ICON2 ICON "resources/2.ico" +IDI_ICON3 ICON "resources/3.ico" +IDI_ICON4 ICON "resources/4.ico" +IDI_ICON5 ICON "resources/5.ico" STRINGTABLE

1 0

[janderwald] 40920: - polish translation by Caemyr (Olaf Siejka)
by janderwald＠svn.reactos.org 14 May '09

14 May '09

Author: janderwald Date: Thu May 14 20:22:48 2009 New Revision: 40920 URL: http://svn.reactos.org/svn/reactos?rev=40920&view=rev Log: - polish translation by Caemyr (Olaf Siejka) Added: trunk/reactos/base/applications/paint/lang/pl-PL.rc (with props) Modified: trunk/reactos/base/applications/paint/rsrc.rc Added: trunk/reactos/base/applications/paint/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la… ============================================================================== --- trunk/reactos/base/applications/paint/lang/pl-PL.rc (added) +++ trunk/reactos/base/applications/paint/lang/pl-PL.rc [iso-8859-1] Thu May 14 20:22:48 2009 @@ -1,0 +1,193 @@ +/* + * translated by Caemyr - Olaf Siejka (May,2009) + */ + + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +ID_MENU MENU +BEGIN + POPUP "&Plik" + BEGIN + MENUITEM "&Nowy\tCtrl+N", IDM_FILENEW + MENUITEM "&Otwórz...\tCtrl+O", IDM_FILEOPEN + MENUITEM "&Zapisz\tCtrl+S", IDM_FILESAVE + MENUITEM "Zapisz &jako...", IDM_FILESAVEAS + MENUITEM SEPARATOR + MENUITEM "Ustaw jako tapetê (s¹siaduj¹ce)", IDM_FILEASWALLPAPERPLANE + MENUITEM "Ustaw jako tapetê (wyrodkowana)", IDM_FILEASWALLPAPERCENTERED + MENUITEM "Ustaw jako tapetê (rozci¹gniêta)", IDM_FILEASWALLPAPERSTRETCHED + MENUITEM SEPARATOR + MENUITEM "&Wyjd\tAlt+F4", IDM_FILEEXIT + END + + POPUP "&Edytuj" + BEGIN + MENUITEM "Cofnij\tCtrl+Z", IDM_EDITUNDO + MENUITEM "Ponów\tCtrl+Y", IDM_EDITREDO + MENUITEM SEPARATOR + MENUITEM "Wytnij\tCtrl+X", IDM_EDITCUT + MENUITEM "Kopiuj\tCtrl+C", IDM_EDITCOPY + MENUITEM "Wklej\tCtrl+V", IDM_EDITPASTE + MENUITEM "Usuñ zaznaczenie\tDel", IDM_EDITDELETESELECTION + MENUITEM "Odwróæ zaznaczenie", IDM_EDITINVERTSELECTION + MENUITEM "Zaznacz wszystko\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "Kopiuj do...", IDM_EDITCOPYTO + MENUITEM "Wklej z...", IDM_EDITPASTEFROM + END + + POPUP "&Widok" + BEGIN + MENUITEM "Pasek narzêdzi\tCtrl+T", IDM_VIEWTOOLBOX, CHECKED + MENUITEM "Paleta kolorów\tCtrl+L", IDM_VIEWCOLORPALETTE, CHECKED + MENUITEM "Pasek stanu", IDM_VIEWSTATUSBAR, CHECKED + MENUITEM "Pasek tekstu", IDM_FORMATICONBAR, CHECKED, GRAYED + MENUITEM SEPARATOR + POPUP "Powiêkszenie" + BEGIN + MENUITEM "12,5%", IDM_VIEWZOOM125 + MENUITEM "25%", IDM_VIEWZOOM25 + MENUITEM "50%", IDM_VIEWZOOM50 + MENUITEM "100%", IDM_VIEWZOOM100 + MENUITEM "200%", IDM_VIEWZOOM200 + MENUITEM "400%", IDM_VIEWZOOM400 + MENUITEM "800%", IDM_VIEWZOOM800 + END + MENUITEM "Pe³ny ekran\tCtrl+F", IDM_VIEWFULLSCREEN + END + + POPUP "&Obraz" + BEGIN + MENUITEM "Obrót/Odbicie...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "Zmiana rozmiaru...\tCtrl+W", IDM_IMAGECHANGESIZE + MENUITEM "Kadrowanie", IDM_IMAGECROP + MENUITEM "Odwrócenie kolorów\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "Atrybuty...\tCtrl+E", IDM_IMAGEATTRIBUTES + MENUITEM "Delete image\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "Draw opaque", IDM_IMAGEDRAWOPAQUE + END + + POPUP "&Kolory" + BEGIN + MENUITEM "Edit palette...", IDM_COLORSEDITPALETTE + END + + POPUP "&?" + BEGIN + MENUITEM "Tematy pomocy", IDM_HELPHELPTOPICS + MENUITEM SEPARATOR + MENUITEM "Informacje", IDM_HELPINFO + END +END + +ID_ACCELERATORS ACCELERATORS +BEGIN + "^N", IDM_FILENEW + "^O", IDM_FILEOPEN + "^S", IDM_FILESAVE + "^Z", IDM_EDITUNDO + "^Y", IDM_EDITREDO + "^X", IDM_EDITCUT + "^C", IDM_EDITCOPY + "^V", IDM_EDITPASTE + VK_DELETE, IDM_EDITDELETESELECTION, VIRTKEY + "^A", IDM_EDITSELECTALL + "^T", IDM_VIEWTOOLBOX + "^L", IDM_VIEWCOLORPALETTE + "^F", IDM_VIEWFULLSCREEN + "^R", IDM_IMAGEROTATEMIRROR + "^W", IDM_IMAGECHANGESIZE + "^I", IDM_IMAGEINVERTCOLORS + "^E", IDM_IMAGEATTRIBUTES + "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY +END + +IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Obrót i odbicie lustrzane" +BEGIN + GROUPBOX "Obrót lub odbicie", IDD_MIRRORROTATEGROUP, 6, 6, 112, 86 + AUTORADIOBUTTON "Odbicie poziome", IDD_MIRRORROTATERB1, 12, 18, 100, 10, WS_GROUP + AUTORADIOBUTTON "Odbicie pionowe", IDD_MIRRORROTATERB2, 12, 30, 100, 10 + AUTORADIOBUTTON "Obrót o k¹t:", IDD_MIRRORROTATERB3, 12, 42, 100, 10 + AUTORADIOBUTTON "90°", IDD_MIRRORROTATERB4, 42, 54, 50, 10, WS_GROUP | WS_DISABLED + AUTORADIOBUTTON "180°", IDD_MIRRORROTATERB5, 42, 66, 50, 10, WS_DISABLED + AUTORADIOBUTTON "270°", IDD_MIRRORROTATERB6, 42, 78, 50, 10, WS_DISABLED + DEFPUSHBUTTON "OK", IDOK, 125, 8, 48, 14 + PUSHBUTTON "Anuluj", IDCANCEL, 125, 24, 48, 14 +END + +IDD_ATTRIBUTES DIALOGEX 100, 100, 210, 120 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Atrybuty" +BEGIN + EDITTEXT IDD_ATTRIBUTESEDIT1, 40, 40, 35, 12 + EDITTEXT IDD_ATTRIBUTESEDIT2, 110, 40, 35, 12 + LTEXT "Szerokoæ:", IDD_ATTRIBUTESTEXT1, 10, 40, 30, 10 + LTEXT "Wysokoæ:", IDD_ATTRIBUTESTEXT2, 80, 40, 30, 10 + LTEXT "Data:", IDD_ATTRIBUTESTEXT3, 10, 5, 60, 10 + LTEXT "Rozmiar:", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10 + LTEXT "Rozdzielczoæ:", IDD_ATTRIBUTESTEXT5, 10, 25, 60, 10 + LTEXT "Not available", IDD_ATTRIBUTESTEXT6, 70, 5, 60, 10 + LTEXT "Not available", IDD_ATTRIBUTESTEXT7, 70, 15, 60, 10 + LTEXT "Not available", IDD_ATTRIBUTESTEXT8, 70, 25, 60, 10 + GROUPBOX "Jednostki", IDD_ATTRIBUTESGROUP1, 6, 57, 139, 27 + AUTORADIOBUTTON "Cale", IDD_ATTRIBUTESRB1, 12, 69, 35, 10, WS_GROUP + AUTORADIOBUTTON "cm", IDD_ATTRIBUTESRB2, 52, 69, 35, 10 + AUTORADIOBUTTON "Piksele", IDD_ATTRIBUTESRB3, 92, 69, 35, 10 + GROUPBOX "Kolory", IDD_ATTRIBUTESGROUP2, 6, 88, 139, 27 + AUTORADIOBUTTON "Czerñ i biel", IDD_ATTRIBUTESRB4, 12, 100, 70, 10, WS_GROUP + AUTORADIOBUTTON "Kolory", IDD_ATTRIBUTESRB5, 92, 100, 35, 10 + DEFPUSHBUTTON "OK", IDOK, 155, 8, 48, 14 + PUSHBUTTON "Anuluj", IDCANCEL, 155, 24, 48, 14 + PUSHBUTTON "Domylne", IDD_ATTRIBUTESSTANDARD, 155, 40, 48, 14 +END + +IDD_CHANGESIZE DIALOGEX 100, 100, 210, 80 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Zmiana rozmiaru" +BEGIN + GROUPBOX "Zmieñ rozmiar", IDD_CHANGESIZEGROUP, 6, 6, 142, 66 + ICON IDI_HORZSTRETCH, IDD_CHANGESIZEICON1, 12, 18 + LTEXT "Poziomo:", IDD_CHANGESIZETEXT1, 45, 24, 40, 10 + EDITTEXT IDD_CHANGESIZEEDIT1, 90, 23, 32, 12 + LTEXT "%", IDD_CHANGESIZETEXT2, 125, 24, 15, 10 + ICON IDI_VERTSTRETCH, IDD_CHANGESIZEICON2, 12, 43 + LTEXT "Pionowo:", IDD_CHANGESIZETEXT3, 45, 49, 40, 10 + EDITTEXT IDD_CHANGESIZEEDIT2, 90, 48, 32, 12 + LTEXT "%", IDD_CHANGESIZETEXT4, 125, 49, 15, 10 + DEFPUSHBUTTON "OK", IDOK, 155, 8, 48, 14 + PUSHBUTTON "Anuluj", IDCANCEL, 155, 24, 48, 14 +END + +STRINGTABLE +BEGIN + IDS_PROGRAMNAME, "Paint" + IDS_WINDOWTITLE, "%s - Paint" + IDS_INFOTITLE, "Paint dla ReactOS" + IDS_INFOTEXT, "Paint dla ReactOS jest dostêpny na licencji GNU Lesser General Public License (LGPL) wersja 3 (www.gnu.org)" + IDS_SAVEPROMPTTEXT, "Czy chcesz zapisaæ zmiany do %s?" + IDS_DEFAULTFILENAME, "Nienazwany.bmp" + IDS_TOOLTIP1, "Zaznaczenie dowolne" + IDS_TOOLTIP2, "Zaznaczenie" + IDS_TOOLTIP3, "Gumka" + IDS_TOOLTIP4, "Wype³nij kolorem" + IDS_TOOLTIP5, "Wybierz kolor" + IDS_TOOLTIP6, "Przybli¿enie" + IDS_TOOLTIP7, "O³ówek" + IDS_TOOLTIP8, "Pêdzel" + IDS_TOOLTIP9, "Spray" + IDS_TOOLTIP10, "Tekst" + IDS_TOOLTIP11, "Linia" + IDS_TOOLTIP12, "Krzywa Beziera" + IDS_TOOLTIP13, "Prostok¹t" + IDS_TOOLTIP14, "Polygon" + IDS_TOOLTIP15, "Ellipsa" + IDS_TOOLTIP16, "Zaokr¹glony Prostok¹t" + IDS_OPENFILTER, "Pliki Bitmapy (*.bmp;*.dib)\1*.bmp;*.dib\1Wszystkie pliki (*.*)\1*.*\1" + IDS_SAVEFILTER, "Bitmapa 24 bit (*.bmp;*.dib)\1*.bmp;*.dib\1" +END Propchange: trunk/reactos/base/applications/paint/lang/pl-PL.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/paint/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/rs… ============================================================================== --- trunk/reactos/base/applications/paint/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/rsrc.rc [iso-8859-1] Thu May 14 20:22:48 2009 @@ -17,10 +17,11 @@ #include "lang/de-DE.rc" #include "lang/en-GB.rc" #include "lang/en-US.rc" +#include "lang/es-ES.rc" #include "lang/no-NO.rc" #include "lang/fr-FR.rc" #include "lang/it-IT.rc" -#include "lang/es-ES.rc" +#include "lang/pl-PL.rc" #include "lang/pt-BR.rc" #include "lang/pt-PT.rc" // cp 1250 languages

1 0

[sedwards] 40919: imported the MT snapshot of the GPL tftp-server for win32 from sourceforge. Minor changes such as formatting and renaming the files, totally untested except for building, will be used later to serve up ReactOS images to PXE boot
by sedwards＠svn.reactos.org 14 May '09

14 May '09

Author: sedwards Date: Thu May 14 18:52:22 2009 New Revision: 40919 URL: http://svn.reactos.org/svn/reactos?rev=40919&view=rev Log: imported the MT snapshot of the GPL tftp-server for win32 from sourceforge. Minor changes such as formatting and renaming the files, totally untested except for building, will be used later to serve up ReactOS images to PXE boot Added: trunk/reactos/base/services/tftpd/ trunk/reactos/base/services/tftpd/README.txt (with props) trunk/reactos/base/services/tftpd/tftpd.cpp (with props) trunk/reactos/base/services/tftpd/tftpd.h (with props) trunk/reactos/base/services/tftpd/tftpd.rbuild (with props) Modified: trunk/reactos/base/services/services.rbuild Modified: trunk/reactos/base/services/services.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/services.rbu… ============================================================================== --- trunk/reactos/base/services/services.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/services/services.rbuild [iso-8859-1] Thu May 14 18:52:22 2009 @@ -25,6 +25,9 @@ <directory name="telnetd"> <xi:include href="telnetd/telnetd.rbuild" /> </directory> + <directory name="tftpd"> + <xi:include href="tftpd/tftpd.rbuild" /> + </directory> <directory name="umpnpmgr"> <xi:include href="umpnpmgr/umpnpmgr.rbuild" /> </directory> Added: trunk/reactos/base/services/tftpd/README.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/tftpd/README… ============================================================================== --- trunk/reactos/base/services/tftpd/README.txt (added) +++ trunk/reactos/base/services/tftpd/README.txt [iso-8859-1] Thu May 14 18:52:22 2009 @@ -1,0 +1,3 @@ +This is a snapshot from the 1.6 release of tftp-server for win32 from sourceforge. + +http://tftp-server.sourceforge.net Propchange: trunk/reactos/base/services/tftpd/README.txt ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/services/tftpd/README.txt ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: trunk/reactos/base/services/tftpd/tftpd.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/tftpd/tftpd.… ============================================================================== --- trunk/reactos/base/services/tftpd/tftpd.cpp (added) +++ trunk/reactos/base/services/tftpd/tftpd.cpp [iso-8859-1] Thu May 14 18:52:22 2009 @@ -1,0 +1,2245 @@ +/************************************************************************** +* Copyright (C) 2005 by Achal Dhir * +* achaldhir(a)gmail.com * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program; if not, write to the * +* Free Software Foundation, Inc., * +* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * +***************************************************************************/ +// TFTPServer.cpp + +#include <stdio.h> +#include <winsock2.h> +#include <process.h> +#include <time.h> +#include <tchar.h> +#include <ws2tcpip.h> +#include <limits.h> +#include <iphlpapi.h> +#include "tftpd.h" + +//Global Variables +char serviceName[] = "TFTPServer"; +char displayName[] = "TFTP Server Multithreaded"; +char sVersion[] = "TFTP Server MultiThreaded Version 1.61 Windows Built 1611"; +char iniFile[_MAX_PATH]; +char logFile[_MAX_PATH]; +char tempbuff[256]; +char logBuff[512]; +char fileSep = '\\'; +char notFileSep = '/'; +WORD blksize = 65464; +char verbatim = 0; +WORD timeout = 3; +data2 cfig; +//ThreadPool Variables +HANDLE tEvent; +HANDLE cEvent; +HANDLE sEvent; +HANDLE lEvent; +BYTE currentServer = UCHAR_MAX; +WORD totalThreads=0; +WORD minThreads=1; +WORD activeThreads=0; + +//Service Variables +SERVICE_STATUS serviceStatus; +SERVICE_STATUS_HANDLE serviceStatusHandle = 0; +HANDLE stopServiceEvent = 0; + +void WINAPI ServiceControlHandler(DWORD controlCode) +{ + switch (controlCode) + { + case SERVICE_CONTROL_INTERROGATE: + break; + + case SERVICE_CONTROL_SHUTDOWN: + case SERVICE_CONTROL_STOP: + serviceStatus.dwCurrentState = SERVICE_STOP_PENDING; + SetServiceStatus(serviceStatusHandle, &serviceStatus); + + SetEvent(stopServiceEvent); + return ; + + case SERVICE_CONTROL_PAUSE: + break; + + case SERVICE_CONTROL_CONTINUE: + break; + + default: + if (controlCode >= 128 && controlCode <= 255) + break; + else + break; + } + + SetServiceStatus(serviceStatusHandle, &serviceStatus); +} + +void WINAPI ServiceMain(DWORD /*argc*/, TCHAR* /*argv*/[]) +{ + serviceStatus.dwServiceType = SERVICE_WIN32; + serviceStatus.dwCurrentState = SERVICE_STOPPED; + serviceStatus.dwControlsAccepted = 0; + serviceStatus.dwWin32ExitCode = NO_ERROR; + serviceStatus.dwServiceSpecificExitCode = NO_ERROR; + serviceStatus.dwCheckPoint = 0; + serviceStatus.dwWaitHint = 0; + + serviceStatusHandle = RegisterServiceCtrlHandler(serviceName, ServiceControlHandler); + + if (serviceStatusHandle) + { + serviceStatus.dwCurrentState = SERVICE_START_PENDING; + SetServiceStatus(serviceStatusHandle, &serviceStatus); + + //init + verbatim = false; + init(); + fd_set readfds; + timeval tv; + int fdsReady = 0; + tv.tv_sec = 20; + tv.tv_usec = 0; + + stopServiceEvent = CreateEvent(0, FALSE, FALSE, 0); + + serviceStatus.dwControlsAccepted |= (SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN); + serviceStatus.dwCurrentState = SERVICE_RUNNING; + SetServiceStatus(serviceStatusHandle, &serviceStatus); + + do + { + FD_ZERO(&readfds); + + for (int i = 0; i < MAX_SERVERS && cfig.tftpConn[i].port; i++) + FD_SET(cfig.tftpConn[i].sock, &readfds); + + int fdsReady = select(cfig.maxFD, &readfds, NULL, NULL, &tv); + + for (int i = 0; fdsReady > 0 && i < MAX_SERVERS && cfig.tftpConn[i].port; i++) + { + if (FD_ISSET(cfig.tftpConn[i].sock, &readfds)) + { + WaitForSingleObject(sEvent, INFINITE); + + currentServer = i; + + if (!totalThreads || activeThreads >= totalThreads) + { + _beginthread( + processRequest, // thread function + 0, // default security attributes + NULL); // argument to thread function + + } + + SetEvent(tEvent); + WaitForSingleObject(sEvent, INFINITE); + fdsReady--; + SetEvent(sEvent); + } + } + } + while (WaitForSingleObject(stopServiceEvent, 0) == WAIT_TIMEOUT); + + if (cfig.logfile) + fclose(cfig.logfile); + + serviceStatus.dwCurrentState = SERVICE_STOP_PENDING; + SetServiceStatus(serviceStatusHandle, &serviceStatus); + + sprintf(logBuff, "Closing Network Connections..."); + logMess(logBuff, 1); + + for (int i = 0; i < MAX_SERVERS && cfig.tftpConn[i].port; i++) + closesocket(cfig.tftpConn[i].sock); + + WSACleanup(); + + sprintf(logBuff, "TFTP Server Stopped !"); + logMess(logBuff, 1); + + serviceStatus.dwControlsAccepted &= ~(SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN); + serviceStatus.dwCurrentState = SERVICE_STOPPED; + SetServiceStatus(serviceStatusHandle, &serviceStatus); + CloseHandle(stopServiceEvent); + stopServiceEvent = 0; + } +} + +void runService() +{ + SERVICE_TABLE_ENTRY serviceTable[] = + { + {serviceName, ServiceMain}, + {0, 0} + }; + + StartServiceCtrlDispatcher(serviceTable); +} + +bool stopService(SC_HANDLE service) +{ + if (service) + { + SERVICE_STATUS serviceStatus; + QueryServiceStatus(service, &serviceStatus); + if (serviceStatus.dwCurrentState != SERVICE_STOPPED) + { + ControlService(service, SERVICE_CONTROL_STOP, &serviceStatus); + printf("Stopping Service."); + for (int i = 0; i < 100; i++) + { + QueryServiceStatus(service, &serviceStatus); + if (serviceStatus.dwCurrentState == SERVICE_STOPPED) + { + printf("Stopped\n"); + return true; + } + else + { + Sleep(500); + printf("."); + } + } + printf("Failed\n"); + return false; + } + } + return true; +} + +void installService() +{ + SC_HANDLE serviceControlManager = OpenSCManager(0, 0, SC_MANAGER_CREATE_SERVICE); + + if (serviceControlManager) + { + SC_HANDLE service = OpenService(serviceControlManager, + serviceName, SERVICE_QUERY_STATUS); + if (service) + { + printf("Service Already Exists..\n"); + StartService(service,0,NULL); + CloseServiceHandle(service); + } + else + { + TCHAR path[ _MAX_PATH + 1 ]; + if (GetModuleFileName(0, path, sizeof(path) / sizeof(path[0])) > 0) + { + SC_HANDLE service = CreateService(serviceControlManager, + serviceName, displayName, + SERVICE_ALL_ACCESS, SERVICE_WIN32_OWN_PROCESS, + SERVICE_AUTO_START, SERVICE_ERROR_IGNORE, path, + 0, 0, 0, 0, 0); + if (service) + { + printf("Successfully installed.. !\n"); + StartService(service,0,NULL); + CloseServiceHandle(service); + } + else + printf("Installation Failed..\n"); + } + } + CloseServiceHandle(serviceControlManager); + } + else + printWindowsError(); +} + +void uninstallService() +{ + SC_HANDLE serviceControlManager = OpenSCManager(0, 0, SC_MANAGER_CONNECT); + + if (serviceControlManager) + { + SC_HANDLE service = OpenService(serviceControlManager, + serviceName, SERVICE_QUERY_STATUS | SERVICE_STOP | DELETE); + if (service) + { + if (stopService(service)) + { + DeleteService(service); + printf("Successfully Removed !\n"); + } + else + printf("Failed to Stop Service..\n"); + + CloseServiceHandle(service); + } + + CloseServiceHandle(serviceControlManager); + } + else + printWindowsError(); +} + +void printWindowsError() +{ + DWORD dw = GetLastError(); + + if (dw) + { + LPVOID lpMsgBuf; + LPVOID lpDisplayBuf; + + FormatMessage( + FORMAT_MESSAGE_ALLOCATE_BUFFER | + FORMAT_MESSAGE_FROM_SYSTEM | + FORMAT_MESSAGE_IGNORE_INSERTS, + NULL, + dw, + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + (LPTSTR) &lpMsgBuf, + 0, NULL ); + + printf("Error: %s\nPress Enter..\n", lpMsgBuf); + getchar(); + } +} + +int main(int argc, TCHAR* argv[]) +{ + OSVERSIONINFO osvi; + osvi.dwOSVersionInfoSize = sizeof(osvi); + bool result = GetVersionEx(&osvi); + + if (result && osvi.dwPlatformId >= VER_PLATFORM_WIN32_NT) + { + if (argc > 1 && lstrcmpi(argv[1], TEXT("-i")) == 0) + installService(); + else if (argc > 1 && lstrcmpi(argv[1], TEXT("-u")) == 0) + uninstallService(); + else if (argc > 1 && lstrcmpi(argv[1], TEXT("-v")) == 0) + { + SC_HANDLE serviceControlManager = OpenSCManager(0, 0, SC_MANAGER_CONNECT); + bool serviceStopped = true; + + if (serviceControlManager) + { + SC_HANDLE service = OpenService(serviceControlManager, + serviceName, SERVICE_QUERY_STATUS | SERVICE_STOP); + if (service) + { + serviceStopped = stopService(service); + CloseServiceHandle(service); + } + CloseServiceHandle(serviceControlManager); + } + else + printWindowsError(); + + if (serviceStopped) + runProg(); + else + printf("Failed to Stop Service\n"); + } + else + runService(); + } + else if (argc == 1 || lstrcmpi(argv[1], TEXT("-v")) == 0) + runProg(); + else + printf("This option is not available on Windows95/98/ME\n"); + + return 0; +} + +void runProg() +{ + verbatim = true; + init(); + fd_set readfds; + timeval tv; + int fdsReady = 0; + tv.tv_sec = 20; + tv.tv_usec = 0; + + printf("\naccepting requests..\n"); + + do + { + //printf("Active=%u Total=%u\n",activeThreads, totalThreads); + + FD_ZERO(&readfds); + + for (int i = 0; i < MAX_SERVERS && cfig.tftpConn[i].port; i++) + FD_SET(cfig.tftpConn[i].sock, &readfds); + + fdsReady = select(cfig.maxFD, &readfds, NULL, NULL, &tv); + + //if (errno) + // printf("%s\n", strerror(errno)); + + for (int i = 0; fdsReady > 0 && i < MAX_SERVERS && cfig.tftpConn[i].port; i++) + { + if (FD_ISSET(cfig.tftpConn[i].sock, &readfds)) + { + //printf("Request Waiting\n"); + + WaitForSingleObject(sEvent, INFINITE); + + currentServer = i; + + if (!totalThreads || activeThreads >= totalThreads) + { + _beginthread( + processRequest, // thread function + 0, // default security attributes + NULL); // argument to thread function + } + SetEvent(tEvent); + + //printf("thread signalled=%u\n",SetEvent(tEvent)); + + WaitForSingleObject(sEvent, INFINITE); + fdsReady--; + SetEvent(sEvent); + } + } + } + while (true); + + for (int i = 0; i < MAX_SERVERS && cfig.tftpConn[i].port; i++) + closesocket(cfig.tftpConn[i].sock); + + WSACleanup(); +} + +void processRequest(void *lpParam) +{ + //printf("New Thread %u\n",GetCurrentThreadId()); + + request req; + + WaitForSingleObject(cEvent, INFINITE); + totalThreads++; + SetEvent(cEvent); + + do + { + WaitForSingleObject(tEvent, INFINITE); + //printf("In Thread %u\n",GetCurrentThreadId()); + + WaitForSingleObject(cEvent, INFINITE); + activeThreads++; + SetEvent(cEvent); + + if (currentServer >= MAX_SERVERS || !cfig.tftpConn[currentServer].port) + { + SetEvent(sEvent); + req.attempt = UCHAR_MAX; + continue; + } + + memset(&req, 0, sizeof(request)); + req.sock = INVALID_SOCKET; + + req.clientsize = sizeof(req.client); + req.sockInd = currentServer; + currentServer = UCHAR_MAX; + req.knock = cfig.tftpConn[req.sockInd].sock; + + if (req.knock == INVALID_SOCKET) + { + SetEvent(sEvent); + req.attempt = UCHAR_MAX; + continue; + } + + errno = 0; + req.bytesRecd = recvfrom(req.knock, (char*)&req.mesin, sizeof(message), 0, (sockaddr*)&req.client, &req.clientsize); + errno = WSAGetLastError(); + + //printf("socket Signalled=%u\n",SetEvent(sEvent)); + SetEvent(sEvent); + + if (!errno && req.bytesRecd > 0) + { + if (cfig.hostRanges[0].rangeStart) + { + DWORD iip = ntohl(req.client.sin_addr.s_addr); + bool allowed = false; + + for (int j = 0; j <= 32 && cfig.hostRanges[j].rangeStart; j++) + { + if (iip >= cfig.hostRanges[j].rangeStart && iip <= cfig.hostRanges[j].rangeEnd) + { + allowed = true; + break; + } + } + + if (!allowed) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(2); + strcpy(req.serverError.errormessage, "Access Denied"); + logMess(&req, 1); + sendto(req.knock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0, (sockaddr*)&req.client, req.clientsize); + req.attempt = UCHAR_MAX; + continue; + } + } + + if ((htons(req.mesin.opcode) == 5)) + { + sprintf(req.serverError.errormessage, "Error Code %i at Client, %s", ntohs(req.clientError.errorcode), req.clientError.errormessage); + logMess(&req, 2); + req.attempt = UCHAR_MAX; + continue; + } + else if (htons(req.mesin.opcode) != 1 && htons(req.mesin.opcode) != 2) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(5); + sprintf(req.serverError.errormessage, "Unknown Transfer Id"); + logMess(&req, 2); + sendto(req.knock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0, (sockaddr*)&req.client, req.clientsize); + req.attempt = UCHAR_MAX; + continue; + } + } + else + { + sprintf(req.serverError.errormessage, "Communication Error"); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + continue; + } + + req.blksize = 512; + req.timeout = timeout; + req.expiry = time(NULL) + req.timeout; + bool fetchAck = false; + + req.sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP); + + if (req.sock == INVALID_SOCKET) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(0); + strcpy(req.serverError.errormessage, "Thread Socket Creation Error"); + sendto(req.knock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0, (sockaddr*)&req.client, req.clientsize); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + continue; + } + + sockaddr_in service; + service.sin_family = AF_INET; + service.sin_addr.s_addr = cfig.tftpConn[req.sockInd].server; + + if (cfig.minport) + { + for (WORD comport = cfig.minport; ; comport++) + { + service.sin_port = htons(comport); + + if (comport > cfig.maxport) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(0); + strcpy(req.serverError.errormessage, "No port is free"); + sendto(req.knock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0, (sockaddr*)&req.client, req.clientsize); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + break; + } + else if (bind(req.sock, (sockaddr*) &service, sizeof(service)) == -1) + continue; + else + break; + } + } + else + { + service.sin_port = 0; + + if (bind(req.sock, (sockaddr*) &service, sizeof(service)) == -1) + { + strcpy(req.serverError.errormessage, "Thread failed to bind"); + sendto(req.knock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0, (sockaddr*)&req.client, req.clientsize); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + } + } + + if (req.attempt >= 3) + continue; + + if (connect(req.sock, (sockaddr*)&req.client, req.clientsize) == -1) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(0); + strcpy(req.serverError.errormessage, "Connect Failed"); + sendto(req.knock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0, (sockaddr*)&req.client, req.clientsize); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + continue; + } + + //sprintf(req.serverError.errormessage, "In Temp, Socket"); + //logMess(&req, 1); + + char *inPtr = req.mesin.buffer; + *(inPtr + (req.bytesRecd - 3)) = 0; + req.filename = inPtr; + + if (!strlen(req.filename) || strlen(req.filename) > UCHAR_MAX) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(4); + strcpy(req.serverError.errormessage, "Malformed Request, Invalid/Missing Filename"); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + req.attempt = UCHAR_MAX; + logMess(&req, 1); + continue; + } + + inPtr += strlen(inPtr) + 1; + req.mode = inPtr; + + if (!strlen(req.mode) || strlen(req.mode) > 25) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(4); + strcpy(req.serverError.errormessage, "Malformed Request, Invalid/Missing Mode"); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + req.attempt = UCHAR_MAX; + logMess(&req, 1); + continue; + } + + inPtr += strlen(inPtr) + 1; + + for (DWORD i = 0; i < strlen(req.filename); i++) + if (req.filename[i] == notFileSep) + req.filename[i] = fileSep; + + tempbuff[0] = '.'; + tempbuff[1] = '.'; + tempbuff[2] = fileSep; + tempbuff[3] = 0; + + if (strstr(req.filename, tempbuff)) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(2); + strcpy(req.serverError.errormessage, "Access violation"); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + continue; + } + + if (req.filename[0] == fileSep) + req.filename++; + + if (!cfig.homes[0].alias[0]) + { + if (strlen(cfig.homes[0].target) + strlen(req.filename) >= sizeof(req.path)) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(4); + sprintf(req.serverError.errormessage, "Filename too large"); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + continue; + } + + strcpy(req.path, cfig.homes[0].target); + strcat(req.path, req.filename); + } + else + { + char *bname = strchr(req.filename, fileSep); + + if (bname) + { + *bname = 0; + bname++; + } + else + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(2); + sprintf(req.serverError.errormessage, "Missing directory/alias"); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + continue; + } + + for (int i = 0; i < 8; i++) + { + //printf("%s=%i\n", req.filename, cfig.homes[i].alias[0]); + if (cfig.homes[i].alias[0] && !strcasecmp(req.filename, cfig.homes[i].alias)) + { + if (strlen(cfig.homes[i].target) + strlen(bname) >= sizeof(req.path)) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(4); + sprintf(req.serverError.errormessage, "Filename too large"); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + break; + } + + strcpy(req.path, cfig.homes[i].target); + strcat(req.path, bname); + break; + } + else if (i == 7 || !cfig.homes[i].alias[0]) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(2); + sprintf(req.serverError.errormessage, "No such directory/alias %s", req.filename); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + break; + } + } + } + + if (req.attempt >= 3) + continue; + + if (ntohs(req.mesin.opcode) == 1) + { + if (!cfig.fileRead) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(2); + strcpy(req.serverError.errormessage, "GET Access Denied"); + logMess(&req, 1); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + req.attempt = UCHAR_MAX; + continue; + } + + if (*inPtr) + { + char *tmp = inPtr; + + while (*tmp) + { + if (!strcasecmp(tmp, "blksize")) + { + tmp += strlen(tmp) + 1; + DWORD val = atol(tmp); + + if (val < 512) + val = 512; + else if (val > blksize) + val = blksize; + + req.blksize = val; + break; + } + + tmp += strlen(tmp) + 1; + } + } + + errno = 0; + + if (!strcasecmp(req.mode, "netascii") || !strcasecmp(req.mode, "ascii")) + req.file = fopen(req.path, "rt"); + else + req.file = fopen(req.path, "rb"); + + if (errno || !req.file) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(1); + strcpy(req.serverError.errormessage, "File not found or No Access"); + logMess(&req, 1); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + req.attempt = UCHAR_MAX; + continue; + } + + setvbuf(req.file, NULL, _IOFBF, req.blksize); + } + else + { + if (!cfig.fileWrite && !cfig.fileOverwrite) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(2); + strcpy(req.serverError.errormessage, "PUT Access Denied"); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + continue; + } + + req.file = fopen(req.path, "rb"); + + if (req.file) + { + fclose(req.file); + req.file = NULL; + + if (!cfig.fileOverwrite) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(6); + strcpy(req.serverError.errormessage, "File already exists"); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + continue; + } + } + else if (!cfig.fileWrite) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(2); + strcpy(req.serverError.errormessage, "Create File Access Denied"); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + continue; + } + + errno = 0; + + if (!strcasecmp(req.mode, "netascii") || !strcasecmp(req.mode, "ascii")) + req.file = fopen(req.path, "wt"); + else + req.file = fopen(req.path, "wb"); + + if (errno || !req.file) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(2); + strcpy(req.serverError.errormessage, "Invalid Path or No Access"); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + continue; + } + } + + if (*inPtr) + { + fetchAck = true; + char *outPtr = req.mesout.buffer; + req.mesout.opcode = htons(6); + DWORD val; + while (*inPtr) + { + //printf("%s\n", inPtr); + if (!strcasecmp(inPtr, "blksize")) + { + strcpy(outPtr, inPtr); + outPtr += strlen(outPtr) + 1; + inPtr += strlen(inPtr) + 1; + val = atol(inPtr); + + if (val < 512) + val = 512; + else if (val > blksize) + val = blksize; + + req.blksize = val; + sprintf(outPtr, "%u", val); + outPtr += strlen(outPtr) + 1; + } + else if (!strcasecmp(inPtr, "tsize")) + { + strcpy(outPtr, inPtr); + outPtr += strlen(outPtr) + 1; + inPtr += strlen(inPtr) + 1; + + if (ntohs(req.mesin.opcode) == 1) + { + if (!fseek(req.file, 0, SEEK_END)) + { + if (ftell(req.file) >= 0) + { + req.tsize = ftell(req.file); + sprintf(outPtr, "%u", req.tsize); + outPtr += strlen(outPtr) + 1; + } + else + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(2); + strcpy(req.serverError.errormessage, "Invalid Path or No Access"); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + break; + } + } + else + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(2); + strcpy(req.serverError.errormessage, "Invalid Path or No Access"); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + break; + } + } + else + { + req.tsize = 0; + sprintf(outPtr, "%u", req.tsize); + outPtr += strlen(outPtr) + 1; + } + } + else if (!strcasecmp(inPtr, "timeout")) + { + strcpy(outPtr, inPtr); + outPtr += strlen(outPtr) + 1; + inPtr += strlen(inPtr) + 1; + val = atoi(inPtr); + + if (val < 1) + val = 1; + else if (val > UCHAR_MAX) + val = UCHAR_MAX; + + req.timeout = val; + req.expiry = time(NULL) + req.timeout; + sprintf(outPtr, "%u", val); + outPtr += strlen(outPtr) + 1; + } + + inPtr += strlen(inPtr) + 1; + //printf("=%u\n", val); + } + + if (req.attempt >= 3) + continue; + + errno = 0; + req.bytesReady = (DWORD)outPtr - (DWORD)&req.mesout; + //printf("Bytes Ready=%u\n", req.bytesReady); + send(req.sock, (const char*)&req.mesout, req.bytesReady, 0); + errno = WSAGetLastError(); + } + else if (htons(req.mesin.opcode) == 2) + { + req.acout.opcode = htons(4); + req.acout.block = htons(0); + errno = 0; + req.bytesReady = 4; + send(req.sock, (const char*)&req.mesout, req.bytesReady, 0); + errno = WSAGetLastError(); + } + + if (errno) + { + sprintf(req.serverError.errormessage, "Communication Error"); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + continue; + } + else if (ntohs(req.mesin.opcode) == 1) + { + errno = 0; + req.pkt[0] = (packet*)calloc(1, req.blksize + 4); + req.pkt[1] = (packet*)calloc(1, req.blksize + 4); + + if (errno || !req.pkt[0] || !req.pkt[1]) + { + sprintf(req.serverError.errormessage, "Memory Error"); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + continue; + } + + long ftellLoc = ftell(req.file); + + if (ftellLoc > 0) + { + if (fseek(req.file, 0, SEEK_SET)) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(2); + strcpy(req.serverError.errormessage, "File Access Error"); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + continue; + } + } + else if (ftellLoc < 0) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(2); + strcpy(req.serverError.errormessage, "File Access Error"); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + continue; + } + + errno = 0; + req.pkt[0]->opcode = htons(3); + req.pkt[0]->block = htons(1); + req.bytesRead[0] = fread(&req.pkt[0]->buffer, 1, req.blksize, req.file); + + if (errno) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(2); + strcpy(req.serverError.errormessage, "Invalid Path or No Access"); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + continue; + } + + if (req.bytesRead[0] == req.blksize) + { + req.pkt[1]->opcode = htons(3); + req.pkt[1]->block = htons(2); + req.bytesRead[1] = fread(&req.pkt[1]->buffer, 1, req.blksize, req.file); + if (req.bytesRead[1] < req.blksize) + { + fclose(req.file); + req.file = 0; + } + } + else + { + fclose(req.file); + req.file = 0; + } + + if (errno) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(2); + strcpy(req.serverError.errormessage, "Invalid Path or No Access"); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + continue; + } + + while (req.attempt <= 3) + { + if (fetchAck) + { + FD_ZERO(&req.readfds); + req.tv.tv_sec = 1; + req.tv.tv_usec = 0; + FD_SET(req.sock, &req.readfds); + select(req.sock + 1, &req.readfds, NULL, NULL, &req.tv); + + if (FD_ISSET(req.sock, &req.readfds)) + { + errno = 0; + req.bytesRecd = recv(req.sock, (char*)&req.mesin, sizeof(message), 0); + errno = WSAGetLastError(); + if (req.bytesRecd <= 0 || errno) + { + sprintf(req.serverError.errormessage, "Communication Error"); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + break; + } + else if(req.bytesRecd >= 4 && ntohs(req.mesin.opcode) == 4) + { + if (ntohs(req.acin.block) == req.block) + { + req.block++; + req.fblock++; + req.attempt = 0; + } + else if (req.expiry > time(NULL)) + continue; + else + req.attempt++; + } + else if (ntohs(req.mesin.opcode) == 5) + { + sprintf(req.serverError.errormessage, "Client %s:%u, Error Code %i at Client, %s", inet_ntoa(req.client.sin_addr), ntohs(req.client.sin_port), ntohs(req.clientError.errorcode), req.clientError.errormessage); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + break; + } + else + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(4); + sprintf(req.serverError.errormessage, "Unexpected Option Code %i", ntohs(req.mesin.opcode)); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + break; + } + } + else if (req.expiry > time(NULL)) + continue; + else + req.attempt++; + } + else + { + fetchAck = true; + req.acin.block = 1; + req.block = 1; + req.fblock = 1; + } + + if (req.attempt >= 3) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(0); + + if (req.fblock && !req.block) + strcpy(req.serverError.errormessage, "Large File, Block# Rollover not supported by Client"); + else + strcpy(req.serverError.errormessage, "Timeout"); + + logMess(&req, 1); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + req.attempt = UCHAR_MAX; + break; + } + else if (!req.fblock) + { + errno = 0; + send(req.sock, (const char*)&req.mesout, req.bytesReady, 0); + errno = WSAGetLastError(); + if (errno) + { + sprintf(req.serverError.errormessage, "Communication Error"); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + break; + } + req.expiry = time(NULL) + req.timeout; + } + else if (ntohs(req.pkt[0]->block) == req.block) + { + errno = 0; + send(req.sock, (const char*)req.pkt[0], req.bytesRead[0] + 4, 0); + errno = WSAGetLastError(); + if (errno) + { + sprintf(req.serverError.errormessage, "Communication Error"); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + break; + } + req.expiry = time(NULL) + req.timeout; + + if (req.file) + { + req.tblock = ntohs(req.pkt[1]->block) + 1; + if (req.tblock == req.block) + { + req.pkt[1]->block = htons(++req.tblock); + req.bytesRead[1] = fread(&req.pkt[1]->buffer, 1, req.blksize, req.file); + + if (errno) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(4); + sprintf(req.serverError.errormessage, strerror(errno)); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + break; + } + else if (req.bytesRead[1] < req.blksize) + { + fclose(req.file); + req.file = 0; + } + } + } + } + else if (ntohs(req.pkt[1]->block) == req.block) + { + errno = 0; + send(req.sock, (const char*)req.pkt[1], req.bytesRead[1] + 4, 0); + errno = WSAGetLastError(); + if (errno) + { + sprintf(req.serverError.errormessage, "Communication Error"); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + break; + } + + req.expiry = time(NULL) + req.timeout; + + if (req.file) + { + req.tblock = ntohs(req.pkt[0]->block) + 1; + if (req.tblock == req.block) + { + req.pkt[0]->block = htons(++req.tblock); + req.bytesRead[0] = fread(&req.pkt[0]->buffer, 1, req.blksize, req.file); + if (errno) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(4); + sprintf(req.serverError.errormessage, strerror(errno)); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + break; + } + else if (req.bytesRead[0] < req.blksize) + { + fclose(req.file); + req.file = 0; + } + } + } + } + else + { + sprintf(req.serverError.errormessage, "%u Blocks Served", req.fblock - 1); + logMess(&req, 2); + req.attempt = UCHAR_MAX; + break; + } + } + } + else if (ntohs(req.mesin.opcode) == 2) + { + errno = 0; + req.pkt[0] = (packet*)calloc(1, req.blksize + 4); + + if (errno || !req.pkt[0]) + { + sprintf(req.serverError.errormessage, "Memory Error"); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + continue; + } + + while (req.attempt <= 3) + { + FD_ZERO(&req.readfds); + req.tv.tv_sec = 1; + req.tv.tv_usec = 0; + FD_SET(req.sock, &req.readfds); + select(req.sock + 1, &req.readfds, NULL, NULL, &req.tv); + + if (FD_ISSET(req.sock, &req.readfds)) + { + errno = 0; + req.bytesRecd = recv(req.sock, (char*)req.pkt[0], req.blksize + 4, 0); + errno = WSAGetLastError(); + + if (errno) + { + sprintf(req.serverError.errormessage, "Communication Error"); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + break; + } + } + else + req.bytesRecd = 0; + + if (req.bytesRecd >= 4) + { + if (ntohs(req.pkt[0]->opcode) == 3) + { + req.tblock = req.block + 1; + + if (ntohs(req.pkt[0]->block) == req.tblock) + { + req.acout.opcode = htons(4); + req.acout.block = req.pkt[0]->block; + req.block++; + req.fblock++; + req.bytesReady = 4; + req.expiry = time(NULL) + req.timeout; + + errno = 0; + send(req.sock, (const char*)&req.mesout, req.bytesReady, 0); + errno = WSAGetLastError(); + + if (errno) + { + sprintf(req.serverError.errormessage, "Communication Error"); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + break; + } + + if (req.bytesRecd > 4) + { + errno = 0; + if (fwrite(&req.pkt[0]->buffer, req.bytesRecd - 4, 1, req.file) != 1 || errno) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(3); + strcpy(req.serverError.errormessage, "Disk full or allocation exceeded"); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + break; + } + else + req.attempt = 0; + } + else + req.attempt = 0; + + if ((WORD)req.bytesRecd < req.blksize + 4) + { + fclose(req.file); + req.file = 0; + sprintf(req.serverError.errormessage, "%u Blocks Received", req.fblock); + logMess(&req, 2); + req.attempt = UCHAR_MAX; + break; + } + } + else if (req.expiry > time(NULL)) + continue; + else if (req.attempt >= 3) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(0); + + if (req.fblock && !req.block) + strcpy(req.serverError.errormessage, "Large File, Block# Rollover not supported by Client"); + else + strcpy(req.serverError.errormessage, "Timeout"); + + logMess(&req, 1); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + req.attempt = UCHAR_MAX; + break; + } + else + { + req.expiry = time(NULL) + req.timeout; + errno = 0; + send(req.sock, (const char*)&req.mesout, req.bytesReady, 0); + errno = WSAGetLastError(); + req.attempt++; + + if (errno) + { + sprintf(req.serverError.errormessage, "Communication Error"); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + break; + } + } + } + else if (req.bytesRecd > (int)sizeof(message)) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(4); + sprintf(req.serverError.errormessage, "Error: Incoming Packet too large"); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + break; + } + else if (ntohs(req.pkt[0]->opcode) == 5) + { + sprintf(req.serverError.errormessage, "Error Code %i at Client, %s", ntohs(req.pkt[0]->block), &req.pkt[0]->buffer); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + break; + } + else + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(4); + sprintf(req.serverError.errormessage, "Unexpected Option Code %i", ntohs(req.pkt[0]->opcode)); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + break; + } + } + else if (req.expiry > time(NULL)) + continue; + else if (req.attempt >= 3) + { + req.serverError.opcode = htons(5); + req.serverError.errorcode = htons(0); + + if (req.fblock && !req.block) + strcpy(req.serverError.errormessage, "Large File, Block# Rollover not supported by Client"); + else + strcpy(req.serverError.errormessage, "Timeout"); + + logMess(&req, 1); + send(req.sock, (const char*)&req.serverError, strlen(req.serverError.errormessage) + 5, 0); + req.attempt = UCHAR_MAX; + break; + } + else + { + req.expiry = time(NULL) + req.timeout; + errno = 0; + send(req.sock, (const char*)&req.mesout, req.bytesReady, 0); + errno = WSAGetLastError(); + req.attempt++; + + if (errno) + { + sprintf(req.serverError.errormessage, "Communication Error"); + logMess(&req, 1); + req.attempt = UCHAR_MAX; + break; + } + } + } + } + } + while (cleanReq(&req)); + + WaitForSingleObject(cEvent, INFINITE); + totalThreads--; + SetEvent(cEvent); + + //printf("Thread %u Killed\n",GetCurrentThreadId()); + _endthread(); + return; +} + +bool cleanReq(request* req) +{ + //printf("cleaning\n"); + + if (req->file) + fclose(req->file); + + if (!(req->sock == INVALID_SOCKET)) + { + //printf("Here\n"); + closesocket(req->sock); + } + + if (req->pkt[0]) + free(req->pkt[0]); + + if (req->pkt[1]) + free(req->pkt[1]); + + WaitForSingleObject(cEvent, INFINITE); + activeThreads--; + SetEvent(cEvent); + + //printf("cleaned\n"); + + return (totalThreads <= minThreads); +} + +char* myGetToken(char* buff, BYTE index) +{ + while (*buff) + { + if (index) + index--; + else + break; + + buff += strlen(buff) + 1; + } + + return buff; +} + +WORD myTokenize(char *target, char *source, char *sep, bool whiteSep) +{ + bool found = true; + char *dp = target; + WORD kount = 0; + + while (*source) + { + if (sep && sep[0] && strchr(sep, (*source))) + { + found = true; + source++; + continue; + } + else if (whiteSep && *source <= 32) + { + found = true; + source++; + continue; + } + + if (found) + { + if (target != dp) + { + *dp = 0; + dp++; + } + kount++; + } + + found = false; + *dp = *source; + dp++; + source++; + } + + *dp = 0; + dp++; + *dp = 0; + + //printf("%s\n", target); + + return kount; +} + +char* myTrim(char *target, char *source) +{ + while ((*source) && (*source) <= 32) + source++; + + int i = 0; + + for (; i < 511 && source[i]; i++) + target[i] = source[i]; + + target[i] = source[i]; + i--; + + for (; i >= 0 && target[i] <= 32; i--) + target[i] = 0; + + return target; +} + +void mySplit(char *name, char *value, char *source, char splitChar) +{ + int i = 0; + int j = 0; + int k = 0; + + for (; source[i] && j <= 510 && source[i] != splitChar; i++, j++) + { + name[j] = source[i]; + } + + if (source[i]) + { + i++; + for (; k <= 510 && source[i]; i++, k++) + { + value[k] = source[i]; + } + } + + name[j] = 0; + value[k] = 0; + + myTrim(name, name); + myTrim(value, value); + //printf("%s %s\n", name, value); +} + +bool getSection(char *sectionName, char *buffer, BYTE serial, char *fileName) +{ + //printf("%s=%s\n",fileName,sectionName); + char section[128]; + sprintf(section, "[%s]", sectionName); + myUpper(section); + FILE *f = fopen(fileName, "rt"); + char buff[512]; + BYTE found = 0; + + if (f) + { + while (fgets(buff, 511, f)) + { + myUpper(buff); + myTrim(buff, buff); + + if (strstr(buff, section) == buff) + { + found++; + if (found == serial) + { + //printf("%s=%s\n",fileName,sectionName); + while (fgets(buff, 511, f)) + { + myTrim(buff, buff); + + if (strstr(buff, "[") == buff) + break; + + if ((*buff) >= '0' && (*buff) <= '9' || (*buff) >= 'A' && (*buff) <= 'Z' || (*buff) >= 'a' && (*buff) <= 'z' || ((*buff) && strchr("/\\?*", (*buff)))) + { + buffer += sprintf(buffer, "%s", buff); + buffer++; + } + } + break; + } + } + } + fclose(f); + } + + *buffer = 0; + *(buffer + 1) = 0; + return (found == serial); +} + +char *IP2String(char *target, DWORD ip) +{ + data15 inaddr; + inaddr.ip = ip; + sprintf(target, "%u.%u.%u.%u", inaddr.octate[0], inaddr.octate[1], inaddr.octate[2], inaddr.octate[3]); + return target; +} + +bool isIP(char *string) +{ + int j = 0; + + for (; *string; string++) + { + if (*string == '.' && *(string + 1) != '.') + j++; + else if (*string < '0' || *string > '9') + return 0; + } + + if (j == 3) + return 1; + else + return 0; +} + +char *myUpper(char *string) +{ + char diff = 'a' - 'A'; + WORD len = strlen(string); + for (int i = 0; i < len; i++) + if (string[i] >= 'a' && string[i] <= 'z') + string[i] -= diff; + return string; +} + +char *myLower(char *string) +{ + char diff = 'a' - 'A'; + WORD len = strlen(string); + for (int i = 0; i < len; i++) + if (string[i] >= 'A' && string[i] <= 'Z') + string[i] += diff; + return string; +} + +void init() +{ + memset(&cfig, 0, sizeof(cfig)); + + GetModuleFileName(NULL, iniFile, MAX_PATH); + char *iniFileExt = strrchr(iniFile, '.'); + strcpy(iniFileExt, ".ini"); + GetModuleFileName(NULL, logFile, MAX_PATH); + iniFileExt = strrchr(logFile, '.'); + strcpy(iniFileExt, ".log"); + + char iniStr[4096]; + char name[256]; + char value[256]; + + if (verbatim) + { + cfig.logLevel = 2; + printf("%s\n\n", sVersion); + } + else if (getSection("LOGGING", iniStr, 1, iniFile)) + { + char *iniStrPtr = myGetToken(iniStr, 0); + + if (!iniStrPtr[0] || !strcasecmp(iniStrPtr, "None")) + cfig.logLevel = 0; + else if (!strcasecmp(iniStrPtr, "Errors")) + cfig.logLevel = 1; + else if (!strcasecmp(iniStrPtr, "All")) + cfig.logLevel = 2; + else if (!strcasecmp(iniStrPtr, "Debug")) + cfig.logLevel = 3; + else + cfig.logLevel = UCHAR_MAX; + } + + if (!verbatim && cfig.logLevel) + { + cfig.logfile = fopen(logFile, "wt"); + + if (cfig.logfile) + { + fclose(cfig.logfile); + cfig.logfile = fopen(logFile, "at"); + fprintf(cfig.logfile, "%s\n", sVersion); + } + } + + if (cfig.logLevel == UCHAR_MAX) + { + cfig.logLevel = 1; + sprintf(logBuff, "Section [LOGGING], Invalid Logging Level: %s, ignored", myGetToken(iniStr, 0)); + logMess(logBuff, 1); + } + + WORD wVersionRequested = MAKEWORD(1, 1); + WSAStartup(wVersionRequested, &cfig.wsaData); + + if (cfig.wsaData.wVersion != wVersionRequested) + { + sprintf(logBuff, "WSAStartup Error"); + logMess(logBuff, 1); + } + + if (getSection("LISTEN-ON", iniStr, 1, iniFile)) + { + char *iniStrPtr = myGetToken(iniStr, 0); + + for (int i = 0; i < MAX_SERVERS && iniStrPtr[0]; iniStrPtr = myGetToken(iniStrPtr, 1)) + { + strncpy(name, iniStrPtr, UCHAR_MAX); + WORD port = 69; + char *dp = strchr(name, ':'); + if (dp) + { + *dp = 0; + dp++; + port = atoi(dp); + } + + DWORD ip = my_inet_addr(name); + + if (isIP(name) && ip) + { + for (BYTE j = 0; j < MAX_SERVERS; j++) + { + if (cfig.servers[j] == ip) + break; + else if (!cfig.servers[j]) + { + cfig.servers[j] = ip; + cfig.ports[j] = port; + i++; + break; + } + } + } + else + { + sprintf(logBuff, "Warning: Section [LISTEN-ON], Invalid IP Address %s, ignored", iniStrPtr); + logMess(logBuff, 1); + } + } + } + + if (getSection("HOME", iniStr, 1, iniFile)) + { + char *iniStrPtr = myGetToken(iniStr, 0); + for (; iniStrPtr[0]; iniStrPtr = myGetToken(iniStrPtr, 1)) + { + mySplit(name, value, iniStrPtr, '='); + if (strlen(value)) + { + if (!cfig.homes[0].alias[0] && cfig.homes[0].target[0]) + { + sprintf(logBuff, "Section [HOME], alias and bare path mixup, entry %s ignored", iniStrPtr); + logMess(logBuff, 1); + } + else if (strchr(name, notFileSep) || strchr(name, fileSep) || strchr(name, '>') || strchr(name, '<') || strchr(name, '.')) + { + sprintf(logBuff, "Section [HOME], invalid chars in alias %s, entry ignored", name); + logMess(logBuff, 1); + } + else if (name[0] && strlen(name) < 64 && value[0]) + { + for (int i = 0; i < 8; i++) + { + if (cfig.homes[i].alias[0] && !strcasecmp(name, cfig.homes[i].alias)) + { + sprintf(logBuff, "Section [HOME], Duplicate Entry: %s ignored", iniStrPtr); + logMess(logBuff, 1); + break; + } + else if (!cfig.homes[i].alias[0]) + { + strcpy(cfig.homes[i].alias, name); + strcpy(cfig.homes[i].target, value); + + if (cfig.homes[i].target[strlen(cfig.homes[i].target) - 1] != fileSep) + { + tempbuff[0] = fileSep; + tempbuff[1] = 0; + strcat(cfig.homes[i].target, tempbuff); + } + + break; + } + } + } + else + { + sprintf(logBuff, "Section [HOME], alias name too large", name); + logMess(logBuff, 1); + } + } + else if (!cfig.homes[0].alias[0] && !cfig.homes[0].target[0]) + { + strcpy(cfig.homes[0].target, name); + + if (cfig.homes[0].target[strlen(cfig.homes[0].target) - 1] != fileSep) + { + tempbuff[0] = fileSep; + tempbuff[1] = 0; + strcat(cfig.homes[0].target, tempbuff); + } + } + else if (cfig.homes[0].alias[0]) + { + sprintf(logBuff, "Section [HOME], alias and bare path mixup, entry %s ignored", iniStrPtr); + logMess(logBuff, 1); + } + else if (cfig.homes[0].target[0]) + { + sprintf(logBuff, "Section [HOME], Duplicate Path: %s ignored", iniStrPtr); + logMess(logBuff, 1); + } + else + { + sprintf(logBuff, "Section [HOME], missing = sign, Invalid Entry: %s ignored", iniStrPtr); + logMess(logBuff, 1); + } + } + } + + if (!cfig.homes[0].target[0]) + { + GetModuleFileName(NULL, cfig.homes[0].target, UCHAR_MAX); + char *iniFileExt = strrchr(cfig.homes[0].target, fileSep); + *(++iniFileExt) = 0; + } + + cfig.fileRead = true; + + if (getSection("TFTP-OPTIONS", iniStr, 1, iniFile)) + { + char *iniStrPtr = myGetToken(iniStr, 0); + for (;strlen(iniStrPtr);iniStrPtr = myGetToken(iniStrPtr, 1)) + { + mySplit(name, value, iniStrPtr, '='); + if (strlen(value)) + { + if (!strcasecmp(name, "blksize")) + { + DWORD tblksize = atol(value); + + if (tblksize < 512) + blksize = 512; + else if (tblksize > USHRT_MAX - 32) + blksize = USHRT_MAX - 32; + else + blksize = tblksize; + } + else if (!strcasecmp(name, "threadpoolsize")) + { + minThreads = atol(value); + if (minThreads < 1) + minThreads = 0; + else if (minThreads > 100) + minThreads = 100; + } + else if (!strcasecmp(name, "timeout")) + { + timeout = atol(value); + if (timeout < 1) + timeout = 1; + else if (timeout > UCHAR_MAX) + timeout = UCHAR_MAX; + } + else if (!strcasecmp(name, "Read")) + { + if (strchr("Yy", *value)) + cfig.fileRead = true; + else + cfig.fileRead = false; + } + else if (!strcasecmp(name, "Write")) + { + if (strchr("Yy", *value)) + cfig.fileWrite = true; + else + cfig.fileWrite = false; + } + else if (!strcasecmp(name, "Overwrite")) + { + if (strchr("Yy", *value)) + cfig.fileOverwrite = true; + else + cfig.fileOverwrite = false; + } + else if (!strcasecmp(name, "port-range")) + { + char *ptr = strchr(value, '-'); + if (ptr) + { + *ptr = 0; + cfig.minport = atol(value); + cfig.maxport = atol(++ptr); + + if (cfig.minport < 1024 || cfig.minport >= USHRT_MAX || cfig.maxport < 1024 || cfig.maxport >= USHRT_MAX || cfig.minport > cfig.maxport) + { + cfig.minport = 0; + cfig.maxport = 0; + + sprintf(logBuff, "Invalid port range %s", value); + logMess(logBuff, 1); + } + } + else + { + sprintf(logBuff, "Invalid port range %s", value); + logMess(logBuff, 1); + } + } + else + { + sprintf(logBuff, "Warning: unknown option %s, ignored", name); + logMess(logBuff, 1); + } + } + } + } + + if (getSection("ALLOWED-CLIENTS", iniStr, 1, iniFile)) + { + char *iniStrPtr = myGetToken(iniStr, 0); + for (int i = 0; i < 32 && iniStrPtr[0]; iniStrPtr = myGetToken(iniStrPtr, 1)) + { + DWORD rs = 0; + DWORD re = 0; + mySplit(name, value, iniStrPtr, '-'); + rs = htonl(my_inet_addr(name)); + + if (strlen(value)) + re = htonl(my_inet_addr(value)); + else + re = rs; + + if (rs && rs != INADDR_NONE && re && re != INADDR_NONE && rs <= re) + { + cfig.hostRanges[i].rangeStart = rs; + cfig.hostRanges[i].rangeEnd = re; + i++; + } + else + { + sprintf(logBuff, "Section [ALLOWED-CLIENTS] Invalid entry %s in ini file, ignored", iniStrPtr); + logMess(logBuff, 1); + } + } + } + +// if (!cfig.servers[0]) +// getServ(); + + int i = 0; + + for (int j = 0; j < MAX_SERVERS; j++) + { + if (j && !cfig.servers[j]) + break; + + cfig.tftpConn[i].sock = socket(PF_INET, + SOCK_DGRAM, + IPPROTO_UDP); + + if (cfig.tftpConn[i].sock == INVALID_SOCKET) + { + sprintf(logBuff, "Failed to Create Socket"); + logMess(logBuff, 1); + continue; + } + + cfig.tftpConn[i].addr.sin_family = AF_INET; + + if (!cfig.ports[j]) + cfig.ports[j] = 69; + + cfig.tftpConn[i].addr.sin_addr.s_addr = cfig.servers[j]; + cfig.tftpConn[i].addr.sin_port = htons(cfig.ports[j]); + + socklen_t nRet = bind(cfig.tftpConn[i].sock, + (sockaddr*)&cfig.tftpConn[i].addr, + sizeof(struct sockaddr_in) + ); + + if (nRet == SOCKET_ERROR) + { + closesocket(cfig.tftpConn[i].sock); + sprintf(logBuff, "%s Port %u, bind failed", IP2String(tempbuff, cfig.servers[j]), cfig.ports[j]); + logMess(logBuff, 1); + continue; + } + + if (cfig.maxFD < cfig.tftpConn[i].sock) + cfig.maxFD = cfig.tftpConn[i].sock; + + cfig.tftpConn[i].server = cfig.tftpConn[i].addr.sin_addr.s_addr; + cfig.tftpConn[i].port = htons(cfig.tftpConn[i].addr.sin_port); + i++; + } + + cfig.maxFD++; + + if (!cfig.tftpConn[0].port) + { + sprintf(logBuff, "no listening interfaces available, stopping..\nPress Enter to exit\n"); + logMess(logBuff, 1); + getchar(); + exit(-1); + } + else if (verbatim) + { + printf("starting TFTP...\n"); + } + else + { + sprintf(logBuff, "starting TFTP service"); + logMess(logBuff, 1); + } + + for (int i = 0; i < MAX_SERVERS; i++) + if (cfig.homes[i].target[0]) + { + sprintf(logBuff, "alias /%s is mapped to %s", cfig.homes[i].alias, cfig.homes[i].target); + logMess(logBuff, 1); + } + + if (cfig.hostRanges[0].rangeStart) + { + char temp[128]; + + for (WORD i = 0; i <= sizeof(cfig.hostRanges) && cfig.hostRanges[i].rangeStart; i++) + { + sprintf(logBuff, "%s", "permitted clients: "); + sprintf(temp, "%s-", IP2String(tempbuff, htonl(cfig.hostRanges[i].rangeStart))); + strcat(logBuff, temp); + sprintf(temp, "%s", IP2String(tempbuff, htonl(cfig.hostRanges[i].rangeEnd))); + strcat(logBuff, temp); + logMess(logBuff, 1); + } + } + else + { + sprintf(logBuff, "%s", "permitted clients: all"); + logMess(logBuff, 1); + } + + if (cfig.minport) + { + sprintf(logBuff, "server port range: %u-%u", cfig.minport, cfig.maxport); + logMess(logBuff, 1); + } + else + { + sprintf(logBuff, "server port range: all"); + logMess(logBuff, 1); + } + + sprintf(logBuff, "max blksize: %u", blksize); + logMess(logBuff, 1); + sprintf(logBuff, "default blksize: %u", 512); + logMess(logBuff, 1); + sprintf(logBuff, "default timeout: %u", timeout); + logMess(logBuff, 1); + sprintf(logBuff, "file read allowed: %s", cfig.fileRead ? "Yes" : "No"); + logMess(logBuff, 1); + sprintf(logBuff, "file create allowed: %s", cfig.fileWrite ? "Yes" : "No"); + logMess(logBuff, 1); + sprintf(logBuff, "file overwrite allowed: %s", cfig.fileOverwrite ? "Yes" : "No"); + logMess(logBuff, 1); + + if (!verbatim) + { + sprintf(logBuff, "logging: %s", cfig.logLevel > 1 ? "all" : "errors"); + logMess(logBuff, 1); + } + + lEvent = CreateEvent( + NULL, // default security descriptor + FALSE, // ManualReset + TRUE, // Signalled + TEXT("AchalTFTServerLogEvent")); // object name + + if (lEvent == NULL) + { + printf("CreateEvent error: %d\n", GetLastError()); + exit(-1); + } + else if ( GetLastError() == ERROR_ALREADY_EXISTS ) + { + sprintf(logBuff, "CreateEvent opened an existing Event\nServer May already be Running"); + logMess(logBuff, 0); + exit(-1); + } + + tEvent = CreateEvent( + NULL, // default security descriptor + FALSE, // ManualReset + FALSE, // Signalled + TEXT("AchalTFTServerThreadEvent")); // object name + + if (tEvent == NULL) + { + printf("CreateEvent error: %d\n", GetLastError()); + exit(-1); + } + else if ( GetLastError() == ERROR_ALREADY_EXISTS ) + { + sprintf(logBuff, "CreateEvent opened an existing Event\nServer May already be Running"); + logMess(logBuff, 0); + exit(-1); + } + + sEvent = CreateEvent( + NULL, // default security descriptor + FALSE, // ManualReset + TRUE, // Signalled + TEXT("AchalTFTServerSocketEvent")); // object name + + if (sEvent == NULL) + { + printf("CreateEvent error: %d\n", GetLastError()); + exit(-1); + } + else if ( GetLastError() == ERROR_ALREADY_EXISTS ) + { + sprintf(logBuff, "CreateEvent opened an existing Event\nServer May already be Running"); + logMess(logBuff, 0); + exit(-1); + } + + cEvent = CreateEvent( + NULL, // default security descriptor + FALSE, // ManualReset + TRUE, // Signalled + TEXT("AchalTFTServerCountEvent")); // object name + + if (cEvent == NULL) + { + printf("CreateEvent error: %d\n", GetLastError()); + exit(-1); + } + else if ( GetLastError() == ERROR_ALREADY_EXISTS ) + { + sprintf(logBuff, "CreateEvent opened an existing Event\nServer May already be Running"); + logMess(logBuff, 0); + exit(-1); + } + + if (minThreads) + { + for (int i = 0; i < minThreads; i++) + { + _beginthread( + processRequest, // thread function + 0, // default security attributes + NULL); // argument to thread function + } + + sprintf(logBuff, "thread pool size: %u", minThreads); + logMess(logBuff, 1); + } + + for (int i = 0; i < MAX_SERVERS && cfig.tftpConn[i].port; i++) + { + sprintf(logBuff, "listening on: %s:%i", IP2String(tempbuff, cfig.tftpConn[i].server), cfig.tftpConn[i].port); + logMess(logBuff, 1); + } +} + +void logMess(char *logBuff, BYTE logLevel) +{ + WaitForSingleObject(lEvent, INFINITE); + + char tempbuff[256]; + + if (verbatim) + printf("%s\n", logBuff); + else if (cfig.logfile && logLevel <= cfig.logLevel) + { + char currentTime[32]; + time_t t = time(NULL); + tm *ttm = localtime(&t); + strftime(currentTime, sizeof(currentTime), "%d-%b-%y %X", ttm); + fprintf(cfig.logfile, "[%s] %s\n", currentTime, logBuff); + fflush(cfig.logfile); + } + SetEvent(lEvent); +} + +void logMess(request *req, BYTE logLevel) +{ + WaitForSingleObject(lEvent, INFINITE); + + char tempbuff[256]; + + if (verbatim) + { + if (!req->serverError.errormessage[0]) + sprintf(req->serverError.errormessage, strerror(errno)); + + if (req->path[0]) + printf("Client %s:%u %s, %s\n", IP2String(tempbuff, req->client.sin_addr.s_addr), ntohs(req->client.sin_port), req->path, req->serverError.errormessage); + else + printf("Client %s:%u, %s\n", IP2String(tempbuff, req->client.sin_addr.s_addr), ntohs(req->client.sin_port), req->serverError.errormessage); + } + else if (cfig.logfile && logLevel <= cfig.logLevel) + { + char currentTime[32]; + time_t t = time(NULL); + tm *ttm = localtime(&t); + strftime(currentTime, sizeof(currentTime), "%d-%b-%y %X", ttm); + + if (req->path[0]) + fprintf(cfig.logfile, "[%s] Client %s:%u %s, %s\n", currentTime, IP2String(tempbuff, req->client.sin_addr.s_addr), ntohs(req->client.sin_port), req->path, req->serverError.errormessage); + else + fprintf(cfig.logfile, "[%s] Client %s:%u, %s\n", currentTime, IP2String(tempbuff, req->client.sin_addr.s_addr), ntohs(req->client.sin_port), req->serverError.errormessage); + + fflush(cfig.logfile); + } + SetEvent(lEvent); +} Propchange: trunk/reactos/base/services/tftpd/tftpd.cpp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/services/tftpd/tftpd.cpp ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: trunk/reactos/base/services/tftpd/tftpd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/tftpd/tftpd.… ============================================================================== --- trunk/reactos/base/services/tftpd/tftpd.h (added) +++ trunk/reactos/base/services/tftpd/tftpd.h [iso-8859-1] Thu May 14 18:52:22 2009 @@ -1,0 +1,161 @@ +/************************************************************************** +* Copyright (C) 2005 by Achal Dhir * +* achaldhir(a)gmail.com * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program; if not, write to the * +* Free Software Foundation, Inc., * +* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * +***************************************************************************/ +// TFTPServer.cpp + +#ifdef _MSC_VER + #define strcasecmp _stricmp + #define _CRT_SECURE_NO_WARNINGS + #pragma comment(lib, "ws2_32.lib") + #pragma comment(lib, "iphlpapi.lib") +#endif + +//Constants +#define my_inet_addr inet_addr +#define MAX_SERVERS 8 + +//Structs +struct home +{ + char alias[64]; + char target[256]; +}; + +struct tftpConnType +{ + SOCKET sock; + sockaddr_in addr; + DWORD server; + WORD port; +}; + +struct acknowledgement +{ + WORD opcode; + WORD block; +}; + +struct message +{ + WORD opcode; + char buffer[514]; +}; + +struct tftperror +{ + WORD opcode; + WORD errorcode; + char errormessage[512]; +}; + +struct packet +{ + WORD opcode; + WORD block; + char buffer; +}; + +struct data12 +{ + DWORD rangeStart; + DWORD rangeEnd; +}; + +struct request +{ + timeval tv; + fd_set readfds; + time_t expiry; + SOCKET sock; + SOCKET knock; + BYTE sockInd; + BYTE attempt; + char path[256]; + FILE *file; + char *filename; + char *mode; + char *alias; + DWORD tsize; + DWORD fblock; + int bytesReady; + int bytesRecd; + int bytesRead[2]; + packet* pkt[2]; + sockaddr_in client; + socklen_t clientsize; + union + { + tftperror serverError; + message mesout; + acknowledgement acout; + }; + union + { + tftperror clientError; + message mesin; + acknowledgement acin; + }; + WORD blksize; + WORD timeout; + WORD block; + WORD tblock; +}; + +struct data2 +{ + WSADATA wsaData; + tftpConnType tftpConn[MAX_SERVERS]; + DWORD servers[MAX_SERVERS]; + WORD ports[MAX_SERVERS]; + home homes[8]; + FILE *logfile; + data12 hostRanges[32]; + char fileRead; + char fileWrite; + char fileOverwrite; + int minport; + int maxport; + SOCKET maxFD; + BYTE logLevel; +}; + +struct data15 +{ + union + { + //DWORD ip; + unsigned ip:32; + BYTE octate[4]; + }; +}; + +//Functions +void runProg(); +void processRequest(LPVOID lpParam); +char* myGetToken(char*, BYTE); +void init(); +bool cleanReq(request*); +bool getSection(char*, char*, BYTE, char*); +bool isIP(char*s); +char* myLower(char*); +char* myUpper(char*); +char* IP2String(char*, DWORD); +void printWindowsError(); +void logMess(request*, BYTE); +void logMess(char*, BYTE); Propchange: trunk/reactos/base/services/tftpd/tftpd.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/services/tftpd/tftpd.h ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: trunk/reactos/base/services/tftpd/tftpd.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/tftpd/tftpd.… ============================================================================== --- trunk/reactos/base/services/tftpd/tftpd.rbuild (added) +++ trunk/reactos/base/services/tftpd/tftpd.rbuild [iso-8859-1] Thu May 14 18:52:22 2009 @@ -1,0 +1,12 @@ +<module name="tftpd" type="win32cui" installbase="system32" installname="tftpd.exe" allowwarnings="true" unicode="no"> + <include base="reactos"></include> + <include base="telnetd">..</include> + + <library>ntdll</library> + <library>kernel32</library> + <library>advapi32</library> + <library>ws2_32</library> + <library>wine</library> + + <file>tftpd.cpp</file> +</module> Propchange: trunk/reactos/base/services/tftpd/tftpd.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/services/tftpd/tftpd.rbuild ------------------------------------------------------------------------------ svn:mime-type = text/plain

1 0

[dchapyshev] 40918: - Add Russian translation - Small cleanup
by dchapyshev＠svn.reactos.org 14 May '09

14 May '09

Author: dchapyshev Date: Thu May 14 13:00:03 2009 New Revision: 40918 URL: http://svn.reactos.org/svn/reactos?rev=40918&view=rev Log: - Add Russian translation - Small cleanup Added: trunk/reactos/base/applications/paint/lang/ru-RU.rc (with props) Modified: trunk/reactos/base/applications/paint/lang/cs-CZ.rc trunk/reactos/base/applications/paint/lang/de-DE.rc trunk/reactos/base/applications/paint/lang/en-GB.rc trunk/reactos/base/applications/paint/lang/en-US.rc trunk/reactos/base/applications/paint/lang/es-ES.rc trunk/reactos/base/applications/paint/lang/fr-FR.rc trunk/reactos/base/applications/paint/lang/it-IT.rc trunk/reactos/base/applications/paint/lang/no-NO.rc trunk/reactos/base/applications/paint/lang/pt-BR.rc trunk/reactos/base/applications/paint/lang/pt-PT.rc trunk/reactos/base/applications/paint/lang/sk-SK.rc trunk/reactos/base/applications/paint/lang/uk-UA.rc trunk/reactos/base/applications/paint/rsrc.rc Modified: trunk/reactos/base/applications/paint/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la… ============================================================================== --- trunk/reactos/base/applications/paint/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/lang/cs-CZ.rc [iso-8859-1] Thu May 14 13:00:03 2009 @@ -81,8 +81,6 @@ END END -LANGUAGE LANG_CZECH, SUBLANG_DEFAULT - ID_ACCELERATORS ACCELERATORS BEGIN "^N", IDM_FILENEW @@ -105,8 +103,6 @@ "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY END -LANGUAGE LANG_CZECH, SUBLANG_DEFAULT - IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" @@ -122,8 +118,6 @@ DEFPUSHBUTTON "OK", IDOK, 125, 8, 48, 14 PUSHBUTTON "Storno", IDCANCEL, 125, 24, 48, 14 END - -LANGUAGE LANG_CZECH, SUBLANG_DEFAULT IDD_ATTRIBUTES DIALOGEX 100, 100, 210, 120 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU @@ -151,8 +145,6 @@ PUSHBUTTON "Storno", IDCANCEL, 155, 24, 48, 14 PUSHBUTTON "Výchozí", IDD_ATTRIBUTESSTANDARD, 155, 40, 48, 14 END - -LANGUAGE LANG_CZECH, SUBLANG_DEFAULT IDD_CHANGESIZE DIALOGEX 100, 100, 210, 80 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU Modified: trunk/reactos/base/applications/paint/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la… ============================================================================== --- trunk/reactos/base/applications/paint/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/lang/de-DE.rc [iso-8859-1] Thu May 14 13:00:03 2009 @@ -81,8 +81,6 @@ END END -LANGUAGE LANG_GERMAN, SUBLANG_GERMAN - ID_ACCELERATORS ACCELERATORS BEGIN "^N", IDM_FILENEW @@ -105,8 +103,6 @@ "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY END -LANGUAGE LANG_GERMAN, SUBLANG_GERMAN - IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" @@ -122,8 +118,6 @@ DEFPUSHBUTTON "OK", IDOK, 125, 8, 48, 14 PUSHBUTTON "Abbrechen", IDCANCEL, 125, 24, 48, 14 END - -LANGUAGE LANG_GERMAN, SUBLANG_GERMAN IDD_ATTRIBUTES DIALOGEX 100, 100, 210, 120 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU @@ -151,8 +145,6 @@ PUSHBUTTON "Abbrechen", IDCANCEL, 155, 24, 48, 14 PUSHBUTTON "Standard", IDD_ATTRIBUTESSTANDARD, 155, 40, 48, 14 END - -LANGUAGE LANG_GERMAN, SUBLANG_GERMAN IDD_CHANGESIZE DIALOGEX 100, 100, 210, 80 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU Modified: trunk/reactos/base/applications/paint/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la… ============================================================================== --- trunk/reactos/base/applications/paint/lang/en-GB.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/lang/en-GB.rc [iso-8859-1] Thu May 14 13:00:03 2009 @@ -81,8 +81,6 @@ END END -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK - ID_ACCELERATORS ACCELERATORS BEGIN "^N", IDM_FILENEW @@ -105,8 +103,6 @@ "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY END -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK - IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" @@ -122,8 +118,6 @@ DEFPUSHBUTTON "OK", IDOK, 125, 8, 48, 14 PUSHBUTTON "Cancel", IDCANCEL, 125, 24, 48, 14 END - -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK IDD_ATTRIBUTES DIALOGEX 100, 100, 210, 120 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU @@ -151,8 +145,6 @@ PUSHBUTTON "Cancel", IDCANCEL, 155, 24, 48, 14 PUSHBUTTON "Standard", IDD_ATTRIBUTESSTANDARD, 155, 40, 48, 14 END - -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK IDD_CHANGESIZE DIALOGEX 100, 100, 210, 80 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU Modified: trunk/reactos/base/applications/paint/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la… ============================================================================== --- trunk/reactos/base/applications/paint/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/lang/en-US.rc [iso-8859-1] Thu May 14 13:00:03 2009 @@ -81,8 +81,6 @@ END END -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US - ID_ACCELERATORS ACCELERATORS BEGIN "^N", IDM_FILENEW @@ -105,8 +103,6 @@ "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY END -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US - IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" @@ -122,8 +118,6 @@ DEFPUSHBUTTON "OK", IDOK, 125, 8, 48, 14 PUSHBUTTON "Cancel", IDCANCEL, 125, 24, 48, 14 END - -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US IDD_ATTRIBUTES DIALOGEX 100, 100, 210, 120 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU @@ -151,8 +145,6 @@ PUSHBUTTON "Cancel", IDCANCEL, 155, 24, 48, 14 PUSHBUTTON "Default", IDD_ATTRIBUTESSTANDARD, 155, 40, 48, 14 END - -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US IDD_CHANGESIZE DIALOGEX 100, 100, 210, 80 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU Modified: trunk/reactos/base/applications/paint/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la… ============================================================================== --- trunk/reactos/base/applications/paint/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/lang/es-ES.rc [iso-8859-1] Thu May 14 13:00:03 2009 @@ -81,8 +81,6 @@ END END -LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL - ID_ACCELERATORS ACCELERATORS BEGIN "^N", IDM_FILENEW @@ -105,8 +103,6 @@ "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY END -LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL - IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" @@ -122,8 +118,6 @@ DEFPUSHBUTTON "Aceptar", IDOK, 125, 8, 48, 14 PUSHBUTTON "Cancelar", IDCANCEL, 125, 24, 48, 14 END - -LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL IDD_ATTRIBUTES DIALOGEX 100, 100, 210, 120 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU @@ -151,8 +145,6 @@ PUSHBUTTON "Cancelar", IDCANCEL, 155, 24, 48, 14 PUSHBUTTON "Predefinido", IDD_ATTRIBUTESSTANDARD, 155, 40, 48, 14 END - -LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL IDD_CHANGESIZE DIALOGEX 100, 100, 210, 80 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU Modified: trunk/reactos/base/applications/paint/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la… ============================================================================== --- trunk/reactos/base/applications/paint/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/lang/fr-FR.rc [iso-8859-1] Thu May 14 13:00:03 2009 @@ -81,8 +81,6 @@ END END -LANGUAGE LANG_FRENCH, SUBLANG_FRENCH - ID_ACCELERATORS ACCELERATORS BEGIN "^N", IDM_FILENEW @@ -105,8 +103,6 @@ "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY END -LANGUAGE LANG_FRENCH, SUBLANG_FRENCH - IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" @@ -122,8 +118,6 @@ DEFPUSHBUTTON "OK", IDOK, 125, 8, 48, 14 PUSHBUTTON "Annuler", IDCANCEL, 125, 24, 48, 14 END - -LANGUAGE LANG_FRENCH, SUBLANG_FRENCH IDD_ATTRIBUTES DIALOGEX 100, 100, 210, 120 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU @@ -151,8 +145,6 @@ PUSHBUTTON "Annuler", IDCANCEL, 155, 24, 48, 14 PUSHBUTTON "Par défaut", IDD_ATTRIBUTESSTANDARD, 155, 40, 48, 14 END - -LANGUAGE LANG_FRENCH, SUBLANG_FRENCH IDD_CHANGESIZE DIALOGEX 100, 100, 210, 80 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU Modified: trunk/reactos/base/applications/paint/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la… ============================================================================== --- trunk/reactos/base/applications/paint/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/lang/it-IT.rc [iso-8859-1] Thu May 14 13:00:03 2009 @@ -81,8 +81,6 @@ END END -LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL - ID_ACCELERATORS ACCELERATORS BEGIN "^N", IDM_FILENEW @@ -105,8 +103,6 @@ "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY END -LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL - IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" @@ -122,8 +118,6 @@ DEFPUSHBUTTON "OK", IDOK, 125, 8, 48, 14 PUSHBUTTON "Annulla", IDCANCEL, 125, 24, 48, 14 END - -LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL IDD_ATTRIBUTES DIALOGEX 100, 100, 210, 120 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU @@ -151,8 +145,6 @@ PUSHBUTTON "Annulla", IDCANCEL, 155, 24, 48, 14 PUSHBUTTON "Predefiniti", IDD_ATTRIBUTESSTANDARD, 155, 40, 48, 14 END - -LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL IDD_CHANGESIZE DIALOGEX 100, 100, 210, 80 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU Modified: trunk/reactos/base/applications/paint/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la… ============================================================================== --- trunk/reactos/base/applications/paint/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/lang/no-NO.rc [iso-8859-1] Thu May 14 13:00:03 2009 @@ -81,8 +81,6 @@ END END -LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL - ID_ACCELERATORS ACCELERATORS BEGIN "^N", IDM_FILENEW @@ -105,8 +103,6 @@ "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY END -LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL - IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" @@ -122,8 +118,6 @@ DEFPUSHBUTTON "OK", IDOK, 125, 8, 48, 14 PUSHBUTTON "Avbryt", IDCANCEL, 125, 24, 48, 14 END - -LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL IDD_ATTRIBUTES DIALOGEX 100, 100, 210, 120 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU @@ -151,8 +145,6 @@ PUSHBUTTON "Avbryt", IDCANCEL, 155, 24, 48, 14 PUSHBUTTON "Standard", IDD_ATTRIBUTESSTANDARD, 155, 40, 48, 14 END - -LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL IDD_CHANGESIZE DIALOGEX 100, 100, 210, 80 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU Modified: trunk/reactos/base/applications/paint/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la… ============================================================================== --- trunk/reactos/base/applications/paint/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/lang/pt-BR.rc [iso-8859-1] Thu May 14 13:00:03 2009 @@ -81,8 +81,6 @@ END END -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN - ID_ACCELERATORS ACCELERATORS BEGIN "^N", IDM_FILENEW @@ -105,8 +103,6 @@ "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY END -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN - IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" @@ -122,8 +118,6 @@ DEFPUSHBUTTON "OK", IDOK, 125, 8, 48, 14 PUSHBUTTON "Cancelar", IDCANCEL, 125, 24, 48, 14 END - -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN IDD_ATTRIBUTES DIALOGEX 100, 100, 210, 120 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU @@ -151,8 +145,6 @@ PUSHBUTTON "Cancelar", IDCANCEL, 155, 24, 48, 14 PUSHBUTTON "&Padrão", IDD_ATTRIBUTESSTANDARD, 155, 40, 48, 14 END - -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN IDD_CHANGESIZE DIALOGEX 100, 100, 210, 80 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU Modified: trunk/reactos/base/applications/paint/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la… ============================================================================== --- trunk/reactos/base/applications/paint/lang/pt-PT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/lang/pt-PT.rc [iso-8859-1] Thu May 14 13:00:03 2009 @@ -81,8 +81,6 @@ END END -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE - ID_ACCELERATORS ACCELERATORS BEGIN "^O", IDM_FILENEW @@ -105,8 +103,6 @@ "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY END -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE - IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" @@ -122,8 +118,6 @@ DEFPUSHBUTTON "OK", IDOK, 125, 8, 48, 14 PUSHBUTTON "Cancelar", IDCANCEL, 125, 24, 48, 14 END - -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE IDD_ATTRIBUTES DIALOGEX 100, 100, 210, 120 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU @@ -151,8 +145,6 @@ PUSHBUTTON "Cancelar", IDCANCEL, 155, 24, 48, 14 PUSHBUTTON "&Predefinição", IDD_ATTRIBUTESSTANDARD, 155, 40, 48, 14 END - -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE IDD_CHANGESIZE DIALOGEX 100, 100, 210, 80 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU Added: trunk/reactos/base/applications/paint/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la… ============================================================================== --- trunk/reactos/base/applications/paint/lang/ru-RU.rc (added) +++ trunk/reactos/base/applications/paint/lang/ru-RU.rc [iso-8859-1] Thu May 14 13:00:03 2009 @@ -1,0 +1,188 @@ +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +ID_MENU MENU +BEGIN + POPUP "&Ôàéë" + BEGIN + MENUITEM "Ñîçä&àòü\tCtrl+N", IDM_FILENEW + MENUITEM "&Îòêðûòü...\tCtrl+O", IDM_FILEOPEN + MENUITEM "&Ñîõðàíèòü\tCtrl+S", IDM_FILESAVE + MENUITEM "Ñîõðàíèòü &êàê...", IDM_FILESAVEAS + MENUITEM SEPARATOR + MENUITEM "Ñäåëàòü ôîíîâûì ðèñóíêîì (&çàìîñòèòü)", IDM_FILEASWALLPAPERPLANE + MENUITEM "Ñäåëàòü ôîíîâûì ðèñóíêîì (ïî ö&åíòðó)", IDM_FILEASWALLPAPERCENTERED + MENUITEM "Ñäåëàòü ôîíîâûì ðèñóíêîì (ðàñò&ÿíóòü)", IDM_FILEASWALLPAPERSTRETCHED + MENUITEM SEPARATOR + MENUITEM "Â&ûõîä\tAlt+F4", IDM_FILEEXIT + END + + POPUP "&Ïðàâêà" + BEGIN + MENUITEM "&Îòìåíèòü\tCtrl+Z", IDM_EDITUNDO + MENUITEM "Ïîâ&òîðèòü\tCtrl+Y", IDM_EDITREDO + MENUITEM SEPARATOR + MENUITEM "&Âûðåçàòü\tCtrl+X", IDM_EDITCUT + MENUITEM "&Êîïèðîâàòü\tCtrl+C", IDM_EDITCOPY + MENUITEM "Âñò&àâèòü\tCtrl+V", IDM_EDITPASTE + MENUITEM "Î&÷èñòèòü âûäåëåíèå\tDel", IDM_EDITDELETESELECTION + MENUITEM "Îáðàòèòü â&ûäåëåíèå", IDM_EDITINVERTSELECTION + MENUITEM "Âûäåëèòü â&ñå\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "Êîïèðîâàò&ü â ôàéë...", IDM_EDITCOPYTO + MENUITEM "Âñòàâèòü èç &ôàéëà...", IDM_EDITPASTEFROM + END + + POPUP "&Âèä" + BEGIN + MENUITEM "Íàáîð &èíñòðóìåíòîâ\tCtrl+T", IDM_VIEWTOOLBOX, CHECKED + MENUITEM "Ïà&ëèòðà\tCtrl+L", IDM_VIEWCOLORPALETTE, CHECKED + MENUITEM "&Ñòðîêà ñîñòîÿíèÿ", IDM_VIEWSTATUSBAR, CHECKED + MENUITEM "Ïàíåëü &àòðèáóòîâ òåêñòà", IDM_FORMATICONBAR, CHECKED, GRAYED + MENUITEM SEPARATOR + POPUP "Ìàñ&øòàá" + BEGIN + MENUITEM "12,5%", IDM_VIEWZOOM125 + MENUITEM "25%", IDM_VIEWZOOM25 + MENUITEM "50%", IDM_VIEWZOOM50 + MENUITEM "100%", IDM_VIEWZOOM100 + MENUITEM "200%", IDM_VIEWZOOM200 + MENUITEM "400%", IDM_VIEWZOOM400 + MENUITEM "800%", IDM_VIEWZOOM800 + END + MENUITEM "Ïîëíûé ýêðàí\tCtrl+F", IDM_VIEWFULLSCREEN + END + + POPUP "&Ðèñóíîê" + BEGIN + MENUITEM "&Îòðàçèòü/ïîâåðíóòü...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Èçìåíèòü ðàçìåð...\tCtrl+W", IDM_IMAGECHANGESIZE + MENUITEM "Îáðå&çàòü", IDM_IMAGECROP + MENUITEM "Î&áðàòèòü öâåòà\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Àòðèáóòû...\tCtrl+E", IDM_IMAGEATTRIBUTES + MENUITEM "Î&÷èñòèòü\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "&Íåïðîçðà÷íûé ôîí", IDM_IMAGEDRAWOPAQUE + END + + POPUP "Ï&àëèòðà" + BEGIN + MENUITEM "&Èçìåíèòü ïàëèòðó...", IDM_COLORSEDITPALETTE + END + + POPUP "&?" + BEGIN + MENUITEM "&Âûçîâ ñïðàâêè", IDM_HELPHELPTOPICS + MENUITEM SEPARATOR + MENUITEM "&Î ïðîãðàììå...", IDM_HELPINFO + END +END + +ID_ACCELERATORS ACCELERATORS +BEGIN + "^N", IDM_FILENEW + "^O", IDM_FILEOPEN + "^S", IDM_FILESAVE + "^Z", IDM_EDITUNDO + "^Y", IDM_EDITREDO + "^X", IDM_EDITCUT + "^C", IDM_EDITCOPY + "^V", IDM_EDITPASTE + VK_DELETE, IDM_EDITDELETESELECTION, VIRTKEY + "^A", IDM_EDITSELECTALL + "^T", IDM_VIEWTOOLBOX + "^L", IDM_VIEWCOLORPALETTE + "^F", IDM_VIEWFULLSCREEN + "^R", IDM_IMAGEROTATEMIRROR + "^W", IDM_IMAGECHANGESIZE + "^I", IDM_IMAGEINVERTCOLORS + "^E", IDM_IMAGEATTRIBUTES + "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY +END + +IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Îòðàæåíèå è ïîâîðîò" +BEGIN + GROUPBOX "Äåéñòâèå", IDD_MIRRORROTATEGROUP, 6, 6, 112, 86 + AUTORADIOBUTTON "Îòðàçèòü ñëåâà íàïðàâî", IDD_MIRRORROTATERB1, 12, 18, 100, 10, WS_GROUP + AUTORADIOBUTTON "Îòðàçèòü ñâåðõó âíèç", IDD_MIRRORROTATERB2, 12, 30, 100, 10 + AUTORADIOBUTTON "Ïîâåðíóòü íà óãîë", IDD_MIRRORROTATERB3, 12, 42, 100, 10 + AUTORADIOBUTTON "90°", IDD_MIRRORROTATERB4, 42, 54, 50, 10, WS_GROUP | WS_DISABLED + AUTORADIOBUTTON "180°", IDD_MIRRORROTATERB5, 42, 66, 50, 10, WS_DISABLED + AUTORADIOBUTTON "270°", IDD_MIRRORROTATERB6, 42, 78, 50, 10, WS_DISABLED + DEFPUSHBUTTON "OK", IDOK, 125, 8, 48, 14 + PUSHBUTTON "Îòìåíà", IDCANCEL, 125, 24, 48, 14 +END + +IDD_ATTRIBUTES DIALOGEX 100, 100, 210, 120 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Àòðèáóòû" +BEGIN + EDITTEXT IDD_ATTRIBUTESEDIT1, 40, 40, 35, 12 + EDITTEXT IDD_ATTRIBUTESEDIT2, 110, 40, 35, 12 + LTEXT "Øèðèíà:", IDD_ATTRIBUTESTEXT1, 10, 42, 30, 10 + LTEXT "Âûñîòà:", IDD_ATTRIBUTESTEXT2, 80, 42, 30, 10 + LTEXT "Äàòà ñîõðàíåíèÿ:", IDD_ATTRIBUTESTEXT3, 10, 5, 60, 10 + LTEXT "Ðàçìåð íà äèñêå:", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10 + LTEXT "Ðàçðåøåíèå:", IDD_ATTRIBUTESTEXT5, 10, 25, 60, 10 + LTEXT "íå äîñòóïíî", IDD_ATTRIBUTESTEXT6, 70, 5, 60, 10 + LTEXT "íå äîñòóïíî", IDD_ATTRIBUTESTEXT7, 70, 15, 60, 10 + LTEXT "íå äîñòóïíî", IDD_ATTRIBUTESTEXT8, 70, 25, 60, 10 + GROUPBOX "Åäèíèöû èçìåðåíèÿ", IDD_ATTRIBUTESGROUP1, 6, 57, 139, 27 + AUTORADIOBUTTON "ä&þéìû", IDD_ATTRIBUTESRB1, 12, 69, 35, 10, WS_GROUP + AUTORADIOBUTTON "ñ&ì", IDD_ATTRIBUTESRB2, 52, 69, 35, 10 + AUTORADIOBUTTON "ò&î÷êè", IDD_ATTRIBUTESRB3, 92, 69, 35, 10 + GROUPBOX "Ïàëèòðà", IDD_ATTRIBUTESGROUP2, 6, 88, 139, 27 + AUTORADIOBUTTON "÷åðíî-áåëàÿ", IDD_ATTRIBUTESRB4, 12, 100, 70, 10, WS_GROUP + AUTORADIOBUTTON "öâåòíàÿ", IDD_ATTRIBUTESRB5, 92, 100, 45, 10 + DEFPUSHBUTTON "OK", IDOK, 150, 8, 57, 14 + PUSHBUTTON "Îòìåíà", IDCANCEL, 150, 24, 57, 14 + PUSHBUTTON "Ïî óìî&ë÷àíèþ", IDD_ATTRIBUTESSTANDARD, 150, 40, 57, 14 +END + +IDD_CHANGESIZE DIALOGEX 100, 100, 210, 80 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Èçìåíåíèå ðàçìåðîâ" +BEGIN + GROUPBOX "Ðàçìåð", IDD_CHANGESIZEGROUP, 6, 6, 145, 66 + ICON IDI_HORZSTRETCH, IDD_CHANGESIZEICON1, 12, 18 + LTEXT "Ïî ãîðèçîíòàëè:", IDD_CHANGESIZETEXT1, 39, 24, 62, 10 + EDITTEXT IDD_CHANGESIZEEDIT1, 102, 23, 32, 12 + LTEXT "%", IDD_CHANGESIZETEXT2, 137, 24, 12, 10 + ICON IDI_VERTSTRETCH, IDD_CHANGESIZEICON2, 12, 43 + LTEXT "Ïî âåðòèêàëè:", IDD_CHANGESIZETEXT3, 39, 49, 62, 10 + EDITTEXT IDD_CHANGESIZEEDIT2, 102, 48, 32, 12 + LTEXT "%", IDD_CHANGESIZETEXT4, 137, 49, 12, 10 + DEFPUSHBUTTON "OK", IDOK, 155, 8, 48, 14 + PUSHBUTTON "Îòìåíà", IDCANCEL, 155, 24, 48, 14 +END + +STRINGTABLE +BEGIN + IDS_PROGRAMNAME, "Paint" + IDS_WINDOWTITLE, "%s - Paint" + IDS_INFOTITLE, "Paint äëÿ ReactOS" + IDS_INFOTEXT, "Paint äëÿ ReactOS ðàñïðîñòðàíÿåòñÿ ïîä ëèöåíçèåé GNU Lesser General Public License (LGPL) âåðñèè 3 (see www.gnu.org)" + IDS_SAVEPROMPTTEXT, "Ñîõðàíèòü èçìåíåíèÿ â %s?" + IDS_DEFAULTFILENAME, "Áåç_èìåíè.bmp" + IDS_TOOLTIP1, "Âûäåëåíèå ïðîèçâîëüíîé îáëàñòè" + IDS_TOOLTIP2, "Âûäåëåíèå" + IDS_TOOLTIP3, "Ëàñòèê" + IDS_TOOLTIP4, "Çàëèâêà" + IDS_TOOLTIP5, "Âûáðàòü öâåò" + IDS_TOOLTIP6, "Ìàñøòàá" + IDS_TOOLTIP7, "Êàðàíäàø" + IDS_TOOLTIP8, "Êèñòü" + IDS_TOOLTIP9, "Ðàñïûëèòåëü" + IDS_TOOLTIP10, "Òåêñò" + IDS_TOOLTIP11, "Ëèíèÿ" + IDS_TOOLTIP12, "Êðèâàÿ" + IDS_TOOLTIP13, "Ïðÿìîóãîëüíèê" + IDS_TOOLTIP14, "Ìíîãîóãîëüíèê" + IDS_TOOLTIP15, "Ýëëèïñ" + IDS_TOOLTIP16, "Ñêðóãëåííûé ïðÿìîóãîëüíèê" + IDS_OPENFILTER, "Òî÷å÷íûå ðèñóíêè (*.bmp;*.dib)\1*.bmp;*.dib\1Âñå ôàéëû (*.*)\1*.*\1" + IDS_SAVEFILTER, "24-ðàçðÿäíûé ðèñóíîê (*.bmp;*.dib)\1*.bmp;*.dib\1" +END Propchange: trunk/reactos/base/applications/paint/lang/ru-RU.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/paint/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la… ============================================================================== --- trunk/reactos/base/applications/paint/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/lang/sk-SK.rc [iso-8859-1] Thu May 14 13:00:03 2009 @@ -82,8 +82,6 @@ END END -LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT - ID_ACCELERATORS ACCELERATORS BEGIN "^N", IDM_FILENEW @@ -106,8 +104,6 @@ "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY END -LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT - IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" @@ -123,8 +119,6 @@ DEFPUSHBUTTON "OK", IDOK, 125, 8, 48, 14 PUSHBUTTON "Zrui", IDCANCEL, 125, 24, 48, 14 END - -LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT IDD_ATTRIBUTES DIALOGEX 100, 100, 210, 120 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU @@ -152,8 +146,6 @@ PUSHBUTTON "Zrui", IDCANCEL, 155, 24, 48, 14 PUSHBUTTON "&Predvolené", IDD_ATTRIBUTESSTANDARD, 155, 40, 48, 14 END - -LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT IDD_CHANGESIZE DIALOGEX 100, 100, 210, 80 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU Modified: trunk/reactos/base/applications/paint/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la… ============================================================================== --- trunk/reactos/base/applications/paint/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/lang/uk-UA.rc [iso-8859-1] Thu May 14 13:00:03 2009 @@ -82,8 +82,6 @@ END END -LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT - ID_ACCELERATORS ACCELERATORS BEGIN "^N", IDM_FILENEW @@ -106,8 +104,6 @@ "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY END -LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT - IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" @@ -123,8 +119,6 @@ DEFPUSHBUTTON "OK", IDOK, 125, 8, 48, 14 PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 125, 24, 48, 14 END - -LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT IDD_ATTRIBUTES DIALOGEX 100, 100, 210, 120 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU @@ -152,8 +146,6 @@ PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 155, 24, 48, 14 PUSHBUTTON "Çà ïðîìîâ÷àííÿì", IDD_ATTRIBUTESSTANDARD, 155, 40, 48, 14 END - -LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT IDD_CHANGESIZE DIALOGEX 100, 100, 210, 80 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU Modified: trunk/reactos/base/applications/paint/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/rs… ============================================================================== --- trunk/reactos/base/applications/paint/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/rsrc.rc [iso-8859-1] Thu May 14 13:00:03 2009 @@ -27,6 +27,7 @@ #include "lang/sk-SK.rc" #include "lang/cs-CZ.rc" // cp 1251 languages +#include "lang/ru-RU.rc" #include "lang/uk-UA.rc"

1 0

[mjmartin] 40917: - Wait_thread_proc: Pass the correct value WaitAny vice FALSE to NtWaitForMultipleObjects. Fixes INFINITE wait when running kernel32_winetest for thread.
by mjmartin＠svn.reactos.org 14 May '09

14 May '09

Author: mjmartin Date: Thu May 14 11:11:00 2009 New Revision: 40917 URL: http://svn.reactos.org/svn/reactos?rev=40917&view=rev Log: - Wait_thread_proc: Pass the correct value WaitAny vice FALSE to NtWaitForMultipleObjects. Fixes INFINITE wait when running kernel32_winetest for thread. Modified: trunk/reactos/lib/rtl/wait.c Modified: trunk/reactos/lib/rtl/wait.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/wait.c?rev=40917&r… ============================================================================== --- trunk/reactos/lib/rtl/wait.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/wait.c [iso-8859-1] Thu May 14 11:11:00 2009 @@ -55,7 +55,7 @@ { Status = NtWaitForMultipleObjects( 2, handles, - FALSE, + WaitAny, alertable, get_nt_timeout( &timeout, Wait->Milliseconds ) );

1 0

[jimtabor] 40916: - Migration changes from W32THREADINFO to use ThreadInfo for kernel space and user space pointer reference, and use ClientInfo from TEB for user space. Next change will have the full removal of W32THREADINFO.
by jimtabor＠svn.reactos.org 13 May '09

13 May '09

Author: jimtabor Date: Thu May 14 01:32:10 2009 New Revision: 40916 URL: http://svn.reactos.org/svn/reactos?rev=40916&view=rev Log: - Migration changes from W32THREADINFO to use ThreadInfo for kernel space and user space pointer reference, and use ClientInfo from TEB for user space. Next change will have the full removal of W32THREADINFO. Modified: trunk/reactos/dll/win32/user32/include/user32.h trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Modified: trunk/reactos/dll/win32/user32/include/user32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… ============================================================================== --- trunk/reactos/dll/win32/user32/include/user32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/user32.h [iso-8859-1] Thu May 14 01:32:10 2009 @@ -103,7 +103,7 @@ ti = GetW32ThreadInfo(); if (ti != NULL) - di = DesktopPtrToUser(ti->pDeskInfo); + di = GetWin32ClientInfo()->pDeskInfo; return di; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] Thu May 14 01:32:10 2009 @@ -504,17 +504,18 @@ { PTEB Teb; PW32THREADINFO ti; - PCLIENTINFO ci; - PTHREADINFO W32Thread = PsGetCurrentThreadWin32Thread(); - - if (W32Thread == NULL) + PPROCESSINFO ppi; + PCLIENTINFO pci; + PTHREADINFO pti = PsGetCurrentThreadWin32Thread(); + + if (pti == NULL) { /* FIXME - temporary hack for system threads... */ return NULL; } /* allocate a THREADINFO structure if neccessary */ - if (W32Thread->ThreadInfo == NULL) + if (pti->ThreadInfo == NULL) { ti = UserHeapAlloc(sizeof(W32THREADINFO)); if (ti != NULL) @@ -523,33 +524,42 @@ sizeof(W32THREADINFO)); /* initialize it */ - ti->ppi = GetW32ProcessInfo(); - ti->fsHooks = W32Thread->fsHooks; - W32Thread->pcti = &W32Thread->cti; // FIXME - if (W32Thread->Desktop != NULL) + ti->ppi = ppi = GetW32ProcessInfo(); + ti->fsHooks = pti->fsHooks; + pti->pcti = &pti->cti; // FIXME Need to set it in desktop.c! + if (pti->Desktop != NULL) { - ti->pDeskInfo = W32Thread->Desktop->DesktopInfo; + pti->pDeskInfo = ti->pDeskInfo = pti->Desktop->DesktopInfo; } else { - ti->pDeskInfo = NULL; + pti->pDeskInfo = ti->pDeskInfo = NULL; } - W32Thread->ThreadInfo = ti; + pti->ThreadInfo = ti; /* update the TEB */ Teb = NtCurrentTeb(); - ci = GetWin32ClientInfo(); - W32Thread->pClientInfo = ci; + pci = GetWin32ClientInfo(); + pti->pClientInfo = pci; _SEH2_TRY { ProbeForWrite(Teb, sizeof(TEB), sizeof(ULONG)); - // FIXME PLEASE! it's a ref pointer and not user data! Use ClientThreadInfo! - Teb->Win32ThreadInfo = UserHeapAddressToUser(W32Thread->ThreadInfo); -// ci->pClientThreadInfo = &ti->ClientThreadInfo; // FIXME! - ci->pClientThreadInfo = NULL; - ci->ppi = ti->ppi; + + Teb->Win32ThreadInfo = UserHeapAddressToUser(pti->ThreadInfo); + + pci->pClientThreadInfo = NULL; // FIXME Need to set it in desktop.c! + pci->ppi = ppi; + pci->fsHooks = pti->fsHooks; + /* CI may not have been initialized. */ + if (!pci->pDeskInfo && pti->pDeskInfo) + { + if (!pci->ulClientDelta) pci->ulClientDelta = DesktopHeapGetUserDelta(); + + pci->pDeskInfo = + (PVOID)((ULONG_PTR)pti->pDeskInfo - pci->ulClientDelta); + } } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -563,7 +573,7 @@ } } - return W32Thread->ThreadInfo; + return pti->ThreadInfo; }

1 0

[hpoussin] 40915: We know that the function works, so no need to print a FIXME
by hpoussin＠svn.reactos.org 13 May '09

13 May '09

Author: hpoussin Date: Thu May 14 00:44:12 2009 New Revision: 40915 URL: http://svn.reactos.org/svn/reactos?rev=40915&view=rev Log: We know that the function works, so no need to print a FIXME Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/cfgmgr.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/cfgmgr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/cfgmgr.c [iso-8859-1] Thu May 14 00:44:12 2009 @@ -810,7 +810,7 @@ LPWSTR lpDevInst; CONFIGRET ret; - FIXME("%p %lx %p\n", dnDevInst, ulFlags, hMachine); + TRACE("%p %lx %p\n", dnDevInst, ulFlags, hMachine); if (!IsUserAdmin()) return CR_ACCESS_DENIED;

1 0

[janderwald] 40914: - IRP_MN_FILTER_RESOURCE_REQUIREMENTS passes the list also in Irp->IoStatus.Information - Fixes a crash in CMI8738 driver
by janderwald＠svn.reactos.org 13 May '09

13 May '09

Author: janderwald Date: Thu May 14 00:15:46 2009 New Revision: 40914 URL: http://svn.reactos.org/svn/reactos?rev=40914&view=rev Log: - IRP_MN_FILTER_RESOURCE_REQUIREMENTS passes the list also in Irp->IoStatus.Information - Fixes a crash in CMI8738 driver Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Thu May 14 00:15:46 2009 @@ -514,6 +514,11 @@ /* PNP IRPs are initialized with a status code of STATUS_NOT_SUPPORTED */ Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; Irp->IoStatus.Information = 0; + + if (MinorFunction == IRP_MN_FILTER_RESOURCE_REQUIREMENTS) + { + Irp->IoStatus.Information = (ULONG_PTR)Stack->Parameters.FilterResourceRequirements.IoResourceRequirementList; + } IrpSp = IoGetNextIrpStackLocation(Irp); IrpSp->MinorFunction = (UCHAR)MinorFunction;

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