Ros-diffs May 2008

ros-diffs@reactos.org

25 participants
586 discussions

[dreimer] 33236: Improve code style. Still tbd. Remove some of the external tools, like buildtime, checknewer etc Fix the last bug which causes the args not to be parsed to make.

by dreimer＠svn.reactos.org

Author: dreimer Date: Fri May 2 08:45:09 2008 New Revision: 33236 URL: http://svn.reactos.org/svn/reactos?rev=33236&view=rev Log: Improve code style. Still tbd. Remove some of the external tools, like buildtime, checknewer etc Fix the last bug which causes the args not to be parsed to make. 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 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] Fri May 2 08:45:09 2008 @@ -49,8 +49,8 @@ } # -# Check if the user has chosen to use a different object or output path -# and set it accordingly. +# Check if the user has chosen to use a different object or output path and set +# it accordingly. # if ($_ROSBE_OBJPATH -ne $null) { if ( Test-Path "$_ROSBE_OBJPATH\.") { @@ -77,10 +77,9 @@ $DATENAME = get-date -f dyMMyyyy $TIMENAME = get-date -f HHmm - # -# Check if writing logs is enabled, if so check if our log directory -# exists, if it doesn't, create it. +# Check if writing logs is enabled, if so check if our log directory exists, if +# it doesn't, create it. # if ($_ROSBE_WRITELOG -eq 1) { if (!(Test-Path "$_ROSBE_LOGDIR")) { @@ -92,7 +91,7 @@ if ($_ROSBE_SHOWTIME -eq 1) { if ($_ROSBE_WRITELOG -eq 1) { 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) + $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 { @@ -101,7 +100,7 @@ } else { if ($_ROSBE_WRITELOG -eq 1) { 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) + $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 { @@ -119,12 +118,12 @@ # -x2 - Number of CPUs, doubled. # -a - Determine the cpu count based on the inherited process affinity mask. # -$CPUCOUNT= &"$_ROSBE_BASEDIR\Tools\cpucount.exe" -x1 + $CPUCOUNT= &"$_ROSBE_BASEDIR\Tools\cpucount.exe" -x1 if ($_ROSBE_SHOWTIME -eq 1) { if ($_ROSBE_WRITELOG -eq 1) { 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) + $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 { @@ -133,7 +132,7 @@ } else { if ($_ROSBE_WRITELOG -eq 1) { 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) + $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 { @@ -146,15 +145,15 @@ # Check if we are using -j or not. # if ($args.count -gt 1) { -if ($args[0] -eq "multi") { + if ($args[0] -eq "multi") { $host.ui.RawUI.WindowTitle = "makex $($args) parallel build started: $TIMERAW" -} -BUILDMULTI + } + BUILDMULTI } else { -if ($args.count -gt 0) { + if ($args.count -gt 0) { $host.ui.RawUI.WindowTitle = "make $($args) build started: $TIMERAW" -} -BUILD + } + BUILD } # @@ -163,19 +162,19 @@ "$_ROSBE_BASEDIR\Tools\flash.exe" if ($_ROSBE_VERSION -ne $null) { -$host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" + $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" } # # Unload all used Vars. # -$ENV:ROS_LEAN_AND_MEAN = "" -$ENV:HOST_CC = "" -$ENV:HOST_CPP = "" -$ENV:TARGET_CC = "" -$ENV:TARGET_CPP = "" -$ENV:ROS_INTERMEDIATE = "" -$ENV:ROS_OUTPUT = "" -$ENV:ROS_TEMPORARY = "" -$ENV:CPUCOUNT = "" -$ENV:CCACHE_DIR = "" +$ENV:ROS_LEAN_AND_MEAN = $null +$ENV:HOST_CC = $null +$ENV:HOST_CPP = $null +$ENV:TARGET_CC = $null +$ENV:TARGET_CPP = $null +$ENV:ROS_INTERMEDIATE = $null +$ENV:ROS_OUTPUT = $null +$ENV:ROS_TEMPORARY = $null +$ENV:CPUCOUNT = $null +$ENV:CCACHE_DIR = $null 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] Fri May 2 08:45:09 2008 @@ -9,20 +9,22 @@ # # -# Set defaults to work with and override them if edited by -# the options utility. +# Set defaults to work with and override them if edited by the options utility. # (Get-Host).UI.RawUI.ForegroundColor = "Green" (Get-Host).UI.RawUI.BackgroundColor = "Black" cls -if ($APPDATA.Length -lt 1) {$APPDATA = $ENV:USERPROFILE} -$global:PATH = "$ENV:SystemRoot\system32;$ENV:SystemRoot" + +if ($APPDATA.Length -lt 1) { + $APPDATA = $ENV:USERPROFILE +} +$ENV:PATH = "$ENV:SystemRoot\system32;$ENV:SystemRoot" $global:_ROSBE_VERSION = 1.2 $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" +$global:_ROSBE_ORIGINALPATH = "$ENV:PATH" $global:_ROSBE_SHOWTIME = 1 $global:_ROSBE_WRITELOG = 1 $global:_ROSBE_USECCACHE = 0 @@ -36,20 +38,19 @@ # Display the banner and set up the environment for the GCC 4.x.x build # environment. # -function RosBE4 -{ -"*******************************************************************************" -"* *" -"* ReactOS Build Environment $_ROSBE_VERSION *" -"* *" -"*******************************************************************************" -"" -"" -(get-WmiObject Win32_OperatingSystem).caption -# -# Set the correct path for the build tools and set the MinGW make. -# -& "$_ROSBE_BASEDIR\rosbe-gcc-env.ps1" +function RosBE4 { + "*******************************************************************************" + "* *" + "* ReactOS Build Environment $_ROSBE_VERSION *" + "* *" + "*******************************************************************************" + "" + "" + (get-WmiObject Win32_OperatingSystem).caption + # + # Set the correct path for the build tools and set the MinGW make. + # + & "$_ROSBE_BASEDIR\rosbe-gcc-env.ps1" } # @@ -57,86 +58,85 @@ # that are not actually present. # -function LOADDOSKEYMACROS -{ -if (Test-Path "$_ROSBE_BASEDIR\chdefdir.ps1") { -set-alias CHDEFDIR "$_ROSBE_BASEDIR\chdefdir.ps1" -scope Global -} +function LOADDOSKEYMACROS { + if (Test-Path "$_ROSBE_BASEDIR\chdefdir.ps1") { + set-alias CHDEFDIR "$_ROSBE_BASEDIR\chdefdir.ps1" -scope Global + } -if (Test-Path "$_ROSBE_BASEDIR\chdefgcc.ps1") { -set-alias CHDEFGCC "$_ROSBE_BASEDIR\chdefgcc.ps1" -scope Global -} + if (Test-Path "$_ROSBE_BASEDIR\chdefgcc.ps1") { + set-alias CHDEFGCC "$_ROSBE_BASEDIR\chdefgcc.ps1" -scope Global + } -if (Test-Path "$_ROSBE_BASEDIR\charch.ps1") { -set-alias CHARCH "$_ROSBE_BASEDIR\charch.ps1" -scope Global -} + if (Test-Path "$_ROSBE_BASEDIR\charch.ps1") { + set-alias CHARCH "$_ROSBE_BASEDIR\charch.ps1" -scope Global + } -set-alias CLEAN "$_ROSBE_BASEDIR\Clean.ps1" -scope Global + set-alias CLEAN "$_ROSBE_BASEDIR\Clean.ps1" -scope Global -if (Test-Path "$_ROSBE_BASEDIR\Config.ps1") { -set-alias CONFIG "$_ROSBE_BASEDIR\Config.ps1" -scope Global -} + if (Test-Path "$_ROSBE_BASEDIR\Config.ps1") { + set-alias CONFIG "$_ROSBE_BASEDIR\Config.ps1" -scope Global + } -set-alias HELP "$_ROSBE_BASEDIR\Help.ps1" -scope Global -set-alias MAKE "$_ROSBE_BASEDIR\Build.ps1" -scope Global -set-alias MAKEX "$_ROSBE_BASEDIR\Build.ps1 multi" -scope Global + set-alias HELP "$_ROSBE_BASEDIR\Help.ps1" -scope Global + set-alias MAKE "$_ROSBE_BASEDIR\Build.ps1" -scope Global + set-alias MAKEX "$_ROSBE_BASEDIR\Build.ps1 multi" -scope Global -if (Test-Path "$_ROSBE_BASEDIR\reladdr2line.ps1") { -set-alias RADDR2LINE "$_ROSBE_BASEDIR\reladdr2line.ps1" -scope Global -} + if (Test-Path "$_ROSBE_BASEDIR\reladdr2line.ps1") { + set-alias RADDR2LINE "$_ROSBE_BASEDIR\reladdr2line.ps1" -scope Global + } -if (Test-Path "$_ROSBE_BASEDIR\scut.ps1") { -set-alias SCUT "$_ROSBE_BASEDIR\scut.ps1" -scope Global -} + if (Test-Path "$_ROSBE_BASEDIR\scut.ps1") { + set-alias SCUT "$_ROSBE_BASEDIR\scut.ps1" -scope Global + } -if (Test-Path "$_ROSBE_BASEDIR\sSVN.ps1") { -set-alias SSVN "$_ROSBE_BASEDIR\sSVN.ps1" -scope Global -set-alias SVN "$_ROSBE_BASEDIR\Tools\svn.exe" -scope Global -} + if (Test-Path "$_ROSBE_BASEDIR\sSVN.ps1") { + set-alias SSVN "$_ROSBE_BASEDIR\sSVN.ps1" -scope Global + set-alias SVN "$_ROSBE_BASEDIR\Tools\svn.exe" -scope Global + } -if (Test-Path "$_ROSBE_BASEDIR\options.ps1") { -set-alias OPTIONS "$_ROSBE_BASEDIR\options.ps1" -scope Global -} + if (Test-Path "$_ROSBE_BASEDIR\options.ps1") { + set-alias OPTIONS "$_ROSBE_BASEDIR\options.ps1" -scope Global + } } # # Check if RosBE data directory exists, if not, create it. # -if (!(Test-Path "$APPDATA\RosBE")) {New-Item -path "$APPDATA" -name "RosBE" -type directory} +if (!(Test-Path "$APPDATA\RosBE")) { + New-Item -path "$APPDATA" -name "RosBE" -type directory +} # -# Check if the user has used the options utility and -# if so, load their options. +# Check if the user has used the options utility and if so, load their options. # if (Test-Path "$APPDATA\RosBE\rosbe-options.ps1") { -& "$APPDATA\RosBE\rosbe-options.ps1" + & "$APPDATA\RosBE\rosbe-options.ps1" } $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" # -# Check if we are using oldmode or if any unknown parameters -# were specified. +# Check if we are using oldmode or if any unknown parameters were specified. # if ($args.count -gt 0) { -if ($args[0] = "oldmode") { - cls - $_ROSBE_MODE = "MinGW" + if ($args[0] = "oldmode") { + cls + $_ROSBE_MODE = "MinGW" -} else { - cls - "Unknown parameter specified. Exiting." -exit -} + } else { + cls + "Unknown parameter specified. Exiting." + exit + } } RosBE4 # -# Load the base directory from srclist.txt and set it as the -# new source directory. +# Load the base directory from srclist.txt and set it as the new source +# directory. # if (Test-Path "$_ROSBE_BASEDIR\scut.ps1") { -& "$_ROSBE_BASEDIR\scut.ps1" + & "$_ROSBE_BASEDIR\scut.ps1" } # @@ -153,8 +153,8 @@ LOADDOSKEYMACROS # -# Look if the ReactOS source directory is empty. If so, -# inform the user and mention 'ssvn create' (only if ssvn is installed). +# Look if the ReactOS source directory is empty. If so, inform the user and +# mention 'ssvn create' (only if ssvn is installed). # if (!(Test-Path "$_ROSBE_BASEDIR\sSVN.ps1")) { if ((get-childitem $_ROSBE_ROSSOURCEDIR).Count -le 0) { Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] Fri May 2 08:45:09 2008 @@ -8,8 +8,8 @@ # # -# Check if we are running within the RosBE, and if not -# initialize GCC for the current directory. +# Check if we are running within the RosBE, and if not initialize GCC for the +# current directory. # if ($ENV:_ROSBE_MINGWPATH -eq $null) { $ENV:_ROSBE_MODE = "MinGW" @@ -57,7 +57,7 @@ } } if (Test-Path "$_ROSBE_MINGWPATH\bin\flex.exe") { -$fver = (& flex --version) -replace ".*version ((\d|\.)+).*",'$1' + $fver = (& flex --version) -replace ".*version ((\d|\.)+).*",'$1' "flex $fver" } else { if ($_ROSBE_MODE -eq "RosBE") {

