Ros-diffs February 2010

ros-diffs@reactos.org

22 participants
365 discussions

[dreimer] 45501: Giant German Language Fix Patch by "tux." I skipped xcopy, winhlp32 and wordpad because they are wine synched and expand, because its not translated anymore. Fix some BOMs i did not see at wine synching.
by dreimer＠svn.reactos.org 08 Feb '10

08 Feb '10

Author: dreimer Date: Mon Feb 8 20:35:26 2010 New Revision: 45501 URL: http://svn.reactos.org/svn/reactos?rev=45501&view=rev Log: Giant German Language Fix Patch by "tux." I skipped xcopy, winhlp32 and wordpad because they are wine synched and expand, because its not translated anymore. Fix some BOMs i did not see at wine synching. Added: trunk/reactos/base/applications/cmdutils/doskey/lang/de-DE.rc (with props) trunk/reactos/base/system/runonce/lang/de-DE.rc (with props) trunk/reactos/dll/cpl/usrmgr/lang/de-DE.rc (with props) Modified: trunk/reactos/base/applications/calc/lang/de-DE.rc trunk/reactos/base/applications/cmdutils/doskey/doskey.rc trunk/reactos/base/applications/cmdutils/doskey/lang/en-US.rc trunk/reactos/base/applications/cmdutils/reg/De.rc trunk/reactos/base/applications/cmdutils/xcopy/It.rc trunk/reactos/base/applications/cmdutils/xcopy/Uk.rc trunk/reactos/base/applications/downloader/lang/de-DE.rc trunk/reactos/base/applications/dxdiag/lang/de-DE.rc trunk/reactos/base/applications/fontview/lang/de-DE.rc trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc trunk/reactos/base/applications/games/spider/lang/de-DE.rc trunk/reactos/base/applications/games/winemine/lang/de-DE.rc trunk/reactos/base/applications/mplay32/lang/de-DE.rc trunk/reactos/base/applications/msconfig/lang/de-DE.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/de-DE.rc trunk/reactos/base/applications/mscutils/servman/lang/de-DE.rc trunk/reactos/base/applications/mstsc/lang/de-DE.rc trunk/reactos/base/applications/network/ipconfig/lang/de-DE.rc trunk/reactos/base/applications/notepad/lang/de-DE.rc trunk/reactos/base/applications/paint/lang/de-DE.rc trunk/reactos/base/applications/rapps/lang/de-DE.rc trunk/reactos/base/applications/regedit/lang/de-DE.rc trunk/reactos/base/applications/screensavers/3dtext/lang/de-DE.rc trunk/reactos/base/applications/screensavers/logon/lang/de-DE.rc trunk/reactos/base/applications/sndvol32/lang/de-DE.rc trunk/reactos/base/applications/taskmgr/lang/de-DE.rc trunk/reactos/base/applications/wordpad/It.rc trunk/reactos/base/applications/wordpad/Uk.rc trunk/reactos/base/applications/wordpad/rsrc.rc trunk/reactos/base/applications/write/Uk.rc trunk/reactos/base/setup/reactos/lang/de-DE.rc trunk/reactos/base/setup/usetup/lang/de-DE.h trunk/reactos/base/setup/vmwinst/lang/de-DE.rc trunk/reactos/base/setup/welcome/lang/de-DE.rc trunk/reactos/base/shell/cmd/lang/de-DE.rc trunk/reactos/base/shell/explorer-new/lang/de-DE.rc trunk/reactos/base/shell/explorer/explorer-de.rc trunk/reactos/base/system/format/lang/de-DE.rc trunk/reactos/base/system/regsvr32/lang/de-DE.rc trunk/reactos/base/system/runonce/rsrc.rc trunk/reactos/base/system/winlogon/lang/de-DE.rc trunk/reactos/dll/cpl/access/lang/de-DE.rc trunk/reactos/dll/cpl/appwiz/lang/de-DE.rc trunk/reactos/dll/cpl/console/lang/de-DE.rc trunk/reactos/dll/cpl/desk/lang/de-DE.rc trunk/reactos/dll/cpl/hdwwiz/lang/de-DE.rc trunk/reactos/dll/cpl/input/lang/de-DE.rc trunk/reactos/dll/cpl/intl/lang/de-DE.rc trunk/reactos/dll/cpl/joy/lang/de-DE.rc trunk/reactos/dll/cpl/liccpa/lang/de-DE.rc trunk/reactos/dll/cpl/main/lang/de-DE.rc trunk/reactos/dll/cpl/mmsys/lang/de-DE.rc trunk/reactos/dll/cpl/powercfg/lang/de-DE.rc trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc trunk/reactos/dll/cpl/timedate/lang/de-DE.rc trunk/reactos/dll/cpl/usrmgr/rsrc.rc trunk/reactos/dll/shellext/deskadp/lang/de-DE.rc trunk/reactos/dll/shellext/deskmon/lang/de-DE.rc trunk/reactos/dll/win32/devmgr/lang/de-DE.rc trunk/reactos/dll/win32/kernel32/lang/de-DE.mc trunk/reactos/dll/win32/modemui/lang/de-DE.rc trunk/reactos/dll/win32/msgina/lang/de-DE.rc trunk/reactos/dll/win32/netcfgx/lang/de-DE.rc trunk/reactos/dll/win32/netid/lang/de-DE.rc trunk/reactos/dll/win32/netshell/lang/de-DE.rc trunk/reactos/dll/win32/newdev/lang/de-DE.rc trunk/reactos/dll/win32/rasdlg/lang/de-DE.rc trunk/reactos/dll/win32/serialui/lang/de-DE.rc trunk/reactos/dll/win32/setupapi/lang/de-DE.rc trunk/reactos/dll/win32/shdoclc/De.rc trunk/reactos/dll/win32/shell32/lang/de-DE.rc trunk/reactos/dll/win32/shimgvw/lang/de-DE.rc trunk/reactos/dll/win32/syssetup/lang/de-DE.rc trunk/reactos/dll/win32/tapiui/lang/de-DE.rc trunk/reactos/dll/win32/user32/lang/de-DE.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/calc/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/cmdutils/doskey/doskey.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Added: trunk/reactos/base/applications/cmdutils/doskey/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/doskey/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/reg/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/xcopy/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/xcopy/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/downloader/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… Modified: trunk/reactos/base/applications/dxdiag/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… Modified: trunk/reactos/base/applications/fontview/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… Modified: trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/spider/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… Modified: trunk/reactos/base/applications/games/winemine/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/mplay32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… Modified: trunk/reactos/base/applications/msconfig/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mstsc/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… Modified: trunk/reactos/base/applications/network/ipconfig/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/notepad/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/paint/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la… Modified: trunk/reactos/base/applications/rapps/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/regedit/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/screensavers/3dtext/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… Modified: trunk/reactos/base/applications/screensavers/logon/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… Modified: trunk/reactos/base/applications/sndvol32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Modified: trunk/reactos/base/applications/taskmgr/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/wordpad/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/write/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/Uk… Modified: trunk/reactos/base/setup/reactos/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/de… Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/de-… Modified: trunk/reactos/base/setup/vmwinst/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/de… Modified: trunk/reactos/base/setup/welcome/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/de… Modified: trunk/reactos/base/shell/cmd/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/de-DE.… Modified: trunk/reactos/base/shell/explorer-new/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… Modified: trunk/reactos/base/shell/explorer/explorer-de.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… Modified: trunk/reactos/base/system/format/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/lang/de… Modified: trunk/reactos/base/system/regsvr32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/lang/… Added: trunk/reactos/base/system/runonce/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/runonce/lang/d… Modified: trunk/reactos/base/system/runonce/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/runonce/rsrc.r… Modified: trunk/reactos/base/system/winlogon/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/lang/… Modified: trunk/reactos/dll/cpl/access/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/de-DE.… Modified: trunk/reactos/dll/cpl/appwiz/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/de-DE.… Modified: trunk/reactos/dll/cpl/console/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/de-DE… Modified: trunk/reactos/dll/cpl/desk/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/de-DE.rc… Modified: trunk/reactos/dll/cpl/hdwwiz/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/de-DE.… Modified: trunk/reactos/dll/cpl/input/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/de-DE.r… Modified: trunk/reactos/dll/cpl/intl/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/de-DE.rc… Modified: trunk/reactos/dll/cpl/joy/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/lang/de-DE.rc?… Modified: trunk/reactos/dll/cpl/liccpa/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/liccpa/lang/de-DE.… Modified: trunk/reactos/dll/cpl/main/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/de-DE.rc… Modified: trunk/reactos/dll/cpl/mmsys/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/de-DE.r… Modified: trunk/reactos/dll/cpl/powercfg/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/de-D… Modified: trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/de-DE.r… Modified: trunk/reactos/dll/cpl/timedate/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/de-D… Added: trunk/reactos/dll/cpl/usrmgr/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/lang/de-DE.… Modified: trunk/reactos/dll/cpl/usrmgr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/rsrc.rc?rev… Modified: trunk/reactos/dll/shellext/deskadp/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/lang/… Modified: trunk/reactos/dll/shellext/deskmon/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskmon/lang/… Modified: trunk/reactos/dll/win32/devmgr/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/de-D… Modified: trunk/reactos/dll/win32/kernel32/lang/de-DE.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/lang/de… Modified: trunk/reactos/dll/win32/modemui/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/modemui/lang/de-… Modified: trunk/reactos/dll/win32/msgina/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/de-D… Modified: trunk/reactos/dll/win32/netcfgx/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/de-… Modified: trunk/reactos/dll/win32/netid/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/de-DE… Modified: trunk/reactos/dll/win32/netshell/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/de… Modified: trunk/reactos/dll/win32/newdev/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/de-D… Modified: trunk/reactos/dll/win32/rasdlg/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasdlg/lang/de-D… Modified: trunk/reactos/dll/win32/serialui/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/serialui/lang/de… Modified: trunk/reactos/dll/win32/setupapi/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/lang/de… Modified: trunk/reactos/dll/win32/shdoclc/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdoclc/De.rc?re… Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… Modified: trunk/reactos/dll/win32/shimgvw/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/lang/de-… Modified: trunk/reactos/dll/win32/syssetup/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/de… Modified: trunk/reactos/dll/win32/tapiui/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapiui/lang/de-D… Modified: trunk/reactos/dll/win32/user32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/lang/de-D…

1 0

[dreimer] 45500: Fix build breakage
by dreimer＠svn.reactos.org 08 Feb '10

08 Feb '10

Author: dreimer Date: Mon Feb 8 17:38:41 2010 New Revision: 45500 URL: http://svn.reactos.org/svn/reactos?rev=45500&view=rev Log: Fix build breakage Modified: trunk/rosapps/applications/winfile/Zh.rc Modified: trunk/rosapps/applications/winfile/Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Zh.rc… ============================================================================== --- trunk/rosapps/applications/winfile/Zh.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/Zh.rc [iso-8859-1] Mon Feb 8 17:38:41 2010 @@ -1,4 +1,4 @@ -ï»¿/* +/* * WineFile * Simplified and Traditional Chinese Language Support *

1 0

[tkreuzer] 45499: [HAL] Add a file, I forgot
by tkreuzer＠svn.reactos.org 08 Feb '10

08 Feb '10

Author: tkreuzer Date: Mon Feb 8 16:50:27 2010 New Revision: 45499 URL: http://svn.reactos.org/svn/reactos?rev=45499&view=rev Log: [HAL] Add a file, I forgot Added: branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/apic.c (with props) Added: branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/apic.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/apic.c (added) +++ branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/apic.c [iso-8859-1] Mon Feb 8 16:50:27 2010 @@ -1,0 +1,20 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: hal/apic.c + * PURPOSE: Hardware Abstraction Layer DLL + * PROGRAMMER: Timo Kreuzer + */ + +#include <hal.h> + +//#define NDEBUG +#include <debug.h> + +VOID +NTAPI +HalpInitializePICs(IN BOOLEAN EnableInterrupts) +{ + UNIMPLEMENTED; +} + Propchange: branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/apic.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[dreimer] 45498: Nice regex solution to get GCC's Version from the Target GCC Paths. This fixes the last evil hack to get information from GCC in PS. Biig thx to niski for coming up with that niice solution.
by dreimer＠svn.reactos.org 08 Feb '10

08 Feb '10

Author: dreimer Date: Mon Feb 8 16:13:50 2010 New Revision: 45498 URL: http://svn.reactos.org/svn/reactos?rev=45498&view=rev Log: Nice regex solution to get GCC's Version from the Target GCC Paths. This fixes the last evil hack to get information from GCC in PS. Biig thx to niski for coming up with that niice solution. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/version.ps1 trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt 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] Mon Feb 8 16:13:50 2010 @@ -3,17 +3,16 @@ # LICENSE: GNU General Public License v2. (see LICENSE.txt) # FILE: Root/version.ps1 # PURPOSE: Display the current version of GCC, NASM, ld and make. -# COPYRIGHT: Copyright 2010 Daniel Reimer <reimer.daniel(a)freenet.de> +# COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> # (get-WmiObject Win32_OperatingSystem).caption # GCC -$TARGETGCC = "$global:_ROSBE_PREFIX" + "gcc" -& $TARGETGCC -v 2> gcctvers.tmp -(select-string -path .\gcctvers.tmp "gcc version") -replace ".*:(.*?)\b",'$1' +[regex]$GCCVer = "4.[0-9].[0-9]" +$_ROSBE_GCC_TARGET_VERSION = $GCCVer.matches($ENV:ROSBE_TARGET_CXXFLAGS)[0].value +"gcc version - $_ROSBE_GCC_TARGET_VERSION" "gcc target - $ENV:ROS_ARCH" -remove-item gcctvers.tmp # LD $run = "$_ROSBE_TARGET_MINGWPATH\bin\$_ROSBE_PREFIX" + "ld" Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] Mon Feb 8 16:13:50 2010 @@ -32,8 +32,9 @@ - Removed the address translation from the raddr2line script. Its done in the tools now (Daniel Reimer) - Fixed the Core detection in makex for PS. Added a global setting to the variable containing the number of cores. (Daniel Reimer) -- Added getincludes from RosBE Unix. This makes the schripts way more logical and fixes a PS Bug +- Added getincludes from RosBE Unix. This makes the scripts way more logical and fixes a PS Bug when you open several Windows at once (Colin Finck, Daniel Reimer) +- Fix for GCC Version showup together with Colin's new Tool in PS. (Maciej Bialas) *** Oct 26th, 2009 - RosBE 1.4.5 Released

1 0

[dreimer] 45497: - Update Copyright Header Dates. - Update Installer Dates. - Add getincludes into makefile.
by dreimer＠svn.reactos.org 08 Feb '10

08 Feb '10

Author: dreimer Date: Mon Feb 8 11:55:33 2010 New Revision: 45497 URL: http://svn.reactos.org/svn/reactos?rev=45497&view=rev Log: - Update Copyright Header Dates. - Update Installer Dates. - Add getincludes into makefile. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/scut.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/version.ps1 trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd trunk/tools/RosBE/RosBE-Windows/Root/TimeDate.cmd trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd trunk/tools/RosBE/RosBE-Windows/Root/options.cmd trunk/tools/RosBE/RosBE-Windows/Root/raddr2line.cmd trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd trunk/tools/RosBE/RosBE-Windows/Root/update.cmd trunk/tools/RosBE/RosBE-Windows/Root/version.cmd trunk/tools/RosBE/RosBE-Windows/RosBE-ARM.nsi trunk/tools/RosBE/RosBE-Windows/RosBE.nsi trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.c trunk/tools/RosBE/Tools/makefile Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] Mon Feb 8 11:55:33 2010 @@ -3,7 +3,7 @@ # LICENSE: GNU General Public License v2. (see LICENSE.txt) # FILE: Root/Build.ps1 # PURPOSE: Perform the build of ReactOS. -# COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> +# COPYRIGHT: Copyright 2010 Daniel Reimer <reimer.daniel(a)freenet.de> # # Check if config.template.rbuild is newer than config.rbuild, if it is then Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 [iso-8859-1] Mon Feb 8 11:55:33 2010 @@ -3,7 +3,7 @@ # LICENSE: GNU General Public License v2. (see LICENSE.txt) # FILE: Root/Config.ps1 # PURPOSE: A Basic Config.rbuild Creator for ReactOS. -# COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> +# COPYRIGHT: Copyright 2010 Daniel Reimer <reimer.daniel(a)freenet.de> # $host.ui.RawUI.WindowTitle = "ReactOS Build Configurator" Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 [iso-8859-1] Mon Feb 8 11:55:33 2010 @@ -3,7 +3,7 @@ # LICENSE: GNU General Public License v2. (see LICENSE.txt) # FILE: Root/Help.ps1 # PURPOSE: Display help for the commands included with the ReactOS Build Environment. -# COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> +# COPYRIGHT: Copyright 2010 Daniel Reimer <reimer.daniel(a)freenet.de> # # Check if we are displaying help on all commands, if so, display it. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1 [iso-8859-1] Mon Feb 8 11:55:33 2010 @@ -3,7 +3,7 @@ # LICENSE: GNU General Public License v2. (see LICENSE.txt) # FILE: Root/reladdr2line.ps1 # PURPOSE: Converts a value to hex and displays it. -# COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> +# COPYRIGHT: Copyright 2010 Daniel Reimer <reimer.daniel(a)freenet.de> # $host.ui.RawUI.WindowTitle = "reladdr2line..." 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] Mon Feb 8 11:55:33 2010 @@ -3,7 +3,7 @@ # LICENSE: GNU General Public License v2. (see LICENSE.txt) # FILE: Root/rosbe-gcc-env.ps1 # PURPOSE: Set up the GCC 4.x.x build environment. -# COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> +# COPYRIGHT: Copyright 2010 Daniel Reimer <reimer.daniel(a)freenet.de> # # Check if we're switching to the AMD64 or AMR architecture. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 [iso-8859-1] Mon Feb 8 11:55:33 2010 @@ -3,7 +3,7 @@ # LICENSE: GNU General Public License v2. (see LICENSE.txt) # FILE: Root/sSVN.ps1 # PURPOSE: Integrated SVN Client. -# COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> +# COPYRIGHT: Copyright 2010 Daniel Reimer <reimer.daniel(a)freenet.de> # function UP($arg) { Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/scut.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/scut.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/scut.ps1 [iso-8859-1] Mon Feb 8 11:55:33 2010 @@ -3,7 +3,7 @@ # LICENSE: GNU General Public License v2. (see LICENSE.txt) # FILE: Root/scut.ps1 # PURPOSE: Manages named shortcuts to ReactOS source directories. -# COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> +# COPYRIGHT: Copyright 2010 Daniel Reimer <reimer.daniel(a)freenet.de> # function paramcall($arg) { 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] Mon Feb 8 11:55:33 2010 @@ -3,7 +3,7 @@ # LICENSE: GNU General Public License v2. (see LICENSE.txt) # FILE: Root/update.ps1 # PURPOSE: RosBE Updater. -# COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> +# COPYRIGHT: Copyright 2010 Daniel Reimer <reimer.daniel(a)freenet.de> # $host.ui.RawUI.WindowTitle = "Updating..." 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] Mon Feb 8 11:55:33 2010 @@ -3,7 +3,7 @@ # LICENSE: GNU General Public License v2. (see LICENSE.txt) # FILE: Root/version.ps1 # PURPOSE: Display the current version of GCC, NASM, ld and make. -# COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> +# COPYRIGHT: Copyright 2010 Daniel Reimer <reimer.daniel(a)freenet.de> # (get-WmiObject Win32_OperatingSystem).caption Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Bui… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd [iso-8859-1] Mon Feb 8 11:55:33 2010 @@ -3,7 +3,7 @@ :: LICENSE: GNU General Public License v2. (see LICENSE.txt) :: FILE: Root/Build-Shared.cmd :: PURPOSE: Perform the build of ReactOS. -:: COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> +:: COPYRIGHT: Copyright 2010 Daniel Reimer <reimer.daniel(a)freenet.de> :: Colin Finck <colin(a)reactos.org> :: Peter Ward <dralnix(a)gmail.com> :: Modified: trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Con… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd [iso-8859-1] Mon Feb 8 11:55:33 2010 @@ -3,7 +3,7 @@ :: LICENSE: GNU General Public License v2. (see LICENSE.txt) :: FILE: Root/Config.cmd :: PURPOSE: A Basic Config.rbuild Creator for ReactOS. -:: COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> +:: COPYRIGHT: Copyright 2010 Daniel Reimer <reimer.daniel(a)freenet.de> :: @echo off Modified: trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Hel… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd [iso-8859-1] Mon Feb 8 11:55:33 2010 @@ -3,7 +3,7 @@ :: LICENSE: GNU General Public License v2. (see LICENSE.txt) :: FILE: Root/Help.cmd :: PURPOSE: Display help for the commands included with the ReactOS Build Environment. -:: COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> +:: COPYRIGHT: Copyright 2010 Daniel Reimer <reimer.daniel(a)freenet.de> :: Peter Ward <dralnix(a)gmail.com> :: Colin Finck <colin(a)reactos.org> :: Modified: trunk/tools/RosBE/RosBE-Windows/Root/TimeDate.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Tim… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/TimeDate.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/TimeDate.cmd [iso-8859-1] Mon Feb 8 11:55:33 2010 @@ -3,7 +3,7 @@ :: LICENSE: GNU General Public License v2. (see LICENSE.txt) :: FILE: Root/TimeDate.cmd :: PURPOSE: Get the current date and time for use in our build log's file name. -:: COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> +:: COPYRIGHT: Copyright 2010 Daniel Reimer <reimer.daniel(a)freenet.de> :: Peter Ward <dralnix(a)gmail.com> :: Colin Finck <colin(a)reactos.org> :: 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] Mon Feb 8 11:55:33 2010 @@ -3,7 +3,7 @@ :: LICENSE: GNU General Public License v2. (see LICENSE.txt) :: FILE: Root/chdefgcc.cmd :: PURPOSE: Tool to change the current gcc in RosBE. -:: COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> +:: COPYRIGHT: Copyright 2010 Daniel Reimer <reimer.daniel(a)freenet.de> :: Peter Ward <dralnix(a)gmail.com> :: Colin Finck <colin(a)reactos.org> :: Modified: trunk/tools/RosBE/RosBE-Windows/Root/options.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/opt… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/options.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/options.cmd [iso-8859-1] Mon Feb 8 11:55:33 2010 @@ -3,7 +3,7 @@ :: LICENSE: GNU General Public License v2. (see LICENSE.txt) :: FILE: Root/options.cmd :: PURPOSE: Starts options.exe and restarts RosBE afterwards. -:: COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> +:: COPYRIGHT: Copyright 2010 Daniel Reimer <reimer.daniel(a)freenet.de> :: @echo off Modified: trunk/tools/RosBE/RosBE-Windows/Root/raddr2line.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/rad… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/raddr2line.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/raddr2line.cmd [iso-8859-1] Mon Feb 8 11:55:33 2010 @@ -3,7 +3,7 @@ :: LICENSE: GNU General Public License v2. (see LICENSE.txt) :: FILE: Root/raddr2line.cmd :: PURPOSE: Converts a value to hex and displays it. -:: COPYRIGHT: Copyright 2009 Christoph von Wittich <Christoph_vW(a)reactos.org> +:: COPYRIGHT: Copyright 2010 Christoph von Wittich <Christoph_vW(a)reactos.org> :: Daniel Reimer <reimer.daniel(a)freenet.de> :: Peter Ward <dralnix(a)gmail.com> :: Colin Finck <colin(a)reactos.org> Modified: trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/sSV… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd [iso-8859-1] Mon Feb 8 11:55:33 2010 @@ -3,7 +3,7 @@ :: LICENSE: GNU General Public License v2. (see LICENSE.txt) :: FILE: Root/sSVN.cmd :: PURPOSE: Integrated SVN Client. -:: COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> +:: COPYRIGHT: Copyright 2010 Daniel Reimer <reimer.daniel(a)freenet.de> :: @echo off Modified: trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/scu… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd [iso-8859-1] Mon Feb 8 11:55:33 2010 @@ -3,7 +3,7 @@ :: LICENSE: GNU General Public License v2. (see LICENSE.txt) :: FILE: Root/scut.cmd :: PURPOSE: Manages named shortcuts to ReactOS source directories. -:: COPYRIGHT: Copyright 2009 Colin Finck <mail(a)colinfinck.de> +:: COPYRIGHT: Copyright 2010 Colin Finck <mail(a)colinfinck.de> :: Daniel Reimer <reimer.daniel(a)freenet.de> :: Peter Ward <dralnix(a)gmail.com> :: Modified: trunk/tools/RosBE/RosBE-Windows/Root/update.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/upd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] Mon Feb 8 11:55:33 2010 @@ -3,7 +3,7 @@ :: LICENSE: GNU General Public License v2. (see LICENSE.txt) :: FILE: Root/update.cmd :: PURPOSE: RosBE Updater. -:: COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> +:: COPYRIGHT: Copyright 2010 Daniel Reimer <reimer.daniel(a)freenet.de> :: @echo off Modified: trunk/tools/RosBE/RosBE-Windows/Root/version.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/ver… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/version.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/version.cmd [iso-8859-1] Mon Feb 8 11:55:33 2010 @@ -3,7 +3,7 @@ :: LICENSE: GNU General Public License v2. (see LICENSE.txt) :: FILE: Root/version.cmd :: PURPOSE: Display the current version of GCC, NASM, ld and make. -:: COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> +:: COPYRIGHT: Copyright 2010 Daniel Reimer <reimer.daniel(a)freenet.de> :: Colin Finck <colin(a)reactos.org> :: Modified: trunk/tools/RosBE/RosBE-Windows/RosBE-ARM.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE-AR… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE-ARM.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE-ARM.nsi [iso-8859-1] Mon Feb 8 11:55:33 2010 @@ -22,8 +22,8 @@ VIAddVersionKey /LANG=1033 "ProductName" "${PRODUCT_NAME}" VIAddVersionKey /LANG=1033 "Comments" "This installer was written by Peter Ward and Daniel Reimer using Nullsoft Scriptable Install System (http://nsis.sourceforge.net/)" VIAddVersionKey /LANG=1033 "CompanyName" "ReactOS Team" -VIAddVersionKey /LANG=1033 "LegalTrademarks" "Copyright © 2009 ReactOS Team" -VIAddVersionKey /LANG=1033 "LegalCopyright" "Copyright © 2009 ReactOS Team" +VIAddVersionKey /LANG=1033 "LegalTrademarks" "Copyright © 2010 ReactOS Team" +VIAddVersionKey /LANG=1033 "LegalCopyright" "Copyright © 2010 ReactOS Team" VIAddVersionKey /LANG=1033 "FileDescription" "${PRODUCT_NAME} Setup" VIProductVersion "1.0.0.0" Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.ns… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] Mon Feb 8 11:55:33 2010 @@ -22,8 +22,8 @@ VIAddVersionKey /LANG=1033 "ProductName" "${PRODUCT_NAME}" VIAddVersionKey /LANG=1033 "Comments" "This installer was written by Peter Ward and Daniel Reimer using Nullsoft Scriptable Install System (http://nsis.sourceforge.net/)" VIAddVersionKey /LANG=1033 "CompanyName" "ReactOS Team" -VIAddVersionKey /LANG=1033 "LegalTrademarks" "Copyright © 2009 ReactOS Team" -VIAddVersionKey /LANG=1033 "LegalCopyright" "Copyright © 2009 ReactOS Team" +VIAddVersionKey /LANG=1033 "LegalTrademarks" "Copyright © 2010 ReactOS Team" +VIAddVersionKey /LANG=1033 "LegalCopyright" "Copyright © 2010 ReactOS Team" VIAddVersionKey /LANG=1033 "FileDescription" "${PRODUCT_NAME} Setup" VIProductVersion "1.5.0.0" Modified: trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE64.… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi [iso-8859-1] Mon Feb 8 11:55:33 2010 @@ -22,8 +22,8 @@ VIAddVersionKey /LANG=1033 "ProductName" "${PRODUCT_NAME}" VIAddVersionKey /LANG=1033 "Comments" "This installer was written by Peter Ward and Daniel Reimer using Nullsoft Scriptable Install System (http://nsis.sourceforge.net/)" VIAddVersionKey /LANG=1033 "CompanyName" "ReactOS Team" -VIAddVersionKey /LANG=1033 "LegalTrademarks" "Copyright © 2009 ReactOS Team" -VIAddVersionKey /LANG=1033 "LegalCopyright" "Copyright © 2009 ReactOS Team" +VIAddVersionKey /LANG=1033 "LegalTrademarks" "Copyright © 2010 ReactOS Team" +VIAddVersionKey /LANG=1033 "LegalCopyright" "Copyright © 2010 ReactOS Team" VIAddVersionKey /LANG=1033 "FileDescription" "${PRODUCT_NAME} Setup" VIProductVersion "1.3.0.0" Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.c [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.c [iso-8859-1] Mon Feb 8 11:55:33 2010 @@ -5,7 +5,7 @@ * PURPOSE: Configuring RosBE * COPYRIGHT: Copyright 2007 Maarten Bosma * Copyright 2007 Pierre Schweitzer - * Copyright 2009 Daniel Reimer + * Copyright 2010 Daniel Reimer * */ Modified: trunk/tools/RosBE/Tools/makefile URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/Tools/makefile?rev=454… ============================================================================== --- trunk/tools/RosBE/Tools/makefile [iso-8859-1] (original) +++ trunk/tools/RosBE/Tools/makefile [iso-8859-1] Mon Feb 8 11:55:33 2010 @@ -17,11 +17,15 @@ endif -all: cpucount scut +all: cpucount scut getincludes cpucount: cpucount.c ${CC} ${CFLAGS} cpucount$(SUFFIX) cpucount.c $(STRIP) cpucount$(SUFFIX) + +getincludes: getincludes.c + ${CC} ${CFLAGS} getincludes$(SUFFIX) getincludes.c + $(STRIP) getincludes$(SUFFIX) scut: scut.c ${CC} ${CFLAGS} scut$(SUFFIX) scut.c @@ -29,4 +33,5 @@ clean: $(RM) cpucount$(SUFFIX) + $(RM) getincludes$(SUFFIX) $(RM) scut$(SUFFIX)

