October 2022 - Wine-commits

Bartosz Kosiorek : msvcrt: Fix error handling for _mbscmp_l.
by Alexandre Julliard 24 Oct '22

24 Oct '22

Module: wine Branch: master Commit: 927a9a5a04c9c7d8dbcfbe887594a87887911ce3 URL: https://gitlab.winehq.org/wine/wine/-/commit/927a9a5a04c9c7d8dbcfbe887594a8… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Thu Oct 20 00:55:59 2022 +0200 msvcrt: Fix error handling for _mbscmp_l. --- dlls/msvcrt/mbcs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 49109943665..1754a732cb6 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -982,7 +982,8 @@ int CDECL _mbscmp_l(const unsigned char* str, const unsigned char* cmp, _locale_ { pthreadmbcinfo mbcinfo; - if (!str || !cmp) return INT_MAX; + if (!MSVCRT_CHECK_PMT(str && cmp)) + return _NLSCMPERROR; mbcinfo = locale ? locale->mbcinfo : get_mbcinfo();

1 0

Bartosz Kosiorek : msvcrt: Add _ismbslead_l implementation.
by Alexandre Julliard 24 Oct '22

24 Oct '22

Module: wine Branch: master Commit: 80c97dc38bc0351a88f74dc45278db4879290071 URL: https://gitlab.winehq.org/wine/wine/-/commit/80c97dc38bc0351a88f74dc45278db… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Thu Oct 20 00:56:01 2022 +0200 msvcrt: Add _ismbslead_l implementation. --- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/mbcs.c | 25 +++++++++++++++++++++---- dlls/msvcrt/msvcrt.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 4 ++-- 8 files changed, 30 insertions(+), 13 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index d4fa4e38b7b..8f24047e8b5 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1007,9 +1007,9 @@ @ cdecl _ismbcupper(long) @ cdecl _ismbcupper_l(long ptr) @ cdecl _ismbslead(ptr ptr) -@ stub _ismbslead_l +@ cdecl _ismbslead_l(ptr ptr ptr) @ cdecl _ismbstrail(ptr ptr) -@ stub _ismbstrail_l +@ stub _ismbstrail_l(ptr ptr ptr) @ cdecl _isnan(double) @ cdecl -arch=x86_64 _isnanf(float) @ cdecl _isprint_l(long ptr) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index a27a4487608..160dce837d9 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1353,7 +1353,7 @@ @ cdecl _ismbcupper(long) @ cdecl _ismbcupper_l(long ptr) @ cdecl _ismbslead(ptr ptr) -@ stub _ismbslead_l +@ cdecl _ismbslead_l(ptr ptr ptr) @ cdecl _ismbstrail(ptr ptr) @ stub _ismbstrail_l @ cdecl _isnan(double) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index cb673976e61..268c6db59d7 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1359,7 +1359,7 @@ @ cdecl _ismbcupper(long) @ cdecl _ismbcupper_l(long ptr) @ cdecl _ismbslead(ptr ptr) -@ stub _ismbslead_l +@ cdecl _ismbslead_l(ptr ptr ptr) @ cdecl _ismbstrail(ptr ptr) @ stub _ismbstrail_l @ cdecl _isnan(double) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index ca32dac7285..cafb0a8f644 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -679,7 +679,7 @@ @ cdecl _ismbcupper(long) @ cdecl _ismbcupper_l(long ptr) @ cdecl _ismbslead(ptr ptr) -@ stub _ismbslead_l +@ cdecl _ismbslead_l(ptr ptr ptr) @ cdecl _ismbstrail(ptr ptr) @ stub _ismbstrail_l @ cdecl _isnan(double) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index ce0ddfb6168..2773762b176 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -657,7 +657,7 @@ @ cdecl _ismbcupper(long) @ cdecl _ismbcupper_l(long ptr) @ cdecl _ismbslead(ptr ptr) -@ stub _ismbslead_l +@ cdecl _ismbslead_l(ptr ptr ptr) @ cdecl _ismbstrail(ptr ptr) @ stub _ismbstrail_l @ cdecl _isnan(double) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 1754a732cb6..0e6e0bdcc7f 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -1808,13 +1808,22 @@ int CDECL _ismbclegal(unsigned int c) } /********************************************************************* - * _ismbslead(MSVCRT.@) + * _ismbslead_l(MSVCRT.@) */ -int CDECL _ismbslead(const unsigned char* start, const unsigned char* str) +int CDECL _ismbslead_l(const unsigned char* start, const unsigned char* str, _locale_t locale) { + pthreadmbcinfo mbcinfo; int lead = 0; - if(!get_mbcinfo()->ismbcodepage) + if (!MSVCRT_CHECK_PMT(start && str)) + return 0; + + if(locale) + mbcinfo = locale->mbcinfo; + else + mbcinfo = get_mbcinfo(); + + if(!mbcinfo->ismbcodepage) return 0; /* Lead bytes can also be trail bytes so we need to analyse the string @@ -1823,13 +1832,21 @@ int CDECL _ismbslead(const unsigned char* start, const unsigned char* str) { if (!*start) return 0; - lead = !lead && _ismbblead(*start); + lead = !lead && _ismbblead_l(*start, locale); start++; } return lead ? -1 : 0; } +/********************************************************************* + * _ismbslead(MSVCRT.@) + */ +int CDECL _ismbslead(const unsigned char* start, const unsigned char* str) +{ + return _ismbslead_l(start, str, NULL); +} + /********************************************************************* * _ismbstrail(MSVCRT.@) */ diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 430835f4422..ae70c2619b6 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -628,7 +628,7 @@ @ cdecl _ismbcupper(long) @ cdecl _ismbcupper_l(long ptr) @ cdecl _ismbslead(ptr ptr) -# stub _ismbslead_l(long ptr) +@ cdecl _ismbslead_l(ptr ptr ptr) @ cdecl _ismbstrail(ptr ptr) # stub _ismbstrail_l(long ptr) @ cdecl _isnan(double) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 969487c2b1e..4d0e69fc57b 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -499,7 +499,7 @@ @ cdecl _ismbcupper(long) @ cdecl _ismbcupper_l(long ptr) @ cdecl _ismbslead(ptr ptr) -@ stub _ismbslead_l +@ cdecl _ismbslead_l(ptr ptr ptr) @ cdecl _ismbstrail(ptr ptr) @ stub _ismbstrail_l @ cdecl _isnan(double) @@ -1098,7 +1098,7 @@ @ cdecl _o__ismbcupper(long) _ismbcupper @ cdecl _o__ismbcupper_l(long ptr) _ismbcupper_l @ cdecl _o__ismbslead(ptr ptr) _ismbslead -@ stub _o__ismbslead_l +@ cdecl _o__ismbslead_l(ptr ptr ptr) _ismbslead_l @ cdecl _o__ismbstrail(ptr ptr) _ismbstrail @ stub _o__ismbstrail_l @ cdecl _o__iswctype_l(long long ptr) _iswctype_l