16 years, 4 months

[gedmurphy] 33235: fix build

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Fri May 2 08:25:58 2008 New Revision: 33235 URL: http://svn.reactos.org/svn/reactos?rev=33235&view=rev Log: fix build Modified: trunk/reactos/dll/win32/browseui/browseui_main.c Modified: trunk/reactos/dll/win32/browseui/browseui_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/browseu… ============================================================================== --- trunk/reactos/dll/win32/browseui/browseui_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/browseui_main.c [iso-8859-1] Fri May 2 08:25:58 2008 @@ -35,6 +35,7 @@ #include "browseui.h" #include "shobjidl.h" /* for IShellFolder used in undoc.h */ +#include "initguid.h" #include "undoc.h" /* for CLSID_RebarBandSite */ WINE_DEFAULT_DEBUG_CHANNEL(browseui); @@ -44,6 +45,10 @@ HINSTANCE browseui_hinstance = 0; typedef HRESULT (WINAPI *LPFNCONSTRUCTOR)(IUnknown *pUnkOuter, IUnknown **ppvOut); + +/* undoc GUID */ +DEFINE_GUID(CLSID_RebarBandSite, 0xECD4FC4D, 0x521C, 0x11D0, 0xB7, 0x92, 0x00, 0xA0, 0xC9, 0x03, 0x12, 0xE1); + static const struct { REFCLSID clsid;

16 years, 4 months

[gedmurphy] 33234: - Remove CLSID_RebarBandSite from uuid, and contain it within explorer as it's an undoc GUID - Load SHInvokeDefaultCommand when required to avoid msvc linker dependencies - explorer_new now builds and links with msvc9, although it'll crash if you try to run it at the moment. Investigation needed.

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Fri May 2 07:09:39 2008 New Revision: 33234 URL: http://svn.reactos.org/svn/reactos?rev=33234&view=rev Log: - Remove CLSID_RebarBandSite from uuid, and contain it within explorer as it's an undoc GUID - Load SHInvokeDefaultCommand when required to avoid msvc linker dependencies - explorer_new now builds and links with msvc9, although it'll crash if you try to run it at the moment. Investigation needed. Modified: trunk/reactos/base/shell/explorer-new/explorer.c trunk/reactos/base/shell/explorer-new/precomp.h trunk/reactos/base/shell/explorer-new/startmnu.c trunk/reactos/base/shell/explorer-new/undoc.h trunk/reactos/lib/sdk/uuid/uuid.c Modified: trunk/reactos/base/shell/explorer-new/explorer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ex… ============================================================================== --- trunk/reactos/base/shell/explorer-new/explorer.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/explorer.c [iso-8859-1] Fri May 2 07:09:39 2008 @@ -24,6 +24,9 @@ HANDLE hProcessHeap; HKEY hkExplorer = NULL; +/* undoc GUID */ +DEFINE_GUID(CLSID_RebarBandSite, 0xECD4FC4D, 0x521C, 0x11D0, 0xB7, 0x92, 0x00, 0xA0, 0xC9, 0x03, 0x12, 0xE1); + LONG SetWindowStyle(IN HWND hWnd, IN LONG dwStyleMask, Modified: trunk/reactos/base/shell/explorer-new/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/pr… ============================================================================== --- trunk/reactos/base/shell/explorer-new/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/precomp.h [iso-8859-1] Fri May 2 07:09:39 2008 @@ -21,11 +21,13 @@ #include "resource.h" #include "comcsup.h" #include "todo.h" +#include "initguid.h" #include "undoc.h" /* dynamic imports due to lack of support in msvc linker libs */ typedef INT (STDCALL *REGSHELLHOOK)(HWND, DWORD); typedef BOOL (STDCALL *DRAWCAPTEMP)(HWND, HDC, const RECT*, HFONT, HICON, LPCWSTR, UINT); +typedef HRESULT (STDCALL *SHINVDEFCMD)(HWND, IShellFolder*, LPCITEMIDLIST); static ULONG __inline Win32DbgPrint(const char *filename, int line, const char *lpFormat, ...) 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] Fri May 2 07:09:39 2008 @@ -471,12 +471,32 @@ IN IShellFolder *pShellFolder, IN LPCITEMIDLIST pidl) { + HMODULE hShlwapi; + HRESULT ret = S_FALSE; + IStartMenuSiteImpl *This = IStartMenuSiteImpl_from_IStartMenuCallback(iface); DbgPrint("IStartMenuCallback::Execute\n"); - return SHInvokeDefaultCommand(ITrayWindow_GetHWND(This->Tray), - pShellFolder, - pidl); + + hShlwapi = LoadLibrary(TEXT("SHLWAPI.DLL")); + if (hShlwapi != NULL) + { + SHINVDEFCMD SHInvokeDefCmd; + + /* SHInvokeDefaultCommand */ + SHInvokeDefCmd = (SHINVDEFCMD)GetProcAddress(hShlwapi, + (LPCSTR)((LONG)279)); + if (SHInvokeDefCmd != NULL) + { + ret = SHInvokeDefCmd(ITrayWindow_GetHWND(This->Tray), + pShellFolder, + pidl); + } + + FreeLibrary(hShlwapi); + } + + return ret; } static HRESULT STDMETHODCALLTYPE Modified: trunk/reactos/base/shell/explorer-new/undoc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/un… ============================================================================== --- trunk/reactos/base/shell/explorer-new/undoc.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/undoc.h [iso-8859-1] Fri May 2 07:09:39 2008 @@ -228,8 +228,7 @@ #define DrawCaptionTemp DrawCaptionTempA #endif -DEFINE_GUID(CLSID_RebarBandSite, 0xECD4FC4D, 0x521C, 0x11D0, 0xB7, 0x92, 0x00, 0xA0, 0xC9, 0x03, 0x12, 0xE1); -DEFINE_GUID(IID_IDeskBand, 0xEB0FE172, 0x1A3A, 0x11D0, 0x89, 0xB3, 0x00, 0xA0, 0xC9, 0x0A, 0x90, 0xAC); +EXTERN_C const GUID CLSID_RebarBandSite; HRESULT WINAPI SHInvokeDefaultCommand(HWND,IShellFolder*,LPCITEMIDLIST); Modified: trunk/reactos/lib/sdk/uuid/uuid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/uuid/uuid.c?rev=33… ============================================================================== --- trunk/reactos/lib/sdk/uuid/uuid.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/uuid/uuid.c [iso-8859-1] Fri May 2 07:09:39 2008 @@ -122,4 +122,3 @@ DEFINE_GUID(CLSID_StdEvent, 0x0000032b,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(CLSID_ManualResetEvent, 0x0000032c,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(CLSID_SynchronizeContainer, 0x0000032d,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); -DEFINE_GUID(CLSID_RebarBandSite, 0xECD4FC4D, 0x521C, 0x11D0, 0xB7, 0x92, 0x00, 0xA0, 0xC9, 0x03, 0x12, 0xE1);

