Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 33220: Added French translation for kbswitch.exe
by pschweitzer＠svn.reactos.org 01 May '08

01 May '08

Author: pschweitzer Date: Thu May 1 12:19:38 2008 New Revision: 33220 URL: http://svn.reactos.org/svn/reactos?rev=33220&view=rev Log: Added French translation for kbswitch.exe Added: trunk/reactos/base/applications/kbswitch/lang/fr-FR.rc (with props) Modified: trunk/reactos/base/applications/kbswitch/rsrc.rc Added: trunk/reactos/base/applications/kbswitch/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/lang/fr-FR.rc (added) +++ trunk/reactos/base/applications/kbswitch/lang/fr-FR.rc [iso-8859-1] Thu May 1 12:19:38 2008 @@ -1,0 +1,11 @@ +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +IDR_POPUP MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM SEPARATOR + MENUITEM "&Préférences...", ID_PREFERENCES + MENUITEM "Quitt&er", ID_EXIT + END +END Propchange: trunk/reactos/base/applications/kbswitch/lang/fr-FR.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/kbswitch/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/rsrc.rc [iso-8859-1] Thu May 1 12:19:38 2008 @@ -2,5 +2,6 @@ #include "lang/de-DE.rc" #include "lang/en-US.rc" #include "lang/es-ES.rc" +#include "lang/fr-FR.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc"

1 0

[dreimer] 33219: Some small fixes
by dreimer＠svn.reactos.org 01 May '08

01 May '08

Author: dreimer Date: Thu May 1 12:05:43 2008 New Revision: 33219 URL: http://svn.reactos.org/svn/reactos?rev=33219&view=rev Log: Some small fixes Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 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] Thu May 1 12:05:43 2008 @@ -73,6 +73,7 @@ # # Get the current date and time for use in in our build log's file name. # +$TIMERAW = get-date -f t $DATENAME = get-date -f dyMMyyyy $TIMENAME = get-date -f HHmm @@ -146,22 +147,14 @@ # if ($args.count -gt 1) { if ($args[0] -eq "multi") { - if ($args[1] -ne "") { - $host.ui.RawUI.WindowTitle = "makex $args parallel build started: $TIMERAW" - } else { - $host.ui.RawUI.WindowTitle = "makex parallel build started: $TIMERAW" - } + $host.ui.RawUI.WindowTitle = "makex $($args) parallel build started: $TIMERAW" +} BUILDMULTI -} } else { if ($args.count -gt 0) { - if ($args[0] -ne "") { - $host.ui.RawUI.WindowTitle = "make $args build started: $TIMERAW" - } else { - $host.ui.RawUI.WindowTitle = "make build started: $TIMERAW" - } + $host.ui.RawUI.WindowTitle = "make $($args) build started: $TIMERAW" +} BUILD -} } #

1 0

[dreimer] 33218: Build Process works BaseDir is set properly
by dreimer＠svn.reactos.org 01 May '08

01 May '08

Author: dreimer Date: Thu May 1 11:54:22 2008 New Revision: 33218 URL: http://svn.reactos.org/svn/reactos?rev=33218&view=rev Log: Build Process works BaseDir is set properly Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] Thu May 1 11:54:22 2008 @@ -83,21 +83,25 @@ # if ($_ROSBE_WRITELOG -eq 1) { if (!(Test-Path "$_ROSBE_LOGDIR")) { - New-Item -path "$_ROSBE_ROSSOURCEDIR" -name "RosBE-Logs" -type directory + $null = (New-Item -path "$_ROSBE_ROSSOURCEDIR" -name "RosBE-Logs" -type directory) } } function BUILD { if ($_ROSBE_SHOWTIME -eq 1) { if ($_ROSBE_WRITELOG -eq 1) { - New-Item -path "$_ROSBE_LOGDIR" -name "BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" -type file + if (!(Test-Path "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt")) { + $null = (New-Item -path "$_ROSBE_LOGDIR" -name "BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" -type file) + } & "$_ROSBE_BASEDIR\Tools\buildtime.exe" "$_ROSBE_MINGWMAKE" $($args) 2>&1 | tee-object -filepath "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" } else { & "$_ROSBE_BASEDIR\Tools\buildtime.exe" "$_ROSBE_MINGWMAKE" $($args) } } else { if ($_ROSBE_WRITELOG -eq 1) { - New-Item -path "$_ROSBE_LOGDIR" -name "BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" -type file + if (!(Test-Path "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt")) { + $null = (New-Item -path "$_ROSBE_LOGDIR" -name "BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" -type file) + } & "$_ROSBE_MINGWMAKE" $($args) 2>&1 | tee-object -filepath "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" } else { & "$_ROSBE_MINGWMAKE" $($args) @@ -114,21 +118,25 @@ # -x2 - Number of CPUs, doubled. # -a - Determine the cpu count based on the inherited process affinity mask. # -# for /f "usebackq" %%i in (`"%_ROSBE_BASEDIR%\Tools\cpucount.exe" -x1`) do set CPUCOUNT=%%i +$CPUCOUNT= &"$_ROSBE_BASEDIR\Tools\cpucount.exe" -x1 if ($_ROSBE_SHOWTIME -eq 1) { if ($_ROSBE_WRITELOG -eq 1) { -# New-Item -path "$_ROSBE_LOGDIR" -name "BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" -type file -# & "$_ROSBE_BASEDIR\Tools\buildtime.exe" "$_ROSBE_MINGWMAKE" -j $CPUCOUNT $($args) 2>&1 | tee-object -filepath "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" + if (!(Test-Path "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt")) { + $null = (New-Item -path "$_ROSBE_LOGDIR" -name "BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" -type file) + } + & "$_ROSBE_BASEDIR\Tools\buildtime.exe" "$_ROSBE_MINGWMAKE" -j $CPUCOUNT $($args) 2>&1 | tee-object -filepath "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" } else { -# & "$_ROSBE_BASEDIR\Tools\buildtime.exe" "$_ROSBE_MINGWMAKE" -j $CPUCOUNT $($args) + & "$_ROSBE_BASEDIR\Tools\buildtime.exe" "$_ROSBE_MINGWMAKE" -j $CPUCOUNT $($args) } } else { if ($_ROSBE_WRITELOG -eq 1) { -# New-Item -path "$_ROSBE_LOGDIR" -name "BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" -type file -# & "$_ROSBE_MINGWMAKE" -j $CPUCOUNT $($args) 2>&1 | tee-object -filepath "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" + if (!(Test-Path "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt")) { + $null = (New-Item -path "$_ROSBE_LOGDIR" -name "BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" -type file) + } + & "$_ROSBE_MINGWMAKE" -j $CPUCOUNT $($args) 2>&1 | tee-object -filepath "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" } else { -# & "$_ROSBE_MINGWMAKE" -j $CPUCOUNT $($args) + & "$_ROSBE_MINGWMAKE" -j $CPUCOUNT $($args) } } } @@ -139,7 +147,7 @@ if ($args.count -gt 1) { if ($args[0] -eq "multi") { if ($args[1] -ne "") { - $host.ui.RawUI.WindowTitle = "makex $args[1] parallel build started: $TIMERAW" + $host.ui.RawUI.WindowTitle = "makex $args parallel build started: $TIMERAW" } else { $host.ui.RawUI.WindowTitle = "makex parallel build started: $TIMERAW" } @@ -148,7 +156,7 @@ } else { if ($args.count -gt 0) { if ($args[0] -ne "") { - $host.ui.RawUI.WindowTitle = "make $args[1] build started: $TIMERAW" + $host.ui.RawUI.WindowTitle = "make $args build started: $TIMERAW" } else { $host.ui.RawUI.WindowTitle = "make build started: $TIMERAW" } Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] Thu May 1 11:54:22 2008 @@ -18,7 +18,8 @@ if ($APPDATA.Length -lt 1) {$APPDATA = $ENV:USERPROFILE} $global:PATH = "$ENV:SystemRoot\system32;$ENV:SystemRoot" $global:_ROSBE_VERSION = 1.2 -$global:_ROSBE_BASEDIR = "C:\Programme\RosBE" #NOCH FALSCH +$global:0 = $myInvocation.MyCommand.Definition +$global:_ROSBE_BASEDIR = [System.IO.Path]::GetDirectoryName($0) $global:_ROSBE_MODE = "RosBE" $global:_ROSBE_ROSSOURCEDIR = "$pwd" $global:_ROSBE_ORIGINALPATH = "$PATH" @@ -101,7 +102,7 @@ # # Check if RosBE data directory exists, if not, create it. # -if (!(Test-Path "$APPDATA\RosBE")) {mkdir $APPDATA\RosBE} +if (!(Test-Path "$APPDATA\RosBE")) {New-Item -path "$APPDATA" -name "RosBE" -type directory} # # Check if the user has used the options utility and @@ -119,17 +120,16 @@ # if ($args.count -gt 0) { if ($args[0] = "oldmode") { -# cls + cls $_ROSBE_MODE = "MinGW" } else { -# cls + cls "Unknown parameter specified. Exiting." exit } } RosBE4 -#cls # # Load the base directory from srclist.txt and set it as the @@ -157,8 +157,7 @@ # inform the user and mention 'ssvn create' (only if ssvn is installed). # if (!(Test-Path "$_ROSBE_BASEDIR\sSVN.ps1")) { -# dir /b $_ROSBE_ROSSOURCEDIR 2>nul | findstr "." >nul - if ($errorlevel = 1) { + if ((get-childitem $_ROSBE_ROSSOURCEDIR).Count -le 0) { "No ReactOS source detected. Please use ""ssvn create"" to download it." } } 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] Thu May 1 11:54:22 2008 @@ -11,7 +11,7 @@ # Check if we are running within the RosBE, and if not # initialize GCC for the current directory. # -if ($ENV:_ROSBE_MINGWPATH = $null) { +if ($ENV:_ROSBE_MINGWPATH -eq $null) { $ENV:_ROSBE_MODE = "MinGW" $ENV:_ROSBE_MINGWPATH = "$pwd" $ENV:_ROSBE_ORIGINALPATH = "$PATH" @@ -23,11 +23,11 @@ $ENV:PATH = "$_ROSBE_MINGWPATH\bin;$_ROSBE_ORIGINALPATH" $global:_ROSBE_GCCVERSION = $null $global:_ROSBE_GCCTARGET = $null -#for /f "usebackq tokens=3" %%i in (`"gcc -v 2>&1 | find "gcc version""`) do set _ROSBE_GCCVERSION=%%i -#for /f "usebackq tokens=2" %%i in (`"gcc -v 2>&1 | find "Target""`) do set _ROSBE_GCCTARGET=%%i +$global:_ROSBE_GCCVERSION = (& gcc -v 2>&1 | select-string "gcc version") -replace ".*version ((\d|\.)+).*",'$1' +$global:_ROSBE_GCCTARGET = (& gcc -v 2>&1 | select-string "target=") -replace ".*--target=(.+?)\b.*",'$1' $ENV:PATH = "$_ROSBE_MINGWPATH\bin;$_ROSBE_MINGWPATH\libexec\gcc\$_ROSBE_GCCTARGET\$_ROSBE_GCCVERSION;$_ROSBE_ORIGINALPATH" $global:_ROSBE_MINGWMAKE = "$_ROSBE_MINGWPATH\bin\mingw32-make.exe" -if ($_ROSBE_MODE = "MinGW") { +if ($_ROSBE_MODE -eq "MinGW") { $ENV:C_INCLUDE_PATH = "$_ROSBE_MINGWPATH\include;$_ROSBE_MINGWPATH\lib\gcc\$_ROSBE_GCCTARGET\$_ROSBE_GCCVERSION\include" $ENV:CPLUS_INCLUDE_PATH = "$_ROSBE_MINGWPATH\include;$_ROSBE_MINGWPATH\include\c++\$_ROSBE_GCCVERSION;$_ROSBE_MINGWPATH\include\c++\$_ROSBE_GCCVERSION\$_ROSBE_GCCTARGET;$_ROSBE_MINGWPATH\lib\gcc\$_ROSBE_GCCTARGET\$_ROSBE_GCCVERSION\include" } else { @@ -39,28 +39,29 @@ # # Display the current version of GCC, NASM, ld and make. # -gcc -v 2>&1 | find "gcc version" +& gcc -v 2>&1 | select-string "gcc version" "gcc target - $_ROSBE_GCCTARGET" -ld -v +& ld -v if (Test-Path "$_ROSBE_MINGWPATH\bin\nasm.exe") { - nasm -v + & nasm -v } else { - if ($_ROSBE_MODE = "RosBE") { + if ($_ROSBE_MODE -eq "RosBE") { "ERROR: NASM is required to build ReactOS, none found in the current MinGW/GCC." } } if (Test-Path "$_ROSBE_MINGWPATH\bin\bison.exe") { - bison --version | find "GNU Bison" + & bison --version | find "GNU Bison" } else { - if ($_ROSBE_MODE = "RosBE") { + if ($_ROSBE_MODE -eq "RosBE") { "WARNING: Bison will soon be required to build ReactOS, none found in the current MinGW/GCC." } } if (Test-Path "$_ROSBE_MINGWPATH\bin\flex.exe") { - flex --version +$fver = (& flex --version) -replace ".*version ((\d|\.)+).*",'$1' + "flex $fver" } else { - if ($_ROSBE_MODE = "RosBE") { + if ($_ROSBE_MODE -eq "RosBE") { "WARNING: Flex will soon be required to build ReactOS, none found in the current MinGW/GCC." } } -mingw32-make -v | find "GNU Make" +& mingw32-make -v | & find "GNU Make" Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] Thu May 1 11:54:22 2008 @@ -40,7 +40,7 @@ :: Check if RosBE data directory exists, if not, create it. :: if not exist "%APPDATA%\RosBE\." ( - mkdir "%APPDATA%\RosBE" + mkdir "%APPDATA%\RosBE" 1> NUL 2> NUL ) ::

