Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 39420: - Fix returned length for RGetServiceKeyNameW - Perform parameters check in right order in ROpenServiceW
by janderwald＠svn.reactos.org 05 Feb '09

05 Feb '09

Author: janderwald Date: Thu Feb 5 14:18:11 2009 New Revision: 39420 URL: http://svn.reactos.org/svn/reactos?rev=39420&view=rev Log: - Fix returned length for RGetServiceKeyNameW - Perform parameters check in right order in ROpenServiceW Modified: trunk/reactos/base/system/services/rpcserver.c Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Thu Feb 5 14:18:11 2009 @@ -2445,18 +2445,18 @@ if (ScmShutdown) return ERROR_SHUTDOWN_IN_PROGRESS; + hManager = (PMANAGER_HANDLE)hSCManager; + if (!hManager || hManager->Handle.Tag != MANAGER_TAG) + { + DPRINT1("Invalid manager handle!\n"); + return ERROR_INVALID_HANDLE; + } + if (!lpServiceHandle) return ERROR_INVALID_PARAMETER; if (!lpServiceName) return ERROR_INVALID_ADDRESS; - - hManager = (PMANAGER_HANDLE)hSCManager; - if (!hManager || hManager->Handle.Tag != MANAGER_TAG) - { - DPRINT1("Invalid manager handle!\n"); - return ERROR_INVALID_HANDLE; - } /* FIXME: Lock the service list */ @@ -2872,7 +2872,7 @@ dwError = (*lpcchBuffer > dwLength) ? ERROR_SUCCESS : ERROR_INSUFFICIENT_BUFFER; - *lpcchBuffer = dwLength * 2; + *lpcchBuffer = dwLength; return dwError; }

1 0

[janderwald] 39419: - Add more error checks which reduce winetest errors
by janderwald＠svn.reactos.org 05 Feb '09

05 Feb '09

Author: janderwald Date: Thu Feb 5 13:13:35 2009 New Revision: 39419 URL: http://svn.reactos.org/svn/reactos?rev=39419&view=rev Log: - Add more error checks which reduce winetest errors Modified: trunk/reactos/dll/win32/advapi32/service/scm.c Modified: trunk/reactos/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] Thu Feb 5 13:13:35 2009 @@ -1025,6 +1025,48 @@ TRACE("EnumServicesStatusA() called\n"); + if (!hSCManager) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + if (dwServiceType != SERVICE_DRIVER && dwServiceType != SERVICE_WIN32) + { + if (pcbBytesNeeded && lpServicesReturned) + { + *pcbBytesNeeded = 0; + *lpServicesReturned = 0; + } + + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (dwServiceState != SERVICE_ACTIVE && dwServiceState != SERVICE_INACTIVE && dwServiceState != SERVICE_STATE_ALL) + { + if (pcbBytesNeeded) + *pcbBytesNeeded = 0; + + if (lpServicesReturned) + *lpServicesReturned = 0; + + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (!pcbBytesNeeded || !lpServicesReturned || !lpResumeHandle) + { + SetLastError(ERROR_INVALID_ADDRESS); + return FALSE; + } + + if (!lpServices && cbBufSize != 0) + { + SetLastError(ERROR_INVALID_ADDRESS); + return FALSE; + } + RpcTryExcept { dwError = REnumServicesStatusA((SC_RPC_HANDLE)hSCManager, @@ -1407,7 +1449,9 @@ if (!lpDisplayName) { SetLastError(ERROR_INVALID_ADDRESS); - *lpcchBuffer = 1; + + if (!lpServiceName) + *lpcchBuffer = 1; return FALSE; } @@ -2295,6 +2339,12 @@ TRACE("QueryServiceStatus(%p, %p)\n", hService, lpServiceStatus); + if (!hService) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + RpcTryExcept { /* Call to services.exe using RPC */ @@ -2333,6 +2383,12 @@ DWORD dwError; TRACE("QueryServiceStatusEx() called\n"); + + if (InfoLevel != SC_STATUS_PROCESS_INFO) + { + SetLastError(ERROR_INVALID_LEVEL); + return FALSE; + } RpcTryExcept {

1 0

[tkreuzer] 39416: rbuild: improve r37786 a bit - Link to libgcc_eh for C++ apps.
by tkreuzer＠svn.reactos.org 05 Feb '09

05 Feb '09

Author: tkreuzer Date: Thu Feb 5 12:37:48 2009 New Revision: 39416 URL: http://svn.reactos.org/svn/reactos?rev=39416&view=rev Log: rbuild: improve r37786 a bit - Link to libgcc_eh for C++ apps. Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Thu Feb 5 12:37:48 2009 @@ -545,9 +545,10 @@ fprintf ( fMakefile, "PROJECT_LFLAGS := '$(shell ${TARGET_CC} -print-libgcc-file-name)' %s\n", GenerateProjectLFLAGS ().c_str () ); fprintf ( fMakefile, "PROJECT_LPPFLAGS := '$(shell ${TARGET_CPP} -print-file-name=libstdc++.a)' '$(shell ${TARGET_CPP} -print-file-name=libgcc.a)' '$(shell ${TARGET_CPP} -print-file-name=libmingw32.a)' '$(shell ${TARGET_CPP} -print-file-name=libmingwex.a)'\n" ); /* hack to get libgcc_eh.a, should check mingw version or something */ - fprintf ( fMakefile, "ifeq ($(ARCH),amd64)\n" ); - fprintf ( fMakefile, "PROJECT_LPPFLAGS += '$(shell ${TARGET_CPP} -print-file-name=libgcc_eh.a)'\n" ); - fprintf ( fMakefile, "endif\n" ); + if (Environment::GetArch() == "amd64") + { + fprintf ( fMakefile, "PROJECT_LPPFLAGS += '$(shell ${TARGET_CPP} -print-file-name=libgcc_eh.a)'\n" ); + } fprintf ( fMakefile, "PROJECT_GCCOPTIONS += -Wall\n" ); fprintf ( fMakefile, "ifneq ($(OARCH),)\n" ); fprintf ( fMakefile, "PROJECT_GCCOPTIONS += -march=$(OARCH)\n" );

1 0

[tkreuzer] 39415: rbuild: implement MingwModuleHandler::GetDebugFormat(), returning "dwarf-2" on amd64, "stabs+" in all other cases so far.
by tkreuzer＠svn.reactos.org 05 Feb '09

05 Feb '09

Author: tkreuzer Date: Thu Feb 5 12:29:24 2009 New Revision: 39415 URL: http://svn.reactos.org/svn/reactos?rev=39415&view=rev Log: rbuild: implement MingwModuleHandler::GetDebugFormat(), returning "dwarf-2" on amd64, "stabs+" in all other cases so far. Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.h Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Thu Feb 5 12:29:24 2009 @@ -31,12 +31,6 @@ #define CLEAN_FILE(f) clean_files.push_back ( (f).name.length () > 0 ? backend->GetFullName ( f ) : backend->GetFullPath ( f ) ); #define IsStaticLibrary( module ) ( ( module.type == StaticLibrary ) || ( module.type == HostStaticLibrary ) ) - -#if (ARCH == amd64) -#define DEBUG_FORMAT " -gdwarf-2" -#else -#define DEBUG_FORMAT " -gstabs+" -#endif MingwBackend* MingwModuleHandler::backend = NULL; @@ -1881,6 +1875,16 @@ } string +MingwModuleHandler::GetDebugFormat () const +{ + if (Environment::GetArch() == "amd64") + { + return "dwarf-2"; + } + return "stabs+"; +} + +string MingwModuleHandler::GetModuleTargets ( const Module& module ) { if ( ReferenceObjects ( module ) ) @@ -2037,7 +2041,7 @@ } else globalCflags += " -Wall -Wpointer-arith"; - globalCflags += DEBUG_FORMAT; + globalCflags += " -g" + MingwModuleHandler::GetDebugFormat (); if ( backend->usePipe ) globalCflags += " -pipe"; if ( !module.allowWarnings ) @@ -3687,6 +3691,7 @@ string objectsMacro = GetObjectsMacro ( module ); string linkDepsMacro = GetLinkingDependenciesMacro (); string libsMacro = GetLibsMacro (); + string debugFormat = GetDebugFormat (); GenerateRules (); @@ -3700,11 +3705,11 @@ fprintf ( fMakefile, "\t$(ECHO_BOOTPROG)\n" ); - fprintf ( fMakefile, "\t${gcc} $(%s_LINKFORMAT) %s %s %s -o %s\n", + fprintf ( fMakefile, "\t${gcc} $(%s_LINKFORMAT) %s %s -g%s -o %s\n", module.buildtype.c_str(), objectsMacro.c_str(), libsMacro.c_str(), - DEBUG_FORMAT, + debugFormat.c_str(), targetMacro.c_str () ); delete target_file; Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.h [iso-8859-1] Thu Feb 5 12:29:24 2009 @@ -102,6 +102,7 @@ std::string GetLinkingDependenciesMacro () const; std::string GetLibsMacro () const; std::string GetLinkerMacro () const; + std::string GetDebugFormat () const; void GenerateCleanObjectsAsYouGoCode () const; void GenerateRunRsymCode () const; void GenerateRunStripCode () const;

