ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kernel32: Make sure the codepage registry keys are set correctly on wineprefix creation.

This commit is contained in:
Alexandre Julliard 2009-10-30 15:14:49 +01:00
parent f8786eacb7
commit cf8fa5459a
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
dlls/kernel32/locale.c
View File

@ -62,8 +62,6 @@ static const union cptable *oem_cptable;
static const union cptable *mac_cptable; static const union cptable *mac_cptable;
static const union cptable *unix_cptable; /* NULL if UTF8 */ static const union cptable *unix_cptable; /* NULL if UTF8 */
static HANDLE NLS_RegOpenKey(HANDLE hRootKey, LPCWSTR szKeyName);
static const WCHAR szNlsKeyName[] = { static const WCHAR szNlsKeyName[] = {
'M','a','c','h','i','n','e','\\','S','y','s','t','e','m','\\', 'M','a','c','h','i','n','e','\\','S','y','s','t','e','m','\\',
'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\',
@ -769,16 +767,22 @@ void LOCALE_InitRegistry(void)
if (locale_update_registry( hkey, lc_ctypeW, lcid_LC_CTYPE, NULL, 0 )) if (locale_update_registry( hkey, lc_ctypeW, lcid_LC_CTYPE, NULL, 0 ))
{ {
HKEY nls_key = NLS_RegOpenKey( 0, szCodepageKeyName ); OBJECT_ATTRIBUTES attr;
HANDLE nls_key;
for (i = 0; i < sizeof(update_cp_values)/sizeof(update_cp_values[0]); i++) RtlInitUnicodeString( &nameW, szCodepageKeyName );
InitializeObjectAttributes( &attr, &nameW, 0, 0, NULL );
if (!NtCreateKey( &nls_key, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL ))
{ {
count = GetLocaleInfoW( lcid, update_cp_values[i].value | LOCALE_NOUSEROVERRIDE, for (i = 0; i < sizeof(update_cp_values)/sizeof(update_cp_values[0]); i++)
bufferW, sizeof(bufferW)/sizeof(WCHAR) ); {
RtlInitUnicodeString( &nameW, update_cp_values[i].name ); count = GetLocaleInfoW( lcid, update_cp_values[i].value | LOCALE_NOUSEROVERRIDE,
NtSetValueKey( nls_key, &nameW, 0, REG_SZ, bufferW, count * sizeof(WCHAR) ); bufferW, sizeof(bufferW)/sizeof(WCHAR) );
RtlInitUnicodeString( &nameW, update_cp_values[i].name );
NtSetValueKey( nls_key, &nameW, 0, REG_SZ, bufferW, count * sizeof(WCHAR) );
}
NtClose( nls_key );
} }
NtClose( nls_key );
} }
NtClose( hkey ); NtClose( hkey );

4
tools/wine.inf.in
View File

@ -584,10 +584,6 @@ HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-99
[Nls] [Nls]
HKLM,System\CurrentControlSet\Control\Nls\Codepage,"37",,"" HKLM,System\CurrentControlSet\Control\Nls\Codepage,"37",,""
HKLM,System\CurrentControlSet\Control\Nls\Codepage,"ACP",,"1252"
HKLM,System\CurrentControlSet\Control\Nls\Codepage,"MACCP",,"10000"
HKLM,System\CurrentControlSet\Control\Nls\Codepage,"OEMCP",,"437"
HKLM,System\CurrentControlSet\Control\Nls\Language,"0401",,"" HKLM,System\CurrentControlSet\Control\Nls\Language,"0401",,""
HKLM,System\CurrentControlSet\Control\Nls\Language,"0402",,"" HKLM,System\CurrentControlSet\Control\Nls\Language,"0402",,""
HKLM,System\CurrentControlSet\Control\Nls\Language,"0403",,"" HKLM,System\CurrentControlSet\Control\Nls\Language,"0403",,""