[WIN32SS][FONT] Fix the system logical stock font data #709

katahiromz · 2018-07-28T14:21:20Z

Purpose

JIRA issue: CORE-14885
This PR will fix the stock font data to improve font selection.

JoachimHenze · 2018-07-28T14:58:15Z

Some observations when applying PR-709 as is on top of 0.4.10-dev-370-g8f44035:
-hell does not come down to earth, even when applying this on its own right here and right now.

patch has no visible effects for me on:
-the fi/fli issue CORE-12091 can not longer be observed with Tahoma 12 in Wordpad (but it's still there, we just have to use smaller font sizes in Wordpad to make it happen atm)
-msi dialogs are still too large CORE-13161 and Total Commander fonts CORE-11620 are still too large, which means the freetype.c changes within https://jira.reactos.org/secure/attachment/47727/47727_CORE-11620-totalCommanderFontSizePatch.patch is what actually fixes those.
-CORE-13211 (the right arrows) are still present
-Abiword 2.6.8 font-size issues, text overflow in about tab 'others', font size in about tab is suspiciously small, is still present
-CORE-14778 (Python idle fonts) is still present

patch will influence:
-the freetype.c changes applied on its own do lead to regressions (in rapps) but 'fix system stock fonts' commit1-changes will mitigate those. that's what I consider the beneficial part of PR-709 from testers pov

If others think PR-709 is correct from technical POV (and more like 2k3), then I think it's reasonable to commit it. I did not check that part myself!

katahiromz · 2018-07-29T02:12:00Z

My test program I made:
https://jira.reactos.org/secure/attachment/47775/StockFontsTest.zip

THE TEST RESULTS:
Windows 2003 English:

Windows 10 Japanese:

katahiromz · 2018-07-29T04:47:06Z

Windows XP Japanese:

Windows 7 Japanese:

katahiromz · 2018-08-07T11:07:37Z

Could you try this test program in Russian Windows 2003 or XP?

JoachimHenze · 2018-08-07T23:05:57Z

I have no russian OS available, sorry.

katahiromz · 2018-08-07T23:59:22Z

Thanks.

Win2007 Home Server Russian:

katahiromz · 2018-08-08T00:08:33Z

Thanks!

Windows XP x64 SP2 English with integrated Russian MUI:

katahiromz · 2018-08-08T00:21:15Z

OEM_FIXED_FONT is SHIFTJIS_CHARSET or OEM_CHARSET.
ANSI_FIXED_FONT and ANSI_VAR_FONT are ANSI_CHARSET.
SYSTEM_FONT, SYSTEM_FIXED_FONT and DEFAULT_GUI_FONT are the charset of the user language.

katahiromz · 2018-08-08T00:39:42Z

It seems like these data are changeable by the user language. Not fixed data.

katahiromz · 2018-08-09T16:53:41Z

@HBelusca: What's your opinion about these screenshots?

HBelusca · 2018-08-09T17:57:22Z

@katahiromz: They look good; I suppose the "discrepancies" between MS and ROS concerning lfPitchAndFamily values come from the fact we do not use the very same font files as Windows?
Also I notice that in ROS Russian the DEVICE_DEFAULT_FONT settings don't completely look the same as SYSTEM_FONT ? (lfCharSet is different).

HBelusca · 2018-08-09T17:58:34Z

win32ss/gdi/ntgdi/freetype.c

+    if (uCodePage == 1)  // CP_OEMCP
+        return OEM_CHARSET;
+
+    if (uCodePage == 2)  // CP_MACCP


Isn't it possible to use the defines names directly?

We cannot #include <winnls.h> at here, and if included <windows.h> then compilation will be slow...

HBelusca · 2018-08-09T18:04:11Z

win32ss/gdi/ntgdi/freetype.c

@@ -160,6 +160,28 @@ static const CHARSETINFO g_FontTci[MAXTCIINDEX] =
    { SYMBOL_CHARSET, CP_SYMBOL, {{0,0,0,0},{FS_SYMBOL,0}} }
 };

+BYTE FASTCALL IntCharSetFromCodePage(UINT uCodePage)


I would suggest to add a comment that refers to gdi/gdi32/objects/font.c!TranslateCharsetInfo() function, in the TCI_SRCCODEPAGE case.

HBelusca · 2018-08-09T18:41:14Z

win32ss/gdi/gdi32/objects/font.c