1 0

[janderwald] 39413: - Improve error checking
by janderwald＠svn.reactos.org 05 Feb '09

05 Feb '09

Author: janderwald Date: Thu Feb 5 11:22:59 2009 New Revision: 39413 URL: http://svn.reactos.org/svn/reactos?rev=39413&view=rev Log: - Improve error checking Modified: trunk/reactos/dll/win32/advapi32/service/scm.c Modified: trunk/reactos/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] Thu Feb 5 11:22:59 2009 @@ -601,6 +601,12 @@ DWORD dwLength; int len; LPSTR lpStr; + + if (!hSCManager) + { + SetLastError(ERROR_INVALID_HANDLE); + return NULL; + } if (lpServiceName) { @@ -1299,6 +1305,12 @@ TRACE("%p %s %p %p\n", hSCManager, debugstr_a(lpServiceName), lpDisplayName, lpcchBuffer); + if (!hSCManager) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (!lpDisplayName) *lpcchBuffer = 0; @@ -1385,6 +1397,19 @@ DWORD dwError; TRACE("GetServiceKeyNameA() called\n"); + + if (!hSCManager) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + if (!lpDisplayName) + { + SetLastError(ERROR_INVALID_ADDRESS); + *lpcchBuffer = 1; + return FALSE; + } if (!lpServiceName) *lpcchBuffer = 0; @@ -1639,6 +1664,12 @@ TRACE("OpenServiceA(%p, %s, %lx)\n", hSCManager, lpServiceName, dwDesiredAccess); + if (!hSCManager) + { + SetLastError(ERROR_INVALID_HANDLE); + return NULL; + } + RpcTryExcept { /* Call to services.exe using RPC */

1 0

[janderwald] 39412: - Make sure "Open" verb is always inserted first - Apply item style to current item not to next - bug 4065
by janderwald＠svn.reactos.org 05 Feb '09

05 Feb '09

Author: janderwald Date: Thu Feb 5 09:15:24 2009 New Revision: 39412 URL: http://svn.reactos.org/svn/reactos?rev=39412&view=rev Log: - Make sure "Open" verb is always inserted first - Apply item style to current item not to next - bug 4065 Modified: trunk/reactos/dll/win32/shell32/shv_def_cmenu.c Modified: trunk/reactos/dll/win32/shell32/shv_def_cmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_def_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_def_cmenu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shv_def_cmenu.c [iso-8859-1] Thu Feb 5 09:15:24 2009 @@ -167,6 +167,16 @@ if (curEntry->szClass) wcscpy(curEntry->szClass, szClass); } + + if (!wcsicmp(szVerb, L"open")) + { + /* open verb is always inserted in front */ + curEntry->Next = This->shead; + This->shead = curEntry; + return; + } + + if (lastEntry) { @@ -621,7 +631,7 @@ mii.cbSize = sizeof(mii); mii.fMask = MIIM_ID | MIIM_TYPE | MIIM_STATE | MIIM_DATA; mii.fType = MFT_STRING; - mii.fState = MFS_ENABLED | MFS_DEFAULT; + mii.fState = MFS_ENABLED; mii.wID = 0x4000; This->iIdSCMFirst = mii.wID; @@ -684,8 +694,9 @@ } mii.cch = wcslen(mii.dwTypeData); + mii.fState = fState; InsertMenuItemW(hMenu, indexMenu++, TRUE, &mii); - mii.fState = fState; + mii.wID++; curEntry = curEntry->Next; }

1 0

[cwittich] 39411: hackfix some services stuff
by cwittich＠svn.reactos.org 05 Feb '09

05 Feb '09

Author: cwittich Date: Thu Feb 5 09:08:51 2009 New Revision: 39411 URL: http://svn.reactos.org/svn/reactos?rev=39411&view=rev Log: hackfix some services stuff Modified: trunk/reactos/base/system/services/rpcserver.c Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Thu Feb 5 09:08:51 2009 @@ -745,6 +745,9 @@ DWORD dwBytesNeeded; DWORD dwError; + + SECURITY_DESCRIPTOR ObjectDescriptor; + DPRINT("RQueryServiceObjectSecurity() called\n"); hSvc = (PSERVICE_HANDLE)hService; @@ -778,7 +781,10 @@ /* FIXME: Lock the service list */ - Status = RtlQuerySecurityObject(lpService->lpSecurityDescriptor, + /* hack */ + Status = RtlCreateSecurityDescriptor(&ObjectDescriptor, SECURITY_DESCRIPTOR_REVISION); + + Status = RtlQuerySecurityObject(&ObjectDescriptor /* lpService->lpSecurityDescriptor */, dwSecurityInformation, (PSECURITY_DESCRIPTOR)lpSecurityDescriptor, cbBufSize, @@ -819,9 +825,9 @@ PSERVICE_HANDLE hSvc; PSERVICE lpService; ULONG DesiredAccess = 0; - HANDLE hToken = NULL; + /* HANDLE hToken = NULL; */ HKEY hServiceKey; - NTSTATUS Status; + /* NTSTATUS Status; */ DWORD dwError; DPRINT1("RSetServiceObjectSecurity() called\n"); @@ -875,6 +881,7 @@ if (lpService->bDeleted) return ERROR_SERVICE_MARKED_FOR_DELETE; +#if 0 RpcImpersonateClient(NULL); Status = NtOpenThreadToken(NtCurrentThread(), @@ -882,13 +889,12 @@ TRUE, &hToken); if (!NT_SUCCESS(Status)) - return RtlNtStatusToDosError(Status); + return RtlNtStatusToDosError(Status); RpcRevertToSelf(); /* FIXME: Lock service database */ -#if 0 Status = RtlSetSecurityObject(dwSecurityInformation, (PSECURITY_DESCRIPTOR)lpSecurityDescriptor, &lpService->lpSecurityDescriptor, @@ -917,8 +923,10 @@ Done: +#if 0 if (hToken != NULL) NtClose(hToken); +#endif /* FIXME: Unlock service database */

1 0

[dchapyshev] 39410: - Add some defines to winnt.h - Partially implement RegSaveKeyExW
by dchapyshev＠svn.reactos.org 05 Feb '09

05 Feb '09

Author: dchapyshev Date: Thu Feb 5 08:18:20 2009 New Revision: 39410 URL: http://svn.reactos.org/svn/reactos?rev=39410&view=rev Log: - Add some defines to winnt.h - Partially implement RegSaveKeyExW Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] Thu Feb 5 08:18:20 2009 @@ -4732,8 +4732,21 @@ LPSECURITY_ATTRIBUTES lpSecurityAttributes, DWORD Flags) { - FIXME("RegSaveKeyExW() not implemented!\n"); - return ERROR_INVALID_PARAMETER; + switch (Flags) + { + case REG_STANDARD_FORMAT: + case REG_LATEST_FORMAT: + case REG_NO_COMPRESSION: + break; + default: + return ERROR_INVALID_PARAMETER; + } + + FIXME("RegSaveKeyExW(): Flags ignored!\n"); + + return RegSaveKeyW(hKey, + lpFile, + lpSecurityAttributes); } Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=3… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Thu Feb 5 08:18:20 2009 @@ -276,6 +276,10 @@ #define STANDARD_RIGHTS_ALL 0x1F0000 #define SPECIFIC_RIGHTS_ALL 0xFFFF #define ACCESS_SYSTEM_SECURITY 0x1000000 + +#define REG_STANDARD_FORMAT 1 +#define REG_LATEST_FORMAT 2 +#define REG_NO_COMPRESSION 4 #ifndef WIN32_NO_STATUS

1 0

[mkupfer] 39409: - Set geographical position in conjunction with language selection - Translation for the changes made for English and German (other languages need to be updated) - List of languages extend by GeoID-field and set the GeoID for a lot of countries (Some countries needs to update in hivesft_* first, some language entries needs to split up for different countries) - Solves second part of issue #3448, now correct GeoID is set per default for a lot of countries.
by mkupfer＠svn.reactos.org 05 Feb '09

05 Feb '09

