November 2022 - Wine-commits

Zhiyi Zhang : user32/tests: Test creating a fullscreen window spanning multiple monitors.
by Alexandre Julliard 04 Nov '22

04 Nov '22

Module: wine Branch: master Commit: 3dd68caab3d39fd5cd4d3a223b696ae7d5f7e9e6 URL: https://gitlab.winehq.org/wine/wine/-/commit/3dd68caab3d39fd5cd4d3a223b696a… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Aug 12 11:32:54 2022 +0800 user32/tests: Test creating a fullscreen window spanning multiple monitors. --- dlls/user32/tests/win.c | 44 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index d9b1d9c2665..a99163860f4 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -9113,12 +9113,12 @@ static void test_fullscreen(void) static const DWORD t_ex_style[] = { 0, WS_EX_APPWINDOW, WS_EX_TOOLWINDOW }; + RECT rc, virtual_rect, expected_rect; WNDCLASSA cls; int timeout; HWND hwnd; int i, j; POINT pt; - RECT rc; HMONITOR hmon; LRESULT ret; @@ -9265,6 +9265,48 @@ static void test_fullscreen(void) DestroyWindow(hwnd); UnregisterClassA("fullscreen_class", GetModuleHandleA(NULL)); + + /* Test fullscreen windows spanning multiple monitors */ + if (GetSystemMetrics(SM_CMONITORS) > 1) + { + /* Test windows covering all monitors */ + virtual_rect.left = GetSystemMetrics(SM_XVIRTUALSCREEN); + virtual_rect.top = GetSystemMetrics(SM_YVIRTUALSCREEN); + virtual_rect.right = virtual_rect.left + GetSystemMetrics(SM_CXVIRTUALSCREEN); + virtual_rect.bottom = virtual_rect.top + GetSystemMetrics(SM_CYVIRTUALSCREEN); + + hwnd = CreateWindowA("static", NULL, WS_POPUP | WS_VISIBLE, virtual_rect.left, + virtual_rect.top, virtual_rect.right - virtual_rect.left, + virtual_rect.bottom - virtual_rect.top, NULL, NULL, NULL, NULL); + ok(!!hwnd, "CreateWindow failed, error %#lx.\n", GetLastError()); + flush_events(TRUE); + + GetWindowRect(hwnd, &rc); + todo_wine + ok(EqualRect(&rc, &virtual_rect), "Expected %s, got %s.\n", + wine_dbgstr_rect(&virtual_rect), wine_dbgstr_rect(&rc)); + DestroyWindow(hwnd); + + /* Test windows covering one monitor and 1 pixel larger on available sides */ + expected_rect = mi.rcMonitor; + InflateRect(&expected_rect, 1, 1); + IntersectRect(&expected_rect, &expected_rect, &virtual_rect); + hwnd = CreateWindowA("static", NULL, WS_POPUP | WS_VISIBLE, expected_rect.left, + expected_rect.top, expected_rect.right - expected_rect.left, + expected_rect.bottom - expected_rect.top, NULL, NULL, NULL, NULL); + ok(!!hwnd, "CreateWindow failed, error %#lx.\n", GetLastError()); + flush_events(TRUE); + + GetWindowRect(hwnd, &rc); + todo_wine + ok(EqualRect(&rc, &expected_rect), "Expected %s, got %s.\n", + wine_dbgstr_rect(&expected_rect), wine_dbgstr_rect(&rc)); + DestroyWindow(hwnd); + } + else + { + skip("This test requires at least two monitors.\n"); + } } static BOOL test_thick_child_got_minmax;

1 0

Zhiyi Zhang : winex11.drv: Support _NET_WM_FULLSCREEN_MONITORS.
by Alexandre Julliard 04 Nov '22

04 Nov '22

Module: wine Branch: master Commit: bd8ec8f264b5403f90bca6ecb26ae3170995ccd4 URL: https://gitlab.winehq.org/wine/wine/-/commit/bd8ec8f264b5403f90bca6ecb26ae3… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Aug 12 11:32:54 2022 +0800 winex11.drv: Support _NET_WM_FULLSCREEN_MONITORS. Support _NET_WM_FULLSCREEN_MONITORS for fullscreen windows spanning multiple monitors. This property is used to hint window managers about which monitor a fullscreen window should cover. Window managers make a fullscreen window spanning multiple monitors cover only one monitor when this property is missing. Fix Project Cars 2/3 incorrect game window size when the triple-screen mode is on. --- dlls/user32/tests/win.c | 3 +- dlls/winex11.drv/display.c | 6 +++ dlls/winex11.drv/window.c | 42 +++++++++++++++++++++ dlls/winex11.drv/x11drv.h | 3 ++ dlls/winex11.drv/x11drv_main.c | 1 + dlls/winex11.drv/xinerama.c | 83 ++++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/xrandr.c | 5 +++ 7 files changed, 142 insertions(+), 1 deletion(-)

