On Fri, Sep 23, 2005 at 01:38:39PM -0500, Aric Stewart wrote:
Implement a basic beginning for fnIMLangFontLink_CodePageToCodePages, fnIMLangFontLink_CodePagesToCodePage and fnIMLangFontLink_GetFontCodePages. Also some tests for the new functions.
Index: dlls/mlang/mlang.c =================================================================== RCS file: /home/wine/wine/dlls/mlang/mlang.c,v retrieving revision 1.23 diff -u -r1.23 mlang.c --- dlls/mlang/mlang.c 7 Sep 2005 11:31:18 -0000 1.23 +++ dlls/mlang/mlang.c 23 Sep 2005 18:36:58 -0000 @@ -449,6 +449,63 @@ "Courier","Arial" } /* FIXME */ };
+#define FS(x) {{0,0,0,0},{0x1<<(x),0}} +#define MAXTCIINDEX 32 +static const CHARSETINFO FONT_tci[MAXTCIINDEX] = { + /* ANSI */ + { ANSI_CHARSET, 1252, FS(0)}, + { EASTEUROPE_CHARSET, 1250, FS(1)}, + { RUSSIAN_CHARSET, 1251, FS(2)}, + { GREEK_CHARSET, 1253, FS(3)}, + { TURKISH_CHARSET, 1254, FS(4)}, + { HEBREW_CHARSET, 1255, FS(5)}, + { ARABIC_CHARSET, 1256, FS(6)}, + { BALTIC_CHARSET, 1257, FS(7)}, + { VIETNAMESE_CHARSET, 1258, FS(8)},
As I mentioned on IRC, all this stuff is available through TranslateCharsetInfo, so why duplicate all thia? Huw.
I did not see a way to go both ways. From a CHARSET to CodePage was given in TranslateCharsetInfo but unless i missed it there was not a way to go from CodePage to CHARSET. If there is a way then i can make that work then I will change things to use that instead. -aric Huw D M Davies wrote:
On Fri, Sep 23, 2005 at 01:38:39PM -0500, Aric Stewart wrote:
Implement a basic beginning for fnIMLangFontLink_CodePageToCodePages, fnIMLangFontLink_CodePagesToCodePage and fnIMLangFontLink_GetFontCodePages. Also some tests for the new functions.
Index: dlls/mlang/mlang.c =================================================================== RCS file: /home/wine/wine/dlls/mlang/mlang.c,v retrieving revision 1.23 diff -u -r1.23 mlang.c --- dlls/mlang/mlang.c 7 Sep 2005 11:31:18 -0000 1.23 +++ dlls/mlang/mlang.c 23 Sep 2005 18:36:58 -0000 @@ -449,6 +449,63 @@ "Courier","Arial" } /* FIXME */ };
+#define FS(x) {{0,0,0,0},{0x1<<(x),0}} +#define MAXTCIINDEX 32 +static const CHARSETINFO FONT_tci[MAXTCIINDEX] = { + /* ANSI */ + { ANSI_CHARSET, 1252, FS(0)}, + { EASTEUROPE_CHARSET, 1250, FS(1)}, + { RUSSIAN_CHARSET, 1251, FS(2)}, + { GREEK_CHARSET, 1253, FS(3)}, + { TURKISH_CHARSET, 1254, FS(4)}, + { HEBREW_CHARSET, 1255, FS(5)}, + { ARABIC_CHARSET, 1256, FS(6)}, + { BALTIC_CHARSET, 1257, FS(7)}, + { VIETNAMESE_CHARSET, 1258, FS(8)},
As I mentioned on IRC, all this stuff is available through TranslateCharsetInfo, so why duplicate all thia?
Huw.
"Aric Stewart" <aric(a)codeweavers.com> wrote:
I did not see a way to go both ways. From a CHARSET to CodePage was given in TranslateCharsetInfo but unless i missed it there was not a way to go from CodePage to CHARSET. If there is a way then i can make that work then I will change things to use that instead.
Isn't that TCI_SRCCODEPAGE is for? -- Dmitry.
Well, looks like i misread the MSDN page on that one. Thanks! I will rewrite those parts of the code to use that. -aric Dmitry Timoshkov wrote:
"Aric Stewart" <aric(a)codeweavers.com> wrote:
I did not see a way to go both ways. From a CHARSET to CodePage was given in TranslateCharsetInfo but unless i missed it there was not a way to go from CodePage to CHARSET. If there is a way then i can make that work then I will change things to use that instead.
Isn't that TCI_SRCCODEPAGE is for?
participants (3)
-
Aric Stewart -
Dmitry Timoshkov -
Huw D M Davies