16 years, 4 months

[gedmurphy] 33233: Fix build due to recent header changes

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Fri May 2 03:43:47 2008 New Revision: 33233 URL: http://svn.reactos.org/svn/reactos?rev=33233&view=rev Log: Fix build due to recent header changes Modified: trunk/reactos/dll/win32/shell32/pidl.c Modified: trunk/reactos/dll/win32/shell32/pidl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/pidl.c?r… ============================================================================== --- trunk/reactos/dll/win32/shell32/pidl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/pidl.c [iso-8859-1] Fri May 2 03:43:47 2008 @@ -432,7 +432,7 @@ * Caller is responsible for deallocating the returned ItemIDList with the * shells IMalloc interface, aka ILFree. */ -LPITEMIDLIST WINAPI SHCloneSpecialIDList(HWND hwndOwner, DWORD nFolder, BOOL fCreate) +PIDLIST_ABSOLUTE WINAPI SHCloneSpecialIDList(HWND hwndOwner, int nFolder, BOOL fCreate) { LPITEMIDLIST ppidl; TRACE_(shell)("(hwnd=%p,csidl=0x%x,%s).\n", hwndOwner, nFolder, fCreate ? "T" : "F");

16 years, 4 months

[gedmurphy] 33232: - Get the locations of DrawCaptionTemp and RegisterShellHook when required instead of at link time. This allows building with msvc due to missing .lib stuff - Remove SHGetViewStatePropertyBag test code - Move more stuff to appropiate headers - Remove unneeded linker libs

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Fri May 2 03:22:09 2008 New Revision: 33232 URL: http://svn.reactos.org/svn/reactos?rev=33232&view=rev Log: - Get the locations of DrawCaptionTemp and RegisterShellHook when required instead of at link time. This allows building with msvc due to missing .lib stuff - Remove SHGetViewStatePropertyBag test code - Move more stuff to appropiate headers - Remove unneeded linker libs Modified: trunk/reactos/base/shell/explorer-new/explorer.rbuild trunk/reactos/base/shell/explorer-new/precomp.h trunk/reactos/base/shell/explorer-new/taskswnd.c trunk/reactos/base/shell/explorer-new/todo.h trunk/reactos/base/shell/explorer-new/traywnd.c trunk/reactos/include/psdk/shlobj.h trunk/reactos/include/psdk/shlwapi.h trunk/reactos/include/psdk/winuser.h Modified: trunk/reactos/base/shell/explorer-new/explorer.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ex… ============================================================================== --- trunk/reactos/base/shell/explorer-new/explorer.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/explorer.rbuild [iso-8859-1] Fri May 2 03:22:09 2008 @@ -11,11 +11,8 @@ <library>gdi32</library> <library>user32</library> <library>comctl32</library> - <library>msvcrt20</library> - <library>ntdll</library> <library>ole32</library> <library>oleaut32</library> - <library>shdocvw</library> <library>shell32</library> <library>shlwapi</library> <library>uuid</library> Modified: trunk/reactos/base/shell/explorer-new/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/pr… ============================================================================== --- trunk/reactos/base/shell/explorer-new/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/precomp.h [iso-8859-1] Fri May 2 03:22:09 2008 @@ -22,6 +22,10 @@ #include "comcsup.h" #include "todo.h" #include "undoc.h" + +/* dynamic imports due to lack of support in msvc linker libs */ +typedef INT (STDCALL *REGSHELLHOOK)(HWND, DWORD); +typedef BOOL (STDCALL *DRAWCAPTEMP)(HWND, HDC, const RECT*, HFONT, HICON, LPCWSTR, UINT); static ULONG __inline Win32DbgPrint(const char *filename, int line, const char *lpFormat, ...) @@ -222,13 +226,6 @@ /* * desktop.c */ - -#define SHCNRF_InterruptLevel (0x0001) -#define SHCNRF_ShellLevel (0x0002) -#define SHCNRF_RecursiveInterrupt (0x1000) -#define SHCNRF_NewDelivery (0x8000) - - HANDLE DesktopCreateWindow(IN OUT ITrayWindow *Tray); Modified: trunk/reactos/base/shell/explorer-new/taskswnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ta… ============================================================================== --- trunk/reactos/base/shell/explorer-new/taskswnd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/taskswnd.c [iso-8859-1] Fri May 2 03:22:09 2008 @@ -1358,6 +1358,7 @@ if (This->hWndToolbar != NULL) { + HMODULE hShell32; SIZE BtnSize; /* Identify the version we're using */ @@ -1391,8 +1392,22 @@ /* Register the shell hook */ This->ShellHookMsg = RegisterWindowMessage(TEXT("SHELLHOOK")); - RegisterShellHook(This->hWnd, - 3); /* 1 if not NT! We're targeting NT so we don't care! */ + hShell32 = LoadLibrary(TEXT("SHELL32.DLL")); + if (hShell32 != NULL) + { + REGSHELLHOOK RegShellHook; + + /* RegisterShellHook */ + RegShellHook = (REGSHELLHOOK)GetProcAddress(hShell32, + (LPCSTR)((LONG)181)); + if (RegShellHook != NULL) + { + RegShellHook(This->hWnd, + 3); /* 1 if no NT! We're targeting NT so we don't care! */ + } + + FreeLibrary(hShell32); + } /* Add all windows to the toolbar */ EnumWindows(TaskSwitchWnd_EnumWindowsProc, @@ -1414,11 +1429,27 @@ static VOID TaskSwitchWnd_NCDestroy(IN OUT PTASK_SWITCH_WND This) { + HMODULE hShell32; + This->IsDestroying = TRUE; /* Unregister the shell hook */ - RegisterShellHook(This->hWnd, - FALSE); + hShell32 = LoadLibrary(TEXT("SHELL32.DLL")); + if (hShell32 != NULL) + { + REGSHELLHOOK RegShellHook; + + /* RegisterShellHook */ + RegShellHook = (REGSHELLHOOK)GetProcAddress(hShell32, + (LPCSTR)((LONG)181)); + if (RegShellHook != NULL) + { + RegShellHook(This->hWnd, + FALSE); + } + + FreeLibrary(hShell32); + } TaskSwitchWnd_DeleteAllTasks(This); } @@ -1572,6 +1603,7 @@ { HFONT hCaptionFont, hBoldCaptionFont; LRESULT Ret = CDRF_DODEFAULT; + HMODULE hUser32; #if TASK_USE_DRAWCAPTIONTEMP != 0 @@ -1627,14 +1659,31 @@ uidctFlags |= DC_ACTIVE; } - /* Draw the button content */ - TaskItem->DisplayTooltip = !DrawCaptionTemp(TaskItem->hWnd, - nmtbcd->nmcd.hdc, - &nmtbcd->nmcd.rc, - hCaptionFont, - NULL, - NULL, - uidctFlags); + hUser32 = LoadLibrary(TEXT("USER32.DLL")); + if (hUser32 != NULL) + { + DRAWCAPTEMP DrawCapTemp; + LONG ord = 187; +#ifndef UNICODE + ord = 186; +#endif + /* DrawCaptionTemp */ + DrawCapTemp = (DRAWCAPTEMP)GetProcAddress(hUser32, + (LPCSTR)ord); + if (DrawCapTemp != NULL) + { + /* Draw the button content */ + TaskItem->DisplayTooltip = !DrawCapTemp(TaskItem->hWnd, + nmtbcd->nmcd.hdc, + &nmtbcd->nmcd.rc, + hCaptionFont, + NULL, + NULL, + uidctFlags); + } + + FreeLibrary(hUser32); + } return CDRF_SKIPDEFAULT; Modified: trunk/reactos/base/shell/explorer-new/todo.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/to… ============================================================================== --- trunk/reactos/base/shell/explorer-new/todo.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/todo.h [iso-8859-1] Fri May 2 03:22:09 2008 @@ -1,11 +1,5 @@ #ifndef __TODO_H #define __TODO_H - -/* - * Stuff missing in our headers - */ - -#define SM_REMOTECONTROL 0x2001 /* FIXME: Ugly hack!!! FIX ASAP! Move to uuid! */ static const GUID IID_HACK_IShellView2 = {0x88E39E80,0x3578,0x11CF,{0xAE,0x69,0x08,0x00,0x2B,0x2E,0x12,0x62}}; @@ -46,18 +40,6 @@ #define IDeskBarClient_GetSize(T,a,b) (T)->lpVtbl->GetSize(T,a,b) #endif - -#define SHGVSPB_PERUSER 0x1 -#define SHGVSPB_PERFOLDER 0x4 -#define SHGVSPB_ROAM 0x00000020 -#define SHGVSPB_NOAUTODEFAULTS 0x80000000 -#define SHGVSPB_FOLDER (SHGVSPB_PERUSER | SHGVSPB_PERFOLDER) -#define SHGVSPB_FOLDERNODEFAULTS (SHGVSPB_PERUSER | SHGVSPB_PERFOLDER | SHGVSPB_NOAUTODEFAULTS) - - -#define DBC_SHOW 1 -#define DBC_HIDE 0 - static const GUID IID_HACK_IShellService = {0x5836FB00,0x8187,0x11CF,{0xA1,0x2B,0x00,0xAA,0x00,0x4A,0xE8,0x37}}; #define IID_IShellService IID_HACK_IShellService @@ -80,40 +62,4 @@ #define IShellService_SetOwner(T,a) (T)->lpVtbl->SetOwner(T,a) #endif -#if _MSC_VER -HRESULT WINAPI SHGetViewStatePropertyBag(LPCITEMIDLIST,LPCWSTR,DWORD,REFIID,PVOID*);/* FIXME: Parameter should be PCIDLIST_ABSOLUTE */ -#else -typedef HRESULT (WINAPI *PSHGetViewStatePropertyBag)(LPCITEMIDLIST,LPCWSTR,DWORD,REFIID,PVOID*); -static HRESULT __inline -SHGetViewStatePropertyBag(IN LPCITEMIDLIST pidl, - IN LPCWSTR pszBagName, - IN DWORD dwFlags, - IN REFIID riid, - OUT PVOID* ppv) -{ - static PSHGetViewStatePropertyBag Func = NULL; - - if (Func == NULL) - { - HMODULE hShlwapi; - hShlwapi = LoadLibrary(TEXT("SHLWAPI.DLL")); - if (hShlwapi != NULL) - { - Func = (PSHGetViewStatePropertyBag)GetProcAddress(hShlwapi, "SHGetViewStatePropertyBag"); - } - } - - if (Func != NULL) - { - return Func(pidl, pszBagName, dwFlags, riid, ppv); - } - - MessageBox(NULL, TEXT("SHGetViewStatePropertyBag not available"), NULL, 0); - return E_NOTIMPL; -} -#endif - -#define PIDLIST_ABSOLUTE LPITEMIDLIST -PIDLIST_ABSOLUTE WINAPI SHCloneSpecialIDList(HWND hwnd, int csidl, BOOL fCreate); - #endif /* __TODO_H */ Modified: trunk/reactos/base/shell/explorer-new/traywnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/tr… ============================================================================== --- trunk/reactos/base/shell/explorer-new/traywnd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/traywnd.c [iso-8859-1] Fri May 2 03:22:09 2008 @@ -1224,6 +1224,7 @@ BOOL Ret; UINT Flags; RECT rcButton; + HMODULE hUser32; /* NOTE: This is the backwards compatibility code that is used if the Common Controls Version 6.0 are not available! */ @@ -1294,13 +1295,30 @@ if (hIconStart != NULL) Flags |= DC_ICON; - Ret = DrawCaptionTemp(NULL, - hDC, - &rcButton, - This->hStartBtnFont, - hIconStart, - szStartCaption, - Flags); + hUser32 = LoadLibrary(TEXT("USER32.DLL")); + if (hUser32 != NULL) + { + DRAWCAPTEMP DrawCapTemp; + LONG ord = 187; +#ifndef UNICODE + ord = 186; +#endif + /* DrawCaptionTemp */ + DrawCapTemp = (DRAWCAPTEMP)GetProcAddress(hUser32, + (LPCSTR)ord); + if (DrawCapTemp != NULL) + { + Ret = DrawCapTemp(NULL, + hDC, + &rcButton, + This->hStartBtnFont, + hIconStart, + szStartCaption, + Flags); + } + + FreeLibrary(hUser32); + } SelectObject(hDC, hbmpOld); Modified: trunk/reactos/include/psdk/shlobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlobj.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/shlobj.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shlobj.h [iso-8859-1] Fri May 2 03:22:09 2008 @@ -441,6 +441,13 @@ STDMETHOD_(HRESULT,GetSize)(THIS_ DWORD,LPRECT) PURE; }; #undef INTERFACE + +#define DBC_GS_IDEAL 0 +#define DBC_GS_SIZEDOWN 1 + +#define DBC_HIDE 0 +#define DBC_SHOW 1 +#define DBC_SHOWOBSCURE 2 /**************************************************************************** @@ -752,6 +759,7 @@ HRESULT WINAPI SHGetDataFromIDListW(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, int nFormat, LPVOID pv, int cb); #define SHGetDataFromIDList WINELIB_NAME_AW(SHGetDataFromIDList) +PIDLIST_ABSOLUTE WINAPI SHCloneSpecialIDList(HWND hwnd, int csidl, BOOL fCreate); BOOL WINAPI SHGetSpecialFolderPathA (HWND hwndOwner, LPSTR szPath, int nFolder, BOOL bCreate); BOOL WINAPI SHGetSpecialFolderPathW (HWND hwndOwner, LPWSTR szPath, int nFolder, BOOL bCreate); #define SHGetSpecialFolderPath WINELIB_NAME_AW(SHGetSpecialFolderPath) Modified: trunk/reactos/include/psdk/shlwapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlwapi.h?rev… ============================================================================== --- trunk/reactos/include/psdk/shlwapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shlwapi.h [iso-8859-1] Fri May 2 03:22:09 2008 @@ -999,6 +999,24 @@ ((ULONGLONG)(mnr)<< 32) | ((ULONGLONG)(bld)<< 16) | (ULONGLONG)(qfe)) HRESULT WINAPI DllInstall(BOOL,LPCWSTR) DECLSPEC_HIDDEN; + + +#if (_WIN32_IE >= 0x0600) +#define SHGVSPB_PERUSER 0x00000001 +#define SHGVSPB_ALLUSERS 0x00000002 +#define SHGVSPB_PERFOLDER 0x00000004 +#define SHGVSPB_ALLFOLDERS 0x00000008 +#define SHGVSPB_INHERIT 0x00000010 +#define SHGVSPB_ROAM 0x00000020 +#define SHGVSPB_NOAUTODEFAULTS 0x80000000 + +#define SHGVSPB_FOLDER (SHGVSPB_PERUSER | SHGVSPB_PERFOLDER) +#define SHGVSPB_FOLDERNODEFAULTS (SHGVSPB_PERUSER | SHGVSPB_PERFOLDER | SHGVSPB_NOAUTODEFAULTS) +#define SHGVSPB_USERDEFAULTS (SHGVSPB_PERUSER | SHGVSPB_ALLFOLDERS) +#define SHGVSPB_GLOBALDEAFAULTS (SHGVSPB_ALLUSERS | SHGVSPB_ALLFOLDERS) + +HRESULT WINAPI SHGetViewStatePropertyBag(PCIDLIST_ABSOLUTE pidl, LPCWSTR pszBagName, DWORD dwFlags, REFIID riid, void** ppv); +#endif /* (_WIN32_IE >= 0x0600) */ /* IsOS definitions */ Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winuser.h [iso-8859-1] Fri May 2 03:22:09 2008 @@ -1004,6 +1004,7 @@ #define SM_CXFOCUSBORDER 83 #define SM_CYFOCUSBORDER 84 #define SM_SHUTTINGDOWN 0x2000 +#define SM_REMOTECONTROL 0x2001 #endif /* _WIN32_WINNT >= 0x0501 */ #define SM_REMOTESESSION 0X1000 #define ARW_BOTTOMLEFT 0