@@ -1978,6 +1978,7 @@ TranslateCharsetInfo(
        while (index < MAXTCIINDEX && !(*lpSrc>>index & 0x0001)) index++;
        break;
    case TCI_SRCCODEPAGE:
+        /* ciACP is also referred by IntCharSetFromCodePage() function */


Actually I was thinking about adding the comment in IntCharSetFromCodePage(), not here.

katahiromz · 2018-08-09T21:53:19Z

English AFTER:

Japanese AFTER:

Russian AFTER:

It's perfect!

learn-more

One comment,
other than that, lgtm.

Amazing work!

learn-more · 2018-08-10T08:05:41Z

win32ss/gdi/ntgdi/stockobj.c

+    BOOL bIsCJK;
+    static const WCHAR SimSun[] = { 0x5B8B, 0x4F53, 0 };
+    static const WCHAR MingLiU[] = { 0x7D30, 0x660E, 0x9AD4 };
+    static const WCHAR Batang[] = { 0xBC14, 0xD0D5 };


Both MingLiU and Batang need a null-terminator, if they are used with wcscpy.

HBelusca · 2018-08-10T11:30:40Z

Can we merge this PR even if PR #713 hasn't been merged yet?

katahiromz · 2018-08-10T11:37:08Z

Yeah, OK. There's no significant change in looking.

HBelusca · 2018-08-10T13:36:02Z

Thanks, let's go!

[WIN32SS][FONT] Fix stock fonts

43ec4f6

katahiromz changed the title ~~[WIN32SS][FONT] Fix stock fonts~~ [WIN32SS][FONT] Fix the stock fonts Jul 28, 2018

katahiromz changed the title ~~[WIN32SS][FONT] Fix the stock fonts~~ [WIN32SS][FONT] Fix the system stock font datas Jul 28, 2018

katahiromz changed the title ~~[WIN32SS][FONT] Fix the system stock font datas~~ [WIN32SS][FONT] Fix the system stock fonts Jul 28, 2018

katahiromz changed the title ~~[WIN32SS][FONT] Fix the system stock fonts~~ [WIN32SS][FONT] Fix the system logical stock font data Jul 29, 2018

katahiromz added 3 commits August 9, 2018 13:07

Merge remote-tracking branch 'upstream/master' into stock-font-fix

9e3e8d7

add IntCharSetFromCodePage function and update lfCharSet of stock fonts

437922e

OEM_CHARSET workaround

dcd5512

create CreateStockFonts function and use it

1f33f22

HBelusca reviewed Aug 9, 2018

View reviewed changes

katahiromz added 6 commits August 10, 2018 03:05

special handling for FAR EAST

f085b21

define CP_OEMCP and CP_MACCP

5b18fb5

fix lfPitchAndFamily values

2c616a0

fix DeviceDefaultFont.lfCharSet

dad45bf

add a comment for TCI_SRCCODEPAGE

c14fb50

s/Tahoma/MS Shell Dlg/

bb28074

HBelusca reviewed Aug 9, 2018

View reviewed changes

fix DefaultGuiFont.lfPitchAndFamily

f7fd3d9

katahiromz added 3 commits August 10, 2018 06:49

fix

f18bf2c

revert font.c

9ec82cb

add comment to IntCharSetFromCodePage

f42c8b2

learn-more approved these changes Aug 10, 2018

View reviewed changes

katahiromz added 2 commits August 10, 2018 17:10

add NULs to MingLiU and Batang strings

7e5acfb

delete extra newline

618624b

HBelusca merged commit cbfe4d0 into reactos:master Aug 10, 2018

katahiromz deleted the stock-font-fix branch August 10, 2018 22:52

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[WIN32SS][FONT] Fix the system logical stock font data #709

[WIN32SS][FONT] Fix the system logical stock font data #709

katahiromz commented Jul 28, 2018 •

edited

JoachimHenze commented Jul 28, 2018 •

edited

katahiromz commented Jul 29, 2018

katahiromz commented Jul 29, 2018

katahiromz commented Aug 7, 2018

JoachimHenze commented Aug 7, 2018

katahiromz commented Aug 7, 2018

katahiromz commented Aug 8, 2018

katahiromz commented Aug 8, 2018 •

edited

katahiromz commented Aug 8, 2018

katahiromz commented Aug 9, 2018

HBelusca commented Aug 9, 2018

HBelusca Aug 9, 2018

katahiromz Aug 9, 2018

HBelusca Aug 9, 2018

katahiromz Aug 9, 2018

HBelusca Aug 9, 2018

katahiromz commented Aug 9, 2018

learn-more left a comment

learn-more Aug 10, 2018

HBelusca commented Aug 10, 2018

katahiromz commented Aug 10, 2018 •

edited

HBelusca commented Aug 10, 2018

[WIN32SS][FONT] Fix the system logical stock font data #709

[WIN32SS][FONT] Fix the system logical stock font data #709

Conversation

katahiromz commented Jul 28, 2018 • edited

Purpose

JoachimHenze commented Jul 28, 2018 • edited

katahiromz commented Jul 29, 2018

katahiromz commented Jul 29, 2018

katahiromz commented Aug 7, 2018

JoachimHenze commented Aug 7, 2018

katahiromz commented Aug 7, 2018

katahiromz commented Aug 8, 2018

katahiromz commented Aug 8, 2018 • edited

katahiromz commented Aug 8, 2018

katahiromz commented Aug 9, 2018

HBelusca commented Aug 9, 2018

HBelusca Aug 9, 2018

Choose a reason for hiding this comment

katahiromz Aug 9, 2018

Choose a reason for hiding this comment

HBelusca Aug 9, 2018

Choose a reason for hiding this comment

katahiromz Aug 9, 2018

Choose a reason for hiding this comment

HBelusca Aug 9, 2018

Choose a reason for hiding this comment

katahiromz commented Aug 9, 2018

learn-more left a comment

Choose a reason for hiding this comment

learn-more Aug 10, 2018

Choose a reason for hiding this comment

HBelusca commented Aug 10, 2018

katahiromz commented Aug 10, 2018 • edited

HBelusca commented Aug 10, 2018

katahiromz commented Jul 28, 2018 •

edited

JoachimHenze commented Jul 28, 2018 •

edited

katahiromz commented Aug 8, 2018 •

edited

katahiromz commented Aug 10, 2018 •

edited