1 0

[dreimer] 45496: Sync winfile to Wine 1.1.38
by dreimer＠svn.reactos.org 08 Feb '10

08 Feb '10

Author: dreimer Date: Mon Feb 8 11:49:41 2010 New Revision: 45496 URL: http://svn.reactos.org/svn/reactos?rev=45496&view=rev Log: Sync winfile to Wine 1.1.38 Added: trunk/rosapps/applications/winfile/Uk.rc (with props) Modified: trunk/rosapps/applications/winfile/Cs.rc trunk/rosapps/applications/winfile/Da.rc trunk/rosapps/applications/winfile/De.rc trunk/rosapps/applications/winfile/En.rc trunk/rosapps/applications/winfile/Es.rc trunk/rosapps/applications/winfile/Fr.rc trunk/rosapps/applications/winfile/Hu.rc trunk/rosapps/applications/winfile/It.rc trunk/rosapps/applications/winfile/Ja.rc trunk/rosapps/applications/winfile/Ko.rc trunk/rosapps/applications/winfile/Lt.rc trunk/rosapps/applications/winfile/Nl.rc trunk/rosapps/applications/winfile/No.rc trunk/rosapps/applications/winfile/Pl.rc trunk/rosapps/applications/winfile/Pt.rc trunk/rosapps/applications/winfile/Ru.rc trunk/rosapps/applications/winfile/Si.rc trunk/rosapps/applications/winfile/Sv.rc trunk/rosapps/applications/winfile/Tr.rc trunk/rosapps/applications/winfile/Zh.rc trunk/rosapps/applications/winfile/resource.h trunk/rosapps/applications/winfile/rsrc.rc trunk/rosapps/applications/winfile/winefile.c Modified: trunk/rosapps/applications/winfile/Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Cs.rc… ============================================================================== --- trunk/rosapps/applications/winfile/Cs.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/Cs.rc [iso-8859-1] Mon Feb 8 11:49:41 2010 @@ -45,7 +45,7 @@ MENUITEM "&Komprese...", 119 MENUITEM "&Dekomprese...", 120 MENUITEM SEPARATOR - MENUITEM "&Spustit...", ID_EXECUTE + MENUITEM "&Spustit...", ID_RUN MENUITEM "&Tisknout...", 102 MENUITEM "Asociovat...", 103 MENUITEM SEPARATOR @@ -150,21 +150,6 @@ } } - -IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Spustit" -FONT 8, "MS Shell Dlg" -{ - CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "&Pøíkaz:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 - EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL - CONTROL "Jako &Symbol", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 - DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 - PUSHBUTTON "Zruit", 2, 158, 23, 47, 14 - PUSHBUTTON "&Pomoc", 254, 158, 43, 47, 14 -} - IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Zvolte cíl" Modified: trunk/rosapps/applications/winfile/Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Da.rc… ============================================================================== --- trunk/rosapps/applications/winfile/Da.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/Da.rc [iso-8859-1] Mon Feb 8 11:49:41 2010 @@ -39,7 +39,7 @@ MENUITEM "K&omprimer...", 119 MENUITEM "De&komprimer...", 120 MENUITEM SEPARATOR - MENUITEM "Kø&r...", ID_EXECUTE + MENUITEM "Kø&r...", ID_RUN MENUITEM "&Udskriv...", 102 MENUITEM "Associer...", 103 MENUITEM SEPARATOR @@ -142,21 +142,6 @@ MENUITEM SEPARATOR MENUITEM "&Information om Filbehandling...",ID_ABOUT } -} - - -IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Kør" -FONT 8, "MS Shell Dlg" -{ - CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "&Kommando:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 - EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL - CONTROL "&Som symbol", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 - DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 - PUSHBUTTON "Annuller", 2, 158, 23, 47, 14 - PUSHBUTTON "&Hjælp", 254, 158, 43, 47, 14 } IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 Modified: trunk/rosapps/applications/winfile/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/De.rc… ============================================================================== --- trunk/rosapps/applications/winfile/De.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/De.rc [iso-8859-1] Mon Feb 8 11:49:41 2010 @@ -43,7 +43,7 @@ MENUITEM "K&omprimieren...", 119 MENUITEM "Deko&mprimieren...", 120 MENUITEM SEPARATOR - MENUITEM "&AusfÃ¼hren...", ID_EXECUTE + MENUITEM "&AusfÃ¼hren...", ID_RUN MENUITEM "&Drucken...", 102 MENUITEM "Zuord&nen...", 103 MENUITEM SEPARATOR @@ -142,21 +142,6 @@ MENUITEM SEPARATOR MENUITEM "&Info Ã¼ber Winefile...", ID_ABOUT } -} - - -IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "AusfÃ¼hren" -FONT 8, "MS Shell Dlg" -{ - CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "Befehls&zeile:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 - EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL - CONTROL "Als &Symbol", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 - DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 - PUSHBUTTON "Abbrechen", 2, 158, 23, 47, 14 - PUSHBUTTON "&Hilfe", 254, 158, 43, 47, 14 } IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 Modified: trunk/rosapps/applications/winfile/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/En.rc… ============================================================================== --- trunk/rosapps/applications/winfile/En.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/En.rc [iso-8859-1] Mon Feb 8 11:49:41 2010 @@ -41,7 +41,7 @@ MENUITEM "C&ompress...", 119 MENUITEM "Dec&ompress...", 120 MENUITEM SEPARATOR - MENUITEM "&Run...", ID_EXECUTE + MENUITEM "&Run...", ID_RUN MENUITEM "&Print...", 102 MENUITEM "Associate...", 103 MENUITEM SEPARATOR @@ -144,21 +144,6 @@ MENUITEM SEPARATOR MENUITEM "&About Winefile...", ID_ABOUT } -} - - -IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Execute" -FONT 8, "MS Shell Dlg" -{ - CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "&Command:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 - EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL - CONTROL "As &Symbol", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 - DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 - PUSHBUTTON "Cancel", 2, 158, 23, 47, 14 - PUSHBUTTON "&Help", 254, 158, 43, 47, 14 } IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 Modified: trunk/rosapps/applications/winfile/Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Es.rc… ============================================================================== --- trunk/rosapps/applications/winfile/Es.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/Es.rc [iso-8859-1] Mon Feb 8 11:49:41 2010 @@ -39,7 +39,7 @@ MENUITEM "C&omprimir...", 119 MENUITEM "&Descomprimir...", 120 MENUITEM SEPARATOR - MENUITEM "E&jecutar...", ID_EXECUTE + MENUITEM "E&jecutar...", ID_RUN MENUITEM "I&mprimir...", 102 MENUITEM "Asoc&iar...", 103 MENUITEM SEPARATOR @@ -142,21 +142,6 @@ MENUITEM SEPARATOR MENUITEM "&Acerca de Winefile...", ID_ABOUT } -} - - -IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Ejecutar" -FONT 8, "MS Shell Dlg" -{ - CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "&Comando:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 - EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL - CONTROL "Como &símbolo", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 - DEFPUSHBUTTON "Aceptar", 1, 158, 6, 47, 14 - PUSHBUTTON "Cancelar", 2, 158, 23, 47, 14 - PUSHBUTTON "&Ayuda", 254, 158, 43, 47, 14 } IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 Modified: trunk/rosapps/applications/winfile/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Fr.rc… ============================================================================== --- trunk/rosapps/applications/winfile/Fr.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/Fr.rc [iso-8859-1] Mon Feb 8 11:49:41 2010 @@ -46,7 +46,7 @@ MENUITEM "Co&mpresser...", 119 MENUITEM "DÃ©compre&sser...", 120 MENUITEM SEPARATOR - MENUITEM "E&xÃ©cuter...", ID_EXECUTE + MENUITEM "E&xÃ©cuter...", ID_RUN MENUITEM "&Imprimer...", 102 MENUITEM "&Associer...", 103 MENUITEM SEPARATOR @@ -149,21 +149,6 @@ MENUITEM SEPARATOR MENUITEM "Ã &propos de Winefile", ID_ABOUT } -} - - -IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "ExÃ©cuter" -FONT 8, "MS Shell Dlg" -{ - CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "&CommandeÂ :", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 - EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL - CONTROL "Sous forme d'icÃ´ne", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 75, 12 - DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 - PUSHBUTTON "Annuler", 2, 158, 23, 47, 14 - PUSHBUTTON "Aid&e", 254, 158, 43, 47, 14 } IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 Modified: trunk/rosapps/applications/winfile/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Hu.rc… ============================================================================== --- trunk/rosapps/applications/winfile/Hu.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/Hu.rc [iso-8859-1] Mon Feb 8 11:49:41 2010 @@ -42,7 +42,7 @@ MENUITEM "&Becsomagolás...", 119 MENUITEM "K&icsomagolás...", 120 MENUITEM SEPARATOR - MENUITEM "&Futtatás...", ID_EXECUTE + MENUITEM "&Futtatás...", ID_RUN MENUITEM "&Nyomtatás...", 102 MENUITEM "Társítás...", 103 MENUITEM SEPARATOR @@ -146,18 +146,3 @@ MENUITEM "&Winefile-ról...", ID_ABOUT } } - - -IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Futtatás" -FONT 8, "MS Shell Dlg" -{ - CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "&Parancs:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 - EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL - CONTROL "&Szimbólumként", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 - DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 - PUSHBUTTON "Mégse", 2, 158, 23, 47, 14 - PUSHBUTTON "&Súgó", 254, 158, 43, 47, 14 -} Modified: trunk/rosapps/applications/winfile/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/It.rc… ============================================================================== --- trunk/rosapps/applications/winfile/It.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/It.rc [iso-8859-1] Mon Feb 8 11:49:41 2010 @@ -6,6 +6,7 @@ * Copyright 2002 Steven Edwards * Copyright 2002 Alexandre Julliard * Copyright 2004 Ivan Leo Puoti + * Copyright 2010 Luca Bennati * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -23,6 +24,9 @@ */ #include "resource.h" + +/*UTF-8*/ +#pragma code_page(65001) LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL @@ -37,12 +41,12 @@ MENUITEM "&Negli Appunti...\tF9", 118 MENUITEM "&Cancella\tDel", ID_FILE_DELETE MENUITEM "Ri&nomina...", 109 - MENUITEM "Propri&età...\tAlt+Invio", ID_EDIT_PROPERTIES + MENUITEM "Propri&etÃ ...\tAlt+Invio", ID_EDIT_PROPERTIES MENUITEM SEPARATOR MENUITEM "C&omprimi...", 119 MENUITEM "Dec&omprimi...", 120 MENUITEM SEPARATOR - MENUITEM "&Esegui...", ID_EXECUTE + MENUITEM "&Esegui...", ID_RUN MENUITEM "&Stampa...", 102 MENUITEM "Associa...", 103 MENUITEM SEPARATOR @@ -81,7 +85,7 @@ MENUITEM "Espandi &tutto\tStrg+*", 303 MENUITEM "Riduci &Albero\t-", 304 MENUITEM SEPARATOR - MENUITEM "&Seleziona unità", 505 + MENUITEM "&Seleziona unitÃ ", 505 } POPUP "&Visualizza" { @@ -141,25 +145,10 @@ POPUP "&Guida" { MENUITEM "&Sommario della Guida\tF1", ID_HELP MENUITEM "&Cerca nella Guida...\tF1", ID_HELP - MENUITEM "&Uso dell Guida\tF1", ID_HELP_USING + MENUITEM "&Uso della Guida\tF1", ID_HELP_USING MENUITEM SEPARATOR MENUITEM "&Informazioni su Winefile...",ID_ABOUT } -} - - -IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Esegui" -FONT 8, "MS Shell Dlg" -{ - CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "&Comando:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 - EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL - CONTROL "Come &Simbolo", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 - DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 - PUSHBUTTON "Annulla", 2, 158, 23, 47, 14 - PUSHBUTTON "&Aiuto", 254, 158, 43, 47, 14 } IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 @@ -175,8 +164,89 @@ PUSHBUTTON "&Naviga", 254, 158, 43, 47, 14 } +IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Per tipo di file" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "&Nome:",-1,7,8,22,10 + EDITTEXT IDC_VIEW_PATTERN,31,7,63,12,ES_AUTOHSCROLL + GROUPBOX "Tipo di file",-1,7,23,87,56 + CONTROL "&Cartelle",IDC_VIEW_TYPE_DIRECTORIES,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,32,70,10 + CONTROL "&Programmi",IDC_VIEW_TYPE_PROGRAMS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,43,70,10 + CONTROL "Docu&menti",IDC_VIEW_TYPE_DOCUMENTS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,54,70,10 + CONTROL "&Altri files",IDC_VIEW_TYPE_OTHERS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,65,70,10 + CONTROL "&Mostra files nascosti/di sistema",IDC_VIEW_TYPE_HIDDEN, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,81,106,9 + DEFPUSHBUTTON "OK",IDOK,104,7,50,14 + PUSHBUTTON "Annulla",IDCANCEL,104,24,50,14 +END + +IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE 0, 0, 248, 215 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "PropprietÃ di %s" +FONT 8, "MS Sans Serif" +BEGIN + DEFPUSHBUTTON "OK",IDOK,191,7,50,14 + PUSHBUTTON "Annulla",IDCANCEL,191,29,50,14 + LTEXT "Nome del &file:",-1,7,7,59,9 + EDITTEXT IDC_STATIC_PROP_FILENAME,71,7,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "&Indirizzo completo:",-1,7,18,59,9 + EDITTEXT IDC_STATIC_PROP_PATH,71,18,120,9, ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Ultima modifica:",-1,7,29,59,9 + EDITTEXT IDC_STATIC_PROP_LASTCHANGE,71,29,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Versione:",-1,7,40,59,9 + EDITTEXT IDC_STATIC_PROP_VERSION,71,40,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Cop&yright:",-1,7,51,59,9 + EDITTEXT IDC_STATIC_PROP_COPYRIGHT,71,51,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Dimensione:",-1,7,62,59,9 + EDITTEXT IDC_STATIC_PROP_SIZE,71,62,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + GROUPBOX "Attributi",-1,7,79,158,46 + CONTROL "&Sola lettura",IDC_CHECK_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,91,68,9 + CONTROL "&Nascosto",IDC_CHECK_HIDDEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,91,68,9 + CONTROL "&Archivio",IDC_CHECK_ARCHIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,101,68,9 + CONTROL "&Di sistema",IDC_CHECK_SYSTEM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,101,68,9 + CONTROL "&Compresso",IDC_CHECK_COMPRESSED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,17,111,68,9 + GROUPBOX "&Informazioni sulla versione",-1,7,129,234,79 + LISTBOX IDC_LIST_PROP_VERSION_TYPES,13,139,107,63,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_LIST_PROP_VERSION_VALUES,123,139,111,63,ES_MULTILINE | ES_READONLY | WS_VSCROLL +END + + STRINGTABLE { IDS_FONT_SEL_DLG_NAME "Applica le impostazioni dei caratteri" - IDS_FONT_SEL_ERROR "Si è verificato un errore durante la selezione del nuovo carattere." -} + IDS_FONT_SEL_ERROR "Si Ã¨ verificato un errore durante la selezione del nuovo carattere." +} + +STRINGTABLE +{ + IDS_WINEFILE "Wine File Manager" + IDS_ERROR "Errore" + IDS_ROOT_FS "root fs" + IDS_UNIXFS "unixfs" + IDS_DESKTOP "Scrivania" + IDS_SHELL "Shell" + IDS_TITLEFMT "%s - %s" + IDS_NO_IMPL "Non ancora implementato" + IDS_WINE_FILE "Wine File" +} + +STRINGTABLE +{ + IDS_COL_NAME "Nome" + IDS_COL_SIZE "Dimensione" + IDS_COL_CDATE "CDate" + IDS_COL_ADATE "ADate" + IDS_COL_MDATE "MDate" + IDS_COL_IDX "Index/Inode" + IDS_COL_LINKS "Collegamenti" + IDS_COL_ATTR "Attributi" + IDS_COL_SEC "Sicurezza" + + IDS_FREE_SPACE_FMT "liberi %s di %s" +} Modified: trunk/rosapps/applications/winfile/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Ja.rc… ============================================================================== --- trunk/rosapps/applications/winfile/Ja.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/Ja.rc [iso-8859-1] Mon Feb 8 11:49:41 2010 @@ -44,7 +44,7 @@ MENUITEM "å§ç¸®(&O)...", 119 MENUITEM "è§£å(&O)...", 120 MENUITEM SEPARATOR - MENUITEM "å®è¡(&R)...", ID_EXECUTE + MENUITEM "å®è¡(&R)...", ID_RUN MENUITEM "å°å·(&P)...", 102 MENUITEM "é¢é£ä»ã...", 103 MENUITEM SEPARATOR @@ -147,21 +147,6 @@ MENUITEM SEPARATOR MENUITEM "Winefile ã«ã¤ãã¦(&A)...", ID_ABOUT } -} - - -IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "å®è¡" -FONT 9, "MS Shell Dlg" -{ - CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "ã³ãã³ã(&C):", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 - EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL - CONTROL "As &Symbol", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 - DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 - PUSHBUTTON "ãã£ã³ã»ã«", 2, 158, 23, 47, 14 - PUSHBUTTON "ãã«ã(&H)", 254, 158, 43, 47, 14 } IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 Modified: trunk/rosapps/applications/winfile/Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Ko.rc… ============================================================================== --- trunk/rosapps/applications/winfile/Ko.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/Ko.rc [iso-8859-1] Mon Feb 8 11:49:41 2010 @@ -42,7 +42,7 @@ MENUITEM "¾ÐÃà(&O)...", 119 MENUITEM "¾ÐÃà Ç®±â(&O)...", 120 MENUITEM SEPARATOR - MENUITEM "½ÇÇà(&R)...", ID_EXECUTE + MENUITEM "½ÇÇà(&R)...", ID_RUN MENUITEM "ÀÎ¼â(&P)...", 102 MENUITEM "¿¬°á...", 103 MENUITEM SEPARATOR @@ -145,21 +145,6 @@ MENUITEM SEPARATOR MENUITEM "Winefile °ü·Ã Á¤º¸(&I)...", ID_ABOUT } -} - - -IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "½ÇÇà" -FONT 9, "MS Shell Dlg" -{ - CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "¸í·É(&C):", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 - EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL - CONTROL "½É¹ú·Î(&S)", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 - DEFPUSHBUTTON "È®ÀÎ", 1, 158, 6, 47, 14 - PUSHBUTTON "Ãë¼Ò", 2, 158, 23, 47, 14 - PUSHBUTTON "µµ¿ò¸»(&H)", 254, 158, 43, 47, 14 } IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 Modified: trunk/rosapps/applications/winfile/Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Lt.rc… ============================================================================== --- trunk/rosapps/applications/winfile/Lt.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/Lt.rc [iso-8859-1] Mon Feb 8 11:49:41 2010 @@ -42,7 +42,7 @@ MENUITEM "&Glaudinti...", 119 MENUITEM "IÅ¡sk&leisti...", 120 MENUITEM SEPARATOR - MENUITEM "&Vykdyti...", ID_EXECUTE + MENUITEM "&Vykdyti...", ID_RUN MENUITEM "&Spausdinti...", 102 MENUITEM "Susieti...", 103 MENUITEM SEPARATOR @@ -145,21 +145,6 @@ MENUITEM SEPARATOR MENUITEM "&Apie Winefile...", ID_ABOUT } -} - - -IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Vykdyti" -FONT 8, "MS Shell Dlg" -{ - CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "&Komanda:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 - EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL - CONTROL "Kaip &simbolÄ¯", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 - DEFPUSHBUTTON "Gerai", 1, 158, 6, 47, 14 - PUSHBUTTON "Atsisakyti", 2, 158, 23, 47, 14 - PUSHBUTTON "&Å½inynas", 254, 158, 43, 47, 14 } IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 Modified: trunk/rosapps/applications/winfile/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Nl.rc… ============================================================================== --- trunk/rosapps/applications/winfile/Nl.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/Nl.rc [iso-8859-1] Mon Feb 8 11:49:41 2010 @@ -38,7 +38,7 @@ MENUITEM "&Comprimeren...", 119 MENUITEM "&Dec&omprimeren...", 120 MENUITEM SEPARATOR - MENUITEM "&Starten...", ID_EXECUTE + MENUITEM "&Starten...", ID_RUN MENUITEM "Af&drukken...", 102 MENUITEM "Koppelen...", 103 MENUITEM SEPARATOR @@ -141,21 +141,6 @@ MENUITEM SEPARATOR MENUITEM "&Over Winefile...", ID_ABOUT } -} - - -IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Uitvoeren" -FONT 8, "MS Shell Dlg" -{ - CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "&Opdracht:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 - EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL - CONTROL "Als &pictogram", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 - DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 - PUSHBUTTON "Annuleren", 2, 158, 23, 47, 14 - PUSHBUTTON "&Help", 254, 158, 43, 47, 14 } IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 Modified: trunk/rosapps/applications/winfile/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/No.rc… ============================================================================== --- trunk/rosapps/applications/winfile/No.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/No.rc [iso-8859-1] Mon Feb 8 11:49:41 2010 @@ -39,7 +39,7 @@ MENUITEM "K&omprimer...", 119 MENUITEM "De&komprimer...", 120 MENUITEM SEPARATOR - MENUITEM "Kjø&r...", ID_EXECUTE + MENUITEM "Kjø&r...", ID_RUN MENUITEM "Skriv &ut...", 102 MENUITEM "Tilknytt...", 103 MENUITEM SEPARATOR @@ -142,21 +142,6 @@ MENUITEM SEPARATOR MENUITEM "&Informasjon om Filbehandling...", ID_ABOUT } -} - - -IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Kjør" -FONT 8, "MS Shell Dlg" -{ - CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "&Kommando:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 - EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL - CONTROL "&Som symbol", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 - DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 - PUSHBUTTON "Avbryt", 2, 158, 23, 47, 14 - PUSHBUTTON "&Hjelp", 254, 158, 43, 47, 14 } IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 Modified: trunk/rosapps/applications/winfile/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Pl.rc… ============================================================================== --- trunk/rosapps/applications/winfile/Pl.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/Pl.rc [iso-8859-1] Mon Feb 8 11:49:41 2010 @@ -42,7 +42,7 @@ MENUITEM "Ko&mpresja...", 119 MENUITEM "D&ekompresja...", 120 MENUITEM SEPARATOR - MENUITEM "U&ruchom...", ID_EXECUTE + MENUITEM "U&ruchom...", ID_RUN MENUITEM "&Drukuj...", 102 MENUITEM "Skojarz...", 103 MENUITEM SEPARATOR @@ -145,21 +145,6 @@ MENUITEM SEPARATOR MENUITEM "&Winefile...", ID_ABOUT } -} - - -IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Uruchom" -FONT 8, "MS Shell Dlg" -{ - CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "&Polecenie:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 - EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL - CONTROL "Jako &symbol", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 - DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 - PUSHBUTTON "Anuluj", 2, 158, 23, 47, 14 - PUSHBUTTON "&Pomoc", 254, 158, 43, 47, 14 } IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 Modified: trunk/rosapps/applications/winfile/Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Pt.rc… ============================================================================== --- trunk/rosapps/applications/winfile/Pt.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/Pt.rc [iso-8859-1] Mon Feb 8 11:49:41 2010 @@ -42,7 +42,7 @@ MENUITEM "C&omprimir...", 119 MENUITEM "Descomprimir...", 120 MENUITEM SEPARATOR - MENUITEM "Execu&tar...", ID_EXECUTE + MENUITEM "Execu&tar...", ID_RUN MENUITEM "&Imprimir...", 102 MENUITEM "A&ssociar...", 103 MENUITEM SEPARATOR @@ -163,7 +163,7 @@ MENUITEM "C&omprimir...", 119 MENUITEM "&Descomprimir...", 120 MENUITEM SEPARATOR - MENUITEM "Execu&tar...", ID_EXECUTE + MENUITEM "Execu&tar...", ID_RUN MENUITEM "&Imprimir...", 102 MENUITEM "A&ssociar...", 103 MENUITEM SEPARATOR @@ -267,24 +267,6 @@ MENUITEM "&Sobre o Winefile...", ID_ABOUT } } - - -LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL - -IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Executar" -FONT 8, "MS Shell Dlg" -{ - CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "&Comando:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 - EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL - CONTROL "&Minimizado", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 - DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 - PUSHBUTTON "Cancelar", 2, 158, 23, 47, 14 - PUSHBUTTON "&Ajuda", 254, 158, 43, 47, 14 -} - LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN Modified: trunk/rosapps/applications/winfile/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Ru.rc… ============================================================================== --- trunk/rosapps/applications/winfile/Ru.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/Ru.rc [iso-8859-1] Mon Feb 8 11:49:41 2010 @@ -42,7 +42,7 @@ MENUITEM "ÐÑÑÐ¸Ð²Ð¸ÑÐ¾Ð²Ð°ÑÑ...", 119 MENUITEM "Ð Ð°ÑÐ¿Ð°ÐºÐ¾Ð²Ð°ÑÑ...", 120 MENUITEM SEPARATOR - MENUITEM "&ÐÐ°Ð¿ÑÑÑÐ¸ÑÑ...", ID_EXECUTE + MENUITEM "&ÐÐ°Ð¿ÑÑÑÐ¸ÑÑ...", ID_RUN MENUITEM "&ÐÐµÑÐ°ÑÐ°ÑÑ...", 102 MENUITEM "ÐÑÑÐ¾ÑÐ¸Ð¸ÑÐ¾Ð²Ð°ÑÑ...", 103 MENUITEM SEPARATOR @@ -147,20 +147,6 @@ } } - -IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "ÐÑÐ¿Ð¾Ð»Ð½Ð¸ÑÑ" -FONT 8, "MS Shell Dlg" -{ - CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "&ÐÐ¾Ð¼Ð°Ð½Ð´Ð°:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 - EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL - CONTROL "ÐÐ°Ðº &ÑÐ¸Ð¼Ð²Ð¾Ð»", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 - DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 - PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", 2, 158, 23, 47, 14 - PUSHBUTTON "&Ð¡Ð¿ÑÐ°Ð²ÐºÐ°", 254, 158, 43, 47, 14 -} IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "ÐÑÐ±ÐµÑÐ¸ÑÐµ Ð¿ÑÑÑ Ð½Ð°Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ" Modified: trunk/rosapps/applications/winfile/Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Si.rc… ============================================================================== --- trunk/rosapps/applications/winfile/Si.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/Si.rc [iso-8859-1] Mon Feb 8 11:49:41 2010 @@ -41,7 +41,7 @@ MENUITEM "&Stisni ...", 119 MENUITEM "Ra&zÅ¡iri ...", 120 MENUITEM SEPARATOR - MENUITEM "ZaÅ¾&eni ...", ID_EXECUTE + MENUITEM "ZaÅ¾&eni ...", ID_RUN MENUITEM "&Tiskaj ...", 102 MENUITEM "PoveÅ¾i s programom ...", 103 MENUITEM SEPARATOR @@ -144,21 +144,6 @@ MENUITEM SEPARATOR MENUITEM "&O Winefile ...", ID_ABOUT } -} - - -IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Zagon" -FONT 8, "MS Shell Dlg" -{ - CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "&Ukaz:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 - EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL - CONTROL "Kot &simbol", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 - DEFPUSHBUTTON "V redu", 1, 158, 6, 47, 14 - PUSHBUTTON "PrekliÄi", 2, 158, 23, 47, 14 - PUSHBUTTON "&PomoÄ", 254, 158, 43, 47, 14 } IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 Modified: trunk/rosapps/applications/winfile/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Sv.rc… ============================================================================== --- trunk/rosapps/applications/winfile/Sv.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/Sv.rc [iso-8859-1] Mon Feb 8 11:49:41 2010 @@ -42,7 +42,7 @@ MENUITEM "&Komprimera...", 119 MENUITEM "Packa &upp...", 120 MENUITEM SEPARATOR - MENUITEM "&Kör...", ID_EXECUTE + MENUITEM "&Kör...", ID_RUN MENUITEM "&Skriv ut...", 102 MENUITEM "Associera...", 103 MENUITEM SEPARATOR @@ -144,21 +144,6 @@ MENUITEM SEPARATOR MENUITEM "Information om &Winefile...", ID_ABOUT } -} - - -IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Kör" -FONT 8, "MS Shell Dlg" -{ - CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "&Kommando:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 - EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL - CONTROL "Som &symbol", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 - DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 - PUSHBUTTON "Avbryt", 2, 158, 23, 47, 14 - PUSHBUTTON "&Hjälp", 254, 158, 43, 47, 14 } IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 Modified: trunk/rosapps/applications/winfile/Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Tr.rc… ============================================================================== --- trunk/rosapps/applications/winfile/Tr.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/Tr.rc [iso-8859-1] Mon Feb 8 11:49:41 2010 @@ -39,7 +39,7 @@ MENUITEM "S&ýkýþtýr...", 119 MENUITEM "Geni&þlet...", 120 MENUITEM SEPARATOR - MENUITEM "&Çalýþtýr...", ID_EXECUTE + MENUITEM "&Çalýþtýr...", ID_RUN MENUITEM "Ya&zdýr...", 102 MENUITEM "Ýliþkilendir...", 103 MENUITEM SEPARATOR @@ -142,21 +142,6 @@ MENUITEM SEPARATOR MENUITEM "Winefile hakkýnda &bilgi...", ID_ABOUT } -} - - -IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Çalýþtýr" -FONT 8, "MS Shell Dlg" -{ - CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "&Komut:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 - EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL - CONTROL "&Simge Olarak", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 - DEFPUSHBUTTON "Tamam", 1, 158, 6, 47, 14 - PUSHBUTTON "Ýptal", 2, 158, 23, 47, 14 - PUSHBUTTON "&Yardým", 254, 158, 43, 47, 14 } IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 Added: trunk/rosapps/applications/winfile/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Uk.rc… ============================================================================== --- trunk/rosapps/applications/winfile/Uk.rc (added) +++ trunk/rosapps/applications/winfile/Uk.rc [iso-8859-1] Mon Feb 8 11:49:41 2010 @@ -1,0 +1,251 @@ +/* + * WineFile + * Ukrainian Language Support + * + * Copyright 2000 Martin Fuchs + * Copyright 2002 Steven Edwards + * Copyright 2002 Alexandre Julliard + * Copyright 2010 Igor Paliychuk + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resource.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +/* Menu */ + +IDM_WINEFILE MENU FIXED IMPURE +{ + POPUP "&Ð¤Ð°Ð¹Ð»" { + MENUITEM "&ÐÑÐ´ÐºÑÐ¸ÑÐ¸\tEnter", ID_ACTIVATE + MENUITEM "&ÐÐµÑÐµÐ¼ÑÑÑÐ¸ÑÐ¸...\tF7", ID_FILE_MOVE + MENUITEM "&ÐÐ¾Ð¿ÑÑÐ²Ð°ÑÐ¸...\tF8", ID_FILE_COPY + MENUITEM "Ð &Ð±ÑÑÐµÑ Ð¾Ð±Ð¼ÑÐ½Ñ...\tF9", 118 + MENUITEM "ÐÐ¸Ð´Ð°&Ð»Ð¸ÑÐ¸\tDel", ID_FILE_DELETE + MENUITEM "ÐÐµÑÐµ&Ð¹Ð¼ÐµÐ½ÑÐ²Ð°ÑÐ¸...", 109 + MENUITEM "ÐÐ»Ð°ÑÑÐ¸Ð²Ð¾Ñ&ÑÑ...\tAlt+Enter", ID_EDIT_PROPERTIES + MENUITEM SEPARATOR + MENUITEM "ÐÐ°Ð¿Ð°Ðº&ÑÐ²Ð°ÑÐ¸...", 119 + MENUITEM "Ð &Ð¾Ð·Ð¿Ð°ÐºÑÐ²Ð°ÑÐ¸...", 120 + MENUITEM SEPARATOR + MENUITEM "&ÐÐ°Ð¿ÑÑÑÐ¸ÑÐ¸...", ID_RUN + MENUITEM "&ÐÑÑÐº...", 102 + MENUITEM "ÐÑÐ¾ÑÑÑÐ²Ð°ÑÐ¸...", 103 + MENUITEM SEPARATOR + MENUITEM "Ð¡ÑÐ²Ð¾ÑÐ¸ÑÐ¸ Ð´Ð¸ÑÐµÐºÑÐ¾ÑÑ&Ñ...", 111 + MENUITEM "ÐÐ¾&ÑÑÐº...", 104 + MENUITEM "ÐÐ¸Ð´ÑÐ»Ð¸ÑÐ¸ &ÑÐ°Ð¹Ð»Ð¸...", 116 + MENUITEM SEPARATOR +#ifndef _NO_EXTENSIONS + MENUITEM "ÐÐ¸&ÑÑÐ´\tAlt+X", ID_FILE_EXIT +#else + MENUITEM "ÐÐ¸&ÑÑÐ´", ID_FILE_EXIT +#endif + } + + POPUP "&ÐÐ¸ÑÐº" { + MENUITEM "&ÐÐ¾Ð¿ÑÑÐ²Ð°ÑÐ¸ Ð´Ð¸ÑÐº...", 201 + MENUITEM "&ÐÑÑÐºÐ° ÑÐ¾Ð¼Ñ...", 202 + MENUITEM SEPARATOR + MENUITEM "&Ð¤Ð¾ÑÐ¼Ð°ÑÑÐ²Ð°ÑÐ¸ Ð´Ð¸ÑÐº...", ID_FORMAT_DISK +#ifdef _WIN95 + MENUITEM "&Ð¡ÑÐ²Ð¾ÑÐ¸ÑÐ¸ ÑÐ¸ÑÑÐµÐ¼Ð½Ð¸Ð¹ Ð´Ð¸ÑÐº...", -1 /*TODO*/ +#endif + MENUITEM SEPARATOR + MENUITEM "ÐÑÐ´ÐºÐ»ÑÑÐ¸ÑÐ¸ &Ð¼ÐµÑÐµÐ¶Ð½Ð¸Ð¹ Ð´Ð¸ÑÐº", ID_CONNECT_NETWORK_DRIVE + MENUITEM "&ÐÑÐ´ÐºÐ»ÑÑÐ¸ÑÐ¸ Ð¼ÐµÑÐµÐ¶Ð½Ð¸Ð¹ Ð´Ð¸ÑÐº", ID_DISCONNECT_NETWORK_DRIVE + MENUITEM SEPARATOR + MENUITEM "ÐÑÐ¾Ð±Ð¸ÑÐ¸ ÑÐ¿ÑÐ»ÑÐ½Ð¸Ð¼ ÑÐº...", 254 + MENUITEM "&ÐÐ°ÐºÑÐ¸ÑÐ¸ ÑÐ¿ÑÐ»ÑÐ½Ð¸Ð¹ Ð´Ð¾ÑÑÑÐ¿...", 255 + MENUITEM SEPARATOR + MENUITEM "ÐÐ¸&Ð±ÑÐ°ÑÐ¸ Ð´Ð¸ÑÐº...", 251 + } + + POPUP "ÐÐ¸&ÑÐµÐºÑÐ¾ÑÑÑ" { + MENUITEM "&ÐÐ°ÑÑÑÐ¿Ð½Ð¸Ð¹ ÑÑÐ²ÐµÐ½Ñ\t+", 301 + MENUITEM "Ð Ð¾Ð·Ð³Ð¾ÑÐ½ÑÑÐ¸ &Ð´ÐµÑÐµÐ²Ð¾\t*", 302 + MENUITEM "Ð Ð¾Ð·Ð³Ð¾ÑÐ½ÑÑÐ¸ &Ð²ÑÐµ\tStrg+*", 303 + MENUITEM "ÐÐ³Ð¾ÑÐ½ÑÑÐ¸ Ð´&ÐµÑÐµÐ²Ð¾\t-", 304 + MENUITEM SEPARATOR + MENUITEM "&Mark Children", 505 + } + + POPUP "&ÐÐ¸Ð³Ð»ÑÐ´" { + MENUITEM "ÐÐµÑÐµ&Ð²Ð¾ Ñ Ð´Ð¸ÑÐµÐºÑÐ¾ÑÑÑ", 413 + MENUITEM "ÐÐ¸ÑÐµ Ð´&ÐµÑÐµÐ²Ð¾", 411 + MENUITEM "ÐÐ¸ÑÐµ Ð´&Ð¸ÑÐµÐºÑÐ¾ÑÑÑ", 412 + MENUITEM SEPARATOR + MENUITEM "Ð Ð¾Ð·&Ð±Ð¸ÑÐ¸", ID_VIEW_SPLIT + MENUITEM SEPARATOR + MENUITEM "&ÐÐ¼'Ñ", ID_VIEW_NAME + MENUITEM "ÐÑÑ Ð´Ð°Ð½Ñ Ð¿ÑÐ¾ ÑÐ°Ð¹&Ð»", ID_VIEW_ALL_ATTRIBUTES, CHECKED + MENUITEM "&Ð§Ð°ÑÑÐºÐ¾Ð²Ñ Ð´Ð°Ð½Ñ...", ID_VIEW_SELECTED_ATTRIBUTES + MENUITEM SEPARATOR + MENUITEM "&Ð¡Ð¾ÑÑÑÐ²Ð°ÑÐ¸ Ð·Ð° ÑÐ¼'ÑÐ¼", ID_VIEW_SORT_NAME + MENUITEM "Ð¡Ð¾ÑÑÑÐ²Ð°ÑÐ¸ Ð·Ð° &ÑÐ¸Ð¿Ð¾Ð¼", ID_VIEW_SORT_TYPE + MENUITEM "Ð¡Ð¾ÑÑÑÐ²Ð°ÑÐ¸ Ð·Ð° ÑÐ¾&Ð·Ð¼ÑÑÐ¾Ð¼", ID_VIEW_SORT_SIZE + MENUITEM "Ð¡Ð¾ÑÑÑÐ²Ð°ÑÐ¸ Ð·Ð° &Ð´Ð°ÑÐ¾Ñ", ID_VIEW_SORT_DATE + MENUITEM SEPARATOR + MENUITEM "Ð¡Ð¾ÑÑÑÐ²Ð°ÑÐ¸ Ð·Ð° &...", ID_VIEW_FILTER + } + + POPUP "&ÐÐ°Ð»Ð°ÑÑÑÐ²Ð°Ð½Ð½Ñ" { + MENUITEM "&ÐÑÐ´ÑÐ²ÐµÑÐ´Ð¶ÐµÐ½Ð½Ñ...", 501 + MENUITEM "&Ð¨ÑÐ¸ÑÑ...", ID_SELECT_FONT + MENUITEM "Customize Tool&bar...", 512 + MENUITEM SEPARATOR + MENUITEM "&Toolbar", ID_VIEW_TOOL_BAR, CHECKED + MENUITEM "ÐÐ°Ð½ÐµÐ»Ñ &Ð´Ð¸ÑÐºÑÐ²", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "&Ð ÑÐ´Ð¾Ðº ÑÑÐ°Ð½Ñ", ID_VIEW_STATUSBAR, CHECKED +#ifndef _NO_EXTENSIONS + MENUITEM "Ð&ÐµÑÑ ÐµÐºÑÐ°Ð½\tCtrl+Shift+S", ID_VIEW_FULLSCREEN +#endif + MENUITEM SEPARATOR + MENUITEM "&Minimize on run", 504 + MENUITEM "&ÐÐ±ÐµÑÐµÐ³ÑÐ¸ Ð½Ð°Ð»Ð°ÑÑÑÐ²Ð°Ð½Ð½Ñ Ð¿ÐµÑÐµÐ´ Ð²Ð¸ÑÐ¾Ð´Ð¾Ð¼", ID_VIEW_SAVESETTINGS + } + + + POPUP "&ÐÐµÐ·Ð¿ÐµÐºÐ°" { + MENUITEM "&ÐÐ¾ÑÑÑÐ¿...", 605 + MENUITEM "&Logging...", 606 + MENUITEM "&ÐÐ»Ð°ÑÐ½Ð¸Ðº...", 607 + } + + POPUP "ÐÑ&ÐºÐ½Ð¾" { + MENUITEM "ÐÐ¾Ð²Ðµ &ÐÑÐºÐ½Ð¾", ID_WINDOW_NEW + MENUITEM "ÐÑÐºÐ½Ð° ÐºÐ°ÑÐºÐ°Ð´Ð¾Ð¼\tCtrl+F5", ID_WINDOW_CASCADE + MENUITEM "Tile &Horizontally", ID_WINDOW_TILE_HORZ + MENUITEM "Tile &Vertically\tCtrl+F4", ID_WINDOW_TILE_VERT +#ifndef _NO_EXTENSIONS + MENUITEM "ÐÐ¿Ð¾ÑÑÐ´ÐºÑÐ²Ð°ÑÐ¸ Ð°Ð²ÑÐ¾Ð¼Ð°ÑÐ¸ÑÐ½Ð¾", ID_WINDOW_AUTOSORT +#endif + MENUITEM "Arrange &Symbols", ID_WINDOW_ARRANGE + MENUITEM "&ÐÐ½Ð¾Ð²Ð¸ÑÐ¸\tF5", ID_REFRESH + } + + POPUP "ÐÐ¾Ð²ÑÐ´Ðº&Ð°" { + MENUITEM "&Ð Ð¾Ð·Ð´ÑÐ»Ð¸ Ð´Ð¾Ð²ÑÐ´ÐºÐ¸\tF1", ID_HELP + MENUITEM "ÐÐ¾&ÑÑÐº...\tF1", ID_HELP + MENUITEM "&ÐÐ¾ÑÐ¸ÑÑÑÐ²Ð°Ð½Ð½Ñ Ð´Ð¾Ð²ÑÐ´ÐºÐ¾Ñ\tF1", ID_HELP_USING + MENUITEM SEPARATOR + MENUITEM "&ÐÑÐ¾ Winefile...", ID_ABOUT + } +} + +IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "ÐÐ¸Ð±ÐµÑÑÑÑ ÑÐ»ÑÑ Ð¿ÑÐ¸Ð·Ð½Ð°ÑÐµÐ½Ð½Ñ" +FONT 8, "MS Shell Dlg" +{ + CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 + CONTROL "&Ð¨Ð»ÑÑ:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 + EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL + DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 + PUSHBUTTON "Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸", 2, 158, 23, 47, 14 + PUSHBUTTON "&ÐÐ³Ð»ÑÐ´", 254, 158, 43, 47, 14 +} + +IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "ÐÐ° ÑÐ¸Ð¿Ð¾Ð¼ ÑÐ°Ð¹Ð»ÑÐ²" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "&ÐÐ¼'Ñ:",-1,7,8,22,10 + EDITTEXT IDC_VIEW_PATTERN,31,7,63,12,ES_AUTOHSCROLL + GROUPBOX "Ð¢Ð¸Ð¿ ÑÐ°Ð¹Ð»Ñ",-1,7,23,87,56 + CONTROL "&ÐÐ¸ÑÐµÐºÑÐ¾ÑÑÑ",IDC_VIEW_TYPE_DIRECTORIES,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,32,70,10 + CONTROL "&ÐÑÐ¾Ð³ÑÐ°Ð¼Ð¸",IDC_VIEW_TYPE_PROGRAMS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,43,70,10 + CONTROL "ÐÐ¾ÐºÑ&Ð¼ÐµÐ½ÑÐ¸",IDC_VIEW_TYPE_DOCUMENTS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,54,70,10 + CONTROL "ÐÐ½ÑÑ &ÑÐ°Ð¹Ð»Ð¸",IDC_VIEW_TYPE_OTHERS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,65,70,10 + CONTROL "ÐÐ¾ÐºÐ°Ð·Ð°ÑÐ¸ Ð¿ÑÐ¸ÑÐ¾Ð²Ð°Ð½Ñ/&Ð¡Ð¸ÑÑÐµÐ¼Ð½Ñ ÑÐ°Ð¹Ð»Ð¸",IDC_VIEW_TYPE_HIDDEN, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,81,106,9 + DEFPUSHBUTTON "OK",IDOK,104,7,50,14 + PUSHBUTTON "Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸",IDCANCEL,104,24,50,14 +END + +IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE 0, 0, 248, 215 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "ÐÐ»Ð°ÑÑÐ¸Ð²Ð¾ÑÑÑ Ð´Ð»Ñ %s" +FONT 8, "MS Sans Serif" +BEGIN + DEFPUSHBUTTON "OK",IDOK,191,7,50,14 + PUSHBUTTON "Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸",IDCANCEL,191,29,50,14 + LTEXT "ÐÐ¼'Ñ &ÑÐ°Ð¹Ð»Ñ:",-1,7,7,59,9 + EDITTEXT IDC_STATIC_PROP_FILENAME,71,7,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "ÐÐ¾Ð²Ð½Ð¸Ð¹ &ÑÐ»ÑÑ:",-1,7,18,59,9 + EDITTEXT IDC_STATIC_PROP_PATH,71,18,120,9, ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "ÐÑÑÐ°Ð½Ð½Ñ Ð·Ð¼ÑÐ½Ð¸:",-1,7,29,59,9 + EDITTEXT IDC_STATIC_PROP_LASTCHANGE,71,29,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "ÐÐµÑÑÑÑ:",-1,7,40,59,9 + EDITTEXT IDC_STATIC_PROP_VERSION,71,40,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Cop&yright:",-1,7,51,59,9 + EDITTEXT IDC_STATIC_PROP_COPYRIGHT,71,51,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Ð Ð¾Ð·Ð¼ÑÑ:",-1,7,62,59,9 + EDITTEXT IDC_STATIC_PROP_SIZE,71,62,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + GROUPBOX "ÐÑÑÐ¸Ð±ÑÑÐ¸",-1,7,79,158,46 + CONTROL "&ÐÐ¸ÑÐµ Ð´Ð»Ñ ÑÐ¸ÑÐ°Ð½Ð½Ñ",IDC_CHECK_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,91,68,9 + CONTROL "ÐÑ&Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ð¹",IDC_CHECK_HIDDEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,91,68,9 + CONTROL "&ÐÑÑÑÐ²",IDC_CHECK_ARCHIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,101,68,9 + CONTROL "&Ð¡Ð¸ÑÐµÐ¼Ð½Ð¸Ð¹",IDC_CHECK_SYSTEM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,101,68,9 + CONTROL "Ð¡&ÑÐ¸ÑÐ½ÑÑÐ¸Ð¹",IDC_CHECK_COMPRESSED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,17,111,68,9 + GROUPBOX "ÐÐ°Ð½Ñ Ð¿ÑÐ¾ Ð²Ðµ&ÑÑÑÑ",-1,7,129,234,79 + LISTBOX IDC_LIST_PROP_VERSION_TYPES,13,139,107,63,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_LIST_PROP_VERSION_VALUES,123,139,111,63,ES_MULTILINE | ES_READONLY | WS_VSCROLL +END + + +STRINGTABLE +{ + IDS_FONT_SEL_DLG_NAME "ÐÐ°ÑÑÐ¾ÑÑÐ²Ð°Ð½Ð½Ñ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÑÐ² ÑÑÐ¸ÑÑÐ°" + IDS_FONT_SEL_ERROR "ÐÐ¾Ð¼Ð¸Ð»ÐºÐ° Ð¿ÑÐ¸ Ð²Ð¸Ð±Ð¾ÑÑ Ð½Ð¾Ð²Ð¾Ð³Ð¾ ÑÑÐ¸ÑÑÐ°." +} + +STRINGTABLE +{ + IDS_WINEFILE "Wine File Manager" + IDS_ERROR "ÐÐ¾Ð¼Ð¸Ð»ÐºÐ°" + IDS_ROOT_FS "root fs" + IDS_UNIXFS "unixfs" + IDS_DESKTOP "Ð Ð¾Ð±Ð¾ÑÐ¸Ð¹ ÑÑÑÐ»" + IDS_SHELL "Shell" + IDS_TITLEFMT "%s - %s" + IDS_NO_IMPL "Ð©Ðµ Ð½Ðµ ÑÐµÐ°Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¾" + IDS_WINE_FILE "Wine File" +} + +STRINGTABLE +{ + IDS_COL_NAME "ÐÐ¼'Ñ" + IDS_COL_SIZE "Ð Ð¾Ð·Ð¼ÑÑ" + IDS_COL_CDATE "CDate" + IDS_COL_ADATE "ADate" + IDS_COL_MDATE "MDate" + IDS_COL_IDX "Index/Inode" + IDS_COL_LINKS "ÐÐ¾ÑÐ¸Ð»Ð°Ð½Ð½Ñ" + IDS_COL_ATTR "ÐÑÑÐ¸Ð±ÑÑÐ¸" + IDS_COL_SEC "ÐÐµÐ·Ð¿ÐµÐºÐ°" + + IDS_FREE_SPACE_FMT "%s Ð· %s Ð²ÑÐ»ÑÐ½Ð¾" +} Propchange: trunk/rosapps/applications/winfile/Uk.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/winfile/Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Zh.rc… ============================================================================== --- trunk/rosapps/applications/winfile/Zh.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/Zh.rc [iso-8859-1] Mon Feb 8 11:49:41 2010 @@ -1,4 +1,4 @@ -/* +ï»¿/* * WineFile * Simplified and Traditional Chinese Language Support * @@ -43,7 +43,7 @@ MENUITEM "åç¼©(&O)...", 119 MENUITEM "è§£åç¼©(&O)...", 120 MENUITEM SEPARATOR - MENUITEM "è¿è¡(&R)...", ID_EXECUTE + MENUITEM "è¿è¡(&R)...", ID_RUN MENUITEM "æå°(&P)...", 102 MENUITEM "éç½®æä»¶ç¸å³...", 103 MENUITEM SEPARATOR @@ -146,21 +146,6 @@ MENUITEM SEPARATOR MENUITEM "&å³äº Winefile...", ID_ABOUT } -} - - -IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "è¿è¡" -FONT 9, "MS Shell Dlg" -{ - CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "å½ä»¤(&C):", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 - EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL - CONTROL "ä½ä¸ºè¿æ¥(&S)", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 - DEFPUSHBUTTON "ç¡®å®", 1, 158, 6, 47, 14 - PUSHBUTTON "åæ¶", 2, 158, 23, 47, 14 - PUSHBUTTON "å¸®å©(&H)", 254, 158, 43, 47, 14 } LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL @@ -181,7 +166,7 @@ MENUITEM "å£ç¸®(&O)...", 119 MENUITEM "è§£å£ç¸®(&O)...", 120 MENUITEM SEPARATOR - MENUITEM "å·è¡(&R)...", ID_EXECUTE + MENUITEM "å·è¡(&R)...", ID_RUN MENUITEM "åå°(&P)...", 102 MENUITEM "éç½®æªæ¡ç¸é...", 103 MENUITEM SEPARATOR @@ -285,19 +270,4 @@ MENUITEM "&éæ¼ Winefile...", ID_ABOUT } } - - -IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "å·è¡" -FONT 9, "MS Shell Dlg" -{ - CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "æä»¤(&C):", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 - EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL - CONTROL "ä½çºé£æ¥(&S)", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 - DEFPUSHBUTTON "ç¢ºå®", 1, 158, 6, 47, 14 - PUSHBUTTON "åæ¶", 2, 158, 23, 47, 14 - PUSHBUTTON "å¹«å©(&H)", 254, 158, 43, 47, 14 -} #pragma code_page(default) Modified: trunk/rosapps/applications/winfile/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/resou… ============================================================================== --- trunk/rosapps/applications/winfile/resource.h [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/resource.h [iso-8859-1] Mon Feb 8 11:49:41 2010 @@ -35,7 +35,6 @@ /* dialogs */ -#define IDD_EXECUTE 103 #define IDD_SELECT_DESTINATION 104 #define IDD_DIALOG_VIEW_TYPE 105 #define IDD_DIALOG_PROPERTIES 106 @@ -44,7 +43,7 @@ /* control ids */ #define ID_ACTIVATE 101 -#define ID_EXECUTE 105 +#define ID_RUN 105 #define ID_FILE_MOVE 106 #define ID_FILE_COPY 107 #define ID_FILE_DELETE 108 Modified: trunk/rosapps/applications/winfile/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/rsrc.… ============================================================================== --- trunk/rosapps/applications/winfile/rsrc.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/rsrc.rc [iso-8859-1] Mon Feb 8 11:49:41 2010 @@ -71,4 +71,5 @@ #include "Si.rc" #include "Sv.rc" #include "Tr.rc" +#include "Uk.rc" #include "Zh.rc" Modified: trunk/rosapps/applications/winfile/winefile.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/winef… ============================================================================== --- trunk/rosapps/applications/winfile/winefile.c [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/winefile.c [iso-8859-1] Mon Feb 8 11:49:41 2010 @@ -1688,37 +1688,17 @@ return child->hwnd; } - -struct ExecuteDialog { - WCHAR cmd[MAX_PATH]; - int cmdshow; -}; - -static INT_PTR CALLBACK ExecuteDialogDlgProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam) -{ - static struct ExecuteDialog* dlg; - - switch(nmsg) { - case WM_INITDIALOG: - dlg = (struct ExecuteDialog*) lparam; - return 1; - - case WM_COMMAND: { - int id = (int)wparam; - - if (id == IDOK) { - GetWindowTextW(GetDlgItem(hwnd, 201), dlg->cmd, MAX_PATH); - dlg->cmdshow = get_check(hwnd,214) ? SW_SHOWMINIMIZED : SW_SHOWNORMAL; - EndDialog(hwnd, id); - } else if (id == IDCANCEL) - EndDialog(hwnd, id); - - return 1;} - } - - return 0; -} - +#define RFF_NODEFAULT 0x02 /* No default item selected. */ + +static void WineFile_OnRun( HWND hwnd ) +{ + static const WCHAR shell32_dll[] = {'S','H','E','L','L','3','2','.','D','L','L',0}; + void (WINAPI *pRunFileDlgAW )(HWND, HICON, LPWSTR, LPWSTR, LPWSTR, DWORD); + HMODULE hshell = GetModuleHandleW( shell32_dll ); + + pRunFileDlgAW = (void*)GetProcAddress(hshell, (LPCSTR)61); + if (pRunFileDlgAW) pRunFileDlgAW( hwnd, 0, NULL, NULL, NULL, RFF_NODEFAULT); +} static INT_PTR CALLBACK DestinationDlgProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam) { @@ -2268,18 +2248,9 @@ Globals.saveSettings ? MF_CHECKED : MF_UNCHECKED ); break; - case ID_EXECUTE: { - struct ExecuteDialog dlg; - - memset(&dlg, 0, sizeof(struct ExecuteDialog)); - - if (DialogBoxParamW(Globals.hInstance, MAKEINTRESOURCEW(IDD_EXECUTE), hwnd, ExecuteDialogDlgProc, (LPARAM)&dlg) == IDOK) { - HINSTANCE hinst = ShellExecuteW(hwnd, NULL/*operation*/, dlg.cmd/*file*/, NULL/*parameters*/, NULL/*dir*/, dlg.cmdshow); - - if (PtrToUlong(hinst) <= 32) - display_error(hwnd, GetLastError()); - } - break;} + case ID_RUN: + WineFile_OnRun( hwnd ); + break; case ID_CONNECT_NETWORK_DRIVE: { DWORD ret = WNetConnectionDialog(hwnd, RESOURCETYPE_DISK);

