December 2022 - Wine-Commits

Ziqing Hui : mf/tests: Introduce check_dmo_set_input_type.
by Alexandre Julliard Dec. 20, 2022

Dec. 20, 2022

Module: wine Branch: master Commit: 6353af03d37cfb8a03d3f0bb8d731dceb16437cf URL: https://gitlab.winehq.org/wine/wine/-/commit/6353af03d37cfb8a03d3f0bb8d731d… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Dec 13 11:26:58 2022 +0800 mf/tests: Introduce check_dmo_set_input_type. --- dlls/mf/tests/transform.c | 349 ++++++++++++++++++++++------------------------ 1 file changed, 168 insertions(+), 181 deletions(-)

1 0

Ziqing Hui : mf/tests: Shorten test messages.
by Alexandre Julliard Dec. 20, 2022

Dec. 20, 2022

Module: wine Branch: master Commit: 5b67e30fd8393cb3a8cc2f97ad63bf9320a7c77d URL: https://gitlab.winehq.org/wine/wine/-/commit/5b67e30fd8393cb3a8cc2f97ad63bf… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Dec 20 09:07:01 2022 +0800 mf/tests: Shorten test messages. --- dlls/mf/tests/transform.c | 90 +++++++++++++++++++++++------------------------ 1 file changed, 45 insertions(+), 45 deletions(-)

1 0

Eric Pouech : conhost: Don't print control characters for Unix tty.
by Alexandre Julliard Dec. 20, 2022

Dec. 20, 2022

Module: wine Branch: master Commit: 0a7c04816f2497d6bdb4006d01f3266cc91bf3fc URL: https://gitlab.winehq.org/wine/wine/-/commit/0a7c04816f2497d6bdb4006d01f326… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Dec 19 18:09:59 2022 +0100 conhost: Don't print control characters for Unix tty. They will be reinterpreted by Unix tty, leading to wrong display. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/conhost/conhost.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index c3a106c9321..769f998f404 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -358,6 +358,8 @@ static void update_output( struct screen_buffer *screen_buffer, RECT *rect ) int x, y, size, trailing_spaces; char_info_t *ch; char buf[8]; + WCHAR wch; + const unsigned int mask = (1u << '\0') | (1u << '\b') | (1u << '\t') | (1u << '\n') | (1u << '\a') | (1u << '\r'); if (!is_active( screen_buffer ) || rect->top > rect->bottom || rect->right < rect->left) return; @@ -393,9 +395,11 @@ static void update_output( struct screen_buffer *screen_buffer, RECT *rect ) tty_write( screen_buffer->console, "\x1b[K", 3 ); break; } - + wch = ch->ch; + if (screen_buffer->console->is_unix && wch < L' ' && mask & (1u << wch)) + wch = L'?'; size = WideCharToMultiByte( get_tty_cp( screen_buffer->console ), 0, - &ch->ch, 1, buf, sizeof(buf), NULL, NULL ); + &wch, 1, buf, sizeof(buf), NULL, NULL ); tty_write( screen_buffer->console, buf, size ); screen_buffer->console->tty_cursor_x++; }

1 0

Jacek Caban : win32u/tests: Add inter-process message tests.
by Alexandre Julliard Dec. 20, 2022

Dec. 20, 2022

