[PATCH 0/3] MR1132: Win32u: Add font links for Yu Gothic UI, Meiryo, MS Mincho.
More font links are added to avoid issues related to missing font links. Data comes from: https://testbot.winehq.org/JobDetails.pl?Key=125079 -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1132
From: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/win32u/font.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c index 9ead47e1983..a414da19287 100644 --- a/dlls/win32u/font.c +++ b/dlls/win32u/font.c @@ -1534,6 +1534,16 @@ static const WCHAR microsoft_jheng_hei_ui_boldW[] = {'M','i','c','r','o','s','o','f','t',' ','J','h','e','n','g','H','e','i',' ','U','I',' ','B','o','l','d',0}; static const WCHAR microsoft_jheng_hei_ui_lightW[] = {'M','i','c','r','o','s','o','f','t',' ','J','h','e','n','g','H','e','i',' ','U','I',' ','L','i','g','h','t',0}; +static const WCHAR yu_gothic_uiW[] = + {'Y','u',' ','G','o','t','h','i','c',' ','U','I',0}; +static const WCHAR yu_gothic_ui_boldW[] = + {'Y','u',' ','G','o','t','h','i','c',' ','U','I',' ','B','o','l','d',0}; +static const WCHAR yu_gothic_ui_lightW[] = + {'Y','u',' ','G','o','t','h','i','c',' ','U','I',' ','L','i','g','h','t',0}; +static const WCHAR yu_gothic_ui_semilightW[] = + {'Y','u',' ','G','o','t','h','i','c',' ','U','I',' ','S','e','m','i','l','i','g','h','t',0}; +static const WCHAR yu_gothic_ui_semiboldW[] = + {'Y','u',' ','G','o','t','h','i','c',' ','U','I',' ','S','e','m','i','b','o','l','d',0}; static const WCHAR * const font_links_list[] = { @@ -1777,6 +1787,41 @@ static const char system_link_ming_li_u_hkscs_ext_b[] = "MALGUN.TTF,Malgun Gothic\0" "SEGUISYM.TTF,Segoe UI Symbol\0"; +static const char system_link_yu_gothic_ui[] = + "SEGOEUI.TTF,Segoe UI\0" + "MSJH.TTC,Microsoft JhengHei\0" + "MSYH.TTC,Microsoft YaHei\0" + "MALGUN.TTF,Malgun Gothic\0" + "SEGUISYM.TTF,Segoe UI Symbol\0"; + +static const char system_link_yu_gothic_ui_bold[] = + "SEGOEUIB.TTF,Segoe UI Bold\0" + "MSJHBD.TTC,Microsoft Jhenghei UI Bold\0" + "MSYHBD.TTC,Microsoft YaHei Bold\0" + "MALGUNBD.TTF,Malgun Gothic Bold\0" + "SEGUISYM.TTF,Segoe UI Symbol\0"; + +static const char system_link_yu_gothic_ui_light[] = + "SEGOEUIL.TTF,Segoe UI Light\0" + "MSJHL.TTC,Microsoft Jhenghei UI Light\0" + "MSYHL.TTC,Microsoft YaHei Light\0" + "MALGUNSL.TTF,Malgun Gothic Semilight\0" + "SEGUISYM.TTF,Segoe UI Symbol\0"; + +static const char system_link_yu_gothic_ui_semilight[] = + "SEGOEUISL.TTF,Segoe UI Semilight\0" + "MSJH.TTC,Microsoft Jhenghei UI\0" + "MSYH.TTC,Microsoft YaHei\0" + "MALGUNSL.TTF,Malgun Gothic Semilight\0" + "SEGUISYM.TTF,Segoe UI Symbol\0"; + +static const char system_link_yu_gothic_ui_semibold[] = + "SEGUISB.TTF,Segoe UI Semibold\0" + "MSJH.TTC,Microsoft Jhenghei UI\0" + "MSYH.TTC,Microsoft YaHei\0" + "MALGUN.TTF,Malgun Gothic\0" + "SEGUISYM.TTF,Segoe UI Symbol\0"; + static const struct system_link_reg { const WCHAR *font_name; @@ -1832,6 +1877,11 @@ default_system_link[] = { ming_li_u_ext_bW, FALSE, system_link_ming_li_u_ext_b, sizeof(system_link_ming_li_u_ext_b) }, { p_ming_li_u_ext_bW, FALSE, system_link_p_ming_li_u_ext_b, sizeof(system_link_p_ming_li_u_ext_b) }, { ming_li_u_hkscs_ext_bW, FALSE, system_link_ming_li_u_hkscs_ext_b, sizeof(system_link_ming_li_u_hkscs_ext_b) }, + { yu_gothic_uiW, FALSE, system_link_yu_gothic_ui, sizeof(system_link_yu_gothic_ui) }, + { yu_gothic_ui_boldW, FALSE, system_link_yu_gothic_ui_bold, sizeof(system_link_yu_gothic_ui_bold) }, + { yu_gothic_ui_lightW, FALSE, system_link_yu_gothic_ui_light, sizeof(system_link_yu_gothic_ui_light) }, + { yu_gothic_ui_semiboldW, FALSE, system_link_yu_gothic_ui_semibold, sizeof(system_link_yu_gothic_ui_semibold) }, + { yu_gothic_ui_semilightW, FALSE, system_link_yu_gothic_ui_semilight, sizeof(system_link_yu_gothic_ui_semilight) }, }; static void populate_system_links( const WCHAR *name, const WCHAR * const *values ) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1132
From: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/win32u/font.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c index a414da19287..505c29c469b 100644 --- a/dlls/win32u/font.c +++ b/dlls/win32u/font.c @@ -1544,6 +1544,14 @@ static const WCHAR yu_gothic_ui_semilightW[] = {'Y','u',' ','G','o','t','h','i','c',' ','U','I',' ','S','e','m','i','l','i','g','h','t',0}; static const WCHAR yu_gothic_ui_semiboldW[] = {'Y','u',' ','G','o','t','h','i','c',' ','U','I',' ','S','e','m','i','b','o','l','d',0}; +static const WCHAR meiryoW[] = + {'M','e','i','r','y','o',0}; +static const WCHAR meiryo_boldW[] = + {'M','e','i','r','y','o',' ','B','o','l','d',0}; +static const WCHAR meiryo_uiW[] = + {'M','e','i','r','y','o',' ','U','I',0}; +static const WCHAR meiryo_ui_boldW[] = + {'M','e','i','r','y','o',' ','U','I',' ','B','o','l','d',0}; static const WCHAR * const font_links_list[] = { @@ -1822,6 +1830,42 @@ static const char system_link_yu_gothic_ui_semibold[] = "MALGUN.TTF,Malgun Gothic\0" "SEGUISYM.TTF,Segoe UI Symbol\0"; +static const char system_link_meiryo[] = + "SEGOEUI.TTF,Segoe UI\0" + "YUGOTHM.TTC,Yu Gothic UI\0" + "MSGOTHIC.TTC,MS UI Gothic\0" + "MSJH.TTC,Microsoft JhengHei\0" + "MSYH.TTC,Microsoft YaHei\0" + "MALGUN.TTF,Malgun Gothic\0" + "SEGUISYM.TTF,Segoe UI Symbol\0"; + +static const char system_link_meiryo_bold[] = + "SEGOEUIB.TTF,Segoe UI Bold\0" + "YUGOTHB.TTC,Yu Gothic UI Bold\0" + "MSGOTHIC.TTC,MS UI Gothic\0" + "MSJHBD.TTC,Microsoft Jhenghei Bold\0" + "MSYHBD.TTC,Microsoft YaHei Bold\0" + "MALGUNBD.TTF,Malgun Gothic Bold\0" + "SEGUISYM.TTF,Segoe UI Symbol\0"; + +static const char system_link_meiryo_ui[] = + "SEGOEUI.TTF,Segoe UI\0" + "YUGOTHM.TTC,Yu Gothic UI\0" + "MSGOTHIC.TTC,MS UI Gothic\0" + "MSJH.TTC,Microsoft Jhenghei UI\0" + "MSYH.TTC,Microsoft YaHei UI\0" + "MALGUN.TTF,Malgun Gothic\0" + "SEGUISYM.TTF,Segoe UI Symbol\0"; + +static const char system_link_meiryo_ui_bold[] = + "SEGOEUIB.TTF,Segoe UI Bold\0" + "YUGOTHB.TTC,Yu Gothic UI Bold\0" + "MSGOTHIC.TTC,MS UI Gothic\0" + "MSJHBD.TTC,Microsoft Jhenghei UI Bold\0" + "MSYHBD.TTC,Microsoft YaHei UI Bold\0" + "MALGUNBD.TTF,Malgun Gothic Bold\0" + "SEGUISYM.TTF,Segoe UI Symbol\0"; + static const struct system_link_reg { const WCHAR *font_name; @@ -1882,6 +1926,10 @@ default_system_link[] = { yu_gothic_ui_lightW, FALSE, system_link_yu_gothic_ui_light, sizeof(system_link_yu_gothic_ui_light) }, { yu_gothic_ui_semiboldW, FALSE, system_link_yu_gothic_ui_semibold, sizeof(system_link_yu_gothic_ui_semibold) }, { yu_gothic_ui_semilightW, FALSE, system_link_yu_gothic_ui_semilight, sizeof(system_link_yu_gothic_ui_semilight) }, + { meiryoW, FALSE, system_link_meiryo, sizeof(system_link_meiryo) }, + { meiryo_boldW, FALSE, system_link_meiryo_bold, sizeof(system_link_meiryo_bold) }, + { meiryo_uiW, FALSE, system_link_meiryo_ui, sizeof(system_link_meiryo_ui) }, + { meiryo_ui_boldW, FALSE, system_link_meiryo_ui_bold, sizeof(system_link_meiryo_ui_bold) }, }; static void populate_system_links( const WCHAR *name, const WCHAR * const *values ) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1132
From: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/win32u/font.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c index 505c29c469b..6746f7fcb40 100644 --- a/dlls/win32u/font.c +++ b/dlls/win32u/font.c @@ -1552,6 +1552,10 @@ static const WCHAR meiryo_uiW[] = {'M','e','i','r','y','o',' ','U','I',0}; static const WCHAR meiryo_ui_boldW[] = {'M','e','i','r','y','o',' ','U','I',' ','B','o','l','d',0}; +static const WCHAR ms_minchoW[] = + {'M','S',' ','M','i','n','c','h','o',0}; +static const WCHAR ms_p_minchoW[] = + {'M','S',' ','P','M','i','n','c','h','o',0}; static const WCHAR * const font_links_list[] = { @@ -1866,6 +1870,26 @@ static const char system_link_meiryo_ui_bold[] = "MALGUNBD.TTF,Malgun Gothic Bold\0" "SEGUISYM.TTF,Segoe UI Symbol\0"; +static const char system_link_ms_mincho[] = + "MINGLIU.TTC,MingLiU\0" + "SIMSUN.TTC,SimSun\0" + "BATANG.TTC,Batang\0" + "YUGOTHM.TTC,Yu Gothic UI\0" + "MSJH.TTC,Microsoft JhengHei UI\0" + "MSYH.TTC,Microsoft YaHei UI\0" + "MALGUN.TTF,Malgun Gothic\0" + "SEGUISYM.TTF,Segoe UI Symbol\0"; + +static const char system_link_ms_p_mincho[] = + "MINGLIU.TTC,PMingLiU\0" + "SIMSUN.TTC,SimSun\0" + "BATANG.TTC,Batang\0" + "YUGOTHM.TTC,Yu Gothic UI\0" + "MSJH.TTC,Microsoft JhengHei UI\0" + "MSYH.TTC,Microsoft YaHei UI\0" + "MALGUN.TTF,Malgun Gothic\0" + "SEGUISYM.TTF,Segoe UI Symbol\0"; + static const struct system_link_reg { const WCHAR *font_name; @@ -1930,6 +1954,8 @@ default_system_link[] = { meiryo_boldW, FALSE, system_link_meiryo_bold, sizeof(system_link_meiryo_bold) }, { meiryo_uiW, FALSE, system_link_meiryo_ui, sizeof(system_link_meiryo_ui) }, { meiryo_ui_boldW, FALSE, system_link_meiryo_ui_bold, sizeof(system_link_meiryo_ui_bold) }, + { ms_minchoW, FALSE, system_link_ms_mincho, sizeof(system_link_ms_mincho) }, + { ms_p_minchoW, FALSE, system_link_ms_p_mincho, sizeof(system_link_ms_p_mincho) }, }; static void populate_system_links( const WCHAR *name, const WCHAR * const *values ) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1132
Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=125230 Your paranoid android. === debian11 (build log) === Task: Could not create the win32 wineprefix: Failed to disable the crash dialogs: Task: WineTest did not produce the win32 report
This merge request was approved by Huw Davies. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1132
participants (4)
-
Huw Davies (＠huw) -
Marvin -
Ziqing Hui
-
Ziqing Hui (＠zhui)