1 0

Bartosz Kosiorek : msvcrt: Add _ismbstrail_l implementation.
by Alexandre Julliard 24 Oct '22

24 Oct '22

Module: wine Branch: master Commit: 5b425baf925a085bc916cee0fa0900550195a45a URL: https://gitlab.winehq.org/wine/wine/-/commit/5b425baf925a085bc916cee0fa0900… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Thu Oct 20 00:56:00 2022 +0200 msvcrt: Add _ismbstrail_l implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/mbcs.c | 17 ++++++++++++++--- dlls/msvcrt/msvcrt.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 4 ++-- 8 files changed, 22 insertions(+), 11 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 8f24047e8b5..54f988ee9cd 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1009,7 +1009,7 @@ @ cdecl _ismbslead(ptr ptr) @ cdecl _ismbslead_l(ptr ptr ptr) @ cdecl _ismbstrail(ptr ptr) -@ stub _ismbstrail_l(ptr ptr ptr) +@ cdecl _ismbstrail_l(ptr ptr ptr) @ cdecl _isnan(double) @ cdecl -arch=x86_64 _isnanf(float) @ cdecl _isprint_l(long ptr) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 160dce837d9..d84a88ea50b 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1355,7 +1355,7 @@ @ cdecl _ismbslead(ptr ptr) @ cdecl _ismbslead_l(ptr ptr ptr) @ cdecl _ismbstrail(ptr ptr) -@ stub _ismbstrail_l +@ cdecl _ismbstrail_l(ptr ptr ptr) @ cdecl _isnan(double) @ cdecl -arch=x86_64 _isnanf(float) @ cdecl _isprint_l(long ptr) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 268c6db59d7..5c65b082309 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1361,7 +1361,7 @@ @ cdecl _ismbslead(ptr ptr) @ cdecl _ismbslead_l(ptr ptr ptr) @ cdecl _ismbstrail(ptr ptr) -@ stub _ismbstrail_l +@ cdecl _ismbstrail_l(ptr ptr ptr) @ cdecl _isnan(double) @ cdecl -arch=x86_64 _isnanf(float) @ cdecl _isprint_l(long ptr) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index cafb0a8f644..4f3425acc35 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -681,7 +681,7 @@ @ cdecl _ismbslead(ptr ptr) @ cdecl _ismbslead_l(ptr ptr ptr) @ cdecl _ismbstrail(ptr ptr) -@ stub _ismbstrail_l +@ cdecl _ismbstrail_l(ptr ptr ptr) @ cdecl _isnan(double) @ cdecl -arch=x86_64 _isnanf(float) @ cdecl _isprint_l(long ptr) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 2773762b176..4e26468b489 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -659,7 +659,7 @@ @ cdecl _ismbslead(ptr ptr) @ cdecl _ismbslead_l(ptr ptr ptr) @ cdecl _ismbstrail(ptr ptr) -@ stub _ismbstrail_l +@ cdecl _ismbstrail_l(ptr ptr ptr) @ cdecl _isnan(double) @ cdecl -arch=x86_64 _isnanf(float) @ cdecl _isprint_l(long ptr) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 0e6e0bdcc7f..bdcfea3b01a 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -1848,17 +1848,28 @@ int CDECL _ismbslead(const unsigned char* start, const unsigned char* str) } /********************************************************************* - * _ismbstrail(MSVCRT.@) + * _ismbstrail_l(MSVCRT.@) */ -int CDECL _ismbstrail(const unsigned char* start, const unsigned char* str) +int CDECL _ismbstrail_l(const unsigned char* start, const unsigned char* str, _locale_t locale) { + if (!MSVCRT_CHECK_PMT(start && str)) + return 0; + /* Note: this function doesn't check _ismbbtrail */ - if ((str > start) && _ismbslead(start, str-1)) + if ((str > start) && _ismbslead_l(start, str-1, locale)) return -1; else return 0; } +/********************************************************************* + * _ismbstrail(MSVCRT.@) + */ +int CDECL _ismbstrail(const unsigned char* start, const unsigned char* str) +{ + return _ismbstrail_l(start, str, NULL); +} + /********************************************************************* * _mbbtype_l(MSVCRT.@) */ diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index ae70c2619b6..156216ae715 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -630,7 +630,7 @@ @ cdecl _ismbslead(ptr ptr) @ cdecl _ismbslead_l(ptr ptr ptr) @ cdecl _ismbstrail(ptr ptr) -# stub _ismbstrail_l(long ptr) +@ cdecl _ismbstrail_l(ptr ptr ptr) @ cdecl _isnan(double) @ cdecl -arch=x86_64 _isnanf(float) @ cdecl _isprint_l(long ptr) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 4d0e69fc57b..805ccc908f7 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -501,7 +501,7 @@ @ cdecl _ismbslead(ptr ptr) @ cdecl _ismbslead_l(ptr ptr ptr) @ cdecl _ismbstrail(ptr ptr) -@ stub _ismbstrail_l +@ cdecl _ismbstrail_l(ptr ptr ptr) @ cdecl _isnan(double) @ cdecl -arch=x86_64 _isnanf(float) @ cdecl _isprint_l(long ptr) @@ -1100,7 +1100,7 @@ @ cdecl _o__ismbslead(ptr ptr) _ismbslead @ cdecl _o__ismbslead_l(ptr ptr ptr) _ismbslead_l @ cdecl _o__ismbstrail(ptr ptr) _ismbstrail -@ stub _o__ismbstrail_l +@ cdecl _o__ismbstrail_l(ptr ptr ptr) _ismbstrail_l @ cdecl _o__iswctype_l(long long ptr) _iswctype_l @ cdecl _o__itoa(long ptr long) _itoa @ cdecl _o__itoa_s(long ptr long long) _itoa_s