16 years, 4 months

[dchapyshev] 33231: - The division of right and the left menu - Fix formatting in translations

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Fri May 2 02:58:03 2008 New Revision: 33231 URL: http://svn.reactos.org/svn/reactos?rev=33231&view=rev Log: - The division of right and the left menu - Fix formatting in translations Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c trunk/reactos/base/applications/kbswitch/lang/cs-CZ.rc trunk/reactos/base/applications/kbswitch/lang/fr-FR.rc trunk/reactos/base/applications/kbswitch/lang/pl-PL.rc Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] Fri May 2 02:58:03 2008 @@ -272,14 +272,11 @@ } static HMENU -BuildPopupMenu() +BuildLeftPopupMenu() { HMENU hMenu; - HMENU hMenuTemplate; HKEY hKey; DWORD dwIndex, dwSize; - LPTSTR pszMenuItem; - MENUITEMINFO mii; TCHAR szLayoutNum[CCH_ULONG_DEC + 1]; TCHAR szName[MAX_PATH]; @@ -303,6 +300,21 @@ RegCloseKey(hKey); } + return hMenu; +} + +static HMENU +BuildRightPopupMenu() +{ + HMENU hMenu; + HMENU hMenuTemplate; + DWORD dwIndex; + LPTSTR pszMenuItem; + MENUITEMINFO mii; + + // Add the keyboard layouts to the popup menu + hMenu = BuildLeftPopupMenu(); + // Add the menu items from the popup menu template hMenuTemplate = GetSubMenu(LoadMenu(hInst, MAKEINTRESOURCE(IDR_POPUP)), 0); dwIndex = 0; @@ -340,26 +352,30 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) { - static HMENU hPopupMenu; + static HMENU hLeftPopupMenu, hRightPopupMenu; switch (Message) { case WM_CREATE: AddTrayIcon(hwnd); - hPopupMenu = BuildPopupMenu(hwnd); + hLeftPopupMenu = BuildLeftPopupMenu(hwnd); + hRightPopupMenu = BuildRightPopupMenu(hwnd); break; case WM_NOTIFYICONMSG: switch (lParam) { + case WM_RBUTTONDOWN: case WM_LBUTTONDOWN: - case WM_RBUTTONDOWN: { POINT pt; GetCursorPos(&pt); SetForegroundWindow(hwnd); - TrackPopupMenu(hPopupMenu, 0, pt.x, pt.y, 0, hwnd, NULL); + if (lParam == WM_LBUTTONDOWN) + TrackPopupMenu(hLeftPopupMenu, 0, pt.x, pt.y, 0, hwnd, NULL); + else + TrackPopupMenu(hRightPopupMenu, 0, pt.x, pt.y, 0, hwnd, NULL); PostMessage(hwnd, WM_NULL, 0, 0); break; } @@ -396,7 +412,8 @@ break; case WM_DESTROY: - DestroyMenu(hPopupMenu); + DestroyMenu(hLeftPopupMenu); + DestroyMenu(hRightPopupMenu); DelTrayIcon(hwnd); PostQuitMessage(0); break; Modified: trunk/reactos/base/applications/kbswitch/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/lang/cs-CZ.rc [iso-8859-1] Fri May 2 02:58:03 2008 @@ -11,6 +11,6 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Pøedvolby...", ID_PREFERENCES - MENUITEM "&Ukonèit", ID_EXIT + MENUITEM "&Ukonèit", ID_EXIT END END Modified: 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 [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/lang/fr-FR.rc [iso-8859-1] Fri May 2 02:58:03 2008 @@ -6,6 +6,6 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Préférences...", ID_PREFERENCES - MENUITEM "Quitt&er", ID_EXIT + MENUITEM "Quitt&er", ID_EXIT END END Modified: 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 [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/lang/pl-PL.rc [iso-8859-1] Fri May 2 02:58:03 2008 @@ -13,6 +13,6 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Ustawienia...", ID_PREFERENCES - MENUITEM "&Wyjcie", ID_EXIT + MENUITEM "&Wyjcie", ID_EXIT END END