1 0

Ziqing Hui : gdi32/uniscribe: Add fallback font for Kana and CJK script.
by Alexandre Julliard 04 Nov '22

04 Nov '22

Module: wine Branch: master Commit: b558c87c50a7fe4e751646811d823a95c98c7c1b URL: https://gitlab.winehq.org/wine/wine/-/commit/b558c87c50a7fe4e751646811d823a… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Nov 3 13:04:34 2022 +0800 gdi32/uniscribe: Add fallback font for Kana and CJK script. This fixes Chinese and Japanese text display issue for Sins of a Solar Empire: Rebellion. --- dlls/gdi32/uniscribe/usp10.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/uniscribe/usp10.c b/dlls/gdi32/uniscribe/usp10.c index eb86048a6bd..75fc7b380a7 100644 --- a/dlls/gdi32/uniscribe/usp10.c +++ b/dlls/gdi32/uniscribe/usp10.c @@ -465,7 +465,7 @@ const scriptData scriptInformation[] = { MS_MAKE_TAG('k','h','m','r'), L"DaunPenh"}, {{Script_CJK_Han, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {LANG_ENGLISH, 0, 0, 0, 0, ANSI_CHARSET, 0, 0, 0, 0, 0, 0, 1, 0, 0}, - MS_MAKE_TAG('h','a','n','i'), L""}, + MS_MAKE_TAG('h','a','n','i'), L"SimSun"}, {{Script_Ideograph, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {LANG_ENGLISH, 0, 0, 0, 0, ANSI_CHARSET, 0, 0, 0, 0, 0, 0, 1, 0, 0}, MS_MAKE_TAG('h','a','n','i'), L""}, @@ -474,7 +474,7 @@ const scriptData scriptInformation[] = { MS_MAKE_TAG('b','o','p','o'), L""}, {{Script_Kana, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {LANG_ENGLISH, 0, 0, 0, 0, ANSI_CHARSET, 0, 0, 0, 0, 0, 0, 1, 0, 0}, - MS_MAKE_TAG('k','a','n','a'), L""}, + MS_MAKE_TAG('k','a','n','a'), L"SimSun"}, {{Script_Hangul, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {LANG_KOREAN, 0, 1, 0, 1, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 1, 0, 0}, MS_MAKE_TAG('h','a','n','g'), L""},

1 0

Evan Tang : kernel32: Null-terminate the atom names passed to NtAddAtom.
by Alexandre Julliard 04 Nov '22

04 Nov '22

Module: wine Branch: master Commit: f181e25a4755dc16a0704dea00e46da002a946f8 URL: https://gitlab.winehq.org/wine/wine/-/commit/f181e25a4755dc16a0704dea00e46d… Author: Evan Tang <etang(a)codeweavers.com> Date: Wed Nov 2 16:14:17 2022 -0500 kernel32: Null-terminate the atom names passed to NtAddAtom. Adobe Reader XI patches NtAddAtom() and expects the name to be null-terminated Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53872 --- dlls/kernel32/atom.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/atom.c b/dlls/kernel32/atom.c index 2330131fb65..5b3128e5c05 100644 --- a/dlls/kernel32/atom.c +++ b/dlls/kernel32/atom.c @@ -110,8 +110,10 @@ ATOM WINAPI GlobalAddAtomA( LPCSTR str /* [in] String to add */ ) { if (!check_integral_atom( str, &atom )) { - WCHAR buffer[MAX_ATOM_LEN]; + /* Note: Adobe Reader XI in protected mode hijacks NtAddAtom and its replacement expects the string to be null terminated. */ + WCHAR buffer[MAX_ATOM_LEN+1]; DWORD len = MultiByteToWideChar( CP_ACP, 0, str, strlen(str), buffer, MAX_ATOM_LEN ); + buffer[len] = 0; if (!len) SetLastError( ERROR_INVALID_PARAMETER ); else if (!set_ntstatus( NtAddAtom( buffer, len * sizeof(WCHAR), &atom ))) atom = 0; }

1 0

Alex Henrie : cmd: Remove inapplicable comment from WCMD_getfileowner.
by Alexandre Julliard 04 Nov '22

04 Nov '22