1 0

Eric Pouech : conhost/tests: Fix tests for some keyboard layouts.
by Alexandre Julliard 24 Oct '22

24 Oct '22

Module: wine Branch: master Commit: bdad6f2c853045602ab3995ec3490bee3d0a60fb URL: https://gitlab.winehq.org/wine/wine/-/commit/bdad6f2c853045602ab3995ec3490b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Oct 24 15:24:33 2022 +0200 conhost/tests: Fix tests for some keyboard layouts. Some keyboards (French, German and some others) report the right alt key (which is some cases the right-shift one) as ctrl+alt. Add proper handling for ctrl+alt return from VkKeyScan(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52980 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/conhost/tests/tty.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/programs/conhost/tests/tty.c b/programs/conhost/tests/tty.c index cab7cd5574f..78e24cdb42d 100644 --- a/programs/conhost/tests/tty.c +++ b/programs/conhost/tests/tty.c @@ -543,7 +543,7 @@ static void expect_key_input_(unsigned int line, unsigned int ctx, WCHAR ch, uns "%x: wVirtualScanCode = %x expected %x\n", ctx, record.Event.KeyEvent.wVirtualScanCode, vs); ok_(__FILE__,line)(record.Event.KeyEvent.dwControlKeyState == ctrl_state, - "%x: dwControlKeyState = %lx\n", ctx, record.Event.KeyEvent.dwControlKeyState); + "%x: dwControlKeyState = %lx expected %x\n", ctx, record.Event.KeyEvent.dwControlKeyState, ctrl_state); } #define get_input_key_vt() get_input_key_vt_(__LINE__) @@ -567,12 +567,17 @@ static void expect_key_pressed_(unsigned int line, unsigned int ctx, WCHAR ch, u if (ctrl_state & LEFT_ALT_PRESSED) expect_key_input_(line, ctx, 0, VK_MENU, TRUE, LEFT_ALT_PRESSED | (ctrl_state & SHIFT_PRESSED)); - if (ctrl_state & LEFT_CTRL_PRESSED) + if (ctrl_state & RIGHT_ALT_PRESSED) + expect_key_input_(line, ctx, 0, VK_MENU, TRUE, + RIGHT_ALT_PRESSED | LEFT_CTRL_PRESSED | ENHANCED_KEY | (ctrl_state & SHIFT_PRESSED)); + else if (ctrl_state & LEFT_CTRL_PRESSED) expect_key_input_(line, ctx, 0, VK_CONTROL, TRUE, LEFT_CTRL_PRESSED | (ctrl_state & (SHIFT_PRESSED | LEFT_ALT_PRESSED))); expect_key_input_(line, ctx, ch, vk, TRUE, ctrl_state); expect_key_input_(line, ctx, ch, vk, FALSE, ctrl_state); - if (ctrl_state & LEFT_CTRL_PRESSED) + if (ctrl_state & RIGHT_ALT_PRESSED) + expect_key_input_(line, ctx, 0, VK_MENU, FALSE, ENHANCED_KEY | (ctrl_state & SHIFT_PRESSED)); + else if (ctrl_state & LEFT_CTRL_PRESSED) expect_key_input_(line, ctx, 0, VK_CONTROL, FALSE, ctrl_state & (SHIFT_PRESSED | LEFT_ALT_PRESSED)); if (ctrl_state & LEFT_ALT_PRESSED) @@ -585,9 +590,12 @@ static void expect_key_pressed_(unsigned int line, unsigned int ctx, WCHAR ch, u static void expect_char_key_(unsigned int line, WCHAR ch) { unsigned int ctrl = 0, vk; + vk = VkKeyScanW(ch); if (vk == ~0) vk = 0; if (vk & 0x0100) ctrl |= SHIFT_PRESSED; + /* Some keyboard (like German or French one) report right alt as ctrl+alt */ + if ((vk & 0x0600) == 0x0600) ctrl |= RIGHT_ALT_PRESSED; if (vk & 0x0200) ctrl |= LEFT_CTRL_PRESSED; vk &= 0xff; expect_key_pressed_(line, ch, ch, vk, ctrl);