1 0

[greatlrd] 33217: Fixed DRIVER_FUNCTIONS this struct are being passdown to ms dxg.sys and it access it direcly so we need it match eacly windows xp/2003 layout Fixed DRIVER_BuildDDIFunctions it now setup all api from the drv to DRIVER_FUNCTIONS struct. it is update to windows 2003, we can now use all hw acc api that exists in the drv. we do not doing that yet.
by greatlrd＠svn.reactos.org 01 May '08

01 May '08

Author: greatlrd Date: Thu May 1 11:36:42 2008 New Revision: 33217 URL: http://svn.reactos.org/svn/reactos?rev=33217&view=rev Log: Fixed DRIVER_FUNCTIONS this struct are being passdown to ms dxg.sys and it access it direcly so we need it match eacly windows xp/2003 layout Fixed DRIVER_BuildDDIFunctions it now setup all api from the drv to DRIVER_FUNCTIONS struct. it is update to windows 2003, we can now use all hw acc api that exists in the drv. we do not doing that yet. Modified: trunk/reactos/include/ddk/winddi.h trunk/reactos/include/reactos/drivers/directx/directxint.h trunk/reactos/include/reactos/win32k/ntgdityp.h trunk/reactos/subsystems/win32/win32k/misc/driver.c trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Modified: trunk/reactos/include/ddk/winddi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddi.h?rev=3… ============================================================================== --- trunk/reactos/include/ddk/winddi.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/winddi.h [iso-8859-1] Thu May 1 11:36:42 2008 @@ -337,6 +337,7 @@ #define INDEX_DrvOffset 6L #define INDEX_DrvResetPDEV 7L #define INDEX_DrvDisableDriver 8L +#define INDEX_DrvUnknown1 9L #define INDEX_DrvCreateDeviceBitmap 10L #define INDEX_DrvDeleteDeviceBitmap 11L #define INDEX_DrvRealizeBrush 12L @@ -348,6 +349,7 @@ #define INDEX_DrvBitBlt 18L #define INDEX_DrvCopyBits 19L #define INDEX_DrvStretchBlt 20L +#define INDEX_DrvUnknown2 21L #define INDEX_DrvSetPalette 22L #define INDEX_DrvTextOut 23L #define INDEX_DrvEscape 24L @@ -362,8 +364,10 @@ #define INDEX_DrvStartPage 33L #define INDEX_DrvEndDoc 34L #define INDEX_DrvStartDoc 35L +#define INDEX_DrvUnknown3 36L #define INDEX_DrvGetGlyphMode 37L #define INDEX_DrvSynchronize 38L +#define INDEX_DrvUnknown4 39L #define INDEX_DrvSaveScreenBits 40L #define INDEX_DrvGetModes 41L #define INDEX_DrvFree 42L @@ -387,6 +391,7 @@ #define INDEX_DrvEnableDirectDraw 60L #define INDEX_DrvDisableDirectDraw 61L #define INDEX_DrvQuerySpoolType 62L +#define INDEX_DrvUnknown5 63L #define INDEX_DrvIcmCreateColorTransform 64L #define INDEX_DrvIcmDeleteColorTransform 65L #define INDEX_DrvIcmCheckBitmapBits 66L @@ -3622,6 +3627,7 @@ IN LPWSTR pwszDeviceName, IN HANDLE hDriver); #endif + typedef HSURF (APIENTRY *PFN_DrvEnableSurface)( IN DHPDEV dhpdev); Modified: trunk/reactos/include/reactos/drivers/directx/directxint.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/drivers/di… ============================================================================== --- trunk/reactos/include/reactos/drivers/directx/directxint.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/drivers/directx/directxint.h [iso-8859-1] Thu May 1 11:36:42 2008 @@ -140,7 +140,7 @@ /* 0x034 */ VIDEOMEMORY *pvmList; // 0x034 <-- verified to match Windows XP, pvmList /* 0x038 */ DWORD dwNumFourCC; /* 0x03C */ PDWORD pdwFourCC; -/* 0x040 */ DD_HALINFO ddHalInfo; +/* 0x040 */ DD_HALINFO ddHalInfo; // 0x040 <-- verified to match Windows XP, ddHalInfo /* 0x1E0 */ ULONG unk_1e0[46]; /* 0x298 */ DD_CALLBACKS ddCallbacks; // 0x298 <-- verified to match Windows XP, ddCallbacks /* 0x2C0 */ DD_SURFACECALLBACKS ddSurfaceCallbacks; // 0x2C4 <-- verified to match Windows XP, ddSurfaceCallbacks Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdityp.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntgdityp.h [iso-8859-1] Thu May 1 11:36:42 2008 @@ -130,28 +130,28 @@ GDIObjType_DRVOBJ_TYPE = 0x1c, GDIObjType_DCIOBJ_TYPE = 0x1d, GDIObjType_SPOOL_TYPE = 0x1e, - GDIObjType_MAX_TYPE = 0x1e, - GDIObjTypeTotal = 0x1f, + GDIObjType_MAX_TYPE = 0x1e, + GDIObjTypeTotal = 0x1f, } GDIOBJTYPE, *PGDIOBJTYPE; - -typedef enum GDILoObjType -{ - GDILoObjType_LO_BRUSH_TYPE = 0x100000, - GDILoObjType_LO_DC_TYPE = 0x10000, - GDILoObjType_LO_BITMAP_TYPE = 0x50000, - GDILoObjType_LO_PALETTE_TYPE = 0x80000, - GDILoObjType_LO_FONT_TYPE = 0xa0000, - GDILoObjType_LO_REGION_TYPE = 0x40000, - GDILoObjType_LO_ICMLCS_TYPE = 0x90000, - GDILoObjType_LO_CLIENTOBJ_TYPE = 0x60000, - GDILoObjType_LO_ALTDC_TYPE = 0x210000, - GDILoObjType_LO_PEN_TYPE = 0x300000, - GDILoObjType_LO_EXTPEN_TYPE = 0x500000, - GDILoObjType_LO_DIBSECTION_TYPE = 0x250000, - GDILoObjType_LO_METAFILE16_TYPE = 0x260000, - GDILoObjType_LO_METAFILE_TYPE = 0x460000, - GDILoObjType_LO_METADC16_TYPE = 0x660000 -} GDILOOBJTYPE, *PGDILOOBJTYPE; + +typedef enum GDILoObjType +{ + GDILoObjType_LO_BRUSH_TYPE = 0x100000, + GDILoObjType_LO_DC_TYPE = 0x10000, + GDILoObjType_LO_BITMAP_TYPE = 0x50000, + GDILoObjType_LO_PALETTE_TYPE = 0x80000, + GDILoObjType_LO_FONT_TYPE = 0xa0000, + GDILoObjType_LO_REGION_TYPE = 0x40000, + GDILoObjType_LO_ICMLCS_TYPE = 0x90000, + GDILoObjType_LO_CLIENTOBJ_TYPE = 0x60000, + GDILoObjType_LO_ALTDC_TYPE = 0x210000, + GDILoObjType_LO_PEN_TYPE = 0x300000, + GDILoObjType_LO_EXTPEN_TYPE = 0x500000, + GDILoObjType_LO_DIBSECTION_TYPE = 0x250000, + GDILoObjType_LO_METAFILE16_TYPE = 0x260000, + GDILoObjType_LO_METAFILE_TYPE = 0x460000, + GDILoObjType_LO_METADC16_TYPE = 0x660000 +} GDILOOBJTYPE, *PGDILOOBJTYPE; #define GdiWorldSpaceToPageSpace 0x203 @@ -531,102 +531,102 @@ // typedef struct _DRIVER_FUNCTIONS { - PGD_ENABLEDRIVER EnableDriver; //ReactOS Extra - PGD_ENABLEPDEV EnablePDEV; - PGD_COMPLETEPDEV CompletePDEV; - PGD_DISABLEPDEV DisablePDEV; - PGD_ENABLESURFACE EnableSurface; - PGD_DISABLESURFACE DisableSurface; - PGD_ASSERTMODE AssertMode; - PGD_OFFSET Offset; - PGD_RESETPDEV ResetPDEV; - PGD_DISABLEDRIVER DisableDriver; - PVOID Unknown0; - PGD_CREATEDEVICEBITMAP CreateDeviceBitmap; - PGD_DELETEDEVICEBITMAP DeleteDeviceBitmap; - PGD_REALIZEBRUSH RealizeBrush; - PGD_DITHERCOLOR DitherColor; - PGD_STROKEPATH StrokePath; - PGD_FILLPATH FillPath; - PGD_STROKEANDFILLPATH StrokeAndFillPath; - PGD_PAINT Paint; - PGD_BITBLT BitBlt; - PGD_COPYBITS CopyBits; - PGD_STRETCHBLT StretchBlt; - PVOID Unknown1; - PGD_SETPALETTE SetPalette; - PGD_TEXTOUT TextOut; - PGD_ESCAPE Escape; - PGD_DRAWESCAPE DrawEscape; - PGD_QUERYFONT QueryFont; - PGD_QUERYFONTTREE QueryFontTree; - PGD_QUERYFONTDATA QueryFontData; - PGD_SETPOINTERSHAPE SetPointerShape; - PGD_MOVEPOINTER MovePointer; - PGD_LINETO LineTo; - PGD_SENDPAGE SendPage; - PGD_STARTPAGE StartPage; - PGD_ENDDOC EndDoc; - PGD_STARTDOC StartDoc; - PVOID Unknown2; - PGD_GETGLYPHMODE GetGlyphMode; - PGD_SYNCHRONIZE Synchronize; - PVOID Unknown3; - PGD_SAVESCREENBITS SaveScreenBits; - PGD_GETMODES GetModes; - PGD_FREE Free; - PGD_DESTROYFONT DestroyFont; - PGD_QUERYFONTCAPS QueryFontCaps; - PGD_LOADFONTFILE LoadFontFile; - PGD_UNLOADFONTFILE UnloadFontFile; - PGD_FONTMANAGEMENT FontManagement; - PGD_QUERYTRUETYPETABLE QueryTrueTypeTable; - PGD_QUERYTRUETYPEOUTLINE QueryTrueTypeOutline; - PGD_GETTRUETYPEFILE GetTrueTypeFile; - PGD_QUERYFONTFILE QueryFontFile; - PFN_DrvMovePanning MovePanning; - PGD_QUERYADVANCEWIDTHS QueryAdvanceWidths; - PGD_SETPIXELFORMAT SetPixelFormat; - PGD_DESCRIBEPIXELFORMAT DescribePixelFormat; - PGD_SWAPBUFFERS SwapBuffers; - PGD_STARTBANDING StartBanding; - PGD_NEXTBAND NextBand; - PGD_GETDIRECTDRAWINFO GetDirectDrawInfo; - PGD_ENABLEDIRECTDRAW EnableDirectDraw; - PGD_DISABLEDIRECTDRAW DisableDirectDraw; - PGD_QUERYSPOOLTYPE QuerySpoolType; - PVOID Unknown4; - PFN_DrvIcmCreateColorTransform IcmCreateColorTransform; - PFN_DrvIcmDeleteColorTransform IcmDeleteColorTransform; - PFN_DrvIcmCheckBitmapBits IcmCheckBitmapBits; - PFN_DrvIcmSetDeviceGammaRamp IcmSetDeviceGammaRamp; - PGD_GRADIENTFILL GradientFill; - PGD_STRETCHBLTROP StretchBltROP; - PFN_DrvPlgBlt PlgBlt; - PGD_ALPHABLEND AlphaBlend; - PVOID SynthesizeFont; - PVOID Unknown5; - PVOID GetSynthesizedFontFiles; - PVOID Unknown6; - PGD_TRANSPARENTBLT TransparentBlt; - PFN_DrvQueryPerBandInfo QueryPerBandInfo; - PFN_DrvQueryDeviceSupport QueryDeviceSupport; - PVOID Reserved1; - PVOID Reserved2; - PVOID Reserved3; - PVOID Reserved4; - PVOID Reserved5; - PVOID Reserved6; - PVOID Reserved7; - PVOID Reserved8; - PFN_DrvDeriveSurface DeriveSurface; - PFN_DrvQueryGlyphAttrs QueryGlyphAttrs; - PFN_DrvNotify Notify; - PGD_SYNCHRONIZESURFACE SynchronizeSurface; - PFN_DrvResetDevice ResetDevice; - PVOID Reserved9; - PVOID Reserved10; - PVOID Reserved11; + PGD_ENABLEPDEV EnablePDEV; + PGD_COMPLETEPDEV CompletePDEV; + PGD_DISABLEPDEV DisablePDEV; + PGD_ENABLESURFACE EnableSurface; + PGD_DISABLESURFACE DisableSurface; + PGD_ASSERTMODE AssertMode; + PGD_OFFSET Offset; + PGD_RESETPDEV ResetPDEV; + PGD_DISABLEDRIVER DisableDriver; + PVOID Unknown1; + PGD_CREATEDEVICEBITMAP CreateDeviceBitmap; + PGD_DELETEDEVICEBITMAP DeleteDeviceBitmap; + PGD_REALIZEBRUSH RealizeBrush; + PGD_DITHERCOLOR DitherColor; + PGD_STROKEPATH StrokePath; + PGD_FILLPATH FillPath; + PGD_STROKEANDFILLPATH StrokeAndFillPath; + PGD_PAINT Paint; + PGD_BITBLT BitBlt; + PGD_COPYBITS CopyBits; + PGD_STRETCHBLT StretchBlt; + PVOID Unknown2; + PGD_SETPALETTE SetPalette; + PGD_TEXTOUT TextOut; + PGD_ESCAPE Escape; + PGD_DRAWESCAPE DrawEscape; + PGD_QUERYFONT QueryFont; + PGD_QUERYFONTTREE QueryFontTree; + PGD_QUERYFONTDATA QueryFontData; + PGD_SETPOINTERSHAPE SetPointerShape; + PGD_MOVEPOINTER MovePointer; + PGD_LINETO LineTo; + PGD_SENDPAGE SendPage; + PGD_STARTPAGE StartPage; + PGD_ENDDOC EndDoc; + PGD_STARTDOC StartDoc; + PVOID Unknown3; + PGD_GETGLYPHMODE GetGlyphMode; + PGD_SYNCHRONIZE Synchronize; + PVOID Unknown4; + PGD_SAVESCREENBITS SaveScreenBits; + PGD_GETMODES GetModes; + PGD_FREE Free; + PGD_DESTROYFONT DestroyFont; + PGD_QUERYFONTCAPS QueryFontCaps; + PGD_LOADFONTFILE LoadFontFile; + PGD_UNLOADFONTFILE UnloadFontFile; + PGD_FONTMANAGEMENT FontManagement; + PGD_QUERYTRUETYPETABLE QueryTrueTypeTable; + PGD_QUERYTRUETYPEOUTLINE QueryTrueTypeOutline; + PGD_GETTRUETYPEFILE GetTrueTypeFile; + PGD_QUERYFONTFILE QueryFontFile; + PFN_DrvMovePanning MovePanning; + PGD_QUERYADVANCEWIDTHS QueryAdvanceWidths; + PGD_SETPIXELFORMAT SetPixelFormat; + PGD_DESCRIBEPIXELFORMAT DescribePixelFormat; + PGD_SWAPBUFFERS SwapBuffers; + PGD_STARTBANDING StartBanding; + PGD_NEXTBAND NextBand; + PGD_GETDIRECTDRAWINFO GetDirectDrawInfo; + PGD_ENABLEDIRECTDRAW EnableDirectDraw; + PGD_DISABLEDIRECTDRAW DisableDirectDraw; + PGD_QUERYSPOOLTYPE QuerySpoolType; + PVOID Unknown5; + PFN_DrvIcmCreateColorTransform IcmCreateColorTransform; + PFN_DrvIcmDeleteColorTransform IcmDeleteColorTransform; + PFN_DrvIcmCheckBitmapBits IcmCheckBitmapBits; + PFN_DrvIcmSetDeviceGammaRamp IcmSetDeviceGammaRamp; + PGD_GRADIENTFILL GradientFill; + PGD_STRETCHBLTROP StretchBltROP; + PFN_DrvPlgBlt PlgBlt; + PGD_ALPHABLEND AlphaBlend; + PVOID SynthesizeFont; + PVOID GetSynthesizedFontFiles; + PGD_TRANSPARENTBLT TransparentBlt; + PFN_DrvQueryPerBandInfo QueryPerBandInfo; + PFN_DrvQueryDeviceSupport QueryDeviceSupport; + PVOID Reserved1; + PVOID Reserved2; + PVOID Reserved3; + PVOID Reserved4; + PVOID Reserved5; + PVOID Reserved6; + PVOID Reserved7; + PVOID Reserved8; + PFN_DrvDeriveSurface DeriveSurface; + PFN_DrvQueryGlyphAttrs QueryGlyphAttrs; + PFN_DrvNotify Notify; + PGD_SYNCHRONIZESURFACE SynchronizeSurface; + PFN_DrvResetDevice ResetDevice; + PVOID Reserved9; + PVOID Reserved10; + PVOID Reserved11; /* 92 */ + + /* ReactOS specify */ + PGD_ENABLEDRIVER EnableDriver; //ReactOS Extra } DRIVER_FUNCTIONS, *PDRIVER_FUNCTIONS; #endif Modified: trunk/reactos/subsystems/win32/win32k/misc/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/mi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/misc/driver.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/misc/driver.c [iso-8859-1] Thu May 1 11:36:42 2008 @@ -30,6 +30,7 @@ /* #define TRACE_DRV_CALLS to get a log of all calls into the display driver. */ #undef TRACE_DRV_CALLS + typedef struct _GRAPHICS_DRIVER { @@ -391,8 +392,7 @@ PDRIVER_FUNCTIONS DF) { BEGIN_FUNCTION_MAP(); - - DRIVER_FUNCTION(EnablePDEV); + DRIVER_FUNCTION(EnablePDEV); DRIVER_FUNCTION(CompletePDEV); DRIVER_FUNCTION(DisablePDEV); DRIVER_FUNCTION(EnableSurface); @@ -401,6 +401,7 @@ DRIVER_FUNCTION(Offset); DRIVER_FUNCTION(ResetPDEV); DRIVER_FUNCTION(DisableDriver); + DRIVER_FUNCTION(Unknown1); DRIVER_FUNCTION(CreateDeviceBitmap); DRIVER_FUNCTION(DeleteDeviceBitmap); DRIVER_FUNCTION(RealizeBrush); @@ -410,10 +411,9 @@ DRIVER_FUNCTION(StrokeAndFillPath); DRIVER_FUNCTION(Paint); DRIVER_FUNCTION(BitBlt); - DRIVER_FUNCTION(TransparentBlt); DRIVER_FUNCTION(CopyBits); DRIVER_FUNCTION(StretchBlt); - DRIVER_FUNCTION(StretchBltROP); + DRIVER_FUNCTION(Unknown2); DRIVER_FUNCTION(SetPalette); DRIVER_FUNCTION(TextOut); DRIVER_FUNCTION(Escape); @@ -428,8 +428,10 @@ DRIVER_FUNCTION(StartPage); DRIVER_FUNCTION(EndDoc); DRIVER_FUNCTION(StartDoc); + DRIVER_FUNCTION(Unknown3); DRIVER_FUNCTION(GetGlyphMode); DRIVER_FUNCTION(Synchronize); + DRIVER_FUNCTION(Unknown4); DRIVER_FUNCTION(SaveScreenBits); DRIVER_FUNCTION(GetModes); DRIVER_FUNCTION(Free); @@ -452,11 +454,36 @@ DRIVER_FUNCTION(EnableDirectDraw); DRIVER_FUNCTION(DisableDirectDraw); DRIVER_FUNCTION(QuerySpoolType); - DRIVER_FUNCTION(IcmSetDeviceGammaRamp); - DRIVER_FUNCTION(GradientFill); - DRIVER_FUNCTION(SynchronizeSurface); - DRIVER_FUNCTION(AlphaBlend); - + DRIVER_FUNCTION(Unknown5); + DRIVER_FUNCTION(IcmCreateColorTransform); + DRIVER_FUNCTION(IcmDeleteColorTransform); + DRIVER_FUNCTION(IcmCheckBitmapBits); + DRIVER_FUNCTION(IcmSetDeviceGammaRamp); + DRIVER_FUNCTION(GradientFill); + DRIVER_FUNCTION(StretchBltROP); + DRIVER_FUNCTION(PlgBlt); + DRIVER_FUNCTION(AlphaBlend); + DRIVER_FUNCTION(SynthesizeFont); + DRIVER_FUNCTION(GetSynthesizedFontFiles); + DRIVER_FUNCTION(TransparentBlt); + DRIVER_FUNCTION(QueryPerBandInfo); + DRIVER_FUNCTION(QueryDeviceSupport); + DRIVER_FUNCTION(Reserved1); + DRIVER_FUNCTION(Reserved2); + DRIVER_FUNCTION(Reserved3); + DRIVER_FUNCTION(Reserved4); + DRIVER_FUNCTION(Reserved5); + DRIVER_FUNCTION(Reserved6); + DRIVER_FUNCTION(Reserved7); + DRIVER_FUNCTION(Reserved8); + DRIVER_FUNCTION(DeriveSurface); + DRIVER_FUNCTION(QueryGlyphAttrs); + DRIVER_FUNCTION(Notify); + DRIVER_FUNCTION(SynchronizeSurface); + DRIVER_FUNCTION(ResetDevice); + DRIVER_FUNCTION(Reserved9); + DRIVER_FUNCTION(Reserved10); + DRIVER_FUNCTION(Reserved11); END_FUNCTION_MAP(); return TRUE; Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c [iso-8859-1] Thu May 1 11:36:42 2008 @@ -737,6 +737,8 @@ /************************************************************************/ BOOL STDCALL DxEngSetDCOwner(HGDIOBJ hObject, DWORD OwnerMask) { + DPRINT1("ReactX Calling : DxEngSetDCOwner \n"); + return IntGdiSetDCOwnerEx( hObject, OwnerMask, FALSE); }