16 years, 4 months

[dchapyshev] 33230: - Adding indexes to getting localized layouts names

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Fri May 2 01:45:46 2008 New Revision: 33230 URL: http://svn.reactos.org/svn/reactos?rev=33230&view=rev Log: - Adding indexes to getting localized layouts names Modified: trunk/reactos/boot/bootdata/hivesys.inf trunk/reactos/boot/bootdata/txtsetup.sif Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Fri May 2 01:45:46 2008 @@ -40,110 +40,209 @@ ; Keyboard Layouts HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00040402","Layout File",0x00000000,"kbdbgm.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00040402","Layout Text",0x00000000,"Bulgarian BDS 5237-1978" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00040402","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5136" + HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00020402","Layout File",0x00000000,"kbdbgt.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00020402","Layout Text",0x00000000,"Bulgarian phonetic classic" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00020402","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5134" + HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00030402","Layout File",0x00000000,"kbdbga.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00030402","Layout Text",0x00000000,"Bulgarian phonetic BDS 5237-2006 " +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00030402","Layout Text",0x00000000,"Bulgarian phonetic BDS 5237-2006" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00030402","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5135" + HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000406","Layout File",0x00000000,"kbdda.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000406","Layout Text",0x00000000,"Danish" -HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\a0020407","Layout File",0x00000000,"kbdgerg.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\a0020407","Layout Text",0x00000000,"German (de_ergo)" -HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\a0010407","Layout File",0x00000000,"kbdgneo.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\a0010407","Layout Text",0x00000000,"German (NEO-1.1)" -HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\a0000407","Layout File",0x00000000,"kbdgrist.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\a0000407","Layout Text",0x00000000,"German (RISTOME)" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000406","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5007" + +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00030407","Layout File",0x00000000,"kbdgerg.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00030407","Layout Text",0x00000000,"German (de_ergo)" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00030407","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5139" + +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00020407","Layout File",0x00000000,"kbdgneo.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00020407","Layout Text",0x00000000,"German (NEO-1.1)" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00020407","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5138" + +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010407","Layout File",0x00000000,"kbdgrist.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010407","Layout Text",0x00000000,"German (RISTOME)" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010407","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5137" + HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000407","Layout File",0x00000000,"kbdgr.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000407","Layout Text",0x00000000,"German" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000407","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5011" + HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000807","Layout File",0x00000000,"kbdsg.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000807","Layout Text",0x00000000,"Swiss German" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000807","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5024" + HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000408","Layout File",0x00000000,"kbdhe.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000408","Layout Text",0x00000000,"Greek" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000408","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5046" + HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000409","Layout File",0x00000000,"kbdus.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000409","Layout Text",0x00000000,"United States" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000409","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5000" + HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000809","Layout File",0x00000000,"kbduk.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000809","Layout Text",0x00000000,"United Kingdom" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000809","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5025" + HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010409","Layout File",0x00000000,"kbddv.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010409","Layout Id", 0x00000000,"0002" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010409","Layout Text",0x00000000,"US-Dvorak" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010409","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5092" + HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00020409","Layout File",0x00000000,"kbdusx.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00020409","Layout Id", 0x00000000,"0001" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00020409","Layout Text",0x00000000,"US International" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00020409","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5026" + HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00030409","Layout File",0x00000000,"kbdusl.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00030409","Layout Id", 0x00000000,"001A" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00030409","Layout Text",0x00000000,"US Dvorak for left hand" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00030409","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5027" + HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00040409","Layout File",0x00000000,"kbdusr.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00040409","Layout Id", 0x00000000,"001B" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00040409","Layout Text",0x00000000,"US Dvorak for right hand" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00040409","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5028" + HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00050409","Layout File",0x00000000,"kbdusa.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00050409","Layout Id", 0x00000000,"000B" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00050409","Layout Text",0x00000000,"US English (IBM Arabic 238_L)" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00050409","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5123" + HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000040a","Layout File",0x00000000,"kbdes.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000040a","Layout Text",0x00000000,"Spanish" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000040a","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5020" + HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000040b","Layout File",0x00000000,"kbdfi.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000040b","Layout Text",0x00000000,"Finnish" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000040b","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5009" + HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000040c","Layout File",0x00000000,"kbdfr.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000040c","Layout Text",0x00000000,"French" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000040c","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5010" + HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000040d","Layout File",0x00000000,"kbdheb.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000040d","Layout Text",0x00000000,"Hebrew" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000040d","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5083" + HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000040f","Layout File",0x00000000,"kbdic.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000040f","Layout Text",0x00000000,"Icelandic" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000040f","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5013" + HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000410","Layout File",0x00000000,"kbdit.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000410","Layout Text",0x00000000,"Italian" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000410","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5015" + HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000411","Layout File",0x00000000,"kbdja.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000411","Layout Text",0x00000000,"Japanese" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000411","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5061" + HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041c","Layout File",0x00000000,"kbdal.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041c","Layout Text",0x00000000,"Albanian" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041c","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5029" + HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000080c","Layout File",0x00000000,"kbdbe.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000080c","Layout Text",0x00000000,"Belgian (French)" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000080c","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5002" + HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000413","Layout File",0x00000000,"kbdne.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000413","Layout Text",0x00000000,"Dutch" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000413","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5008" + HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000813","Layout File",0x00000000,"kbdbe.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000813","Layout Text",0x00000000,"Belgian (Dutch)" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000813","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5001" + HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000415","Layout File",0x00000000,"kbdpl1.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000415","Layout Text",0x00000000,"Polish (programmer's)" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000415","Layout Text",0x00000000,"Polish (Programmers)" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000415","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5035" + HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000816","Layout File",0x00000000,"kbdpo.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000816","Layout Text",0x00000000,"Portuguese" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000816","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5019" + HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000418","Layout File",0x00000000,"kbdro.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000418","Layout Text",0x00000000,"Romanian" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000418","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5037" + HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000419","Layout File",0x00000000,"kbdru.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000419","Layout Text",0x00000000,"Russian" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000419","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5055" + HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010419","Layout File",0x00000000,"kbdru1.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010419","Layout Text",0x00000000,"Russian (Typewriter)" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010419","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5056" + HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041b","Layout File",0x00000000,"kbdsk.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041b","Layout Text",0x00000000,"Slovak" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041b","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5039" + HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041d","Layout File",0x00000000,"kbdsw.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041d","Layout Text",0x00000000,"Swedish" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041d","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5022" + HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041e","Layout File",0x00000000,"kbdth.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041e","Layout Text",0x00000000,"Thai" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041e","Layout Text",0x00000000,"Thai Kedmanee" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041e","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5079" + HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000422","Layout File",0x00000000,"kbdur.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000422","Layout Text",0x00000000,"Ukrainian" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000422","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5058" + HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000425","Layout File",0x00000000,"kbdest.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000425","Layout Text",0x00000000,"Estonian" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000425","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5042" + HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000426","Layout File",0x00000000,"kbdlv.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000426","Layout Text",0x00000000,"Latvian" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000426","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5043" + HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000427","Layout File",0x00000000,"kbdlt.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000427","Layout Text",0x00000000,"Lithuanian" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000427","Layout Text",0x00000000,"Lithuanian IBM" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000427","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5045" + HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000042f","Layout File",0x00000000,"kbdmac.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000042f","Layout Text",0x00000000,"Macedonian (FYRO)" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000042f","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5109" + HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000437","Layout File",0x00000000,"kbdgeo.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000437","Layout Text",0x00000000,"Georgian" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000437","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5119" + HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000444","Layout File",0x00000000,"kbdtat.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000444","Layout Text",0x00000000,"Tatar" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000444","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5116" + HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000455","Layout File",0x00000000,"kbdbur.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000455","Layout Text",0x00000000,"Burmese" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000455","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5140" + HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000414","Layout File",0x00000000,"kbdno.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000414","Layout Text",0x00000000,"Norwegian" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000414","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5018" + HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000405","Layout File",0x00000000,"kbdcz1.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000405","Layout Text",0x00000000,"Czech (QWERTY)" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000405","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5031" + HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00011009","Layout File",0x00000000,"kbdcan.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00011009","Layout Id", 0x00000000,"0020" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00011009","Layout Text",0x00000000,"Canadian Multilingual Standard" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00011009","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5110" + HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000c0c","Layout File",0x00000000,"kbdfc.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000c0c","Layout Text",0x00000000,"Canadian French (Legacy)" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000c0c","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5005" + HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000c1a","Layout File",0x00000000,"kbdycc.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000c1a","Layout Text",0x00000000,"Serbian (Cyrillic)" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000c1a","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5057" + HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000081a","Layout File",0x00000000,"kbdycl.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000081a","Layout Text",0x00000000,"Serbian (Latin)" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000081a","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5038" ; Network HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E972-E325-11CE-BFC1-08002BE10318}",,0x00000000,"Network Adapters" Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Fri May 2 01:45:46 2008 @@ -151,9 +151,9 @@ 0000040C = "French (France)" 00000437 = "Georgian" 00000407 = "German (Germany)" -A0020407 = "German (de_ergo)" -A0010407 = "German (NEO-1.1)" -A0000407 = "German (Ristome)" +00030407 = "German (de_ergo)" +00020407 = "German (NEO-1.1)" +00010407 = "German (Ristome)" 00000807 = "German (Swiss)" 00000408 = "Greek" 00010408 = "Greek 220" @@ -202,9 +202,9 @@ 0000040A = kbdes.dll 0000040B = kbdfi.dll 0000040C = kbdfr.dll -A0020407 = kbdgerg.dll -A0010407 = kbdgneo.dll -A0000407 = kbdgrist.dll +00030407 = kbdgerg.dll +00020407 = kbdgneo.dll +00010407 = kbdgrist.dll 00000407 = kbdgr.dll 00000408 = kbdhe.dll 00010408 = kbdhe.dll