Module: wine Branch: master Commit: 4a415b0c56377e0b92f768835b9468a078c11e57 URL: https://gitlab.winehq.org/wine/wine/-/commit/4a415b0c56377e0b92f768835b9468… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 20 13:52:26 2022 +0100 win32u/tests: Add inter-process message tests. --- dlls/win32u/tests/win32u.c | 139 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 139 insertions(+) diff --git a/dlls/win32u/tests/win32u.c b/dlls/win32u/tests/win32u.c index bcfafbf13b3..87419f6fadb 100644 --- a/dlls/win32u/tests/win32u.c +++ b/dlls/win32u/tests/win32u.c @@ -694,11 +694,149 @@ static void test_NtUserDisplayConfigGetDeviceInfo(void) ok(status == STATUS_UNSUCCESSFUL || status == STATUS_NOT_SUPPORTED, "got %#lx.\n", status); } +static LRESULT WINAPI test_ipc_message_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) +{ + switch (msg) + { + case WM_SETTEXT: + case CB_FINDSTRING: + ok( !wcscmp( (const WCHAR *)lparam, L"test" ), + "lparam = %s\n", wine_dbgstr_w( (const WCHAR *)lparam )); + return 6; + + case WM_GETTEXT: + case EM_GETLINE: + case CB_GETLBTEXT: + ok( wparam == 100, "wparam = %Iu\n", wparam ); + wcscpy( (void *)lparam, L"Test" ); + return 4; + + case WM_GETTEXTLENGTH: + return 99; + + case WM_MDICREATE: + { + MDICREATESTRUCTW *mdi = (MDICREATESTRUCTW *)lparam; + ok( !wcscmp( mdi->szClass, L"TestClass" ), "szClass = %s\n", wine_dbgstr_w( mdi->szClass )); + ok( !wcscmp( mdi->szTitle, L"TestTitle" ), "szTitle = %s\n", wine_dbgstr_w( mdi->szTitle )); + return 0xdeadbeef; + } + } + + return DefWindowProcW( hwnd, msg, wparam, lparam ); +} + +static void test_inter_process_messages( const char *argv0 ) +{ + WNDCLASSW cls = { 0 }; + char path[MAX_PATH]; + PROCESS_INFORMATION pi; + STARTUPINFOA startup; + MSG msg; + HWND hwnd; + BOOL ret; + + cls.lpfnWndProc = test_ipc_message_proc; + cls.lpszClassName = L"TestIPCClass"; + RegisterClassW( &cls ); + + hwnd = CreateWindowExW( 0, L"TestIPCClass", NULL, WS_POPUP | CBS_HASSTRINGS, 0,0,0,0,0,0,0, NULL ); + + memset( &startup, 0, sizeof(startup) ); + startup.cb = sizeof(startup); + startup.dwFlags = STARTF_USESHOWWINDOW; + startup.wShowWindow = SW_SHOWNORMAL; + sprintf( path, "%s win32u ipcmsg %Ix", argv0, (INT_PTR)hwnd ); + ret = CreateProcessA( NULL, path, NULL, NULL, TRUE, 0, NULL, NULL, &startup, &pi ); + ok( ret, "CreateProcess '%s' failed err %lu.\n", path, GetLastError() ); + + do + { + GetMessageW( &msg, NULL, 0, 0 ); + TranslateMessage( &msg ); + DispatchMessageW( &msg ); + } while (msg.message != WM_USER); + + wait_child_process( pi.hProcess ); + + CloseHandle( pi.hThread ); + CloseHandle( pi.hProcess ); + + DestroyWindow( hwnd ); + UnregisterClassW( L"TestIPCClass", NULL ); +} + +static void test_inter_process_child( HWND hwnd ) +{ + MDICREATESTRUCTA mdi; + WCHAR bufW[100]; + char buf[100]; + int res; + + res = SendMessageA( hwnd, WM_SETTEXT, 0, (LPARAM)"test" ); + ok( res == 6, "WM_SETTEXT returned %d\n", res ); + + res = NtUserMessageCall( hwnd, WM_SETTEXT, 0, (LPARAM)"test", NULL, NtUserSendMessage, TRUE ); + ok( res == 6, "res = %d\n", res ); + + res = NtUserMessageCall( hwnd, CB_FINDSTRING, 0, (LPARAM)"test", NULL, NtUserSendMessage, TRUE ); + ok( res == 6, "res = %d\n", res ); + + memset( buf, 0xcc, sizeof(buf) ); + res = NtUserMessageCall( hwnd, WM_GETTEXT, sizeof(buf), (LPARAM)buf, NULL, NtUserSendMessage, TRUE ); + ok( res == 4, "res = %d\n", res ); + ok( !strcmp( buf, "Test" ), "buf = %s\n", buf ); + + memset( bufW, 0xcc, sizeof(bufW) ); + res = NtUserMessageCall( hwnd, WM_GETTEXT, ARRAYSIZE(bufW), (LPARAM)bufW, NULL, NtUserSendMessage, FALSE ); + ok( res == 4, "res = %d\n", res ); + ok( !wcscmp( bufW, L"Test" ), "buf = %s\n", buf ); + + memset( buf, 0xcc, sizeof(buf) ); + res = NtUserMessageCall( hwnd, CB_GETLBTEXT, 100, (LPARAM)buf, NULL, NtUserSendMessage, TRUE ); + todo_wine + ok( res == 1, "res = %d\n", res ); + ok( buf[0] == 'T', "buf[0] = %c\n", buf[0] ); + todo_wine + ok( buf[1] == (char)0xcc, "buf[1] = %x\n", buf[1] ); + + memset( buf, 0xcc, sizeof(buf) ); + *(DWORD *)buf = ARRAYSIZE(buf); + res = NtUserMessageCall( hwnd, EM_GETLINE, sizeof(buf), (LPARAM)buf, NULL, NtUserSendMessage, TRUE ); + ok( res == 4, "res = %d\n", res ); + ok( !strcmp( buf, "Test" ), "buf = %s\n", buf ); + + res = NtUserMessageCall( hwnd, WM_GETTEXTLENGTH, 0, 0, NULL, NtUserSendMessage, TRUE ); + ok( res == 4, "res = %d\n", res ); + + mdi.szClass = "TestClass"; + mdi.szTitle = "TestTitle"; + mdi.hOwner = 0; + mdi.x = mdi.y = 10; + mdi.cx = mdi.cy = 100; + mdi.style = 0; + mdi.lParam = 0xdeadbeef; + res = NtUserMessageCall( hwnd, WM_MDICREATE, 0, (LPARAM)&mdi, NULL, NtUserSendMessage, TRUE ); + ok( res == 0xdeadbeef, "res = %d\n", res ); + + PostMessageA( hwnd, WM_USER, 0, 0 ); +} + START_TEST(win32u) { + char **argv; + int argc; + /* native win32u.dll fails if user32 is not loaded, so make sure it's fully initialized */ GetDesktopWindow(); + argc = winetest_get_mainargs( &argv ); + if (argc > 3 && !strcmp( argv[2], "ipcmsg" )) + { + test_inter_process_child( LongToHandle( strtol( argv[3], NULL, 16 ))); + return; + } + test_NtUserEnumDisplayDevices(); test_window_props(); test_class(); @@ -709,6 +847,7 @@ START_TEST(win32u) test_menu(); test_message_filter(); test_timer(); + test_inter_process_messages( argv[0] ); test_NtUserCloseWindowStation(); test_NtUserDisplayConfigGetDeviceInfo();