1 0

[dreimer] 45495: Sync wordpad, write and xcopy to Wine 1.1.38
by dreimer＠svn.reactos.org 08 Feb '10

08 Feb '10

Author: dreimer Date: Mon Feb 8 11:49:03 2010 New Revision: 45495 URL: http://svn.reactos.org/svn/reactos?rev=45495&view=rev Log: Sync wordpad, write and xcopy to Wine 1.1.38 Added: trunk/reactos/base/applications/cmdutils/xcopy/It.rc (with props) trunk/reactos/base/applications/cmdutils/xcopy/Uk.rc (with props) trunk/reactos/base/applications/wordpad/It.rc (with props) trunk/reactos/base/applications/wordpad/Uk.rc (with props) trunk/reactos/base/applications/write/It.rc (with props) trunk/reactos/base/applications/write/Uk.rc (with props) Modified: trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc trunk/reactos/base/applications/wordpad/Da.rc trunk/reactos/base/applications/wordpad/En.rc trunk/reactos/base/applications/wordpad/Fr.rc trunk/reactos/base/applications/wordpad/Hu.rc trunk/reactos/base/applications/wordpad/Ja.rc trunk/reactos/base/applications/wordpad/Ko.rc trunk/reactos/base/applications/wordpad/Lt.rc trunk/reactos/base/applications/wordpad/Nl.rc trunk/reactos/base/applications/wordpad/No.rc trunk/reactos/base/applications/wordpad/Pl.rc trunk/reactos/base/applications/wordpad/Pt.rc trunk/reactos/base/applications/wordpad/Ru.rc trunk/reactos/base/applications/wordpad/Si.rc trunk/reactos/base/applications/wordpad/Sv.rc trunk/reactos/base/applications/wordpad/Tr.rc trunk/reactos/base/applications/wordpad/Zh.rc trunk/reactos/base/applications/wordpad/print.c trunk/reactos/base/applications/wordpad/rsrc.rc trunk/reactos/base/applications/wordpad/wordpad.c trunk/reactos/base/applications/wordpad/wordpad.h trunk/reactos/base/applications/write/rsrc.rc Added: trunk/reactos/base/applications/cmdutils/xcopy/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/It.rc (added) +++ trunk/reactos/base/applications/cmdutils/xcopy/It.rc [iso-8859-1] Mon Feb 8 11:49:03 2010 @@ -1,0 +1,84 @@ +ï»¿/* + * XCOPY - Wine-compatible xcopy program + * Italian language support + * + * Copyright (C) 2010 Luca Bennati + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "xcopy.h" + +/*UTF-8*/ +#pragma code_page(65001) + +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +STRINGTABLE +{ + STRING_INVPARMS, "Numero non valido di parametri - Digita xcopy /? per l'aiuto\n" + STRING_INVPARM, "Parametro '%s' non valido - Digita xcopy /? per l'aiuto\n" + STRING_PAUSE, "Premi Invio per iniziare a copiare\n" + STRING_SIMCOPY, "%d file(s) sarebbero copiati\n" + STRING_COPY, "%d file(s) copiati\n" + STRING_QISDIR, "'%s' Ã¨ il nome di un file o una cartella\n" \ + "sull'obiettivo?\n" \ + "(F - File, C - Cartella)\n" + STRING_SRCPROMPT,"%s? (SÃ¬|No)\n" + STRING_OVERWRITE,"Sovrascrivere %s? (SÃ¬|No|Tutti)\n" + STRING_COPYFAIL, "La copia di '%s' in '%s' Ã¨ fallita con r/c %d\n" + STRING_OPENFAIL, "Impossibile aprire '%s'\n" + STRING_READFAIL, "Errore durante la lettura di '%s'\n" + STRING_YES_CHAR, "S" + STRING_NO_CHAR, "N" + STRING_ALL_CHAR, "T" + STRING_FILE_CHAR,"F" + STRING_DIR_CHAR, "C" + + STRING_HELP, +"XCOPY - Copia file(s) e alberi di cartelle sorgenti in una destinazione\n\ +\n\ +Sintassi:\n\ +XCOPY sorgente [destinazione] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\n\ +Dove:\n\ +\n\ +[/I] Assumi una cartella se la destinazione non esiste e sono copiati 2 o\n\ +\tpiÃ¹ files\n\ +[/S] Copia le cartelle e le sottocartelle\n\ +[/E] Copia le cartelle e le sottocartelle, includendo quelle vuote\n\ +[/Q] Non mostrare i nomi durante la copia, modalitÃ silenziosa.\n\ +[/F] Mostra i nomi completi della sorgente e della destinazione durante la copia\n\ +[/L] Simula l'operazione, mostrando i nome che sarebbero copiati\n\ +[/W] Prompts before beginning the copy operation\n\ +[/T] Crea la struttura di cartelle vuote ma non copia i files\n\ +[/Y] Disabilita le conferme quando sono sovrascritti files\n\ +[/-Y] Abilita le conferme quando sono sovrascritti files\n\ +[/P] Chiede conferma per ogni file sorgente prima di copiare\n\ +[/N] Copia usando gli short names\n\ +[/U] Copia solo files che sono giÃ presenti nella destinazione\n\ +[/R] Sovrascrivi ogni file che abbia l'attributo Sola Lettura\n\ +[/H] Includi files nascosti e di sistema nella copia\n\ +[/C] Continua anche se accade un errore durante la copia\n\ +[/A] Copia solo files che abbiano l'attributo Archivio\n\ +[/M] Copia solo files che abbiano l'attributo Archivio, rimuovendo\n\ +\tl'attributo\n\ +[/D | /D:m-g-a] Copia i nuovi files o quelli modificati dopo la data fornita.\n\ +\t\tSe nessuna data Ã¨ stata fornita, copia solo se la destinazione Ã¨ piÃ¹ vecchia\n\ +\t\tdella sorgente\n\n" + +} +#pragma code_page(default) Propchange: trunk/reactos/base/applications/cmdutils/xcopy/It.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/xcopy/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/Uk.rc (added) +++ trunk/reactos/base/applications/cmdutils/xcopy/Uk.rc [iso-8859-1] Mon Feb 8 11:49:03 2010 @@ -1,0 +1,85 @@ +ï»¿/* + * XCOPY - Wine-compatible xcopy program + * Ukrainian language support + * + * Copyright (C) 2007 J. Edmeades + * Copyright (C) 2010 I. Paliychuk + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "xcopy.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +STRINGTABLE +{ + STRING_INVPARMS, "ÐÐµÐ²ÑÑÐ½Ð° ÐºÑÐ»ÑÐºÑÑÑÑ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÑÐ² - ÐÐ²ÐµÐ´ÑÑÑ xcopy /? Ð´Ð»Ñ Ð´Ð¾Ð²ÑÐ´ÐºÐ¸\n" + STRING_INVPARM, "ÐÐµÐ²ÑÑÐ½Ð¸Ð¹ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ '%s' - ÐÐ²ÐµÐ´ÑÑÑ xcopy /? Ð´Ð»Ñ Ð´Ð¾Ð²ÑÐ´ÐºÐ¸\n" + STRING_PAUSE, "ÐÐ°ÑÐ¸ÑÐ½ÑÑÑ <enter> ÑÐ¾Ð± Ð¿Ð¾ÑÐ°ÑÐ¸ ÐºÐ¾Ð¿ÑÑÐ²Ð°Ð½Ð½Ñ\n" + STRING_SIMCOPY, "%d ÑÐ°Ð¹Ð»(ÑÐ²) Ð±ÑÐ´Ðµ ÑÐºÐ¾Ð¿ÑÐ¹Ð¾Ð²Ð°Ð½Ð¾\n" + STRING_COPY, "%d ÑÐ°Ð¹Ð»(ÑÐ²) ÑÐºÐ¾Ð¿ÑÐ¹Ð¾Ð²Ð°Ð½Ð¾\n" + STRING_QISDIR, "'%s' Ñ ÑÐ°Ð¹Ð»Ð¾Ð¼ ÑÐ¸ Ð´Ð¸ÑÐµÐºÑÐ¾ÑÑÑÑ\n" \ + "on the target?\n" \ + "(F - Ð¤Ð°Ð¹Ð», D - ÐÐ¸ÑÐµÐºÑÐ¾ÑÑÑ)\n" + STRING_SRCPROMPT,"%s? (Yes|No)\n" + STRING_OVERWRITE,"ÐÐµÑÐµÐ¿Ð¸ÑÐ°ÑÐ¸ %s? (Yes|No|All)\n" + STRING_COPYFAIL, "ÐÑÐ´ ÑÐ°Ñ ÐºÐ¾Ð¿ÑÑÐ²Ð°Ð½Ð½Ñ '%s' Ð² '%s' ÑÑÐ°Ð»Ð°ÑÑ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° r/c %d\n" + STRING_OPENFAIL, "ÐÐµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð²ÑÐ´ÐºÑÐ¸ÑÐ¸ '%s'\n" + STRING_READFAIL, "ÐÐ¾Ð¼Ð¸Ð»ÐºÐ° ÑÐ¸ÑÐ°Ð½Ð½Ñ '%s'\n" + STRING_YES_CHAR, "Y" + STRING_NO_CHAR, "N" + STRING_ALL_CHAR, "A" + STRING_FILE_CHAR,"F" + STRING_DIR_CHAR, "D" + + STRING_HELP, +"XCOPY - ÐÐ¾Ð¿ÑÑÑ ÑÐ°Ð¹Ð»Ð¸ ÑÐ° Ð´ÐµÑÐµÐ²Ð° Ð´Ð¸ÑÐµÐºÑÐ¾ÑÑÐ¹ Ð·Ð° Ð¿ÑÐ¸Ð·Ð½Ð°ÑÐµÐ½Ð½ÑÐ¼\n\ +\n\ +Syntax:\n\ +XCOPY source [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\n\ +Where:\n\ +\n\ +[/I] Assume directory if destination does not exist and copying 2 or\n\ +\tmore files\n\ +[/S] ÐÐ¾Ð¿ÑÑÑ Ð´Ð¸ÑÐµÐºÑÐ¾ÑÑÑ ÑÐ° Ð¿ÑÐ´Ð´Ð¸ÑÐµÐºÑÐ¾ÑÑÑ\n\ +[/E] ÐÐ¾Ð¿ÑÑÑ Ð´Ð¸ÑÐµÐºÑÐ¾ÑÑÑ ÑÐ° Ð¿ÑÐ´Ð´Ð¸ÑÐµÐºÑÐ¾ÑÑÑ, Ð²ÐºÐ»ÑÑÐ½Ð¾ Ð· Ð¿Ð¾ÑÐ¾Ð¶Ð½ÑÐ¼Ð¸\n\ +[/Q] Do not list names during copy, ie quiet.\n\ +[/F] ÐÑÐ´ ÑÐ°Ñ ÐºÐ¾Ð¿ÑÑÐ²Ð°Ð½Ð½Ñ Ð²ÑÐ´Ð¾Ð±ÑÐ°Ð¶Ð°Ñ Ð¿Ð¾Ð²Ð½Ñ ÑÐ¼ÐµÐ½Ð° Ð¿Ð¾ÑÐ°ÑÐºÐ¾Ð²Ð¸Ñ Ñ ÐºÑÐ½ÑÐµÐ²Ð¸Ñ ÑÐ°Ð¹Ð»ÑÐ²\n\ +[/L] Simulate operation, showing names which would be copied\n\ +[/W] ÐÐ¸ÑÐ°Ñ Ð¿ÑÐ´ÑÐ²ÐµÑÐ´Ð¶ÐµÐ½Ð½Ñ Ð¿ÐµÑÐµÐ´ Ð¿Ð¾ÑÐ°ÑÐºÐ¾Ð¼ ÐºÐ¾Ð¿ÑÑÐ²Ð°Ð½Ð½Ñ\n\ +[/T] Ð¡ÑÐ²Ð¾ÑÑÑ ÑÑÑÑÐºÑÑÑÑ ÐºÐ°ÑÐ°Ð»Ð¾Ð³ÑÐ² Ð°Ð»Ðµ Ð½Ðµ ÐºÐ¾Ð¿ÑÑÑ ÑÐ°Ð¹Ð»Ð¸\n\ +[/Y] Suppress prompting when overwriting files\n\ +[/-Y] ÐÐ¸ÑÐ°Ñ Ð¿ÑÐ´ÑÐ²ÐµÑÐ´Ð¶ÐµÐ½Ð½Ñ Ð½Ð° Ð¿ÐµÑÐµÐ·Ð°Ð¿Ð¸Ñ ÑÐ°Ð¹Ð»ÑÐ²\n\ +[/P] Prompts on each source file before copying\n\ +[/N] ÐÐ¾Ð¿ÑÑÑ, Ð²Ð¸ÐºÐ¾ÑÐ¸ÑÑÐ¾Ð²ÑÑÑÐ¸ ÐºÐ¾ÑÐ¾ÑÐºÑ ÑÐ¼ÐµÐ½Ð°\n\ +[/U] Copy only files which already exist in destination\n\ +[/R] ÐÐµÑÐµÐ·Ð°Ð¿Ð¸ÑÑÑ ÑÐ°Ð¹Ð»Ð¸, Ð´Ð¾ÑÑÑÐ¿Ð½Ñ Ð»Ð¸ÑÐµ Ð´Ð»Ñ ÑÐ¸ÑÐ°Ð½Ð½Ñ\n\ +[/H] Include hidden and system files in the copy\n\ +[/C] ÐÑÐ¾Ð´Ð¾Ð²Ð¶ÑÑ ÑÐ¾Ð±Ð¾ÑÑ, Ð½Ð°Ð²ÑÑÑ ÑÐºÑÐ¾ Ð¿ÑÐ¸ ÐºÐ¾Ð¿ÑÑÐ²Ð°Ð½Ð½Ñ Ð²Ð¸Ð½Ð¸ÐºÐ»Ð° Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ°\n\ +[/A] ÐÐ¾Ð¿ÑÑÑ Ð»Ð¸ÑÐµ ÑÐ°Ð¹Ð»Ð¸ Ð· Ð²Ð»Ð°ÑÑÐ¸Ð²ÑÑÑÑ ÐÐ Ð¥ÐÐÐÐÐ\n\ +[/M] ÐÐ¾Ð¿ÑÑÑ Ð»Ð¸ÑÐµ ÑÐ°Ð¹Ð»Ð¸ Ð· Ð²Ð»Ð°ÑÑÐ¸Ð²ÑÑÑÑ ÐÐ Ð¥ÐÐÐÐÐ, Ð²Ð¸Ð´Ð°Ð»ÑÑ\n\ +\Ð²Ð»Ð°ÑÑÐ¸Ð²ÑÑÑÑ ÐÐ Ð¥ÐÐÐÐÐ\n\ +[/D | /D:m-d-y] ÐÐ¾Ð¿ÑÑÑ Ð»Ð¸ÑÐµ Ð½Ð¾Ð²Ñ ÑÐ°Ð¹Ð»Ð¸ Ð°Ð±Ð¾ ÑÑ, ÑÐºÑ Ð±ÑÐ»Ð¸ Ð·Ð¼ÑÐ½ÐµÐ½Ñ Ð¿ÑÑÐ»Ñ Ð²ÐºÐ°Ð·Ð°Ð½Ð¾Ñ Ð´Ð°ÑÐ¸.\n\ +\t\tÐ¯ÐºÑÐ¾ Ð´Ð°ÑÐ° Ð½Ðµ Ð²ÐºÐ°Ð·Ð°Ð½Ð°, only copy if destination is older\n\ +\t\tthan source\n\n" + +} +#pragma code_page(default) Propchange: trunk/reactos/base/applications/cmdutils/xcopy/Uk.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc [iso-8859-1] Mon Feb 8 11:49:03 2010 @@ -30,6 +30,7 @@ #include "De.rc" #include "En.rc" #include "Fr.rc" +#include "It.rc" #include "Ja.rc" #include "Ko.rc" #include "Lt.rc" @@ -39,3 +40,4 @@ #include "Pt.rc" #include "Ru.rc" #include "Si.rc" +#include "Uk.rc" Modified: trunk/reactos/base/applications/wordpad/Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Da.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Da.rc [iso-8859-1] Mon Feb 8 11:49:03 2010 @@ -46,7 +46,7 @@ MENUITEM "&Fjern\tDEL", ID_EDIT_CLEAR MENUITEM "&Marker alt\tCtrl+A", ID_EDIT_SELECTALL MENUITEM SEPARATOR - MENUITEM "&Søg efter...\tCrtl+F", ID_FIND + MENUITEM "&Søg efter...\tCtrl+F", ID_FIND MENUITEM "Søg efter &næste\tF3", ID_FIND_NEXT MENUITEM "E&rstat...\tCtrl+H", ID_REPLACE MENUITEM SEPARATOR @@ -218,6 +218,8 @@ STRING_PREVIEW_PREVPAGE, "Forrige side" STRING_PREVIEW_TWOPAGES, "To sider" STRING_PREVIEW_ONEPAGE, "Én side" + STRING_PREVIEW_ZOOMIN, "Zoom in" + STRING_PREVIEW_ZOOMOUT, "Zoom out" STRING_PREVIEW_CLOSE, "Luk" END Modified: trunk/reactos/base/applications/wordpad/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/En.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/En.rc [iso-8859-1] Mon Feb 8 11:49:03 2010 @@ -46,7 +46,7 @@ MENUITEM "&Clear\tDEL", ID_EDIT_CLEAR MENUITEM "&Select all\tCtrl+A", ID_EDIT_SELECTALL MENUITEM SEPARATOR - MENUITEM "&Find...\tCrtl+F", ID_FIND + MENUITEM "&Find...\tCtrl+F", ID_FIND MENUITEM "Find &next\tF3", ID_FIND_NEXT MENUITEM "&Replace...\tCtrl+H", ID_REPLACE MENUITEM SEPARATOR @@ -210,6 +210,8 @@ STRING_PREVIEW_PREVPAGE, "Previous page" STRING_PREVIEW_TWOPAGES, "Two pages" STRING_PREVIEW_ONEPAGE, "One page" + STRING_PREVIEW_ZOOMIN, "Zoom in" + STRING_PREVIEW_ZOOMOUT, "Zoom out" STRING_PREVIEW_CLOSE, "Close" STRING_UNITS_CM, "cm" END Modified: trunk/reactos/base/applications/wordpad/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Fr.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Fr.rc [iso-8859-1] Mon Feb 8 11:49:03 2010 @@ -49,7 +49,7 @@ MENUITEM "&Effacer\tDel", ID_EDIT_CLEAR MENUITEM "&SÃ©lectionner tout\tCtrl+A", ID_EDIT_SELECTALL MENUITEM SEPARATOR - MENUITEM "&Rechercher...\tCrtl+F", ID_FIND + MENUITEM "&Rechercher...\tCtrl+F", ID_FIND MENUITEM "Rechercher le &suivant\tF3", ID_FIND_NEXT MENUITEM "&Remplacer...\tCtrl+H", ID_REPLACE MENUITEM SEPARATOR @@ -221,6 +221,8 @@ STRING_PREVIEW_PREVPAGE, "Page prÃ©cÃ©dente" STRING_PREVIEW_TWOPAGES, "Deux pages" STRING_PREVIEW_ONEPAGE, "Une page" + STRING_PREVIEW_ZOOMIN, "Zoom avant" + STRING_PREVIEW_ZOOMOUT, "Zoom arriÃ¨re" STRING_PREVIEW_CLOSE, "Fermer" END Modified: trunk/reactos/base/applications/wordpad/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Hu.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Hu.rc [iso-8859-1] Mon Feb 8 11:49:03 2010 @@ -46,7 +46,7 @@ MENUITEM "Tör&lés\tDel", ID_EDIT_CLEAR MENUITEM "M&indet kijelöli\tCtrl+A", ID_EDIT_SELECTALL MENUITEM SEPARATOR - MENUITEM "&Find...\tCrtl+F", ID_FIND + MENUITEM "&Find...\tCtrl+F", ID_FIND MENUITEM "Find &next\tF3", ID_FIND_NEXT MENUITEM "&Replace...\tCtrl+H", ID_REPLACE MENUITEM SEPARATOR @@ -218,6 +218,8 @@ STRING_PREVIEW_PREVPAGE, "Previous page" STRING_PREVIEW_TWOPAGES, "Two pages" STRING_PREVIEW_ONEPAGE, "One page" + STRING_PREVIEW_ZOOMIN, "Zoom in" + STRING_PREVIEW_ZOOMOUT, "Zoom out" STRING_PREVIEW_CLOSE, "Close" END Added: trunk/reactos/base/applications/wordpad/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/It.rc (added) +++ trunk/reactos/base/applications/wordpad/It.rc [iso-8859-1] Mon Feb 8 11:49:03 2010 @@ -1,0 +1,241 @@ +ï»¿/* Italian resource for Wine WordPad + * + * Copyright 2010 by Luca Bennati + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wordpad.h" + +/*UTF-8*/ +#pragma code_page(65001) + +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +IDM_MAINMENU MENU DISCARDABLE +BEGIN + POPUP "&File" + BEGIN + MENUITEM "&Nuovo...\tCtrl+N", ID_FILE_NEW + MENUITEM "&Apri...\tCtrl+O", ID_FILE_OPEN + MENUITEM "&Salva\tCtrl+S", ID_FILE_SAVE + MENUITEM "Salva &come...", ID_FILE_SAVEAS + MENUITEM SEPARATOR + MENUITEM "&Stampa...\tCtrl+P", ID_PRINT + MENUITEM "An&teprima di stampa...", ID_PREVIEW + MENUITEM "&Impostazioni di stampa...", ID_PRINTSETUP + MENUITEM SEPARATOR + MENUITEM "E&sci", ID_FILE_EXIT + END + POPUP "&Modifica" + BEGIN + MENUITEM "&Annulla\tCtrl+Z", ID_EDIT_UNDO + MENUITEM "&Rifai\tCtrl+Y", ID_EDIT_REDO + MENUITEM SEPARATOR + MENUITEM "&Taglia\tCtrl+X", ID_EDIT_CUT + MENUITEM "&Copia\tCtrl+C", ID_EDIT_COPY + MENUITEM "&Incolla\tCtrl+V", ID_EDIT_PASTE + MENUITEM "Ca&ncella\tDEL", ID_EDIT_CLEAR + MENUITEM "&Seleziona tutto\tCtrl+A", ID_EDIT_SELECTALL + MENUITEM SEPARATOR + MENUITEM "T&rova...\tCtrl+F", ID_FIND + MENUITEM "Trova s&uccessivo\tF3", ID_FIND_NEXT + MENUITEM "S&ostituisci...\tCtrl+H", ID_REPLACE + MENUITEM SEPARATOR + MENUITEM "Sola &Lettura", ID_EDIT_READONLY + MENUITEM "&Modificato", ID_EDIT_MODIFIED + MENUITEM SEPARATOR + POPUP "E&xtra" + BEGIN + MENUITEM "&Informazioni sulla selezione", ID_EDIT_SELECTIONINFO + MENUITEM "&Formato del carattere", ID_EDIT_CHARFORMAT + MENUITEM "Formato del &def. char", ID_EDIT_DEFCHARFORMAT + MENUITEM "Formato del &paragrafo", ID_EDIT_PARAFORMAT + MENUITEM "&Ricava il testo", ID_EDIT_GETTEXT + END + END + POPUP "&Visualizza" + BEGIN + MENUITEM "Barra degli &strumenti", ID_TOGGLE_TOOLBAR + MENUITEM "Barra del &formato", ID_TOGGLE_FORMATBAR + MENUITEM "&Righello", ID_TOGGLE_RULER + MENUITEM "Barra dello s&tato", ID_TOGGLE_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&Opzioni...", ID_VIEWPROPERTIES + END + POPUP "&Inserisci" + BEGIN + MENUITEM "&Data e ora...", ID_DATETIME + END + POPUP "F&ormato" + BEGIN + MENUITEM "&Font...", ID_FONTSETTINGS + MENUITEM "&Elenco" ID_BULLET + MENUITEM "&Paragrafo..." ID_PARAFORMAT + MENUITEM "&Tabulazioni..." ID_TABSTOPS + POPUP "Sfon&do" + BEGIN + MENUITEM "Di &sistema\tCtrl+1", ID_BACK_1 + MENUITEM "&Giallo di PostThat\tCtrl+2", ID_BACK_2 + END + END + POPUP "&Aiuto" + BEGIN + MENUITEM "&Su Wine Wordpad" ID_ABOUT + END +END + +IDM_POPUP MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Taglia", ID_EDIT_CUT + MENUITEM "&Copia", ID_EDIT_COPY + MENUITEM "&Incolla", ID_EDIT_PASTE + MENUITEM SEPARATOR + MENUITEM "&Elenco" ID_BULLET + MENUITEM "&Paragrafo..." ID_PARAFORMAT + END +END + +IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Data e ora" +FONT 10, "MS Sans Serif" +BEGIN + LTEXT "Formati disponibili",-1,3,2,100,15 + LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT | LBS_NOTIFY + PUSHBUTTON "&OK",IDOK,87,12,40,12 + PUSHBUTTON "&Annulla",IDCANCEL,87,26,40,12 +END + +IDD_NEWFILE DIALOG DISCARDABLE 30, 20, 140, 80 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Nuovo" +FONT 10, "MS Sans Serif" +BEGIN + LTEXT "Nuovo tipo di documento",-1,3,2,100,15 + LISTBOX IDC_NEWFILE,3,12,90,65,LBS_NOINTEGRALHEIGHT + PUSHBUTTON "&OK",IDOK,97,12,40,12 + PUSHBUTTON "&Annulla",IDCANCEL,97,26,40,12 +END + +IDD_PARAFORMAT DIALOG DISCARDABLE 30, 20, 200, 110 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +Caption "Formato del paragrafo" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Indentazione", -1, 10, 10, 120, 68 + LTEXT "Sinistra", -1, 15, 22, 40, 13 + EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13 + LTEXT "Destra", -1, 15, 40, 40, 13 + EDITTEXT IDC_PARA_RIGHT, 55, 38, 60, 13 + LTEXT "Prima riga", -1, 15, 58, 40, 13 + EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 + LTEXT "Allineamento", -1, 15, 87, 45, 13 + COMBOBOX IDC_PARA_ALIGN, 60, 85, 60, 60, CBS_DROPDOWNLIST + PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 + PUSHBUTTON "&Annulla", IDCANCEL, 137, 33, 50, 15 +END + +IDD_TABSTOPS DIALOG DISCARDABLE 30, 20, 200, 110 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +Caption "Tabulazioni" +FONT 8, "MS SHell DLg" +BEGIN + GROUPBOX "Punti di fermata delle tabulazioni", -1, 10, 10, 120, 90 + COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE + DEFPUSHBUTTON "&Aggiungi", ID_TAB_ADD, 20, 80, 45, 15 + PUSHBUTTON "&Rimuovi", ID_TAB_DEL, 72, 80, 45, 15 + PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 + PUSHBUTTON "&Annulla", IDCANCEL, 137, 33, 50, 15 + PUSHBUTTON "Rimuovi &tutti", ID_TAB_EMPTY, 137, 51, 50, 15 +END + +IDD_FORMATOPTS DIALOG DISCARDABLE 0, 0, 310, 110 +STYLE DS_SYSMODAL +Caption "" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Linea di margine", -1, 10, 10, 150, 85 + RADIOBUTTON "&Nessuna linea di margine", IDC_PAGEFMT_WN, 18, 25, 140, 15 + RADIOBUTTON "Confina il testo nel &bordo della finestra", IDC_PAGEFMT_WW, 18, 45, 140, 15 + RADIOBUTTON "Confina il testo nel &margine", IDC_PAGEFMT_WM, 18, 65, 140, 15 + GROUPBOX "Barre", -1, 170, 10, 120, 85 + CHECKBOX "Barra degli &strumenti", IDC_PAGEFMT_TB, 180, 20, 80, 15 + CHECKBOX "Barra del &formato", IDC_PAGEFMT_FB, 180, 38, 80, 15 + CHECKBOX "&Righello", IDC_PAGEFMT_RU, 180, 56, 80, 15 + CHECKBOX "Barra dello s&tato", IDC_PAGEFMT_SB, 180, 74, 80, 15 + LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_ALL_FILES, "Tutti i files (*.*)" + STRING_TEXT_FILES_TXT, "Files di testo (*.txt)" + STRING_TEXT_FILES_UNICODE_TXT, "Files di testo Unicode (*.txt)" + STRING_RICHTEXT_FILES_RTF, "Rich text format (*.rtf)" + STRING_NEWFILE_RICHTEXT, "Documento Rich text" + STRING_NEWFILE_TXT, "Documento di testo" + STRING_NEWFILE_TXT_UNICODE, "Documento di testo Unicode" + STRING_PRINTER_FILES_PRN, "File di stampa (*.PRN)" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_ALIGN_LEFT, "Sinistra" + STRING_ALIGN_RIGHT, "Destra" + STRING_ALIGN_CENTER, "Centro" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_VIEWPROPS_TITLE, "Opzioni" + STRING_VIEWPROPS_TEXT, "Testo" + STRING_VIEWPROPS_RICHTEXT, "Rich text" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_PREVIEW_PRINT, "Stampa" + STRING_PREVIEW_NEXTPAGE, "Prossima pagina" + STRING_PREVIEW_PREVPAGE, "Pagina precedente" + STRING_PREVIEW_TWOPAGES, "Due pagine" + STRING_PREVIEW_ONEPAGE, "Una pagina" + STRING_PREVIEW_ZOOMIN, "Ingrandisci" + STRING_PREVIEW_ZOOMOUT, "Rimpicciolisci" + STRING_PREVIEW_CLOSE, "Chiudi" + STRING_UNITS_CM, "cm" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_DEFAULT_FILENAME, "Documento" + STRING_PROMPT_SAVE_CHANGES, "Salva i cambiamenti su '%s'?" + STRING_SEARCH_FINISHED, "Finita la ricerca sul documento." + STRING_LOAD_RICHED_FAILED, "Impossibile caricare la libreria RichEdit." + STRING_SAVE_LOSEFORMATTING, "Hai scelto di salvare nel formato Testo semplice, " \ + "che causerÃ la perdita di tutta la formattazione. " \ + "Sei sicuro?" + STRING_INVALID_NUMBER, "Numero di formato non valido" + STRING_OLE_STORAGE_NOT_SUPPORTED, "I documenti di storage OLE non sono supportati" + STRING_WRITE_FAILED, "Impossibile salvare il file." + STRING_WRITE_ACCESS_DENIED, "Non hai i diritti di accesso per salvare il file." + STRING_OPEN_FAILED, "Impossibile aprire il file." + STRING_OPEN_ACCESS_DENIED, "Non hai i diritti di accesso per aprire il file." + STRING_PRINTING_NOT_IMPLEMENTED, "Stampa non implementata" + STRING_MAX_TAB_STOPS, "Non si possono aggiungere piÃ¹ di 32 punti di fermata delle tabulazioni." +END +#pragma code_page(default) Propchange: trunk/reactos/base/applications/wordpad/It.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/wordpad/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Ja.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Ja.rc [iso-8859-1] Mon Feb 8 11:49:03 2010 @@ -49,7 +49,7 @@ MENUITEM "ã¯ãªã¢(&C)\tDEL", ID_EDIT_CLEAR MENUITEM "ãã¹ã¦é¸æ(&S)\tCtrl+A", ID_EDIT_SELECTALL MENUITEM SEPARATOR - MENUITEM "æ¤ç´¢(&F)...\tCrtl+F", ID_FIND + MENUITEM "æ¤ç´¢(&F)...\tCtrl+F", ID_FIND MENUITEM "æ¬¡ãæ¤ç´¢(&N)\tF3", ID_FIND_NEXT MENUITEM "ç½®æ(&R)...\tCtrl+H", ID_REPLACE MENUITEM SEPARATOR @@ -221,6 +221,8 @@ STRING_PREVIEW_PREVPAGE, "åã®ãã¼ã¸" STRING_PREVIEW_TWOPAGES, "2ãã¼ã¸" STRING_PREVIEW_ONEPAGE, "1ãã¼ã¸" + STRING_PREVIEW_ZOOMIN, "Zoom in" + STRING_PREVIEW_ZOOMOUT, "Zoom out" STRING_PREVIEW_CLOSE, "éãã" END Modified: trunk/reactos/base/applications/wordpad/Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Ko.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Ko.rc [iso-8859-1] Mon Feb 8 11:49:03 2010 @@ -47,7 +47,7 @@ MENUITEM "Áö¿ì±â(&C)\tDEL", ID_EDIT_CLEAR MENUITEM "¸ðµÎ ¼±ÅÃ(&S)\tCtrl+A", ID_EDIT_SELECTALL MENUITEM SEPARATOR - MENUITEM "Ã£±â(&F)...\tCrtl+F", ID_FIND + MENUITEM "Ã£±â(&F)...\tCtrl+F", ID_FIND MENUITEM "´ÙÀ½ Ã£±â(&N)\tF3", ID_FIND_NEXT MENUITEM " ¹Ù²Ù±â(&R)...\tCtrl+H", ID_REPLACE MENUITEM SEPARATOR @@ -212,6 +212,8 @@ STRING_PREVIEW_PREVPAGE, "ÀÌÀü ÆäÀÌÁö" STRING_PREVIEW_TWOPAGES, "µÎ ÆäÀÌÁö" STRING_PREVIEW_ONEPAGE, "ÇÑ ÆäÀÌÁö" + STRING_PREVIEW_ZOOMIN, "Zoom in" + STRING_PREVIEW_ZOOMOUT, "Zoom out" STRING_PREVIEW_CLOSE, "´Ý±â" STRING_UNITS_CM, "cm" END Modified: trunk/reactos/base/applications/wordpad/Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Lt.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Lt.rc [iso-8859-1] Mon Feb 8 11:49:03 2010 @@ -49,7 +49,7 @@ MENUITEM "&Å alinti\tDEL", ID_EDIT_CLEAR MENUITEM "&PaÅ¾ymÄti viskÄ\tCtrl+A", ID_EDIT_SELECTALL MENUITEM SEPARATOR - MENUITEM "I&eÅ¡koti...\tCrtl+F", ID_FIND + MENUITEM "I&eÅ¡koti...\tCtrl+F", ID_FIND MENUITEM "IeÅ¡k&oti kito\tF3", ID_FIND_NEXT MENUITEM "Pa&keisti...\tCtrl+H", ID_REPLACE MENUITEM SEPARATOR @@ -221,6 +221,8 @@ STRING_PREVIEW_PREVPAGE, "Ankstesnis puslapis" STRING_PREVIEW_TWOPAGES, "Du puslapiai" STRING_PREVIEW_ONEPAGE, "Vienas puslapis" + STRING_PREVIEW_ZOOMIN, "Didinti" + STRING_PREVIEW_ZOOMOUT, "MaÅ¾inti" STRING_PREVIEW_CLOSE, "UÅ¾verti" END Modified: trunk/reactos/base/applications/wordpad/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Nl.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Nl.rc [iso-8859-1] Mon Feb 8 11:49:03 2010 @@ -47,7 +47,7 @@ MENUITEM "&Verwijderen\tDel", ID_EDIT_CLEAR MENUITEM "&Alles selecteren\tCtrl+A", ID_EDIT_SELECTALL MENUITEM SEPARATOR - MENUITEM "&Zoeken...\tCrtl+F", ID_FIND + MENUITEM "&Zoeken...\tCtrl+F", ID_FIND MENUITEM "Zoek vo&lgende\tF3", ID_FIND_NEXT MENUITEM "Ve&rvang...\tCtrl+H", ID_REPLACE MENUITEM SEPARATOR @@ -211,6 +211,8 @@ STRING_PREVIEW_PREVPAGE, "Vorige pagina" STRING_PREVIEW_TWOPAGES, "Twee pagina's" STRING_PREVIEW_ONEPAGE, "Een pagina" + STRING_PREVIEW_ZOOMIN, "Zoom in" + STRING_PREVIEW_ZOOMOUT, "Zoom out" STRING_PREVIEW_CLOSE, "Sluiten" END Modified: trunk/reactos/base/applications/wordpad/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/No.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/No.rc [iso-8859-1] Mon Feb 8 11:49:03 2010 @@ -48,7 +48,7 @@ MENUITEM "&Fjern\tDEL", ID_EDIT_CLEAR MENUITEM "&Merk alt\tCtrl+A", ID_EDIT_SELECTALL MENUITEM SEPARATOR - MENUITEM "&SÃ¸k etter...\tCrtl+F", ID_FIND + MENUITEM "&SÃ¸k etter...\tCtrl+F", ID_FIND MENUITEM "SÃ¸k etter &neste\tF3", ID_FIND_NEXT MENUITEM "E&rstatt...\tCtrl+H", ID_REPLACE MENUITEM SEPARATOR @@ -220,6 +220,8 @@ STRING_PREVIEW_PREVPAGE, "Forrige side" STRING_PREVIEW_TWOPAGES, "To sider" STRING_PREVIEW_ONEPAGE, "Ãn side" + STRING_PREVIEW_ZOOMIN, "Zoom in" + STRING_PREVIEW_ZOOMOUT, "Zoom out" STRING_PREVIEW_CLOSE, "Lukk" END Modified: trunk/reactos/base/applications/wordpad/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Pl.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Pl.rc [iso-8859-1] Mon Feb 8 11:49:03 2010 @@ -47,7 +47,7 @@ MENUITEM "&Usuñ\tDel", ID_EDIT_CLEAR MENUITEM "&Zaznacz wszystko\tCtrl+A", ID_EDIT_SELECTALL MENUITEM SEPARATOR - MENUITEM "Znaj&d...\tCrtl+F", ID_FIND + MENUITEM "Znaj&d...\tCtrl+F", ID_FIND MENUITEM "Z&najd nastêpny\tF3", ID_FIND_NEXT MENUITEM "Za&mieñ...\tCtrl+H", ID_REPLACE MENUITEM SEPARATOR @@ -219,6 +219,8 @@ STRING_PREVIEW_PREVPAGE, "Poprz. strona" STRING_PREVIEW_TWOPAGES, "Two pages" STRING_PREVIEW_ONEPAGE, "One page" + STRING_PREVIEW_ZOOMIN, "Zoom in" + STRING_PREVIEW_ZOOMOUT, "Zoom out" STRING_PREVIEW_CLOSE, "Zamknij" END Modified: trunk/reactos/base/applications/wordpad/Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Pt.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Pt.rc [iso-8859-1] Mon Feb 8 11:49:03 2010 @@ -50,7 +50,7 @@ MENUITEM "&Limpar\tDEL", ID_EDIT_CLEAR MENUITEM "&Seleccionar tudo\tCtrl+A", ID_EDIT_SELECTALL MENUITEM SEPARATOR - MENUITEM "Local&izar...\tCrtl+F", ID_FIND + MENUITEM "Local&izar...\tCtrl+F", ID_FIND MENUITEM "&Encontrar Seguinte\tF3", ID_FIND_NEXT MENUITEM "&Substituir...\tCtrl+H", ID_REPLACE MENUITEM SEPARATOR @@ -222,6 +222,8 @@ STRING_PREVIEW_PREVPAGE, "PÃ¡gina anterior" STRING_PREVIEW_TWOPAGES, "Duas pÃ¡ginas" STRING_PREVIEW_ONEPAGE, "Uma pÃ¡gina" + STRING_PREVIEW_ZOOMIN, "Zoom in" + STRING_PREVIEW_ZOOMOUT, "Zoom out" STRING_PREVIEW_CLOSE, "Fechar" END Modified: trunk/reactos/base/applications/wordpad/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Ru.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Ru.rc [iso-8859-1] Mon Feb 8 11:49:03 2010 @@ -49,7 +49,7 @@ MENUITEM "&Ð£Ð´Ð°Ð»Ð¸ÑÑ\tDEL", ID_EDIT_CLEAR MENUITEM "ÐÑÐ´ÐµÐ»Ð¸ÑÑ Ð²&ÑÐµ\tCtrl+A", ID_EDIT_SELECTALL MENUITEM SEPARATOR - MENUITEM "&ÐÐ°Ð¹ÑÐ¸...\tCrtl+F", ID_FIND + MENUITEM "&ÐÐ°Ð¹ÑÐ¸...\tCtrl+F", ID_FIND MENUITEM "ÐÐ°&Ð¹ÑÐ¸ Ð´Ð°Ð»ÐµÐµ\tF3", ID_FIND_NEXT MENUITEM "&ÐÐ°Ð¼ÐµÐ½Ð¸ÑÑ...\tCtrl+H", ID_REPLACE MENUITEM SEPARATOR @@ -221,6 +221,8 @@ STRING_PREVIEW_PREVPAGE, "ÐÑÐµÐ´ÑÐ´ÑÑÐ°Ñ ÑÑÑÐ°Ð½Ð¸ÑÐ°" STRING_PREVIEW_TWOPAGES, "ÐÐ²Ðµ ÑÑÑÐ°Ð½Ð¸ÑÑ" STRING_PREVIEW_ONEPAGE, "ÐÐ´Ð½Ð° ÑÑÑÐ°Ð½Ð¸ÑÐ°" + STRING_PREVIEW_ZOOMIN, "Zoom in" + STRING_PREVIEW_ZOOMOUT, "Zoom out" STRING_PREVIEW_CLOSE, "ÐÐ°ÐºÑÑÑÑ" END Modified: trunk/reactos/base/applications/wordpad/Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Si.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Si.rc [iso-8859-1] Mon Feb 8 11:49:03 2010 @@ -48,7 +48,7 @@ MENUITEM "Po&briÅ¡i\tDEL", ID_EDIT_CLEAR MENUITEM "Izberi &vse\tCtrl+A", ID_EDIT_SELECTALL MENUITEM SEPARATOR - MENUITEM "Na&jdi ...\tCrtl+F", ID_FIND + MENUITEM "Na&jdi ...\tCtrl+F", ID_FIND MENUITEM "Najdi n&aslednje\tF3", ID_FIND_NEXT MENUITEM "Za&menjaj ...\tCtrl+H", ID_REPLACE MENUITEM SEPARATOR @@ -220,6 +220,8 @@ STRING_PREVIEW_PREVPAGE, "PrejÅ¡nja" STRING_PREVIEW_TWOPAGES, "Dve strani" STRING_PREVIEW_ONEPAGE, "Ena stran" + STRING_PREVIEW_ZOOMIN, "Zoom in" + STRING_PREVIEW_ZOOMOUT, "Zoom out" STRING_PREVIEW_CLOSE, "Zapri" END Modified: trunk/reactos/base/applications/wordpad/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Sv.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Sv.rc [iso-8859-1] Mon Feb 8 11:49:03 2010 @@ -48,7 +48,7 @@ MENUITEM "Ta &bort\tDEL", ID_EDIT_CLEAR MENUITEM "&Markera allt\tCtrl+A", ID_EDIT_SELECTALL MENUITEM SEPARATOR - MENUITEM "&SÃ¶k...\tCrtl+F", ID_FIND + MENUITEM "&SÃ¶k...\tCtrl+F", ID_FIND MENUITEM "SÃ¶k &nÃ¤sta\tF3", ID_FIND_NEXT MENUITEM "&ErsÃ¤tt...\tCtrl+H", ID_REPLACE MENUITEM SEPARATOR @@ -220,6 +220,8 @@ STRING_PREVIEW_PREVPAGE, "FÃ¶regÃ¥ende sida" STRING_PREVIEW_TWOPAGES, "TvÃ¥ sidor" STRING_PREVIEW_ONEPAGE, "En sida" + STRING_PREVIEW_ZOOMIN, "Zooma in" + STRING_PREVIEW_ZOOMOUT, "Zooma ut" STRING_PREVIEW_CLOSE, "StÃ¤ng" END Modified: trunk/reactos/base/applications/wordpad/Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Tr.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Tr.rc [iso-8859-1] Mon Feb 8 11:49:03 2010 @@ -48,7 +48,7 @@ MENUITEM "&Sil\tDel", ID_EDIT_CLEAR MENUITEM "&Tümünü seç\tCtrl+A", ID_EDIT_SELECTALL MENUITEM SEPARATOR - MENUITEM "&Find...\tCrtl+F", ID_FIND + MENUITEM "&Find...\tCtrl+F", ID_FIND MENUITEM "Find &next\tF3", ID_FIND_NEXT MENUITEM "&Replace...\tCtrl+H", ID_REPLACE MENUITEM SEPARATOR @@ -220,6 +220,8 @@ STRING_PREVIEW_PREVPAGE, "Previous page" STRING_PREVIEW_TWOPAGES, "Two pages" STRING_PREVIEW_ONEPAGE, "One page" + STRING_PREVIEW_ZOOMIN, "Zoom in" + STRING_PREVIEW_ZOOMOUT, "Zoom out" STRING_PREVIEW_CLOSE, "Close" END Added: trunk/reactos/base/applications/wordpad/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Uk.rc (added) +++ trunk/reactos/base/applications/wordpad/Uk.rc [iso-8859-1] Mon Feb 8 11:49:03 2010 @@ -1,0 +1,253 @@ +ï»¿/* + * Copyright 2004 by Krzysztof Foltman + * + * Ukrainian language support + * + * Copyright (C) 2010 Igor Paliychuk + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wordpad.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +IDM_MAINMENU MENU DISCARDABLE +BEGIN + POPUP "&File" + BEGIN + MENUITEM "&ÐÐ¾Ð²Ð¸Ð¹...\tCtrl+N", ID_FILE_NEW + MENUITEM "&ÐÑÐ´ÐºÑÐ¸ÑÐ¸...\tCtrl+O", ID_FILE_OPEN + MENUITEM "&ÐÐ±ÐµÑÐµÐ³ÑÐ¸\tCtrl+S", ID_FILE_SAVE + MENUITEM "ÐÐ±ÐµÑÐµÐ³ÑÐ¸ &ÑÐº...", ID_FILE_SAVEAS + MENUITEM SEPARATOR + MENUITEM "&ÐÑÑÐº...\tCtrl+P", ID_PRINT + MENUITEM "ÐÐ¾Ð¿ÐµÑÐµÐ´Ð½ÑÐ¹ Ð¿ÐµÑÐµÐ³&Ð»ÑÐ´...", ID_PREVIEW + MENUITEM "ÐÐ°Ð»Ð°ÑÑÑÐ²Ð°Ð½Ð½Ñ &ÑÑÐ¾ÑÑÐ½ÐºÐ¸...", ID_PRINTSETUP + MENUITEM SEPARATOR + MENUITEM "Ð&Ð¸ÑÑÐ´", ID_FILE_EXIT + END + POPUP "&ÐÑÐ°Ð²ÐºÐ°" + BEGIN + MENUITEM "&ÐÑÐ´Ð¼ÑÐ½Ð¸ÑÐ¸\tCtrl+Z", ID_EDIT_UNDO + MENUITEM "ÐÐ¾Ð²Ñ&Ð¾ÑÐ¸ÑÐ¸\tCtrl+Y", ID_EDIT_REDO + MENUITEM SEPARATOR + MENUITEM "ÐÐ¸ÑÑÐ·Ð°&ÑÐ¸\tCtrl+X", ID_EDIT_CUT + MENUITEM "&ÐÐ¾Ð¿ÑÑÐ²Ð°ÑÐ¸\tCtrl+C", ID_EDIT_COPY + MENUITEM "Ð&ÑÑÐ°Ð²Ð¸ÑÐ¸\tCtrl+V", ID_EDIT_PASTE + MENUITEM "Ð&ÑÐ¸ÑÑÐ¸ÑÐ¸\tDEL", ID_EDIT_CLEAR + MENUITEM "ÐÐ¸Ð±&ÑÐ°ÑÐ¸ Ð²ÑÐµ\tCtrl+A", ID_EDIT_SELECTALL + MENUITEM SEPARATOR + MENUITEM "&ÐÐ½Ð°Ð¹ÑÐ¸...\tCtrl+F", ID_FIND + MENUITEM "ÐÐ½Ð°Ð¹ÑÐ¸ Ð´&Ð°Ð»Ñ\tF3", ID_FIND_NEXT + MENUITEM "ÐÐ°&Ð¼ÑÐ½ÑÐ¸ÑÐ¸...\tCtrl+H", ID_REPLACE + MENUITEM SEPARATOR + MENUITEM "ÐÐ¸ÑÐµ Ð´&Ð»Ñ ÑÐ¸ÑÐ°Ð½Ð½Ñ", ID_EDIT_READONLY + MENUITEM "ÐÐ¼&ÑÐ½ÐµÐ½Ð¸Ð¹", ID_EDIT_MODIFIED + MENUITEM SEPARATOR + POPUP "Ð&Ð¾Ð´Ð°ÑÐºÐ¾Ð²Ð¾" + BEGIN + MENUITEM "&ÐÐ½ÑÐ¾ÑÐ¼Ð°ÑÑÑ Ð¿ÑÐ¾ Ð²Ð¸Ð´ÑÐ»ÐµÐ½Ð½Ñ", ID_EDIT_SELECTIONINFO + MENUITEM "&Ð¤Ð¾ÑÐ¼Ð°Ñ ÑÐ¸Ð¼Ð²Ð¾Ð»ÑÐ²", ID_EDIT_CHARFORMAT + MENUITEM "Ð¤Ð¾ÑÐ¼Ð°Ñ ÑÐ¸Ð¼Ð²Ð¾Ð»ÑÐ² &Ð¿Ð¾ Ð·Ð°Ð¼Ð¾Ð²ÑÑÐ²Ð°Ð½Ð½Ñ", ID_EDIT_DEFCHARFORMAT + MENUITEM "Paragrap&h format", ID_EDIT_PARAFORMAT + MENUITEM "&ÐÐ·ÑÑÐ¸ ÑÐµÐºÑÑ", ID_EDIT_GETTEXT + END + END + POPUP "&ÐÐ¸Ð³Ð»ÑÐ´" + BEGIN + MENUITEM "ÐÐ°Ð½ÐµÐ»Ñ ÑÐ½Ñ&ÑÑÑÐ¼ÐµÐ½ÑÑÐ²", ID_TOGGLE_TOOLBAR + MENUITEM "ÐÐ°Ð½ÐµÐ»Ñ &ÑÐ¾ÑÐ¼Ð°ÑÑÐ²Ð°Ð½Ð½Ñ", ID_TOGGLE_FORMATBAR + MENUITEM "&ÐÑÐ½ÑÐ¹ÐºÐ°", ID_TOGGLE_RULER + MENUITEM "&Ð ÑÐ´Ð¾Ðº ÑÑÐ°Ð½Ñ", ID_TOGGLE_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&ÐÐ°ÑÐ°Ð¼ÐµÑÑÐ¸...", ID_VIEWPROPERTIES + END + POPUP "&ÐÑÑÐ°Ð²ÐºÐ°" + BEGIN + MENUITEM "&ÐÐ°ÑÐ° ÑÐ° ÑÐ°Ñ...", ID_DATETIME + END + POPUP "Ð¤&Ð¾ÑÐ¼Ð°Ñ" + BEGIN + MENUITEM "&Ð¨ÑÐ¸ÑÑ...", ID_FONTSETTINGS + MENUITEM "&Bullet points" ID_BULLET + MENUITEM "&ÐÐ±Ð·Ð°Ñ..." ID_PARAFORMAT + MENUITEM "&Ð¢Ð°Ð±ÑÐ»ÑÑÑÑ..." ID_TABSTOPS + POPUP "&Ð¤Ð¾Ð½" + BEGIN + MENUITEM "&Ð¡Ð¸ÑÑÐµÐ¼Ð½Ð¸Ð¹\tCtrl+1", ID_BACK_1 + MENUITEM "&ÐÐ¾Ð²ÑÑÐ²Ð°ÑÐ¸Ð¹ PostThat\tCtrl+2", ID_BACK_2 + END + END + POPUP "&ÐÐ¾Ð²ÑÐ´ÐºÐ°" + BEGIN + MENUITEM "&ÐÑÐ¾ Wine Wordpad" ID_ABOUT + END +END + +IDM_POPUP MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "ÐÐ¸Ñ&ÑÐ·Ð°ÑÐ¸", ID_EDIT_CUT + MENUITEM "&ÐÐ¾Ð¿ÑÑÐ²Ð°ÑÐ¸", ID_EDIT_COPY + MENUITEM "&ÐÑÑÐ°Ð²Ð¸ÑÐ¸", ID_EDIT_PASTE + MENUITEM SEPARATOR + MENUITEM "&Bullet points" ID_BULLET + MENUITEM "&ÐÐ±Ð·Ð°Ñ..." ID_PARAFORMAT + END +END + +IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "ÐÐ°ÑÐ° ÑÐ° ÑÐ°Ñ" +FONT 10, "MS Sans Serif" +BEGIN + LTEXT "ÐÐ¾ÑÑÑÐ¿Ð½Ñ ÑÐ¾ÑÐ¼Ð°ÑÐ¸",-1,3,2,100,15 + LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT | LBS_NOTIFY + PUSHBUTTON "&OK",IDOK,87,12,40,12 + PUSHBUTTON "&Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸",IDCANCEL,87,26,40,12 +END + +IDD_NEWFILE DIALOG DISCARDABLE 30, 20, 140, 80 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "ÐÐ¾Ð²Ð¸Ð¹" +FONT 10, "MS Sans Serif" +BEGIN + LTEXT "Ð¢Ð¸Ð¿ Ð½Ð¾Ð²Ð¾Ð³Ð¾ Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÑ",-1,3,2,100,15 + LISTBOX IDC_NEWFILE,3,12,90,65,LBS_NOINTEGRALHEIGHT + PUSHBUTTON "&OK",IDOK,97,12,40,12 + PUSHBUTTON "&Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸",IDCANCEL,97,26,40,12 +END + +IDD_PARAFORMAT DIALOG DISCARDABLE 30, 20, 200, 110 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +Caption "ÐÐ±Ð·Ð°Ñ" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "ÐÑÐ´ÑÑÑÐ¿", -1, 10, 10, 120, 68 + LTEXT "ÐÐ»ÑÐ²Ð°", -1, 15, 22, 40, 13 + EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13 + LTEXT "Ð¡Ð¿ÑÐ°Ð²Ð°", -1, 15, 40, 40, 13 + EDITTEXT IDC_PARA_RIGHT, 55, 38, 60, 13 + LTEXT "ÐÐµÑÑÐ¸Ð¹ ÑÑÐ´Ð¾Ðº", -1, 15, 58, 40, 13 + EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 + LTEXT "ÐÐ¸ÑÑÐ²Ð½ÑÐ²Ð°Ð½Ð½Ñ", -1, 15, 87, 40, 13 + COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST + PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 + PUSHBUTTON "&Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸", IDCANCEL, 137, 33, 50, 15 +END + +IDD_TABSTOPS DIALOG DISCARDABLE 30, 20, 200, 110 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +Caption "Ð¢Ð°Ð±ÑÐ»ÑÑÑÑ" +FONT 8, "MS SHell DLg" +BEGIN + GROUPBOX "Tab stops", -1, 10, 10, 120, 90 + COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE + DEFPUSHBUTTON "&ÐÐ¾Ð´Ð°ÑÐ¸", ID_TAB_ADD, 20, 80, 45, 15 + PUSHBUTTON "&ÐÐ¸Ð´Ð°Ð»Ð¸ÑÐ¸", ID_TAB_DEL, 72, 80, 45, 15 + PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 + PUSHBUTTON "&Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸", IDCANCEL, 137, 33, 50, 15 + PUSHBUTTON "ÐÐ¸Ð´Ð°Ð»Ð¸ÑÐ¸ Ð²&ÑÐµ", ID_TAB_EMPTY, 137, 51, 50, 15 +END + +IDD_FORMATOPTS DIALOG DISCARDABLE 0, 0, 280, 110 +STYLE DS_SYSMODAL +Caption "" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Line wrapping", -1, 10, 10, 130, 85 + RADIOBUTTON "&No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15 + RADIOBUTTON "Wrap text by the &window border", IDC_PAGEFMT_WW, 18, 45, 117, 15 + RADIOBUTTON "Wrap text by the &margin", IDC_PAGEFMT_WM, 18, 65, 117, 15 + GROUPBOX "Toolbars", -1, 150, 10, 120, 85 + CHECKBOX "&Toolbar", IDC_PAGEFMT_TB, 160, 20, 80, 15 + CHECKBOX "&Formatbar", IDC_PAGEFMT_FB, 160, 38, 80, 15 + CHECKBOX "&ÐÑÐ½ÑÐ¹ÐºÐ°", IDC_PAGEFMT_RU, 160, 56, 80, 15 + CHECKBOX "&Ð ÑÐ´Ð¾Ñ ÑÑÐ°Ð½Ñ", IDC_PAGEFMT_SB, 160, 74, 80, 15 + LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_ALL_FILES, "ÐÑÑ Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÐ¸ (*.*)" + STRING_TEXT_FILES_TXT, "Ð¢ÐµÐºÑÑÐ¾Ð²Ñ Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÐ¸ (*.txt)" + STRING_TEXT_FILES_UNICODE_TXT, "Ð¢ÐµÐºÑÑÐ¾Ð²Ð¸Ð¹ Ð´Ð¾ÐºÑÐ¼ÐµÐ½Ñ Unicode (*.txt)" + STRING_RICHTEXT_FILES_RTF, "Rich text format (*.rtf)" + STRING_NEWFILE_RICHTEXT, "Rich text Ð´Ð¾ÐºÑÐ¼ÐµÐ½Ñ" + STRING_NEWFILE_TXT, "Ð¢ÐµÐºÑÑÐ¾Ð²Ð¸Ð¹ Ð´Ð¾ÐºÑÐ¼ÐµÐ½Ñ" + STRING_NEWFILE_TXT_UNICODE, "Ð¢ÐµÐºÑÑÐ¾Ð²Ð¸Ð¹ Ð´Ð¾ÐºÑÐ¼ÐµÐ½Ñ Unicode" + STRING_PRINTER_FILES_PRN, "Printer files (*.PRN)" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_ALIGN_LEFT, "ÐÐ¾ ÐÑÐ²Ð¾Ð¼Ñ ÐÑÐ°Ñ" + STRING_ALIGN_RIGHT, "ÐÐ¾ ÐÑÐ°Ð²Ð¾Ð¼Ñ ÐÑÐ°Ñ" + STRING_ALIGN_CENTER, "ÐÐ¾ Ð¦ÐµÐ½ÑÑÑ" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_VIEWPROPS_TITLE, "ÐÐ°Ð»Ð°ÑÑÑÐ²Ð°Ð½Ð½Ñ" + STRING_VIEWPROPS_TEXT, "Ð¢ÐµÐºÑÑ" + STRING_VIEWPROPS_RICHTEXT, "Rich text" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_PREVIEW_PRINT, "ÐÑÑÐº" + STRING_PREVIEW_NEXTPAGE, "ÐÐ°ÑÑÑÐ¿Ð½Ð° ÑÑÐ¾ÑÑÐ½ÐºÐ°" + STRING_PREVIEW_PREVPAGE, "ÐÐ¾Ð¿ÐµÑÐµÐ´Ð½Ñ ÑÑÐ¾ÑÑÐ½ÐºÐ°" + STRING_PREVIEW_TWOPAGES, "ÐÐ²Ñ ÑÑÐ¾ÑÑÐ½ÐºÐ¸" + STRING_PREVIEW_ONEPAGE, "ÐÐ´Ð½Ð° ÑÑÐ¾ÑÑÐ½ÐºÐ°" + STRING_PREVIEW_ZOOMIN, "ÐÐ±ÑÐ»ÑÑÐ¸ÑÐ¸" + STRING_PREVIEW_ZOOMOUT, "ÐÐ¼ÐµÐ½ÑÐ¸ÑÐ¸" + STRING_PREVIEW_CLOSE, "ÐÐ°ÐºÑÐ¸ÑÐ¸" + STRING_UNITS_CM, "cm" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_DEFAULT_FILENAME, "ÐÐ¾ÐºÑÐ¼ÐµÐ½Ñ" + STRING_PROMPT_SAVE_CHANGES, "ÐÐ±ÐµÑÐµÐ³ÑÐ¸ Ð·Ð¼ÑÐ½Ð¸ Ð² '%s'?" + STRING_SEARCH_FINISHED, "ÐÐ¾ÐºÑÑ Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÑ Ð·Ð°Ð²ÐµÑÑÐµÐ½Ð¾." + STRING_LOAD_RICHED_FAILED, "ÐÐµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð·Ð°Ð²Ð°Ð½ÑÐ°Ð¶Ð¸ÑÐ¸ Ð±ÑÐ±Ð»ÑÐ¾ÑÐµÐºÑ RichEdit." + STRING_SAVE_LOSEFORMATTING, "ÐÐ¸ Ð²Ð¸Ð±ÑÐ°Ð»Ð¸ Ð·Ð±ÐµÑÐµÐ¶ÐµÐ½Ð½Ñ Ð² ÑÐ¾ÑÐ¼Ð°ÑÑ Ð¿ÑÐ¾ÑÑÐ¾Ð³Ð¾ ÑÐµÐºÑÑÑ, " \ + "ÑÐ¾ Ð¿ÑÐ¸Ð·Ð²ÐµÐ´Ðµ Ð´Ð¾ Ð²ÑÑÐ°ÑÐ¸ ÑÐ¾ÑÐ¼Ð°ÑÑÐ²Ð°Ð½Ð½Ñ. " \ + "ÐÐ¸ ÑÐ¿ÑÐ°Ð²Ð´Ñ ÑÑÐ¾Ð³Ð¾ ÑÐ¾ÑÐµÑÐµ?" + STRING_INVALID_NUMBER, "ÐÐµÐ²ÑÑÐ½Ð¸Ð¹ ÑÐ¸ÑÐ»Ð¾Ð²Ð¸Ð¹ ÑÐ¾ÑÐ¼Ð°Ñ" + STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÐ¸ Ð½Ðµ Ð¿ÑÐ´ÑÑÐ¸Ð¼ÑÑÑÑÑÑ" + STRING_WRITE_FAILED, "ÐÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð·Ð±ÐµÑÐµÐ³ÑÐ¸ ÑÐ°Ð¹Ð»." + STRING_WRITE_ACCESS_DENIED, "ÐÐµÐ´Ð¾ÑÑÐ°ÑÐ½ÑÐ¾ Ð¿ÑÐ°Ð² Ð´Ð»Ñ Ð·Ð±ÐµÑÐµÐ¶ÐµÐ½Ð½Ñ ÑÐ°Ð¹Ð»Ñ." + STRING_OPEN_FAILED, "ÐÐµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð²ÑÐ´ÐºÑÐ¸ÑÐ¸ ÑÐ°Ð¹Ð»." + STRING_OPEN_ACCESS_DENIED, "ÐÐµÐ´Ð¾ÑÑÐ°ÑÐ½ÑÐ¾ Ð¿ÑÐ°Ð² Ð´Ð»Ñ Ð²ÑÐ´ÐºÑÐ¸ÑÑÑ ÑÐ°Ð¹Ð»Ñ." + STRING_PRINTING_NOT_IMPLEMENTED, "ÐÑÑÐº Ð½Ðµ Ð²Ð¿ÑÐ¾Ð²Ð°Ð´Ð¶ÐµÐ½Ð¾" + STRING_MAX_TAB_STOPS, "ÐÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð´Ð¾Ð´Ð°ÑÐ¸ Ð±ÑÐ»ÑÑÐµ 32 Ð¿Ð¾Ð·Ð¸ÑÑÐ¹ ÑÐ°Ð±ÑÐ»ÑÑÑÑ." +END + +LANGUAGE LANG_UKRAINIAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +BEGIN + STRING_ALIGN_LEFT, "ÐÐ¾ ÐÑÐ²Ð¾Ð¼Ñ ÐÑÐ°Ñ" + STRING_ALIGN_RIGHT, "ÐÐ¾ Ð¿ÑÐ°Ð²Ð¾Ð¼Ñ ÐÑÐ°Ñ" + STRING_ALIGN_CENTER, "ÐÐ¾ Ð¦ÐµÐ½ÑÑÑ" +END +#pragma code_page(default) Propchange: trunk/reactos/base/applications/wordpad/Uk.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/wordpad/Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Zh.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Zh.rc [iso-8859-1] Mon Feb 8 11:49:03 2010 @@ -51,7 +51,7 @@ MENUITEM "å é¤(&D)\tDEL", ID_EDIT_CLEAR MENUITEM "å¨é(&S)\tCtrl+A", ID_EDIT_SELECTALL MENUITEM SEPARATOR - MENUITEM "æ¥æ¾(&F)...\tCrtl+F", ID_FIND + MENUITEM "æ¥æ¾(&F)...\tCtrl+F", ID_FIND MENUITEM "æ¾ä¸ä¸ä¸ª(&N)\tF3", ID_FIND_NEXT MENUITEM "æ¿æ¢(&R)...\tCtrl+H", ID_REPLACE MENUITEM SEPARATOR @@ -223,6 +223,8 @@ STRING_PREVIEW_PREVPAGE, "ä¸ä¸é¡µ" STRING_PREVIEW_TWOPAGES, "åé¡µ" STRING_PREVIEW_ONEPAGE, "åé¡µ" + STRING_PREVIEW_ZOOMIN, "Zoom in" + STRING_PREVIEW_ZOOMOUT, "Zoom out" STRING_PREVIEW_CLOSE, "å³é" END @@ -276,7 +278,7 @@ MENUITEM "åªé¤(&D)\tDEL", ID_EDIT_CLEAR MENUITEM "å¨é¸(&S)\tCtrl+A", ID_EDIT_SELECTALL MENUITEM SEPARATOR - MENUITEM "æ¥æ¾(&F)...\tCrtl+F", ID_FIND + MENUITEM "æ¥æ¾(&F)...\tCtrl+F", ID_FIND MENUITEM "æ¾ä¸ä¸å(&N)\tF3", ID_FIND_NEXT MENUITEM "æ¿æ(&R)...\tCtrl+H", ID_REPLACE MENUITEM SEPARATOR Modified: trunk/reactos/base/applications/wordpad/print.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/print.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/print.c [iso-8859-1] Mon Feb 8 11:49:03 2010 @@ -33,6 +33,12 @@ HDC hdcSized; HDC hdcSized2; RECT window; + RECT rcPage; + SIZE bmSize; + SIZE bmScaledSize; + SIZE spacing; + float zoomratio; + int zoomlevel; LPWSTR wszFileName; } previewinfo, *ppreviewinfo; @@ -41,6 +47,8 @@ static RECT margins; static previewinfo preview; + +extern const WCHAR wszPreviewWndClass[]; static const WCHAR var_pagemargin[] = {'P','a','g','e','M','a','r','g','i','n',0}; @@ -50,7 +58,7 @@ const WCHAR files_prn[] = {'*','.','P','R','N',0}; const WCHAR files_all[] = {'*','.','*','\0'}; LPWSTR p; - HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr(hMainWnd, GWLP_HINSTANCE); + HINSTANCE hInstance = GetModuleHandleW(0); p = wszPrintFilter; LoadStringW(hInstance, STRING_PRINTER_FILES_PRN, p, MAX_STRING_LEN); @@ -88,7 +96,7 @@ static void AddTextButton(HWND hRebarWnd, UINT string, UINT command, UINT id) { REBARBANDINFOW rb; - HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr(hRebarWnd, GWLP_HINSTANCE); + HINSTANCE hInstance = GetModuleHandleW(0); WCHAR text[MAX_STRING_LEN]; HWND hButton; @@ -243,9 +251,11 @@ do { + int bottom = fr.rc.bottom; page++; - fr.chrg.cpMin = SendMessageW(hEditorWnd, EM_FORMATRANGE, TRUE, + fr.chrg.cpMin = SendMessageW(hEditorWnd, EM_FORMATRANGE, FALSE, (LPARAM)&fr); + fr.rc.bottom = bottom; } while(fr.chrg.cpMin && fr.chrg.cpMin < fr.chrg.cpMax); @@ -260,7 +270,9 @@ for(i = 1; i < page; i++) { - fr->chrg.cpMin = SendMessageW(hEditorWnd, EM_FORMATRANGE, TRUE, (LPARAM)fr); + int bottom = fr->rc.bottom; + fr->chrg.cpMin = SendMessageW(hEditorWnd, EM_FORMATRANGE, FALSE, (LPARAM)fr); + fr->rc.bottom = bottom; } } @@ -328,6 +340,7 @@ StartDocW(fr.hdc, &di); do { + int bottom = fr.rc.bottom; if(StartPage(fr.hdc) <= 0) break; @@ -335,6 +348,7 @@ if(EndPage(fr.hdc) <= 0) break; + bottom = fr.rc.bottom; printedPages++; if((pd->Flags & PD_PAGENUMS) && (printedPages > (pd->nToPage - pd->nFromPage))) @@ -442,7 +456,9 @@ AddTextButton(hReBar, STRING_PREVIEW_NEXTPAGE, ID_PREVIEW_NEXTPAGE, BANDID_PREVIEW_BTN2); AddTextButton(hReBar, STRING_PREVIEW_PREVPAGE, ID_PREVIEW_PREVPAGE, BANDID_PREVIEW_BTN3); AddTextButton(hReBar, STRING_PREVIEW_TWOPAGES, ID_PREVIEW_NUMPAGES, BANDID_PREVIEW_BTN4); - AddTextButton(hReBar, STRING_PREVIEW_CLOSE, ID_FILE_EXIT, BANDID_PREVIEW_BTN5); + AddTextButton(hReBar, STRING_PREVIEW_ZOOMIN, ID_PREVIEW_ZOOMIN, BANDID_PREVIEW_BTN5); + AddTextButton(hReBar, STRING_PREVIEW_ZOOMOUT, ID_PREVIEW_ZOOMOUT, BANDID_PREVIEW_BTN6); + AddTextButton(hReBar, STRING_PREVIEW_CLOSE, ID_FILE_EXIT, BANDID_PREVIEW_BTN7); hStatic = CreateWindowW(WC_STATICW, NULL, WS_VISIBLE | WS_CHILD, 0, 0, 0, 0, @@ -465,23 +481,220 @@ } } +static const int min_spacing = 10; + +static void update_preview_scrollbars(HWND hwndPreview, RECT *window) +{ + SCROLLINFO sbi; + sbi.cbSize = sizeof(sbi); + sbi.fMask = SIF_PAGE|SIF_RANGE; + sbi.nMin = 0; + if (preview.zoomlevel == 0) + { + /* Hide scrollbars when zoomed out. */ + sbi.nMax = 0; + sbi.nPage = window->right; + SetScrollInfo(hwndPreview, SB_HORZ, &sbi, TRUE); + sbi.nPage = window->bottom; + SetScrollInfo(hwndPreview, SB_VERT, &sbi, TRUE); + } else { + if (!preview.hdc2) + sbi.nMax = preview.bmScaledSize.cx + min_spacing * 2; + else + sbi.nMax = preview.bmScaledSize.cx * 2 + min_spacing * 3; + sbi.nPage = window->right; + SetScrollInfo(hwndPreview, SB_HORZ, &sbi, TRUE); + /* Change in the horizontal scrollbar visibility affects the + * client rect, so update the client rect. */ + GetClientRect(hwndPreview, window); + sbi.nMax = preview.bmScaledSize.cy + min_spacing * 2; + sbi.nPage = window->bottom; + SetScrollInfo(hwndPreview, SB_VERT, &sbi, TRUE); + } +} + +static void update_preview_sizes(HWND hwndPreview, BOOL zoomLevelUpdated) +{ + RECT window; + + GetClientRect(hwndPreview, &window); + + /* The zoom ratio isn't updated for partial zoom because of resizing the window. */ + if (zoomLevelUpdated || preview.zoomlevel != 1) + { + float ratio, ratioHeight, ratioWidth; + if (preview.zoomlevel == 2) + { + ratio = 1.0; + } else { + ratioHeight = (window.bottom - min_spacing * 2) / (float)preview.bmSize.cy; + + if(preview.hdc2) + ratioWidth = ((window.right - min_spacing * 3) / 2.0) / (float)preview.bmSize.cx; + else + ratioWidth = (window.right - min_spacing * 2) / (float)preview.bmSize.cx; + + if(ratioWidth > ratioHeight) + ratio = ratioHeight; + else + ratio = ratioWidth; + + if (preview.zoomlevel == 1) + ratio += (1.0 - ratio) / 2; + } + preview.zoomratio = ratio; + } + + preview.bmScaledSize.cx = preview.bmSize.cx * preview.zoomratio; + preview.bmScaledSize.cy = preview.bmSize.cy * preview.zoomratio; + + preview.spacing.cy = max(min_spacing, (window.bottom - preview.bmScaledSize.cy) / 2); + + if(!preview.hdc2) + preview.spacing.cx = (window.right - preview.bmScaledSize.cx) / 2; + else + preview.spacing.cx = (window.right - preview.bmScaledSize.cx * 2) / 3; + if (preview.spacing.cx < min_spacing) + preview.spacing.cx = min_spacing; + + update_preview_scrollbars(hwndPreview, &window); +} + +/* Update for zoom ratio changes with same page. */ +static void update_scaled_preview(HWND hMainWnd) +{ + HWND hwndPreview = GetDlgItem(hMainWnd, IDC_PREVIEW); + preview.window.right = 0; + InvalidateRect(hwndPreview, NULL, TRUE); +} + +LRESULT CALLBACK preview_proc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + switch(msg) + { + case WM_CREATE: + { + HWND hEditorWnd = GetDlgItem(GetParent(hWnd), IDC_EDITOR); + FORMATRANGE fr; + GETTEXTLENGTHEX gt = {GTL_DEFAULT, 1200}; + HDC hdc = GetDC(hWnd); + HDC hdcTarget = make_dc(); + + fr.rc = preview.rcPage = get_print_rect(hdcTarget); + preview.rcPage.bottom += margins.bottom; + preview.rcPage.right += margins.right; + preview.rcPage.top = preview.rcPage.left = 0; + fr.rcPage = preview.rcPage; + + preview.bmSize.cx = twips_to_pixels(preview.rcPage.right, GetDeviceCaps(hdc, LOGPIXELSX)); + preview.bmSize.cy = twips_to_pixels(preview.rcPage.bottom, GetDeviceCaps(hdc, LOGPIXELSY)); + + fr.hdc = CreateCompatibleDC(hdc); + fr.hdcTarget = hdcTarget; + fr.chrg.cpMin = 0; + fr.chrg.cpMax = SendMessageW(hEditorWnd, EM_GETTEXTLENGTHEX, (WPARAM)&gt, 0); + preview.pages = get_num_pages(hEditorWnd, fr); + DeleteDC(fr.hdc); + + update_preview_sizes(hWnd, TRUE); + break; + } + + case WM_PAINT: + return print_preview(hWnd); + + case WM_SIZE: + { + update_preview_sizes(hWnd, FALSE); + update_scaled_preview(hWnd); + break; + } + + case WM_VSCROLL: + case WM_HSCROLL: + { + SCROLLINFO si; + RECT rc; + int nBar = (msg == WM_VSCROLL) ? SB_VERT : SB_HORZ; + int origPos; + + GetClientRect(hWnd, &rc); + si.cbSize = sizeof(si); + si.fMask = SIF_ALL; + GetScrollInfo(hWnd, nBar, &si); + origPos = si.nPos; + switch(LOWORD(wParam)) + { + case SB_TOP: /* == SB_LEFT */ + si.nPos = si.nMin; + break; + case SB_BOTTOM: /* == SB_RIGHT */ + si.nPos = si.nMax; + break; + case SB_LINEUP: /* == SB_LINELEFT */ + si.nPos -= si.nPage / 10; + break; + case SB_LINEDOWN: /* == SB_LINERIGHT */ + si.nPos += si.nPage / 10; + break; + case SB_PAGEUP: /* == SB_PAGELEFT */ + si.nPos -= si.nPage; + break; + case SB_PAGEDOWN: /* SB_PAGERIGHT */ + si.nPos += si.nPage; + break; + case SB_THUMBTRACK: + si.nPos = si.nTrackPos; + break; + } + si.fMask = SIF_POS; + SetScrollInfo(hWnd, nBar, &si, TRUE); + GetScrollInfo(hWnd, nBar, &si); + if (si.nPos != origPos) + { + int amount = origPos - si.nPos; + if (msg == WM_VSCROLL) + ScrollWindow(hWnd, 0, amount, NULL, NULL); + else + ScrollWindow(hWnd, amount, 0, NULL, NULL); + } + return 0; + } + + default: + return DefWindowProcW(hWnd, msg, wParam, lParam); + } + + return 0; +} + void init_preview(HWND hMainWnd, LPWSTR wszFileName) { + HWND hwndPreview; + HINSTANCE hInstance = GetModuleHandleW(0); preview.page = 1; preview.hdc = 0; preview.hdc2 = 0; preview.wszFileName = wszFileName; + preview.zoomratio = 0; + preview.zoomlevel = 0; preview_bar_show(hMainWnd, TRUE); + + hwndPreview = CreateWindowExW(0, wszPreviewWndClass, NULL, + WS_VISIBLE | WS_CHILD | WS_VSCROLL | WS_HSCROLL, + 0, 0, 200, 10, hMainWnd, (HMENU)IDC_PREVIEW, hInstance, NULL); } void close_preview(HWND hMainWnd) { + HWND hwndPreview = GetDlgItem(hMainWnd, IDC_PREVIEW); preview.window.right = 0; preview.window.bottom = 0; preview.page = 0; preview.pages = 0; preview_bar_show(hMainWnd, FALSE); + DestroyWindow(hwndPreview); } BOOL preview_isactive(void) @@ -663,46 +876,53 @@ static void draw_preview(HWND hEditorWnd, FORMATRANGE* lpFr, int bmWidth, int bmHeight, RECT* paper, int page) { HBITMAP hBitmapCapture = CreateCompatibleBitmap(lpFr->hdc, bmWidth, bmHeight); + int bottom; char_from_pagenum(hEditorWnd, lpFr, page); SelectObject(lpFr->hdc, hBitmapCapture); FillRect(lpFr->hdc, paper, GetStockObject(WHITE_BRUSH)); + bottom = lpFr->rc.bottom; SendMessageW(hEditorWnd, EM_FORMATRANGE, TRUE, (LPARAM)lpFr); - /* EM_FORMATRANGE sets fr.rc to indicate the area printed in, but we want to - keep the original for drawing margins */ - lpFr->rc = get_print_rect(lpFr->hdcTarget); + /* EM_FORMATRANGE sets fr.rc.bottom to indicate the area printed in, + * but we want to keep the original for drawing margins */ + lpFr->rc.bottom = bottom; SendMessageW(hEditorWnd, EM_FORMATRANGE, FALSE, 0); } -LRESULT print_preview(HWND hMainWnd) +static void update_preview_buttons(HWND hMainWnd) +{ + HWND hReBar = GetDlgItem(hMainWnd, IDC_REBAR); + EnableWindow(GetDlgItem(hReBar, ID_PREVIEW_PREVPAGE), preview.page > 1); + EnableWindow(GetDlgItem(hReBar, ID_PREVIEW_NEXTPAGE), preview.hdc2 ? + (preview.page + 1) < preview.pages : + preview.page < preview.pages); + EnableWindow(GetDlgItem(hReBar, ID_PREVIEW_NUMPAGES), preview.pages > 1 && preview.zoomlevel == 0); + EnableWindow(GetDlgItem(hReBar, ID_PREVIEW_ZOOMIN), preview.zoomlevel < 2); + EnableWindow(GetDlgItem(hReBar, ID_PREVIEW_ZOOMOUT), preview.zoomlevel > 0); +} + +LRESULT print_preview(HWND hwndPreview) { FORMATRANGE fr; - GETTEXTLENGTHEX gt; HDC hdc; RECT window, background; - int bmWidth, bmHeight, bmNewWidth, bmNewHeight; - float ratioWidth, ratioHeight, ratio; - int xOffset, yOffset; - int barheight; - float spacing = 20.0; - HWND hReBar = GetDlgItem(hMainWnd, IDC_REBAR); PAINTSTRUCT ps; - - hdc = BeginPaint(hMainWnd, &ps); - GetClientRect(hMainWnd, &window); + HWND hMainWnd = GetParent(hwndPreview); + POINT scrollpos; + + hdc = BeginPaint(hwndPreview, &ps); + GetClientRect(hwndPreview, &window); fr.hdcTarget = make_dc(); - fr.rc = get_print_rect(fr.hdcTarget); - fr.rcPage.left = 0; - fr.rcPage.top = 0; - fr.rcPage.bottom = fr.rc.bottom + margins.bottom; - fr.rcPage.right = fr.rc.right + margins.right; - - bmWidth = twips_to_pixels(fr.rcPage.right, GetDeviceCaps(hdc, LOGPIXELSX)); - bmHeight = twips_to_pixels(fr.rcPage.bottom, GetDeviceCaps(hdc, LOGPIXELSY)); + fr.rc = fr.rcPage = preview.rcPage; + fr.rc.left += margins.left; + fr.rc.top += margins.top; + fr.rc.bottom -= margins.bottom; + fr.rc.right -= margins.right; if(!preview.hdc) { + GETTEXTLENGTHEX gt; RECT paper; HWND hEditorWnd = GetDlgItem(hMainWnd, IDC_EDITOR); @@ -715,111 +935,113 @@ preview.hdc2 = CreateCompatibleDC(hdc); } - fr.hdc = preview.hdc; gt.flags = GTL_DEFAULT; gt.codepage = 1200; fr.chrg.cpMin = 0; fr.chrg.cpMax = SendMessageW(hEditorWnd, EM_GETTEXTLENGTHEX, (WPARAM)&gt, 0); paper.left = 0; - paper.right = bmWidth; + paper.right = preview.bmSize.cx; paper.top = 0; - paper.bottom = bmHeight; - - if(!preview.pages) - preview.pages = get_num_pages(hEditorWnd, fr); + paper.bottom = preview.bmSize.cy; fr.hdc = preview.hdc; - draw_preview(hEditorWnd, &fr, bmWidth, bmHeight, &paper, preview.page); + draw_preview(hEditorWnd, &fr, preview.bmSize.cx, preview.bmSize.cy, &paper, preview.page); if(preview.hdc2) { fr.hdc = preview.hdc2; - draw_preview(hEditorWnd, &fr, bmWidth, bmHeight, &paper, preview.page + 1); + draw_preview(hEditorWnd, &fr, preview.bmSize.cx, preview.bmSize.cy, &fr.rcPage, preview.page + 1); } - EnableWindow(GetDlgItem(hReBar, ID_PREVIEW_PREVPAGE), preview.page > 1); - EnableWindow(GetDlgItem(hReBar, ID_PREVIEW_NEXTPAGE), preview.hdc2 ? - (preview.page + 1) < preview.pages : - preview.page < preview.pages); - EnableWindow(GetDlgItem(hReBar, ID_PREVIEW_NUMPAGES), preview.pages > 1); - } - - barheight = SendMessageW(hReBar, RB_GETBARHEIGHT, 0, 0); - ratioHeight = ((float)window.bottom - spacing - (float)barheight) / (float)bmHeight; + update_preview_buttons(hMainWnd); + } + + FillRect(hdc, &window, GetStockObject(GRAY_BRUSH)); + + scrollpos.x = GetScrollPos(hwndPreview, SB_HORZ); + scrollpos.y = GetScrollPos(hwndPreview, SB_VERT); + + background.left = preview.spacing.cx - 2 - scrollpos.x; + background.right = background.left + preview.bmScaledSize.cx + 4; + background.top = preview.spacing.cy - 2 - scrollpos.y; + background.bottom = background.top + preview.bmScaledSize.cy + 4; + + FillRect(hdc, &background, GetStockObject(BLACK_BRUSH)); if(preview.hdc2) - ratioWidth = ((float)window.right / 2.0 - spacing * 2.0) / (float)bmWidth; - else - ratioWidth = ((float)window.right - spacing * 3.0) / (float)bmWidth; - - if(ratioWidth > ratioHeight) - ratio = ratioHeight; - else - ratio = ratioWidth; - - bmNewWidth = (int)((float)bmWidth * ratio); - bmNewHeight = (int)((float)bmHeight * ratio); - - yOffset = ((window.bottom - bmNewHeight + barheight) / 2); - - if(!preview.hdc2) - xOffset = (window.right - bmNewWidth) / 2; - else - xOffset = (window.right - bmNewWidth * 2) / 2; - - window.top = barheight; - FillRect(hdc, &window, GetStockObject(GRAY_BRUSH)); - - background.left = xOffset - 2; - background.right = xOffset + bmNewWidth + 2; - background.top = yOffset - 2; - background.bottom = yOffset + bmNewHeight + 2; - - FillRect(hdc, &background, GetStockObject(BLACK_BRUSH)); + { + background.left += preview.bmScaledSize.cx + preview.spacing.cx; + background.right += preview.bmScaledSize.cx + preview.spacing.cx; + + FillRect(hdc, &background, GetStockObject(BLACK_BRUSH)); + } if(window.right != preview.window.right || window.bottom != preview.window.bottom) { - draw_preview_page(preview.hdc, &preview.hdcSized, &fr, ratio, bmNewWidth, bmNewHeight, bmWidth, bmHeight); + draw_preview_page(preview.hdc, &preview.hdcSized, &fr, preview.zoomratio, + preview.bmScaledSize.cx, preview.bmScaledSize.cy, + preview.bmSize.cx, preview.bmSize.cy); if(preview.hdc2) { - background.left += bmNewWidth + spacing; - background.right += bmNewWidth + spacing; - - FillRect(hdc, &background, GetStockObject(BLACK_BRUSH)); - - draw_preview_page(preview.hdc2, &preview.hdcSized2, &fr, ratio, bmNewWidth, bmNewHeight, bmWidth, bmHeight); + draw_preview_page(preview.hdc2, &preview.hdcSized2, &fr, preview.zoomratio, + preview.bmScaledSize.cx, preview.bmScaledSize.cy, + preview.bmSize.cx, preview.bmSize.cy); } } - BitBlt(hdc, xOffset, yOffset, bmNewWidth, bmNewHeight, preview.hdcSized, 0, 0, SRCCOPY); + BitBlt(hdc, preview.spacing.cx - scrollpos.x, preview.spacing.cy - scrollpos.y, + preview.bmScaledSize.cx, preview.bmScaledSize.cy, + preview.hdcSized, 0, 0, SRCCOPY); if(preview.hdc2) { - BitBlt(hdc, xOffset + bmNewWidth + spacing, yOffset, bmNewWidth, bmNewHeight, preview.hdcSized2, 0, 0, SRCCOPY); + BitBlt(hdc, preview.spacing.cx * 2 + preview.bmScaledSize.cx - scrollpos.x, + preview.spacing.cy - scrollpos.y, preview.bmScaledSize.cx, + preview.bmScaledSize.cy, preview.hdcSized2, 0, 0, SRCCOPY); } DeleteDC(fr.hdcTarget); preview.window = window; - EndPaint(hMainWnd, &ps); + EndPaint(hwndPreview, &ps); return 0; } -static void update_preview(HWND hWnd) -{ - RECT rc; - +/* Update for page changes. */ +static void update_preview(HWND hMainWnd) +{ DeleteDC(preview.hdc); preview.hdc = 0; - preview.window.right = 0; - - GetClientRect(hWnd, &rc); - rc.top += SendMessageW(GetDlgItem(hWnd, IDC_REBAR), RB_GETBARHEIGHT, 0, 0); - InvalidateRect(hWnd, &rc, TRUE); + update_scaled_preview(hMainWnd); +} + +static void toggle_num_pages(HWND hMainWnd) +{ + HWND hReBar = GetDlgItem(hMainWnd, IDC_REBAR); + WCHAR name[MAX_STRING_LEN]; + HINSTANCE hInst = GetModuleHandleW(0); + + if(preview.hdc2) + { + DeleteDC(preview.hdc2); + preview.hdc2 = 0; + } else + { + if(preview.page == preview.pages) + preview.page--; + preview.hdc2 = (HDC)-1; + } + + LoadStringW(hInst, preview.hdc2 ? STRING_PREVIEW_ONEPAGE : STRING_PREVIEW_TWOPAGES, + name, MAX_STRING_LEN); + + SetWindowTextW(GetDlgItem(hReBar, ID_PREVIEW_NUMPAGES), name); + update_preview_sizes(GetDlgItem(hMainWnd, IDC_PREVIEW), TRUE); + update_preview(hMainWnd); } LRESULT preview_command(HWND hWnd, WPARAM wParam) @@ -843,29 +1065,38 @@ break; case ID_PREVIEW_NUMPAGES: - { - HWND hReBar = GetDlgItem(hWnd, IDC_REBAR); - WCHAR name[MAX_STRING_LEN]; - HINSTANCE hInst = (HINSTANCE)GetWindowLongPtrW(hWnd, GWLP_HINSTANCE); - - if(preview.hdc2) + toggle_num_pages(hWnd); + break; + + case ID_PREVIEW_ZOOMIN: + if (preview.zoomlevel < 2) { - DeleteDC(preview.hdc2); - preview.hdc2 = 0; - } else + preview.zoomlevel++; + preview.zoomratio = 0; + if (preview.hdc2) + { + /* Forced switch to one page when zooming in. */ + toggle_num_pages(hWnd); + } else { + HWND hwndPreview = GetDlgItem(hWnd, IDC_PREVIEW); + update_preview_sizes(hwndPreview, TRUE); + update_scaled_preview(hWnd); + update_preview_buttons(hWnd); + } + } + break; + + case ID_PREVIEW_ZOOMOUT: + if (preview.zoomlevel > 0) { - if(preview.page == preview.pages) - preview.page--; - preview.hdc2 = (HDC)-1; + HWND hwndPreview = GetDlgItem(hWnd, IDC_PREVIEW); + preview.zoomlevel--; + preview.zoomratio = 0; + update_preview_sizes(hwndPreview, TRUE); + update_scaled_preview(hWnd); + update_preview_buttons(hWnd); } - - LoadStringW(hInst, preview.hdc2 ? STRING_PREVIEW_ONEPAGE : STRING_PREVIEW_TWOPAGES, - name, MAX_STRING_LEN); - - SetWindowTextW(GetDlgItem(hReBar, ID_PREVIEW_NUMPAGES), name); - update_preview(hWnd); - } - break; + break; case ID_PRINT: dialog_print(hWnd, preview.wszFileName); Modified: trunk/reactos/base/applications/wordpad/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/rsrc.rc [iso-8859-1] Mon Feb 8 11:49:03 2010 @@ -1,4 +1,4 @@ -/* +ï»¿/* * Copyright 2004 by Krzysztof Foltman * Copyright 2007 by Alexander N. SÃ¸rnes <alex(a)thehandofagony.com> * @@ -66,6 +66,7 @@ #include "En.rc" #include "Fr.rc" #include "Hu.rc" +#include "It.rc" #include "Ja.rc" #include "Ko.rc" #include "Lt.rc" @@ -77,4 +78,5 @@ #include "Si.rc" #include "Sv.rc" #include "Tr.rc" +#include "Uk.rc" #include "Zh.rc" Modified: trunk/reactos/base/applications/wordpad/wordpad.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/wordpad.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/wordpad.c [iso-8859-1] Mon Feb 8 11:49:03 2010 @@ -56,6 +56,9 @@ static const WCHAR stringFormat[] = {'%','2','d','\0'}; +const WCHAR wszPreviewWndClass[] = {'P','r','t','P','r','e','v','i','e','w',0}; +LRESULT CALLBACK preview_proc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam); + static HWND hMainWnd; static HWND hEditorWnd; static HWND hFindWnd; @@ -85,7 +88,7 @@ static const WCHAR files_txt[] = {'*','.','t','x','t','\0'}; static const WCHAR files_all[] = {'*','.','*','\0'}; - HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr(hMainWnd, GWLP_HINSTANCE); + HINSTANCE hInstance = GetModuleHandleW(0); LoadStringW(hInstance, STRING_RICHTEXT_FILES_RTF, p, MAX_STRING_LEN); p += lstrlenW(p) + 1; @@ -683,8 +686,7 @@ static void preview_exit(HWND hMainWnd) { - HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr(hMainWnd, GWLP_HINSTANCE); - HMENU hMenu = LoadMenuW(hInstance, MAKEINTRESOURCEW(IDM_MAINMENU)); + HMENU hMenu = LoadMenuW(GetModuleHandleW(0), MAKEINTRESOURCEW(IDM_MAINMENU)); HWND hEditorWnd = GetDlgItem(hMainWnd, IDC_EDITOR); set_bar_states(); @@ -701,7 +703,7 @@ static void set_fileformat(WPARAM format) { HICON hIcon; - HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr(hMainWnd, GWLP_HINSTANCE); + HINSTANCE hInstance = GetModuleHandleW(0); fileFormat = format; if(format & SF_TEXT) @@ -980,8 +982,7 @@ static void dialog_about(void) { - HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr(hMainWnd, GWLP_HINSTANCE); - HICON icon = LoadImageW(hInstance, MAKEINTRESOURCEW(IDI_WORDPAD), IMAGE_ICON, 48, 48, LR_SHARED); + HICON icon = LoadImageW(GetModuleHandleW(0), MAKEINTRESOURCEW(IDI_WORDPAD), IMAGE_ICON, 48, 48, LR_SHARED); ShellAboutW(hMainWnd, wszAppTitle, 0, icon); } @@ -1088,7 +1089,7 @@ PROPSHEETPAGEW psp[2]; PROPSHEETHEADERW psh; size_t i; - HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr(hMainWnd, GWLP_HINSTANCE); + HINSTANCE hInstance = GetModuleHandleW(0); LPCPROPSHEETPAGEW ppsp = (LPCPROPSHEETPAGEW)&psp; psp[0].dwSize = sizeof(PROPSHEETPAGEW); @@ -1241,7 +1242,7 @@ if(pFr->Flags & FR_WHOLEWORD) flags |= FR_WHOLEWORD; - ret = SendMessageW(hEditorWnd, EM_FINDTEXTW, (WPARAM)flags, (LPARAM)&ft); + ret = SendMessageW(hEditorWnd, EM_FINDTEXTW, flags, (LPARAM)&ft); if(ret == -1) { @@ -1250,7 +1251,7 @@ ft.chrg.cpMin = cr.cpMin = 0; ft.chrg.cpMax = cr.cpMax = startPos; - ret = SendMessageW(hEditorWnd, EM_FINDTEXTW, (WPARAM)flags, (LPARAM)&ft); + ret = SendMessageW(hEditorWnd, EM_FINDTEXTW, flags, (LPARAM)&ft); } } @@ -1263,7 +1264,7 @@ { end = ret + lstrlenW(pFr->lpstrFindWhat); cr.cpMin = end; - SendMessageW(hEditorWnd, EM_SETSEL, (WPARAM)ret, (LPARAM)end); + SendMessageW(hEditorWnd, EM_SETSEL, ret, end); SendMessageW(hEditorWnd, EM_SCROLLCARET, 0, 0); if(pFr->Flags & FR_REPLACE || pFr->Flags & FR_REPLACEALL) @@ -1414,7 +1415,7 @@ { case WM_INITDIALOG: { - HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr(hMainWnd, GWLP_HINSTANCE); + HINSTANCE hInstance = GetModuleHandleW(0); WCHAR buffer[MAX_STRING_LEN]; HWND hListWnd = GetDlgItem(hWnd, IDC_NEWFILE); @@ -1459,8 +1460,7 @@ { case WM_INITDIALOG: { - HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr(hMainWnd, - GWLP_HINSTANCE); + HINSTANCE hInstance = GetModuleHandleW(0); WCHAR buffer[MAX_STRING_LEN]; HWND hListWnd = GetDlgItem(hWnd, IDC_PARA_ALIGN); HWND hLeftWnd = GetDlgItem(hWnd, IDC_PARA_LEFT); @@ -1737,7 +1737,7 @@ int from = 0, to = 0; POINTL pt; SendMessageW(hEditorWnd, EM_GETSEL, (WPARAM)&from, (LPARAM)&to); - SendMessageW(hEditorWnd, EM_POSFROMCHAR, (WPARAM)&pt, (LPARAM)to); + SendMessageW(hEditorWnd, EM_POSFROMCHAR, (WPARAM)&pt, to); ClientToScreen(hEditorWnd, (POINT*)&pt); x = pt.x; y = pt.y; @@ -1752,7 +1752,7 @@ static LRESULT OnCreate( HWND hWnd ) { HWND hToolBarWnd, hFormatBarWnd, hReBarWnd, hFontListWnd, hSizeListWnd, hRulerWnd; - HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr(hWnd, GWLP_HINSTANCE); + HINSTANCE hInstance = GetModuleHandleW(0); HANDLE hDLL; TBADDBITMAP ab; int nStdBitmaps = 0; @@ -2018,7 +2018,7 @@ case ID_FILE_NEW: { - HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr(hWnd, GWLP_HINSTANCE); + HINSTANCE hInstance = GetModuleHandleW(0); int ret = DialogBox(hInstance, MAKEINTRESOURCE(IDD_NEWFILE), hWnd, newfile_proc); @@ -2334,25 +2334,15 @@ break; case ID_DATETIME: - { - HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr(hWnd, GWLP_HINSTANCE); - DialogBoxW(hInstance, MAKEINTRESOURCEW(IDD_DATETIME), hWnd, datetime_proc); - break; - } + DialogBoxW(GetModuleHandleW(0), MAKEINTRESOURCEW(IDD_DATETIME), hWnd, datetime_proc); + break; case ID_PARAFORMAT: - { - HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr(hWnd, GWLP_HINSTANCE); - DialogBoxW(hInstance, MAKEINTRESOURCEW(IDD_PARAFORMAT), hWnd, - paraformat_proc); - } + DialogBoxW(GetModuleHandleW(0), MAKEINTRESOURCEW(IDD_PARAFORMAT), hWnd, paraformat_proc); break; case ID_TABSTOPS: - { - HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr(hWnd, GWLP_HINSTANCE); - DialogBoxW(hInstance, MAKEINTRESOURCEW(IDD_TABSTOPS), hWnd, tabstops_proc); - } + DialogBoxW(GetModuleHandleW(0), MAKEINTRESOURCEW(IDD_PARAFORMAT), hWnd, tabstops_proc); break; case ID_ABOUT: @@ -2460,7 +2450,7 @@ { int nStatusSize = 0; RECT rc; - HWND hwndEditor = GetDlgItem(hWnd, IDC_EDITOR); + HWND hwndEditor = preview_isactive() ? GetDlgItem(hWnd, IDC_PREVIEW) : GetDlgItem(hWnd, IDC_EDITOR); HWND hwndStatusBar = GetDlgItem(hWnd, IDC_STATUSBAR); HWND hwndReBar = GetDlgItem(hWnd, IDC_REBAR); HWND hRulerWnd = GetDlgItem(hWnd, IDC_RULER); @@ -2563,9 +2553,7 @@ } break; case WM_PAINT: - if(preview_isactive()) - return print_preview(hWnd); - else + if(!preview_isactive()) return DefWindowProcW(hWnd, msg, wParam, lParam); default: @@ -2605,6 +2593,18 @@ wc.lpszClassName = wszMainWndClass; RegisterClassW(&wc); + wc.style = CS_HREDRAW | CS_VREDRAW; + wc.lpfnWndProc = preview_proc; + wc.cbClsExtra = 0; + wc.cbWndExtra = 0; + wc.hInstance = hInstance; + wc.hIcon = NULL; + wc.hCursor = LoadCursor(NULL, IDC_IBEAM); + wc.hbrBackground = GetSysColorBrush(COLOR_WINDOW); + wc.lpszMenuName = NULL; + wc.lpszClassName = wszPreviewWndClass; + RegisterClassW(&wc); + registry_read_winrect(&rc); hMainWnd = CreateWindowExW(0, wszMainWndClass, wszAppTitle, WS_CLIPCHILDREN|WS_OVERLAPPEDWINDOW, rc.left, rc.top, rc.right-rc.left, rc.bottom-rc.top, NULL, NULL, hInstance, NULL); Modified: trunk/reactos/base/applications/wordpad/wordpad.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/wordpad.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/wordpad.h [iso-8859-1] Mon Feb 8 11:49:03 2010 @@ -49,6 +49,8 @@ #define ID_PREVIEW_NEXTPAGE 1017 #define ID_PREVIEW_PREVPAGE 1018 #define ID_PREVIEW_NUMPAGES 1019 +#define ID_PREVIEW_ZOOMIN 1020 +#define ID_PREVIEW_ZOOMOUT 1021 #define ID_ALIGN_LEFT 1100 #define ID_ALIGN_CENTER 1101 @@ -84,7 +86,7 @@ #define ID_TOGGLE_STATUSBAR 1502 #define ID_TOGGLE_RULER 1503 -#define PREVIEW_BUTTONS 5 +#define PREVIEW_BUTTONS 7 #define FILELIST_ENTRIES 4 #define FILELIST_ENTRY_LENGTH 33 @@ -101,7 +103,9 @@ #define BANDID_PREVIEW_BTN3 8 #define BANDID_PREVIEW_BTN4 9 #define BANDID_PREVIEW_BTN5 10 -#define BANDID_PREVIEW_BUFFER 11 +#define BANDID_PREVIEW_BTN6 11 +#define BANDID_PREVIEW_BTN7 12 +#define BANDID_PREVIEW_BUFFER 13 #define ID_WORDWRAP_NONE 0 #define ID_WORDWRAP_WINDOW 1 @@ -145,6 +149,7 @@ #define IDC_FONTLIST 2013 #define IDC_SIZELIST 2014 #define IDC_RULER 2015 +#define IDC_PREVIEW 2016 #define IDD_DATETIME 2100 #define IDD_NEWFILE 2101 @@ -187,9 +192,11 @@ #define STRING_PREVIEW_PREVPAGE 1450 #define STRING_PREVIEW_TWOPAGES 1451 #define STRING_PREVIEW_ONEPAGE 1452 -#define STRING_PREVIEW_CLOSE 1453 - -#define STRING_UNITS_CM 1454 +#define STRING_PREVIEW_ZOOMIN 1453 +#define STRING_PREVIEW_ZOOMOUT 1454 +#define STRING_PREVIEW_CLOSE 1455 + +#define STRING_UNITS_CM 1456 #define STRING_DEFAULT_FILENAME 1700 #define STRING_PROMPT_SAVE_CHANGES 1701 Added: trunk/reactos/base/applications/write/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/It… ============================================================================== --- trunk/reactos/base/applications/write/It.rc (added) +++ trunk/reactos/base/applications/write/It.rc [iso-8859-1] Mon Feb 8 11:49:03 2010 @@ -1,0 +1,32 @@ +/* + * Italian language support + * + * Copyright (C) 2010 by Luca Bennati + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resources.h" + +/*UTF-8*/ +#pragma code_page(65001) + +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +STRINGTABLE +{ + IDS_FAILED, "Impossibile avviare WordPad" +} +#pragma code_page(default) Propchange: trunk/reactos/base/applications/write/It.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/write/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/Uk… ============================================================================== --- trunk/reactos/base/applications/write/Uk.rc (added) +++ trunk/reactos/base/applications/write/Uk.rc [iso-8859-1] Mon Feb 8 11:49:03 2010 @@ -1,0 +1,34 @@ +ï»¿/* + * Ukrainian language support + * + * Copyright (C) 2007 Mikolaj Zalewski + * + * Copyright (C) 2010 Igor Paliychuk + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resources.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +STRINGTABLE +{ + IDS_FAILED, "ÐÐµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð·Ð°Ð¿ÑÑÑÐ¸ÑÐ¸ Wordpad" +} +#pragma code_page(default) Propchange: trunk/reactos/base/applications/write/Uk.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/write/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/rs… ============================================================================== --- trunk/reactos/base/applications/write/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/write/rsrc.rc [iso-8859-1] Mon Feb 8 11:49:03 2010 @@ -23,6 +23,7 @@ #include "De.rc" #include "En.rc" #include "Fr.rc" +#include "It.rc" #include "Ja.rc" #include "Ko.rc" #include "Lt.rc" @@ -32,3 +33,4 @@ #include "Ru.rc" #include "Si.rc" #include "Sv.rc" +#include "Uk.rc"