Module: wine Branch: master Commit: 6ee8f819cfed710c70d539c584aa50954b6754cd URL: https://gitlab.winehq.org/wine/wine/-/commit/6ee8f819cfed710c70d539c584aa50… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 3 19:10:04 2022 -0600 cmd: Remove inapplicable comment from WCMD_getfileowner. --- programs/cmd/directory.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index 8417687939a..c556746d7ad 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -177,8 +177,6 @@ static int __cdecl WCMD_dir_sort (const void *a, const void *b) /***************************************************************************** * WCMD_getfileowner - * - * Reverse a WCHARacter string in-place (strrev() is not available under unixen :-( ). */ static void WCMD_getfileowner(WCHAR *filename, WCHAR *owner, int ownerlen) {

1 0

Alex Henrie : cmd: Use the wcsrev function instead of reimplementing it.
by Alexandre Julliard 04 Nov '22

04 Nov '22

Module: wine Branch: master Commit: 212e319dce4deb77f27a65f10e5be2b069cb1d01 URL: https://gitlab.winehq.org/wine/wine/-/commit/212e319dce4deb77f27a65f10e5be2… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 3 19:30:31 2022 -0600 cmd: Use the wcsrev function instead of reimplementing it. --- programs/cmd/directory.c | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index c556746d7ad..86c9b387c82 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -49,25 +49,6 @@ static BOOL orderReverse, orderGroupDirs, orderGroupDirsReverse, orderByCol; static BOOL paged_mode, recurse, wide, bare, lower, shortname, usernames, separator; static ULONG showattrs, attrsbits; -/***************************************************************************** - * WCMD_strrev - * - * Reverse a WCHARacter string in-place (strrev() is not available under unixen :-( ). - */ -static WCHAR * WCMD_strrev (WCHAR *buff) { - - int r, i; - WCHAR b; - - r = lstrlenW (buff); - for (i=0; i<r/2; i++) { - b = buff[i]; - buff[i] = buff[r-i-1]; - buff[r-i-1] = b; - } - return (buff); -} - /***************************************************************************** * WCMD_filesize64 * @@ -92,7 +73,7 @@ static WCHAR * WCMD_filesize64 (ULONGLONG n) { *p = '\0'; n = q; } while (n != 0); - WCMD_strrev (buff); + wcsrev(buff); return buff; }

1 0

Ziqing Hui : usp10/tests: Add CJK shaping test.
by Alexandre Julliard 04 Nov '22

04 Nov '22

Module: wine Branch: master Commit: 1e07b77b515b784f4dae9cbdc847f6aaac07dede URL: https://gitlab.winehq.org/wine/wine/-/commit/1e07b77b515b784f4dae9cbdc847f6… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Nov 3 12:38:12 2022 +0800 usp10/tests: Add CJK shaping test. --- dlls/usp10/tests/usp10.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index aee751423b3..35d25d46ccc 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -1617,6 +1617,16 @@ static void test_ScriptShapeOpenType(HDC hdc) {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, {1,{{SCRIPT_JUSTIFY_NONE,0,0,0,0,0},0}} }; + /* CJK */ + static const WCHAR test_cjk[] = {0x4e2d, 0x6587, 0x65e5, 0x672c, 0x8a9e}; + static const shapeTest_char cjk_c[] = {{0,{0,0}},{1,{0,0}},{2,{0,0}},{3,{0,0}},{4,{0,0}}}; + static const shapeTest_glyph cjk_g[] = { + {1,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}} }; + static const font_fingerprint fingerprint_estrangelo = { {'A','a','B','b','C','c','D','d',0,0}, {284,310,285,311,286,312,287,313,0,0}}; @@ -1801,6 +1811,14 @@ static void test_ScriptShapeOpenType(HDC hdc) SelectObject(hdc, hfont_orig); DeleteObject(hfont); } + + test_valid = find_font_for_range(hdc, "SimSun", 59, test_cjk[0], &hfont, &hfont_orig, NULL); + if (hfont != NULL) + { + test_shape_ok_valid(test_valid, hdc, test_cjk, 5, &Control, &State, 0, 5, cjk_c, cjk_g); + SelectObject(hdc, hfont_orig); + DeleteObject(hfont); + } } static void test_ScriptShape(HDC hdc)

1 0

Ziqing Hui : usp10/tests: Add Hiragana shaping test.
by Alexandre Julliard 04 Nov '22

04 Nov '22