1 0

[dchapyshev] 33216: - Implement layouts indicator
by dchapyshev＠svn.reactos.org 01 May '08

01 May '08

Author: dchapyshev Date: Thu May 1 11:00:51 2008 New Revision: 33216 URL: http://svn.reactos.org/svn/reactos?rev=33216&view=rev Log: - Implement layouts indicator Modified: trunk/reactos/dll/cpl/input/input.rbuild trunk/reactos/dll/cpl/input/settings.c Modified: trunk/reactos/dll/cpl/input/input.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/input.rbuild… ============================================================================== --- trunk/reactos/dll/cpl/input/input.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/input.rbuild [iso-8859-1] Thu May 1 11:00:51 2008 @@ -10,6 +10,7 @@ <library>user32</library> <library>comctl32</library> <library>msvcrt</library> + <library>gdi32</library> <file>input.c</file> <file>settings.c</file> <file>keysettings.c</file> Modified: trunk/reactos/dll/cpl/input/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/settings.c?r… ============================================================================== --- trunk/reactos/dll/cpl/input/settings.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/settings.c [iso-8859-1] Thu May 1 11:00:51 2008 @@ -13,6 +13,7 @@ #include "input.h" static HWND MainDlgWnd; +static HIMAGELIST hImgList; typedef struct { @@ -23,6 +24,67 @@ TCHAR IndName[MAX_PATH]; } LAYOUT_ITEM, *LPLAYOUT_ITEM; + +static HICON +CreateLayoutIcon(LPTSTR szInd) +{ + HDC hdc, hdcsrc; + HBITMAP hBitmap, hBmpNew, hBmpOld; + RECT rect; + DWORD bkColor, bkText; + HFONT hFont = NULL; + ICONINFO IconInfo; + HICON hIcon = NULL; + + hdcsrc = GetDC(NULL); + hdc = CreateCompatibleDC(hdcsrc); + hBitmap = CreateCompatibleBitmap(hdcsrc, 16, 16); + ReleaseDC(NULL, hdcsrc); + + if (hdc && hBitmap) + { + hBmpNew = CreateBitmap(16, 16, 1, 1, NULL); + if (hBmpNew) + { + hBmpOld = SelectObject(hdc, hBitmap); + rect.right = 16; + rect.left = 0; + rect.bottom = 16; + rect.top = 0; + + bkColor = SetBkColor(hdc, GetSysColor(COLOR_HIGHLIGHT)); + bkText = SetTextColor(hdc, GetSysColor(COLOR_HIGHLIGHTTEXT)); + + ExtTextOut(hdc, rect.left, rect.top, ETO_OPAQUE, &rect, _T(""), 0, NULL); + + hFont = CreateFont(-11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, + OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, + DEFAULT_QUALITY, FF_DONTCARE, _T("Tahoma")); + + SelectObject(hdc, hFont); + DrawText(hdc, _tcsupr(szInd), 2, &rect, DT_SINGLELINE|DT_CENTER|DT_VCENTER); + SelectObject(hdc, hBmpNew); + PatBlt(hdc, 0, 0, 16, 16, BLACKNESS); + SelectObject(hdc, hBmpOld); + + IconInfo.hbmColor = hBitmap; + IconInfo.hbmMask = hBmpNew; + IconInfo.fIcon = TRUE; + + hIcon = CreateIconIndirect(&IconInfo); + + DeleteObject(hBmpNew); + DeleteObject(hBmpOld); + DeleteObject(hFont); + } + } + + DeleteDC(hdc); + DeleteObject(hBitmap); + + return hIcon; +} + BOOL GetLayoutName(LPCTSTR lcid, LPTSTR name) { @@ -55,25 +117,20 @@ ZeroMemory(&column, sizeof(LV_COLUMN)); column.mask = LVCF_FMT | LVCF_TEXT | LVCF_WIDTH | LVCF_SUBITEM; + column.fmt = LVCFMT_LEFT; column.iSubItem = 0; - column.pszText = NULL; - column.cx = 25; - (VOID) ListView_InsertColumn(hList, 0, &column); - - column.fmt = LVCFMT_LEFT; - column.iSubItem = 1; LoadString(hApplet, IDS_LANGUAGE, szBuf, sizeof(szBuf) / sizeof(TCHAR)); column.pszText = szBuf; - column.cx = 160; - (VOID) ListView_InsertColumn(hList, 1, &column); + column.cx = 175; + (VOID) ListView_InsertColumn(hList, 0, &column); column.fmt = LVCFMT_RIGHT; - column.cx = 145; - column.iSubItem = 2; + column.cx = 155; + column.iSubItem = 1; LoadString(hApplet, IDS_LAYOUT, szBuf, sizeof(szBuf) / sizeof(TCHAR)); column.pszText = szBuf; - (VOID) ListView_InsertColumn(hList, 2, &column); + (VOID) ListView_InsertColumn(hList, 1, &column); } static VOID @@ -85,9 +142,9 @@ DWORD dwIndex = 0, dwType, dwSize; LV_ITEM item = {0}; HWND hList = GetDlgItem(hWnd, IDC_KEYLAYOUT_LIST); - INT i; - - item.mask = LVIF_TEXT | LVIF_PARAM | LVIF_STATE; + INT i, imgIndex; + + item.mask = LVIF_TEXT | LVIF_PARAM | LVIF_STATE | LVIF_IMAGE; if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Keyboard Layout\\Preload"), 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) @@ -103,6 +160,7 @@ GetLocaleInfo(lItem.LangId, LOCALE_SISO639LANGNAME, (LPTSTR)szBuf, sizeof(szBuf) / sizeof(TCHAR)); lstrcpy(lItem.IndName, _tcsupr(szBuf)); + imgIndex = ImageList_AddIcon(hImgList, CreateLayoutIcon(lItem.IndName)); GetLocaleInfo(lItem.LangId, LOCALE_SLANGUAGE, (LPTSTR)szBuf, sizeof(szBuf) / sizeof(TCHAR)); lstrcpy(lItem.LangName, szBuf); @@ -124,13 +182,13 @@ GetLayoutName(szPreload, lItem.LayoutName); - item.pszText = lItem.IndName; + item.pszText = lItem.LangName; item.iItem = (INT) dwIndex; item.lParam = (LPARAM)_ttoi(lItem.ValName); + item.iImage = imgIndex; i = ListView_InsertItem(hList, &item); - ListView_SetItemText(hList, i, 1, lItem.LangName); - ListView_SetItemText(hList, i, 2, lItem.LayoutName); + ListView_SetItemText(hList, i, 1, lItem.LayoutName); dwIndex++; @@ -147,8 +205,11 @@ VOID UpdateLayoutsList(VOID) { + (VOID) ImageList_Destroy(hImgList); (VOID) ListView_DeleteAllItems(GetDlgItem(MainDlgWnd, IDC_KEYLAYOUT_LIST)); + hImgList = ImageList_Create(16, 16, ILC_COLOR8 | ILC_MASK, 0, 1); InitLangList(MainDlgWnd); + (VOID) ListView_SetImageList(GetDlgItem(MainDlgWnd, IDC_KEYLAYOUT_LIST), hImgList, LVSIL_SMALL); } static VOID @@ -204,7 +265,9 @@ AddListColumn(hwndDlg); (VOID) ListView_SetExtendedListViewStyle(GetDlgItem(MainDlgWnd, IDC_KEYLAYOUT_LIST), LVS_EX_FULLROWSELECT); + hImgList = ImageList_Create(16, 16, ILC_COLOR8 | ILC_MASK, 0, 1); InitLangList(hwndDlg); + (VOID) ListView_SetImageList(GetDlgItem(MainDlgWnd, IDC_KEYLAYOUT_LIST), hImgList, LVSIL_SMALL); EnableWindow(GetDlgItem(hwndDlg, IDC_PROP_BUTTON),FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_SET_DEFAULT),FALSE); } @@ -246,6 +309,9 @@ break; } break; + case WM_DESTROY: + (VOID) ImageList_Destroy(hImgList); + break; } return FALSE;