Author: mkupfer Date: Thu Feb 5 07:50:49 2009 New Revision: 39409 URL: http://svn.reactos.org/svn/reactos?rev=39409&view=rev Log: - Set geographical position in conjunction with language selection - Translation for the changes made for English and German (other languages need to be updated) - List of languages extend by GeoID-field and set the GeoID for a lot of countries (Some countries needs to update in hivesft_* first, some language entries needs to split up for different countries) - Solves second part of issue #3448, now correct GeoID is set per default for a lot of countries. Modified: trunk/reactos/base/setup/usetup/errorcode.h trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/lang/bg-BG.h trunk/reactos/base/setup/usetup/lang/cs-CZ.h trunk/reactos/base/setup/usetup/lang/de-DE.h trunk/reactos/base/setup/usetup/lang/el-GR.h trunk/reactos/base/setup/usetup/lang/en-US.h trunk/reactos/base/setup/usetup/lang/es-ES.h trunk/reactos/base/setup/usetup/lang/fr-FR.h trunk/reactos/base/setup/usetup/lang/it-IT.h trunk/reactos/base/setup/usetup/lang/lt-LT.h trunk/reactos/base/setup/usetup/lang/pl-PL.h trunk/reactos/base/setup/usetup/lang/ru-RU.h trunk/reactos/base/setup/usetup/lang/sk-SK.h trunk/reactos/base/setup/usetup/lang/sv-SE.h trunk/reactos/base/setup/usetup/lang/uk-UA.h trunk/reactos/base/setup/usetup/mui.c trunk/reactos/base/setup/usetup/mui.h trunk/reactos/base/setup/usetup/muilanguages.h trunk/reactos/base/setup/usetup/settings.c trunk/reactos/base/setup/usetup/settings.h Modified: trunk/reactos/base/setup/usetup/errorcode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/errorcod… ============================================================================== --- trunk/reactos/base/setup/usetup/errorcode.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/errorcode.h [iso-8859-1] Thu Feb 5 07:50:49 2009 @@ -65,6 +65,7 @@ ERROR_ADDING_CODEPAGE, ERROR_UPDATE_LOCALESETTINGS, ERROR_ADDING_KBLAYOUTS, + ERROR_UPDATE_GEOID, ERROR_LAST_ERROR_CODE }ERROR_NUMBER; Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Thu Feb 5 07:50:49 2009 @@ -3280,6 +3280,14 @@ return QUIT_PAGE; } + /* Set GeoID */ + + if (!SetGeoID(MUIGetGeoID())) + { + MUIDisplayError(ERROR_UPDATE_GEOID, Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; + } + if (!IsUnattendedSetup){ /* Update keyboard layout settings */ Modified: trunk/reactos/base/setup/usetup/lang/bg-BG.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/bg-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/bg-BG.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/bg-BG.h [iso-8859-1] Thu Feb 5 07:50:49 2009 @@ -1483,6 +1483,11 @@ //ERROR_ADDING_KBLAYOUTS, "¥ãá¯¥è® ¤®¡ ¢ï¥ ª« ¢¨ âãà¨â¥ ¯®¤à¥¤¡¨ ¢ à¥£¨áâêà .\n" "ENTER = à¥§ ¯ãáª ¥ ª®¬¯îâêà " + }, + { + //ERROR_UPDATE_GEOID, + "Setup could not set the geo id.\n" + "ENTER = Reboot computer" }, { NULL, Modified: trunk/reactos/base/setup/usetup/lang/cs-CZ.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/cs-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] Thu Feb 5 07:50:49 2009 @@ -1479,6 +1479,11 @@ //ERROR_ADDING_KBLAYOUTS, "Nepodaýilo se pýidat rozlo§en¡ kl vesnice do registru.\n" "ENTER = Restartovat po¡ta" + }, + { + //ERROR_UPDATE_GEOID, + "Setup could not set the geo id.\n" + "ENTER = Reboot computer" }, { NULL, 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 Feb 5 07:50:49 2009 @@ -1473,7 +1473,12 @@ "Setup konnte die Tastaturlayouts nicht in Registry eintragen.\n" "ENTER = Computer neustarten" }, - { + { + //ERROR_UPDATE_GEOID, + "Setup konnte den geographischen Standort nicht einstellen.\n" + "ENTER = Computer neustarten" + }, +{ NULL, NULL } Modified: trunk/reactos/base/setup/usetup/lang/el-GR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/el-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/el-GR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/el-GR.h [iso-8859-1] Thu Feb 5 07:50:49 2009 @@ -1501,6 +1501,11 @@ //ERROR_ADDING_KBLAYOUTS, " ¡«á©«© §â«¬® ¤ §¨¦©â© « ª «á¥ ª §¢¡«¨¦¢¦åà¤ ©«¦ £«¨é¦.\n" "ENTER = §¤¡¡å¤© ¬§¦¢¦ ©«ã" + }, + { + //ERROR_UPDATE_GEOID, + "Setup could not set the geo id.\n" + "ENTER = Reboot computer" }, { NULL, Modified: trunk/reactos/base/setup/usetup/lang/en-US.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/en-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/en-US.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/en-US.h [iso-8859-1] Thu Feb 5 07:50:49 2009 @@ -1470,6 +1470,11 @@ { //ERROR_ADDING_KBLAYOUTS, "Setup failed to add keyboard layouts to registry.\n" + "ENTER = Reboot computer" + }, + { + //ERROR_UPDATE_GEOID, + "Setup could not set the geo id.\n" "ENTER = Reboot computer" }, { Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/es-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] Thu Feb 5 07:50:49 2009 @@ -1474,6 +1474,11 @@ "ENTER = Reboot computer" }, { + //ERROR_UPDATE_GEOID, + "Setup could not set the geo id.\n" + "ENTER = Reboot computer" + }, +{ NULL, NULL } Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/fr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] Thu Feb 5 07:50:49 2009 @@ -1483,6 +1483,11 @@ { //ERROR_ADDING_KBLAYOUTS, "Setup failed to add keyboard layouts to registry.\n" + "ENTER = Reboot computer" + }, + { + //ERROR_UPDATE_GEOID, + "Setup could not set the geo id.\n" "ENTER = Reboot computer" }, { Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/it-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] Thu Feb 5 07:50:49 2009 @@ -1472,6 +1472,11 @@ //ERROR_ADDING_KBLAYOUTS, "Impossibile aggiungere le nazionalit di tastiera al registro.\n" "INVIO = Riavviare il computer" + }, + { + //ERROR_UPDATE_GEOID, + "Setup could not set the geo id.\n" + "ENTER = Reboot computer" }, { NULL, Modified: trunk/reactos/base/setup/usetup/lang/lt-LT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/lt-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/lt-LT.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/lt-LT.h [iso-8859-1] Thu Feb 5 07:50:49 2009 @@ -1480,6 +1480,11 @@ { //ERROR_ADDING_KBLAYOUTS, "Setup failed to add keyboard layouts to registry.\n" + "ENTER = Reboot computer" + }, + { + //ERROR_UPDATE_GEOID, + "Setup could not set the geo id.\n" "ENTER = Reboot computer" }, { 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 Feb 5 07:50:49 2009 @@ -1480,6 +1480,11 @@ //ERROR_ADDING_KBLAYOUTS, "Instalator nie m¢g doda ukad¢w klawiatury do rejestru.\n" "ENTER = Restart komputera" + }, + { + //ERROR_UPDATE_GEOID, + "Setup could not set the geo id.\n" + "ENTER = Reboot computer" }, { NULL, Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ru-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] Thu Feb 5 07:50:49 2009 @@ -1471,6 +1471,11 @@ { //ERROR_ADDING_KBLAYOUTS, "Setup failed to add keyboard layouts to registry.\n" + "ENTER = Reboot computer" + }, + { + //ERROR_UPDATE_GEOID, + "Setup could not set the geo id.\n" "ENTER = Reboot computer" }, { Modified: trunk/reactos/base/setup/usetup/lang/sk-SK.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] Thu Feb 5 07:50:49 2009 @@ -1481,6 +1481,11 @@ //ERROR_ADDING_KBLAYOUTS, "Inçtal tor zlyhal pri prid van¡ rozlo§en¡ kl vesnice do registrov.\n" "ENTER = Reçtart po¡taa" + }, + { + //ERROR_UPDATE_GEOID, + "Setup could not set the geo id.\n" + "ENTER = Reboot computer" }, { NULL, Modified: trunk/reactos/base/setup/usetup/lang/sv-SE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sv-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sv-SE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sv-SE.h [iso-8859-1] Thu Feb 5 07:50:49 2009 @@ -1471,6 +1471,11 @@ { //ERROR_ADDING_KBLAYOUTS, "Setup failed to add keyboard layouts to registry.\n" + "ENTER = Reboot computer" + }, + { + //ERROR_UPDATE_GEOID, + "Setup could not set the geo id.\n" "ENTER = Reboot computer" }, { Modified: trunk/reactos/base/setup/usetup/lang/uk-UA.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/uk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] Thu Feb 5 07:50:49 2009 @@ -1471,6 +1471,11 @@ { //ERROR_ADDING_KBLAYOUTS, "Setup failed to add keyboard layouts to registry.\n" + "ENTER = Reboot computer" + }, + { + //ERROR_UPDATE_GEOID, + "Setup could not set the geo id.\n" "ENTER = Reboot computer" }, { Modified: trunk/reactos/base/setup/usetup/mui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.c?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/mui.c [iso-8859-1] Thu Feb 5 07:50:49 2009 @@ -112,6 +112,13 @@ return LanguageList[lngIndex].MuiLayouts[0].LayoutID; } +PWCHAR +MUIGetGeoID(VOID) +{ + ULONG lngIndex = max(FindLanguageIndex(), 0); + return LanguageList[lngIndex].GeoID; +} + const MUI_LAYOUTS * MUIGetLayoutsList(VOID) { Modified: trunk/reactos/base/setup/usetup/mui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.h?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/mui.h [iso-8859-1] Thu Feb 5 07:50:49 2009 @@ -46,6 +46,7 @@ PWCHAR OEMCPage; PWCHAR MACCPage; PWCHAR LanguageDescriptor; + PWCHAR GeoID; const MUI_PAGE * MuiPages; const MUI_ERROR * MuiErrors; const MUI_STRING * MuiStrings; @@ -61,6 +62,9 @@ LPCWSTR MUIDefaultKeyboardLayout(VOID); + +PWCHAR +MUIGetGeoID(VOID); const MUI_LAYOUTS * MUIGetLayoutsList(VOID); Modified: trunk/reactos/base/setup/usetup/muilanguages.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/muilangu… ============================================================================== --- trunk/reactos/base/setup/usetup/muilanguages.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/muilanguages.h [iso-8859-1] Thu Feb 5 07:50:49 2009 @@ -135,144 +135,144 @@ const MUI_LANGUAGE LanguageList[] = { - /* Lang ID, ANSI CP, OEM CP, MAC CP, Language Name, page strgs,error strings, other strings, fonts, kb layouts */ - {L"00000436", L"1252", L"850", L"10000", L"Afrikaans", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, afZALayouts }, - {L"0000041C", L"1250", L"852", L"10029", L"Albanian", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, sqALLayouts }, - {L"00000401", L"1256", L"720", L"10004", L"Arabic (Saudi Arabia)", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arSALayouts }, - {L"00000801", L"1256", L"720", L"10004", L"Arabic (Iraq)", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arIQLayouts }, - {L"00000C01", L"1256", L"720", L"10004", L"Arabic (Egypt)", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arEGLayouts }, - {L"00001001", L"1256", L"720", L"10004", L"Arabic (Libya)", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arLYLayouts }, - {L"00001401", L"1256", L"720", L"10004", L"Arabic (Algeria)", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arDZLayouts }, - {L"00001801", L"1256", L"720", L"10004", L"Arabic (Morocco)", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arMALayouts }, - {L"00001C01", L"1256", L"720", L"10004", L"Arabic (Tunisia)", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arTNLayouts }, - {L"00002001", L"1256", L"720", L"10004", L"Arabic (Oman)", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arOMLayouts }, - {L"00002401", L"1256", L"720", L"10004", L"Arabic (Yemen)", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arYELayouts }, - {L"00002801", L"1256", L"720", L"10004", L"Arabic (Syria)", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arSYLayouts }, - {L"00002C01", L"1256", L"720", L"10004", L"Arabic (Jordan)", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arJOLayouts }, - {L"00003001", L"1256", L"720", L"10004", L"Arabic (Lebanon)", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arLBLayouts }, - {L"00003401", L"1256", L"720", L"10004", L"Arabic (Kuwait)", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arKWLayouts }, - {L"00003801", L"1256", L"720", L"10004", L"Arabic (U.A.E.)", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arAELayouts }, - {L"00003C01", L"1256", L"720", L"10004", L"Arabic (Bahrain)", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arBHLayouts }, - {L"00004001", L"1256", L"720", L"10004", L"Arabic (Qatar)", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arQALayouts }, - {L"0000042B", L"0", L"1", L"2", L"Armenian", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, hyAMLayouts }, - {L"0000082C", L"1251", L"866", L"10007", L"Azeri (Cyrillic)", enUSPages, enUSErrorEntries, enUSStrings, CyrillicFonts, azAZLayouts }, - {L"0000042C", L"1254", L"857", L"10081", L"Azeri (Latin)", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, azAZLayouts }, - {L"0000042D", L"1252", L"850", L"10000", L"Basque", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, euESLayouts }, - {L"00000423", L"1251", L"866", L"10007", L"Belarusian", enUSPages, enUSErrorEntries, enUSStrings, CyrillicFonts, beBYLayouts }, - {L"00000402", L"1251", L"866", L"10007", L"Bulgarian", bgBGPages, bgBGErrorEntries, bgBGStrings, CyrillicFonts, bgBGLayouts }, - {L"00000455", L"0", L"1", L"2", L"Burmese", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, myMMLayouts }, - {L"00000403", L"1252", L"850", L"10000", L"Catalan", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, caESLayouts }, - {L"00000404", L"950", L"950", L"10008", L"Chinese (Taiwan)", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, zhTWLayouts }, - {L"00000804", L"936", L"936", L"10008", L"Chinese (PRC)", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, zhCNLayouts }, - {L"00000C04", L"950", L"950", L"10008", L"Chinese (Hong Kong S.A.R.)", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, zhHKLayouts }, - {L"00001004", L"936", L"936", L"10008", L"Chinese (Singapore)", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, zhSGLayouts }, - {L"00001404", L"950", L"950", L"10002", L"Chinese (Macau S.A.R.)", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, zhMOLayouts }, - {L"0000041A", L"1250", L"852", L"10029", L"Croatian", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, hrHRLayouts }, - {L"00000405", L"1250", L"852", L"10029", L"Czech", csCZPages, csCZErrorEntries, csCZStrings, LatinFonts, csCZLayouts }, - {L"00000406", L"1252", L"850", L"10000", L"Danish", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, daDKLayouts }, - {L"00000465", L"0", L"1", L"2", L"Divehi (Maldives)", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, dvMVLayouts }, - {L"00000413", L"1252", L"850", L"10000", L"Dutch (Netherlands)", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, nlNLLayouts }, - {L"00000813", L"1252", L"850", L"10000", L"Dutch (Belgium)", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, nlBELayouts }, - {L"00000409", L"1252", L"437", L"10000", L"English (United States)", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enUSLayouts }, - {L"00000809", L"1252", L"850", L"10000", L"English (United Kingdom)", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enGBLayouts }, - {L"00000C09", L"1252", L"850", L"10000", L"English (Australia)", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enAULayouts }, - {L"00001009", L"1252", L"850", L"10000", L"English (Canada)", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enCALayouts }, - {L"00001409", L"1252", L"850", L"10000", L"English (New Zealand)", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enNZLayouts }, - {L"00001809", L"1252", L"850", L"10000", L"English (Ireland)", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enIELayouts }, - {L"00001C09", L"1252", L"437", L"10000", L"English (South Africa)", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enZALayouts }, - {L"00002009", L"1252", L"850", L"10000", L"English (Jamaica)", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enJMLayouts }, - {L"00002409", L"1252", L"850", L"10000", L"English (Caribbean)", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enCBLayouts }, - {L"00002809", L"1252", L"850", L"10000", L"English (Belize)", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enBZLayouts }, - {L"00002C09", L"1252", L"850", L"10000", L"English (Trinidad)", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enTTLayouts }, - {L"00003009", L"1252", L"437", L"10000", L"English (Zimbabwe)", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enZWLayouts }, - {L"00003409", L"1252", L"437", L"10000", L"English (Philippines)", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enPHLayouts }, - {L"00000425", L"1257", L"775", L"10029", L"Estonian", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, etEELayouts }, - {L"00000438", L"1252", L"850", L"10079", L"Faeroese", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, foFOLayouts }, - {L"00000429", L"1256", L"720", L"10004", L"Farsi", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, faIRLayouts }, - {L"0000040B", L"1252", L"850", L"10000", L"Finnish", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, fiFILayouts }, - {L"00000C0C", L"1252", L"850", L"10000", L"French (Canada)", frFRPages, frFRErrorEntries, frFRStrings, LatinFonts, frCALayouts }, - {L"0000040C", L"1252", L"850", L"10000", L"French (France)", frFRPages, frFRErrorEntries, frFRStrings, LatinFonts, frFRLayouts }, - {L"0000080C", L"1252", L"850", L"10000", L"French (Belgium)", frFRPages, frFRErrorEntries, frFRStrings, LatinFonts, frBELayouts }, - {L"0000100C", L"1252", L"850", L"10000", L"French (Switzerland)", frFRPages, frFRErrorEntries, frFRStrings, LatinFonts, frCHLayouts }, - {L"0000140C", L"1252", L"850", L"10000", L"French (Luxembourg)", frFRPages, frFRErrorEntries, frFRStrings, LatinFonts, frLULayouts }, - {L"0000180C", L"1252", L"850", L"10000", L"French (Monaco)", frFRPages, frFRErrorEntries, frFRStrings, LatinFonts, frMCLayouts }, - {L"00000456", L"1252", L"850", L"10000", L"Galician (Spain)", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, glESLayouts }, - {L"00000437", L"0", L"1", L"2", L"Georgian", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, kaGELayouts }, - {L"00000407", L"1252", L"850", L"10000", L"German (Germany)", deDEPages, deDEErrorEntries, deDEStrings, LatinFonts, deDELayouts }, - {L"00000807", L"1252", L"850", L"10000", L"German (Switzerland)", deDEPages, deDEErrorEntries, deDEStrings, LatinFonts, deCHLayouts }, - {L"00000C07", L"1252", L"850", L"10000", L"German (Austria)", deDEPages, deDEErrorEntries, deDEStrings, LatinFonts, deATLayouts }, - {L"00001007", L"1252", L"850", L"10000", L"German (Luxembourg)", deDEPages, deDEErrorEntries, deDEStrings, LatinFonts, deLULayouts }, - {L"00001407", L"1252", L"850", L"10000", L"German (Liechtenstein)", deDEPages, deDEErrorEntries, deDEStrings, LatinFonts, deLILayouts }, - {L"00000408", L"1253", L"737", L"10006", L"Greek", elGRPages, elGRErrorEntries, elGRStrings, GreekFonts, elGRLayouts }, - {L"00000447", L"0", L"1", L"2", L"Gujarati (India)", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, guINLayouts }, - {L"0000040D", L"1255", L"862", L"10005", L"Hebrew", enUSPages, enUSErrorEntries, enUSStrings, HebrewFonts, heILLayouts }, - {L"00000439", L"1252", L"437", L"10000", L"Hindi", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, hiINLayouts }, - {L"0000040E", L"1250", L"852", L"10029", L"Hungarian", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, huHULayouts }, - {L"0000040F", L"1252", L"850", L"10079", L"Icelandic", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, isISLayouts }, - {L"00000421", L"1252", L"850", L"10079", L"Indonesian", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, idIDLayouts }, - {L"00000410", L"1252", L"850", L"10000", L"Italian (Italy)", itITPages, itITErrorEntries, itITStrings, LatinFonts, itITLayouts }, - {L"00000810", L"1252", L"850", L"10000", L"Italian (Switzerland)", itITPages, itITErrorEntries, itITStrings, LatinFonts, itCHLayouts }, - {L"00000411", L"932", L"932", L"10001", L"Japanese", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, jaJPLayouts }, - {L"0000044B", L"1252", L"437", L"10079", L"Kannada (India)", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, knINLayouts }, - {L"0000043F", L"1251", L"866", L"10007", L"Kazakh", enUSPages, enUSErrorEntries, enUSStrings, CyrillicFonts, kkKZLayouts }, - {L"00000457", L"0", L"437", L"2", L"Konkani", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, kokINLayouts}, - {L"00000412", L"949", L"949", L"10003", L"Korean", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, koKRLayouts }, - {L"00000440", L"1251", L"866", L"10007", L"Kyrgyz (Kyrgyzstan)", enUSPages, enUSErrorEntries, enUSStrings, CyrillicFonts, kyKGLayouts }, - {L"00000426", L"1257", L"775", L"10029", L"Latvian", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, lvLVLayouts }, - {L"00000427", L"1257", L"775", L"10029", L"Lithuanian", ltLTPages, ltLTErrorEntries, ltLTStrings, LatinFonts, ltLTLayouts }, - {L"0000042F", L"1251", L"866", L"10007", L"FYRO Macedonian", enUSPages, enUSErrorEntries, enUSStrings, CyrillicFonts, mkMKLayouts }, - {L"0000083E", L"1252", L"850", L"10000", L"Malay (Brunei Darussalam)", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, msBNLayouts }, - {L"0000043E", L"1252", L"850", L"10000", L"Malay (Malaysia)", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, msMYLayouts }, - {L"0000044E", L"0", L"1", L"2", L"Marathi", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, mrINLayouts }, - {L"00000450", L"1251", L"866", L"10007", L"Mongolian (Mongolia)", enUSPages, enUSErrorEntries, enUSStrings, CyrillicFonts, mnMNLayouts }, - {L"00000414", L"1252", L"850", L"10000", L"Norwegian (Bokmal)", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, nnNOLayouts }, - {L"00000814", L"1252", L"850", L"10000", L"Norwegian (Nynorsk)", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, nnNOLayouts }, - {L"00000415", L"1250", L"852", L"10029", L"Polish", plPLPages, plPLErrorEntries, plPLStrings, LatinFonts, plPLLayouts }, - {L"00000816", L"1252", L"850", L"10000", L"Portuguese (Portugal)", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, ptPTLayouts }, - {L"00000416", L"1252", L"850", L"10000", L"Portuguese (Brazil)", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, ptBRLayouts }, - {L"00000446", L"0", L"1", L"2", L"Punjabi (India)", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, paINLayouts }, - {L"00000418", L"1250", L"852", L"10029", L"Romanian", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, roROLayouts }, - {L"00000419", L"1251", L"866", L"10007", L"Russian", ruRUPages, ruRUErrorEntries, ruRUStrings, CyrillicFonts, ruRULayouts }, - {L"0000044F", L"0", L"1", L"2", L"Sanskrit", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, saINLayouts }, - {L"00000C1A", L"1251", L"855", L"10007", L"Serbian (Cyrillic)", enUSPages, enUSErrorEntries, enUSStrings, CyrillicFonts, srSPLayouts }, - {L"0000081A", L"1250", L"852", L"10029", L"Serbian (Latin)", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, srSPLayouts }, - {L"0000041B", L"1250", L"852", L"10029", L"Slovak", skSKPages, skSKErrorEntries, skSKStrings, LatinFonts, skSKLayouts }, - {L"00000424", L"1250", L"852", L"10029", L"Slovenian", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, slSILayouts }, - {L"0000040A", L"1252", L"850", L"10000", L"Spanish (Traditional Sort)", esESPages, esESErrorEntries, esESStrings, LatinFonts, esESLayouts }, - {L"0000080A", L"1252", L"850", L"10000", L"Spanish (Mexico)", esESPages, esESErrorEntries, esESStrings, LatinFonts, esMXLayouts }, - {L"00000C0A", L"1252", L"850", L"10000", L"Spanish (International Sort)", esESPages, esESErrorEntries, esESStrings, LatinFonts, esESLayouts }, - {L"0000100A", L"1252", L"850", L"10000", L"Spanish (Guatemala)", esESPages, esESErrorEntries, esESStrings, LatinFonts, esGTLayouts }, - {L"0000140A", L"1252", L"850", L"10000", L"Spanish (Costa Rica)", esESPages, esESErrorEntries, esESStrings, LatinFonts, esCRLayouts }, - {L"0000180A", L"1252", L"850", L"10000", L"Spanish (Panama)", esESPages, esESErrorEntries, esESStrings, LatinFonts, esPALayouts }, - {L"00001C0A", L"1252", L"850", L"10000", L"Spanish (Dominican Republic)", esESPages, esESErrorEntries, esESStrings, LatinFonts, esDOLayouts }, - {L"0000200A", L"1252", L"850", L"10000", L"Spanish (Venezuela)", esESPages, esESErrorEntries, esESStrings, LatinFonts, esVELayouts }, - {L"0000240A", L"1252", L"850", L"10000", L"Spanish (Colombia)", esESPages, esESErrorEntries, esESStrings, LatinFonts, esCOLayouts }, - {L"0000280A", L"1252", L"850", L"10000", L"Spanish (Peru)", esESPages, esESErrorEntries, esESStrings, LatinFonts, esPELayouts }, - {L"00002C0A", L"1252", L"850", L"10000", L"Spanish (Argentina)", esESPages, esESErrorEntries, esESStrings, LatinFonts, esARLayouts }, - {L"0000300A", L"1252", L"850", L"10000", L"Spanish (Ecuador)", esESPages, esESErrorEntries, esESStrings, LatinFonts, esECLayouts }, - {L"0000340A", L"1252", L"850", L"10000", L"Spanish (Chile)", esESPages, esESErrorEntries, esESStrings, LatinFonts, esCLLayouts }, - {L"0000380A", L"1252", L"850", L"10000", L"Spanish (Uruguay)", esESPages, esESErrorEntries, esESStrings, LatinFonts, esUYLayouts }, - {L"00003C0A", L"1252", L"850", L"10000", L"Spanish (Paraguay)", esESPages, esESErrorEntries, esESStrings, LatinFonts, esPYLayouts }, - {L"0000400A", L"1252", L"850", L"10000", L"Spanish (Bolivia)", esESPages, esESErrorEntries, esESStrings, LatinFonts, esBOLayouts }, - {L"0000440A", L"1252", L"850", L"10000", L"Spanish (El Salvador)", esESPages, esESErrorEntries, esESStrings, LatinFonts, esSVLayouts }, - {L"0000480A", L"1252", L"850", L"10000", L"Spanish (Honduras)", esESPages, esESErrorEntries, esESStrings, LatinFonts, esHNLayouts }, - {L"00004C0A", L"1252", L"850", L"10000", L"Spanish (Nicaragua)", esESPages, esESErrorEntries, esESStrings, LatinFonts, esNILayouts }, - {L"0000500A", L"1252", L"850", L"10000", L"Spanish (Puerto Rico)", esESPages, esESErrorEntries, esESStrings, LatinFonts, esPRLayouts }, - {L"00000441", L"1252", L"437", L"10000", L"Swahili", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, swKELayouts }, - {L"0000041D", L"1252", L"850", L"10000", L"Swedish", svSEPages, svSEErrorEntries, svSEStrings, LatinFonts, svSELayouts }, - {L"0000081D", L"1252", L"850", L"10000", L"Swedish (Finland)", svSEPages, svSEErrorEntries, svSEStrings, LatinFonts, svFILayouts }, - {L"0000045A", L"0", L"1", L"2", L"Syriac (Syria)", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, syrSYLayouts}, - {L"00000449", L"0", L"1", L"2", L"Tamil", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, taINLayouts }, - {L"00000444", L"1251", L"866", L"10007", L"Tatar", enUSPages, enUSErrorEntries, enUSStrings, CyrillicFonts, ttTALayouts }, - {L"0000044A", L"0", L"1", L"2", L"Telugu (India)", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, teINLayouts }, - {L"0000041E", L"874", L"874", L"10021", L"Thai", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, thTHLayouts }, - {L"0000041F", L"1254", L"857", L"10081", L"Turkish", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, trTRLayouts }, - {L"00000422", L"1251", L"866", L"10017", L"Ukrainian", ukUAPages, ukUAErrorEntries, ukUAStrings, CyrillicFonts, ukUALayouts }, - {L"00000420", L"1256", L"720", L"10004", L"Urdu", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, urPKLayouts }, - {L"00000443", L"1254", L"857", L"10029", L"Uzbek (Latin)", enUSPages, enUSErrorEntries, enUSStrings, CyrillicFonts, uzUZLayouts }, - {L"00000843", L"1251", L"866", L"10007", L"Uzbek (Cyrillic)", enUSPages, enUSErrorEntries, enUSStrings, CyrillicFonts, uzUZLayouts }, - {L"0000042A", L"1258", L"1258",L"10000", L"Vietnamese", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, viVNLayouts }, - {L"00000435", L"1252", L"850", L"10000", L"Zulu", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enUSLayouts }, + /* Lang ID, ANSI CP, OEM CP, MAC CP, Language Name, GeoID page strgs,error strings, other strings, fonts, kb layouts */ + {L"00000436", L"1252", L"850", L"10000", L"Afrikaans", L"1", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, afZALayouts }, + {L"0000041C", L"1250", L"852", L"10029", L"Albanian", L"355", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, sqALLayouts }, + {L"00000401", L"1256", L"720", L"10004", L"Arabic (Saudi Arabia)", L"966", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arSALayouts }, + {L"00000801", L"1256", L"720", L"10004", L"Arabic (Iraq)", L"964", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arIQLayouts }, + {L"00000C01", L"1256", L"720", L"10004", L"Arabic (Egypt)", L"20", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arEGLayouts }, + {L"00001001", L"1256", L"720", L"10004", L"Arabic (Libya)", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arLYLayouts }, + {L"00001401", L"1256", L"720", L"10004", L"Arabic (Algeria)", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arDZLayouts }, + {L"00001801", L"1256", L"720", L"10004", L"Arabic (Morocco)", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arMALayouts }, + {L"00001C01", L"1256", L"720", L"10004", L"Arabic (Tunisia)", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arTNLayouts }, + {L"00002001", L"1256", L"720", L"10004", L"Arabic (Oman)", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arOMLayouts }, + {L"00002401", L"1256", L"720", L"10004", L"Arabic (Yemen)", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arYELayouts }, + {L"00002801", L"1256", L"720", L"10004", L"Arabic (Syria)", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arSYLayouts }, + {L"00002C01", L"1256", L"720", L"10004", L"Arabic (Jordan)", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arJOLayouts }, + {L"00003001", L"1256", L"720", L"10004", L"Arabic (Lebanon)", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arLBLayouts }, + {L"00003401", L"1256", L"720", L"10004", L"Arabic (Kuwait)", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arKWLayouts }, + {L"00003801", L"1256", L"720", L"10004", L"Arabic (U.A.E.)", L"971", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arAELayouts }, + {L"00003C01", L"1256", L"720", L"10004", L"Arabic (Bahrain)", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arBHLayouts }, + {L"00004001", L"1256", L"720", L"10004", L"Arabic (Qatar)", L"974", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, arQALayouts }, + {L"0000042B", L"0", L"1", L"2", L"Armenian", L"374", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, hyAMLayouts }, + {L"0000082C", L"1251", L"866", L"10007", L"Azeri (Cyrillic)", L"1", enUSPages, enUSErrorEntries, enUSStrings, CyrillicFonts, azAZLayouts }, + {L"0000042C", L"1254", L"857", L"10081", L"Azeri (Latin)", L"1", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, azAZLayouts }, + {L"0000042D", L"1252", L"850", L"10000", L"Basque", L"1", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, euESLayouts }, + {L"00000423", L"1251", L"866", L"10007", L"Belarusian", L"1", enUSPages, enUSErrorEntries, enUSStrings, CyrillicFonts, beBYLayouts }, + {L"00000402", L"1251", L"866", L"10007", L"Bulgarian", L"359", bgBGPages, bgBGErrorEntries, bgBGStrings, CyrillicFonts, bgBGLayouts }, + {L"00000455", L"0", L"1", L"2", L"Burmese", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, myMMLayouts }, + {L"00000403", L"1252", L"850", L"10000", L"Catalan", L"1", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, caESLayouts }, + {L"00000404", L"950", L"950", L"10008", L"Chinese (Taiwan)", L"886", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, zhTWLayouts }, + {L"00000804", L"936", L"936", L"10008", L"Chinese (PRC)", L"86", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, zhCNLayouts }, + {L"00000C04", L"950", L"950", L"10008", L"Chinese (Hong Kong S.A.R.)", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, zhHKLayouts }, + {L"00001004", L"936", L"936", L"10008", L"Chinese (Singapore)", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, zhSGLayouts }, + {L"00001404", L"950", L"950", L"10002", L"Chinese (Macau S.A.R.)", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, zhMOLayouts }, + {L"0000041A", L"1250", L"852", L"10029", L"Croatian", L"385", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, hrHRLayouts }, + {L"00000405", L"1250", L"852", L"10029", L"Czech", L"1", csCZPages, csCZErrorEntries, csCZStrings, LatinFonts, csCZLayouts }, + {L"00000406", L"1252", L"850", L"10000", L"Danish", L"1", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, daDKLayouts }, + {L"00000465", L"0", L"1", L"2", L"Divehi (Maldives)", L"960", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, dvMVLayouts }, + {L"00000413", L"1252", L"850", L"10000", L"Dutch (Netherlands)", L"31", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, nlNLLayouts }, + {L"00000813", L"1252", L"850", L"10000", L"Dutch (Belgium)", L"32", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, nlBELayouts }, + {L"00000409", L"1252", L"437", L"10000", L"English (United States)", L"1", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enUSLayouts }, + {L"00000809", L"1252", L"850", L"10000", L"English (United Kingdom)", L"44", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enGBLayouts }, + {L"00000C09", L"1252", L"850", L"10000", L"English (Australia)", L"61", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enAULayouts }, + {L"00001009", L"1252", L"850", L"10000", L"English (Canada)", L"107", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enCALayouts }, + {L"00001409", L"1252", L"850", L"10000", L"English (New Zealand)", L"64", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enNZLayouts }, + {L"00001809", L"1252", L"850", L"10000", L"English (Ireland)", L"353", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enIELayouts }, + {L"00001C09", L"1252", L"437", L"10000", L"English (South Africa)", L"27", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enZALayouts }, + {L"00002009", L"1252", L"850", L"10000", L"English (Jamaica)", L"1", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enJMLayouts }, + {L"00002409", L"1252", L"850", L"10000", L"English (Caribbean)", L"1", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enCBLayouts }, + {L"00002809", L"1252", L"850", L"10000", L"English (Belize)", L"1", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enBZLayouts }, + {L"00002C09", L"1252", L"850", L"10000", L"English (Trinidad)", L"1", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enTTLayouts }, + {L"00003009", L"1252", L"437", L"10000", L"English (Zimbabwe)", L"1", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enZWLayouts }, + {L"00003409", L"1252", L"437", L"10000", L"English (Philippines)", L"63", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enPHLayouts }, + {L"00000425", L"1257", L"775", L"10029", L"Estonian", L"372", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, etEELayouts }, + {L"00000438", L"1252", L"850", L"10079", L"Faeroese", L"1", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, foFOLayouts }, + {L"00000429", L"1256", L"720", L"10004", L"Farsi", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, faIRLayouts }, + {L"0000040B", L"1252", L"850", L"10000", L"Finnish", L"358", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, fiFILayouts }, + {L"00000C0C", L"1252", L"850", L"10000", L"French (Canada)", L"107", frFRPages, frFRErrorEntries, frFRStrings, LatinFonts, frCALayouts }, + {L"0000040C", L"1252", L"850", L"10000", L"French (France)", L"33", frFRPages, frFRErrorEntries, frFRStrings, LatinFonts, frFRLayouts }, + {L"0000080C", L"1252", L"850", L"10000", L"French (Belgium)", L"32", frFRPages, frFRErrorEntries, frFRStrings, LatinFonts, frBELayouts }, + {L"0000100C", L"1252", L"850", L"10000", L"French (Switzerland)", L"41", frFRPages, frFRErrorEntries, frFRStrings, LatinFonts, frCHLayouts }, + {L"0000140C", L"1252", L"850", L"10000", L"French (Luxembourg)", L"352", frFRPages, frFRErrorEntries, frFRStrings, LatinFonts, frLULayouts }, + {L"0000180C", L"1252", L"850", L"10000", L"French (Monaco)", L"1", frFRPages, frFRErrorEntries, frFRStrings, LatinFonts, frMCLayouts }, + {L"00000456", L"1252", L"850", L"10000", L"Galician (Spain)", L"34", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, glESLayouts }, + {L"00000437", L"0", L"1", L"2", L"Georgian", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, kaGELayouts }, + {L"00000407", L"1252", L"850", L"10000", L"German (Germany)", L"49", deDEPages, deDEErrorEntries, deDEStrings, LatinFonts, deDELayouts }, + {L"00000807", L"1252", L"850", L"10000", L"German (Switzerland)", L"41", deDEPages, deDEErrorEntries, deDEStrings, LatinFonts, deCHLayouts }, + {L"00000C07", L"1252", L"850", L"10000", L"German (Austria)", L"43", deDEPages, deDEErrorEntries, deDEStrings, LatinFonts, deATLayouts }, + {L"00001007", L"1252", L"850", L"10000", L"German (Luxembourg)", L"352", deDEPages, deDEErrorEntries, deDEStrings, LatinFonts, deLULayouts }, + {L"00001407", L"1252", L"850", L"10000", L"German (Liechtenstein)", L"423", deDEPages, deDEErrorEntries, deDEStrings, LatinFonts, deLILayouts }, + {L"00000408", L"1253", L"737", L"10006", L"Greek", L"30", elGRPages, elGRErrorEntries, elGRStrings, GreekFonts, elGRLayouts }, + {L"00000447", L"0", L"1", L"2", L"Gujarati (India)", L"91", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, guINLayouts }, + {L"0000040D", L"1255", L"862", L"10005", L"Hebrew", L"1", enUSPages, enUSErrorEntries, enUSStrings, HebrewFonts, heILLayouts }, + {L"00000439", L"1252", L"437", L"10000", L"Hindi", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, hiINLayouts }, + {L"0000040E", L"1250", L"852", L"10029", L"Hungarian", L"36", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, huHULayouts }, + {L"0000040F", L"1252", L"850", L"10079", L"Icelandic", L"354", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, isISLayouts }, + {L"00000421", L"1252", L"850", L"10079", L"Indonesian", L"62", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, idIDLayouts }, + {L"00000410", L"1252", L"850", L"10000", L"Italian (Italy)", L"39", itITPages, itITErrorEntries, itITStrings, LatinFonts, itITLayouts }, + {L"00000810", L"1252", L"850", L"10000", L"Italian (Switzerland)", L"41", itITPages, itITErrorEntries, itITStrings, LatinFonts, itCHLayouts }, + {L"00000411", L"932", L"932", L"10001", L"Japanese", L"81", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, jaJPLayouts }, + {L"0000044B", L"1252", L"437", L"10079", L"Kannada (India)", L"91", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, knINLayouts }, + {L"0000043F", L"1251", L"866", L"10007", L"Kazakh", L"705", enUSPages, enUSErrorEntries, enUSStrings, CyrillicFonts, kkKZLayouts }, + {L"00000457", L"0", L"437", L"2", L"Konkani", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, kokINLayouts}, + {L"00000412", L"949", L"949", L"10003", L"Korean", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, koKRLayouts }, + {L"00000440", L"1251", L"866", L"10007", L"Kyrgyz (Kyrgyzstan)", L"1", enUSPages, enUSErrorEntries, enUSStrings, CyrillicFonts, kyKGLayouts }, + {L"00000426", L"1257", L"775", L"10029", L"Latvian", L"371", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, lvLVLayouts }, + {L"00000427", L"1257", L"775", L"10029", L"Lithuanian", L"370", ltLTPages, ltLTErrorEntries, ltLTStrings, LatinFonts, ltLTLayouts }, + {L"0000042F", L"1251", L"866", L"10007", L"FYRO Macedonian", L"1", enUSPages, enUSErrorEntries, enUSStrings, CyrillicFonts, mkMKLayouts }, + {L"0000083E", L"1252", L"850", L"10000", L"Malay (Brunei Darussalam)", L"1", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, msBNLayouts }, + {L"0000043E", L"1252", L"850", L"10000", L"Malay (Malaysia)", L"60", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, msMYLayouts }, + {L"0000044E", L"0", L"1", L"2", L"Marathi", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, mrINLayouts }, + {L"00000450", L"1251", L"866", L"10007", L"Mongolian (Mongolia)", L"976", enUSPages, enUSErrorEntries, enUSStrings, CyrillicFonts, mnMNLayouts }, + {L"00000414", L"1252", L"850", L"10000", L"Norwegian (Bokmal)", L"47", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, nnNOLayouts }, + {L"00000814", L"1252", L"850", L"10000", L"Norwegian (Nynorsk)", L"47", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, nnNOLayouts }, + {L"00000415", L"1250", L"852", L"10029", L"Polish", L"48", plPLPages, plPLErrorEntries, plPLStrings, LatinFonts, plPLLayouts }, + {L"00000816", L"1252", L"850", L"10000", L"Portuguese (Portugal)", L"351", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, ptPTLayouts }, + {L"00000416", L"1252", L"850", L"10000", L"Portuguese (Brazil)", L"55", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, ptBRLayouts }, + {L"00000446", L"0", L"1", L"2", L"Punjabi (India)", L"91", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, paINLayouts }, + {L"00000418", L"1250", L"852", L"10029", L"Romanian", L"40", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, roROLayouts }, + {L"00000419", L"1251", L"866", L"10007", L"Russian", L"7", ruRUPages, ruRUErrorEntries, ruRUStrings, CyrillicFonts, ruRULayouts }, + {L"0000044F", L"0", L"1", L"2", L"Sanskrit", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, saINLayouts }, + {L"00000C1A", L"1251", L"855", L"10007", L"Serbian (Cyrillic)", L"1", enUSPages, enUSErrorEntries, enUSStrings, CyrillicFonts, srSPLayouts }, + {L"0000081A", L"1250", L"852", L"10029", L"Serbian (Latin)", L"1", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, srSPLayouts }, + {L"0000041B", L"1250", L"852", L"10029", L"Slovak", L"421", skSKPages, skSKErrorEntries, skSKStrings, LatinFonts, skSKLayouts }, + {L"00000424", L"1250", L"852", L"10029", L"Slovenian", L"386", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, slSILayouts }, + {L"0000040A", L"1252", L"850", L"10000", L"Spanish (Traditional Sort)", L"1", esESPages, esESErrorEntries, esESStrings, LatinFonts, esESLayouts }, + {L"0000080A", L"1252", L"850", L"10000", L"Spanish (Mexico)", L"52", esESPages, esESErrorEntries, esESStrings, LatinFonts, esMXLayouts }, + {L"00000C0A", L"1252", L"850", L"10000", L"Spanish (International Sort)", L"1", esESPages, esESErrorEntries, esESStrings, LatinFonts, esESLayouts }, + {L"0000100A", L"1252", L"850", L"10000", L"Spanish (Guatemala)", L"1", esESPages, esESErrorEntries, esESStrings, LatinFonts, esGTLayouts }, + {L"0000140A", L"1252", L"850", L"10000", L"Spanish (Costa Rica)", L"1", esESPages, esESErrorEntries, esESStrings, LatinFonts, esCRLayouts }, + {L"0000180A", L"1252", L"850", L"10000", L"Spanish (Panama)", L"1", esESPages, esESErrorEntries, esESStrings, LatinFonts, esPALayouts }, + {L"00001C0A", L"1252", L"850", L"10000", L"Spanish (Dominican Republic)", L"110", esESPages, esESErrorEntries, esESStrings, LatinFonts, esDOLayouts }, + {L"0000200A", L"1252", L"850", L"10000", L"Spanish (Venezuela)", L"58", esESPages, esESErrorEntries, esESStrings, LatinFonts, esVELayouts }, + {L"0000240A", L"1252", L"850", L"10000", L"Spanish (Colombia)", L"57", esESPages, esESErrorEntries, esESStrings, LatinFonts, esCOLayouts }, + {L"0000280A", L"1252", L"850", L"10000", L"Spanish (Peru)", L"1", esESPages, esESErrorEntries, esESStrings, LatinFonts, esPELayouts }, + {L"00002C0A", L"1252", L"850", L"10000", L"Spanish (Argentina)", L"54", esESPages, esESErrorEntries, esESStrings, LatinFonts, esARLayouts }, + {L"0000300A", L"1252", L"850", L"10000", L"Spanish (Ecuador)", L"1", esESPages, esESErrorEntries, esESStrings, LatinFonts, esECLayouts }, + {L"0000340A", L"1252", L"850", L"10000", L"Spanish (Chile)", L"56", esESPages, esESErrorEntries, esESStrings, LatinFonts, esCLLayouts }, + {L"0000380A", L"1252", L"850", L"10000", L"Spanish (Uruguay)", L"1", esESPages, esESErrorEntries, esESStrings, LatinFonts, esUYLayouts }, + {L"00003C0A", L"1252", L"850", L"10000", L"Spanish (Paraguay)", L"1", esESPages, esESErrorEntries, esESStrings, LatinFonts, esPYLayouts }, + {L"0000400A", L"1252", L"850", L"10000", L"Spanish (Bolivia)", L"1", esESPages, esESErrorEntries, esESStrings, LatinFonts, esBOLayouts }, + {L"0000440A", L"1252", L"850", L"10000", L"Spanish (El Salvador)", L"1", esESPages, esESErrorEntries, esESStrings, LatinFonts, esSVLayouts }, + {L"0000480A", L"1252", L"850", L"10000", L"Spanish (Honduras)", L"1", esESPages, esESErrorEntries, esESStrings, LatinFonts, esHNLayouts }, + {L"00004C0A", L"1252", L"850", L"10000", L"Spanish (Nicaragua)", L"1", esESPages, esESErrorEntries, esESStrings, LatinFonts, esNILayouts }, + {L"0000500A", L"1252", L"850", L"10000", L"Spanish (Puerto Rico)", L"1", esESPages, esESErrorEntries, esESStrings, LatinFonts, esPRLayouts }, + {L"00000441", L"1252", L"437", L"10000", L"Swahili", L"1", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, swKELayouts }, + {L"0000041D", L"1252", L"850", L"10000", L"Swedish", L"46", svSEPages, svSEErrorEntries, svSEStrings, LatinFonts, svSELayouts }, + {L"0000081D", L"1252", L"850", L"10000", L"Swedish (Finland)", L"358", svSEPages, svSEErrorEntries, svSEStrings, LatinFonts, svFILayouts }, + {L"0000045A", L"0", L"1", L"2", L"Syriac (Syria)", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, syrSYLayouts}, + {L"00000449", L"0", L"1", L"2", L"Tamil", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, taINLayouts }, + {L"00000444", L"1251", L"866", L"10007", L"Tatar", L"1", enUSPages, enUSErrorEntries, enUSStrings, CyrillicFonts, ttTALayouts }, + {L"0000044A", L"0", L"1", L"2", L"Telugu (India)", L"91", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, teINLayouts }, + {L"0000041E", L"874", L"874", L"10021", L"Thai", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, thTHLayouts }, + {L"0000041F", L"1254", L"857", L"10081", L"Turkish", L"90", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, trTRLayouts }, + {L"00000422", L"1251", L"866", L"10017", L"Ukrainian", L"380", ukUAPages, ukUAErrorEntries, ukUAStrings, CyrillicFonts, ukUALayouts }, + {L"00000420", L"1256", L"720", L"10004", L"Urdu", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, urPKLayouts }, + {L"00000443", L"1254", L"857", L"10029", L"Uzbek (Latin)", L"998", enUSPages, enUSErrorEntries, enUSStrings, CyrillicFonts, uzUZLayouts }, + {L"00000843", L"1251", L"866", L"10007", L"Uzbek (Cyrillic)", L"998", enUSPages, enUSErrorEntries, enUSStrings, CyrillicFonts, uzUZLayouts }, + {L"0000042A", L"1258", L"1258",L"10000", L"Vietnamese", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, viVNLayouts }, + {L"00000435", L"1252", L"850", L"10000", L"Zulu", L"1", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, enUSLayouts }, {NULL, NULL, NULL, NULL, NULL, NULL} }; Modified: trunk/reactos/base/setup/usetup/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/settings… ============================================================================== --- trunk/reactos/base/setup/usetup/settings.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/settings.c [iso-8859-1] Thu Feb 5 07:50:49 2009 @@ -944,4 +944,47 @@ } #endif +BOOLEAN +SetGeoID(PWCHAR Id) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING KeyName; + UNICODE_STRING ValueName; + HANDLE KeyHandle; + WCHAR szKeyName[] = L"\\Registry\\User\\.DEFAULT\\Control Panel\\International\\Geo"; + WCHAR szValueName[] = L"Nation"; + NTSTATUS Status; + RtlInitUnicodeString(&KeyName, + szKeyName); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = NtOpenKey(&KeyHandle, + KEY_ALL_ACCESS, + &ObjectAttributes); + if(!NT_SUCCESS(Status)) + { + DPRINT1("NtOpenKey() failed (Status %lx)\n", Status); + return FALSE; + } + RtlInitUnicodeString(&ValueName, szValueName); + Status = NtSetValueKey(KeyHandle, + &ValueName, + 0, + REG_SZ, + (PVOID)Id, + (wcslen(Id) * sizeof(WCHAR))); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtSetValueKey() failed (Status = %lx)\n", Status); + NtClose(KeyHandle); + return FALSE; + } + + return TRUE; +} + /* EOF */ Modified: trunk/reactos/base/setup/usetup/settings.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/settings… ============================================================================== --- trunk/reactos/base/setup/usetup/settings.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/settings.h [iso-8859-1] Thu Feb 5 07:50:49 2009 @@ -63,6 +63,9 @@ BOOLEAN ProcessKeyboardLayoutFiles(PGENERIC_LIST List); +BOOLEAN +SetGeoID(PWCHAR Id); + #endif /* __SETTINGS_H__ */ /* EOF */