Module: wine Branch: master Commit: 0e7415389c8617160cf3017361cc316f5f630208 URL: https://gitlab.winehq.org/wine/wine/-/commit/0e7415389c8617160cf3017361cc31… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Nov 3 12:48:07 2022 +0800 usp10/tests: Add Hiragana shaping test. --- dlls/usp10/tests/usp10.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 35d25d46ccc..432e4bdce07 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -1617,6 +1617,14 @@ static void test_ScriptShapeOpenType(HDC hdc) {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, {1,{{SCRIPT_JUSTIFY_NONE,0,0,0,0,0},0}} }; + /* Hiragana */ + static const WCHAR test_hiragana[] = {0x306b, 0x307b, 0x3093, 0x3054}; + static const shapeTest_char hiragana_c[] = {{0,{0,0}},{1,{0,0}},{2,{0,0}},{3,{0,0}}}; + static const shapeTest_glyph hiragana_g[] = { + {1,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}} }; /* CJK */ static const WCHAR test_cjk[] = {0x4e2d, 0x6587, 0x65e5, 0x672c, 0x8a9e}; static const shapeTest_char cjk_c[] = {{0,{0,0}},{1,{0,0}},{2,{0,0}},{3,{0,0}},{4,{0,0}}}; @@ -1812,6 +1820,14 @@ static void test_ScriptShapeOpenType(HDC hdc) DeleteObject(hfont); } + test_valid = find_font_for_range(hdc, "SimSun", 49, test_hiragana[0], &hfont, &hfont_orig, NULL); + if (hfont != NULL) + { + test_shape_ok_valid(test_valid, hdc, test_hiragana, 4, &Control, &State, 0, 4, hiragana_c, hiragana_g); + SelectObject(hdc, hfont_orig); + DeleteObject(hfont); + } + test_valid = find_font_for_range(hdc, "SimSun", 59, test_cjk[0], &hfont, &hfont_orig, NULL); if (hfont != NULL) {

1 0

Ziqing Hui : usp10/tests: Add Katakana shaping test.
by Alexandre Julliard 04 Nov '22

04 Nov '22

Module: wine Branch: master Commit: 6f8c5195eca5de9aabac98d1ab22e9920428aff5 URL: https://gitlab.winehq.org/wine/wine/-/commit/6f8c5195eca5de9aabac98d1ab22e9… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Nov 3 13:02:24 2022 +0800 usp10/tests: Add Katakana shaping test. --- dlls/usp10/tests/usp10.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 432e4bdce07..7516bfb2a97 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -1625,6 +1625,14 @@ static void test_ScriptShapeOpenType(HDC hdc) {1,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}}, {1,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}}, {1,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}} }; + + /* Katakana */ + static const WCHAR test_katakana[] = {0x30b3, 0x30fc, 0x30c9}; + static const shapeTest_char katakana_c[] = {{0,{0,0}},{1,{0,0}},{2,{0,0}}}; + static const shapeTest_glyph katakana_g[] = { + {1,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}} }; /* CJK */ static const WCHAR test_cjk[] = {0x4e2d, 0x6587, 0x65e5, 0x672c, 0x8a9e}; static const shapeTest_char cjk_c[] = {{0,{0,0}},{1,{0,0}},{2,{0,0}},{3,{0,0}},{4,{0,0}}}; @@ -1828,6 +1836,14 @@ static void test_ScriptShapeOpenType(HDC hdc) DeleteObject(hfont); } + test_valid = find_font_for_range(hdc, "SimSun", 50, test_katakana[0], &hfont, &hfont_orig, NULL); + if (hfont != NULL) + { + test_shape_ok_valid(test_valid, hdc, test_katakana, 3, &Control, &State, 0, 3, katakana_c, katakana_g); + SelectObject(hdc, hfont_orig); + DeleteObject(hfont); + } + test_valid = find_font_for_range(hdc, "SimSun", 59, test_cjk[0], &hfont, &hfont_orig, NULL); if (hfont != NULL) {

1 0

Paul Gofman : ws2_32/tests: Add tests for SO_EXCLUSIVEADDRUSE.
by Alexandre Julliard 04 Nov '22

04 Nov '22

Module: wine Branch: master Commit: 1178a9dd3ae1afdba0c2bb309a04b8a33056ef92 URL: https://gitlab.winehq.org/wine/wine/-/commit/1178a9dd3ae1afdba0c2bb309a04b8… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Oct 31 12:20:47 2022 -0600 ws2_32/tests: Add tests for SO_EXCLUSIVEADDRUSE. --- dlls/ws2_32/tests/sock.c | 208 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 204 insertions(+), 4 deletions(-)

1 0