1 0

[dchapyshev] 33215: - Implement deleting layouts
by dchapyshev＠svn.reactos.org 01 May '08

01 May '08

Author: dchapyshev Date: Thu May 1 10:25:12 2008 New Revision: 33215 URL: http://svn.reactos.org/svn/reactos?rev=33215&view=rev Log: - Implement deleting layouts Modified: trunk/reactos/dll/cpl/input/lang/bg-BG.rc trunk/reactos/dll/cpl/input/lang/de-DE.rc trunk/reactos/dll/cpl/input/lang/el-GR.rc trunk/reactos/dll/cpl/input/lang/en-US.rc trunk/reactos/dll/cpl/input/lang/es-ES.rc trunk/reactos/dll/cpl/input/lang/fr-FR.rc trunk/reactos/dll/cpl/input/lang/it-IT.rc trunk/reactos/dll/cpl/input/lang/pl-PL.rc trunk/reactos/dll/cpl/input/lang/ru-RU.rc trunk/reactos/dll/cpl/input/lang/sk-SK.rc trunk/reactos/dll/cpl/input/lang/uk-UA.rc trunk/reactos/dll/cpl/input/resource.h trunk/reactos/dll/cpl/input/settings.c Modified: trunk/reactos/dll/cpl/input/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/bg-BG.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/bg-BG.rc [iso-8859-1] Thu May 1 10:25:12 2008 @@ -85,6 +85,8 @@ IDS_WHATS_THIS "Êàêâî å òîâà?" IDS_LANGUAGE "Åçèê" IDS_LAYOUT "Êëàâèàòóðíà ïîäðåäáà" + IDS_REM_QUESTION "Do you want to remove selected keyboard layout?" + IDS_CONFIRMATION "Confirmation" END STRINGTABLE 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… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/de-DE.rc [iso-8859-1] Thu May 1 10:25:12 2008 @@ -86,6 +86,8 @@ IDS_WHATS_THIS "Was ist das?" IDS_LANGUAGE "Sprache" IDS_LAYOUT "Tastaturlayout" + IDS_REM_QUESTION "Do you want to remove selected keyboard layout?" + IDS_CONFIRMATION "Confirmation" END STRINGTABLE Modified: trunk/reactos/dll/cpl/input/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/el-GR.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/el-GR.rc [iso-8859-1] Thu May 1 10:25:12 2008 @@ -85,6 +85,8 @@ IDS_WHATS_THIS "Ôé åßíáé áõôü;" IDS_LANGUAGE "Ãëþóóá" IDS_LAYOUT "ÄéÜôáîç ðëçêôñïëïãßïõ" + IDS_REM_QUESTION "Do you want to remove selected keyboard layout?" + IDS_CONFIRMATION "Confirmation" END STRINGTABLE Modified: trunk/reactos/dll/cpl/input/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/en-US.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/en-US.rc [iso-8859-1] Thu May 1 10:25:12 2008 @@ -85,6 +85,8 @@ IDS_WHATS_THIS "What's This?" IDS_LANGUAGE "Language" IDS_LAYOUT "Keyboard Layout" + IDS_REM_QUESTION "Do you want to remove selected keyboard layout?" + IDS_CONFIRMATION "Confirmation" END STRINGTABLE Modified: trunk/reactos/dll/cpl/input/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/es-ES.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/es-ES.rc [iso-8859-1] Thu May 1 10:25:12 2008 @@ -90,6 +90,8 @@ IDS_WHATS_THIS "¿Qué es esto?" IDS_LANGUAGE "Idioma" IDS_LAYOUT "Distribución del teclado" + IDS_REM_QUESTION "Do you want to remove selected keyboard layout?" + IDS_CONFIRMATION "Confirmation" END STRINGTABLE Modified: trunk/reactos/dll/cpl/input/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/fr-FR.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/fr-FR.rc [iso-8859-1] Thu May 1 10:25:12 2008 @@ -85,6 +85,8 @@ IDS_WHATS_THIS "Qu'est-ce que c'est ?" IDS_LANGUAGE "Language" IDS_LAYOUT "Keyboard Layout" + IDS_REM_QUESTION "Do you want to remove selected keyboard layout?" + IDS_CONFIRMATION "Confirmation" END /* FIXME : To improve/complete */ Modified: trunk/reactos/dll/cpl/input/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/it-IT.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/it-IT.rc [iso-8859-1] Thu May 1 10:25:12 2008 @@ -85,6 +85,8 @@ IDS_WHATS_THIS "Cosa è questo?" IDS_LANGUAGE "Lingua" IDS_LAYOUT "Disposizione tastiera" + IDS_REM_QUESTION "Do you want to remove selected keyboard layout?" + IDS_CONFIRMATION "Confirmation" END STRINGTABLE Modified: trunk/reactos/dll/cpl/input/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/pl-PL.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/pl-PL.rc [iso-8859-1] Thu May 1 10:25:12 2008 @@ -92,6 +92,8 @@ IDS_WHATS_THIS "Co to jest?" IDS_LANGUAGE "Jêzyk" IDS_LAYOUT "Uk³ad klawiatury" + IDS_REM_QUESTION "Do you want to remove selected keyboard layout?" + IDS_CONFIRMATION "Confirmation" END STRINGTABLE Modified: trunk/reactos/dll/cpl/input/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/ru-RU.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/ru-RU.rc [iso-8859-1] Thu May 1 10:25:12 2008 @@ -85,6 +85,8 @@ IDS_WHATS_THIS "×òî ýòî?" IDS_LANGUAGE "ßçûê ââîäà" IDS_LAYOUT "Ðàñêëàäêà" + IDS_REM_QUESTION "Âû äåéñòâèòåëüíî õîòèòå óäàëèòü âûáðàííóþ ðàñêëàäêó êëàâèàòóðû?" + IDS_CONFIRMATION "Ïîäòâåðæäåíèå" END STRINGTABLE Modified: trunk/reactos/dll/cpl/input/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/sk-SK.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/sk-SK.rc [iso-8859-1] Thu May 1 10:25:12 2008 @@ -89,6 +89,8 @@ IDS_WHATS_THIS "Èo je toto?" IDS_LANGUAGE "Language" IDS_LAYOUT "Keyboard Layout" + IDS_REM_QUESTION "Do you want to remove selected keyboard layout?" + IDS_CONFIRMATION "Confirmation" END STRINGTABLE Modified: trunk/reactos/dll/cpl/input/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/uk-UA.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/uk-UA.rc [iso-8859-1] Thu May 1 10:25:12 2008 @@ -94,6 +94,8 @@ IDS_WHATS_THIS "Ùî öå?" IDS_LANGUAGE "Language" IDS_LAYOUT "Keyboard Layout" + IDS_REM_QUESTION "Do you want to remove selected keyboard layout?" + IDS_CONFIRMATION "Confirmation" END STRINGTABLE Modified: trunk/reactos/dll/cpl/input/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/resource.h?r… ============================================================================== --- trunk/reactos/dll/cpl/input/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/resource.h [iso-8859-1] Thu May 1 10:25:12 2008 @@ -49,6 +49,8 @@ #define IDS_WHATS_THIS 7 #define IDS_LANGUAGE 8 #define IDS_LAYOUT 9 +#define IDS_REM_QUESTION 10 +#define IDS_CONFIRMATION 11 /* Layouts */ #define IDS_US_LAYOUT 5000 Modified: trunk/reactos/dll/cpl/input/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/settings.c?r… ============================================================================== --- trunk/reactos/dll/cpl/input/settings.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/settings.c [iso-8859-1] Thu May 1 10:25:12 2008 @@ -126,6 +126,7 @@ item.pszText = lItem.IndName; item.iItem = (INT) dwIndex; + item.lParam = (LPARAM)_ttoi(lItem.ValName); i = ListView_InsertItem(hList, &item); ListView_SetItemText(hList, i, 1, lItem.LangName); @@ -153,12 +154,39 @@ static VOID DeleteLayout(VOID) { - INT iIndex; - - iIndex = (INT) SendMessage(GetDlgItem(MainDlgWnd, IDC_KEYLAYOUT_LIST), LVM_GETNEXTITEM, -1, LVNI_FOCUSED); + INT iIndex, LayoutNum; + LVITEM item; + HKEY hKey; + HWND hLayoutList = GetDlgItem(MainDlgWnd, IDC_KEYLAYOUT_LIST); + TCHAR szLayoutNum[10 + 1], szTitle[MAX_PATH], szConf[MAX_PATH]; + + iIndex = (INT) SendMessage(hLayoutList, LVM_GETNEXTITEM, -1, LVNI_FOCUSED); + if (iIndex != -1) { - MessageBox(0, _T("Not implemented!"), NULL, MB_OK); + LoadString(hApplet, IDS_REM_QUESTION, szConf, sizeof(szConf) / sizeof(TCHAR)); + LoadString(hApplet, IDS_CONFIRMATION, szTitle, sizeof(szTitle) / sizeof(TCHAR)); + + if (MessageBox(MainDlgWnd, szConf, szTitle, MB_YESNO | MB_ICONQUESTION) == IDYES) + { + ZeroMemory(&item, sizeof(LVITEM)); + + item.mask = LVIF_PARAM; + item.iItem = iIndex; + + (VOID) ListView_GetItem(hLayoutList, &item); + LayoutNum = (INT) item.lParam; + + if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Keyboard Layout\\Preload"), 0, KEY_ALL_ACCESS, &hKey) == ERROR_SUCCESS) + { + _ultot(LayoutNum, szLayoutNum, 10); + if (RegDeleteValue(hKey, szLayoutNum) == ERROR_SUCCESS) + { + UpdateLayoutsList(); + } + } + RegCloseKey(hKey); + } } }