16 years, 4 months

[dchapyshev] 33229: - Getting a localized layout names from input.dll

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Fri May 2 01:42:45 2008 New Revision: 33229 URL: http://svn.reactos.org/svn/reactos?rev=33229&view=rev Log: - Getting a localized layout names from input.dll Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] Fri May 2 01:42:45 2008 @@ -185,8 +185,10 @@ { HKEY hKey; DWORD dwBufLen; - TCHAR szBuf[MAX_PATH]; + TCHAR szBuf[MAX_PATH], szDispName[MAX_PATH], szIndex[MAX_PATH], szPath[MAX_PATH]; TCHAR szLCID[CCH_LAYOUT_ID + 1]; + HANDLE hLib; + int i, j, k; if(!GetLayoutID(szLayoutNum, szLCID)) return FALSE; @@ -195,18 +197,53 @@ if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, (LPCTSTR)szBuf, 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) { - dwBufLen = MAX_PATH * sizeof(TCHAR); - - if(RegQueryValueEx(hKey, _T("Layout Text"), NULL, NULL, (LPBYTE)szName, &dwBufLen) != ERROR_SUCCESS) + dwBufLen = sizeof(szBuf); + + if (RegQueryValueEx(hKey, _T("Layout Display Name"), NULL, NULL, (LPBYTE)szDispName, &dwBufLen) == ERROR_SUCCESS) + { + if (szDispName[0] == '@') + { + for (i = 0; i < _tcslen(szDispName); i++) + { + if ((szDispName[i] == ',') && (szDispName[i + 1] == '-')) + { + for (j = i + 2, k = 0; j < _tcslen(szDispName)+1; j++, k++) + { + szIndex[k] = szDispName[j]; + } + szDispName[i - 1] = '\0'; + break; + } + else szDispName[i] = szDispName[i + 1]; + } + + if (ExpandEnvironmentStrings(szDispName, szPath, MAX_PATH)) + { + hLib = LoadLibrary(szPath); + if (hLib) + { + if (LoadString(hLib, _ttoi(szIndex), szPath, sizeof(szPath) / sizeof(TCHAR)) != 0) + { + _tcscpy(szName, szPath); + RegCloseKey(hKey); + return TRUE; + } + FreeLibrary(hLib); + } + } + } + } + + dwBufLen = sizeof(szBuf); + + if (RegQueryValueEx(hKey, _T("Layout Text"), NULL, NULL, (LPBYTE)szName, &dwBufLen) == ERROR_SUCCESS) { RegCloseKey(hKey); - return FALSE; - } - - RegCloseKey(hKey); - } - - return TRUE; + return TRUE; + } + } + + return FALSE; } BOOL CALLBACK @@ -343,7 +380,7 @@ shInputDll.cbSize = sizeof(shInputDll); shInputDll.hwnd = hwnd; shInputDll.lpVerb = _T("open"); - shInputDll.lpFile = _T("RunDll32.exe"); + shInputDll.lpFile = _T("rundll32.exe"); shInputDll.lpParameters = _T("shell32.dll,Control_RunDLL input.dll"); if (!ShellExecuteEx(&shInputDll)) @@ -404,7 +441,7 @@ DispatchMessage(&msg); } - CloseHandle(hMutex); + if (hMutex) CloseHandle(hMutex); return 0; }

16 years, 4 months