1 0

Jacek Caban : win32u: Convert inter-process messages to Unicode.
by Alexandre Julliard Dec. 20, 2022

Dec. 20, 2022

Module: wine Branch: master Commit: d222dcc2a47b0d4cb05c967eade773efcb208543 URL: https://gitlab.winehq.org/wine/wine/-/commit/d222dcc2a47b0d4cb05c967eade773… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 20 13:53:04 2022 +0100 win32u: Convert inter-process messages to Unicode. Based on user32 WINPROC_CallProcWtoA. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53744 --- dlls/win32u/font.c | 82 +++++++++++++ dlls/win32u/message.c | 282 ++++++++++++++++++++++++++++++++++++++++++- dlls/win32u/ntgdi_private.h | 1 - dlls/win32u/win32u_private.h | 3 + 4 files changed, 366 insertions(+), 2 deletions(-)

1 0

Paul Gofman : winhttp: Check for NULL lpszAutoConfigUrl in WinHttpGetProxyForUrl().
by Alexandre Julliard Dec. 19, 2022

Dec. 19, 2022

Module: wine Branch: master Commit: 2b0cd25b5f5794463a59cac999583fb52fa021cc URL: https://gitlab.winehq.org/wine/wine/-/commit/2b0cd25b5f5794463a59cac999583f… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Dec 19 10:22:15 2022 -0600 winhttp: Check for NULL lpszAutoConfigUrl in WinHttpGetProxyForUrl(). Fixes a regression introduced by cbfe940a1eaf5e158de3127b1265462bfbfb70af. --- dlls/winhttp/session.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 65e471f7ee5..6b426bee220 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -2094,7 +2094,8 @@ BOOL WINAPI WinHttpGetProxyForUrl( HINTERNET hsession, LPCWSTR url, WINHTTP_AUTO !(options->dwFlags & (WINHTTP_AUTOPROXY_AUTO_DETECT|WINHTTP_AUTOPROXY_CONFIG_URL)) || ((options->dwFlags & WINHTTP_AUTOPROXY_AUTO_DETECT) && !options->dwAutoDetectFlags) || ((options->dwFlags & WINHTTP_AUTOPROXY_AUTO_DETECT) && - (options->dwFlags & WINHTTP_AUTOPROXY_CONFIG_URL))) + (options->dwFlags & WINHTTP_AUTOPROXY_CONFIG_URL)) || + (options->dwFlags & WINHTTP_AUTOPROXY_CONFIG_URL && !options->lpszAutoConfigUrl)) { release_object( &session->hdr ); SetLastError( ERROR_INVALID_PARAMETER );

