October 2022 - Wine-commits

Alexandre Julliard : nls: Update locales that have been added in recent Windows versions.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: wine Branch: master Commit: b591b3167cf98ccc6d70871f282d8b5f98013fff URL: https://gitlab.winehq.org/wine/wine/-/commit/b591b3167cf98ccc6d70871f282d8b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 17 12:31:38 2022 +0200 nls: Update locales that have been added in recent Windows versions. --- nls/locale.nls | Bin 736194 -> 738990 bytes tools/make_unicode | 27 ++++++++++++++++++++------- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/nls/locale.nls b/nls/locale.nls index 06d1982cf5a..8ee39e44222 100644 Binary files a/nls/locale.nls and b/nls/locale.nls differ diff --git a/tools/make_unicode b/tools/make_unicode index 667df5e186f..12076252e3d 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -614,8 +614,10 @@ my @locales = { name => "de-LU", lcid => 0x00001007, sabbrevlangname => "DEL" }, { name => "dje", sopentypelang => "DJR" }, { name => "dje-NE" }, - { name => "doi" }, - { name => "doi-IN" }, + { name => "doi", sopentypelang => "DGR" }, + { name => "doi-IN", alias => "doi-Deva-IN" }, + { name => "doi-Deva", file => "doi" }, + { name => "doi-Deva-IN", file => "doi_IN" }, { name => "dsb", lcid => 0x00007c2e, sparent => "hsb", oemcp => 850, ebcdiccp => 870, sabbrevlangname => "DSB", sopentypelang => "LSB" }, { name => "dsb-DE", lcid => 0x0000082e }, { name => "dua" }, @@ -790,7 +792,7 @@ my @locales = { name => "ff-MR", alias => "ff-Latn-MR" }, { name => "ff-NG", alias => "ff-Latn-NG" }, { name => "ff-SN", alias => "ff-Latn-SN" }, - { name => "ff-Adlm" }, + { name => "ff-Adlm", oemcp => 65001 }, { name => "ff-Adlm-BF" }, { name => "ff-Adlm-CM" }, { name => "ff-Adlm-GH" }, @@ -875,10 +877,11 @@ my @locales = { name => "fr-YT" }, { name => "fur", sopentypelang => "FRL" }, { name => "fur-IT" }, + { name => "fuv-NG", alias => "ff-Latn-NG" }, { name => "fy", lcid => 0x00000062, oemcp => 850, sabbrevlangname => "FYN", sopentypelang => "FRI" }, { name => "fy-NL", lcid => 0x00000462 }, { name => "ga", lcid => 0x0000003c, oemcp => 850, sabbrevlangname => "IRE", sopentypelang => "IRI" }, - { name => "ga-GB" }, + { name => "ga-GB", oemcp => 65001 }, { name => "ga-IE", lcid => 0x0000083c }, { name => "gd", lcid => 0x00000091, oemcp => 850, ebcdiccp => 20285, sopentypelang => "GAE" }, { name => "gd-GB", lcid => 0x00000491 }, @@ -896,6 +899,7 @@ my @locales = { name => "guz" }, { name => "guz-KE" }, { name => "gv", sopentypelang => "MNX" }, + { name => "gv-GB", file => "gv" }, { name => "gv-IM" }, { name => "ha", lcid => 0x00000068, oemcp => 437 }, { name => "ha-GH", alias => "ha-Latn-GH" }, @@ -1026,7 +1030,8 @@ my @locales = { name => "ky-Cyrl-KG", alias => "ky-KG" }, { name => "ky-KG", lcid => 0x00000440 }, { name => "la", lcid => 0x00000076, oemcp => 437, slist => ",", dir => "seed", sabbrevlangname => "ZZZ" }, - { name => "la-001", lcid => 0x00000476, file => "la", dir => "seed" }, + { name => "la-VA", lcid => 0x00000476, dir => "seed" }, + { name => "la-001", alias => "la-VA" }, { name => "lag" }, { name => "lag-TZ" }, { name => "lb", lcid => 0x0000006e, oemcp => 850, ebcdiccp => 20297, sabbrevlangname => "LBX" }, @@ -1087,6 +1092,8 @@ my @locales = { name => "mn-Mong-MN", lcid => 0x00000c50, dir => "seed", sabbrevlangname => "MNM" }, { name => "mni", lcid => 0x00000058, slist => ",", sabbrevlangname => "ZZZ" }, { name => "mni-IN", lcid => 0x00000458, file => "mni_Beng_IN" }, + { name => "mni-Beng" }, + { name => "mni-Beng-IN", alias => "mni-IN" }, { name => "moh", lcid => 0x0000007c, oemcp => 850, ebcdiccp => 37, slist => ",", dir => "seed", sabbrevlangname => "MWK" }, { name => "moh-CA", lcid => 0x0000047c, dir => "seed" }, { name => "moh-Latn", alias => "moh" }, @@ -1170,7 +1177,9 @@ my @locales = ## name => "pap", lcid => 0x00000079 }, ## name => "pap-029", lcid => 0x00000479 }, { name => "pcm" }, - { name => "pcm-NG" }, + { name => "pcm-NG", alias => "pcm-Latn-NG" }, + { name => "pcm-Latn", file => "pcm" }, + { name => "pcm-Latn-NG", file => "pcm_NG" }, { name => "pl", lcid => 0x00000015, oemcp => 852, ebcdiccp => 20880, group => 2, sabbrevlangname => "PLK", sopentypelang => "PLK" }, { name => "pl-PL", lcid => 0x00000415 }, ## name => "prg" }, @@ -1376,6 +1385,7 @@ my @locales = { name => "ti-ET", lcid => 0x00000473, sabbrevlangname => "TIE" }, { name => "tig", dir => "seed", sopentypelang => "TGR" }, { name => "tig-ER", dir => "seed" }, + { name => "tig-Ethi-ER", alias => "tig-ER" }, { name => "tk", lcid => 0x00000042, oemcp => 852, ebcdiccp => 20880, group => 2, sopentypelang => "TKM" }, { name => "tk-Latn", alias => "tk" }, { name => "tk-Latn-TM", alias => "tk-TM" }, @@ -1401,6 +1411,7 @@ my @locales = { name => "tzm-Latn-MA", file => "tzm_MA", oemcp => 65001 }, { name => "tzm-Latn-DZ", lcid => 0x0000085f, file => "tzm" }, { name => "tzm-MA", alias => "tzm-Latn-MA" }, + { name => "tzm-DZ", alias => "tzm-Latn-DZ" }, ## name => "tzm-Arab", group => 13 }, ## name => "tzm-Arab-MA", lcid => 0x0000045f }, ## name => "tzm-Tfng", lcid => 0x0000785f }, @@ -1434,6 +1445,8 @@ my @locales = { name => "vo-001", dir => "seed" }, { name => "vun" }, { name => "vun-TZ" }, + { name => "wa", dir => "seed", oemcp => 850 }, + { name => "wa-BE", dir => "seed" }, { name => "wae" }, { name => "wae-CH" }, { name => "wal", dir => "seed" }, @@ -4480,7 +4493,7 @@ sub build_locale_data() else { my $name = $loc->{file} || $loc->{name}; - $name =~ s/-(Arab|Cyrl|Deva|Guru|Hans|Hant|Latn|Tfng|Vaii)$//; + $name =~ s/-(Arab|Beng|Cyrl|Deva|Guru|Hans|Hant|Latn|Tfng|Vaii)$//; $name =~ s/-/_/g; $id = xml_query( $subtags, "/supplementalData/likelySubtags/likelySubtag[\@from='$name']/\@to" ); $id =~ s/_/-/g if $id;