1 0

Eric Pouech : conhost/tests: Fix some tests on input sequences.
by Alexandre Julliard 24 Oct '22

24 Oct '22

Module: wine Branch: master Commit: 5a8350120c27f4bcb5f53817dec4a6f5964e06b2 URL: https://gitlab.winehq.org/wine/wine/-/commit/5a8350120c27f4bcb5f53817dec4a6… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Oct 24 15:24:35 2022 +0200 conhost/tests: Fix some tests on input sequences. Correctly handling keyboards (French, German...) which report right-alt as ctrl+alt in VkKeyScan(). Splitting escape_test input tests into pure virtual keys on one hand, and modified char key on the other. Generating the virtual codes for the later instead of hardcoding the results (bound to generic US keyboard). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52980 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/conhost/tests/tty.c | 124 ++++++++++++++++++++++++------------------- 1 file changed, 68 insertions(+), 56 deletions(-) diff --git a/programs/conhost/tests/tty.c b/programs/conhost/tests/tty.c index 78e24cdb42d..5befbd2ea82 100644 --- a/programs/conhost/tests/tty.c +++ b/programs/conhost/tests/tty.c @@ -586,16 +586,17 @@ static void expect_key_pressed_(unsigned int line, unsigned int ctx, WCHAR ch, u expect_key_input_(line, ctx, 0, VK_SHIFT, FALSE, 0); } -#define expect_char_key(a) expect_char_key_(__LINE__,a) -static void expect_char_key_(unsigned int line, WCHAR ch) +#define expect_char_key(a) expect_char_key_(__LINE__,a,0) +#define expect_char_key_ctrl(a,c) expect_char_key_(__LINE__,a,c) +static void expect_char_key_(unsigned int line, WCHAR ch, unsigned int ctrl) { - unsigned int ctrl = 0, vk; + unsigned int vk; vk = VkKeyScanW(ch); if (vk == ~0) vk = 0; if (vk & 0x0100) ctrl |= SHIFT_PRESSED; /* Some keyboard (like German or French one) report right alt as ctrl+alt */ - if ((vk & 0x0600) == 0x0600) ctrl |= RIGHT_ALT_PRESSED; + if ((vk & 0x0600) == 0x0600 && !(ctrl & LEFT_ALT_PRESSED)) ctrl |= RIGHT_ALT_PRESSED; if (vk & 0x0200) ctrl |= LEFT_CTRL_PRESSED; vk &= 0xff; expect_key_pressed_(line, ch, ch, vk, ctrl); @@ -1448,62 +1449,67 @@ static void test_tty_input(void) static const struct { const char *str; - WCHAR ch; unsigned int vk; unsigned int ctrl; } escape_test[] = { - { "\x1b[A", 0, VK_UP, 0 }, - { "\x1b[B", 0, VK_DOWN, 0 }, - { "\x1b[C", 0, VK_RIGHT, 0 }, - { "\x1b[D", 0, VK_LEFT, 0 }, - { "\x1b[H", 0, VK_HOME, 0 }, - { "\x1b[F", 0, VK_END, 0 }, - { "\x1b[Z", 0x9, VK_TAB, SHIFT_PRESSED }, - { "\x1b[2~", 0, VK_INSERT, 0 }, - { "\x1b[3~", 0, VK_DELETE, 0 }, - { "\x1b[5~", 0, VK_PRIOR, 0 }, - { "\x1b[6~", 0, VK_NEXT, 0 }, - { "\x1b[15~", 0, VK_F5, 0 }, - { "\x1b[17~", 0, VK_F6, 0 }, - { "\x1b[18~", 0, VK_F7, 0 }, - { "\x1b[19~", 0, VK_F8, 0 }, - { "\x1b[20~", 0, VK_F9, 0 }, + { "\x1b[A", VK_UP, 0 }, + { "\x1b[B", VK_DOWN, 0 }, + { "\x1b[C", VK_RIGHT, 0 }, + { "\x1b[D", VK_LEFT, 0 }, + { "\x1b[H", VK_HOME, 0 }, + { "\x1b[F", VK_END, 0 }, + { "\x1b[2~", VK_INSERT, 0 }, + { "\x1b[3~", VK_DELETE, 0 }, + { "\x1b[5~", VK_PRIOR, 0 }, + { "\x1b[6~", VK_NEXT, 0 }, + { "\x1b[15~", VK_F5, 0 }, + { "\x1b[17~", VK_F6, 0 }, + { "\x1b[18~", VK_F7, 0 }, + { "\x1b[19~", VK_F8, 0 }, + { "\x1b[20~", VK_F9, 0 }, + { "\x1b[21~", VK_F10, 0 }, /* 0x10 */ - { "\x1b[21~", 0, VK_F10, 0 }, - { "\x1b[23~", 0, VK_F11, 0 }, - { "\x1b[24~", 0, VK_F12, 0 }, - { "\x1bOP", 0, VK_F1, 0 }, - { "\x1bOQ", 0, VK_F2, 0 }, - { "\x1bOR", 0, VK_F3, 0 }, - { "\x1bOS", 0, VK_F4, 0 }, - { "\x1b[1;1A", 0, VK_UP, 0 }, - { "\x1b[1;2A", 0, VK_UP, SHIFT_PRESSED }, - { "\x1b[1;3A", 0, VK_UP, LEFT_ALT_PRESSED }, - { "\x1b[1;4A", 0, VK_UP, SHIFT_PRESSED | LEFT_ALT_PRESSED }, - { "\x1b[1;5A", 0, VK_UP, LEFT_CTRL_PRESSED }, - { "\x1b[1;6A", 0, VK_UP, SHIFT_PRESSED | LEFT_CTRL_PRESSED }, - { "\x1b[1;7A", 0, VK_UP, LEFT_ALT_PRESSED | LEFT_CTRL_PRESSED }, - { "\x1b[1;8A", 0, VK_UP, SHIFT_PRESSED | LEFT_ALT_PRESSED | LEFT_CTRL_PRESSED }, - { "\x1b[1;9A", 0, VK_UP, 0 }, + { "\x1b[23~", VK_F11, 0 }, + { "\x1b[24~", VK_F12, 0 }, + { "\x1bOP", VK_F1, 0 }, + { "\x1bOQ", VK_F2, 0 }, + { "\x1bOR", VK_F3, 0 }, + { "\x1bOS", VK_F4, 0 }, + { "\x1b[1;1A", VK_UP, 0 }, + { "\x1b[1;2A", VK_UP, SHIFT_PRESSED }, + { "\x1b[1;3A", VK_UP, LEFT_ALT_PRESSED }, + { "\x1b[1;4A", VK_UP, SHIFT_PRESSED | LEFT_ALT_PRESSED }, + { "\x1b[1;5A", VK_UP, LEFT_CTRL_PRESSED }, + { "\x1b[1;6A", VK_UP, SHIFT_PRESSED | LEFT_CTRL_PRESSED }, + { "\x1b[1;7A", VK_UP, LEFT_ALT_PRESSED | LEFT_CTRL_PRESSED }, + { "\x1b[1;8A", VK_UP, SHIFT_PRESSED | LEFT_ALT_PRESSED | LEFT_CTRL_PRESSED }, + { "\x1b[1;9A", VK_UP, 0 }, + { "\x1b[1;10A", VK_UP, SHIFT_PRESSED }, /* 0x20 */ - { "\x1b[1;10A", 0, VK_UP, SHIFT_PRESSED }, - { "\x1b[1;11A", 0, VK_UP, LEFT_ALT_PRESSED }, - { "\x1b[1;12A", 0, VK_UP, SHIFT_PRESSED | LEFT_ALT_PRESSED }, - { "\x1b[1;13A", 0, VK_UP, LEFT_CTRL_PRESSED }, - { "\x1b[1;14A", 0, VK_UP, SHIFT_PRESSED | LEFT_CTRL_PRESSED }, - { "\x1b[1;15A", 0, VK_UP, LEFT_ALT_PRESSED | LEFT_CTRL_PRESSED }, - { "\x1b[1;16A", 0, VK_UP, SHIFT_PRESSED | LEFT_ALT_PRESSED | LEFT_CTRL_PRESSED }, - { "\x1b[1;2P", 0, VK_F1, SHIFT_PRESSED }, - { "\x1b[2;3~", 0, VK_INSERT, LEFT_ALT_PRESSED }, - { "\x1b[2;3;5;6~", 0, VK_INSERT, 0 }, - { "\x1b[6;2;3;5;1~", 0, VK_NEXT, 0 }, - { "\xe4\xb8\x80", 0x4e00, 0, 0 }, - { "\x1b\x1b", 0x1b, VK_ESCAPE, LEFT_ALT_PRESSED }, - { "\x1b""1", '1', '1', LEFT_ALT_PRESSED }, - { "\x1b""x", 'x', 'X', LEFT_ALT_PRESSED }, - { "\x1b""[", '[', VK_OEM_4, LEFT_ALT_PRESSED }, - /* 0x30 */ - { "\x7f", '\b', VK_BACK, 0 }, + { "\x1b[1;11A", VK_UP, LEFT_ALT_PRESSED }, + { "\x1b[1;12A", VK_UP, SHIFT_PRESSED | LEFT_ALT_PRESSED }, + { "\x1b[1;13A", VK_UP, LEFT_CTRL_PRESSED }, + { "\x1b[1;14A", VK_UP, SHIFT_PRESSED | LEFT_CTRL_PRESSED }, + { "\x1b[1;15A", VK_UP, LEFT_ALT_PRESSED | LEFT_CTRL_PRESSED }, + { "\x1b[1;16A", VK_UP, SHIFT_PRESSED | LEFT_ALT_PRESSED | LEFT_CTRL_PRESSED }, + { "\x1b[1;2P", VK_F1, SHIFT_PRESSED }, + { "\x1b[2;3~", VK_INSERT, LEFT_ALT_PRESSED }, + { "\x1b[2;3;5;6~", VK_INSERT, 0 }, + { "\x1b[6;2;3;5;1~", VK_NEXT, 0 }, + }; + static const struct + { + const char *str; + WCHAR ch; + unsigned int ctrl; + } escape_char_test[] = { + { "\x1b[Z", 0x9, SHIFT_PRESSED }, + { "\xe4\xb8\x80", 0x4e00, 0 }, + { "\x1b\x1b", 0x1b, LEFT_ALT_PRESSED }, + { "\x1b""1", '1', LEFT_ALT_PRESSED }, + { "\x1b""x", 'x', LEFT_ALT_PRESSED }, + { "\x1b""[", '[', LEFT_ALT_PRESSED }, + { "\x7f", '\b', 0 }, }; write_console_pipe("x"); @@ -1555,7 +1561,13 @@ static void test_tty_input(void) for (i = 0; i < ARRAY_SIZE(escape_test); i++) { write_console_pipe(escape_test[i].str); - expect_key_pressed_ctx(i, escape_test[i].ch, escape_test[i].vk, escape_test[i].ctrl); + expect_key_pressed_ctx(i, 0, escape_test[i].vk, escape_test[i].ctrl); + } + + for (i = 0; i < ARRAY_SIZE(escape_char_test); i++) + { + write_console_pipe(escape_char_test[i].str); + expect_char_key_ctrl(escape_char_test[i].ch, escape_char_test[i].ctrl); } for (i = 0x80; i < 0x100; i += 11)