1 0

Alexandre Julliard : d3d9/tests: Mark some of the depth bias tests as todo.
by Alexandre Julliard Dec. 19, 2022

Dec. 19, 2022

Module: wine Branch: master Commit: 1efcbeacf152404b7ed389836ed78125376cde02 URL: https://gitlab.winehq.org/wine/wine/-/commit/1efcbeacf152404b7ed389836ed781… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 19 15:16:01 2022 +0100 d3d9/tests: Mark some of the depth bias tests as todo. They fail on the Gitlab CI. --- dlls/d3d9/tests/visual.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index f630a074ea0..ccfa8ce5e3a 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -22485,23 +22485,29 @@ static void test_depthbias(void) /* The broken results are for the WARP driver on the testbot. It seems to initialize * a scaling factor based on the first depth format that is used. Other formats with * a different depth size then render incorrectly. */ + todo_wine_if(!color_match(color, 0x000000ff, 1)) ok(color_match(color, 0x000000ff, 1) || broken(color_match(color, 0x00ffffff, 1)), "Got unexpected color %08x at x=64, format %u.\n", color, formats[i]); color = getPixelColor(device, 190, 240); + todo_wine_if(!color_match(color, 0x000000ff, 1)) ok(color_match(color, 0x000000ff, 1) || broken(color_match(color, 0x00ffffff, 1)), "Got unexpected color %08x at x=190, format %u.\n", color, formats[i]); color = getPixelColor(device, 194, 240); + todo_wine_if(!color_match(color, 0x0000ff00, 1)) ok(color_match(color, 0x0000ff00, 1) || broken(color_match(color, 0x00ffffff, 1)), "Got unexpected color %08x at x=194, format %u.\n", color, formats[i]); color = getPixelColor(device, 318, 240); + todo_wine_if(!color_match(color, 0x0000ff00, 1)) ok(color_match(color, 0x0000ff00, 1) || broken(color_match(color, 0x00ffffff, 1)), "Got unexpected color %08x at x=318, format %u.\n", color, formats[i]); color = getPixelColor(device, 322, 240); + todo_wine_if(!color_match(color, 0x00ff0000, 1)) ok(color_match(color, 0x00ff0000, 1) || broken(color_match(color, 0x00000000, 1)), "Got unexpected color %08x at x=322, format %u.\n", color, formats[i]); color = getPixelColor(device, 446, 240); + todo_wine_if(!color_match(color, 0x00ff0000, 1)) ok(color_match(color, 0x00ff0000, 1) || broken(color_match(color, 0x00000000, 1)), "Got unexpected color %08x at x=446, format %u.\n", color, formats[i]);

1 0

Alexandre Julliard : d3d8/tests: Mark a zero-size pixel test as todo.
by Alexandre Julliard Dec. 19, 2022

Dec. 19, 2022