1 0

Ziqing Hui : win32u: Add mechanism for font specific system links.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: wine Branch: master Commit: a9cc68336c591d3d9bf915a3a74d9a3685d0ae4b URL: https://gitlab.winehq.org/wine/wine/-/commit/a9cc68336c591d3d9bf915a3a74d9a… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Oct 11 12:38:38 2022 +0800 win32u: Add mechanism for font specific system links. --- dlls/win32u/font.c | 148 +++++++++++++++++++++++++++++++++++------------------ 1 file changed, 99 insertions(+), 49 deletions(-) diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c index 7fc4a01eb64..d3e69cb5f8e 100644 --- a/dlls/win32u/font.c +++ b/dlls/win32u/font.c @@ -1551,6 +1551,78 @@ static const struct font_links_defaults_list } }; +static const char system_link_tahoma_sc[] = + "SIMSUN.TTC,SimSun\0" + "MINGLIU.TTC,PMingLiu\0" + "MSGOTHIC.TTC,MS UI Gothic\0" + "BATANG.TTC,Batang\0"; + +static const char system_link_tahoma_tc[] = + "MINGLIU.TTC,PMingLiu\0" + "SIMSUN.TTC,SimSun\0" + "MSGOTHIC.TTC,MS UI Gothic\0" + "BATANG.TTC,Batang\0"; + +static const char system_link_tahoma_jp[] = + "MSGOTHIC.TTC,MS UI Gothic\0" + "MINGLIU.TTC,PMingLiU\0" + "SIMSUN.TTC,SimSun\0" + "GULIM.TTC,Gulim\0"; + +static const char system_link_tahoma_kr[] = + "GULIM.TTC,Gulim\0" + "MSGOTHIC.TTC,MS UI Gothic\0" + "MINGLIU.TTC,PMingLiU\0" + "SIMSUN.TTC,SimSun\0"; + +static const char system_link_tahoma_non_cjk[] = + "MSGOTHIC.TTC,MS UI Gothic\0" + "MINGLIU.TTC,PMingLiU\0" + "SIMSUN.TTC,SimSun\0" + "GULIM.TTC,Gulim\0"; + +static const struct system_link_reg +{ + const WCHAR *font_name; + const char *link_sc; + DWORD link_sc_len; + const char *link_tc; + DWORD link_tc_len; + const char *link_jp; + DWORD link_jp_len; + const char *link_kr; + DWORD link_kr_len; + const char *link_non_cjk; + DWORD link_non_cjk_len; +} +default_system_link[] = +{ + { + tahomaW, + system_link_tahoma_sc, sizeof(system_link_tahoma_sc), + system_link_tahoma_tc, sizeof(system_link_tahoma_tc), + system_link_tahoma_jp, sizeof(system_link_tahoma_jp), + system_link_tahoma_kr, sizeof(system_link_tahoma_kr), + system_link_tahoma_non_cjk, sizeof(system_link_tahoma_non_cjk), + }, + { + microsoft_sans_serifW, + system_link_tahoma_sc, sizeof(system_link_tahoma_sc), + system_link_tahoma_tc, sizeof(system_link_tahoma_tc), + system_link_tahoma_jp, sizeof(system_link_tahoma_jp), + system_link_tahoma_kr, sizeof(system_link_tahoma_kr), + system_link_tahoma_non_cjk, sizeof(system_link_tahoma_non_cjk), + }, + { + lucida_sans_unicodeW, + system_link_tahoma_sc, sizeof(system_link_tahoma_sc), + system_link_tahoma_tc, sizeof(system_link_tahoma_tc), + system_link_tahoma_jp, sizeof(system_link_tahoma_jp), + system_link_tahoma_kr, sizeof(system_link_tahoma_kr), + system_link_tahoma_non_cjk, sizeof(system_link_tahoma_non_cjk), + }, +}; + static void populate_system_links( const WCHAR *name, const WCHAR * const *values ) { struct gdi_font_family *family; @@ -2646,63 +2718,41 @@ static void set_multi_value_key( HKEY hkey, const WCHAR *name, const char *value static void update_font_system_link_info(void) { - static const char system_link_simplified_chinese[] = - "SIMSUN.TTC,SimSun\0" - "MINGLIU.TTC,PMingLiu\0" - "MSGOTHIC.TTC,MS UI Gothic\0" - "BATANG.TTC,Batang\0"; - static const char system_link_traditional_chinese[] = - "MINGLIU.TTC,PMingLiu\0" - "SIMSUN.TTC,SimSun\0" - "MSGOTHIC.TTC,MS UI Gothic\0" - "BATANG.TTC,Batang\0"; - static const char system_link_japanese[] = - "MSGOTHIC.TTC,MS UI Gothic\0" - "MINGLIU.TTC,PMingLiU\0" - "SIMSUN.TTC,SimSun\0" - "GULIM.TTC,Gulim\0"; - static const char system_link_korean[] = - "GULIM.TTC,Gulim\0" - "MSGOTHIC.TTC,MS UI Gothic\0" - "MINGLIU.TTC,PMingLiU\0" - "SIMSUN.TTC,SimSun\0"; - static const char system_link_non_cjk[] = - "MSGOTHIC.TTC,MS UI Gothic\0" - "MINGLIU.TTC,PMingLiU\0" - "SIMSUN.TTC,SimSun\0" - "GULIM.TTC,Gulim\0"; HKEY hkey; if ((hkey = reg_create_key( NULL, system_link_keyW, sizeof(system_link_keyW), 0, NULL ))) { const char *link; - DWORD len; + DWORD len, i; - switch (ansi_cp.CodePage) + for (i = 0; i < ARRAY_SIZE(default_system_link); ++i) { - case 932: - link = system_link_japanese; - len = sizeof(system_link_japanese); - break; - case 936: - link = system_link_simplified_chinese; - len = sizeof(system_link_simplified_chinese); - break; - case 949: - link = system_link_korean; - len = sizeof(system_link_korean); - break; - case 950: - link = system_link_traditional_chinese; - len = sizeof(system_link_traditional_chinese); - break; - default: - link = system_link_non_cjk; - len = sizeof(system_link_non_cjk); + const struct system_link_reg *link_reg = &default_system_link[i]; + + switch (ansi_cp.CodePage) + { + case 932: + link = link_reg->link_jp; + len = link_reg->link_jp_len; + break; + case 936: + link = link_reg->link_sc; + len = link_reg->link_sc_len; + break; + case 949: + link = link_reg->link_kr; + len = link_reg->link_kr_len; + break; + case 950: + link = link_reg->link_tc; + len = link_reg->link_tc_len; + break; + default: + link = link_reg->link_non_cjk; + len = link_reg->link_non_cjk_len; + } + set_multi_value_key(hkey, link_reg->font_name, link, len); } - set_multi_value_key(hkey, lucida_sans_unicodeW, link, len); - set_multi_value_key(hkey, microsoft_sans_serifW, link, len); - set_multi_value_key(hkey, tahomaW, link, len); NtClose( hkey ); } }