1 0

Ziqing Hui : win32u: Add font links for MS Mincho.
by Alexandre Julliard 24 Oct '22

24 Oct '22

Module: wine Branch: master Commit: 7486c4061e08fa0355a2a5e23554e38681202926 URL: https://gitlab.winehq.org/wine/wine/-/commit/7486c4061e08fa0355a2a5e23554e3… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Oct 21 10:21:28 2022 +0800 win32u: Add font links for MS Mincho. --- 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 )

1 0

Martin Storsjö : win32u: Make sure that the stack buffer in set_multi_value_key is large enough.
by Alexandre Julliard 24 Oct '22

24 Oct '22

Module: wine Branch: master Commit: 0cb279812546bedae68bc86210facd6c00dbb83f URL: https://gitlab.winehq.org/wine/wine/-/commit/0cb279812546bedae68bc86210facd… Author: Martin Storsjö <martin(a)martin.st> Date: Mon Oct 24 10:49:52 2022 +0300 win32u: Make sure that the stack buffer in set_multi_value_key is large enough. This fixes stack overflows since edecac8afdd04701314381b6386e0f7ac862e066. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- dlls/win32u/font.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c index 6746f7fcb40..75189f8ec5a 100644 --- a/dlls/win32u/font.c +++ b/dlls/win32u/font.c @@ -3043,12 +3043,19 @@ static void update_font_association_info(void) static void set_multi_value_key( HKEY hkey, const WCHAR *name, const char *value, DWORD len ) { - WCHAR valueW[256]; + WCHAR *valueW; + + if (!(valueW = malloc( len * sizeof(WCHAR) ))) + { + ERR( "malloc of %d * WCHAR failed\n", len ); + return; + } ascii_to_unicode( valueW, value, len ); if (value) set_reg_value( hkey, name, REG_MULTI_SZ, valueW, len * sizeof(WCHAR) ); else if (name) reg_delete_value( hkey, name ); + free( valueW ); } static void update_font_system_link_info(void)