1 0

[dchapyshev] 39408: - Add RegSaveKeyExA/W to winreg.h - Uncomment RegSaveKeyExA/W in advapi32.def - Implement RegSaveKeyExA - Add stub for RegSaveKeyExW
by dchapyshev＠svn.reactos.org 05 Feb '09

05 Feb '09

Author: dchapyshev Date: Thu Feb 5 07:47:51 2009 New Revision: 39408 URL: http://svn.reactos.org/svn/reactos?rev=39408&view=rev Log: - Add RegSaveKeyExA/W to winreg.h - Uncomment RegSaveKeyExA/W in advapi32.def - Implement RegSaveKeyExA - Add stub for RegSaveKeyExW Modified: trunk/reactos/dll/win32/advapi32/advapi32.def trunk/reactos/dll/win32/advapi32/reg/reg.c trunk/reactos/include/psdk/winreg.h Modified: trunk/reactos/dll/win32/advapi32/advapi32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3… ============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.def [iso-8859-1] Thu Feb 5 07:47:51 2009 @@ -528,8 +528,8 @@ RegRestoreKeyA@12 RegRestoreKeyW@12 RegSaveKeyA@12 -;RegSaveKeyExA -;RegSaveKeyExW +RegSaveKeyExA@16 +RegSaveKeyExW@16 RegSaveKeyW@12 RegSetKeySecurity@12 RegSetKeyValueA@24 Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] Thu Feb 5 07:47:51 2009 @@ -4694,6 +4694,50 @@ /************************************************************************ + * RegSaveKeyExA + * + * @implemented + */ +LONG +WINAPI +RegSaveKeyExA(HKEY hKey, + LPCSTR lpFile, + LPSECURITY_ATTRIBUTES lpSecurityAttributes, + DWORD Flags) +{ + UNICODE_STRING FileName; + LONG ErrorCode; + + RtlCreateUnicodeStringFromAsciiz(&FileName, + (LPSTR)lpFile); + ErrorCode = RegSaveKeyExW(hKey, + FileName.Buffer, + lpSecurityAttributes, + Flags); + RtlFreeUnicodeString(&FileName); + + return ErrorCode; +} + + +/************************************************************************ + * RegSaveKeyExW + * + * @unimplemented + */ +LONG +WINAPI +RegSaveKeyExW(HKEY hKey, + LPCWSTR lpFile, + LPSECURITY_ATTRIBUTES lpSecurityAttributes, + DWORD Flags) +{ + FIXME("RegSaveKeyExW() not implemented!\n"); + return ERROR_INVALID_PARAMETER; +} + + +/************************************************************************ * RegSetKeySecurity * * @implemented Modified: trunk/reactos/include/psdk/winreg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winreg.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/winreg.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winreg.h [iso-8859-1] Thu Feb 5 07:47:51 2009 @@ -93,6 +93,8 @@ LONG WINAPI RegDeleteValueW(HKEY,LPCWSTR); #if (_WIN32_WINNT >= 0x0500) LONG WINAPI RegDisablePredefinedCache(VOID); +LONG WINAPI RegSaveKeyExA(HKEY,LPCSTR,LPSECURITY_ATTRIBUTES,DWORD); +LONG WINAPI RegSaveKeyExW(HKEY,LPCWSTR,LPSECURITY_ATTRIBUTES,DWORD); #endif #if (_WIN32_WINNT >= 0x0600) LONG WINAPI RegDisablePredefinedCacheEx(VOID); @@ -188,6 +190,7 @@ #define RegReplaceKey RegReplaceKeyW #define RegRestoreKey RegRestoreKeyW #define RegSaveKey RegSaveKeyW +#define RegSaveKeyEx RegSaveKeyExW #if (_WIN32_WINNT >= 0x0600) #define RegSetKeyValue RegSetKeyValueW #endif @@ -230,6 +233,7 @@ #define RegReplaceKey RegReplaceKeyA #define RegRestoreKey RegRestoreKeyA #define RegSaveKey RegSaveKeyA +#define RegSaveKeyEx RegSaveKeyExA #if (_WIN32_WINNT >= 0x0600) #define RegSetKeyValue RegSetKeyValueA #endif

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