1 0

Ziqing Hui : win32u: Add font link for MS UI Gothic.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: wine Branch: master Commit: 71b1e636ecc8a63e4edb74b4c80cd4aef47bf013 URL: https://gitlab.winehq.org/wine/wine/-/commit/71b1e636ecc8a63e4edb74b4c80cd4… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Sat Oct 15 12:32:09 2022 +0800 win32u: Add font link for MS UI Gothic. Win10 has font link for most of the system default fonts, including MS UI Gothic. This fixes Korean text display issue for Romance of the There Kindoms XIII. --- dlls/win32u/font.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c index d3e69cb5f8e..6086fa79609 100644 --- a/dlls/win32u/font.c +++ b/dlls/win32u/font.c @@ -1581,6 +1581,16 @@ static const char system_link_tahoma_non_cjk[] = "SIMSUN.TTC,SimSun\0" "GULIM.TTC,Gulim\0"; +static const char system_link_ms_ui_gothic[] = + "MICROSS.TTF,Microsoft Sans Serif\0" + "MINGLIU.TTC,PMingLiU\0""SIMSUN.TTC,SimSun\0" + "GULIM.TTC,Gulim\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; @@ -1621,6 +1631,14 @@ default_system_link[] = system_link_tahoma_kr, sizeof(system_link_tahoma_kr), system_link_tahoma_non_cjk, sizeof(system_link_tahoma_non_cjk), }, + { + ms_ui_gothicW, + system_link_ms_ui_gothic, sizeof(system_link_ms_ui_gothic), + system_link_ms_ui_gothic, sizeof(system_link_ms_ui_gothic), + system_link_ms_ui_gothic, sizeof(system_link_ms_ui_gothic), + system_link_ms_ui_gothic, sizeof(system_link_ms_ui_gothic), + system_link_ms_ui_gothic, sizeof(system_link_ms_ui_gothic), + }, }; static void populate_system_links( const WCHAR *name, const WCHAR * const *values )