1 0

[dreimer] 45494: - Include the new Tool from Colin into PS1, too. - Update ChangeLog.txt. - Add the new Tool to the Tools makefile. - Add the new Tool to Installer. Last cosmetic thing to fix: Show Target GCC Version in the Versions showup at the startup from RosBE without this evil temp file hack. If anyone finds another bug... KEEP IT :-P (jk)
by dreimer＠svn.reactos.org 08 Feb '10

08 Feb '10

Author: dreimer Date: Mon Feb 8 01:35:07 2010 New Revision: 45494 URL: http://svn.reactos.org/svn/reactos?rev=45494&view=rev Log: - Include the new Tool from Colin into PS1, too. - Update ChangeLog.txt. - Add the new Tool to the Tools makefile. - Add the new Tool to Installer. Last cosmetic thing to fix: Show Target GCC Version in the Versions showup at the startup from RosBE without this evil temp file hack. If anyone finds another bug... KEEP IT :-P (jk) Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/version.ps1 trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE/RosBE-Windows/Root/version.cmd trunk/tools/RosBE/RosBE-Windows/RosBE.nsi Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] Mon Feb 8 01:35:07 2010 @@ -57,7 +57,7 @@ if (!(Test-Path "$_ROSBE_LOGDIR")) { New-Item -path "$_ROSBE_LOGDIR" -type directory } - $file = "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_TARGET_GCCVERSION-$DATENAME-$TIMENAME.txt" + $file = "$_ROSBE_LOGDIR\BuildLog-$ENV:ROS_ARCH-$DATENAME-$TIMENAME.txt" &{IEX "&'make.exe' -j $MAKE_JOBS $($args)"} $($args) 2>&1 | tee-object $file } else { &{IEX "&'make.exe' -j $MAKE_JOBS $($args)"} $($args) 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] Mon Feb 8 01:35:07 2010 @@ -22,17 +22,9 @@ } $ENV:PATH = "$_ROSBE_HOST_MINGWPATH\bin;$_ROSBE_TARGET_MINGWPATH\bin;$_ROSBE_ORIGINALPATH" -$TARGETGCC = "$global:_ROSBE_PREFIX" + "gcc" -& $TARGETGCC -v 2> gcctvers.tmp -$global:_ROSBE_TARGET_GCCVERSION = (select-string -path .\gcctvers.tmp "gcc version") -replace ".*version ((\d|\.)+).*",'$1' -$global:_ROSBE_TARGET_GCCTARGET = (select-string -path .\gcctvers.tmp "Target: ") -replace ".*Target: (.+?)\b.*",'$1' -remove-item gcctvers.tmp -gcc -v 2> gcchvers.tmp -$global:_ROSBE_HOST_GCCVERSION = (select-string -path .\gcchvers.tmp "gcc version") -replace ".*version ((\d|\.)+).*",'$1' -$global:_ROSBE_HOST_GCCTARGET = (select-string -path .\gcchvers.tmp "Target: ") -replace ".*Target: (.+?)\b.*",'$1' -remove-item gcchvers.tmp -$ENV:ROSBE_HOST_CFLAGS = "-I""$_ROSBE_HOST_MINGWPATH\$_ROSBE_HOST_GCCTARGET\include"" -I""$_ROSBE_HOST_MINGWPATH\lib\gcc\$_ROSBE_HOST_GCCTARGET\$_ROSBE_HOST_GCCVERSION\include""" -$ENV:ROSBE_HOST_CXXFLAGS = "-I""$_ROSBE_HOST_MINGWPATH\$_ROSBE_HOST_GCCTARGET\include"" -I""$_ROSBE_HOST_MINGWPATH\lib\gcc\$_ROSBE_HOST_GCCTARGET\$_ROSBE_HOST_GCCVERSION\include\c++"" -I""$_ROSBE_HOST_MINGWPATH\lib\gcc\$_ROSBE_HOST_GCCTARGET\$_ROSBE_HOST_GCCVERSION\include""" -$ENV:ROSBE_TARGET_CFLAGS = "-I""$_ROSBE_TARGET_MINGWPATH\$_ROSBE_TARGET_GCCTARGET\include"" -I""$_ROSBE_TARGET_MINGWPATH\lib\gcc\$_ROSBE_TARGET_GCCTARGET\$_ROSBE_TARGET_GCCVERSION\include""" -$ENV:ROSBE_TARGET_CXXFLAGS = "-I""$_ROSBE_TARGET_MINGWPATH\$_ROSBE_TARGET_GCCTARGET\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"" -I""$_ROSBE_TARGET_MINGWPATH\lib\gcc\$_ROSBE_TARGET_GCCTARGET\$_ROSBE_TARGET_GCCVERSION\include\c++"" -I""$_ROSBE_TARGET_MINGWPATH\$_ROSBE_TARGET_GCCTARGET\include\c++\$_ROSBE_TARGET_GCCVERSION"" -I""$_ROSBE_TARGET_MINGWPATH\$_ROSBE_TARGET_GCCTARGET\include\c++\$_ROSBE_TARGET_GCCVERSION\$_ROSBE_TARGET_GCCTARGET""" +$ENV:ROSBE_HOST_CFLAGS = "" | cpp.exe -x c -v 2>&1 | getincludes +$ENV:ROSBE_HOST_CXXFLAGS = "" | cpp.exe -x c++ -v 2>&1 | getincludes +$TARGETGCC = "$_ROSBE_PREFIX" + "cpp.exe" +$ENV:ROSBE_TARGET_CFLAGS = "" | &$TARGETGCC -x c -v 2>&1 | getincludes +$ENV:ROSBE_TARGET_CXXFLAGS = "" | &$TARGETGCC -x c++ -v 2>&1 | getincludes 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] Mon Feb 8 01:35:07 2010 @@ -12,7 +12,7 @@ $TARGETGCC = "$global:_ROSBE_PREFIX" + "gcc" & $TARGETGCC -v 2> gcctvers.tmp (select-string -path .\gcctvers.tmp "gcc version") -replace ".*:(.*?)\b",'$1' -"gcc target - $_ROSBE_TARGET_GCCTARGET" +"gcc target - $ENV:ROS_ARCH" remove-item gcctvers.tmp # LD Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Bui… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd [iso-8859-1] Mon Feb 8 01:35:07 2010 @@ -55,7 +55,7 @@ if not exist "%_ROSBE_LOGDIR%\." ( mkdir "%_ROSBE_LOGDIR%" 1> NUL 2> NUL ) - %BUILDTIME_COMMAND% make.exe -j %MAKE_JOBS% %* 2>&1 | tee.exe "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_TARGET_GCCVERSION%-%datename%-%timename%.txt" + %BUILDTIME_COMMAND% make.exe -j %MAKE_JOBS% %* 2>&1 | tee.exe "%_ROSBE_LOGDIR%\BuildLog-%ROS_ARCH%-%datename%-%timename%.txt" ) else ( %BUILDTIME_COMMAND% make.exe -j %MAKE_JOBS% %* ) Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] Mon Feb 8 01:35:07 2010 @@ -1,4 +1,4 @@ -*** Jan XXth, 2010 - RosBE 1.5 Released +*** Feb 08th, 2010 - RosBE 1.5 Released - Updated Binutils to 2.20.51-20091222 (snapshot) (Colin Finck) - Updated GCC to 4.4.3 (including backported GCC r153606) (Colin Finck) @@ -10,7 +10,7 @@ - Updated SVN to 1.6.9 (Daniel Reimer) - Added Remake Command (Daniel Reimer) - Added kdbg Command (Jan Roeloffzen, Daniel Reimer) -- Replaced raddr2line with log2lines v1.11 (Jan Roeloffzen, Daniel Reimer) +- Replaced raddr2line with log2lines v1.12 (Jan Roeloffzen, Daniel Reimer) - Added piperead Tool for log2lines fully working in Powershell (Jan Roeloffzen, Daniel Reimer) - Added a chinese translation to the options tool (Elton Chung) - Added ARM Arch support to RosBE (Daniel Reimer) @@ -32,6 +32,8 @@ - Removed the address translation from the raddr2line script. Its done in the tools now (Daniel Reimer) - Fixed the Core detection in makex for PS. Added a global setting to the variable containing the number of cores. (Daniel Reimer) +- Added getincludes from RosBE Unix. This makes the schripts way more logical and fixes a PS Bug + when you open several Windows at once (Colin Finck, Daniel Reimer) *** Oct 26th, 2009 - RosBE 1.4.5 Released Modified: trunk/tools/RosBE/RosBE-Windows/Root/version.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/ver… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/version.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/version.cmd [iso-8859-1] Mon Feb 8 01:35:07 2010 @@ -17,7 +17,7 @@ :: GCC "%_ROSBE_TARGET_MINGWPATH%\bin\%_ROSBE_PREFIX%gcc" -v 2>&1 | find "gcc version" -echo gcc target^: %_ROSBE_TARGET_GCCTARGET% +echo gcc target^: %ROS_ARCH% :: LD "%_ROSBE_TARGET_MINGWPATH%\bin\%_ROSBE_PREFIX%ld" -v Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.ns… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] Mon Feb 8 01:35:07 2010 @@ -118,45 +118,30 @@ File /r Root\README.pdf File /r Root\changelog.txt File /r Root\LICENSE.txt - ${If} $R4 = '6.1' - File /r Components\Powershell\Build.ps1 - File /r Components\Powershell\charch.ps1 - File /r Components\Powershell\chdefgcc.ps1 - File /r Components\Powershell\Clean.ps1 - File /r Components\Powershell\Help.ps1 - File /r Components\Powershell\Remake.ps1 - File /r Components\Powershell\RosBE.ps1 - File /r Components\Powershell\rosbe-gcc-env.ps1 - File /r Components\Powershell\version.ps1 - WriteRegStr HKLM "SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" "ExecutionPolicy" "RemoteSigned" - WriteRegStr HKLM "SOFTWARE\Wow6432Node\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" "ExecutionPolicy" "RemoteSigned" - ${else} - File /r Root\Basedir.cmd - File /r Root\Build-Shared.cmd - File /r Root\charch.cmd - File /r Root\chdefgcc.cmd - File /r Root\Clean.cmd - File /r Root\Help.cmd - File /r Root\Make.cmd - File /r Root\Makex.cmd - File /r Root\Remake.cmd - File /r Root\Renv.cmd - File /r Root\RosBE.cmd - File /r Root\rosbe-gcc-env.cmd - File /r Root\TimeDate.cmd - File /r Root\version.cmd - SetOutPath "$INSTDIR\Tools" - SetOverwrite try - File /r Components\Tools\flash.exe - File /r Components\Tools\buildtime.exe - File /r Components\Tools\chknewer.exe - File /r Components\Tools\cpucount.exe - File /r Components\Tools\getdate.exe - File /r Components\Tools\rquote.exe - File /r Components\Tools\tee.exe - ${Endif} - SetOutPath "$INSTDIR\Tools" - SetOverwrite try + File /r Root\Basedir.cmd + File /r Root\Build-Shared.cmd + File /r Root\charch.cmd + File /r Root\chdefgcc.cmd + File /r Root\Clean.cmd + File /r Root\Help.cmd + File /r Root\Make.cmd + File /r Root\Makex.cmd + File /r Root\Remake.cmd + File /r Root\Renv.cmd + File /r Root\RosBE.cmd + File /r Root\rosbe-gcc-env.cmd + File /r Root\TimeDate.cmd + File /r Root\version.cmd + SetOutPath "$INSTDIR\Tools" + SetOverwrite try + File /r Components\Tools\flash.exe + File /r Components\Tools\buildtime.exe + File /r Components\Tools\chknewer.exe + File /r Components\Tools\cpucount.exe + File /r Components\Tools\getdate.exe + File /r Components\Tools\getincludes.exe + File /r Components\Tools\rquote.exe + File /r Components\Tools\tee.exe File /r Components\Tools\make.exe File /r Components\Tools\libintl3.dll File /r Components\Tools\libiconv2.dll @@ -179,11 +164,7 @@ SetShellVarContext current SetOutPath "$INSTDIR" SetOverwrite try - ${If} $R4 = '6.1' - File /r Components\Powershell\options.ps1 - ${else} - File /r Root\options.cmd - ${Endif} + File /r Root\options.cmd SetOutPath "$INSTDIR\Tools" SetOverwrite try File /r Components\Tools\options.exe @@ -199,11 +180,7 @@ SetShellVarContext current SetOutPath "$INSTDIR" SetOverwrite try - ${If} $R4 = '6.1' - File /r Components\Powershell\sSVN.ps1 - ${else} - File /r Root\sSVN.cmd - ${Endif} + File /r Root\sSVN.cmd SetOutPath "$INSTDIR\Tools" SetOverwrite try File /r Components\Tools\svn.exe @@ -232,11 +209,7 @@ SetShellVarContext current SetOutPath "$INSTDIR" SetOverwrite try - ${If} $R4 = '6.1' - File /r Components\Powershell\scut.ps1 - ${else} - File /r Root\scut.cmd - ${Endif} + File /r Root\scut.cmd SetOutPath "$INSTDIR\Tools" SetOverwrite try File /r Components\Tools\scut.exe @@ -262,13 +235,8 @@ SetShellVarContext current SetOutPath "$INSTDIR" SetOverwrite try - ${If} $R4 = '6.1' - File /r Components\Powershell\reladdr2line.ps1 - File /r Components\Powershell\kdbg.ps1 - ${else} - File /r Root\raddr2line.cmd - File /r Root\kdbg.cmd - ${Endif} + File /r Root\raddr2line.cmd + File /r Root\kdbg.cmd SetOutPath "$INSTDIR\Tools" SetOverwrite try File /r Components\Tools\echoh.exe @@ -281,13 +249,8 @@ SetShellVarContext current SetOutPath "$INSTDIR" SetOverwrite try - ${If} $R4 = '6.1' - File /r Components\Powershell\chdefdir.ps1 - File /r Components\Powershell\Config.ps1 - ${else} - File /r Root\chdefdir.cmd - File /r Root\Config.cmd - ${Endif} + File /r Root\chdefdir.cmd + File /r Root\Config.cmd SectionEnd Section "Update Script" SEC10 @@ -301,73 +264,32 @@ File /r Components\Tools\elevate.exe SetOutPath "$INSTDIR" SetOverwrite try - ${If} $R4 = '6.1' - File /r Components\Powershell\update.ps1 - ${else} - File /r Root\update.cmd - ${Endif} -SectionEnd - -Section "PowerShell (XP, Vista) / CMD (win7) Version" SEC11 + File /r Root\update.cmd +SectionEnd + +Section "PowerShell Version" SEC11 SetShellVarContext current - ${If} $R4 = '6.1' - SetOutPath "$INSTDIR" - SetOverwrite try - File /r Root\Basedir.cmd - File /r Root\Build-Shared.cmd - File /r Root\chdefgcc.cmd - File /r Root\Clean.cmd - File /r Root\Help.cmd - File /r Root\Make.cmd - File /r Root\Makex.cmd - File /r Root\Renv.cmd - File /r Root\RosBE.cmd - File /r Root\rosbe-gcc-env.cmd - File /r Root\TimeDate.cmd - File /r Root\version.cmd - File /r Root\charch.cmd - File /r Root\chdefdir.cmd - File /r Root\Config.cmd - File /r Root\options.cmd - File /r Root\Remake.cmd - File /r Root\kdbg.cmd - File /r Root\raddr2line.cmd - File /r Root\scut.cmd - File /r Root\sSVN.cmd - File /r Root\update.cmd - SetOutPath "$INSTDIR\Tools" - SetOverwrite try - File /r Components\Tools\buildtime.exe - File /r Components\Tools\flash.exe - File /r Components\Tools\chknewer.exe - File /r Components\Tools\cpucount.exe - File /r Components\Tools\getdate.exe - File /r Components\Tools\rquote.exe - File /r Components\Tools\tee.exe - File /r Components\Tools\elevate.exe - ${else} - SetOutPath "$INSTDIR" - SetOverwrite try - File /r Components\Powershell\Build.ps1 - File /r Components\Powershell\RosBE.ps1 - File /r Components\Powershell\rosbe-gcc-env.ps1 - File /r Components\Powershell\Help.ps1 - File /r Components\Powershell\chdefgcc.ps1 - File /r Components\Powershell\Clean.ps1 - File /r Components\Powershell\version.ps1 - File /r Components\Powershell\charch.ps1 - File /r Components\Powershell\chdefdir.ps1 - File /r Components\Powershell\Config.ps1 - File /r Components\Powershell\options.ps1 - File /r Components\Powershell\Remake.ps1 - File /r Components\Powershell\kdbg.ps1 - File /r Components\Powershell\reladdr2line.ps1 - File /r Components\Powershell\scut.ps1 - File /r Components\Powershell\sSVN.ps1 - File /r Components\Powershell\update.ps1 - WriteRegStr HKLM "SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" "ExecutionPolicy" "RemoteSigned" - WriteRegStr HKLM "SOFTWARE\Wow6432Node\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" "ExecutionPolicy" "RemoteSigned" - ${Endif} + SetOutPath "$INSTDIR" + SetOverwrite try + File /r Components\Powershell\Build.ps1 + File /r Components\Powershell\RosBE.ps1 + File /r Components\Powershell\rosbe-gcc-env.ps1 + File /r Components\Powershell\Help.ps1 + File /r Components\Powershell\chdefgcc.ps1 + File /r Components\Powershell\Clean.ps1 + File /r Components\Powershell\version.ps1 + File /r Components\Powershell\charch.ps1 + File /r Components\Powershell\chdefdir.ps1 + File /r Components\Powershell\Config.ps1 + File /r Components\Powershell\options.ps1 + File /r Components\Powershell\Remake.ps1 + File /r Components\Powershell\kdbg.ps1 + File /r Components\Powershell\reladdr2line.ps1 + File /r Components\Powershell\scut.ps1 + File /r Components\Powershell\sSVN.ps1 + File /r Components\Powershell\update.ps1 + WriteRegStr HKLM "SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" "ExecutionPolicy" "RemoteSigned" + WriteRegStr HKLM "SOFTWARE\Wow6432Node\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" "ExecutionPolicy" "RemoteSigned" SectionEnd Section -StartMenuShortcuts SEC12 @@ -422,11 +344,7 @@ Section -Post SEC15 WriteUninstaller "$INSTDIR\Uninstall-${PRODUCT_VERSION}.exe" - ${If} $R4 = '6.1' - WriteRegStr HKCU "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\RosBE.ps1" - ${else} - WriteRegStr HKCU "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\RosBE.cmd" - ${Endif} + WriteRegStr HKCU "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\RosBE.cmd" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\Uninstall-${PRODUCT_VERSION}.exe" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"