Module: wine Branch: master Commit: 28eafda808c5c426ebc54580607ae714bad1a8f2 URL: https://gitlab.winehq.org/wine/wine/-/commit/28eafda808c5c426ebc54580607ae7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 19 15:15:09 2022 +0100 d3d8/tests: Mark a zero-size pixel test as todo. It fails on the Gitlab CI. --- dlls/d3d8/tests/visual.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 434474b292d..ea2d96378f7 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -7833,6 +7833,7 @@ static void test_pointsize(void) * it does the "useful" thing on all the drivers I tried. */ /* On WARP it does draw some pixels, most of the time. */ color = getPixelColor(device, 64, 64); + todo_wine_if(!color_match(color, 0x0000ffff, 0)) ok(color_match(color, 0x0000ffff, 0) || broken(color_match(color, 0x00ff0000, 0)) || broken(color_match(color, 0x00ffff00, 0))

1 0

Alexandre Julliard : d3d9/tests: Mark a zero-size pixel test as todo.
by Alexandre Julliard Dec. 19, 2022

Dec. 19, 2022

Module: wine Branch: master Commit: ab8d0dafde662d2c912c7f115c151b78e5b91597 URL: https://gitlab.winehq.org/wine/wine/-/commit/ab8d0dafde662d2c912c7f115c151b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 19 15:15:32 2022 +0100 d3d9/tests: Mark a zero-size pixel test as todo. It fails on the Gitlab CI. --- dlls/d3d9/tests/visual.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index d1bcaf39c14..f630a074ea0 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -12220,6 +12220,7 @@ static void test_pointsize(void) * it does the "useful" thing on all the drivers I tried. */ /* On WARP it does draw some pixels, most of the time. */ color = getPixelColor(device, 64, 64); + todo_wine_if(!color_match(color, 0x0000ffff, 0)) ok(color_match(color, 0x0000ffff, 0) || broken(color_match(color, 0x00ff0000, 0)) || broken(color_match(color, 0x00ffff00, 0))

1 0

Rémi Bernon : user32/tests: Test IsMouseInPointerEnabled behavior.
by Alexandre Julliard Dec. 19, 2022

Dec. 19, 2022

Module: wine Branch: master Commit: eb681558896ed299dbee347a40b52efe551f1ece URL: https://gitlab.winehq.org/wine/wine/-/commit/eb681558896ed299dbee347a40b52e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Dec 19 11:39:38 2022 +0100 user32/tests: Test IsMouseInPointerEnabled behavior. --- dlls/user32/tests/input.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index fde5aedeb4a..3f9ad8b184f 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -82,6 +82,7 @@ static struct { } key_status; static BOOL (WINAPI *pEnableMouseInPointer)( BOOL ); +static BOOL (WINAPI *pIsMouseInPointerEnabled)(void); static BOOL (WINAPI *pGetCurrentInputMessageSource)( INPUT_MESSAGE_SOURCE *source ); static BOOL (WINAPI *pGetPointerType)(UINT32, POINTER_INPUT_TYPE*); static BOOL (WINAPI *pGetPointerInfo)(UINT32, POINTER_INFO*); @@ -151,6 +152,7 @@ static void init_function_pointers(void) trace("GetProcAddress(%s) failed\n", #func) GET_PROC(EnableMouseInPointer); + GET_PROC(IsMouseInPointerEnabled); GET_PROC(GetCurrentInputMessageSource); GET_PROC(GetMouseMovePointsEx); GET_PROC(GetPointerInfo); @@ -4606,10 +4608,18 @@ static void test_EnableMouseInPointer_process( const char *arg ) ok( !ret, "EnableMouseInPointer succeeded\n" ); todo_wine ok( GetLastError() == ERROR_ACCESS_DENIED, "got error %lu\n", GetLastError() ); + if (!pIsMouseInPointerEnabled) ret = !enable; + else ret = pIsMouseInPointerEnabled(); + todo_wine_if(!pIsMouseInPointerEnabled) + ok( ret == enable, "IsMouseInPointerEnabled returned %u, error %lu\n", ret, GetLastError() ); ret = pEnableMouseInPointer( enable ); todo_wine ok( ret, "EnableMouseInPointer failed, error %lu\n", GetLastError() ); + if (!pIsMouseInPointerEnabled) ret = !enable; + else ret = pIsMouseInPointerEnabled(); + todo_wine_if(!pIsMouseInPointerEnabled) + ok( ret == enable, "IsMouseInPointerEnabled returned %u, error %lu\n", ret, GetLastError() ); } static void test_EnableMouseInPointer( char **argv, BOOL enable )

1 0