1 0

[gedmurphy] 33214: DECLSPEC_NOVTABLE isn't supported by gcc
by gedmurphy＠svn.reactos.org 01 May '08

01 May '08

Author: gedmurphy Date: Thu May 1 09:56:54 2008 New Revision: 33214 URL: http://svn.reactos.org/svn/reactos?rev=33214&view=rev Log: DECLSPEC_NOVTABLE isn't supported by gcc Modified: trunk/reactos/include/psdk/objbase.h Modified: trunk/reactos/include/psdk/objbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/objbase.h?rev… ============================================================================== --- trunk/reactos/include/psdk/objbase.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/objbase.h [iso-8859-1] Thu May 1 09:56:54 2008 @@ -227,8 +227,8 @@ #define interface struct #define DECLARE_INTERFACE(iface) interface iface #define DECLARE_INTERFACE_(iface,ibase) interface iface : public ibase -#define DECLARE_INTERFACE_IID(iface, iid) interface DECLSPEC_UUID(iid) DECLSPEC_NOVTABLE iface -#define DECLARE_INTERFACE_IID_(iface, baseiface, iid) interface DECLSPEC_UUID(iid) DECLSPEC_NOVTABLE iface : public baseiface +#define DECLARE_INTERFACE_IID(iface, iid) interface DECLSPEC_UUID(iid) iface +#define DECLARE_INTERFACE_IID_(iface, baseiface, iid) interface DECLSPEC_UUID(iid) iface : public baseiface #define BEGIN_INTERFACE #define END_INTERFACE

1 0

