gdi32: Use OEM codepage for bitmap fonts with OEM_CHARSET
Dmitry Groshev
wjaguar at in-trans.ru
Mon Jul 30 13:52:15 CDT 2007
-------------- next part --------------
>From 2b26703d6e378fce9f17c4e2a167bda963802dff Mon Sep 17 00:00:00 2001
From: Dmitry Groshev <wjaguar at in-trans.ru>
Date: Mon, 30 Jul 2007 22:38:46 +0400
Subject: gdi32: Use OEM codepage for bitmap fonts with OEM_CHARSET
---
dlls/gdi32/freetype.c | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c
index cdd23ef..03b3aca 100644
--- a/dlls/gdi32/freetype.c
+++ b/dlls/gdi32/freetype.c
@@ -2320,6 +2320,12 @@ static int get_nearest_charset(Face *fac
}
}
+ if (!face->scalable && !face->fs.fsCsb[0]) /* OEM */ {
+ *cp = GetOEMCP();
+ return OEM_CHARSET;
+ }
+
+
FIXME("returning DEFAULT_CHARSET face->fs.fsCsb[0] = %08x file = %s\n",
face->fs.fsCsb[0], face->file);
*cp = acp;
@@ -2717,6 +2723,7 @@ GdiFont *WineEngCreateFontInstance(DC *d
if(!TranslateCharsetInfo((DWORD*)(INT_PTR)lf.lfCharSet, &csi, TCI_SRCCHARSET)) {
switch(lf.lfCharSet) {
case DEFAULT_CHARSET:
+ case OEM_CHARSET:
csi.fs.fsCsb[0] = 0;
break;
default:
--
1.4.2.1
More information about the wine-patches
mailing list