[dchapyshev] 33228: - Getting a localized layout names from input.dll - Add some layouts to resources

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Fri May 2 01:41:59 2008 New Revision: 33228 URL: http://svn.reactos.org/svn/reactos?rev=33228&view=rev Log: - Getting a localized layout names from input.dll - Add some layouts to resources Modified: trunk/reactos/dll/cpl/input/add.c trunk/reactos/dll/cpl/input/input.h 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/add.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/add.c?rev=33… ============================================================================== --- trunk/reactos/dll/cpl/input/add.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/add.c [iso-8859-1] Fri May 2 01:41:59 2008 @@ -72,7 +72,7 @@ VOID CreateKeyboardLayoutList(VOID) { - HKEY hKey, hSubKey; + HKEY hKey; PTSTR pstrLayoutID; TCHAR szLayoutID[CCH_LAYOUT_ID + 1], KeyName[MAX_PATH]; DWORD dwIndex = 0; @@ -84,31 +84,21 @@ while (RegEnumKeyEx(hKey, dwIndex, szLayoutID, &dwSize, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) { - wsprintf(KeyName, _T("System\\CurrentControlSet\\Control\\Keyboard Layouts\\%s"), szLayoutID); + GetLayoutName(szLayoutID, KeyName); - if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, KeyName, 0, KEY_QUERY_VALUE, &hSubKey) == ERROR_SUCCESS) + INT iIndex = (INT) SendMessage(hLayoutList, CB_ADDSTRING, 0, (LPARAM)KeyName); + + pstrLayoutID = (PTSTR)HeapAlloc(hProcessHeap, 0, sizeof(szLayoutID)); + lstrcpy(pstrLayoutID, szLayoutID); + SendMessage(hLayoutList, CB_SETITEMDATA, iIndex, (LPARAM)pstrLayoutID); + + // FIXME! + if (_tcscmp(szLayoutID, _T("00000409")) == 0) { - DWORD dwKeyNameSize = sizeof(KeyName); + SendMessage(hLayoutList, CB_SETCURSEL, (WPARAM)iIndex, (LPARAM)0); + } - if (RegQueryValueEx(hSubKey, _T("Layout Text"), NULL, NULL, (LPBYTE)KeyName, &dwKeyNameSize) == ERROR_SUCCESS) - { - INT iIndex = (INT) SendMessage(hLayoutList, CB_ADDSTRING, 0, (LPARAM)KeyName); - - pstrLayoutID = (PTSTR)HeapAlloc(hProcessHeap, 0, sizeof(szLayoutID)); - lstrcpy(pstrLayoutID, szLayoutID); - SendMessage(hLayoutList, CB_SETITEMDATA, iIndex, (LPARAM)pstrLayoutID); - - // FIXME! - if (_tcscmp(szLayoutID, _T("00000409")) == 0) - { - SendMessage(hLayoutList, CB_SETCURSEL, (WPARAM)iIndex, (LPARAM)0); - } - - dwIndex++; - } - - RegCloseKey(hSubKey); - } + dwIndex++; dwSize = sizeof(szLayoutID) / sizeof(TCHAR); } Modified: trunk/reactos/dll/cpl/input/input.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/input.h?rev=… ============================================================================== --- trunk/reactos/dll/cpl/input/input.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/input.h [iso-8859-1] Fri May 2 01:41:59 2008 @@ -38,7 +38,7 @@ INT_PTR CALLBACK SettingPageProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam); BOOL -GetLayoutName(LPCTSTR lcid, LPTSTR name); +GetLayoutName(LPCTSTR szLCID, LPTSTR szName); VOID UpdateLayoutsList(VOID); 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] Fri May 2 01:41:59 2008 @@ -223,4 +223,9 @@ IDS_DIVEHI_TYPEWRITER_LAYOUT, "Äõèâåõñêà ìàëòèéñêà" IDS_BULGARIAN_PHONETIC_CLASSIC_LAYOUT, "Áúëãàðñêà ßÂÅÐÒÚ" IDS_BULGARIAN_PHONETIC_BDS_LAYOUT, "Áúëãàðñêà ×ØÅÐÒÚ" -END + IDS_BULGARIAN_BDS_LAYOUT, "Bulgarian BDS 5237-1978" + IDS_GERMAN_RISTOME_LAYOUT, "German (RISTOME)" + IDS_GERMAN_NEO_11_LAYOUT, "German (NEO-1.1)" + IDS_GERMAN_DE_ERGO_LAYOUT, "German (de_ergo)" + IDS_BURMESE_LAYOUT, "Burmese" +END 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] Fri May 2 01:41:59 2008 @@ -224,4 +224,9 @@ IDS_DIVEHI_TYPEWRITER_LAYOUT, "Divehi (Schreibmaschine)" IDS_BULGARIAN_PHONETIC_CLASSIC_LAYOUT, "Bulgarian Phonetic (Classic)" IDS_BULGARIAN_PHONETIC_BDS_LAYOUT, "Bulgarian Phonetic (BDS)" -END + IDS_BULGARIAN_BDS_LAYOUT, "Bulgarian BDS 5237-1978" + IDS_GERMAN_RISTOME_LAYOUT, "German (RISTOME)" + IDS_GERMAN_NEO_11_LAYOUT, "German (NEO-1.1)" + IDS_GERMAN_DE_ERGO_LAYOUT, "German (de_ergo)" + IDS_BURMESE_LAYOUT, "Burmese" +END 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] Fri May 2 01:41:59 2008 @@ -223,4 +223,9 @@ IDS_DIVEHI_TYPEWRITER_LAYOUT, "Divehi Typewriter" IDS_BULGARIAN_PHONETIC_CLASSIC_LAYOUT, "Bulgarian Phonetic (Classic)" IDS_BULGARIAN_PHONETIC_BDS_LAYOUT, "Bulgarian Phonetic (BDS)" -END + IDS_BULGARIAN_BDS_LAYOUT, "Bulgarian BDS 5237-1978" + IDS_GERMAN_RISTOME_LAYOUT, "German (RISTOME)" + IDS_GERMAN_NEO_11_LAYOUT, "German (NEO-1.1)" + IDS_GERMAN_DE_ERGO_LAYOUT, "German (de_ergo)" + IDS_BURMESE_LAYOUT, "Burmese" +END 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] Fri May 2 01:41:59 2008 @@ -222,5 +222,10 @@ IDS_DIVEHI_PHONETIC_LAYOUT, "Divehi Phonetic" IDS_DIVEHI_TYPEWRITER_LAYOUT, "Divehi Typewriter" IDS_BULGARIAN_PHONETIC_CLASSIC_LAYOUT, "Bulgarian Phonetic (Classic)" - IDS_BULGARIAN_PHONETIC_BDS_LAYOUT, "Bulgarian Phonetic (BDS)" -END + IDS_BULGARIAN_PHONETIC_BDS_LAYOUT, "Bulgarian Phonetic (BDS 5237-1978)" + IDS_BULGARIAN_BDS_LAYOUT, "Bulgarian BDS 5237-1978" + IDS_GERMAN_RISTOME_LAYOUT, "German (RISTOME)" + IDS_GERMAN_NEO_11_LAYOUT, "German (NEO-1.1)" + IDS_GERMAN_DE_ERGO_LAYOUT, "German (de_ergo)" + IDS_BURMESE_LAYOUT, "Burmese" +END 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] Fri May 2 01:41:59 2008 @@ -228,4 +228,9 @@ IDS_DIVEHI_TYPEWRITER_LAYOUT, "Divehi Typewriter" IDS_BULGARIAN_PHONETIC_CLASSIC_LAYOUT, "Búlgaro Fonético (Classic)" IDS_BULGARIAN_PHONETIC_BDS_LAYOUT, "Búlgaro Fonético (BDS)" -END + IDS_BULGARIAN_BDS_LAYOUT, "Bulgarian BDS 5237-1978" + IDS_GERMAN_RISTOME_LAYOUT, "German (RISTOME)" + IDS_GERMAN_NEO_11_LAYOUT, "German (NEO-1.1)" + IDS_GERMAN_DE_ERGO_LAYOUT, "German (de_ergo)" + IDS_BURMESE_LAYOUT, "Burmese" +END 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] Fri May 2 01:41:59 2008 @@ -225,4 +225,9 @@ IDS_DIVEHI_TYPEWRITER_LAYOUT, "Divehi Typewriter" IDS_BULGARIAN_PHONETIC_CLASSIC_LAYOUT, "Bulgarian Phonetic (Classic)" IDS_BULGARIAN_PHONETIC_BDS_LAYOUT, "Bulgarian Phonetic (BDS)" -END + IDS_BULGARIAN_BDS_LAYOUT, "Bulgarian BDS 5237-1978" + IDS_GERMAN_RISTOME_LAYOUT, "German (RISTOME)" + IDS_GERMAN_NEO_11_LAYOUT, "German (NEO-1.1)" + IDS_GERMAN_DE_ERGO_LAYOUT, "German (de_ergo)" + IDS_BURMESE_LAYOUT, "Burmese" +END 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] Fri May 2 01:41:59 2008 @@ -223,4 +223,9 @@ IDS_DIVEHI_TYPEWRITER_LAYOUT, "Divehi Typewriter" IDS_BULGARIAN_PHONETIC_CLASSIC_LAYOUT, "Bulgarian Phonetic (Classic)" IDS_BULGARIAN_PHONETIC_BDS_LAYOUT, "Bulgarian Phonetic (BDS)" -END + IDS_BULGARIAN_BDS_LAYOUT, "Bulgarian BDS 5237-1978" + IDS_GERMAN_RISTOME_LAYOUT, "German (RISTOME)" + IDS_GERMAN_NEO_11_LAYOUT, "German (NEO-1.1)" + IDS_GERMAN_DE_ERGO_LAYOUT, "German (de_ergo)" + IDS_BURMESE_LAYOUT, "Burmese" +END 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] Fri May 2 01:41:59 2008 @@ -230,4 +230,9 @@ IDS_DIVEHI_TYPEWRITER_LAYOUT, "Malediwski (Maszynisty)" IDS_BULGARIAN_PHONETIC_CLASSIC_LAYOUT, "Bu³garski (Fonetyczny)" IDS_BULGARIAN_PHONETIC_BDS_LAYOUT, "Bu³garski (Fonetyczny, BDS)" -END + IDS_BULGARIAN_BDS_LAYOUT, "Bulgarian BDS 5237-1978" + IDS_GERMAN_RISTOME_LAYOUT, "German (RISTOME)" + IDS_GERMAN_NEO_11_LAYOUT, "German (NEO-1.1)" + IDS_GERMAN_DE_ERGO_LAYOUT, "German (de_ergo)" + IDS_BURMESE_LAYOUT, "Burmese" +END 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] Fri May 2 01:41:59 2008 @@ -223,4 +223,9 @@ IDS_DIVEHI_TYPEWRITER_LAYOUT, "Äèâèõàé ìàøèíîïèñü" IDS_BULGARIAN_PHONETIC_CLASSIC_LAYOUT, "Áîëãàðñêàÿ ôîíåòè÷åñêàÿ (êëàññè÷åñêàÿ)" IDS_BULGARIAN_PHONETIC_BDS_LAYOUT, "Áîëãàðñêàÿ ôîíåòè÷åñêàÿ (BDS)" -END + IDS_BULGARIAN_BDS_LAYOUT, "Áîëãàðñêàÿ (BDS 5237-1978)" + IDS_GERMAN_RISTOME_LAYOUT, "German (RISTOME)" + IDS_GERMAN_NEO_11_LAYOUT, "German (NEO-1.1)" + IDS_GERMAN_DE_ERGO_LAYOUT, "German (de_ergo)" + IDS_BURMESE_LAYOUT, "Burmese" +END 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] Fri May 2 01:41:59 2008 @@ -227,4 +227,9 @@ IDS_DIVEHI_TYPEWRITER_LAYOUT, "Divehi Typewriter" IDS_BULGARIAN_PHONETIC_CLASSIC_LAYOUT, "Bulgarian Phonetic (Classic)" IDS_BULGARIAN_PHONETIC_BDS_LAYOUT, "Bulgarian Phonetic (BDS)" -END + IDS_BULGARIAN_BDS_LAYOUT, "Bulgarian BDS 5237-1978" + IDS_GERMAN_RISTOME_LAYOUT, "German (RISTOME)" + IDS_GERMAN_NEO_11_LAYOUT, "German (NEO-1.1)" + IDS_GERMAN_DE_ERGO_LAYOUT, "German (de_ergo)" + IDS_BURMESE_LAYOUT, "Burmese" +END 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] Fri May 2 01:41:59 2008 @@ -232,4 +232,9 @@ IDS_DIVEHI_TYPEWRITER_LAYOUT, "Ìàëüä³âñüêà (äðóêàðñüêà ìàøèíêà)" IDS_BULGARIAN_PHONETIC_CLASSIC_LAYOUT, "Áîëãàðñüêà ôîíåòè÷íà (êëàñè÷íà)" IDS_BULGARIAN_PHONETIC_BDS_LAYOUT, "Áîëãàðñüêà ôîíåòè÷íà (BDS)" -END + IDS_BULGARIAN_BDS_LAYOUT, "Bulgarian BDS 5237-1978" + IDS_GERMAN_RISTOME_LAYOUT, "German (RISTOME)" + IDS_GERMAN_NEO_11_LAYOUT, "German (NEO-1.1)" + IDS_GERMAN_DE_ERGO_LAYOUT, "German (de_ergo)" + IDS_BURMESE_LAYOUT, "Burmese" +END 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] Fri May 2 01:41:59 2008 @@ -185,6 +185,11 @@ #define IDS_DIVEHI_TYPEWRITER_LAYOUT 5133 #define IDS_BULGARIAN_PHONETIC_CLASSIC_LAYOUT 5134 #define IDS_BULGARIAN_PHONETIC_BDS_LAYOUT 5135 +#define IDS_BULGARIAN_BDS_LAYOUT 5136 +#define IDS_GERMAN_RISTOME_LAYOUT 5137 +#define IDS_GERMAN_NEO_11_LAYOUT 5138 +#define IDS_GERMAN_DE_ERGO_LAYOUT 5139 +#define IDS_BURMESE_LAYOUT 5140 #endif /* __CPL_RESOURCE_H */ 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] Fri May 2 01:41:59 2008 @@ -86,19 +86,58 @@ } BOOL -GetLayoutName(LPCTSTR lcid, LPTSTR name) +GetLayoutName(LPCTSTR szLCID, LPTSTR szName) { HKEY hKey; DWORD dwBufLen; - TCHAR szBuf[MAX_PATH]; - - wsprintf(szBuf, _T("SYSTEM\\CurrentControlSet\\Control\\Keyboard Layouts\\%s"), lcid); + TCHAR szBuf[MAX_PATH], szDispName[MAX_PATH], szIndex[MAX_PATH], szPath[MAX_PATH]; + HANDLE hLib; + int i, j, k; + + wsprintf(szBuf, _T("SYSTEM\\CurrentControlSet\\Control\\Keyboard Layouts\\%s"), szLCID); if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, (LPCTSTR)szBuf, 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) { dwBufLen = sizeof(szBuf); - if (RegQueryValueEx(hKey, _T("Layout Text"), NULL, NULL, (LPBYTE)name, &dwBufLen) == ERROR_SUCCESS) + if (RegQueryValueEx(hKey, _T("Layout Display Name"), NULL, NULL, (LPBYTE)szDispName, &dwBufLen) == ERROR_SUCCESS) + { + if (szDispName[0] == '@') + { + for (i = 0; i < _tcslen(szDispName); i++) + { + if ((szDispName[i] == ',') && (szDispName[i + 1] == '-')) + { + for (j = i + 2, k = 0; j < _tcslen(szDispName)+1; j++, k++) + { + szIndex[k] = szDispName[j]; + } + szDispName[i - 1] = '\0'; + break; + } + else szDispName[i] = szDispName[i + 1]; + } + + if (ExpandEnvironmentStrings(szDispName, szPath, MAX_PATH)) + { + hLib = LoadLibrary(szPath); + if (hLib) + { + if (LoadString(hLib, _ttoi(szIndex), szPath, sizeof(szPath) / sizeof(TCHAR)) != 0) + { + _tcscpy(szName, szPath); + RegCloseKey(hKey); + return TRUE; + } + FreeLibrary(hLib); + } + } + } + } + + dwBufLen = sizeof(szBuf); + + if (RegQueryValueEx(hKey, _T("Layout Text"), NULL, NULL, (LPBYTE)szName, &dwBufLen) == ERROR_SUCCESS) { RegCloseKey(hKey); return TRUE;