1 0

[cfinck] 45493: - Make "getincludes" a shared tool and also use it for setting the ROSBE_HOST/TARGET_CFLAGS/CXXFLAGS variables in RosBE-Windows. - Modify it to put quotes around the pathes it outputs. (for pathes containing spaces)
by cfinck＠svn.reactos.org 07 Feb '10

07 Feb '10

Author: cfinck Date: Sun Feb 7 23:18:32 2010 New Revision: 45493 URL: http://svn.reactos.org/svn/reactos?rev=45493&view=rev Log: - Make "getincludes" a shared tool and also use it for setting the ROSBE_HOST/TARGET_CFLAGS/CXXFLAGS variables in RosBE-Windows. - Modify it to put quotes around the pathes it outputs. (for pathes containing spaces) Added: trunk/tools/RosBE/Tools/getincludes.c - copied, changed from r45295, trunk/tools/RosBE/RosBE-Unix/Base-i386/tools/getincludes.c Removed: trunk/tools/RosBE/RosBE-Unix/Base-i386/tools/getincludes.c Modified: trunk/tools/RosBE/RosBE-Unix/makepackage.sh trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd Removed: trunk/tools/RosBE/RosBE-Unix/Base-i386/tools/getincludes.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/Base-i386/t… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/Base-i386/tools/getincludes.c [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/Base-i386/tools/getincludes.c (removed) @@ -1,38 +1,0 @@ -/* - * PROJECT: ReactOS Build Environment Tools - * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation - * PURPOSE: Parse the search directory output of 'cpp -v' to compiler flags - * COPYRIGHT: Copyright 2009 Colin Finck <colin(a)reactos.org> - */ - -#include <stdio.h> -#include <string.h> - -int main() -{ - char Line[1024]; - - /* Skip all lines up to the second #include */ - for(;;) - { - if(!fgets(Line, sizeof(Line), stdin)) - return 1; - - if(strstr(Line, "#include <...> ")) - break; - } - - /* The pathes should now follow prefixed by a single space */ - for(;;) - { - if(!fgets(Line, sizeof(Line), stdin) || *Line != ' ') - break; - - /* This is an include directory, remove the newline character and output it */ - Line[strlen(Line) - 1] = 0; - printf("-I%s ", &Line[1]); - } - - printf("\n"); - return 0; -} Modified: trunk/tools/RosBE/RosBE-Unix/makepackage.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/makepackage… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/makepackage.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/makepackage.sh [iso-8859-1] Sun Feb 7 23:18:32 2010 @@ -62,7 +62,7 @@ case "$package_name" in "Base-i386") sources+="gmp make mingw_runtime_dev mpfr nasm w32api" - tools+="cpucount scut" + tools+="cpucount getincludes scut" esac # Check if all required files exist Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] Sun Feb 7 23:18:32 2010 @@ -3,7 +3,7 @@ :: LICENSE: GNU General Public License v2. (see LICENSE.txt) :: FILE: Root/rosbe-gcc-env.cmd :: PURPOSE: Set up toolchain-specific settings when initializing RosBE and when using "charch" or "chdefgcc" -:: COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> +:: COPYRIGHT: Copyright 2010 Daniel Reimer <reimer.daniel(a)freenet.de> :: Peter Ward <dralnix(a)gmail.com> :: Colin Finck <colin(a)reactos.org> :: @@ -31,12 +31,7 @@ set PATH=%_ROSBE_HOST_MINGWPATH%\bin;%_ROSBE_TARGET_MINGWPATH%\bin;%_ROSBE_ORIGINALPATH% -for /f "usebackq tokens=3" %%i in (`"%_ROSBE_PREFIX%gcc -v 2>&1 | find "gcc version""`) do set _ROSBE_TARGET_GCCVERSION=%%i -for /f "usebackq tokens=2" %%i in (`"%_ROSBE_PREFIX%gcc -v 2>&1 | find "Target""`) do set _ROSBE_TARGET_GCCTARGET=%%i -for /f "usebackq tokens=3" %%i in (`"gcc -v 2>&1 | find "gcc version""`) do set _ROSBE_HOST_GCCVERSION=%%i -for /f "usebackq tokens=2" %%i in (`"gcc -v 2>&1 | find "Target""`) do set _ROSBE_HOST_GCCTARGET=%%i - -set ROSBE_HOST_CFLAGS=-I"%_ROSBE_HOST_MINGWPATH%\%_ROSBE_HOST_GCCTARGET%\include" -I"%_ROSBE_HOST_MINGWPATH%\lib\gcc\%_ROSBE_HOST_GCCTARGET%\%_ROSBE_HOST_GCCVERSION%\include" -set ROSBE_HOST_CXXFLAGS=-I"%_ROSBE_HOST_MINGWPATH%\%_ROSBE_HOST_GCCTARGET%\include" -I"%_ROSBE_HOST_MINGWPATH%\lib\gcc\%_ROSBE_HOST_GCCTARGET%\%_ROSBE_HOST_GCCVERSION%\include\c++" -I"%_ROSBE_HOST_MINGWPATH%\lib\gcc\%_ROSBE_HOST_GCCTARGET%\%_ROSBE_HOST_GCCVERSION%\include" -set ROSBE_TARGET_CFLAGS=-I"%_ROSBE_TARGET_MINGWPATH%\%_ROSBE_TARGET_GCCTARGET%\include" -I"%_ROSBE_TARGET_MINGWPATH%\lib\gcc\%_ROSBE_TARGET_GCCTARGET%\%_ROSBE_TARGET_GCCVERSION%\include" -set ROSBE_TARGET_CXXFLAGS=-I"%_ROSBE_TARGET_MINGWPATH%\%_ROSBE_TARGET_GCCTARGET%\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" -I"%_ROSBE_TARGET_MINGWPATH%\lib\gcc\%_ROSBE_TARGET_GCCTARGET%\%_ROSBE_TARGET_GCCVERSION%\include\c++" -I"%_ROSBE_TARGET_MINGWPATH%\%_ROSBE_TARGET_GCCTARGET%\include\c++\%_ROSBE_TARGET_GCCVERSION%" -I"%_ROSBE_TARGET_MINGWPATH%\%_ROSBE_TARGET_GCCTARGET%\include\c++\%_ROSBE_TARGET_GCCVERSION%\%_ROSBE_TARGET_GCCTARGET%" +for /f "usebackq tokens=*" %%i in (`"cpp -x c -v <NUL 2>&1 | getincludes"`) do set ROSBE_HOST_CFLAGS=%%i +for /f "usebackq tokens=*" %%i in (`"cpp -x c++ -v <NUL 2>&1 | getincludes"`) do set ROSBE_HOST_CXXFLAGS=%%i +for /f "usebackq tokens=*" %%i in (`"%_ROSBE_PREFIX%cpp -x c -v <NUL 2>&1 | getincludes"`) do set ROSBE_TARGET_CFLAGS=%%i +for /f "usebackq tokens=*" %%i in (`"%_ROSBE_PREFIX%cpp -x c++ -v <NUL 2>&1 | getincludes"`) do set ROSBE_TARGET_CXXFLAGS=%%i Copied: trunk/tools/RosBE/Tools/getincludes.c (from r45295, trunk/tools/RosBE/RosBE-Unix/Base-i386/tools/getincludes.c) URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/Tools/getincludes.c?p2… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/Base-i386/tools/getincludes.c [iso-8859-1] (original) +++ trunk/tools/RosBE/Tools/getincludes.c [iso-8859-1] Sun Feb 7 23:18:32 2010 @@ -2,7 +2,7 @@ * PROJECT: ReactOS Build Environment Tools * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation * PURPOSE: Parse the search directory output of 'cpp -v' to compiler flags - * COPYRIGHT: Copyright 2009 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2009-2010 Colin Finck <colin(a)reactos.org> */ #include <stdio.h> @@ -30,7 +30,7 @@ /* This is an include directory, remove the newline character and output it */ Line[strlen(Line) - 1] = 0; - printf("-I%s ", &Line[1]); + printf("-I\"%s\" ", &Line[1]); } printf("\n");