1 0

Ziqing Hui : win32u: Add more linked fonts for Tahoma.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: wine Branch: master Commit: a32782d28b744e228f21f61bb3d94c5371ff3f99 URL: https://gitlab.winehq.org/wine/wine/-/commit/a32782d28b744e228f21f61bb3d94c… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Oct 11 18:00:59 2022 +0800 win32u: Add more linked fonts for Tahoma. --- dlls/win32u/font.c | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c index 6086fa79609..5762d55eab5 100644 --- a/dlls/win32u/font.c +++ b/dlls/win32u/font.c @@ -1555,31 +1555,56 @@ static const char system_link_tahoma_sc[] = "SIMSUN.TTC,SimSun\0" "MINGLIU.TTC,PMingLiu\0" "MSGOTHIC.TTC,MS UI Gothic\0" - "BATANG.TTC,Batang\0"; + "BATANG.TTC,Batang\0" + "MSYH.TTC,Microsoft YaHei UI\0" + "MSJH.TTC,Microsoft JhengHei UI\0" + "YUGOTHM.TTC,Yu Gothic UI\0" + "MALGUN.TTF,Malgun Gothic\0" + "SEGUISYM.TTF,Segoe UI Symbol\0"; static const char system_link_tahoma_tc[] = "MINGLIU.TTC,PMingLiu\0" "SIMSUN.TTC,SimSun\0" "MSGOTHIC.TTC,MS UI Gothic\0" - "BATANG.TTC,Batang\0"; + "BATANG.TTC,Batang\0" + "MSJH.TTC,Microsoft JhengHei UI\0" + "MSYH.TTC,Microsoft YaHei UI\0" + "YUGOTHM.TTC,Yu Gothic UI\0" + "MALGUN.TTF,Malgun Gothic\0" + "SEGUISYM.TTF,Segoe UI Symbol\0"; static const char system_link_tahoma_jp[] = "MSGOTHIC.TTC,MS UI Gothic\0" "MINGLIU.TTC,PMingLiU\0" "SIMSUN.TTC,SimSun\0" - "GULIM.TTC,Gulim\0"; + "GULIM.TTC,Gulim\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_tahoma_kr[] = "GULIM.TTC,Gulim\0" "MSGOTHIC.TTC,MS UI Gothic\0" "MINGLIU.TTC,PMingLiU\0" - "SIMSUN.TTC,SimSun\0"; + "SIMSUN.TTC,SimSun\0" + "MALGUN.TTF,Malgun Gothic\0" + "YUGOTHM.TTC,Yu Gothic UI\0" + "MSJH.TTC,Microsoft JhengHei UI\0" + "MSYH.TTC,Microsoft YaHei UI\0" + "SEGUISYM.TTF,Segoe UI Symbol\0"; static const char system_link_tahoma_non_cjk[] = "MSGOTHIC.TTC,MS UI Gothic\0" "MINGLIU.TTC,PMingLiU\0" "SIMSUN.TTC,SimSun\0" - "GULIM.TTC,Gulim\0"; + "GULIM.TTC,Gulim\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_ui_gothic[] = "MICROSS.TTF,Microsoft Sans Serif\0"

1 0