1 0

Gabriel Ivăncescu : mshtml: Move HTMLDocumentObj implementation to oleobj.c.
by Alexandre Julliard 24 Oct '22

24 Oct '22

Module: wine Branch: master Commit: c72686aec8872cf8d60eb6aefd32ef553ea155a9 URL: https://gitlab.winehq.org/wine/wine/-/commit/c72686aec8872cf8d60eb6aefd32ef… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Oct 24 15:58:00 2022 +0300 mshtml: Move HTMLDocumentObj implementation to oleobj.c. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmldoc.c | 363 ++----------------------------------------- dlls/mshtml/mshtml_private.h | 4 +- dlls/mshtml/oleobj.c | 350 ++++++++++++++++++++++++++++++++++++++++- 3 files changed, 361 insertions(+), 356 deletions(-)

1 0

Gabriel Ivăncescu : mshtml: Move the remaining non-IHTMLDocument* interfaces out of basedoc.
by Alexandre Julliard 24 Oct '22

24 Oct '22

Module: wine Branch: master Commit: 0759e865271d58cc48059ca22d3e2709165c2146 URL: https://gitlab.winehq.org/wine/wine/-/commit/0759e865271d58cc48059ca22d3e27… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Oct 24 15:58:01 2022 +0300 mshtml: Move the remaining non-IHTMLDocument* interfaces out of basedoc. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmldoc.c | 366 ++++++++++++++++++++++--------------------- dlls/mshtml/mshtml_private.h | 24 ++- dlls/mshtml/oleobj.c | 360 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 562 insertions(+), 188 deletions(-)

1 0

Gabriel Ivăncescu : mshtml: Move the IHTMLDocument2 interface out of basedoc.
by Alexandre Julliard 24 Oct '22

24 Oct '22

Module: wine Branch: master Commit: eaaae516956d5b39a798a6506442186120746a9b URL: https://gitlab.winehq.org/wine/wine/-/commit/eaaae516956d5b39a798a650644218… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Oct 24 15:58:01 2022 +0300 mshtml: Move the IHTMLDocument2 interface out of basedoc. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmldoc.c | 532 +++++++++++++++++++++---------------------- dlls/mshtml/htmlelem.c | 2 +- dlls/mshtml/htmlframe.c | 6 +- dlls/mshtml/htmlnode.c | 2 +- dlls/mshtml/htmlwindow.c | 2 +- dlls/mshtml/mshtml_private.h | 3 +- dlls/mshtml/oleobj.c | 319 ++++++++++++++++++++++++++ dlls/mshtml/script.c | 2 +- dlls/mshtml/service.c | 4 +- dlls/mshtml/view.c | 2 +- 10 files changed, 594 insertions(+), 280 deletions(-)

1 0