16 years, 4 months

[greatlrd] 33227: Fixed some struct member positions in EDD_DIRECTDRAW_GLOBAL

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Fri May 2 00:45:29 2008 New Revision: 33227 URL: http://svn.reactos.org/svn/reactos?rev=33227&view=rev Log: Fixed some struct member positions in EDD_DIRECTDRAW_GLOBAL Modified: trunk/reactos/include/reactos/drivers/directx/directxint.h trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c 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] Fri May 2 00:45:29 2008 @@ -143,16 +143,16 @@ /* 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 +/* 0x2C4 */ DD_SURFACECALLBACKS ddSurfaceCallbacks; // 0x2C4 <-- verified to match Windows XP, ddSurfaceCallbacks /* 0x300 */ DD_PALETTECALLBACKS ddPaletteCallbacks; // 0x300 <-- verified to match Windows XP, ddPaletteCallbacks /* 0x314 */ ULONG unk_314[46]; /* 0x3D4 */ D3DNTHAL_CALLBACKS d3dNtHalCallbacks; -/* 0x460 */ ULONG unk_460[7]; +/* 0x460 */ ULONG unk_460[9]; /* 0x47C */ D3DNTHAL_CALLBACKS2 d3dNtHalCallbacks2; /* 0x498 */ DD_VIDEOPORTCALLBACKS ddVideoPortCallback; // 0x498 <-- verified to match Windows XP, ddVideoPortCallback /* 0x4E0 */ DD_MISCELLANEOUSCALLBACKS ddMiscellanousCallbacks; // 0x4E0 <-- verified to match Windows XP, ddMiscellanousCallbacks /* 0x4EC */ DD_MISCELLANEOUS2CALLBACKS ddMiscellanous2Callbacks; // 0x4EC <-- verified to match Windows XP, ddMiscellanous2Callbacks -/* 0x504 */ ULONG unk_504[12]; +/* 0x504 */ ULONG unk_504[10]; /* 0x534 */ D3DNTHAL_CALLBACKS3 d3dNtHalCallbacks3; /* 0x5A4 */ ULONG unk_544; /* 0x5A8 */ ULONG unk_548; Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] Fri May 2 00:45:29 2008 @@ -811,6 +811,8 @@ DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_460[4] : 0x%08lx\n",(((DWORD)&pEddgbl->unk_460[4]) - (DWORD)pEddgbl),pEddgbl->unk_460[4]); DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_460[5] : 0x%08lx\n",(((DWORD)&pEddgbl->unk_460[5]) - (DWORD)pEddgbl),pEddgbl->unk_460[5]); DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_460[6] : 0x%08lx\n",(((DWORD)&pEddgbl->unk_460[6]) - (DWORD)pEddgbl),pEddgbl->unk_460[6]); + DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_460[7] : 0x%08lx\n",(((DWORD)&pEddgbl->unk_460[6]) - (DWORD)pEddgbl),pEddgbl->unk_460[7]); + DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_460[8] : 0x%08lx\n",(((DWORD)&pEddgbl->unk_460[6]) - (DWORD)pEddgbl),pEddgbl->unk_460[8]); // D3DNTHAL_CALLBACKS2 d3dNtHalCallbacks2; DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->d3dNtHalCallbacks2 : 0x%08lx\n",(((DWORD)&pEddgbl->d3dNtHalCallbacks2) - (DWORD)pEddgbl),pEddgbl->d3dNtHalCallbacks2); @@ -854,9 +856,7 @@ DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_504[7] : 0x%08lx\n",(((DWORD)&pEddgbl->unk_504[7]) - (DWORD)pEddgbl),pEddgbl->unk_504[7]); DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_504[8] : 0x%08lx\n",(((DWORD)&pEddgbl->unk_504[8]) - (DWORD)pEddgbl),pEddgbl->unk_504[8]); DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_504[9] : 0x%08lx\n",(((DWORD)&pEddgbl->unk_504[9]) - (DWORD)pEddgbl),pEddgbl->unk_504[9]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_504[10] : 0x%08lx\n",(((DWORD)&pEddgbl->unk_504[10]) - (DWORD)pEddgbl),pEddgbl->unk_504[10]); - DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_504[11] : 0x%08lx\n",(((DWORD)&pEddgbl->unk_504[11]) - (DWORD)pEddgbl),pEddgbl->unk_504[11]); - + // D3DNTHAL_CALLBACKS3 d3dNtHalCallbacks3; DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->d3dNtHalCallbacks3 : 0x%08lx\n",(((DWORD)&pEddgbl->d3dNtHalCallbacks3) - (DWORD)pEddgbl),pEddgbl->d3dNtHalCallbacks3); DPRINT1("0x%08lx ????? PEDD_DIRECTDRAW_GLOBAL->unk_544 : 0x%08lx\n",(((DWORD)&pEddgbl->unk_544) - (DWORD)pEddgbl), pEddgbl->unk_544);

16 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2008