Hugh McMaster : kernel32/tests: Remove tests comparing expected output in certain functions.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: wine Branch: master Commit: c7b8da649d899ad90f6949b6d6bd96d0e760cdcd URL: https://gitlab.winehq.org/wine/wine/-/commit/c7b8da649d899ad90f6949b6d6bd96… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Oct 17 22:28:34 2022 +1100 kernel32/tests: Remove tests comparing expected output in certain functions. The Windows versions of [Read|Write]ConsoleOutput[Attribute|Character] appear to assign an uninitialized internal DWORD to the given pointer address before returning. As the functions fail (intentionally) in these tests, the value of the DWORD is never set, so the tests end up comparing the expected value of zero with random values. This value of this test is very limited and is best removed. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53686 --- dlls/kernel32/tests/console.c | 36 ------------------------------------ 1 file changed, 36 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index c145aa4cb59..9eabd887f2c 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -2347,12 +2347,6 @@ static void test_WriteConsoleOutputCharacterA(HANDLE output_handle) invalid_table[i].coord, invalid_table[i].lpNumCharsWritten); ok(!ret, "[%d] Expected WriteConsoleOutputCharacterA to return FALSE, got %d\n", i, ret); - if (invalid_table[i].lpNumCharsWritten) - { - ok(count == invalid_table[i].expected_count, - "[%d] Expected count to be %lu, got %lu\n", - i, invalid_table[i].expected_count, count); - } ok(GetLastError() == invalid_table[i].last_error, "[%d] Expected last error to be %lu, got %lu\n", i, invalid_table[i].last_error, GetLastError()); @@ -2437,12 +2431,6 @@ static void test_WriteConsoleOutputCharacterW(HANDLE output_handle) invalid_table[i].coord, invalid_table[i].lpNumCharsWritten); ok(!ret, "[%d] Expected WriteConsoleOutputCharacterW to return FALSE, got %d\n", i, ret); - if (invalid_table[i].lpNumCharsWritten) - { - ok(count == invalid_table[i].expected_count, - "[%d] Expected count to be %lu, got %lu\n", - i, invalid_table[i].expected_count, count); - } ok(GetLastError() == invalid_table[i].last_error, "[%d] Expected last error to be %lu, got %lu\n", i, invalid_table[i].last_error, GetLastError()); @@ -2527,12 +2515,6 @@ static void test_WriteConsoleOutputAttribute(HANDLE output_handle) invalid_table[i].coord, invalid_table[i].lpNumAttrsWritten); ok(!ret, "[%d] Expected WriteConsoleOutputAttribute to return FALSE, got %d\n", i, ret); - if (invalid_table[i].lpNumAttrsWritten) - { - ok(count == invalid_table[i].expected_count, - "[%d] Expected count to be %lu, got %lu\n", - i, invalid_table[i].expected_count, count); - } ok(GetLastError() == invalid_table[i].last_error, "[%d] Expected last error to be %lu, got %lu\n", i, invalid_table[i].last_error, GetLastError()); @@ -2943,12 +2925,6 @@ static void test_ReadConsoleOutputCharacterA(HANDLE output_handle) invalid_table[i].coord, invalid_table[i].read_count); ok(!ret, "[%d] Expected ReadConsoleOutputCharacterA to return FALSE, got %d\n", i, ret); - if (invalid_table[i].read_count) - { - ok(count == invalid_table[i].expected_count, - "[%d] Expected count to be %lu, got %lu\n", - i, invalid_table[i].expected_count, count); - } ok(GetLastError() == invalid_table[i].last_error, "[%d] Expected last error to be %lu, got %lu\n", i, invalid_table[i].last_error, GetLastError()); @@ -3033,12 +3009,6 @@ static void test_ReadConsoleOutputCharacterW(HANDLE output_handle) invalid_table[i].coord, invalid_table[i].read_count); ok(!ret, "[%d] Expected ReadConsoleOutputCharacterW to return FALSE, got %d\n", i, ret); - if (invalid_table[i].read_count) - { - ok(count == invalid_table[i].expected_count, - "[%d] Expected count to be %lu, got %lu\n", - i, invalid_table[i].expected_count, count); - } ok(GetLastError() == invalid_table[i].last_error, "[%d] Expected last error to be %lu, got %lu\n", i, invalid_table[i].last_error, GetLastError()); @@ -3122,12 +3092,6 @@ static void test_ReadConsoleOutputAttribute(HANDLE output_handle) invalid_table[i].coord, invalid_table[i].read_count); ok(!ret, "[%d] Expected ReadConsoleOutputAttribute to return FALSE, got %d\n", i, ret); - if (invalid_table[i].read_count) - { - ok(count == invalid_table[i].expected_count, - "[%d] Expected count to be %lu, got %lu\n", - i, invalid_table[i].expected_count, count); - } ok(GetLastError() == invalid_table[i].last_error, "[%d] Expected last error to be %lu, got %lu\n", i, invalid_table[i].last_error, GetLastError());

1 0

Piotr Caban : winedump: Add initial EMF spool files support.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: wine Branch: master Commit: cfbe32d557f5f07a1e6d6796c478e22274002117 URL: https://gitlab.winehq.org/wine/wine/-/commit/cfbe32d557f5f07a1e6d6796c478e2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Oct 15 18:15:25 2022 +0200 winedump: Add initial EMF spool files support. --- tools/winedump/Makefile.in | 1 + tools/winedump/dump.c | 1 + tools/winedump/emfspool.c | 158 +++++++++++++++++++++++++++++++++++++++++++++ tools/winedump/winedump.h | 4 +- 4 files changed, 163 insertions(+), 1 deletion(-) diff --git a/tools/winedump/Makefile.in b/tools/winedump/Makefile.in index 54028024b0d..04dcacf0216 100644 --- a/tools/winedump/Makefile.in +++ b/tools/winedump/Makefile.in @@ -7,6 +7,7 @@ C_SRCS = \ dos.c \ dump.c \ emf.c \ + emfspool.c \ font.c \ le.c \ lib.c \ diff --git a/tools/winedump/dump.c b/tools/winedump/dump.c index cf52761290b..f2cb601b295 100644 --- a/tools/winedump/dump.c +++ b/tools/winedump/dump.c @@ -255,6 +255,7 @@ dumpers[] = {SIG_MDMP, get_kind_mdmp, mdmp_dump}, {SIG_LNK, get_kind_lnk, lnk_dump}, {SIG_EMF, get_kind_emf, emf_dump}, + {SIG_EMFSPOOL, get_kind_emfspool, emfspool_dump}, {SIG_MF, get_kind_mf, mf_dump}, {SIG_FNT, get_kind_fnt, fnt_dump}, {SIG_TLB, get_kind_tlb, tlb_dump}, diff --git a/tools/winedump/emfspool.c b/tools/winedump/emfspool.c new file mode 100644 index 00000000000..a10b3be2788 --- /dev/null +++ b/tools/winedump/emfspool.c @@ -0,0 +1,158 @@ +/* + * Dump an EMF Spool File + * + * Copyright 2022 Piotr Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "winedump.h" + +#define EMFSPOOL_VERSION 0x10000 + +typedef enum +{ + EMRI_METAFILE = 1, + EMRI_ENGINE_FONT, + EMRI_DEVMODE, + EMRI_TYPE1_FONT, + EMRI_PRESTARTPAGE, + EMRI_DESIGNVECTOR, + EMRI_SUBSET_FONT, + EMRI_DELTA_FONT, + EMRI_FORM_METAFILE, + EMRI_BW_METAFILE, + EMRI_BW_FORM_METAFILE, + EMRI_METAFILE_DATA, + EMRI_METAFILE_EXT, + EMRI_BW_METAFILE_EXT, + EMRI_ENGINE_FONT_EXT, + EMRI_TYPE1_FONT_EXT, + EMRI_DESIGNVECTOR_EXT, + EMRI_SUBSET_FONT_EXT, + EMRI_DELTA_FONT_EXT, + EMRI_PS_JOB_DATA, + EMRI_EMBED_FONT_EXT, +} record_type; + +typedef struct +{ + unsigned int dwVersion; + unsigned int cjSize; + unsigned int dpszDocName; + unsigned int dpszOutput; +} header; + +typedef struct +{ + unsigned int ulID; + unsigned int cjSize; +} record_hdr; + +static const WCHAR* read_wstr(unsigned long off) +{ + const WCHAR *beg, *end; + + if (!off) + return NULL; + + beg = end = PRD(off, sizeof(WCHAR)); + off += sizeof(WCHAR); + if (!beg) + fatal("can't read Unicode string, corrupted file\n"); + + while (*end) + { + end = PRD(off, sizeof(WCHAR)); + off += sizeof(WCHAR); + if (!end) + fatal("can't read Unicode string, corrupted file\n"); + } + return beg; +} + +#define EMRICASE(x) case x: printf("%-24s %08x\n", #x, hdr->cjSize); break +static unsigned long dump_emfspool_record(unsigned long off) +{ + const record_hdr *hdr; + + hdr = PRD(off, sizeof(*hdr)); + if (!hdr) + return 0; + + switch (hdr->ulID) + { + EMRICASE(EMRI_METAFILE); + EMRICASE(EMRI_ENGINE_FONT); + EMRICASE(EMRI_DEVMODE); + EMRICASE(EMRI_TYPE1_FONT); + EMRICASE(EMRI_PRESTARTPAGE); + EMRICASE(EMRI_DESIGNVECTOR); + EMRICASE(EMRI_SUBSET_FONT); + EMRICASE(EMRI_DELTA_FONT); + EMRICASE(EMRI_FORM_METAFILE); + EMRICASE(EMRI_BW_METAFILE); + EMRICASE(EMRI_BW_FORM_METAFILE); + EMRICASE(EMRI_METAFILE_DATA); + EMRICASE(EMRI_METAFILE_EXT); + EMRICASE(EMRI_BW_METAFILE_EXT); + EMRICASE(EMRI_ENGINE_FONT_EXT); + EMRICASE(EMRI_TYPE1_FONT_EXT); + EMRICASE(EMRI_DESIGNVECTOR_EXT); + EMRICASE(EMRI_SUBSET_FONT_EXT); + EMRICASE(EMRI_DELTA_FONT_EXT); + EMRICASE(EMRI_PS_JOB_DATA); + EMRICASE(EMRI_EMBED_FONT_EXT); + default: + printf("%u %08x\n", hdr->ulID, hdr->cjSize); + break; + } + + dump_data((const unsigned char *)(hdr + 1), hdr->cjSize, ""); + return off + sizeof(*hdr) + hdr->cjSize; +} + +enum FileSig get_kind_emfspool(void) +{ + const header *hdr; + + hdr = PRD(0, sizeof(*hdr)); + if (hdr && hdr->dwVersion == EMFSPOOL_VERSION) + return SIG_EMFSPOOL; + return SIG_UNKNOWN; +} + +void emfspool_dump(void) +{ + const WCHAR *doc_name, *output; + unsigned long off; + const header *hdr; + + hdr = PRD(0, sizeof(*hdr)); + if(!hdr) + return; + doc_name = read_wstr(hdr->dpszDocName); + output = read_wstr(hdr->dpszOutput); + + printf("File Header\n"); + printf(" %-20s %#x\n", "dwVersion:", hdr->dwVersion); + printf(" %-20s %#x\n", "cjSize:", hdr->cjSize); + printf(" %-20s %#x %s\n", "dpszDocName:", hdr->dpszDocName, get_unicode_str(doc_name, -1)); + printf(" %-20s %#x %s\n", "dpszOutput:", hdr->dpszOutput, get_unicode_str(output, -1)); + printf("\n"); + + off = hdr->cjSize; + while ((off = dump_emfspool_record(off))); +} diff --git a/tools/winedump/winedump.h b/tools/winedump/winedump.h index 361f44b62b0..505470436d0 100644 --- a/tools/winedump/winedump.h +++ b/tools/winedump/winedump.h @@ -214,7 +214,7 @@ const char *get_machine_str(int mach); /* file dumping functions */ enum FileSig {SIG_UNKNOWN, SIG_DOS, SIG_PE, SIG_DBG, SIG_PDB, SIG_NE, SIG_LE, SIG_MDMP, SIG_COFFLIB, SIG_LNK, - SIG_EMF, SIG_MF, SIG_FNT, SIG_TLB, SIG_NLS}; + SIG_EMF, SIG_EMFSPOOL, SIG_MF, SIG_FNT, SIG_TLB, SIG_NLS}; const void* PRD(unsigned long prd, unsigned long len); unsigned long Offset(const void* ptr); @@ -249,6 +249,8 @@ enum FileSig get_kind_lnk(void); void lnk_dump( void ); enum FileSig get_kind_emf(void); void emf_dump( void ); +enum FileSig get_kind_emfspool(void); +void emfspool_dump(void); enum FileSig get_kind_mf(void); void mf_dump(void); enum FileSig get_kind_pdb(void);

1 0

Piotr Caban : winedump: Fix buffer overflow in debugstr_wn helper.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: wine Branch: master Commit: cf78df3612d0731f1254d03e381401655b508433 URL: https://gitlab.winehq.org/wine/wine/-/commit/cf78df3612d0731f1254d03e381401… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Oct 15 20:12:00 2022 +0200 winedump: Fix buffer overflow in debugstr_wn helper. --- tools/winedump/emf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winedump/emf.c b/tools/winedump/emf.c index 48a67141ace..8c74702ecff 100644 --- a/tools/winedump/emf.c +++ b/tools/winedump/emf.c @@ -49,7 +49,7 @@ static const char *debugstr_wn(const WCHAR *wstr, unsigned int n) i = 0; p = buf; *p++ = '\"'; - while (i < n && i < sizeof(buf) - 2 && wstr[i]) + while (i < n && i < sizeof(buf) - 3 && wstr[i]) { if (wstr[i] < 127) *p++ = wstr[i]; else *p++ = '.';

1 0

Piotr Caban : winedump: Don't use static offset in dump_emfrecord.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: wine Branch: master Commit: d745c8d4a07949b379085f99b68b15580c42168d URL: https://gitlab.winehq.org/wine/wine/-/commit/d745c8d4a07949b379085f99b68b15… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Oct 15 20:14:44 2022 +0200 winedump: Don't use static offset in dump_emfrecord. --- tools/winedump/emf.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/tools/winedump/emf.c b/tools/winedump/emf.c index 8c74702ecff..f27a9903320 100644 --- a/tools/winedump/emf.c +++ b/tools/winedump/emf.c @@ -77,15 +77,13 @@ static unsigned int read_int(const unsigned char *buffer) #define EMRCASE(x) case x: printf("%-20s %08x\n", #x, length); break #define EMRPLUSCASE(x) case x: printf(" %-20s %04x %08x %08x\n", #x, (UINT)header->Flags, (UINT)header->Size, (UINT)header->DataSize); break -static unsigned offset = 0; - -static int dump_emfrecord(void) +static unsigned long dump_emfrecord(unsigned long offset) { const unsigned char* ptr; unsigned int type, length, i; ptr = PRD(offset, 8); - if (!ptr) return -1; + if (!ptr) return 0; type = read_int(ptr); length = read_int(ptr + 4); @@ -277,7 +275,7 @@ static int dump_emfrecord(void) } if (length<sizeof(*header) || header->Size%4) - return -1; + return 0; length -= sizeof(*header); offset += sizeof(*header); @@ -286,7 +284,7 @@ static int dump_emfrecord(void) { if (i%16 == 0) printf(" "); - if (!(ptr = PRD(offset, 4))) return -1; + if (!(ptr = PRD(offset, 4))) return 0; length -= 4; offset += 4; printf("%08x ", read_int(ptr)); @@ -295,7 +293,7 @@ static int dump_emfrecord(void) } } - return 0; + return offset; } break; @@ -463,7 +461,7 @@ static int dump_emfrecord(void) } if ( (length < 8) || (length % 4) ) - return -1; + return 0; length -= 8; @@ -473,14 +471,14 @@ static int dump_emfrecord(void) { if (i%16 == 0) printf(" "); - if (!(ptr = PRD(offset, 4))) return -1; + if (!(ptr = PRD(offset, 4))) return 0; offset += 4; printf("%08x ", read_int(ptr)); if ( (i % 16 == 12) || (i + 4 == length)) printf("\n"); } - return 0; + return offset; } enum FileSig get_kind_emf(void) @@ -495,6 +493,6 @@ enum FileSig get_kind_emf(void) void emf_dump(void) { - offset = 0; - while (!dump_emfrecord()); + unsigned long offset = 0; + while ((offset = dump_emfrecord(offset))); }

1 0

Piotr Caban : winedump: Dump metafiles in EMF spool files.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: wine Branch: master Commit: 4d649c6232fc53ebfcc1adf3ead93a8401c0cefb URL: https://gitlab.winehq.org/wine/wine/-/commit/4d649c6232fc53ebfcc1adf3ead93a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Oct 15 20:36:33 2022 +0200 winedump: Dump metafiles in EMF spool files. --- tools/winedump/emf.c | 2 +- tools/winedump/emfspool.c | 19 ++++++++++++++++++- tools/winedump/winedump.h | 1 + 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/tools/winedump/emf.c b/tools/winedump/emf.c index f27a9903320..9f73fc365e9 100644 --- a/tools/winedump/emf.c +++ b/tools/winedump/emf.c @@ -77,7 +77,7 @@ static unsigned int read_int(const unsigned char *buffer) #define EMRCASE(x) case x: printf("%-20s %08x\n", #x, length); break #define EMRPLUSCASE(x) case x: printf(" %-20s %04x %08x %08x\n", #x, (UINT)header->Flags, (UINT)header->Size, (UINT)header->DataSize); break -static unsigned long dump_emfrecord(unsigned long offset) +unsigned long dump_emfrecord(unsigned long offset) { const unsigned char* ptr; unsigned int type, length, i; diff --git a/tools/winedump/emfspool.c b/tools/winedump/emfspool.c index a10b3be2788..d65e580b22e 100644 --- a/tools/winedump/emfspool.c +++ b/tools/winedump/emfspool.c @@ -120,7 +120,24 @@ static unsigned long dump_emfspool_record(unsigned long off) break; } - dump_data((const unsigned char *)(hdr + 1), hdr->cjSize, ""); + switch (hdr->ulID) + { + case EMRI_METAFILE: + case EMRI_FORM_METAFILE: + case EMRI_BW_METAFILE: + case EMRI_BW_FORM_METAFILE: + case EMRI_METAFILE_DATA: + { + unsigned long emf_off = off + sizeof(*hdr); + while ((emf_off = dump_emfrecord(emf_off)) && emf_off < off + sizeof(*hdr) + hdr->cjSize); + break; + } + + default: + dump_data((const unsigned char *)(hdr + 1), hdr->cjSize, ""); + break; + } + return off + sizeof(*hdr) + hdr->cjSize; } diff --git a/tools/winedump/winedump.h b/tools/winedump/winedump.h index 505470436d0..09f4a9301e7 100644 --- a/tools/winedump/winedump.h +++ b/tools/winedump/winedump.h @@ -248,6 +248,7 @@ void dbg_dump( void ); enum FileSig get_kind_lnk(void); void lnk_dump( void ); enum FileSig get_kind_emf(void); +unsigned long dump_emfrecord(unsigned long offset); void emf_dump( void ); enum FileSig get_kind_emfspool(void); void emfspool_dump(void);

1 0

Piotr Caban : winedump: Add prefix when dumping EMF files.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: wine Branch: master Commit: 893ac008735fe3a7f56771fb3a854e9d1eff2ef1 URL: https://gitlab.winehq.org/wine/wine/-/commit/893ac008735fe3a7f56771fb3a854e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Oct 15 21:13:37 2022 +0200 winedump: Add prefix when dumping EMF files. --- tools/winedump/emf.c | 93 ++++++++++++++++++++++++----------------------- tools/winedump/emfspool.c | 2 +- tools/winedump/winedump.h | 2 +- 3 files changed, 49 insertions(+), 48 deletions(-)

1 0