1 0

[dgorbachev] 45492: Simplify a bit, remove unused macros.
by dgorbachev＠svn.reactos.org 07 Feb '10

07 Feb '10

Author: dgorbachev Date: Sun Feb 7 20:56:49 2010 New Revision: 45492 URL: http://svn.reactos.org/svn/reactos?rev=45492&view=rev Log: Simplify a bit, remove unused macros. Modified: trunk/reactos/base/setup/usetup/cabinet.c trunk/reactos/base/setup/usetup/usetup.h Modified: trunk/reactos/base/setup/usetup/cabinet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/cabinet.… ============================================================================== --- trunk/reactos/base/setup/usetup/cabinet.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/cabinet.c [iso-8859-1] Sun Feb 7 20:56:49 2010 @@ -66,28 +66,22 @@ /* Needed by zlib, but we don't want the dependency on msvcrt.dll */ - -/* round to 16 bytes + alloc at minimum 16 bytes */ -#define ROUND_SIZE(size) (max(16, ROUND_UP(size, 16))) - -void* __cdecl malloc(size_t _size) -{ - size_t nSize = ROUND_SIZE(_size); - - if (nSize<_size) - return NULL; - - return RtlAllocateHeap(ProcessHeap, HEAP_ZERO_MEMORY, nSize); -} - -void __cdecl free(void* _ptr) -{ - RtlFreeHeap(ProcessHeap, 0, _ptr); -} - -void* __cdecl calloc(size_t _nmemb, size_t _size) -{ - return (void*)RtlAllocateHeap (ProcessHeap, HEAP_ZERO_MEMORY, _size); +void *__cdecl +malloc(size_t size) +{ + return RtlAllocateHeap(ProcessHeap, HEAP_ZERO_MEMORY, size); +} + +void __cdecl +free(void *ptr) +{ + RtlFreeHeap(ProcessHeap, 0, ptr); +} + +void *__cdecl +calloc(size_t nmemb, size_t size) +{ + return (void *)RtlAllocateHeap(ProcessHeap, HEAP_ZERO_MEMORY, nmemb * size); } /* RAW codec */ @@ -108,9 +102,11 @@ PLONG InputLength, PLONG OutputLength) { - LONG In = abs(*InputLength), Out = abs(*OutputLength); - memcpy(OutputBuffer, InputBuffer, In < Out ? In : Out); - *InputLength = *OutputLength = In < Out ? In : Out; + LONG Len = min(abs(*InputLength), abs(*OutputLength)); + + memcpy(OutputBuffer, InputBuffer, Len); + *InputLength = *OutputLength = Len; + return CS_SUCCESS; } Modified: trunk/reactos/base/setup/usetup/usetup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/usetup.h… ============================================================================== --- trunk/reactos/base/setup/usetup/usetup.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/usetup.h [iso-8859-1] Sun Feb 7 20:56:49 2010 @@ -122,12 +122,6 @@ #define POPUP_WAIT_ANY_KEY 1 #define POPUP_WAIT_ENTER 2 -#define ROUND_DOWN(n, align) \ - (((ULONG)n) & ~((align) - 1l)) - -#define ROUND_UP(n, align) \ - ROUND_DOWN(((ULONG)n) + (align) - 1, (align)) - #define LIST_FOR_EACH(elem, list, type, field) \ for ((elem) = CONTAINING_RECORD((list)->Flink, type, field); \ &(elem)->field != (list) || (elem == NULL); \

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
37
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2010