Alexandre Julliard : gdi32: Don'
t assume that the font codepages change with the user locale.
Alexandre Julliard
julliard at wine.codeweavers.com
Fri Dec 8 06:07:15 CST 2006
Module: wine
Branch: master
Commit: 33eadd39d4278718ea552b3ef6b6068401066622
URL: http://source.winehq.org/git/wine.git/?a=commit;h=33eadd39d4278718ea552b3ef6b6068401066622
Author: Alexandre Julliard <julliard at winehq.org>
Date: Fri Dec 8 13:00:53 2006 +0100
gdi32: Don't assume that the font codepages change with the user locale.
Codepages can be set independently with LC_CTYPE.
---
dlls/gdi32/freetype.c | 27 +++++++++++++--------------
1 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c
index ab4a266..9344515 100644
--- a/dlls/gdi32/freetype.c
+++ b/dlls/gdi32/freetype.c
@@ -1558,36 +1558,35 @@ static void add_font_list(HKEY hkey, con
static void update_font_info(void)
{
- char buf[80];
+ char buf[40], cpbuf[40];
DWORD len, type;
HKEY hkey = 0;
UINT i, ansi_cp = 0, oem_cp = 0;
- LCID lcid = GetUserDefaultLCID();
if (RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Fonts", &hkey) != ERROR_SUCCESS)
return;
+ GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_IDEFAULTANSICODEPAGE|LOCALE_RETURN_NUMBER|LOCALE_NOUSEROVERRIDE,
+ (WCHAR *)&ansi_cp, sizeof(ansi_cp)/sizeof(WCHAR));
+ GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_IDEFAULTCODEPAGE|LOCALE_RETURN_NUMBER|LOCALE_NOUSEROVERRIDE,
+ (WCHAR *)&oem_cp, sizeof(oem_cp)/sizeof(WCHAR));
+ sprintf( cpbuf, "%u,%u", ansi_cp, oem_cp );
+
len = sizeof(buf);
- if (RegQueryValueExA(hkey, "Locale", 0, &type, (BYTE *)buf, &len) == ERROR_SUCCESS && type == REG_SZ)
+ if (RegQueryValueExA(hkey, "Codepages", 0, &type, (BYTE *)buf, &len) == ERROR_SUCCESS && type == REG_SZ)
{
- if (strtoul(buf, NULL, 16 ) == lcid) /* already set correctly */
+ if (!strcmp( buf, cpbuf )) /* already set correctly */
{
RegCloseKey(hkey);
return;
}
- TRACE("updating registry, locale changed %s -> %08x\n", debugstr_a(buf), lcid);
+ TRACE("updating registry, codepages changed %s -> %u,%u\n", buf, ansi_cp, oem_cp);
}
- else TRACE("updating registry, locale changed none -> %08x\n", lcid);
+ else TRACE("updating registry, codepages changed none -> %u,%u\n", ansi_cp, oem_cp);
- sprintf(buf, "%08x", lcid);
- RegSetValueExA(hkey, "Locale", 0, REG_SZ, (const BYTE *)buf, strlen(buf)+1);
+ RegSetValueExA(hkey, "Codepages", 0, REG_SZ, (const BYTE *)cpbuf, strlen(cpbuf)+1);
RegCloseKey(hkey);
- GetLocaleInfoW(lcid, LOCALE_IDEFAULTANSICODEPAGE|LOCALE_RETURN_NUMBER|LOCALE_NOUSEROVERRIDE,
- (WCHAR *)&ansi_cp, sizeof(ansi_cp)/sizeof(WCHAR));
- GetLocaleInfoW(lcid, LOCALE_IDEFAULTCODEPAGE|LOCALE_RETURN_NUMBER|LOCALE_NOUSEROVERRIDE,
- (WCHAR *)&oem_cp, sizeof(oem_cp)/sizeof(WCHAR));
-
for (i = 0; i < sizeof(nls_update_font_list)/sizeof(nls_update_font_list[0]); i++)
{
if (nls_update_font_list[i].ansi_cp == ansi_cp &&
@@ -1612,7 +1611,7 @@ static void update_font_info(void)
return;
}
}
- FIXME("there is no font defaults for lcid %04x/ansi_cp %u\n", lcid, ansi_cp);
+ FIXME("there is no font defaults for codepages %u,%u\n", ansi_cp, oem_cp);
}
/*************************************************************
More information about the wine-cvs
mailing list