[gedmurphy] 33213: - Change the ... gcc specific statement - Seperators with MENUEX now need the full definition (although the docs don't say this yet) - explorer_new now builds with msvc9. Doesn't link yet though...
by gedmurphy＠svn.reactos.org 01 May '08

01 May '08

Author: gedmurphy Date: Thu May 1 09:52:11 2008 New Revision: 33213 URL: http://svn.reactos.org/svn/reactos?rev=33213&view=rev Log: - Change the ... gcc specific statement - Seperators with MENUEX now need the full definition (although the docs don't say this yet) - explorer_new now builds with msvc9. Doesn't link yet though... Modified: trunk/reactos/base/shell/explorer-new/lang/bg-BG.rc trunk/reactos/base/shell/explorer-new/lang/de-DE.rc trunk/reactos/base/shell/explorer-new/lang/en-US.rc trunk/reactos/base/shell/explorer-new/lang/es-ES.rc trunk/reactos/base/shell/explorer-new/lang/fr-FR.rc trunk/reactos/base/shell/explorer-new/lang/it-IT.rc trunk/reactos/base/shell/explorer-new/lang/pl-PL.rc trunk/reactos/base/shell/explorer-new/lang/ru-RU.rc trunk/reactos/base/shell/explorer-new/lang/sk-SK.rc trunk/reactos/base/shell/explorer-new/lang/uk-UA.rc trunk/reactos/base/shell/explorer-new/startmnu.c Modified: trunk/reactos/base/shell/explorer-new/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/bg-BG.rc [iso-8859-1] Thu May 1 09:52:11 2008 @@ -29,7 +29,7 @@ POPUP "Íà&ñòðîéêè", IDM_SETTINGS BEGIN MENUITEM "&Êðèëî çà óïðàâëåíèå", IDM_CONTROLPANEL, MFT_STRING, MFS_GRAYED - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&Ñèãóðíîñò...", IDM_SECURITY, MFT_STRING, MFS_ENABLED MENUITEM "&Ìðåæîâè âðúçêè", IDM_NETWORKCONNECTIONS, MFT_STRING, MFS_ENABLED MENUITEM "&Ïå÷àòà÷è è ôàêñîâå", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED @@ -37,7 +37,7 @@ END POPUP "&Òúðñåíå", IDM_SEARCH BEGIN - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR END MENUITEM "&Ïîìîù è ïîääðúæêà", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED MENUITEM "&Èçïúëíåíèå...", IDM_RUN, MFT_STRING, MFS_ENABLED 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… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/de-DE.rc [iso-8859-1] Thu May 1 09:52:11 2008 @@ -29,7 +29,7 @@ POPUP "&Einstellungen", IDM_SETTINGS BEGIN MENUITEM "S&ystemsteuerung", IDM_CONTROLPANEL, MFT_STRING, MFS_GRAYED - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&Sicherheit...", IDM_SECURITY, MFT_STRING, MFS_ENABLED MENUITEM "&Netzwerkverbindungen", IDM_NETWORKCONNECTIONS, MFT_STRING, MFS_ENABLED MENUITEM "&Drucker und Faxgeräte", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED @@ -37,7 +37,7 @@ END POPUP "&Suche", IDM_SEARCH BEGIN - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR END MENUITEM "&Hilfe und Support", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED MENUITEM "A&usführen...", IDM_RUN, MFT_STRING, MFS_ENABLED Modified: trunk/reactos/base/shell/explorer-new/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/en-US.rc [iso-8859-1] Thu May 1 09:52:11 2008 @@ -29,7 +29,7 @@ POPUP "&Settings", IDM_SETTINGS BEGIN MENUITEM "&Control Panel", IDM_CONTROLPANEL, MFT_STRING, MFS_GRAYED - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&Security...", IDM_SECURITY, MFT_STRING, MFS_ENABLED MENUITEM "&Network Connections", IDM_NETWORKCONNECTIONS, MFT_STRING, MFS_ENABLED MENUITEM "&Printers and Faxes", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED @@ -37,7 +37,7 @@ END POPUP "Sear&ch", IDM_SEARCH BEGIN - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR END MENUITEM "&Help and Support", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED MENUITEM "&Run...", IDM_RUN, MFT_STRING, MFS_ENABLED Modified: trunk/reactos/base/shell/explorer-new/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/es-ES.rc [iso-8859-1] Thu May 1 09:52:11 2008 @@ -37,7 +37,7 @@ POPUP "&Configuración", IDM_SETTINGS BEGIN MENUITEM "&Panel de Control", IDM_CONTROLPANEL, MFT_STRING, MFS_GRAYED - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&Seguridad...", IDM_SECURITY, MFT_STRING, MFS_ENABLED MENUITEM "&Conexiones de red", IDM_NETWORKCONNECTIONS, MFT_STRING, MFS_ENABLED MENUITEM "&Impresoras y faxes", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED @@ -45,7 +45,7 @@ END POPUP "Sear&ch", IDM_SEARCH BEGIN - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR END MENUITEM "&Ayuda y soporte técnico", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED MENUITEM "&Ejecutar...", IDM_RUN, MFT_STRING, MFS_ENABLED Modified: trunk/reactos/base/shell/explorer-new/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/fr-FR.rc [iso-8859-1] Thu May 1 09:52:11 2008 @@ -29,7 +29,7 @@ POPUP "Paramètre&s", IDM_SETTINGS BEGIN MENUITEM "Panneau de &contrôle", IDM_CONTROLPANEL, MFT_STRING, MFS_GRAYED - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&Sécurité...", IDM_SECURITY, MFT_STRING, MFS_ENABLED MENUITEM "Co&nnexions au réseau", IDM_NETWORKCONNECTIONS, MFT_STRING, MFS_ENABLED MENUITEM "Im&primantes et fax", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED @@ -37,7 +37,7 @@ END POPUP "&Chercher", IDM_SEARCH BEGIN - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR END MENUITEM "Aide et support", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED MENUITEM "Exécuter...", IDM_RUN, MFT_STRING, MFS_ENABLED Modified: trunk/reactos/base/shell/explorer-new/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/it-IT.rc [iso-8859-1] Thu May 1 09:52:11 2008 @@ -29,7 +29,7 @@ POPUP "&Impostazioni", IDM_SETTINGS BEGIN MENUITEM "&Pannello di controllo", IDM_CONTROLPANEL, MFT_STRING, MFS_GRAYED - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&Sicurezza...", IDM_SECURITY, MFT_STRING, MFS_ENABLED MENUITEM "&Connessioni di rete", IDM_NETWORKCONNECTIONS, MFT_STRING, MFS_ENABLED MENUITEM "&Fax e stampanti", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED @@ -37,7 +37,7 @@ END POPUP "Cerca", IDM_SEARCH BEGIN - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR END MENUITEM "&Aiuto e supporto", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED MENUITEM "&Esegui...", IDM_RUN, MFT_STRING, MFS_ENABLED Modified: trunk/reactos/base/shell/explorer-new/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/pl-PL.rc [iso-8859-1] Thu May 1 09:52:11 2008 @@ -31,7 +31,7 @@ POPUP "Us&tawienia", IDM_SETTINGS BEGIN MENUITEM "P&anel sterowania", IDM_CONTROLPANEL, MFT_STRING, MFS_GRAYED - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Za&bezpieczenia...", IDM_SECURITY, MFT_STRING, MFS_ENABLED MENUITEM "P&o³¹czenia sieciowe", IDM_NETWORKCONNECTIONS, MFT_STRING, MFS_ENABLED MENUITEM "&Drukarki i faksy", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED @@ -39,7 +39,7 @@ END POPUP "&Szukaj", IDM_SEARCH BEGIN - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR END MENUITEM "Po&moc", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED MENUITEM "&Uruchom...", IDM_RUN, MFT_STRING, MFS_ENABLED Modified: trunk/reactos/base/shell/explorer-new/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/ru-RU.rc [iso-8859-1] Thu May 1 09:52:11 2008 @@ -31,7 +31,7 @@ POPUP "&Íàñòðîéêè", IDM_SETTINGS BEGIN MENUITEM "&Ïàíåëü óïðàâëåíèÿ", IDM_CONTROLPANEL, MFT_STRING, MFS_GRAYED - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&Áåçîïàñíîñòü...", IDM_SECURITY, MFT_STRING, MFS_ENABLED MENUITEM "&Ñåòåâûå ïîäêëþ÷åíèÿ", IDM_NETWORKCONNECTIONS, MFT_STRING, MFS_ENABLED MENUITEM "&Ïðèíòåðû è ôàêñû", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED @@ -39,7 +39,7 @@ END POPUP "Ï&îèñê", IDM_SEARCH BEGIN - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR END MENUITEM "Ñï&ðàâêà è ïîääåðæêà", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED MENUITEM "Çàïóñ&ê...", IDM_RUN, MFT_STRING, MFS_ENABLED Modified: trunk/reactos/base/shell/explorer-new/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/sk-SK.rc [iso-8859-1] Thu May 1 09:52:11 2008 @@ -29,7 +29,7 @@ POPUP "Nastav&enia", IDM_SETTINGS BEGIN MENUITEM "&Ovládaci panel", IDM_CONTROLPANEL, MFT_STRING, MFS_GRAYED - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&Zabezpeèenie systému ReactOS...", IDM_SECURITY, MFT_STRING, MFS_ENABLED MENUITEM "Sieové pripoje&nia", IDM_NETWORKCONNECTIONS, MFT_STRING, MFS_ENABLED MENUITEM "&Tlaèiarne a faxy", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED @@ -37,7 +37,7 @@ END POPUP "&H¾ada", IDM_SEARCH BEGIN - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR END MENUITEM "&Pomoc a technická podpora", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED MENUITEM "Sp&usti...", IDM_RUN, MFT_STRING, MFS_ENABLED Modified: trunk/reactos/base/shell/explorer-new/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/uk-UA.rc [iso-8859-1] Thu May 1 09:52:11 2008 @@ -37,7 +37,7 @@ POPUP "Í&àñòðîéêà", IDM_SETTINGS BEGIN MENUITEM "Ï&àíåëü êåðóâàííÿ", IDM_CONTROLPANEL, MFT_STRING, MFS_GRAYED - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&Áåçïåêà...", IDM_SECURITY, MFT_STRING, MFS_ENABLED MENUITEM "&Ìåðåæí³ ï³äêëþ÷åííÿ", IDM_NETWORKCONNECTIONS, MFT_STRING, MFS_ENABLED MENUITEM "Ïð&èíòåðè é ôàêñè", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED @@ -45,7 +45,7 @@ END POPUP "Ç&íàéòè", IDM_SEARCH BEGIN - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR END MENUITEM "&Äîâ³äêà òà ï³äòðèìêà", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED MENUITEM "Çàïóñê ïðî&ãðàìè...", IDM_RUN, MFT_STRING, MFS_ENABLED Modified: trunk/reactos/base/shell/explorer-new/startmnu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/st… ============================================================================== --- trunk/reactos/base/shell/explorer-new/startmnu.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/startmnu.c [iso-8859-1] Thu May 1 09:52:11 2008 @@ -100,35 +100,31 @@ if (uiCmdId != 0) { - switch (uiCmdId) - { - case ID_SHELL_CMD_FIRST ... ID_SHELL_CMD_LAST: + if ((uiCmdId >= ID_SHELL_CMD_FIRST) && (uiCmdId <= ID_SHELL_CMD_LAST)) + { + CMINVOKECOMMANDINFO cmici = {0}; + CHAR szDir[MAX_PATH]; + + /* Setup and invoke the shell command */ + cmici.cbSize = sizeof(cmici); + cmici.hwnd = hWndOwner; + cmici.lpVerb = (LPCSTR)MAKEINTRESOURCE(uiCmdId - ID_SHELL_CMD_FIRST); + cmici.nShow = SW_NORMAL; + + /* FIXME: Support Unicode!!! */ + if (SHGetPathFromIDListA(psmcmc->pidl, + szDir)) { - CMINVOKECOMMANDINFO cmici = {0}; - CHAR szDir[MAX_PATH]; - - /* Setup and invoke the shell command */ - cmici.cbSize = sizeof(cmici); - cmici.hwnd = hWndOwner; - cmici.lpVerb = (LPCSTR)MAKEINTRESOURCE(uiCmdId - ID_SHELL_CMD_FIRST); - cmici.nShow = SW_NORMAL; - - /* FIXME: Support Unicode!!! */ - if (SHGetPathFromIDListA(psmcmc->pidl, - szDir)) - { - cmici.lpDirectory = szDir; - } - - IContextMenu_InvokeCommand(psmcmc->pcm, - &cmici); - break; + cmici.lpDirectory = szDir; } - default: - ITrayWindow_ExecContextMenuCmd((ITrayWindow *)Context, - uiCmdId); - break; + IContextMenu_InvokeCommand(psmcmc->pcm, + &cmici); + } + else + { + ITrayWindow_ExecContextMenuCmd((ITrayWindow *)Context, + uiCmdId); } } @@ -804,15 +800,20 @@ (PVOID)&pbb); if (SUCCEEDED(hRet)) { - hRet = IBanneredBar_SetBitmap(pbb, + // hRet = IBanneredBar_SetBitmap(pbb, + // hbmBanner); + hRet = pbb->lpVtbl->SetBitmap(pbb, hbmBanner); /* Update the icon size */ - hRet = IBanneredBar_SetIconSize(pbb, + //hRet = IBanneredBar_SetIconSize(pbb, + // bSmallIcons ? BMICON_SMALL : BMICON_LARGE); + hRet = pbb->lpVtbl->SetIconSize(pbb, bSmallIcons ? BMICON_SMALL : BMICON_LARGE); - IBanneredBar_Release(pbb); + //IBanneredBar_Release(pbb); + pbb->lpVtbl->Release(pbb); } return hRet; @@ -861,9 +862,11 @@ (PVOID*)&pIo); if (SUCCEEDED(hRet)) { - hRet = IInitializeObject_Initialize(pIo); - - IInitializeObject_Release(pIo); + //hRet = IInitializeObject_Initialize(pIo); + hRet = pIo->lpVtbl->Initialize(pIo); + + //IInitializeObject_Release(pIo); + pIo->lpVtbl->Release(pIo); } else hRet = S_OK;

1 0

[dreimer] 33212: build.ps1 works now. makex not, because I did not find a way to get the number of cores yet.
by dreimer＠svn.reactos.org 01 May '08

01 May '08

Author: dreimer Date: Thu May 1 09:24:40 2008 New Revision: 33212 URL: http://svn.reactos.org/svn/reactos?rev=33212&view=rev Log: build.ps1 works now. makex not, because I did not find a way to get the number of cores yet. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 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] Thu May 1 09:24:40 2008 @@ -73,8 +73,8 @@ # # Get the current date and time for use in in our build log's file name. # -$DATENAME = get-date -f d -$TIMENAME = get-date -f t +$DATENAME = get-date -f dyMMyyyy +$TIMENAME = get-date -f HHmm # @@ -82,23 +82,25 @@ # exists, if it doesn't, create it. # if ($_ROSBE_WRITELOG -eq 1) { - if (Test-Path "$_ROSBE_LOGDIR\.") { - mkdir "$_ROSBE_LOGDIR" 1> NUL 2> NUL + if (!(Test-Path "$_ROSBE_LOGDIR")) { + New-Item -path "$_ROSBE_ROSSOURCEDIR" -name "RosBE-Logs" -type directory } } function BUILD { if ($_ROSBE_SHOWTIME -eq 1) { if ($_ROSBE_WRITELOG -eq 1) { - """$_ROSBE_BASEDIR\Tools\buildtime.exe"" ""$_ROSBE_MINGWMAKE"" $args[0..5] 2>&1 | ""$_ROSBE_BASEDIR\Tools\tee.exe"" ""$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt""" + New-Item -path "$_ROSBE_LOGDIR" -name "BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" -type file + & "$_ROSBE_BASEDIR\Tools\buildtime.exe" "$_ROSBE_MINGWMAKE" $($args) 2>&1 | tee-object -filepath "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" } else { - """$_ROSBE_BASEDIR\Tools\buildtime.exe"" ""$_ROSBE_MINGWMAKE"" $args[0..5]" + & "$_ROSBE_BASEDIR\Tools\buildtime.exe" "$_ROSBE_MINGWMAKE" $($args) } } else { if ($_ROSBE_WRITELOG -eq 1) { - """$_ROSBE_MINGWMAKE"" $args[0..5] 2>&1 | ""$_ROSBE_BASEDIR\Tools\tee.exe"" ""$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt""" + New-Item -path "$_ROSBE_LOGDIR" -name "BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" -type file + & "$_ROSBE_MINGWMAKE" $($args) 2>&1 | tee-object -filepath "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" } else { - """$_ROSBE_MINGWMAKE"" $args[0..5]" + & "$_ROSBE_MINGWMAKE" $($args) } } } @@ -116,15 +118,17 @@ if ($_ROSBE_SHOWTIME -eq 1) { if ($_ROSBE_WRITELOG -eq 1) { -# "$_ROSBE_BASEDIR\Tools\buildtime.exe" "$_ROSBE_MINGWMAKE" -j $CPUCOUNT %2 %3 %4 %5 %6 %7 %8 %9 2>&1 | "$_ROSBE_BASEDIR\Tools\tee.exe" "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" +# New-Item -path "$_ROSBE_LOGDIR" -name "BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" -type file +# & "$_ROSBE_BASEDIR\Tools\buildtime.exe" "$_ROSBE_MINGWMAKE" -j $CPUCOUNT $($args) 2>&1 | tee-object -filepath "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" } else { -# "$_ROSBE_BASEDIR\Tools\buildtime.exe" "$_ROSBE_MINGWMAKE" -j $CPUCOUNT %2 %3 %4 %5 %6 %7 %8 %9 +# & "$_ROSBE_BASEDIR\Tools\buildtime.exe" "$_ROSBE_MINGWMAKE" -j $CPUCOUNT $($args) } } else { if ($_ROSBE_WRITELOG -eq 1) { -# "$_ROSBE_MINGWMAKE" -j $CPUCOUNT %2 %3 %4 %5 %6 %7 %8 %9 2>&1 | "$_ROSBE_BASEDIR\Tools\tee.exe" "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" +# New-Item -path "$_ROSBE_LOGDIR" -name "BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" -type file +# & "$_ROSBE_MINGWMAKE" -j $CPUCOUNT $($args) 2>&1 | tee-object -filepath "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" } else { -# "$_ROSBE_MINGWMAKE" -j $CPUCOUNT %2 %3 %4 %5 %6 %7 %8 %9 +# & "$_ROSBE_MINGWMAKE" -j $CPUCOUNT $($args) } } }

1 0

[dreimer] 33211: Polish Translation Update by Olaf Siejka Updated German USETUP Translation. To Translators: kbswitch is open for translations now in my eyes. DXDiag maybe too. Ask Johannes Anderwald about it
by dreimer＠svn.reactos.org 01 May '08

01 May '08

Author: dreimer Date: Thu May 1 08:07:58 2008 New Revision: 33211 URL: http://svn.reactos.org/svn/reactos?rev=33211&view=rev Log: Polish Translation Update by Olaf Siejka Updated German USETUP Translation. To Translators: kbswitch is open for translations now in my eyes. DXDiag maybe too. Ask Johannes Anderwald about it Added: trunk/reactos/base/applications/kbswitch/lang/pl-PL.rc (with props) Modified: trunk/reactos/base/applications/dxdiag/lang/pl-PL.rc trunk/reactos/base/applications/kbswitch/rsrc.rc trunk/reactos/base/applications/mmc/lang/lt-LT.rc trunk/reactos/base/setup/usetup/lang/de-DE.h trunk/reactos/base/setup/usetup/lang/pl-PL.h Modified: trunk/reactos/base/applications/dxdiag/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/pl-PL.rc [iso-8859-1] Thu May 1 08:07:58 2008 @@ -16,7 +16,7 @@ BEGIN CONTROL "Tab1",IDC_TAB_CONTROL,"SysTabControl32",WS_TABSTOP,2,2,474,250 PUSHBUTTON "&Pomoc", IDC_BUTTON_HELP, 2, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - DEFPUSHBUTTON "&Nastêpna Strona", IDC_BUTTON_NEXT, 137, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "&Nastêpna", IDC_BUTTON_NEXT, 137, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Zapisz wszystkie informacje...", IDC_BUTTON_SAVE_INFO, 201, 261, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Wyjcie", IDC_BUTTON_EXIT, 323, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END @@ -25,20 +25,20 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - LTEXT "This tool reports detailed information about the ReactX components and drivers installed on your system.", -1, 10, 10, 443, 17 - LTEXT "If you know what area is causing the problem, click the appropiate tab above. Otherwise you can use the ""Next Page"" button below to visit each page in sequence.", -1, 10, 30, 443, 25 - GROUPBOX "System Information", -1, 10, 55, 443, 130, SS_RIGHT - LTEXT "Current Date/Time:", -1, 70, 70, 80, 10, SS_RIGHT - LTEXT "Computer Name:", -1, 70, 80, 80, 10, SS_RIGHT - LTEXT "Operating System:", -1, 70, 90, 80, 10, SS_RIGHT - LTEXT "Language:", -1, 70, 100, 80, 10, SS_RIGHT - LTEXT "System Manufacturer:", -1, 70, 110, 80, 10, SS_RIGHT - LTEXT "System Modell:", -1, 70, 120, 80, 10, SS_RIGHT + LTEXT "Ten program dostarcza szczegó³owych danych o komponentach ReactX i sterownikach, zainstalowanych na twoim systemie..", -1, 10, 10, 443, 17 + LTEXT "Jeli wiesz ju¿, gdzie tkwi b³¹d, kliknij na odpowiedni¹ zak³adkê. W innym wypadku mo¿esz przejæ przez wszystkie zak³adki przyciskiem Nastêpna", -1, 10, 30, 443, 25 + GROUPBOX "Informacje o systemie", -1, 10, 55, 443, 130, SS_RIGHT + LTEXT "Data i czas:", -1, 70, 70, 80, 10, SS_RIGHT + LTEXT "Nazwa komputera:", -1, 70, 80, 80, 10, SS_RIGHT + LTEXT "System operacyjny:", -1, 70, 90, 80, 10, SS_RIGHT + LTEXT "Jêzyk:", -1, 70, 100, 80, 10, SS_RIGHT + LTEXT "Producent:", -1, 70, 110, 80, 10, SS_RIGHT + LTEXT "Model:", -1, 70, 120, 80, 10, SS_RIGHT LTEXT "BIOS:", -1, 70, 130, 80, 10, SS_RIGHT - LTEXT "Processor:", -1, 70, 140, 80, 10, SS_RIGHT - LTEXT "Memory:", -1, 70, 150, 80, 10, SS_RIGHT - LTEXT "Page file:", -1, 70, 160, 80, 10, SS_RIGHT - LTEXT "ReactX-Version:", -1, 70, 170, 80, 10, SS_RIGHT + LTEXT "Procesor:", -1, 70, 140, 80, 10, SS_RIGHT + LTEXT "Pamiêæ:", -1, 70, 150, 80, 10, SS_RIGHT + LTEXT "Plik wymiany:", -1, 70, 160, 80, 10, SS_RIGHT + LTEXT "Wersja ReactX:", -1, 70, 170, 80, 10, SS_RIGHT LTEXT "", IDC_STATIC_TIME, 155, 70, 195, 10, SS_LEFT LTEXT "", IDC_STATIC_COMPUTER, 155, 80, 195, 10, SS_LEFT LTEXT "", IDC_STATIC_OS, 155, 90, 195, 10, SS_LEFT @@ -56,13 +56,13 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Device", -1, 10, 10, 220, 100 - RTEXT "Name:", -1, 20, 25, 70, 10 - RTEXT "Manufacturer:", -1, 20, 35, 70, 10 - RTEXT "Chip Type:", -1, 20, 45, 70, 10 - RTEXT "DAC Type:", -1, 20, 55, 70, 10 - RTEXT "Approx. Total Memory:", -1, 20, 65, 70, 10 - RTEXT "Current Display Mode:", -1, 20, 75, 70, 10 + GROUPBOX "Urz¹dzenie", -1, 10, 10, 220, 100 + RTEXT "Nazwa:", -1, 20, 25, 70, 10 + RTEXT "Producent:", -1, 20, 35, 70, 10 + RTEXT "GPU:", -1, 20, 45, 70, 10 + RTEXT "Typ DAC:", -1, 20, 55, 70, 10 + RTEXT "Pamiêæ:", -1, 20, 65, 70, 10 + RTEXT "Bierz¹ca rozdzielczoæ:", -1, 20, 75, 70, 10 RTEXT "Monitor:", -1, 20, 85, 70, 10 LTEXT "", IDC_STATIC_ADAPTER_ID, 95, 25, 130, 10 LTEXT "", IDC_STATIC_ADAPTER_VENDOR, 95, 35, 130, 10 @@ -72,14 +72,14 @@ LTEXT "", IDC_STATIC_ADAPTER_MODE, 95, 75, 130, 10 LTEXT "", IDC_STATIC_ADAPTER_MONITOR, 95, 85, 130, 10 - GROUPBOX "Driver", -1, 240, 10, 190, 100 - RTEXT "Main Driver:", -1, 245, 30, 55, 10 - RTEXT "Version:", -1, 245, 40, 55, 10 - RTEXT "Date:", -1, 245, 50, 55, 10 - RTEXT "WHQL-Logo:", -1, 245, 60, 55, 10 + GROUPBOX "Sterownik", -1, 240, 10, 190, 100 + RTEXT "G³ówny sterownik:", -1, 245, 30, 55, 10 + RTEXT "Wersja:", -1, 245, 40, 55, 10 + RTEXT "Data:", -1, 245, 50, 55, 10 + RTEXT "WHQL:", -1, 245, 60, 55, 10 RTEXT "Mini-VDD:", -1, 245, 70, 55, 10 RTEXT " vvdddVDD:", -1, 245, 80, 55, 10 - RTEXT "DDI Version:", -1, 245, 90, 55, 10 + RTEXT "Wersja DDI:", -1, 245, 90, 55, 10 LTEXT "", IDC_STATIC_ADAPTER_DRIVER, 305, 30, 130, 10 LTEXT "", IDC_STATIC_ADAPTER_VERSION, 305, 40, 130, 10 LTEXT "", IDC_STATIC_ADAPTER_DATE, 305, 50, 130, 10 @@ -88,20 +88,20 @@ LTEXT "", IDC_STATIC_ADAPTER_VDD, 305, 80, 130, 10 LTEXT "", IDC_STATIC_ADAPTER_DDI, 305, 90, 130, 10 - GROUPBOX "ReactX-Features", -1, 10, 115, 450, 60 - RTEXT "DirectDraw Acceleration:", -1, 15, 130, 110, 12 - RTEXT "Direct3D Acceleration:", -1, 15, 145, 110, 12 - RTEXT "AGP Texture Acceleration:", -1, 15, 160, 110, 12 + GROUPBOX "ReactX", -1, 10, 115, 450, 60 + RTEXT "DirectDraw:", -1, 15, 130, 110, 12 + RTEXT "Direct3D:", -1, 15, 145, 110, 12 + RTEXT "Teksturowanie AGP:", -1, 15, 160, 110, 12 LTEXT "", IDC_STATIC_DDSTATE, 130, 130, 40, 10 LTEXT "", IDC_STATIC_D3DSTATE, 130, 145, 40, 10 LTEXT "", IDC_STATIC_AGPSTATE, 130, 160, 40, 10 - PUSHBUTTON "Enable", IDC_BUTTON_DDRAW, 170, 130, 60, 12, WS_DISABLED - PUSHBUTTON "Enable", IDC_BUTTON_D3D, 170, 145, 60, 12, WS_DISABLED - PUSHBUTTON "Enable", IDC_BUTTON_AGP, 170, 160, 60, 12, WS_DISABLED - PUSHBUTTON "Test DirectDraw", IDC_BUTTON_TESTDD, 250, 130, 80, 12 - PUSHBUTTON "Test Direct3D", IDC_BUTTON_TEST3D, 250, 145, 80, 12, WS_DISABLED - - GROUPBOX "Notes", -1, 10, 180, 450, 40 + PUSHBUTTON "W³¹cz", IDC_BUTTON_DDRAW, 170, 130, 60, 12, WS_DISABLED + PUSHBUTTON "W³¹cz", IDC_BUTTON_D3D, 170, 145, 60, 12, WS_DISABLED + PUSHBUTTON "W³¹cz", IDC_BUTTON_AGP, 170, 160, 60, 12, WS_DISABLED + PUSHBUTTON "Testuj DirectDraw", IDC_BUTTON_TESTDD, 250, 130, 80, 12 + PUSHBUTTON "Testuj Direct3D", IDC_BUTTON_TEST3D, 250, 145, 80, 12, WS_DISABLED + + GROUPBOX "Uwagi", -1, 10, 180, 450, 40 EDITTEXT IDC_TEXT_INFO, 20, 190, 432, 20, WS_DISABLED | WS_TABSTOP END @@ -110,37 +110,37 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Device", -1, 10, 10, 250, 100 - RTEXT "Name:", -1, 20, 25, 70, 10 - RTEXT "Device ID:", -1, 20, 35, 70, 10 - RTEXT "Manufacturer ID:", -1, 20, 45, 70, 10 - RTEXT "Product ID:", -1, 20, 55, 70, 10 - RTEXT "Type:", -1, 20, 65, 70, 10 - RTEXT "Default Device:", -1, 20, 75, 70, 10 + GROUPBOX "Urz¹dzenie", -1, 10, 10, 250, 100 + RTEXT "Nazwa:", -1, 20, 25, 70, 10 + RTEXT "ID Urz¹dzenia:", -1, 20, 35, 70, 10 + RTEXT "ID Producenta:", -1, 20, 45, 70, 10 + RTEXT "ID Produktu:", -1, 20, 55, 70, 10 + RTEXT "Typ:", -1, 20, 65, 70, 10 + RTEXT "Urz¹denie domylne:", -1, 20, 75, 70, 10 LTEXT "", IDC_STATIC_DSOUND_NAME, 95, 25, 150, 10 LTEXT "", IDC_STATIC_DSOUND_DEVICEID, 95, 35, 150, 10 LTEXT "", IDC_STATIC_DSOUND_VENDORID, 95, 45, 150, 10 LTEXT "", IDC_STATIC_DSOUND_PRODUCTID, 95, 55, 150, 10 LTEXT "", IDC_STATIC_DSOUND_TYPE, 95, 65, 150, 10 LTEXT "", IDC_STATIC_DSOUND_STANDARD, 95, 75, 150, 10 - GROUPBOX "Driver", -1, 270, 10, 190, 100 - RTEXT "Name:", -1, 275, 25, 55, 10 - RTEXT "Version:", -1, 275, 35, 55, 10 - RTEXT "Datw:", -1, 275, 45, 55, 10 - RTEXT "WHQL-Logo:", -1, 275, 55, 55, 10 - RTEXT "Other Files:", -1, 275, 65, 55, 10 - RTEXT "Provider:", -1, 275, 75, 55, 10 + GROUPBOX "Sterownik", -1, 270, 10, 190, 100 + RTEXT "Nazwa:", -1, 275, 25, 55, 10 + RTEXT "Wersja:", -1, 275, 35, 55, 10 + RTEXT "Data:", -1, 275, 45, 55, 10 + RTEXT "Logo WHQL:", -1, 275, 55, 55, 10 + RTEXT "Inne pliki:", -1, 275, 65, 55, 10 + RTEXT "Dostawca:", -1, 275, 75, 55, 10 LTEXT "", IDC_STATIC_DSOUND_DRIVER, 335, 25, 100, 10 LTEXT "", IDC_STATIC_DSOUND_VERSION, 335, 35, 100, 10 LTEXT "", IDC_STATIC_DSOUND_DATE, 335, 45, 100, 10 LTEXT "", IDC_STATIC_DSOUND_LOGO, 335, 55, 100, 10 LTEXT "", IDC_STATIC_DSOUND_FILES, 335, 65, 100, 10 LTEXT "", IDC_STATIC_ADAPTER_PROVIDER, 335, 75, 100, 10 - GROUPBOX "ReactX-Features", -1, 10, 115, 450, 60 + GROUPBOX "ReactX-", -1, 10, 115, 450, 60 CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | WS_TABSTOP, 120, 135, 80, 17 - RTEXT "Hardware Sound\nAcceleration Level:", -1, 20, 135, 90, 20 - PUSHBUTTON "Test DirectSound", IDC_BUTTON_TESTDSOUND, 270, 130, 80, 13 - GROUPBOX "Notes", -1, 10, 180, 450, 40 + RTEXT "Przyspiesznie sprzêtowe\nPoziom:", -1, 20, 135, 90, 20 + PUSHBUTTON "Testuj DirectSound", IDC_BUTTON_TESTDSOUND, 270, 130, 80, 13 + GROUPBOX "Uwagi", -1, 10, 180, 450, 40 EDITTEXT IDC_TEXT_DSOUNDINFO, 20, 190, 432, 20, WS_DISABLED | WS_TABSTOP END @@ -155,11 +155,11 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "DirectInput Devices", -1, 10, 10, 452, 80 + GROUPBOX "Urz¹dzenia DirectInput", -1, 10, 10, 452, 80 CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 20, 432, 60 - GROUPBOX "Input Devices", -1, 10, 100, 452, 60 + GROUPBOX "Urz¹denia wejcia", -1, 10, 100, 452, 60 CONTROL "", IDC_TREE_PORT, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 20, 110, 432, 40, 0x00000200 - GROUPBOX "Information", -1, 10, 170, 452, 50 + GROUPBOX "Informacje", -1, 10, 170, 452, 50 EDITTEXT IDC_RICH_INFO, 20, 180, 432, 30, WS_DISABLED | WS_TABSTOP END @@ -173,7 +173,7 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Registered DirectPlay Service Provider", -1, 10, 10, 452, 80 + GROUPBOX "Zarejestrowani dostawcy us³ug DirectPlay", -1, 10, 10, 452, 80 CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 20, 332, 60 END @@ -191,41 +191,41 @@ IDS_FORMAT_SWAP "%I64u MB used, %I64u MB available" IDS_FORMAT_UNIPROC "%s (%u CPU)" IDS_FORMAT_MPPROC "%s (%u CPUs)" - IDS_VERSION_UNKNOWN "Unknown Version" - IDS_DEVICE_STATUS_ATTACHED "Connected" - IDS_DEVICE_STATUS_MISSING "Disconnected" - IDS_DEVICE_STATUS_UNKNOWN "Unknown" - IDS_DEVICE_NAME "Device name" - IDS_DEVICE_STATUS "Status" - IDS_DEVICE_CONTROLLER "Controller ID" - IDS_DEVICE_MANUFACTURER "Manufacturer ID" - IDS_DEVICE_PRODUCT "Product ID" - IDS_DEVICE_FORCEFEEDBACK "Force Feedback-Driver" - IDS_NOT_APPLICABLE "Not applicable" - IDS_OPTION_YES "Yes" - IDS_DIRECTPLAY_COL_NAME1 "Name" - IDS_DIRECTPLAY_COL_NAME2 "Registry" - IDS_DIRECTPLAY_COL_NAME3 "File" - IDS_DIRECTPLAY_COL_NAME4 "Version" - IDS_DIRECTPLAY8_MODEMSP "DirectPlay8-Modem Service Provider" - IDS_DIRECTPLAY8_SERIALSP "DirectPlay8 Serial Service Provider" - IDS_DIRECTPLAY8_IPXSP "DirectPlay8 IPX Service Provider" - IDS_DIRECTPLAY8_TCPSP "DirectPlay8-TCP/IP Service Provider" - IDS_DIRECTPLAY_TCPCONN "Internet TCP/IP Connection For DirectPlay" - IDS_DIRECTPLAY_IPXCONN "IPX Connection For DirectPlay" - IDS_DIRECTPLAY_MODEMCONN "Modem Connection For DirectPlay" - IDS_DIRECTPLAY_SERIALCONN "Serial Connection For DirectPlay" + IDS_VERSION_UNKNOWN "Wersja nieznana" + IDS_DEVICE_STATUS_ATTACHED "Po³¹czony" + IDS_DEVICE_STATUS_MISSING "Roz³¹czony" + IDS_DEVICE_STATUS_UNKNOWN "Nieznany" + IDS_DEVICE_NAME "Nazwa urz¹dzenia" + IDS_DEVICE_STATUS "Stan" + IDS_DEVICE_CONTROLLER "ID Kontrolera" + IDS_DEVICE_MANUFACTURER "ID Producenta" + IDS_DEVICE_PRODUCT "ID Produktu" + IDS_DEVICE_FORCEFEEDBACK "Sterowniki Force-Feedback" + IDS_NOT_APPLICABLE "Nie stosowane" + IDS_OPTION_YES "Tak" + IDS_DIRECTPLAY_COL_NAME1 "Nazwa" + IDS_DIRECTPLAY_COL_NAME2 "Rejestr" + IDS_DIRECTPLAY_COL_NAME3 "Plik" + IDS_DIRECTPLAY_COL_NAME4 "Wersja" + IDS_DIRECTPLAY8_MODEMSP "Dostawca us³ug modemowych DirectPlay8" + IDS_DIRECTPLAY8_SERIALSP "Dostawca us³ug portu szeregowego DirectPlay8" + IDS_DIRECTPLAY8_IPXSP "Dostawca us³ug IPX DirectPlay8" + IDS_DIRECTPLAY8_TCPSP "Dostawca us³ug TCP/IP DirectPlay8" + IDS_DIRECTPLAY_TCPCONN "Po³¹czenie internetowe TCP/IP dla DirectPlay" + IDS_DIRECTPLAY_IPXCONN "Po³¹czenie IPX dla DirectPlay" + IDS_DIRECTPLAY_MODEMCONN "Po³¹czenie modemowe dla DirectPlay" + IDS_DIRECTPLAY_SERIALCONN "Po³¹czenie szeregowe dla DirectPlay" IDS_REG_SUCCESS "OK" - IDS_REG_FAIL "Error" - IDS_DDTEST_ERROR "Test failed!" - IDS_DDTEST_DESCRIPTION "This will start DirecDraw interface test. Continue?" - IDS_DDPRIMARY_DESCRIPTION "This test will use DirectDraw to draw on primary surface. Black and white rectangles should be drawn. Continue?" - IDS_DDPRIMARY_RESULT "Did you see black and white rectangles?" - IDS_DDOFFSCREEN_DESCRIPTION "This test will use DirectDraw to draw in an offscreen buffer. Moving white rectangle should be drawn. Continue?" - IDS_DDOFFSCREEN_RESULT "Did you see white moving reactangle?" - IDS_DDFULLSCREEN_DESCRIPTION "This test will use DirectDraw to draw in a fullscreen mode. Moving white rectangle should be drawn. Continue?" - IDS_DDFULLSCREEN_RESULT "Did you see white moving reactangle in a fullscreen mode?" + IDS_REG_FAIL "B³¹d" + IDS_DDTEST_ERROR "Test nieudany!" + IDS_DDTEST_DESCRIPTION "Czy chcesz rozpocz¹æ test interface DirectDraw?" + IDS_DDPRIMARY_DESCRIPTION "Ten test wykorzysta DirectDraw do rysowania na powierzchni podstawowej. Narysowane zostan¹ czarne i bia³e prostok¹ty. Kontynuowaæ?" + IDS_DDPRIMARY_RESULT "Czy by³o widaæ czarne i bia³e prostok¹ty?" + IDS_DDOFFSCREEN_DESCRIPTION "Ten test wykorzysta DirectDraw do rysowania przy u¿yciu bufora pozaekranowego. Narysowany zostanie poruszaj¹cy siê bia³y kwadrat. Kontynuowaæ?" + IDS_DDOFFSCREEN_RESULT "Czy by³o widaæ poruszaj¹cy siê bia³y kwadrat?" + IDS_DDFULLSCREEN_DESCRIPTION "Ten test wykorzysta DirectDraw do rysowania w trybie pe³noekranowym. Narysowany zostanie poruszaj¹cy siê bia³y kwadrat. Kontynuowaæ?" + IDS_DDFULLSCREEN_RESULT "Czy by³o widaæ poruszaj¹cy siê bia³y kwadrat, w trybie pe³noekranowym?" IDS_FORMAT_ADAPTER_MEM "%u MB" IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u bit)(%uHz)" - IDS_OPTION_NO "No" -END + IDS_OPTION_NO "Nie" +END Added: trunk/reactos/base/applications/kbswitch/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/lang/pl-PL.rc (added) +++ trunk/reactos/base/applications/kbswitch/lang/pl-PL.rc [iso-8859-1] Thu May 1 08:07:58 2008 @@ -1,0 +1,18 @@ +/* + * translated by Caemyr - Olaf Siejka (Apr,2008) + * Use ReactOS forum PM or IRC to contact me + * http://www.reactos.org + * IRC: irc.freenode.net #reactos-pl + */ + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +IDR_POPUP MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM SEPARATOR + MENUITEM "&Ustawienia...", ID_PREFERENCES + MENUITEM "&Wyjcie", ID_EXIT + END +END Propchange: trunk/reactos/base/applications/kbswitch/lang/pl-PL.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/kbswitch/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/rsrc.rc [iso-8859-1] Thu May 1 08:07:58 2008 @@ -2,4 +2,5 @@ #include "lang/de-DE.rc" #include "lang/en-US.rc" #include "lang/es-ES.rc" +#include "lang/pl-PL.rc" #include "lang/ru-RU.rc" Modified: trunk/reactos/base/applications/mmc/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/lt-LT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/lang/lt-LT.rc [iso-8859-1] Thu May 1 08:07:58 2008 @@ -21,26 +21,3 @@ IDS_APPTITLE "ReactOS Valdymo Pultas" IDS_CONSOLETITLE "Pultas%1!u!" END -/* Translation by Vytis "CMan" Girdþijauskas (cman(a)cman.us) */ - -LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT - -IDM_CONSOLEROOT MENU DISCARDABLE -BEGIN - POPUP "&Byla" - BEGIN - MENUITEM SEPARATOR - MENUITEM "&Baigti\tAlt+F4", ID_FILE_EXIT - END - - POPUP "&Pagalba" - BEGIN - MENUITEM "&Apie ReactOS Valdymo Pultà...", ID_HELP_ABOUT - END -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_APPTITLE "ReactOS Valdymo Pultas" - IDS_CONSOLETITLE "Pultas%1!u!" -END Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/de-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] Thu May 1 08:07:58 2008 @@ -1463,8 +1463,8 @@ }, { //ERROR_ADDING_KBLAYOUTS, - "Setup failed to add keyboard layouts to registry.\n" - "ENTER = Reboot computer" + "Setup konnte die Tastaturlayouts nicht in Registry eintragen.\n" + "ENTER = Computer neustarten" }, { NULL, @@ -1686,7 +1686,7 @@ {STRING_GB, "GB"}, {STRING_ADDKBLAYOUTS, - "Adding keyboard layouts"}, + "Tastaturlayout hinzufügen"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pl-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] Thu May 1 08:07:58 2008 @@ -1,5 +1,5 @@ /* - * translated by Caemyr (Jan-Feb, 2008) + * translated by Caemyr (Jan-Feb, Apr, 2008) * Use ReactOS forum PM or IRC to contact me * http://www.reactos.org * IRC: irc.freenode.net #reactos-pl; @@ -1470,8 +1470,8 @@ }, { //ERROR_ADDING_KBLAYOUTS, - "Setup failed to add keyboard layouts to registry.\n" - "ENTER = Reboot computer" + "Instalator nie m¢g doda ukad¢w klawiatury do rejestru.\n" + "ENTER = Restart komputera" }, { NULL, @@ -1693,7 +1693,7 @@ {STRING_GB, "GB"}, {STRING_ADDKBLAYOUTS, - "Adding keyboard layouts"}, + "Dodawanie ukad¢w klawiatury"}, {0, 0} };

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs