December 2022 - Wine-Commits

Alexandre Julliard : d3d9/tests: Fix some activation/focus test failures.
by Alexandre Julliard Dec. 22, 2022

Dec. 22, 2022

Module: wine Branch: master Commit: 6a1e2c1b89f35050a19fc87ec1abe3ce362fb26c URL: https://gitlab.winehq.org/wine/wine/-/commit/6a1e2c1b89f35050a19fc87ec1abe3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 21 15:55:59 2022 +0100 d3d9/tests: Fix some activation/focus test failures. By backporting the corresponding window management tweaks from the d3d8:device test. --- dlls/d3d9/tests/device.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 5c4417a2568..0a95e819018 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -4294,7 +4294,6 @@ static void test_wndproc(void) SetForegroundWindow(GetDesktopWindow()); ShowWindow(device_window, SW_MINIMIZE); - ShowWindow(device_window, SW_RESTORE); ShowWindow(focus_window, SW_MINIMIZE); ShowWindow(focus_window, SW_RESTORE); SetForegroundWindow(focus_window); @@ -4339,7 +4338,6 @@ static void test_wndproc(void) } filter_messages = NULL; SetForegroundWindow(focus_window); /* For KDE. */ - flush_events(); expect_messages = focus_loss_messages_filtered; windowposchanged_received = 0; @@ -4416,6 +4414,10 @@ static void test_wndproc(void) ref = IDirect3DDevice9_Release(device); ok(!ref, "Unexpected refcount %lu, i=%u.\n", ref, i); + ShowWindow(device_window, SW_RESTORE); + SetForegroundWindow(focus_window); + flush_events(); + filter_messages = focus_window; device_desc.device_window = device_window; if (!(device = create_device(d3d9, focus_window, &device_desc)))

1 0

Alexandre Julliard : d3d9/tests: Mark a render target color test as todo.
by Alexandre Julliard Dec. 22, 2022

Dec. 22, 2022

Module: wine Branch: master Commit: 1368a4c20b0789108da5473aa8fd33b6757170e2 URL: https://gitlab.winehq.org/wine/wine/-/commit/1368a4c20b0789108da5473aa8fd33… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 21 12:25:59 2022 +0100 d3d9/tests: Mark a render target color test as todo. Split the check_rt_color() function to allow conditional todos. --- dlls/d3d9/tests/visual.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 53f38632d5c..8857c483302 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -258,9 +258,7 @@ static DWORD getPixelColor(IDirect3DDevice9 *device, UINT x, UINT y) return ret; } -#define check_rt_color(a, b) check_rt_color_(__LINE__, a, b, false) -#define check_rt_color_todo(a, b) check_rt_color_(__LINE__, a, b, true) -static void check_rt_color_(unsigned int line, IDirect3DSurface9 *rt, D3DCOLOR expected_color, bool todo) +static D3DCOLOR check_expected_rt_color(unsigned int line, IDirect3DSurface9 *rt, D3DCOLOR expected_color) { unsigned int color = 0xdeadbeef; struct surface_readback rb; @@ -284,6 +282,15 @@ static void check_rt_color_(unsigned int line, IDirect3DSurface9 *rt, D3DCOLOR e break; } release_surface_readback(&rb); + return color; +} + +#define check_rt_color(a, b) check_rt_color_(__LINE__, a, b, false) +#define check_rt_color_todo(a, b) check_rt_color_(__LINE__, a, b, true) +static void check_rt_color_(unsigned int line, IDirect3DSurface9 *rt, D3DCOLOR expected_color, bool todo) +{ + unsigned int color = check_expected_rt_color(line, rt, expected_color); + todo_wine_if (todo) ok_(__FILE__, line)(color == expected_color, "Got unexpected color 0x%08x.\n", color); } @@ -26913,7 +26920,12 @@ static void test_sample_attached_rendertarget(void) if (is_warp || color == 0x00010101) skip("Sampling attached render targets is not supported.\n"); else - check_rt_color(rt, 0x00c1c1c1); + { + unsigned int expected_color = 0x00c1c1c1; + unsigned int color = check_expected_rt_color(__LINE__, rt, expected_color); + todo_wine_if(color != expected_color) + ok(color == expected_color, "Got unexpected color 0x%08x.\n", color); + } IDirect3DQuery9_Release(event_query);

1 0

Biswapriyo Nath : include: Add missing constants in d3d11.idl.
by Alexandre Julliard Dec. 22, 2022

Dec. 22, 2022

Module: wine Branch: master Commit: d059dd1cd0770e9c63da33562f6bcba4ef52846b URL: https://gitlab.winehq.org/wine/wine/-/commit/d059dd1cd0770e9c63da33562f6bcb… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Fri Dec 23 00:25:06 2022 +0530 include: Add missing constants in d3d11.idl. --- include/d3d11.idl | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/include/d3d11.idl b/include/d3d11.idl index 1740ca6eac6..3aff03448c4 100644 --- a/include/d3d11.idl +++ b/include/d3d11.idl @@ -35,6 +35,15 @@ interface ID3D11VideoProcessorInputView; cpp_quote("#ifndef _D3D11_CONSTANTS") cpp_quote("#define _D3D11_CONSTANTS") +const UINT D3D11_16BIT_INDEX_STRIP_CUT_VALUE = 0xffff; +const UINT D3D11_32BIT_INDEX_STRIP_CUT_VALUE = 0xffffffff; +const UINT D3D11_8BIT_INDEX_STRIP_CUT_VALUE = 0xff; + +const UINT D3D11_ARRAY_AXIS_ADDRESS_RANGE_BIT_COUNT = 9; + +const UINT D3D11_CLIP_OR_CULL_DISTANCE_COUNT = 8; +const UINT D3D11_CLIP_OR_CULL_DISTANCE_ELEMENT_COUNT = 2; + const UINT D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT = 14; const UINT D3D11_COMMONSHADER_CONSTANT_BUFFER_COMPONENTS = 4; const UINT D3D11_COMMONSHADER_CONSTANT_BUFFER_COMPONENT_BIT_COUNT = 32;

1 0

Alexandre Julliard : d3d9/tests: Mark a texture sampling test as todo.
by Alexandre Julliard Dec. 22, 2022

Dec. 22, 2022

Module: wine Branch: master Commit: 8bd9fcbdeae8df0db8c6fe6de4bc71c76df5ebfa URL: https://gitlab.winehq.org/wine/wine/-/commit/8bd9fcbdeae8df0db8c6fe6de4bc71… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 21 12:19:18 2022 +0100 d3d9/tests: Mark a texture sampling 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 12105cfa0e0..53f38632d5c 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -26608,6 +26608,7 @@ static void test_mismatched_sample_types(void) colour = getPixelColor(device, 320, 240); + todo_wine_if(!color_match(colour, tests[i].expected_colour, 1)) ok(color_match(colour, tests[i].expected_colour, 1) || broken(tests[i].expected_broken && color_match(colour, tests[i].expected_broken, 1)) || broken(tests[i].expected_broken2 && color_match(colour, tests[i].expected_broken2, 1)),

1 0

Zebediah Figura : ntdll/tests: Avoid testing the server pipe signaled state from the main thread.
by Alexandre Julliard Dec. 22, 2022

Dec. 22, 2022

Module: wine Branch: master Commit: 1a02862622db0e9f203ef117c96c5265283e9d6e URL: https://gitlab.winehq.org/wine/wine/-/commit/1a02862622db0e9f203ef117c96c52… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Dec 21 15:38:36 2022 -0600 ntdll/tests: Avoid testing the server pipe signaled state from the main thread. Although the test has never been observed to fail on Windows, I think the failure is genuinely a race in the test. File handles (like events) are signaled in order to mark that an I/O operation has completed. In this case the I/O operation includes manipulating data on both ends of the pipe, and as part of that may signal the other end. Internally, however, the file handle must logically happen *after* all of this processing has taken place, not least because (given the Windows I/O architecture) it is the job of the I/O manager, not the IRP handler. Since the purpose of the test is probably just to check that the file handle will be signaled after a synchronous I/O operation has completed, we may as well check it from the client thread, after we know for sure that it has. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=54078 --- dlls/ntdll/tests/pipe.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index 0e373dcf7ea..11192d6e471 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -1679,6 +1679,7 @@ static DWORD WINAPI blocking_thread(void *arg) ok(is_signaled(ctx->pipe), "pipe is not signaled\n"); ret = WriteFile(ctx->pipe, buf, 1, &num_bytes, NULL); ok(ret, "WriteFile failed, error %lu\n", GetLastError()); + ok(is_signaled(ctx->pipe), "pipe is not signaled\n"); break; case BLOCKING_THREAD_READ: Sleep(100); @@ -1689,6 +1690,7 @@ static DWORD WINAPI blocking_thread(void *arg) ok(is_signaled(ctx->pipe), "pipe is not signaled\n"); ret = ReadFile(ctx->pipe, read_buf, 1, &num_bytes, NULL); ok(ret, "WriteFile failed, error %lu\n", GetLastError()); + ok(is_signaled(ctx->pipe), "pipe is not signaled\n"); break; case BLOCKING_THREAD_QUIT: return 0; @@ -1748,7 +1750,6 @@ static void test_blocking(ULONG options) ok(io.Status == STATUS_SUCCESS, "Status = %lx\n", io.Status); ok(io.Information == 1, "Information = %Iu\n", io.Information); ok(is_signaled(ctx.client), "client is not signaled\n"); - ok(is_signaled(ctx.pipe), "pipe is not signaled\n"); res = WaitForSingleObject(ctx.done, 10000); ok(res == WAIT_OBJECT_0, "wait returned %lx\n", res); @@ -1767,7 +1768,6 @@ static void test_blocking(ULONG options) ok(is_signaled(ctx.event), "event is not signaled\n"); todo_wine ok(is_signaled(ctx.client), "client is not signaled\n"); - ok(is_signaled(ctx.pipe), "pipe is not signaled\n"); if (!(options & FILE_SYNCHRONOUS_IO_ALERT)) ok(!ioapc_called, "ioapc called\n"); @@ -1797,7 +1797,6 @@ static void test_blocking(ULONG options) res = WaitForSingleObject(ctx.done, 10000); ok(res == WAIT_OBJECT_0, "wait returned %lx\n", res); - ok(is_signaled(ctx.pipe), "pipe is not signaled\n"); CloseHandle(ctx.pipe); CloseHandle(ctx.client); @@ -1806,13 +1805,11 @@ static void test_blocking(ULONG options) PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE, 4096); ok(is_signaled(ctx.client), "client is not signaled\n"); - ok(is_signaled(ctx.pipe), "pipe is not signaled\n"); ret = WriteFile(ctx.client, read_buf, 1, &num_bytes, NULL); ok(ret, "WriteFile failed, error %lu\n", GetLastError()); ok(is_signaled(ctx.client), "client is not signaled\n"); - ok(is_signaled(ctx.pipe), "pipe is not signaled\n"); ioapc_called = FALSE; memset(&io, 0xff, sizeof(io));

1 0

Jinoh Kang : win32u: Honor CS_HREDRAW and CS_VREDRAW when resizing window.
by Alexandre Julliard Dec. 22, 2022

Dec. 22, 2022

Module: wine Branch: master Commit: eb1f9896cc023786e5d1a1d0e7e9ea434a9d7cae URL: https://gitlab.winehq.org/wine/wine/-/commit/eb1f9896cc023786e5d1a1d0e7e9ea… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Thu Dec 22 01:21:48 2022 +0900 win32u: Honor CS_HREDRAW and CS_VREDRAW when resizing window. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52903 --- dlls/user32/tests/msg.c | 1 - dlls/win32u/window.c | 7 ++++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 461d79d9a5d..35e4f0dd1f8 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -9475,7 +9475,6 @@ static void subtest_hvredraw(HWND hparent, const char *classname, DWORD style) CombineRgn( hrgn_expect, hrgn_new_vis, hrgn_old_vis, is_redraw ? RGN_COPY : RGN_DIFF ); rgn_ok = EqualRgn( hrgn_expect, hrgn_actual ); - todo_wine_if( is_redraw ) ok( !!rgn_ok, "Update region shall match expected region\n" ); if (!rgn_ok && winetest_debug > 1) diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 19348338c46..a3ff0647dcd 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -3116,6 +3116,7 @@ static UINT calc_ncsize( WINDOWPOS *winpos, const RECT *old_window_rect, const R { NCCALCSIZE_PARAMS params; WINDOWPOS winposCopy; + UINT class_style; params.rgrc[0] = *new_window_rect; params.rgrc[1] = *old_window_rect; @@ -3135,7 +3136,11 @@ static UINT calc_ncsize( WINDOWPOS *winpos, const RECT *old_window_rect, const R winposCopy.cy = old_window_rect->bottom - old_window_rect->top; } - wvr_flags = send_message( winpos->hwnd, WM_NCCALCSIZE, TRUE, (LPARAM)&params ); + class_style = get_class_long( winpos->hwnd, GCL_STYLE, FALSE ); + if (class_style & CS_VREDRAW) wvr_flags |= WVR_VREDRAW; + if (class_style & CS_HREDRAW) wvr_flags |= WVR_HREDRAW; + + wvr_flags |= send_message( winpos->hwnd, WM_NCCALCSIZE, TRUE, (LPARAM)&params ); *new_client_rect = params.rgrc[0];

1 0

Jinoh Kang : user32/tests: Add tests for CS_HREDRAW and CS_VREDRAW.
by Alexandre Julliard Dec. 22, 2022

Dec. 22, 2022

Module: wine Branch: master Commit: b2a9445e155487f1b47a646b70edbe181a905454 URL: https://gitlab.winehq.org/wine/wine/-/commit/b2a9445e155487f1b47a646b70edbe… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Thu Dec 22 01:20:59 2022 +0900 user32/tests: Add tests for CS_HREDRAW and CS_VREDRAW. --- dlls/user32/tests/msg.c | 130 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 130 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 50bfc9855dd..461d79d9a5d 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -9416,6 +9416,120 @@ static void test_swp_paint_regions(void) subtest_swp_paint_regions( 0, "SimpleWindowClassWithParentDC", "SimpleWindowClass" ); } +static void subtest_hvredraw(HWND hparent, const char *classname, DWORD style) +{ + static const struct movesize_test { + int dx, dy, dw, dh; + } movesize_tests[] = { + { 0, 0, 0, 50 }, + { 0, 0, 50, 0 }, + { 0, 0, 50, 50 }, + { 0, 0, -50, -50 }, + { -50, -50, 0, 50 }, + { -50, -50, 50, 0 }, + { -50, -50, 50, 50 }, + }; + HRGN hrgn_old_vis = CreateRectRgn( 0, 0, 0, 0 ); + HRGN hrgn_new_vis = CreateRectRgn( 0, 0, 0, 0 ); + HRGN hrgn_expect = CreateRectRgn( 0, 0, 0, 0 ); + HRGN hrgn_actual = CreateRectRgn( 0, 0, 0, 0 ); + const int x0 = 100, y0 = 100, w0 = 200, h0 = 200; + size_t i; + HWND hwnd; + UINT class_style; + + hwnd = CreateWindowExA( 0, classname, "Test window", style, x0, y0, w0, h0, hparent, 0, 0, NULL ); + ok(hwnd != NULL, "Failed to create the window\n"); + + class_style = GetClassLongA( hwnd, GCL_STYLE ); + + ShowWindow( hwnd, SW_SHOW ); + UpdateWindow( hwnd ); + + for (i = 0; i < ARRAY_SIZE(movesize_tests); i++) + { + const struct movesize_test *test = &movesize_tests[i]; + int is_redraw = (test->dw != 0 && (class_style & CS_HREDRAW)) || + (test->dh != 0 && (class_style & CS_VREDRAW)); + RECT rect_old_vis, rect_new_vis; + BOOL rgn_ok; + + winetest_push_context( "%s %08lx SetWindowPos redraw #%Id (%d, %d, %d, %d)", + classname, style, i, test->dx, test->dy, test->dw, test->dh ); + + SetWindowPos( hwnd, HWND_TOP, x0, y0, w0, h0, SWP_NOACTIVATE ); + + GetClientRect( hwnd, &rect_old_vis ); + SetRectRgn( hrgn_old_vis, rect_old_vis.left, rect_old_vis.top, rect_old_vis.right, rect_old_vis.bottom ); + + UpdateWindow( hparent ); + flush_events(); + + SetWindowPos( hwnd, HWND_TOP, + x0 + test->dx, y0 + test->dy, + w0 + test->dw, h0 + test->dh, SWP_NOACTIVATE ); + ok( GetUpdateRgn( hwnd, hrgn_actual, FALSE ) != ERROR, "GetUpdateRgn shall succeed\n" ); + + GetClientRect( hwnd, &rect_new_vis ); + SetRectRgn( hrgn_new_vis, rect_new_vis.left, rect_new_vis.top, rect_new_vis.right, rect_new_vis.bottom ); + CombineRgn( hrgn_expect, hrgn_new_vis, hrgn_old_vis, is_redraw ? RGN_COPY : RGN_DIFF ); + + rgn_ok = EqualRgn( hrgn_expect, hrgn_actual ); + todo_wine_if( is_redraw ) + ok( !!rgn_ok, "Update region shall match expected region\n" ); + + if (!rgn_ok && winetest_debug > 1) + { + trace( "Expected update region: " ); + dump_region( hrgn_expect ); + trace( "Actual update region: " ); + dump_region( hrgn_actual ); + trace( "Old window visible area: %s\n", wine_dbgstr_rect( &rect_old_vis ) ); + trace( "New window visible area: %s\n", wine_dbgstr_rect( &rect_new_vis ) ); + } + + if (winetest_interactive) + { + if (!rgn_ok) + { + visualize_region_differences( hwnd, NULL, hrgn_expect, hrgn_actual ); + } + + /* Let the position change be visible to the user */ + flush_events(); + } + + winetest_pop_context(); + } + + DestroyWindow( hwnd ); + DeleteObject( hrgn_actual ); + DeleteObject( hrgn_expect ); + DeleteObject( hrgn_new_vis ); + DeleteObject( hrgn_old_vis ); +} + + +static void test_hvredraw(void) +{ + HWND htoplevel; + + subtest_hvredraw( NULL, "SimpleWindowClassWithHRedraw", WS_OVERLAPPEDWINDOW ); + subtest_hvredraw( NULL, "SimpleWindowClassWithVRedraw", WS_OVERLAPPEDWINDOW ); + subtest_hvredraw( NULL, "SimpleWindowClassWithHVRedraw", WS_OVERLAPPEDWINDOW ); + + htoplevel = CreateWindowExA( 0, "SimpleWindowClass", "Test toplevel", + WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN | WS_VISIBLE, + 100, 100, 400, 400, 0, 0, 0, NULL ); + ok( htoplevel != 0, "Failed to create top-level window: %lu\n", GetLastError() ); + + subtest_hvredraw( htoplevel, "SimpleWindowClassWithHRedraw", WS_CHILD | WS_BORDER ); + subtest_hvredraw( htoplevel, "SimpleWindowClassWithVRedraw", WS_CHILD | WS_BORDER ); + subtest_hvredraw( htoplevel, "SimpleWindowClassWithHVRedraw", WS_CHILD | WS_BORDER ); + + DestroyWindow( htoplevel ); +} + struct wnd_event { HWND hwnd; @@ -10766,6 +10880,21 @@ static BOOL RegisterWindowClasses(void) cls.lpszClassName = "SimpleWindowClassWithParentDC"; if(!RegisterClassA(&cls)) return FALSE; + cls.lpfnWndProc = DefWindowProcA; + cls.style = CS_HREDRAW; + cls.lpszClassName = "SimpleWindowClassWithHRedraw"; + if(!RegisterClassA(&cls)) return FALSE; + + cls.lpfnWndProc = DefWindowProcA; + cls.style = CS_VREDRAW; + cls.lpszClassName = "SimpleWindowClassWithVRedraw"; + if(!RegisterClassA(&cls)) return FALSE; + + cls.lpfnWndProc = DefWindowProcA; + cls.style = CS_HREDRAW | CS_VREDRAW; + cls.lpszClassName = "SimpleWindowClassWithHVRedraw"; + if(!RegisterClassA(&cls)) return FALSE; + clsW.style = 0; clsW.lpfnWndProc = MsgCheckProcW; clsW.cbClsExtra = 0; @@ -19521,6 +19650,7 @@ START_TEST(msg) test_wmime_keydown_message(); test_paint_messages(); test_swp_paint_regions(); + test_hvredraw(); test_interthread_messages(); test_message_conversion(); test_accelerators();

1 0

Alexandre Julliard : Wine release 8.0-rc2
by Alexandre Julliard Dec. 21, 2022

Dec. 21, 2022

Module: website Branch: master Commit: 8e10035cafcefb49f0b110d5ebeeabaa1d06b1fc URL: https://gitlab.winehq.org/winehq/winehq/-/commit/8e10035cafcefb49f0b110d5eb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 21 22:16:04 2022 +0100 Wine release 8.0-rc2 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2022122101.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/en/2022122101.xml b/news/en/2022122101.xml new file mode 100644 index 00000000..db5896bc --- /dev/null +++ b/news/en/2022122101.xml @@ -0,0 +1,13 @@ +<news> +<date>December 21, 2022</date> +<title>Wine 8.0-rc2 Released</title> +<body> + The Wine development release 8.0-rc2 is now available. + <a href="{$root}/announce/8.0-rc2">What's new</a> in this release: +<ul> + <li>Bug fixes only, we are in code freeze.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/8.0/wine-8.0-rc2.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-8.0-rc2 : Alexandre Julliard : Release 8.0-rc2
by Alexandre Julliard Dec. 21, 2022

Dec. 21, 2022

Module: wine Branch: refs/tags/wine-8.0-rc2 Tag: a8f4da95a4dec4b1403d5601665fdd4190df04b9 URL: https://gitlab.winehq.org/wine/wine/-/tags/a8f4da95a4dec4b1403d5601665fdd41… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 21 22:13:35 2022 +0100 Release 8.0-rc2

1 0

Alexandre Julliard : Release 8.0-rc2.
by Alexandre Julliard Dec. 21, 2022

Dec. 21, 2022

Module: wine Branch: master Commit: 2d7d84a65ace4c669698740c11cab5dbf127a0c6 URL: https://gitlab.winehq.org/wine/wine/-/commit/2d7d84a65ace4c669698740c11cab5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 21 22:07:48 2022 +0100 Release 8.0-rc2. --- ANNOUNCE | 915 ++++++++++++++++---------------------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 244 insertions(+), 692 deletions(-)

1 0

Rémi Bernon : opengl32/tests: Test wglChoosePixelFormatARB flags filters.
by Alexandre Julliard Dec. 21, 2022

Dec. 21, 2022

Module: wine Branch: master Commit: 87090965ff50a43e06fdc4fe91ee7566f566ea9a URL: https://gitlab.winehq.org/wine/wine/-/commit/87090965ff50a43e06fdc4fe91ee75… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Dec 21 19:59:01 2022 +0100 opengl32/tests: Test wglChoosePixelFormatARB flags filters. --- dlls/opengl32/tests/opengl.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 57be207b548..3b49f8d2149 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -1821,6 +1821,13 @@ static void test_wglChoosePixelFormatARB(HDC hdc) WGL_SUPPORT_OPENGL_ARB, 1, 0 }; + static int attrib_list_flags[] = + { + WGL_DRAW_TO_WINDOW_ARB, 1, + WGL_SUPPORT_OPENGL_ARB, 1, + WGL_SUPPORT_GDI_ARB, 1, + 0 + }; PIXELFORMATDESCRIPTOR fmt, last_fmt; BYTE depth, last_depth; @@ -1867,6 +1874,27 @@ static void test_wglChoosePixelFormatARB(HDC hdc) depth, last_depth, i, formats[i]); } } + + format_count = 0; + res = pwglChoosePixelFormatARB(hdc, attrib_list_flags, NULL, ARRAY_SIZE(formats), formats, &format_count); + ok(res, "Got unexpected result %d.\n", res); + + for (i = 0; i < format_count; ++i) + { + PIXELFORMATDESCRIPTOR format = {0}; + BOOL ret; + + winetest_push_context("%u", i); + + ret = DescribePixelFormat(hdc, formats[i], sizeof(format), &format); + ok(ret, "DescribePixelFormat failed, error %lu\n", GetLastError()); + + ok(format.dwFlags & PFD_DRAW_TO_WINDOW, "got dwFlags %#lx\n", format.dwFlags); + ok(format.dwFlags & PFD_SUPPORT_OPENGL, "got dwFlags %#lx\n", format.dwFlags); + todo_wine ok(format.dwFlags & PFD_SUPPORT_GDI, "got dwFlags %#lx\n", format.dwFlags); + + winetest_pop_context(); + } } static void test_copy_context(HDC hdc)

1 0

Rémi Bernon : winex11: Check pixel format flags in X11DRV_wglChoosePixelFormatARB.
by Alexandre Julliard Dec. 21, 2022

Dec. 21, 2022

Module: wine Branch: master Commit: 6dd2ed2c7dd6eb7c05e96f8373f639ea975cb9f0 URL: https://gitlab.winehq.org/wine/wine/-/commit/6dd2ed2c7dd6eb7c05e96f8373f639… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Dec 16 11:28:32 2022 +0100 winex11: Check pixel format flags in X11DRV_wglChoosePixelFormatARB. The check was dropped in e392e0ac2846edc25610723c19d6a796372017e1, leaving the dwFlags variable unused. --- dlls/opengl32/tests/opengl.c | 2 +- dlls/winex11.drv/opengl.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 3b49f8d2149..42c2626a2c2 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -1891,7 +1891,7 @@ static void test_wglChoosePixelFormatARB(HDC hdc) ok(format.dwFlags & PFD_DRAW_TO_WINDOW, "got dwFlags %#lx\n", format.dwFlags); ok(format.dwFlags & PFD_SUPPORT_OPENGL, "got dwFlags %#lx\n", format.dwFlags); - todo_wine ok(format.dwFlags & PFD_SUPPORT_GDI, "got dwFlags %#lx\n", format.dwFlags); + ok(format.dwFlags & PFD_SUPPORT_GDI, "got dwFlags %#lx\n", format.dwFlags); winetest_pop_context(); } diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 52f363461e4..96a8526604b 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -2638,6 +2638,8 @@ static BOOL X11DRV_wglChoosePixelFormatARB( HDC hdc, const int *piAttribIList, c if (i == nb_pixel_formats) continue; + if ((pixel_formats[i].dwFlags & dwFlags) != dwFlags) + continue; format = &formats[format_count]; format->format = i + 1;

1 0

Rémi Bernon : Revert "qasf: Register ASF Reader filter media type."
by Alexandre Julliard Dec. 21, 2022

Dec. 21, 2022

Module: wine Branch: master Commit: 409d0f4247ea4815481489bb1934cadde9c30410 URL: https://gitlab.winehq.org/wine/wine/-/commit/409d0f4247ea4815481489bb1934ca… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Dec 21 11:45:59 2022 +0100 Revert "qasf: Register ASF Reader filter media type." This reverts commit 4608e1e1257a377cd554a0e885368e3feb7d286f. The ASF Reader filter suffers from defects which are difficult to solve, and will require a better implementation of wmvcore in order to work correctly. In the meantime, revert the class registration so that the File Source filter is preferred instead. This will break games that tried to use the filter directly and which may have started to work correctly, but they are less frequent than the ones simply playing wmv videos with quartz. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53640 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53748 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54191 --- dlls/qasf/qasf.rgs | 15 --------------- dlls/qasf/version.rc | 3 --- 2 files changed, 18 deletions(-) diff --git a/dlls/qasf/qasf.rgs b/dlls/qasf/qasf.rgs deleted file mode 100644 index de0d3e425ed..00000000000 --- a/dlls/qasf/qasf.rgs +++ /dev/null @@ -1,15 +0,0 @@ -HKCR -{ - NoRemove 'Media Type' - { - '{e436eb83-524f-11ce-9f53-0020af0ba770}' - { - '{6b6d0801-9ada-11d0-a520-00a0d10129c0}' - { - val '0' = s '0,4,,3026b275' - val '1' = s '0,4,,d129e2d6' - val 'Source Filter' = s '{187463a0-5bb7-11d3-acbe-0080c75e246e}' - } - } - } -} diff --git a/dlls/qasf/version.rc b/dlls/qasf/version.rc index 70ec03ad6b1..dab46194395 100644 --- a/dlls/qasf/version.rc +++ b/dlls/qasf/version.rc @@ -24,6 +24,3 @@ #define WINE_PRODUCTVERSION_STR "9.0.0.4503" #include "wine/wine_common_ver.rc" - -/* @makedep: qasf.rgs */ -1 WINE_REGISTRY qasf.rgs

1 0

Sven Baars : wined3d: Do not explicitly check 3D depth/stencil capabilities in wined3d_check_device_format().
by Alexandre Julliard Dec. 21, 2022

Dec. 21, 2022

Module: wine Branch: master Commit: 8e7c99f7ab2c687bc69d257cf1398e9531b4751d URL: https://gitlab.winehq.org/wine/wine/-/commit/8e7c99f7ab2c687bc69d257cf1398e… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Fri Dec 16 11:19:13 2022 +0100 wined3d: Do not explicitly check 3D depth/stencil capabilities in wined3d_check_device_format(). This reapplies the change from 67d0038e49323523b745c4a728069d8195273d23 that was reverted in 06b19322187e5ef8ffc06504c322ce9bcdaaa6ee, causing a regression. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53785 --- dlls/wined3d/directx.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 9d7c4769cb8..9b6901d25c0 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2109,13 +2109,6 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, if (gl_type == WINED3D_GL_RES_TYPE_TEX_2D && !(bind_flags & WINED3D_BIND_SHADER_RESOURCE)) caps |= format->caps[WINED3D_GL_RES_TYPE_RB]; - if ((caps & format_caps) != format_caps) - { - TRACE("Requested format caps %#x, but format %s only has %#x.\n", - format_caps, debug_d3dformat(check_format_id), caps); - return WINED3DERR_NOTAVAILABLE; - } - if ((bind_flags & WINED3D_BIND_RENDER_TARGET) && !adapter->adapter_ops->adapter_check_format(adapter, adapter_format, format, NULL)) { @@ -2143,6 +2136,13 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, return WINED3DERR_NOTAVAILABLE; } + if ((caps & format_caps) != format_caps) + { + TRACE("Requested format caps %#x, but format %s only has %#x.\n", + format_caps, debug_d3dformat(check_format_id), caps); + return WINED3DERR_NOTAVAILABLE; + } + if (!(caps & WINED3D_FORMAT_CAP_GEN_MIPMAP)) mipmap_gen_supported = FALSE; }

1 0

Eric Pouech : kernel32/tests: Skip some console tests on w1064v1909.
by Alexandre Julliard Dec. 21, 2022

Dec. 21, 2022

Module: wine Branch: master Commit: af215210f0c4d8b0cea945692cff1b13c2b47f3b URL: https://gitlab.winehq.org/wine/wine/-/commit/af215210f0c4d8b0cea945692cff1b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Dec 21 17:11:49 2022 +0100 kernel32/tests: Skip some console tests on w1064v1909. We get conhost.exe:tty failures on testbot: - not for version prior to w1064v1909 (these tests require pseudo-consoles, which are not implemented in these Windows version). - for w1064v1909 - not for W10 versions after w1064v1909. So, we assume that pseudo-console support is immature in this Windows version: skip all the remaining test at the first discrepancy point. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53465 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/conhost/tests/tty.c | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/programs/conhost/tests/tty.c b/programs/conhost/tests/tty.c index 9371d0ce6f5..441bc17f04d 100644 --- a/programs/conhost/tests/tty.c +++ b/programs/conhost/tests/tty.c @@ -628,12 +628,22 @@ static void _test_cursor_pos(unsigned line, int expect_x, int expect_y) info.dwCursorPosition.Y, expect_y); } -static void test_write_console(void) +static BOOL test_write_console(void) { child_set_output_mode(ENABLE_PROCESSED_OUTPUT | ENABLE_WRAP_AT_EOL_OUTPUT | ENABLE_VIRTUAL_TERMINAL_PROCESSING); child_string_request(REQ_WRITE_CONSOLE, L"abc"); skip_hide_cursor(); + if (skip_sequence("\x1b[H \x1b[32m0\x1b[41m1\x1b[30m2")) + { + /* we get this on w1064v1909 (and more discrepancies afterwards). + * This is inconsistent with ulterior w10 versions. Assume it's + * immature result, and skip rest of tests. + */ + console_output_count = 0; + return FALSE; + } + expect_output_sequence("abc"); skip_sequence("\x1b[?25h"); /* show cursor */ @@ -961,9 +971,11 @@ static void test_write_console(void) skip_sequence("\x1b[?25h"); /* show cursor */ expect_empty_output(); test_cursor_pos(1, 23); + + return TRUE; } -static void test_tty_output(void) +static BOOL test_tty_output(void) { CHAR_INFO char_info_buf[2048], char_info; HANDLE sb, sb2; @@ -1197,7 +1209,7 @@ static void test_tty_output(void) expect_output_sequence("\x1b[?25h"); /* show cursor */ expect_empty_output(); - test_write_console(); + if (!test_write_console()) return FALSE; sb = child_create_screen_buffer(); child_set_active(sb); @@ -1244,6 +1256,8 @@ static void test_tty_output(void) expect_output_sequence("\x1b[H"); /* set cursor */ expect_output_sequence("\x1b[?25h"); /* show cursor */ expect_empty_output(); + + return TRUE; } static void write_console_pipe(const char *buf) @@ -1836,12 +1850,16 @@ static void test_pseudoconsole(void) if (!broken_version) { - test_tty_output(); - test_read_console_control(); - test_read_console(); - test_tty_input(); + if (test_tty_output()) + { + test_read_console_control(); + test_read_console(); + test_tty_input(); + } + else + win_skip("Partially supported windows version. Skipping rest of the tests\n"); } - else win_skip("Skipping tty output tests on broken Windows version\n"); + else win_skip("Skipping tty tests on broken Windows version\n"); CloseHandle(child_pipe); wait_child_process(child_process);

1 0

Zebediah Figura : d3d9: Upload the relevant texture in d3d9_texture_gen_auto_mipmap().
by Alexandre Julliard Dec. 21, 2022

Dec. 21, 2022

Module: wine Branch: master Commit: f3e381d1c9dd7bbb1a8aa4ccb22e5b2b992d4b86 URL: https://gitlab.winehq.org/wine/wine/-/commit/f3e381d1c9dd7bbb1a8aa4ccb22e5b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Dec 19 18:09:45 2022 -0600 d3d9: Upload the relevant texture in d3d9_texture_gen_auto_mipmap(). Instead of uploading all currently bound textures. Besides being redundant, this would generate mipmaps for an uninitialized texture, and subsequently trying to render from nonzero mipmap levels would yield uninitialized data. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54170 --- dlls/d3d9/d3d9_private.h | 1 - dlls/d3d9/device.c | 2 +- dlls/d3d9/tests/visual.c | 2 +- dlls/d3d9/texture.c | 4 +++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index fe13f679db4..7dc32e6c12f 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -125,7 +125,6 @@ struct d3d9_device HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wined3d *wined3d, UINT adapter, D3DDEVTYPE device_type, HWND focus_window, DWORD flags, D3DPRESENT_PARAMETERS *parameters, D3DDISPLAYMODEEX *mode) DECLSPEC_HIDDEN; -void d3d9_device_upload_managed_textures(struct d3d9_device *device); struct d3d9_resource { diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 55641670665..eddb2a0ebdd 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3010,7 +3010,7 @@ static HRESULT d3d9_device_upload_sysmem_index_buffer(struct d3d9_device *device return S_OK; } -void d3d9_device_upload_managed_textures(struct d3d9_device *device) +static void d3d9_device_upload_managed_textures(struct d3d9_device *device) { const struct wined3d_stateblock_state *state = device->stateblock_state; unsigned int i; diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index e6c0458c69f..12105cfa0e0 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -27903,7 +27903,7 @@ static void test_managed_generate_mipmap(void) ok(hr == S_OK, "Got hr %#lx.\n", hr); draw_textured_quad(&context, texture); - check_rt_color_todo(context.backbuffer, 0x0000ff00); + check_rt_color(context.backbuffer, 0x0000ff00); IDirect3DTexture9_Release(texture); release_test_context(&context); diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index e5b52fdcc82..0a27941ac2b 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -138,7 +138,9 @@ void d3d9_texture_gen_auto_mipmap(struct d3d9_texture *texture) if (!(texture->flags & D3D9_TEXTURE_MIPMAP_DIRTY)) return; d3d9_texture_acquire_shader_resource_view(texture); - d3d9_device_upload_managed_textures(texture->parent_device); + if (texture->draw_texture) + wined3d_device_update_texture(texture->parent_device->wined3d_device, + texture->wined3d_texture, texture->draw_texture); wined3d_device_context_generate_mipmaps(texture->parent_device->immediate_context, texture->wined3d_srv); texture->flags &= ~D3D9_TEXTURE_MIPMAP_DIRTY; }

1 0

Zebediah Figura : d3d9/tests: Test GenerateMipSubLevels() on a managed texture.
by Alexandre Julliard Dec. 21, 2022

Dec. 21, 2022

Module: wine Branch: master Commit: c3ee85b606fb434436533c8e74a6a2307b38cfd1 URL: https://gitlab.winehq.org/wine/wine/-/commit/c3ee85b606fb434436533c8e74a6a2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Dec 19 17:21:13 2022 -0600 d3d9/tests: Test GenerateMipSubLevels() on a managed texture. --- dlls/d3d9/tests/visual.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index ccfa8ce5e3a..e6c0458c69f 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -27876,6 +27876,39 @@ static void test_managed_reset(void) release_test_context(&context); } +static void test_managed_generate_mipmap(void) +{ + struct d3d9_test_context context; + IDirect3DTexture9 *texture; + IDirect3DDevice9 *device; + HRESULT hr; + + if (!init_test_context(&context)) + return; + device = context.device; + + hr = IDirect3DDevice9_CreateTexture(device, 16, 16, 0, D3DUSAGE_AUTOGENMIPMAP, + D3DFMT_A8R8G8B8, D3DPOOL_MANAGED, &texture, NULL); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + fill_texture(texture, 0x0000ff00, 0); + + IDirect3DTexture9_GenerateMipSubLevels(texture); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 0.0, 0); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MIPFILTER, D3DTEXF_POINT); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MAXMIPLEVEL, 1); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + draw_textured_quad(&context, texture); + check_rt_color_todo(context.backbuffer, 0x0000ff00); + + IDirect3DTexture9_Release(texture); + release_test_context(&context); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER9 identifier; @@ -28028,4 +28061,5 @@ START_TEST(visual) test_dynamic_map_synchronization(); test_filling_convention(); test_managed_reset(); + test_managed_generate_mipmap(); }

1 0

Paul Gofman : ddraw/tests: Release ddraw after device in test_texture_wrong_caps().
by Alexandre Julliard Dec. 21, 2022

Dec. 21, 2022

Module: wine Branch: master Commit: 1a9c1d593b5ac5aee7450ba510f46c2a153741f7 URL: https://gitlab.winehq.org/wine/wine/-/commit/1a9c1d593b5ac5aee7450ba510f46c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Dec 19 13:49:15 2022 -0600 ddraw/tests: Release ddraw after device in test_texture_wrong_caps(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54049 --- dlls/ddraw/tests/ddraw2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 4bb6e71fc32..2880982ed33 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -15657,9 +15657,9 @@ static void test_texture_wrong_caps(const GUID *device_guid) IDirectDrawSurface_Release(rt); destroy_viewport(device, viewport); destroy_material(background); - IDirectDraw2_Release(ddraw); refcount = IDirect3DDevice2_Release(device); ok(!refcount, "Device has %lu references left.\n", refcount); + IDirectDraw2_Release(ddraw); DestroyWindow(window); }

1 0

Jacek Caban : shell32: Always set last error in Shell_NotifyIconW.
by Alexandre Julliard Dec. 21, 2022

Dec. 21, 2022

Module: wine Branch: master Commit: 9e351472dd5fc7a9ceb0aacaadfd431ea38a974e URL: https://gitlab.winehq.org/wine/wine/-/commit/9e351472dd5fc7a9ceb0aacaadfd43… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 21 13:46:33 2022 +0100 shell32: Always set last error in Shell_NotifyIconW. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53101 --- dlls/shell32/systray.c | 8 +++++++- dlls/shell32/tests/systray.c | 12 ++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/systray.c b/dlls/shell32/systray.c index 6916937c41b..7863c4de177 100644 --- a/dlls/shell32/systray.c +++ b/dlls/shell32/systray.c @@ -148,7 +148,11 @@ BOOL WINAPI Shell_NotifyIconW(DWORD dwMessage, PNOTIFYICONDATAW nid) } tray = FindWindowExW(0, NULL, L"Shell_TrayWnd", NULL); - if (!tray) return FALSE; + if (!tray) + { + SetLastError(E_FAIL); + return FALSE; + } cds.dwData = dwMessage; cds.cbData = sizeof(*data); @@ -185,6 +189,7 @@ BOOL WINAPI Shell_NotifyIconW(DWORD dwMessage, PNOTIFYICONDATAW nid) { DeleteObject(iconinfo.hbmMask); if (iconinfo.hbmColor) DeleteObject(iconinfo.hbmColor); + SetLastError(E_OUTOFMEMORY); return FALSE; } @@ -241,6 +246,7 @@ noicon: cds.lpData = data; ret = SendMessageW(tray, WM_COPYDATA, (WPARAM)nid->hWnd, (LPARAM)&cds); if (data != &data_buffer) heap_free( data ); + SetLastError(ret ? S_OK : E_FAIL); return ret; } diff --git a/dlls/shell32/tests/systray.c b/dlls/shell32/tests/systray.c index ba5832e51c7..80621761240 100644 --- a/dlls/shell32/tests/systray.c +++ b/dlls/shell32/tests/systray.c @@ -44,8 +44,11 @@ static void test_cbsize(void) nidW.uFlags = NIF_ICON|NIF_MESSAGE; nidW.hIcon = LoadIconA(NULL, (LPSTR)IDI_APPLICATION); nidW.uCallbackMessage = WM_USER+17; + SetLastError(0xdeadbeef); ret = pShell_NotifyIconW(NIM_ADD, &nidW); ok(ret, "NIM_ADD failed!\n"); + ok(GetLastError() == ERROR_SUCCESS || GetLastError() == ERROR_NO_TOKEN, + "GetLastError() = %lu\n", GetLastError()); /* using an invalid cbSize does work */ nidW.cbSize = 3; nidW.hWnd = hMainWnd; @@ -54,7 +57,10 @@ static void test_cbsize(void) ok( ret || broken(!ret), /* nt4 */ "NIM_DELETE failed!\n"); /* as icon doesn't exist anymore - now there will be an error */ nidW.cbSize = sizeof(nidW); + SetLastError(0xdeadbeef); ok(!pShell_NotifyIconW(NIM_DELETE, &nidW) != !ret, "The icon was not deleted\n"); + ok(GetLastError() == E_FAIL || GetLastError() == ERROR_TIMEOUT, + "GetLastError() = %lu\n", GetLastError()); } /* same for Shell_NotifyIconA */ @@ -65,7 +71,10 @@ static void test_cbsize(void) nidA.uFlags = NIF_ICON|NIF_MESSAGE; nidA.hIcon = LoadIconA(NULL, (LPSTR)IDI_APPLICATION); nidA.uCallbackMessage = WM_USER+17; + SetLastError(0xdeadbeef); ok(Shell_NotifyIconA(NIM_ADD, &nidA), "NIM_ADD failed!\n"); + ok(GetLastError() == ERROR_SUCCESS || GetLastError() == ERROR_NO_TOKEN, + "GetLastError() = %lu\n", GetLastError()); /* using an invalid cbSize does work */ nidA.cbSize = 3; @@ -75,7 +84,10 @@ static void test_cbsize(void) ok(ret, "NIM_DELETE failed!\n"); /* as icon doesn't exist anymore - now there will be an error */ nidA.cbSize = sizeof(nidA); + SetLastError(0xdeadbeef); ok(!Shell_NotifyIconA(NIM_DELETE, &nidA) != !ret, "The icon was not deleted\n"); + ok(GetLastError() == E_FAIL || GetLastError() == ERROR_TIMEOUT, + "GetLastError() = %lu\n", GetLastError()); } START_TEST(systray)

1 0

Jacek Caban : urlmon/tests: Use gitlab.winehq.org host in can_do_https.
by Alexandre Julliard Dec. 21, 2022

Dec. 21, 2022

Module: wine Branch: master Commit: 1cd47755763cb2a17a8e48b3cb4f7c838be96aa2 URL: https://gitlab.winehq.org/wine/wine/-/commit/1cd47755763cb2a17a8e48b3cb4f7c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 21 13:10:55 2022 +0100 urlmon/tests: Use gitlab.winehq.org host in can_do_https. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53680 --- dlls/urlmon/tests/url.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 9e1a6edcdfd..ef2a742b726 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -3977,11 +3977,11 @@ static BOOL can_do_https(void) ses = InternetOpenA("winetest", INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); ok(ses != NULL, "InternetOpen failed\n"); - con = InternetConnectA(ses, "test.winehq.org", INTERNET_DEFAULT_HTTPS_PORT, + con = InternetConnectA(ses, "gitlab.winehq.org", INTERNET_DEFAULT_HTTPS_PORT, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); ok(con != NULL, "InternetConnect failed\n"); - req = HttpOpenRequestA(con, "GET", "/tests/hello.html", NULL, NULL, NULL, + req = HttpOpenRequestA(con, "GET", "/robots.txt", NULL, NULL, NULL, INTERNET_FLAG_SECURE, 0); ok(req != NULL, "HttpOpenRequest failed\n");

1 0

Rémi Bernon : dinput/tests: Test windows.gaming.input infinite effect duration.
by Alexandre Julliard Dec. 21, 2022

Dec. 21, 2022

Module: wine Branch: master Commit: d348cf37221e40a7d584d910faa14ce1eaf6be33 URL: https://gitlab.winehq.org/wine/wine/-/commit/d348cf37221e40a7d584d910faa14c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Dec 21 12:31:42 2022 +0100 dinput/tests: Test windows.gaming.input infinite effect duration. --- dlls/dinput/tests/force_feedback.c | 77 +++++++++++++++++++++++++++++++++++++- 1 file changed, 75 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/tests/force_feedback.c b/dlls/dinput/tests/force_feedback.c index 6c7d4791c84..353a8968f89 100644 --- a/dlls/dinput/tests/force_feedback.c +++ b/dlls/dinput/tests/force_feedback.c @@ -20,6 +20,7 @@ #include <stdarg.h> #include <stddef.h> +#include <stdint.h> #include "ntstatus.h" #define WIN32_NO_STATUS @@ -5024,7 +5025,7 @@ static void test_windows_gaming_input(void) LOGICAL_MINIMUM(1, 0), LOGICAL_MAXIMUM(2, 0x7fff), PHYSICAL_MINIMUM(1, 0), - PHYSICAL_MAXIMUM(2, 0x7fff), + PHYSICAL_MAXIMUM(1, 0), REPORT_SIZE(1, 16), REPORT_COUNT(1, 4), OUTPUT(1, Data|Var|Abs), @@ -5709,6 +5710,54 @@ static void test_windows_gaming_input(void) .report_buf = {3,0x01,0x05,0x04,0x5a,0x00,0x00,0x00,0x00,0x00,0x0a,0x00,0xff,0xff,0x4e,0x01,0x00,0x00}, }, }; + struct hid_expect expect_create_ramp_inf[] = + { + /* create new effect */ + { + .code = IOCTL_HID_SET_FEATURE, + .report_id = 2, + .report_len = 3, + .report_buf = {2,0x05,0x00}, + }, + /* block load */ + { + .code = IOCTL_HID_GET_FEATURE, + .report_id = 3, + .report_len = 5, + .report_buf = {3,0x01,0x01,0x00,0x00}, + }, + /* set ramp */ + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 10, + .report_len = 6, + .report_buf = {10,0x01,0xe8,0x03,0xa0,0x0f}, + }, + /* set envelope (wine) */ + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 8, + .report_len = 8, + .report_buf = {8,0x01,0x00,0x00,0x00,0x00,0x00,0x00}, + .todo = TRUE, .wine_only = TRUE, + }, + /* update effect (wine) */ + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 3, + .report_len = 18, + .report_buf = {3,0x01,0x05,0x04,0x8f,0xe4,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4e,0x01,0x00,0x00}, + .todo = TRUE, .wine_only = TRUE, + }, + /* update effect */ + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 3, + .report_len = 18, + .report_buf = {3,0x01,0x05,0x04,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4e,0x01,0x00,0x00}, + .todo = TRUE, + }, + }; struct hid_expect expect_effect_start = { .code = IOCTL_HID_WRITE_REPORT, @@ -5756,7 +5805,7 @@ static void test_windows_gaming_input(void) .dwHow = DIPH_DEVICE, }, }; - TimeSpan delay = {100000}, attack_duration = {200000}, release_duration = {300000}, duration = {400000}; + TimeSpan delay = {100000}, attack_duration = {200000}, release_duration = {300000}, duration = {400000}, infinite_duration = {INT64_MAX}; Vector3 direction = {0.1, 0.2, 0.3}, end_direction = {0.4, 0.5, 0.6}; DIDEVICEINSTANCEW devinst = {.dwSize = sizeof(DIDEVICEINSTANCEW)}; IAsyncOperation_ForceFeedbackLoadEffectResult *result_async; @@ -6441,6 +6490,30 @@ static void test_windows_gaming_input(void) IAsyncOperation_boolean_Release( bool_async ); set_hid_expect( file, NULL, 0 ); + + hr = IForceFeedbackEffect_QueryInterface( effect, &IID_IRampForceEffect, (void **)&ramp_effect ); + ok( hr == S_OK, "QueryInterface returned %#lx\n", hr ); + hr = IRampForceEffect_SetParameters( ramp_effect, direction, end_direction, infinite_duration ); + ok( hr == S_OK, "SetParameters returned %#lx\n", hr ); + IRampForceEffect_Release( ramp_effect ); + + set_hid_expect( file, expect_create_ramp_inf, sizeof(expect_create_ramp_inf) ); + hr = IForceFeedbackMotor_LoadEffectAsync( motor, effect, &result_async ); + ok( hr == S_OK, "LoadEffectAsync returned %#lx\n", hr ); + await_result( result_async ); + check_result_async( result_async, 1, Completed, S_OK, ForceFeedbackLoadEffectResult_Succeeded ); + IAsyncOperation_ForceFeedbackLoadEffectResult_Release( result_async ); + set_hid_expect( file, NULL, 0 ); + + set_hid_expect( file, expect_unload, sizeof(expect_unload) ); + hr = IForceFeedbackMotor_TryUnloadEffectAsync( motor, effect, &bool_async ); + ok( hr == S_OK, "TryUnloadEffectAsync returned %#lx\n", hr ); + await_bool( bool_async ); + check_bool_async( bool_async, 1, Completed, S_OK, TRUE ); + IAsyncOperation_boolean_Release( bool_async ); + set_hid_expect( file, NULL, 0 ); + + IForceFeedbackEffect_Release( effect );

1 0

Rémi Bernon : dinput/tests: Test dinput force feedback effect envelope removal.
by Alexandre Julliard Dec. 21, 2022

Dec. 21, 2022

Module: wine Branch: master Commit: 11374e7020999e94d3f2366db068b3b72490fc2a URL: https://gitlab.winehq.org/wine/wine/-/commit/11374e7020999e94d3f2366db068b3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Dec 21 12:55:41 2022 +0100 dinput/tests: Test dinput force feedback effect envelope removal. --- dlls/dinput/tests/force_feedback.c | 75 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/dlls/dinput/tests/force_feedback.c b/dlls/dinput/tests/force_feedback.c index 353a8968f89..145f6108ab6 100644 --- a/dlls/dinput/tests/force_feedback.c +++ b/dlls/dinput/tests/force_feedback.c @@ -425,6 +425,55 @@ static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file, DWO .report_buf = {0x03,0x01,0x02,0x08,0x01,0x00,version >= 0x700 ? 0x06 : 0x00,0x00,0x01,0x55,0xd5}, }, }; + struct hid_expect expect_download_3[] = + { + /* set periodic */ + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 5, + .report_len = 2, + .report_buf = {0x05,0x19}, + }, + /* set envelope */ + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 6, + .report_len = 7, + .report_buf = {0x06,0x19,0x4c,0x01,0x00,0x04,0x00}, + }, + /* update effect */ + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 3, + .report_len = 11, + .report_buf = {0x03,0x01,0x02,0x08,0xff,0xff,version >= 0x700 ? 0x06 : 0x00,0x00,0x01,0x55,0xd5}, + }, + }; + struct hid_expect expect_download_4[] = + { + /* set periodic */ + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 5, + .report_len = 2, + .report_buf = {0x05,0x19}, + }, + /* set envelope (wine) */ + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 6, + .report_len = 7, + .report_buf = {0x06,0x19,0x4c,0x01,0x00,0x04,0x00}, + .todo = TRUE, .wine_only = TRUE, + }, + /* update effect */ + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 3, + .report_len = 11, + .report_buf = {0x03,0x01,0x02,0x08,0xff,0xff,version >= 0x700 ? 0x06 : 0x00,0x00,0x01,0x55,0xd5}, + }, + }; struct hid_expect expect_update[] = { /* update effect */ @@ -1441,6 +1490,32 @@ static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file, DWO ok( hr == DI_OK, "SetParameters returned %#lx\n", hr ); wait_hid_expect( file, 100 ); /* these updates are sent asynchronously */ + set_hid_expect( file, &expect_stop, sizeof(expect_stop) ); + hr = IDirectInputEffect_Unload( effect ); + ok( hr == DI_OK, "Unload returned %#lx\n", hr ); + set_hid_expect( file, NULL, 0 ); + + hr = IDirectInputEffect_SetParameters( effect, &expect_desc, DIEP_NODOWNLOAD ); + ok( hr == DI_DOWNLOADSKIPPED, "SetParameters returned %#lx\n", hr ); + set_hid_expect( file, expect_download_3, sizeof(expect_download_3) ); + hr = IDirectInputEffect_SetParameters( effect, &expect_desc, 0 ); + ok( hr == DI_OK, "SetParameters returned %#lx\n", hr ); + wait_hid_expect( file, 100 ); /* these updates are sent asynchronously */ + + set_hid_expect( file, &expect_stop, sizeof(expect_stop) ); + hr = IDirectInputEffect_Unload( effect ); + ok( hr == DI_OK, "Unload returned %#lx\n", hr ); + set_hid_expect( file, NULL, 0 ); + + desc = expect_desc; + desc.lpEnvelope = NULL; + hr = IDirectInputEffect_SetParameters( effect, &desc, DIEP_NODOWNLOAD | DIEP_ENVELOPE ); + ok( hr == DI_DOWNLOADSKIPPED, "SetParameters returned %#lx\n", hr ); + set_hid_expect( file, expect_download_4, sizeof(expect_download_4) ); + hr = IDirectInputEffect_SetParameters( effect, &expect_desc, 0 ); + ok( hr == DI_OK, "SetParameters returned %#lx\n", hr ); + wait_hid_expect( file, 100 ); /* these updates are sent asynchronously */ + set_hid_expect( file, &expect_stop, sizeof(expect_stop) ); ref = IDirectInputEffect_Release( effect ); ok( ref == 0, "Release returned %ld\n", ref );

1 0

Rémi Bernon : dinput/tests: Factor async await together with some new helpers.
by Alexandre Julliard Dec. 21, 2022

Dec. 21, 2022

Module: wine Branch: master Commit: 735adb9ff44958d09f267a0f2861ebc46c69d4ca URL: https://gitlab.winehq.org/wine/wine/-/commit/735adb9ff44958d09f267a0f2861eb… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Dec 21 12:06:52 2022 +0100 dinput/tests: Factor async await together with some new helpers. --- dlls/dinput/tests/force_feedback.c | 125 +++++++++++++------------------------ 1 file changed, 43 insertions(+), 82 deletions(-)

1 0

Shaun Ren : mfmediaengine: Pause the session in media_engine_Pause.
by Alexandre Julliard Dec. 21, 2022

Dec. 21, 2022

Module: wine Branch: master Commit: 5ef7a45bc9bbb21c1892ce939670302f15214601 URL: https://gitlab.winehq.org/wine/wine/-/commit/5ef7a45bc9bbb21c1892ce93967030… Author: Shaun Ren <sren(a)codeweavers.com> Date: Sat Dec 17 00:30:26 2022 -0500 mfmediaengine: Pause the session in media_engine_Pause. --- dlls/mfmediaengine/main.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 27dafd616a2..63e9a8f07d5 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -1952,11 +1952,14 @@ static HRESULT WINAPI media_engine_Pause(IMFMediaEngineEx *iface) { if (!(engine->flags & FLAGS_ENGINE_PAUSED)) { - media_engine_set_flag(engine, FLAGS_ENGINE_WAITING | FLAGS_ENGINE_IS_ENDED, FALSE); - media_engine_set_flag(engine, FLAGS_ENGINE_PAUSED, TRUE); + if (SUCCEEDED(hr = IMFMediaSession_Pause(engine->session))) + { + media_engine_set_flag(engine, FLAGS_ENGINE_WAITING | FLAGS_ENGINE_IS_ENDED, FALSE); + media_engine_set_flag(engine, FLAGS_ENGINE_PAUSED, TRUE); - IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_TIMEUPDATE, 0, 0); - IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_PAUSE, 0, 0); + IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_TIMEUPDATE, 0, 0); + IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_PAUSE, 0, 0); + } } IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_PURGEQUEUEDEVENTS, 0, 0);

1 0

Shaun Ren : mfmediaengine: Change media_engine_Shutdown FIXME to TRACE.
by Alexandre Julliard Dec. 21, 2022

Dec. 21, 2022

Module: wine Branch: master Commit: adbc4b666d166e24d4010b5a4f3408b9fca5d0fa URL: https://gitlab.winehq.org/wine/wine/-/commit/adbc4b666d166e24d4010b5a4f3408… Author: Shaun Ren <sren(a)codeweavers.com> Date: Sat Dec 17 00:28:51 2022 -0500 mfmediaengine: Change media_engine_Shutdown FIXME to TRACE. --- dlls/mfmediaengine/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index f2fae1cac3e..27dafd616a2 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -2123,7 +2123,7 @@ static HRESULT WINAPI media_engine_Shutdown(IMFMediaEngineEx *iface) struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); HRESULT hr = S_OK; - FIXME("(%p): stub.\n", iface); + TRACE("%p.\n", iface); EnterCriticalSection(&engine->cs); if (engine->flags & FLAGS_ENGINE_SHUT_DOWN)

1 0

Ziqing Hui : mfplat/tests: Add MEDIASUBTYPE_RGB* and NV11 image size tests.
by Alexandre Julliard Dec. 21, 2022

Dec. 21, 2022

Module: wine Branch: master Commit: ae32fb465eacd9bf13874d344c6ede98c7a5637a URL: https://gitlab.winehq.org/wine/wine/-/commit/ae32fb465eacd9bf13874d344c6ede… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Dec 21 11:33:24 2022 +0800 mfplat/tests: Add MEDIASUBTYPE_RGB* and NV11 image size tests. --- dlls/mfplat/tests/mfplat.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 83d2aacf843..13055d4c5e4 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -337,6 +337,15 @@ static WCHAR *load_resource(const WCHAR *name) return pathW; } +static BOOL is_MEDIASUBTYPE_RGB(const GUID *subtype) +{ + return IsEqualGUID(subtype, &MEDIASUBTYPE_RGB8) + || IsEqualGUID(subtype, &MEDIASUBTYPE_RGB555) + || IsEqualGUID(subtype, &MEDIASUBTYPE_RGB565) + || IsEqualGUID(subtype, &MEDIASUBTYPE_RGB24) + || IsEqualGUID(subtype, &MEDIASUBTYPE_RGB32); +} + struct test_callback { IMFAsyncCallback IMFAsyncCallback_iface; @@ -4261,6 +4270,16 @@ image_size_tests[] = { &MFVideoFormat_A2R10G10B10, 1, 1, 4, 0, 64, 4, 64 }, { &MFVideoFormat_A16B16G16R16F, 3, 5, 120, 0, 320, 120, 64 }, { &MFVideoFormat_A16B16G16R16F, 1, 1, 8, 0, 64, 8, 64 }, + { &MEDIASUBTYPE_RGB8, 3, 5, 20 }, + { &MEDIASUBTYPE_RGB8, 1, 1, 4 }, + { &MEDIASUBTYPE_RGB555, 3, 5, 40 }, + { &MEDIASUBTYPE_RGB555, 1, 1, 4 }, + { &MEDIASUBTYPE_RGB565, 3, 5, 40 }, + { &MEDIASUBTYPE_RGB565, 1, 1, 4 }, + { &MEDIASUBTYPE_RGB24, 3, 5, 60 }, + { &MEDIASUBTYPE_RGB24, 1, 1, 4 }, + { &MEDIASUBTYPE_RGB32, 3, 5, 60 }, + { &MEDIASUBTYPE_RGB32, 1, 1, 4 }, /* YUV 4:4:4, 32 bpp, packed */ { &MFVideoFormat_AYUV, 1, 1, 4, 0, 64, 4, 64 }, @@ -4338,6 +4357,15 @@ image_size_tests[] = { &MFVideoFormat_IMC4, 4, 2, 12, 0, 384, 12, 128 }, { &MFVideoFormat_IMC4, 4, 3, 18, 0, 576, 18, 128 }, { &MFVideoFormat_IMC4, 320, 240, 115200, 0, 138240, 115200, 384 }, + + /* YUV 4:1:1, 12 bpp, semi-planar */ + { &MFVideoFormat_NV11, 1, 3, 18, 4, 576, 3, 128 }, + { &MFVideoFormat_NV11, 1, 2, 12, 3, 384, 2, 128 }, + { &MFVideoFormat_NV11, 2, 2, 12, 6, 384, 6, 128 }, + { &MFVideoFormat_NV11, 2, 4, 24, 12, 768, 12, 128 }, + { &MFVideoFormat_NV11, 3, 2, 12, 9, 384, 8, 128 }, + { &MFVideoFormat_NV11, 4, 2, 12, 0, 384, 12, 128 }, + { &MFVideoFormat_NV11, 320, 240, 115200, 0, 138240, 115200, 384 }, }; static void test_MFCalculateImageSize(void) @@ -4360,7 +4388,9 @@ static void test_MFCalculateImageSize(void) IsEqualGUID(ptr->subtype, &MFVideoFormat_A2R10G10B10); hr = MFCalculateImageSize(ptr->subtype, ptr->width, ptr->height, &size); + todo_wine_if(is_MEDIASUBTYPE_RGB(ptr->subtype) || IsEqualGUID(ptr->subtype, &MFVideoFormat_NV11)) ok(hr == S_OK || (is_broken && hr == E_INVALIDARG), "%u: failed to calculate image size, hr %#lx.\n", i, hr); + todo_wine_if(is_MEDIASUBTYPE_RGB(ptr->subtype) || IsEqualGUID(ptr->subtype, &MFVideoFormat_NV11)) ok(size == ptr->size, "%u: unexpected image size %u, expected %u. Size %u x %u, format %s.\n", i, size, ptr->size, ptr->width, ptr->height, wine_dbgstr_an((char *)&ptr->subtype->Data1, 4)); } @@ -4387,9 +4417,12 @@ static void test_MFGetPlaneSize(void) { const struct image_size_test *ptr = &image_size_tests[i]; unsigned int plane_size = ptr->plane_size ? ptr->plane_size : ptr->size; + if ((is_MEDIASUBTYPE_RGB(ptr->subtype))) + plane_size = 0; hr = pMFGetPlaneSize(ptr->subtype->Data1, ptr->width, ptr->height, &size); ok(hr == S_OK, "%u: failed to get plane size, hr %#lx.\n", i, hr); + todo_wine_if(IsEqualGUID(ptr->subtype, &MFVideoFormat_NV11)) ok(size == plane_size, "%u: unexpected plane size %lu, expected %u. Size %u x %u, format %s.\n", i, size, plane_size, ptr->width, ptr->height, wine_dbgstr_an((char*)&ptr->subtype->Data1, 4)); } @@ -5932,8 +5965,14 @@ static void test_MFCreate2DMediaBuffer(void) { const struct image_size_test *ptr = &image_size_tests[i]; + if (is_MEDIASUBTYPE_RGB(ptr->subtype)) + continue; + hr = pMFCreate2DMediaBuffer(ptr->width, ptr->height, ptr->subtype->Data1, FALSE, &buffer); + todo_wine_if(IsEqualGUID(ptr->subtype, &MFVideoFormat_NV11)) ok(hr == S_OK, "Failed to create a buffer, hr %#lx.\n", hr); + if (hr != S_OK) + continue; hr = IMFMediaBuffer_GetMaxLength(buffer, &length); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); @@ -6070,8 +6109,14 @@ static void test_MFCreate2DMediaBuffer(void) { const struct image_size_test *ptr = &image_size_tests[i]; + if (is_MEDIASUBTYPE_RGB(ptr->subtype)) + continue; + hr = pMFCreate2DMediaBuffer(ptr->width, ptr->height, ptr->subtype->Data1, FALSE, &buffer); + todo_wine_if(IsEqualGUID(ptr->subtype, &MFVideoFormat_NV11)) ok(hr == S_OK, "Failed to create a buffer, hr %#lx.\n", hr); + if (hr != S_OK) + continue; hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMF2DBuffer, (void **)&_2dbuffer); ok(hr == S_OK, "Failed to get interface, hr %#lx.\n", hr);

1 0

Gabriel Ivăncescu : jscript: Fix JSCaller Release refcount.
by Alexandre Julliard Dec. 20, 2022

Dec. 20, 2022

Module: wine Branch: master Commit: aa7f3b1ef6efec4aa7cec131ec03086833bb4813 URL: https://gitlab.winehq.org/wine/wine/-/commit/aa7f3b1ef6efec4aa7cec131ec0308… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Dec 20 21:39:46 2022 +0200 jscript: Fix JSCaller Release refcount. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/jsutils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 8c1eedf4283..3dfcd08f14c 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -1017,7 +1017,7 @@ static ULONG WINAPI JSCaller_AddRef(IServiceProvider *iface) static ULONG WINAPI JSCaller_Release(IServiceProvider *iface) { JSCaller *This = impl_from_IServiceProvider(iface); - LONG ref = InterlockedIncrement(&This->ref); + LONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref=%ld\n", This, ref);

1 0

Paul Gofman : winhttp: Only read server reply in send_request() if the whole request is sent.
by Alexandre Julliard Dec. 20, 2022

Dec. 20, 2022

Module: wine Branch: master Commit: 3f51fcf8ac40296265f0bf88ed51e0778f6b266a URL: https://gitlab.winehq.org/wine/wine/-/commit/3f51fcf8ac40296265f0bf88ed51e0… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Dec 19 17:06:13 2022 -0600 winhttp: Only read server reply in send_request() if the whole request is sent. Fixes a regression introduced by aa8f97e8294b0618de0e8a45ff2adef0c4e516da. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54184 --- dlls/winhttp/request.c | 45 ++++++++++++++++++++++++++++++++------- dlls/winhttp/tests/notification.c | 36 +++++++++++++++++++++++-------- dlls/winhttp/winhttp_private.h | 2 ++ 3 files changed, 66 insertions(+), 17 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 43d123de129..07d0ff19b7c 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2216,9 +2216,9 @@ static DWORD send_request( struct request *request, const WCHAR *headers, DWORD { struct connect *connect = request->connect; struct session *session = connect->session; + DWORD ret, len, buflen, content_length; char *wire_req; int bytes_sent; - DWORD ret, len; TRACE( "request state %d.\n", request->state ); @@ -2305,14 +2305,29 @@ static DWORD send_request( struct request *request, const WCHAR *headers, DWORD request->optional_len = optional_len; len += optional_len; } - netconn_set_timeout( request->netconn, FALSE, request->receive_response_timeout ); - request->read_reply_status = read_reply( request ); send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_REQUEST_SENT, &len, sizeof(len) ); - if (request->state == REQUEST_RESPONSE_STATE_READ_RESPONSE_QUEUED) - request->state = REQUEST_RESPONSE_STATE_READ_RESPONSE_QUEUED_REQUEST_SENT; + buflen = sizeof(content_length); + if (query_headers( request, WINHTTP_QUERY_FLAG_REQUEST_HEADERS | WINHTTP_QUERY_CONTENT_LENGTH + | WINHTTP_QUERY_FLAG_NUMBER, NULL, &content_length, &buflen, NULL )) + content_length = total_len; + + if (content_length <= optional_len) + { + netconn_set_timeout( request->netconn, FALSE, request->receive_response_timeout ); + request->read_reply_status = read_reply( request ); + if (request->state == REQUEST_RESPONSE_STATE_READ_RESPONSE_QUEUED) + request->state = REQUEST_RESPONSE_STATE_READ_RESPONSE_QUEUED_REPLY_RECEIVED; + else + request->state = REQUEST_RESPONSE_STATE_REPLY_RECEIVED; + } else - request->state = REQUEST_RESPONSE_STATE_REQUEST_SENT; + { + if (request->state == REQUEST_RESPONSE_STATE_READ_RESPONSE_QUEUED) + request->state = REQUEST_RESPONSE_STATE_READ_RESPONSE_QUEUED_REQUEST_SENT; + else + request->state = REQUEST_RESPONSE_STATE_REQUEST_SENT; + } end: if (async) @@ -2895,10 +2910,24 @@ static DWORD receive_response( struct request *request ) case REQUEST_RESPONSE_STATE_REQUEST_SENT: send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE, NULL, 0 ); + if (async_mode) + { + request->state = REQUEST_RESPONSE_STATE_READ_RESPONSE_QUEUED_REQUEST_SENT; + return queue_receive_response( request ); + } + /* fallthrough */ + case REQUEST_RESPONSE_STATE_READ_RESPONSE_QUEUED_REQUEST_SENT: + netconn_set_timeout( request->netconn, FALSE, request->receive_response_timeout ); + request->read_reply_status = read_reply( request ); + request->state = REQUEST_RESPONSE_STATE_REPLY_RECEIVED; break; - case REQUEST_RESPONSE_STATE_READ_RESPONSE_QUEUED_REQUEST_SENT: - request->state = REQUEST_RESPONSE_STATE_REQUEST_SENT; + case REQUEST_RESPONSE_STATE_REPLY_RECEIVED: + send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE, NULL, 0 ); + break; + + case REQUEST_RESPONSE_STATE_READ_RESPONSE_QUEUED_REPLY_RECEIVED: + request->state = REQUEST_RESPONSE_STATE_REPLY_RECEIVED; break; default: diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index dbdb958f061..78319f0df5c 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -1852,6 +1852,8 @@ struct test_recursion_context DWORD main_thread_id; DWORD receive_response_thread_id; BOOL headers_available; + DWORD total_len; + BYTE *send_buffer; }; /* The limit is 128 before Win7 and 3 on newer Windows. */ @@ -1872,17 +1874,29 @@ static void CALLBACK test_recursion_callback( HINTERNET handle, DWORD_PTR contex case WINHTTP_CALLBACK_STATUS_SENDREQUEST_COMPLETE: if (status == context->call_receive_response_status) { - context->receive_response_thread_id = GetCurrentThreadId(); - ret = WinHttpReceiveResponse( context->request, NULL ); - ok( ret, "failed to receive response, GetLastError() %lu\n", GetLastError() ); + if (context->total_len) + { + ret = WinHttpWriteData( context->request, context->send_buffer, context->total_len, NULL ); + ok(ret, "failed.\n"); + } + else + { + context->receive_response_thread_id = GetCurrentThreadId(); + ret = WinHttpReceiveResponse( context->request, NULL ); + ok( ret, "failed to receive response, GetLastError() %lu\n", GetLastError() ); + } } break; + case WINHTTP_CALLBACK_STATUS_WRITE_COMPLETE: + trace("WINHTTP_CALLBACK_STATUS_WRITE_COMPLETE thread %04lx.\n", GetCurrentThreadId()); + context->receive_response_thread_id = GetCurrentThreadId(); + ret = WinHttpReceiveResponse( context->request, NULL ); + ok( ret, "failed to receive response, GetLastError() %lu\n", GetLastError() ); + break; + case WINHTTP_CALLBACK_STATUS_HEADERS_AVAILABLE: - if (context->call_receive_response_status == WINHTTP_CALLBACK_STATUS_SENDREQUEST_COMPLETE) - ok( GetCurrentThreadId() == context->receive_response_thread_id, - "expected callback to be called from the same thread, got %lx.\n", GetCurrentThreadId() ); - else + if (context->call_receive_response_status != WINHTTP_CALLBACK_STATUS_SENDREQUEST_COMPLETE) ok( GetCurrentThreadId() != context->main_thread_id, "expected callback to be called from the other thread, got main.\n" ); context->headers_available = TRUE; @@ -1933,7 +1947,6 @@ static void CALLBACK test_recursion_callback( HINTERNET handle, DWORD_PTR contex InterlockedDecrement( &context->recursion_count ); break; case WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE: - case WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED: if (!context->headers_available && context->call_receive_response_status == WINHTTP_CALLBACK_STATUS_SENDREQUEST_COMPLETE) ok( GetCurrentThreadId() == context->receive_response_thread_id, @@ -1979,7 +1992,10 @@ static void test_recursion(void) ok( ret, "failed to receive response, GetLastError() %lu\n", GetLastError() ); context.call_receive_response_status = WINHTTP_CALLBACK_STATUS_SENDREQUEST_COMPLETE; - ret = WinHttpSendRequest( request, NULL, 0, NULL, 0, 0, (DWORD_PTR)&context ); + context.total_len = 1; + context.send_buffer = &b; + b = 0; + ret = WinHttpSendRequest( request, NULL, 0, NULL, 0, context.total_len, (DWORD_PTR)&context ); err = GetLastError(); if (!ret && (err == ERROR_WINHTTP_CANNOT_CONNECT || err == ERROR_WINHTTP_TIMEOUT)) { @@ -1994,6 +2010,8 @@ static void test_recursion(void) ok( ret, "failed to send request, GetLastError() %lu\n", GetLastError() ); WaitForSingleObject( context.wait, INFINITE ); + context.total_len = 0; + context.send_buffer = NULL; size = sizeof(status); ret = WinHttpQueryHeaders( request, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 8e4789356ec..bf1e60e2cee 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -181,6 +181,8 @@ enum request_response_state REQUEST_RESPONSE_STATE_READ_RESPONSE_QUEUED, REQUEST_RESPONSE_STATE_REQUEST_SENT, REQUEST_RESPONSE_STATE_READ_RESPONSE_QUEUED_REQUEST_SENT, + REQUEST_RESPONSE_STATE_REPLY_RECEIVED, + REQUEST_RESPONSE_STATE_READ_RESPONSE_QUEUED_REPLY_RECEIVED, REQUEST_RESPONSE_RECURSIVE_REQUEST, REQUEST_RESPONSE_STATE_RESPONSE_RECEIVED, };

1 0

Paul Gofman : winhttp: Handle state in a single switch in receive_response().
by Alexandre Julliard Dec. 20, 2022

Dec. 20, 2022

Module: wine Branch: master Commit: 2677546e0a24f647ac98fd3deaf8ae3a2f457825 URL: https://gitlab.winehq.org/wine/wine/-/commit/2677546e0a24f647ac98fd3deaf8ae… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Dec 19 18:04:38 2022 -0600 winhttp: Handle state in a single switch in receive_response(). --- dlls/winhttp/request.c | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index c99cb7ee195..43d123de129 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2871,38 +2871,39 @@ static DWORD receive_response( struct request *request ) { BOOL async_mode = request->connect->hdr.flags & WINHTTP_FLAG_ASYNC; DWORD ret, size, query, status; - BOOL return_to_send; TRACE( "request state %d.\n", request->state ); - if (request->state >= REQUEST_RESPONSE_STATE_RESPONSE_RECEIVED) - { - ret = ERROR_WINHTTP_INCORRECT_HANDLE_STATE; - goto done; - } - - if (request->state == REQUEST_RESPONSE_RECURSIVE_REQUEST) + switch (request->state) { + case REQUEST_RESPONSE_RECURSIVE_REQUEST: TRACE( "Sending request.\n" ); if ((ret = send_request( request, NULL, 0, request->optional, request->optional_len, 0, 0, FALSE ))) goto done; - } - - return_to_send = async_mode && request->state == REQUEST_RESPONSE_STATE_SENDING_REQUEST; - if (request->state < REQUEST_RESPONSE_STATE_REQUEST_SENT && !return_to_send) - { - ret = ERROR_WINHTTP_INCORRECT_HANDLE_STATE; - goto done; - } - - if (request->state == REQUEST_RESPONSE_STATE_READ_RESPONSE_QUEUED_REQUEST_SENT) - request->state = REQUEST_RESPONSE_STATE_REQUEST_SENT; - else send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE, NULL, 0 ); + break; - if (return_to_send) - { + case REQUEST_RESPONSE_STATE_SENDING_REQUEST: + if (!async_mode) + { + ret = ERROR_WINHTTP_INCORRECT_HANDLE_STATE; + goto done; + } + send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE, NULL, 0 ); request->state = REQUEST_RESPONSE_STATE_READ_RESPONSE_QUEUED; return queue_receive_response( request ); + + + case REQUEST_RESPONSE_STATE_REQUEST_SENT: + send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE, NULL, 0 ); + break; + + case REQUEST_RESPONSE_STATE_READ_RESPONSE_QUEUED_REQUEST_SENT: + request->state = REQUEST_RESPONSE_STATE_REQUEST_SENT; + break; + + default: + ret = ERROR_WINHTTP_INCORRECT_HANDLE_STATE; + goto done; } send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED,

1 0

Gerald Pfeifer : winebus.sys: Declare a variable only when used.
by Alexandre Julliard Dec. 20, 2022

Dec. 20, 2022

Module: wine Branch: master Commit: 940d13db369f1ebaf5fdeaa5775ecf1794ce6b71 URL: https://gitlab.winehq.org/wine/wine/-/commit/940d13db369f1ebaf5fdeaa5775ecf… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Tue Dec 20 03:36:46 2022 +0100 winebus.sys: Declare a variable only when used. udev_add_device declares a variable (product) even when it is not used on all platforms. Use the same condition for the declaration that already guards the code. --- dlls/winebus.sys/bus_udev.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 3cd8bfd1ceb..34b3305ed88 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1329,7 +1329,9 @@ static void udev_add_device(struct udev_device *dev, int fd) if (!strcmp(subsystem, "hidraw")) { static const WCHAR hidraw[] = {'h','i','d','r','a','w',0}; +#ifdef HAVE_LINUX_HIDRAW_H char product[MAX_PATH]; +#endif if (!desc.manufacturer[0]) memcpy(desc.manufacturer, hidraw, sizeof(hidraw));

1 0

Gerald Pfeifer : wmc: Avoid uninitialized variable in init_argv0_dir.
by Alexandre Julliard Dec. 20, 2022

Dec. 20, 2022

Module: wine Branch: master Commit: 4bbdbc759a8c1b8eab8aea8c8f581eafe5ed4d78 URL: https://gitlab.winehq.org/wine/wine/-/commit/4bbdbc759a8c1b8eab8aea8c8f581e… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Tue Dec 20 00:02:19 2022 +0100 wmc: Avoid uninitialized variable in init_argv0_dir. init_argv0_dir has conditional code for different operating systems. In case of FreeBSD a variable remains uninitialized in the error case, yet is then used. Fix that by handling the error case. --- tools/wmc/wmc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/wmc/wmc.c b/tools/wmc/wmc.c index f5ff7abcdf9..145acb5d718 100644 --- a/tools/wmc/wmc.c +++ b/tools/wmc/wmc.c @@ -160,6 +160,8 @@ static void init_argv0_dir( const char *argv0 ) char *path = xmalloc( path_size ); if (!sysctl( pathname, ARRAY_SIZE(pathname), path, &path_size, NULL, 0 )) dir = realpath( path, NULL ); + else + dir = NULL; free( path ); #else dir = realpath( argv0, NULL );

1 0

Alexandre Julliard : d3d8/tests: Don't require WM_MOVE on window reactivation.
by Alexandre Julliard Dec. 20, 2022

Dec. 20, 2022

Module: wine Branch: master Commit: 971ef0d3b376f3b67f8608219b4f495263fbb15f URL: https://gitlab.winehq.org/wine/wine/-/commit/971ef0d3b376f3b67f8608219b4f49… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 20 17:42:17 2022 +0100 d3d8/tests: Don't require WM_MOVE on window reactivation. It can be activated without moving. --- dlls/d3d8/tests/device.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 12d8aeb89f6..9dcdcab066f 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -2922,7 +2922,6 @@ static void test_wndproc(void) { {WM_WINDOWPOSCHANGING, DEVICE_WINDOW, FALSE, 0}, {WM_WINDOWPOSCHANGED, DEVICE_WINDOW, FALSE, 0}, - {WM_MOVE, DEVICE_WINDOW, FALSE, 0}, {WM_ACTIVATEAPP, FOCUS_WINDOW, TRUE, TRUE}, {0, 0, FALSE, 0}, };

1 0

Alexandre Julliard : d3d8/tests: Make sure that the window has focus before testing loss of focus.
by Alexandre Julliard Dec. 20, 2022

Dec. 20, 2022

Module: wine Branch: master Commit: 9761191f1c3aa7714204da470db1c8ef5dedc5c2 URL: https://gitlab.winehq.org/wine/wine/-/commit/9761191f1c3aa7714204da470db1c8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 20 17:44:07 2022 +0100 d3d8/tests: Make sure that the window has focus before testing loss of focus. --- dlls/d3d8/tests/device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 9dcdcab066f..59532d0a208 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -3305,6 +3305,7 @@ static void test_wndproc(void) skip("Failed to create a D3D device, skipping tests.\n"); goto done; } + SetForegroundWindow(focus_window); /* make sure that the window has focus */ filter_messages = NULL;

1 0

Zebediah Figura : httpapi/tests: Test passing NULL size to request reading functions.
by Alexandre Julliard Dec. 20, 2022

Dec. 20, 2022

Module: wine Branch: master Commit: 266c855fbd2a6a939c78cfb44391bdb5d71b5e2b URL: https://gitlab.winehq.org/wine/wine/-/commit/266c855fbd2a6a939c78cfb44391bd… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Dec 20 00:58:56 2022 -0600 httpapi/tests: Test passing NULL size to request reading functions. --- dlls/httpapi/tests/httpapi.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/httpapi/tests/httpapi.c b/dlls/httpapi/tests/httpapi.c index 1d00aa22c50..fa412b1093a 100644 --- a/dlls/httpapi/tests/httpapi.c +++ b/dlls/httpapi/tests/httpapi.c @@ -572,27 +572,39 @@ static void test_v1_short_buffer(void) ok(ret == strlen(req_text), "send() returned %d.\n", ret); memset(req_buffer, 0xcc, sizeof(req_buffer)); + + ret_size = 1; ret = HttpReceiveHttpRequest(queue, HTTP_NULL_ID, 0, (HTTP_REQUEST *)req, sizeof(HTTP_REQUEST_V1) - 1, &ret_size, NULL); ok(ret == ERROR_INSUFFICIENT_BUFFER, "Got error %u.\n", ret); + ok(ret_size == 1 /* win < 10 */ || !ret_size, "Got size %lu.\n", ret_size); + + ret_size = 1; ret = HttpReceiveHttpRequest(queue, HTTP_NULL_ID, 0, (HTTP_REQUEST *)req, sizeof(HTTP_REQUEST_V1), &ret_size, NULL); ok(ret == ERROR_MORE_DATA, "Got error %u.\n", ret); ok(ret_size > sizeof(*req), "Got size %lu.\n", ret_size); + ok(!!req->ConnectionId, "Got connection ID %s.\n", wine_dbgstr_longlong(req->ConnectionId)); ok(!!req->RequestId, "Got request ID %s.\n", wine_dbgstr_longlong(req->RequestId)); ok(!req->Version.MajorVersion || req->Version.MajorVersion == 0xcccc /* < Vista */, "Got major version %u.\n", req->Version.MajorVersion); ok(!req->BytesReceived || req->BytesReceived == ((ULONGLONG)0xcccccccc << 32 | 0xcccccccc) /* < Vista */, "Got %s bytes.\n", wine_dbgstr_longlong(req->BytesReceived)); + req_id = req->RequestId; /* At this point the request has been assigned a specific ID, and one cannot * receive it by calling with HTTP_NULL_ID. */ ret = HttpReceiveHttpRequest(queue, HTTP_NULL_ID, 0, (HTTP_REQUEST *)req2, sizeof(req_buffer2), NULL, &ovl); ok(ret == ERROR_IO_PENDING, "Got error %u.\n", ret); - req_id = req->RequestId; memset(req_buffer, 0xcc, sizeof(req_buffer)); ret = HttpReceiveHttpRequest(queue, req_id, 0, (HTTP_REQUEST *)req, ret_size - 1, &ret_size, NULL); ok(ret == ERROR_MORE_DATA, "Got error %u.\n", ret); + ok(req->RequestId == req_id, "Got request ID %s.\n", wine_dbgstr_longlong(req->RequestId)); + + memset(req_buffer, 0xcc, sizeof(req_buffer)); + ret = HttpReceiveHttpRequest(queue, req_id, 0, (HTTP_REQUEST *)req, ret_size - 1, NULL, NULL); + ok(ret == ERROR_MORE_DATA, "Got error %u.\n", ret); + ok(req->RequestId == req_id, "Got request ID %s.\n", wine_dbgstr_longlong(req->RequestId)); memset(req_buffer, 0xcc, sizeof(req_buffer)); ret = HttpReceiveHttpRequest(queue, req_id, 0, (HTTP_REQUEST *)req, ret_size, &ret_size, NULL); @@ -828,11 +840,15 @@ static void test_v1_entity_body(void) ok(ret_size == 2, "Got size %lu.\n", ret_size); ok(!memcmp(recv_body, "pi", 2), "Entity body didn't match.\n"); + ret = HttpReceiveRequestEntityBody(queue, req->RequestId, 0, recv_body, 1, NULL, NULL); + ok(!ret, "Got error %u.\n", ret); + ok(!memcmp(recv_body, "n", 1), "Entity body didn't match.\n"); + ret_size = 0xdeadbeef; ret = HttpReceiveRequestEntityBody(queue, req->RequestId, 0, recv_body, 4, &ret_size, NULL); ok(!ret, "Got error %u.\n", ret); - ok(ret_size == 3, "Got size %lu.\n", ret_size); - ok(!memcmp(recv_body, "ng", 3), "Entity body didn't match.\n"); + ok(ret_size == 2, "Got size %lu.\n", ret_size); + ok(!memcmp(recv_body, "g", 2), "Entity body didn't match.\n"); ret_size = 0xdeadbeef; ret = HttpReceiveRequestEntityBody(queue, req->RequestId, 0, recv_body, sizeof(recv_body), &ret_size, NULL);

1 0

Zebediah Figura : httpapi: Allow passing NULL size to HttpReceiveRequestEntityBody().
by Alexandre Julliard Dec. 20, 2022

Dec. 20, 2022

Module: wine Branch: master Commit: c9f628042216eea338a154f0585003fe9187bacc URL: https://gitlab.winehq.org/wine/wine/-/commit/c9f628042216eea338a154f0585003… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Dec 20 00:57:38 2022 -0600 httpapi: Allow passing NULL size to HttpReceiveRequestEntityBody(). --- dlls/httpapi/httpapi_main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c index cd00608c1ca..10131fdd029 100644 --- a/dlls/httpapi/httpapi_main.c +++ b/dlls/httpapi/httpapi_main.c @@ -278,6 +278,7 @@ ULONG WINAPI HttpReceiveRequestEntityBody(HANDLE queue, HTTP_REQUEST_ID id, ULON .bits = sizeof(void *) * 8, }; ULONG ret = ERROR_SUCCESS; + ULONG local_ret_size; OVERLAPPED sync_ovl; TRACE("queue %p, id %s, flags %#lx, buffer %p, size %#lx, ret_size %p, ovl %p.\n", @@ -292,6 +293,9 @@ ULONG WINAPI HttpReceiveRequestEntityBody(HANDLE queue, HTTP_REQUEST_ID id, ULON ovl = &sync_ovl; } + if (!ret_size) + ret_size = &local_ret_size; + if (!DeviceIoControl(queue, IOCTL_HTTP_RECEIVE_BODY, &params, sizeof(params), buffer, size, ret_size, ovl)) ret = GetLastError();

1 0

Zebediah Figura : httpapi: Allow passing NULL size to HttpReceiveHttpRequest().
by Alexandre Julliard Dec. 20, 2022

Dec. 20, 2022

Module: wine Branch: master Commit: d1d37e40d2cd2e7eb181db733ac8a2141cae4d99 URL: https://gitlab.winehq.org/wine/wine/-/commit/d1d37e40d2cd2e7eb181db733ac8a2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Dec 20 00:57:18 2022 -0600 httpapi: Allow passing NULL size to HttpReceiveHttpRequest(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53980 --- dlls/httpapi/httpapi_main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c index 964589021d6..cd00608c1ca 100644 --- a/dlls/httpapi/httpapi_main.c +++ b/dlls/httpapi/httpapi_main.c @@ -323,6 +323,7 @@ ULONG WINAPI HttpReceiveHttpRequest(HANDLE queue, HTTP_REQUEST_ID id, ULONG flag .bits = sizeof(void *) * 8, }; ULONG ret = ERROR_SUCCESS; + ULONG local_ret_size; OVERLAPPED sync_ovl; TRACE("queue %p, id %s, flags %#lx, request %p, size %#lx, ret_size %p, ovl %p.\n", @@ -340,6 +341,9 @@ ULONG WINAPI HttpReceiveHttpRequest(HANDLE queue, HTTP_REQUEST_ID id, ULONG flag ovl = &sync_ovl; } + if (!ret_size) + ret_size = &local_ret_size; + if (!DeviceIoControl(queue, IOCTL_HTTP_RECEIVE_REQUEST, &params, sizeof(params), request, size, ret_size, ovl)) ret = GetLastError();

1 0

Eric Pouech : kernel32/tests: Silence a failing test on Win10+.
by Alexandre Julliard Dec. 20, 2022

Dec. 20, 2022

Module: wine Branch: master Commit: f5a81ff02a8f359f9b1a7b1aa78ce1a5341c2158 URL: https://gitlab.winehq.org/wine/wine/-/commit/f5a81ff02a8f359f9b1a7b1aa78ce1… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Dec 20 15:47:56 2022 +0100 kernel32/tests: Silence a failing test on Win10+. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/kernel32/tests/volume.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 9166cf228d9..eb0b5fec772 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -87,7 +87,9 @@ static void test_query_dos_deviceA(void) for (;;) { if (!*p) break; ret2 = QueryDosDeviceA( p, buffer2, sizeof(buffer2) ); - ok(ret2, "QueryDosDeviceA failed to return current mapping for %s, last error %lu\n", p, GetLastError()); + /* Win10+ exposes security device which requires extra priviledges to be queried. So skip it */ + ok(ret2 || broken( !strcmp( p, "MSSECFLTSYS" ) && GetLastError() == ERROR_ACCESS_DENIED ), + "QueryDosDeviceA failed to return current mapping for %s, last error %lu\n", p, GetLastError()); p += strlen(p) + 1; if (ret <= (p-buffer)) break; }

1 0

Ziqing Hui : mf/tests: Use one input type for GetOutputType tests.
by Alexandre Julliard Dec. 20, 2022

Dec. 20, 2022

Module: wine Branch: master Commit: 9c4bcbea00b1f31b4cdece3fee501070c428c8c5 URL: https://gitlab.winehq.org/wine/wine/-/commit/9c4bcbea00b1f31b4cdece3fee5010… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Dec 20 09:54:44 2022 +0800 mf/tests: Use one input type for GetOutputType tests. --- dlls/mf/tests/transform.c | 29 +++++------------------------ 1 file changed, 5 insertions(+), 24 deletions(-) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index ccb2413faf4..35dc6aea6b8 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -4956,30 +4956,11 @@ static void test_wmv_decoder_media_object(void) ok(hr == DMO_E_TYPE_NOT_SET, "GetOutputType returned %#lx.\n", hr); /* Test GetOutputType after setting input type. */ - for (i = 0; i < ARRAY_SIZE(expected_input_types); ++i) - { - const GUID *subtype = &expected_input_types[i].subtype; - if (IsEqualGUID(subtype, &MEDIASUBTYPE_WMV2) - || IsEqualGUID(subtype, &MEDIASUBTYPE_WMVA) - || IsEqualGUID(subtype, &MEDIASUBTYPE_WVP2) - || IsEqualGUID(subtype, &MEDIASUBTYPE_WVC1) - || IsEqualGUID(subtype, &MFVideoFormat_VC1S)) - { - skip("Skipping GetOutputType tests for input subtype %s.\n", debugstr_guid(subtype)); - continue; - } - - winetest_push_context("in %lu", i); - - init_dmo_media_type_video(input_type, &expected_input_types[i].subtype, 16, 16); - hr = IMediaObject_SetInputType(media_object, 0, input_type, 0); - ok(hr == S_OK, "SetInputType returned %#lx.\n", hr); - - todo_wine - check_dmo_get_output_type(media_object, expected_output_types, ARRAY_SIZE(expected_output_types)); - - winetest_pop_context(); - } + init_dmo_media_type_video(input_type, &expected_input_types[0].subtype, 16, 16); + hr = IMediaObject_SetInputType(media_object, 0, input_type, 0); + ok(hr == S_OK, "SetInputType returned %#lx.\n", hr); + todo_wine + check_dmo_get_output_type(media_object, expected_output_types, ARRAY_SIZE(expected_output_types)); ret = IMediaObject_Release(media_object); ok(ret == 0, "Release returned %lu\n", ret);

1 0

Ziqing Hui : mf/tests: Test SetOutputType for WMV decoder.
by Alexandre Julliard Dec. 20, 2022

Dec. 20, 2022

Module: wine Branch: master Commit: 3eaa44a75cc3205bf5d3f4fef05b024570c30d5b URL: https://gitlab.winehq.org/wine/wine/-/commit/3eaa44a75cc3205bf5d3f4fef05b02… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Mon Dec 19 10:16:36 2022 +0800 mf/tests: Test SetOutputType for WMV decoder. --- dlls/mf/tests/transform.c | 130 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 127 insertions(+), 3 deletions(-) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index 35dc6aea6b8..3c068aae743 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -55,6 +55,58 @@ DEFINE_GUID(MFVideoFormat_WMV_Unknown,0x7ce12ca9,0xbfbf,0x43d9,0x9d,0x00,0x82,0x DEFINE_GUID(mft_output_sample_incomplete,0xffffff,0xffff,0xffff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff); +static BOOL is_compressed_subtype(const GUID *subtype) +{ + if (IsEqualGUID(subtype, &MEDIASUBTYPE_WMV1) + || IsEqualGUID(subtype, &MEDIASUBTYPE_WMV2) + || IsEqualGUID(subtype, &MEDIASUBTYPE_WMVA) + || IsEqualGUID(subtype, &MEDIASUBTYPE_WMVP) + || IsEqualGUID(subtype, &MEDIASUBTYPE_WVP2) + || IsEqualGUID(subtype, &MFVideoFormat_WMV_Unknown) + || IsEqualGUID(subtype, &MEDIASUBTYPE_WVC1) + || IsEqualGUID(subtype, &MEDIASUBTYPE_WMV3) + || IsEqualGUID(subtype, &MFVideoFormat_VC1S)) + return TRUE; + return FALSE; +} + +static DWORD subtype_to_compression(const GUID *subtype) +{ + if (IsEqualGUID(subtype, &MEDIASUBTYPE_RGB32) + || IsEqualGUID(subtype, &MEDIASUBTYPE_RGB24) + || IsEqualGUID(subtype, &MEDIASUBTYPE_RGB555) + || IsEqualGUID(subtype, &MEDIASUBTYPE_RGB8)) + return BI_RGB; + else if (IsEqualGUID(subtype, &MEDIASUBTYPE_RGB565)) + return BI_BITFIELDS; + else + return subtype->Data1; +} + +static DWORD subtype_to_bpp(const GUID *subtype) +{ + if (IsEqualGUID(subtype, &MEDIASUBTYPE_RGB8)) + return 8; + else if (IsEqualGUID(subtype, &MEDIASUBTYPE_NV12) + || IsEqualGUID(subtype, &MEDIASUBTYPE_YV12) + || IsEqualGUID(subtype, &MEDIASUBTYPE_IYUV) + || IsEqualGUID(subtype, &MEDIASUBTYPE_I420) + || IsEqualGUID(subtype, &MEDIASUBTYPE_NV11)) + return 12; + else if (IsEqualGUID(subtype, &MEDIASUBTYPE_YUY2) + || IsEqualGUID(subtype, &MEDIASUBTYPE_UYVY) + || IsEqualGUID(subtype, &MEDIASUBTYPE_YVYU) + || IsEqualGUID(subtype, &MEDIASUBTYPE_RGB565) + || IsEqualGUID(subtype, &MEDIASUBTYPE_RGB555)) + return 16; + else if (IsEqualGUID(subtype, &MEDIASUBTYPE_RGB24)) + return 24; + else if (IsEqualGUID(subtype, &MEDIASUBTYPE_RGB32)) + return 32; + else + return 0; +} + static void load_resource(const WCHAR *filename, const BYTE **data, DWORD *length) { HRSRC resource = FindResourceW(NULL, filename, (const WCHAR *)RT_RCDATA); @@ -274,17 +326,19 @@ static void init_dmo_media_type_video(DMO_MEDIA_TYPE *media_type, const GUID *subtype, const LONG width, const LONG height) { VIDEOINFOHEADER *header = (VIDEOINFOHEADER *)(media_type + 1); + BOOL compressed = is_compressed_subtype(subtype); memset(header, 0, sizeof(*header)); header->bmiHeader.biSize = sizeof(header->bmiHeader); header->bmiHeader.biWidth = width; header->bmiHeader.biHeight = height; - header->bmiHeader.biCompression = subtype->Data1; + header->bmiHeader.biBitCount = subtype_to_bpp(subtype); + header->bmiHeader.biCompression = subtype_to_compression(subtype); media_type->majortype = MEDIATYPE_Video; media_type->subtype = *subtype; - media_type->bFixedSizeSamples = FALSE; - media_type->bTemporalCompression = TRUE; + media_type->bFixedSizeSamples = !compressed; + media_type->bTemporalCompression = compressed; media_type->lSampleSize = 0; media_type->formattype = FORMAT_VideoInfo; media_type->pUnk = NULL; @@ -1411,6 +1465,62 @@ static void check_dmo_set_input_type(IMediaObject *media_object, const GUID *sub ok(hr == S_OK, "SetInputType returned %#lx.\n", hr); } +static void check_dmo_set_output_type(IMediaObject *media_object, const GUID *subtype) +{ + DMO_MEDIA_TYPE bad_media_type, *good_media_type; + char buffer[1024]; + DWORD i, flag; + HRESULT hr; + + const DWORD flags[] = {0, 0x4, DMO_SET_TYPEF_CLEAR, DMO_SET_TYPEF_TEST_ONLY, DMO_SET_TYPEF_TEST_ONLY | 0x4}; + + memset(&bad_media_type, 0, sizeof(bad_media_type)); + good_media_type = (DMO_MEDIA_TYPE *)buffer; + init_dmo_media_type_video(good_media_type, subtype, 16, 16); + + /* Test invalid stream index. */ + for (i = 0; i < ARRAY_SIZE(flags); ++i) + { + flag = flags[i]; + hr = IMediaObject_SetOutputType(media_object, 1, NULL, flag); + ok(hr == DMO_E_INVALIDSTREAMINDEX, "SetOutputType returned %#lx for flag %#lx.\n", hr, flag); + hr = IMediaObject_SetOutputType(media_object, 1, &bad_media_type, flag); + ok(hr == DMO_E_INVALIDSTREAMINDEX, "SetOutputType returned %#lx for flag %#lx.\n", hr, flag); + hr = IMediaObject_SetOutputType(media_object, 1, good_media_type, flag); + ok(hr == DMO_E_INVALIDSTREAMINDEX, "SetOutputType returned %#lx for flag %#lx.\n", hr, flag); + } + + /* Test unaccepted type. */ + for (i = 0; i < ARRAY_SIZE(flags); ++i) + { + flag = flags[i]; + if (!(flag & DMO_SET_TYPEF_CLEAR)) + { + hr = IMediaObject_SetOutputType(media_object, 0, NULL, flag); + ok(hr == E_POINTER, "SetOutputType returned %#lx for flag %#lx.\n", hr, flag); + } + hr = IMediaObject_SetOutputType(media_object, 0, &bad_media_type, flag); + ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "SetOutputType returned %#lx for flag %#lx.\n", hr, flag); + } + + /* Test clearing the type. */ + for (i = 0; i < ARRAY_SIZE(flags); ++i) + { + flag = DMO_SET_TYPEF_CLEAR | flags[i]; + hr = IMediaObject_SetOutputType(media_object, 0, NULL, flag); + ok(hr == S_OK, "SetOutputType returned %#lx for flag %#lx.\n", hr, flag); + } + + /* Test accepted type. */ + for (i = 0; i < ARRAY_SIZE(flags); ++i) + { + flag = flags[i]; + hr = IMediaObject_SetOutputType(media_object, 0, good_media_type, flag); + ok(hr == S_OK, "SetOutputType returned %#lx for flag %#lx.\n", hr, flag); + } +} + + static HRESULT WINAPI test_unk_QueryInterface(IUnknown *iface, REFIID riid, void **obj) { if (IsEqualIID(riid, &IID_IUnknown)) @@ -4962,6 +5072,20 @@ static void test_wmv_decoder_media_object(void) todo_wine check_dmo_get_output_type(media_object, expected_output_types, ARRAY_SIZE(expected_output_types)); + /* Test SetOutputType without setting input type. */ + hr = IMediaObject_SetInputType(media_object, 0, NULL, DMO_SET_TYPEF_CLEAR); + ok(hr == S_OK, "SetInputType returned %#lx.\n", hr); + hr = IMediaObject_SetOutputType(media_object, 0, &media_type, 0); + todo_wine + ok(hr == DMO_E_TYPE_NOT_SET, "SetOutputType returned %#lx.\n", hr); + + /* Test SetOutputType after setting input type. */ + init_dmo_media_type_video(input_type, &expected_input_types[0].subtype, 16, 16); + hr = IMediaObject_SetInputType(media_object, 0, input_type, 0); + ok(hr == S_OK, "SetInputType returned %#lx.\n", hr); + todo_wine + check_dmo_set_output_type(media_object, &MEDIASUBTYPE_RGB24); + ret = IMediaObject_Release(media_object); ok(ret == 0, "Release returned %lu\n", ret); CoUninitialize();

1 0

Eric Pouech : kernel32/tests: Test that control characters can be read & stored.
by Alexandre Julliard Dec. 20, 2022

Dec. 20, 2022

Module: wine Branch: master Commit: 26699b363003d8040edca5f0a47de0490c539c8d URL: https://gitlab.winehq.org/wine/wine/-/commit/26699b363003d8040edca5f0a47de0… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Dec 19 18:09:58 2022 +0100 kernel32/tests: Test that control characters can be read & stored. WriteConsole (not in processed mode) and WriteConsoleOutput* functions allow to write control characters, which can then be read back as is. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/kernel32/tests/console.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 1f285faf1e2..f8e39c164d2 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -306,6 +306,7 @@ static void testWriteNotWrappedNotProcessed(HANDLE hCon, COORD sbSize) DWORD len, mode; const char* mytest = "123"; const int mylen = strlen(mytest); + char ctrl_buf[32]; int ret; int p; @@ -336,6 +337,17 @@ static void testWriteNotWrappedNotProcessed(HANDLE hCon, COORD sbSize) ok(SetConsoleCursorPosition(hCon, c) != 0, "Cursor in upper-left-3\n"); ok(WriteConsoleA(hCon, mytest, mylen, &len, NULL) != 0 && len == mylen, "WriteConsole\n"); + + /* test how control chars are handled. */ + c.X = c.Y = 0; + ok(SetConsoleCursorPosition(hCon, c) != 0, "Cursor in upper-left-3\n"); + for (p = 0; p < 32; p++) ctrl_buf[p] = (char)p; + ok(WriteConsoleA(hCon, ctrl_buf, 32, &len, NULL) != 0 && len == 32, "WriteConsole\n"); + for (p = 0; p < 32; p++) + { + c.X = p; c.Y = 0; + okCHAR(hCon, c, (char)p, TEST_ATTRIB); + } } static void testWriteNotWrappedProcessed(HANDLE hCon, COORD sbSize) @@ -2378,6 +2390,19 @@ static void test_WriteConsoleOutputCharacterA(HANDLE output_handle) ret = WriteConsoleOutputCharacterA(output_handle, output, 0, origin, &count); ok(ret == TRUE, "Expected WriteConsoleOutputCharacterA to return TRUE, got %d\n", ret); ok(count == 0, "Expected count to be 0, got %lu\n", count); + + for (i = 1; i < 32; i++) + { + CONSOLE_SCREEN_BUFFER_INFO csbi; + char ch = (char)i; + COORD c = {1, 2}; + + ret = WriteConsoleOutputCharacterA(output_handle, &ch, 1, c, &count); + ok(ret == TRUE, "Expected WriteConsoleOutputCharacterA to return TRUE, got %d\n", ret); + ok(count == 1, "Expected count to be 1, got %lu\n", count); + okCHAR(output_handle, c, (char)i, 7); + ret = GetConsoleScreenBufferInfo(output_handle, &csbi); + } } static void test_WriteConsoleOutputCharacterW(HANDLE output_handle)

1 0

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

Rémi Bernon : user32/tests: Move old GetPointerType tests into test_GetPointerInfo.
by Alexandre Julliard Dec. 19, 2022

Dec. 19, 2022

Module: wine Branch: master Commit: 389bbf8fbbf2dee2a44d3d5a6a22b0b587ea5adb URL: https://gitlab.winehq.org/wine/wine/-/commit/389bbf8fbbf2dee2a44d3d5a6a22b0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Dec 19 11:39:38 2022 +0100 user32/tests: Move old GetPointerType tests into test_GetPointerInfo. --- dlls/user32/tests/input.c | 60 ++++++++++++++++++++--------------------------- 1 file changed, 25 insertions(+), 35 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 06d4f122941..d8b8aeb5b94 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -4446,38 +4446,6 @@ static void test_input_message_source(void) UnregisterClassA( cls.lpszClassName, GetModuleHandleA(0) ); } -static void test_pointer_info(void) -{ - BOOL ret; - POINTER_INPUT_TYPE type = -1; - POINTER_INFO info; - UINT id = 0; - - SetLastError(0xdeadbeef); - ret = pGetPointerType(id, NULL); - ok(!ret, "GetPointerType should have failed.\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, - "expected error ERROR_INVALID_PARAMETER, got %lu.\n", GetLastError()); - - SetLastError(0xdeadbeef); - ret = pGetPointerType(id, &type); - ok(GetLastError() == ERROR_INVALID_PARAMETER, - "expected error ERROR_INVALID_PARAMETER, got %lu.\n", GetLastError()); - ok(!ret, "GetPointerType failed, got type %ld for %u.\n", type, id ); - ok(type == -1, " type %ld\n", type ); - - id = 1; - ret = pGetPointerType(id, &type); - ok(ret, "GetPointerType failed, got type %ld for %u.\n", type, id ); - ok(type == PT_MOUSE, " type %ld\n", type ); - - /* GetPointerInfo always fails unless the app receives WM_POINTER messages. */ - SetLastError(0xdeadbeef); - ret = pGetPointerInfo(id, &info); - ok(!ret, "succeeded.\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %lu.\n", GetLastError()); -} - static void test_UnregisterDeviceNotification(void) { BOOL ret = UnregisterDeviceNotification(NULL); @@ -4617,6 +4585,7 @@ static void test_GetPointerInfo( BOOL mouse_in_pointer_enabled ) { void *invalid_ptr = (void *)0xdeadbeef; POINTER_INFO pointer_info[4]; + POINTER_INPUT_TYPE type; WNDCLASSW cls = { .lpfnWndProc = DefWindowProcW, @@ -4630,6 +4599,27 @@ static void test_GetPointerInfo( BOOL mouse_in_pointer_enabled ) HWND hwnd; BOOL ret; + if (!pGetPointerType) + { + todo_wine + win_skip( "GetPointerType not found, skipping tests\n" ); + return; + } + + SetLastError( 0xdeadbeef ); + ret = pGetPointerType( 1, NULL ); + ok( !ret, "GetPointerType succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "got error %lu\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ret = pGetPointerType( 0xdead, &type ); + todo_wine + ok( !ret, "GetPointerType succeeded\n" ); + todo_wine + ok( GetLastError() == ERROR_INVALID_PARAMETER, "got error %lu\n", GetLastError() ); + ret = pGetPointerType( 1, &type ); + ok( ret, "GetPointerType failed, error %lu\n", GetLastError() ); + ok( type == PT_MOUSE, " type %ld\n", type ); + if (!pGetPointerInfo) { todo_wine @@ -4844,10 +4834,10 @@ START_TEST(input) SetCursorPos( pos.x, pos.y ); - if(pGetPointerType) - test_pointer_info(); + if (pGetPointerType) + test_GetPointerInfo( FALSE ); else - win_skip("GetPointerType is not available\n"); + win_skip( "GetPointerType is not available\n" ); test_UnregisterDeviceNotification();

1 0

Alexandre Julliard : ntdll: Match a timezone change happening at 23:59:59 with the following day.
by Alexandre Julliard Dec. 19, 2022

Dec. 19, 2022

Module: wine Branch: master Commit: 501ac4d496e9fb10fab3ec7c891ae2ce530e2b94 URL: https://gitlab.winehq.org/wine/wine/-/commit/501ac4d496e9fb10fab3ec7c891ae2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 19 16:37:25 2022 +0100 ntdll: Match a timezone change happening at 23:59:59 with the following day. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53595 --- dlls/ntdll/unix/system.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index b9be2f53752..b9762fd278f 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2039,6 +2039,11 @@ static BOOL match_tz_date( const RTL_SYSTEM_TIME *st, const RTL_SYSTEM_TIME *reg if (!reg_st->wYear) /* date in a day-of-week format */ wDay = weekday_to_mday(st->wYear - 1900, reg_st->wDay, reg_st->wMonth - 1, reg_st->wDayOfWeek); + /* special case for 23:59:59.999, match with 0:00:00.000 on the following day */ + if (!reg_st->wYear && reg_st->wHour == 23 && reg_st->wMinute == 59 && + reg_st->wSecond == 59 && reg_st->wMilliseconds == 999) + return (st->wDay == wDay + 1 && !st->wHour && !st->wMinute && !st->wSecond && !st->wMilliseconds); + return (st->wDay == wDay && st->wHour == reg_st->wHour && st->wMinute == reg_st->wMinute &&

1 0

Rémi Bernon : user32/tests: Test GetPointer(Frame)Info(History) behavior.
by Alexandre Julliard Dec. 19, 2022

Dec. 19, 2022

Module: wine Branch: master Commit: 29b437a53ac1551da41d7ff12cb4342079df583f URL: https://gitlab.winehq.org/wine/wine/-/commit/29b437a53ac1551da41d7ff12cb434… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Dec 19 11:39:38 2022 +0100 user32/tests: Test GetPointer(Frame)Info(History) behavior. --- dlls/user32/tests/input.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 73 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index d8b8aeb5b94..bf913b8e6a6 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -59,6 +59,11 @@ #include "wine/test.h" +#define check_member_( file, line, val, exp, fmt, member ) \ + ok_(file, line)( (val).member == (exp).member, "got " #member " " fmt "\n", (val).member ) +#define check_member( val, exp, fmt, member ) \ + check_member_( __FILE__, __LINE__, val, exp, fmt, member ) + /* globals */ static HWND hWndTest; static LONG timetag = 0x10000000; @@ -86,6 +91,9 @@ 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*); +static BOOL (WINAPI *pGetPointerInfoHistory)(UINT32, UINT32*, POINTER_INFO*); +static BOOL (WINAPI *pGetPointerFrameInfo)(UINT32, UINT32*, POINTER_INFO*); +static BOOL (WINAPI *pGetPointerFrameInfoHistory)(UINT32, UINT32*, UINT32*, POINTER_INFO*); static int (WINAPI *pGetMouseMovePointsEx) (UINT, LPMOUSEMOVEPOINT, LPMOUSEMOVEPOINT, int, DWORD); static UINT (WINAPI *pGetRawInputDeviceList) (PRAWINPUTDEVICELIST, PUINT, UINT); static UINT (WINAPI *pGetRawInputDeviceInfoW) (HANDLE, UINT, void *, UINT *); @@ -156,6 +164,9 @@ static void init_function_pointers(void) GET_PROC(GetCurrentInputMessageSource); GET_PROC(GetMouseMovePointsEx); GET_PROC(GetPointerInfo); + GET_PROC(GetPointerInfoHistory); + GET_PROC(GetPointerFrameInfo); + GET_PROC(GetPointerFrameInfoHistory); GET_PROC(GetPointerType); GET_PROC(GetRawInputDeviceList); GET_PROC(GetRawInputDeviceInfoW); @@ -4562,6 +4573,31 @@ static void test_SendInput(void) DestroyWindow( hwnd ); } +#define check_pointer_info( a, b ) check_pointer_info_( __LINE__, a, b ) +static void check_pointer_info_( int line, const POINTER_INFO *actual, const POINTER_INFO *expected ) +{ + check_member( *actual, *expected, "%#lx", pointerType ); + check_member( *actual, *expected, "%#x", pointerId ); + check_member( *actual, *expected, "%#x", frameId ); + check_member( *actual, *expected, "%#x", pointerFlags ); + check_member( *actual, *expected, "%p", sourceDevice ); + check_member( *actual, *expected, "%p", hwndTarget ); + check_member( *actual, *expected, "%+ld", ptPixelLocation.x ); + check_member( *actual, *expected, "%+ld", ptPixelLocation.y ); + check_member( *actual, *expected, "%+ld", ptHimetricLocation.x ); + check_member( *actual, *expected, "%+ld", ptHimetricLocation.y ); + check_member( *actual, *expected, "%+ld", ptPixelLocationRaw.x ); + check_member( *actual, *expected, "%+ld", ptPixelLocationRaw.y ); + check_member( *actual, *expected, "%+ld", ptHimetricLocationRaw.x ); + check_member( *actual, *expected, "%+ld", ptHimetricLocationRaw.y ); + check_member( *actual, *expected, "%lu", dwTime ); + check_member( *actual, *expected, "%u", historyCount ); + check_member( *actual, *expected, "%#x", InputData ); + check_member( *actual, *expected, "%#lx", dwKeyStates ); + check_member( *actual, *expected, "%I64u", PerformanceCount ); + check_member( *actual, *expected, "%#x", ButtonChangeType ); +} + static DWORD CALLBACK test_GetPointerInfo_thread( void *arg ) { POINTER_INFO pointer_info; @@ -4583,8 +4619,9 @@ static DWORD CALLBACK test_GetPointerInfo_thread( void *arg ) static void test_GetPointerInfo( BOOL mouse_in_pointer_enabled ) { + POINTER_INFO pointer_info[4], expect_pointer; void *invalid_ptr = (void *)0xdeadbeef; - POINTER_INFO pointer_info[4]; + UINT32 entry_count, pointer_count; POINTER_INPUT_TYPE type; WNDCLASSW cls = { @@ -4712,6 +4749,41 @@ static void test_GetPointerInfo( BOOL mouse_in_pointer_enabled ) res = WaitForSingleObject( thread, 5000 ); ok( !res, "WaitForSingleObject returned %#lx, error %lu\n", res, GetLastError() ); + expect_pointer = pointer_info[0]; + + memset( pointer_info, 0xa5, sizeof(pointer_info) ); + entry_count = pointer_count = 2; + if (!pGetPointerFrameInfo) ret = FALSE; + else ret = pGetPointerFrameInfo( 1, &pointer_count, pointer_info ); + todo_wine_if(!pGetPointerFrameInfo) + ok( ret, "GetPointerFrameInfo failed, error %lu\n", GetLastError() ); + todo_wine_if(!pGetPointerFrameInfo) + ok( pointer_count == 1, "got pointer_count %u\n", pointer_count ); + todo_wine_if(!pGetPointerFrameInfo) + check_pointer_info( &pointer_info[0], &expect_pointer ); + memset( pointer_info, 0xa5, sizeof(pointer_info) ); + entry_count = pointer_count = 2; + if (!pGetPointerInfoHistory) ret = FALSE; + else ret = pGetPointerInfoHistory( 1, &entry_count, pointer_info ); + todo_wine_if(!pGetPointerInfoHistory) + ok( ret, "GetPointerInfoHistory failed, error %lu\n", GetLastError() ); + todo_wine_if(!pGetPointerInfoHistory) + ok( entry_count == 1, "got entry_count %u\n", entry_count ); + todo_wine_if(!pGetPointerInfoHistory) + check_pointer_info( &pointer_info[0], &expect_pointer ); + memset( pointer_info, 0xa5, sizeof(pointer_info) ); + entry_count = pointer_count = 2; + if (!pGetPointerFrameInfoHistory) ret = FALSE; + else ret = pGetPointerFrameInfoHistory( 1, &entry_count, &pointer_count, pointer_info ); + todo_wine_if(!pGetPointerFrameInfoHistory) + ok( ret, "GetPointerFrameInfoHistory failed, error %lu\n", GetLastError() ); + todo_wine_if(!pGetPointerFrameInfoHistory) + ok( entry_count == 1, "got pointer_count %u\n", pointer_count ); + todo_wine_if(!pGetPointerFrameInfoHistory) + ok( pointer_count == 1, "got pointer_count %u\n", pointer_count ); + todo_wine_if(!pGetPointerFrameInfoHistory) + check_pointer_info( &pointer_info[0], &expect_pointer ); + DestroyWindow( hwnd ); ret = UnregisterClassW( L"test", GetModuleHandleW( NULL ) );

1 0

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

Dec. 19, 2022

Module: wine Branch: master Commit: d4aaf273337dfea7a08db51d3c47df78fe22fc94 URL: https://gitlab.winehq.org/wine/wine/-/commit/d4aaf273337dfea7a08db51d3c47df… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Dec 19 11:39:38 2022 +0100 user32/tests: Test GetPointerInfo behavior with EnableMouseInPointer. --- dlls/user32/tests/input.c | 136 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 136 insertions(+) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 3f9ad8b184f..06d4f122941 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -4594,6 +4594,140 @@ static void test_SendInput(void) DestroyWindow( hwnd ); } +static DWORD CALLBACK test_GetPointerInfo_thread( void *arg ) +{ + POINTER_INFO pointer_info; + HWND hwnd; + BOOL ret; + + hwnd = CreateWindowW( L"test", L"test name", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 100, 100, 200, + 200, 0, 0, NULL, 0 ); + + memset( &pointer_info, 0xcd, sizeof(pointer_info) ); + ret = pGetPointerInfo( 1, &pointer_info ); + ok( !ret, "GetPointerInfo succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "got error %lu\n", GetLastError() ); + + DestroyWindow( hwnd ); + + return 0; +} + +static void test_GetPointerInfo( BOOL mouse_in_pointer_enabled ) +{ + void *invalid_ptr = (void *)0xdeadbeef; + POINTER_INFO pointer_info[4]; + WNDCLASSW cls = + { + .lpfnWndProc = DefWindowProcW, + .hInstance = GetModuleHandleW( NULL ), + .hbrBackground = GetStockObject( WHITE_BRUSH ), + .lpszClassName = L"test", + }; + HANDLE thread; + ATOM class; + DWORD res; + HWND hwnd; + BOOL ret; + + if (!pGetPointerInfo) + { + todo_wine + win_skip( "GetPointerInfo not found, skipping tests\n" ); + return; + } + + class = RegisterClassW( &cls ); + ok( class, "RegisterClassW failed: %lu\n", GetLastError() ); + + ret = pGetPointerInfo( 1, invalid_ptr ); + ok( !ret, "GetPointerInfo succeeded\n" ); + todo_wine + ok( GetLastError() == ERROR_NOACCESS || broken(GetLastError() == ERROR_INVALID_PARAMETER) /* w10 32bit */, + "got error %lu\n", GetLastError() ); + + memset( pointer_info, 0xcd, sizeof(pointer_info) ); + ret = pGetPointerInfo( 1, pointer_info ); + ok( !ret, "GetPointerInfo succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "got error %lu\n", GetLastError() ); + + SetCursorPos( 500, 500 ); /* avoid generating mouse message on window creation */ + + hwnd = CreateWindowW( L"test", L"test name", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 100, 100, 200, + 200, 0, 0, NULL, 0 ); + empty_message_queue(); + + memset( pointer_info, 0xcd, sizeof(pointer_info) ); + ret = pGetPointerInfo( 1, pointer_info ); + ok( !ret, "GetPointerInfo succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "got error %lu\n", GetLastError() ); + + SetCursorPos( 200, 200 ); + empty_message_queue(); + mouse_event( MOUSEEVENTF_LEFTDOWN, 0, 0, 0, 0 ); + empty_message_queue(); + mouse_event( MOUSEEVENTF_LEFTUP, 0, 0, 0, 0 ); + empty_message_queue(); + mouse_event( MOUSEEVENTF_MOVE, 10, 10, 0, 0 ); + empty_message_queue(); + + memset( pointer_info, 0xcd, sizeof(pointer_info) ); + ret = pGetPointerInfo( 0xdead, pointer_info ); + ok( !ret, "GetPointerInfo succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "got error %lu\n", GetLastError() ); + + memset( pointer_info, 0xcd, sizeof(pointer_info) ); + ret = pGetPointerInfo( 1, pointer_info ); + todo_wine_if(mouse_in_pointer_enabled) + ok( ret == mouse_in_pointer_enabled, "GetPointerInfo failed, error %lu\n", GetLastError() ); + if (!mouse_in_pointer_enabled) + { + ok( GetLastError() == ERROR_INVALID_PARAMETER, "got error %lu\n", GetLastError() ); + return; + } + + todo_wine + ok( pointer_info[0].pointerType == PT_MOUSE, "got pointerType %lu\n", pointer_info[0].pointerType ); + todo_wine + ok( pointer_info[0].pointerId == 1, "got pointerId %u\n", pointer_info[0].pointerId ); + ok( !!pointer_info[0].frameId, "got frameId %u\n", pointer_info[0].frameId ); + todo_wine + ok( pointer_info[0].pointerFlags == (0x20000 | POINTER_MESSAGE_FLAG_INRANGE | POINTER_MESSAGE_FLAG_PRIMARY), + "got pointerFlags %#x\n", pointer_info[0].pointerFlags ); + todo_wine + ok( pointer_info[0].sourceDevice == INVALID_HANDLE_VALUE || broken(!!pointer_info[0].sourceDevice) /* < w10 & 32bit */, + "got sourceDevice %p\n", pointer_info[0].sourceDevice ); + todo_wine + ok( pointer_info[0].hwndTarget == hwnd, "got hwndTarget %p\n", pointer_info[0].hwndTarget ); + ok( !!pointer_info[0].ptPixelLocation.x, "got ptPixelLocation %s\n", wine_dbgstr_point( &pointer_info[0].ptPixelLocation ) ); + ok( !!pointer_info[0].ptPixelLocation.y, "got ptPixelLocation %s\n", wine_dbgstr_point( &pointer_info[0].ptPixelLocation ) ); + ok( !!pointer_info[0].ptHimetricLocation.x, "got ptHimetricLocation %s\n", wine_dbgstr_point( &pointer_info[0].ptHimetricLocation ) ); + ok( !!pointer_info[0].ptHimetricLocation.y, "got ptHimetricLocation %s\n", wine_dbgstr_point( &pointer_info[0].ptHimetricLocation ) ); + ok( !!pointer_info[0].ptPixelLocationRaw.x, "got ptPixelLocationRaw %s\n", wine_dbgstr_point( &pointer_info[0].ptPixelLocationRaw ) ); + ok( !!pointer_info[0].ptPixelLocationRaw.y, "got ptPixelLocationRaw %s\n", wine_dbgstr_point( &pointer_info[0].ptPixelLocationRaw ) ); + ok( !!pointer_info[0].ptHimetricLocationRaw.x, "got ptHimetricLocationRaw %s\n", wine_dbgstr_point( &pointer_info[0].ptHimetricLocationRaw ) ); + ok( !!pointer_info[0].ptHimetricLocationRaw.y, "got ptHimetricLocationRaw %s\n", wine_dbgstr_point( &pointer_info[0].ptHimetricLocationRaw ) ); + ok( !!pointer_info[0].dwTime, "got dwTime %lu\n", pointer_info[0].dwTime ); + todo_wine + ok( pointer_info[0].historyCount == 1, "got historyCount %u\n", pointer_info[0].historyCount ); + todo_wine + ok( pointer_info[0].InputData == 0, "got InputData %u\n", pointer_info[0].InputData ); + todo_wine + ok( pointer_info[0].dwKeyStates == 0, "got dwKeyStates %lu\n", pointer_info[0].dwKeyStates ); + ok( !!pointer_info[0].PerformanceCount, "got PerformanceCount %I64u\n", pointer_info[0].PerformanceCount ); + todo_wine + ok( pointer_info[0].ButtonChangeType == 0, "got ButtonChangeType %u\n", pointer_info[0].ButtonChangeType ); + + thread = CreateThread( NULL, 0, test_GetPointerInfo_thread, NULL, 0, NULL ); + res = WaitForSingleObject( thread, 5000 ); + ok( !res, "WaitForSingleObject returned %#lx, error %lu\n", res, GetLastError() ); + + DestroyWindow( hwnd ); + + ret = UnregisterClassW( L"test", GetModuleHandleW( NULL ) ); + ok( ret, "UnregisterClassW failed: %lu\n", GetLastError() ); +} + static void test_EnableMouseInPointer_process( const char *arg ) { DWORD enable = strtoul( arg, 0, 10 ); @@ -4620,6 +4754,8 @@ static void test_EnableMouseInPointer_process( const char *arg ) else ret = pIsMouseInPointerEnabled(); todo_wine_if(!pIsMouseInPointerEnabled) ok( ret == enable, "IsMouseInPointerEnabled returned %u, error %lu\n", ret, GetLastError() ); + + test_GetPointerInfo( enable ); } static void test_EnableMouseInPointer( char **argv, BOOL enable )

1 0

Rémi Bernon : dinput/tests: Wait for each device interface to start / stop.
by Alexandre Julliard Dec. 19, 2022

Dec. 19, 2022

Module: wine Branch: master Commit: eefc7a86ac4f38d71017a83e7b14f3f61206898f URL: https://gitlab.winehq.org/wine/wine/-/commit/eefc7a86ac4f38d71017a83e7b14f3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Dec 19 11:39:38 2022 +0100 dinput/tests: Wait for each device interface to start / stop. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=53525 --- dlls/dinput/tests/dinput_test.h | 1 - dlls/dinput/tests/hid.c | 64 ++++++++++++++++++++++++----------------- 2 files changed, 37 insertions(+), 28 deletions(-) diff --git a/dlls/dinput/tests/dinput_test.h b/dlls/dinput/tests/dinput_test.h index a5b02b98a3e..e25314f6224 100644 --- a/dlls/dinput/tests/dinput_test.h +++ b/dlls/dinput/tests/dinput_test.h @@ -50,7 +50,6 @@ extern const GUID expect_guid_product; extern const WCHAR expect_path[]; extern const WCHAR expect_path_end[]; -extern HANDLE device_added, device_removed; extern HINSTANCE instance; extern BOOL localized; /* object names get translated */ diff --git a/dlls/dinput/tests/hid.c b/dlls/dinput/tests/hid.c index a2b76953596..5200892e95b 100644 --- a/dlls/dinput/tests/hid.c +++ b/dlls/dinput/tests/hid.c @@ -74,8 +74,7 @@ const WCHAR expect_vidpid_str[] = L"VID_1209&PID_0001"; const GUID expect_guid_product = {EXPECT_VIDPID, 0x0000, 0x0000, {0x00, 0x00, 'P', 'I', 'D', 'V', 'I', 'D'}}; const WCHAR expect_path[] = L"\\\\?\\hid#vid_1209&pid_0001#2&"; const WCHAR expect_path_end[] = L"&0000#{4d1e55b2-f16f-11cf-88cb-001111000030}"; -HANDLE device_added, device_removed; -static LONG device_added_count; +static HANDLE device_added, device_removed; static struct winetest_shared_data *test_data; static HANDLE monitor_thread, monitor_stop; @@ -710,9 +709,7 @@ BOOL bus_device_start(void) void hid_device_stop( struct hid_device_desc *desc, UINT count ) { HANDLE control; - DWORD ret; - - ResetEvent( device_removed ); + DWORD ret, i; control = CreateFileW( L"\\\\?\\root#winetest#0#{deadbeef-29ef-4538-a5fd-b69573a362c0}", 0, 0, NULL, OPEN_EXISTING, 0, NULL ); @@ -721,9 +718,15 @@ void hid_device_stop( struct hid_device_desc *desc, UINT count ) ok( ret || GetLastError() == ERROR_FILE_NOT_FOUND, "IOCTL_WINETEST_REMOVE_DEVICE failed, last error %lu\n", GetLastError() ); CloseHandle( control ); - if (ret) + if (!ret) return; + + ret = WaitForSingleObject( device_removed, 5000 ); + ok( !ret, "WaitForSingleObject returned %#lx\n", ret ); + + for (i = 0; i < count; ++i) { - ret = WaitForSingleObject( device_removed, 5000 ); + ret = WaitForSingleObject( device_removed, i > 0 ? 500 : 5000 ); + todo_wine_if(i > 0) ok( !ret, "WaitForSingleObject returned %#lx\n", ret ); } } @@ -731,9 +734,7 @@ void hid_device_stop( struct hid_device_desc *desc, UINT count ) BOOL hid_device_start( struct hid_device_desc *desc, UINT count ) { HANDLE control; - DWORD ret; - - ResetEvent( device_added ); + DWORD ret, i; control = CreateFileW( L"\\\\?\\root#winetest#0#{deadbeef-29ef-4538-a5fd-b69573a362c0}", 0, 0, NULL, OPEN_EXISTING, 0, NULL ); @@ -745,6 +746,15 @@ BOOL hid_device_start( struct hid_device_desc *desc, UINT count ) ret = WaitForSingleObject( device_added, 5000 ); ok( !ret, "WaitForSingleObject returned %#lx\n", ret ); + if (ret) return FALSE; + + for (i = 0; i < count; ++i) + { + ret = WaitForSingleObject( device_added, 1000 ); + todo_wine_if(i > 0) + ok( !ret, "WaitForSingleObject returned %#lx\n", ret ); + } + return TRUE; } @@ -2609,8 +2619,7 @@ static void test_hid_device( DWORD report_id, DWORD polled, const HIDP_CAPS *exp /* Win7 has a spurious device removal event with polled HID devices */ if (!polled || !strcmp(winetest_platform, "wine")) ret = WAIT_TIMEOUT; - else ret = WaitForSingleObject( device_removed, 2000 ); - if (!ret && InterlockedOr( &device_added_count, 0 ) == 1) + else if (!(ret = WaitForSingleObject( device_removed, 2000 ))) { ret = WaitForSingleObject( device_added, 5000 ); ok( !ret, "WaitForSingleObject returned %#lx\n", ret ); @@ -3513,13 +3522,14 @@ static LRESULT CALLBACK monitor_wndproc( HWND hwnd, UINT msg, WPARAM wparam, LPA if (msg == WM_DEVICECHANGE) { DEV_BROADCAST_DEVICEINTERFACE_W *iface = (DEV_BROADCAST_DEVICEINTERFACE_W *)lparam; - if (wparam == DBT_DEVICEREMOVECOMPLETE && IsEqualGUID( &iface->dbcc_classguid, &control_class )) - SetEvent( device_removed ); - if (wparam == DBT_DEVICEARRIVAL && IsEqualGUID( &iface->dbcc_classguid, &GUID_DEVINTERFACE_HID )) - { - InterlockedIncrement( &device_added_count ); - SetEvent( device_added ); - } + + if (!IsEqualGUID( &iface->dbcc_classguid, &control_class ) && !IsEqualGUID( &iface->dbcc_classguid, &GUID_DEVINTERFACE_HID )) + return DefWindowProcW( hwnd, msg, wparam, lparam ); + if (!wcsnicmp( iface->dbcc_name, L"\\\\?\\root#winetest", 17 )) + return DefWindowProcW( hwnd, msg, wparam, lparam ); + + if (wparam == DBT_DEVICEREMOVECOMPLETE) ReleaseSemaphore( device_removed, 1, NULL ); + if (wparam == DBT_DEVICEARRIVAL) ReleaseSemaphore( device_added, 1, NULL ); } return DefWindowProcW( hwnd, msg, wparam, lparam ); @@ -3572,10 +3582,10 @@ void dinput_test_init_( const char *file, int line ) monitor_stop = CreateEventW( NULL, FALSE, FALSE, NULL ); ok_(file, line)( !!monitor_stop, "CreateEventW failed, error %lu\n", GetLastError() ); - device_added = CreateEventW( NULL, FALSE, FALSE, NULL ); - ok_(file, line)( !!device_added, "CreateEventW failed, error %lu\n", GetLastError() ); - device_removed = CreateEventW( NULL, FALSE, FALSE, NULL ); - ok_(file, line)( !!device_removed, "CreateEventW failed, error %lu\n", GetLastError() ); + device_added = CreateSemaphoreW( NULL, 0, LONG_MAX, NULL ); + ok_(file, line)( !!device_added, "CreateSemaphoreW failed, error %lu\n", GetLastError() ); + device_removed = CreateSemaphoreW( NULL, 0, LONG_MAX, NULL ); + ok_(file, line)( !!device_removed, "CreateSemaphoreW failed, error %lu\n", GetLastError() ); monitor_thread = CreateThread( NULL, 0, monitor_thread_proc, monitor_stop, 0, NULL ); ok_(file, line)( !!monitor_thread, "CreateThread failed, error %lu\n", GetLastError() ); @@ -3831,8 +3841,6 @@ static void test_bus_driver(void) desc.report_descriptor_len = sizeof(report_desc); memcpy( desc.report_descriptor_buf, report_desc, sizeof(report_desc) ); - ResetEvent( device_added ); - control = CreateFileW( L"\\\\?\\root#winetest#0#{deadbeef-29ef-4538-a5fd-b69573a362c0}", 0, 0, NULL, OPEN_EXISTING, 0, NULL ); ok( control != INVALID_HANDLE_VALUE, "CreateFile failed, error %lu\n", GetLastError() ); @@ -3841,19 +3849,21 @@ static void test_bus_driver(void) ret = WaitForSingleObject( device_added, 5000 ); ok( !ret, "WaitForSingleObject returned %#lx\n", ret ); + ret = WaitForSingleObject( device_added, 1000 ); + ok( !ret, "WaitForSingleObject returned %#lx\n", ret ); swprintf( device_path, MAX_PATH, L"\\\\?\\hid#vid_%04x&pid_%04x", LOWORD(EXPECT_VIDPID), HIWORD(EXPECT_VIDPID) ); ret = find_hid_device_path( device_path ); ok( ret, "Failed to find HID device matching %s\n", debugstr_w(device_path) ); - ResetEvent( device_removed ); - ret = sync_ioctl( control, IOCTL_WINETEST_REMOVE_DEVICE, &desc, sizeof(desc), NULL, 0, 5000 ); ok( ret, "IOCTL_WINETEST_REMOVE_DEVICE failed, last error %lu\n", GetLastError() ); CloseHandle( control ); ret = WaitForSingleObject( device_removed, 5000 ); ok( !ret, "WaitForSingleObject returned %#lx\n", ret ); + ret = WaitForSingleObject( device_removed, 1000 ); + ok( !ret, "WaitForSingleObject returned %#lx\n", ret ); done: bus_device_stop();

1 0

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

Dec. 19, 2022

Module: wine Branch: master Commit: 73d6140d7134ac39a13710a71b3356df110a1324 URL: https://gitlab.winehq.org/wine/wine/-/commit/73d6140d7134ac39a13710a71b3356… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Dec 19 11:39:38 2022 +0100 user32/tests: Test EnableMouseInPointer behavior. --- dlls/user32/tests/input.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 86c88520eeb..fde5aedeb4a 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -81,6 +81,7 @@ static struct { BOOL sendinput_broken; } key_status; +static BOOL (WINAPI *pEnableMouseInPointer)( BOOL ); static BOOL (WINAPI *pGetCurrentInputMessageSource)( INPUT_MESSAGE_SOURCE *source ); static BOOL (WINAPI *pGetPointerType)(UINT32, POINTER_INPUT_TYPE*); static BOOL (WINAPI *pGetPointerInfo)(UINT32, POINTER_INFO*); @@ -149,6 +150,7 @@ static void init_function_pointers(void) if (!(p ## func = (void*)GetProcAddress(hdll, #func))) \ trace("GetProcAddress(%s) failed\n", #func) + GET_PROC(EnableMouseInPointer); GET_PROC(GetCurrentInputMessageSource); GET_PROC(GetMouseMovePointsEx); GET_PROC(GetPointerInfo); @@ -4590,6 +4592,43 @@ static void test_SendInput(void) DestroyWindow( hwnd ); } +static void test_EnableMouseInPointer_process( const char *arg ) +{ + DWORD enable = strtoul( arg, 0, 10 ); + BOOL ret; + + ret = pEnableMouseInPointer( enable ); + todo_wine + ok( ret, "EnableMouseInPointer failed, error %lu\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = pEnableMouseInPointer( !enable ); + ok( !ret, "EnableMouseInPointer succeeded\n" ); + todo_wine + ok( GetLastError() == ERROR_ACCESS_DENIED, "got error %lu\n", GetLastError() ); + + ret = pEnableMouseInPointer( enable ); + todo_wine + ok( ret, "EnableMouseInPointer failed, error %lu\n", GetLastError() ); +} + +static void test_EnableMouseInPointer( char **argv, BOOL enable ) +{ + STARTUPINFOA startup = {.cb = sizeof(STARTUPINFOA)}; + PROCESS_INFORMATION info = {0}; + char cmdline[MAX_PATH * 2]; + BOOL ret; + + sprintf( cmdline, "%s %s EnableMouseInPointer %u", argv[0], argv[1], enable ); + ret = CreateProcessA( NULL, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &info ); + ok( ret, "CreateProcessA failed, error %lu\n", GetLastError() ); + if (!ret) return; + + wait_child_process( info.hProcess ); + CloseHandle( info.hThread ); + CloseHandle( info.hProcess ); +} + START_TEST(input) { char **argv; @@ -4612,6 +4651,14 @@ START_TEST(input) return; } + if (argc >= 4 && strcmp( argv[2], "EnableMouseInPointer" ) == 0) + { + winetest_push_context( "enable %s", argv[3] ); + test_EnableMouseInPointer_process( argv[3] ); + winetest_pop_context(); + return; + } + test_SendInput(); test_Input_blackbox(); test_Input_whitebox(); @@ -4657,4 +4704,12 @@ START_TEST(input) win_skip("GetPointerType is not available\n"); test_UnregisterDeviceNotification(); + + if (!pEnableMouseInPointer) + win_skip( "EnableMouseInPointer not found, skipping tests\n" ); + else + { + test_EnableMouseInPointer( argv, FALSE ); + test_EnableMouseInPointer( argv, TRUE ); + } }

1 0

Rémi Bernon : dinput/tests: Add a device count parameter to hid_device_(start|stop).
by Alexandre Julliard Dec. 19, 2022

Dec. 19, 2022

Module: wine Branch: master Commit: 2bae0cb5f2abb01b61f3ed549bb83b5dc017d8ab URL: https://gitlab.winehq.org/wine/wine/-/commit/2bae0cb5f2abb01b61f3ed549bb83b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Dec 19 11:39:38 2022 +0100 dinput/tests: Add a device count parameter to hid_device_(start|stop). --- dlls/dinput/tests/dinput_test.h | 4 ++-- dlls/dinput/tests/force_feedback.c | 12 ++++++------ dlls/dinput/tests/hid.c | 20 +++++++++---------- dlls/dinput/tests/hotplug.c | 8 ++++---- dlls/dinput/tests/joystick8.c | 40 +++++++++++++++++++------------------- 5 files changed, 42 insertions(+), 42 deletions(-)

1 0

Rémi Bernon : dinput/tests: Use semaphores to count and notify rawinput messages.
by Alexandre Julliard Dec. 19, 2022

Dec. 19, 2022

Module: wine Branch: master Commit: 15630ab443ca826226eafd25cfb0837caf7fd974 URL: https://gitlab.winehq.org/wine/wine/-/commit/15630ab443ca826226eafd25cfb083… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Dec 19 11:39:38 2022 +0100 dinput/tests: Use semaphores to count and notify rawinput messages. --- dlls/dinput/tests/dinput_test.h | 3 ++ dlls/dinput/tests/hotplug.c | 22 ++++++------ dlls/dinput/tests/joystick8.c | 78 ++++++++++++++++++++++++++++------------- 3 files changed, 67 insertions(+), 36 deletions(-)

1 0

Rémi Bernon : dinput/tests: Avoid using INFINITE timeouts.
by Alexandre Julliard Dec. 19, 2022

Dec. 19, 2022

Module: wine Branch: master Commit: 43814ac480536cc676d21bfc848d41c0ca474510 URL: https://gitlab.winehq.org/wine/wine/-/commit/43814ac480536cc676d21bfc848d41… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Dec 19 11:39:38 2022 +0100 dinput/tests: Avoid using INFINITE timeouts. --- dlls/dinput/tests/force_feedback.c | 3 +- dlls/dinput/tests/hid.c | 87 +++++++++++++++++++++++--------------- dlls/dinput/tests/hotplug.c | 45 +++++++++++++------- dlls/dinput/tests/joystick8.c | 10 +++-- 4 files changed, 90 insertions(+), 55 deletions(-)

1 0

Huw Davies : ntdll: Only compile get_current_teb() on linux.
by Alexandre Julliard Dec. 19, 2022

Dec. 19, 2022

Module: wine Branch: master Commit: c28258039b0f9d51afc1eade239e450b8a29b587 URL: https://gitlab.winehq.org/wine/wine/-/commit/c28258039b0f9d51afc1eade239e45… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Dec 19 09:35:41 2022 +0000 ntdll: Only compile get_current_teb() on linux. --- dlls/ntdll/unix/signal_x86_64.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 18de58fd713..15d1a3539a1 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -440,12 +440,14 @@ static inline struct amd64_thread_data *amd64_thread_data(void) return (struct amd64_thread_data *)ntdll_get_thread_data()->cpu_data; } +#ifdef __linux__ static inline TEB *get_current_teb(void) { unsigned long rsp; __asm__( "movq %%rsp,%0" : "=r" (rsp) ); return (TEB *)(rsp & ~signal_stack_mask); } +#endif static BOOL is_inside_syscall( const ucontext_t *sigcontext ) {

1 0

Rémi Bernon : hidclass.sys: Make sure a desktop is created for the driver process.
by Alexandre Julliard Dec. 19, 2022

Dec. 19, 2022

Module: wine Branch: master Commit: 5225aabd07010aa9fb11f7c490d63046ff178da5 URL: https://gitlab.winehq.org/wine/wine/-/commit/5225aabd07010aa9fb11f7c490d630… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Dec 19 11:39:38 2022 +0100 hidclass.sys: Make sure a desktop is created for the driver process. This was previously automatically done when user32 was loaded, but since the move of __wine_send_input to win32u, we do not need to load it any more. Make sure we have a desktop or WM_INPUT messages won't be sent by wineserver. --- dlls/hidclass.sys/pnp.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index 46b6e803465..c0e2a874788 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -599,6 +599,10 @@ NTSTATUS WINAPI HidRegisterMinidriver(HID_MINIDRIVER_REGISTRATION *registration) { minidriver *driver; + /* make sure we have a window station and a desktop, we need one to send input */ + if (!GetProcessWindowStation()) + return STATUS_INVALID_PARAMETER; + if (!(driver = calloc(1, sizeof(*driver)))) return STATUS_NO_MEMORY;

1 0

Rémi Bernon : dinput/tests: Unregister rawinput devices after tests.
by Alexandre Julliard Dec. 19, 2022

Dec. 19, 2022

Module: wine Branch: master Commit: 4a5c9f7dc6b4b27cca19b780927e75adfdca0d86 URL: https://gitlab.winehq.org/wine/wine/-/commit/4a5c9f7dc6b4b27cca19b780927e75… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Dec 19 11:39:38 2022 +0100 dinput/tests: Unregister rawinput devices after tests. --- dlls/dinput/tests/device8.c | 52 +++++++++++++++++++++++++++++---------------- 1 file changed, 34 insertions(+), 18 deletions(-) diff --git a/dlls/dinput/tests/device8.c b/dlls/dinput/tests/device8.c index e779b56092a..b98a24df080 100644 --- a/dlls/dinput/tests/device8.c +++ b/dlls/dinput/tests/device8.c @@ -1103,9 +1103,9 @@ static void test_mouse_keyboard(void) todo_wine ok(hr == 1, "GetRegisteredRawInputDevices returned %ld, raw_devices_count: %d\n", hr, raw_devices_count); todo_wine - ok(raw_devices[0].usUsagePage == 1, "Unexpected raw device usage page: %x\n", raw_devices[0].usUsagePage); + ok(raw_devices[0].usUsagePage == HID_USAGE_PAGE_GENERIC, "got usUsagePage: %x\n", raw_devices[0].usUsagePage); todo_wine - ok(raw_devices[0].usUsage == 6, "Unexpected raw device usage: %x\n", raw_devices[0].usUsage); + ok(raw_devices[0].usUsage == HID_USAGE_GENERIC_KEYBOARD, "got usUsage: %x\n", raw_devices[0].usUsage); todo_wine ok(raw_devices[0].dwFlags == RIDEV_INPUTSINK, "Unexpected raw device flags: %#lx\n", raw_devices[0].dwFlags); todo_wine @@ -1137,8 +1137,8 @@ static void test_mouse_keyboard(void) memset(raw_devices, 0, sizeof(raw_devices)); hr = GetRegisteredRawInputDevices(raw_devices, &raw_devices_count, sizeof(RAWINPUTDEVICE)); ok(hr == 1, "GetRegisteredRawInputDevices returned %ld, raw_devices_count: %d\n", hr, raw_devices_count); - ok(raw_devices[0].usUsagePage == 1, "Unexpected raw device usage page: %x\n", raw_devices[0].usUsagePage); - ok(raw_devices[0].usUsage == 2, "Unexpected raw device usage: %x\n", raw_devices[0].usUsage); + ok(raw_devices[0].usUsagePage == HID_USAGE_PAGE_GENERIC, "got usUsagePage: %x\n", raw_devices[0].usUsagePage); + ok(raw_devices[0].usUsage == HID_USAGE_GENERIC_MOUSE, "got usUsage: %x\n", raw_devices[0].usUsage); ok(raw_devices[0].dwFlags == RIDEV_INPUTSINK, "Unexpected raw device flags: %#lx\n", raw_devices[0].dwFlags); todo_wine ok(raw_devices[0].hwndTarget == di_hwnd, "Unexpected raw device target: %p\n", raw_devices[0].hwndTarget); @@ -1152,16 +1152,16 @@ static void test_mouse_keyboard(void) di_hwnd = raw_devices[0].hwndTarget; /* expect dinput8 to take over any activated raw input devices */ - raw_devices[0].usUsagePage = 0x01; - raw_devices[0].usUsage = 0x05; + raw_devices[0].usUsagePage = HID_USAGE_PAGE_GENERIC; + raw_devices[0].usUsage = HID_USAGE_GENERIC_GAMEPAD; raw_devices[0].dwFlags = 0; raw_devices[0].hwndTarget = hwnd; - raw_devices[1].usUsagePage = 0x01; - raw_devices[1].usUsage = 0x06; + raw_devices[1].usUsagePage = HID_USAGE_PAGE_GENERIC; + raw_devices[1].usUsage = HID_USAGE_GENERIC_KEYBOARD; raw_devices[1].dwFlags = 0; raw_devices[1].hwndTarget = hwnd; - raw_devices[2].usUsagePage = 0x01; - raw_devices[2].usUsage = 0x02; + raw_devices[2].usUsagePage = HID_USAGE_PAGE_GENERIC; + raw_devices[2].usUsage = HID_USAGE_GENERIC_MOUSE; raw_devices[2].dwFlags = 0; raw_devices[2].hwndTarget = hwnd; raw_devices_count = ARRAY_SIZE(raw_devices); @@ -1176,16 +1176,16 @@ static void test_mouse_keyboard(void) memset(raw_devices, 0, sizeof(raw_devices)); hr = GetRegisteredRawInputDevices(raw_devices, &raw_devices_count, sizeof(RAWINPUTDEVICE)); ok(hr == 3, "GetRegisteredRawInputDevices returned %ld, raw_devices_count: %d\n", hr, raw_devices_count); - ok(raw_devices[0].usUsagePage == 1, "Unexpected raw device usage page: %x\n", raw_devices[0].usUsagePage); - ok(raw_devices[0].usUsage == 2, "Unexpected raw device usage: %x\n", raw_devices[0].usUsage); + ok(raw_devices[0].usUsagePage == HID_USAGE_PAGE_GENERIC, "got usUsagePage: %x\n", raw_devices[0].usUsagePage); + ok(raw_devices[0].usUsage == HID_USAGE_GENERIC_MOUSE, "got usUsage: %x\n", raw_devices[0].usUsage); ok(raw_devices[0].dwFlags == RIDEV_INPUTSINK, "Unexpected raw device flags: %#lx\n", raw_devices[0].dwFlags); ok(raw_devices[0].hwndTarget == di_hwnd, "Unexpected raw device target: %p\n", raw_devices[0].hwndTarget); - ok(raw_devices[1].usUsagePage == 1, "Unexpected raw device usage page: %x\n", raw_devices[1].usUsagePage); - ok(raw_devices[1].usUsage == 5, "Unexpected raw device usage: %x\n", raw_devices[1].usUsage); + ok(raw_devices[1].usUsagePage == HID_USAGE_PAGE_GENERIC, "got usUsagePage: %x\n", raw_devices[1].usUsagePage); + ok(raw_devices[1].usUsage == HID_USAGE_GENERIC_GAMEPAD, "got usUsage: %x\n", raw_devices[1].usUsage); ok(raw_devices[1].dwFlags == 0, "Unexpected raw device flags: %#lx\n", raw_devices[1].dwFlags); ok(raw_devices[1].hwndTarget == hwnd, "Unexpected raw device target: %p\n", raw_devices[1].hwndTarget); - ok(raw_devices[2].usUsagePage == 1, "Unexpected raw device usage page: %x\n", raw_devices[1].usUsagePage); - ok(raw_devices[2].usUsage == 6, "Unexpected raw device usage: %x\n", raw_devices[1].usUsage); + ok(raw_devices[2].usUsagePage == HID_USAGE_PAGE_GENERIC, "got usUsagePage: %x\n", raw_devices[1].usUsagePage); + ok(raw_devices[2].usUsage == HID_USAGE_GENERIC_KEYBOARD, "got usUsage: %x\n", raw_devices[1].usUsage); todo_wine ok(raw_devices[2].dwFlags == RIDEV_INPUTSINK, "Unexpected raw device flags: %#lx\n", raw_devices[1].dwFlags); todo_wine @@ -1222,11 +1222,27 @@ static void test_mouse_keyboard(void) hr = GetRegisteredRawInputDevices(raw_devices, &raw_devices_count, sizeof(RAWINPUTDEVICE)); todo_wine ok(hr == 1, "GetRegisteredRawInputDevices returned %ld, raw_devices_count: %d\n", hr, raw_devices_count); - ok(raw_devices[0].usUsagePage == 1, "Unexpected raw device usage page: %x\n", raw_devices[0].usUsagePage); - ok(raw_devices[0].usUsage == 5, "Unexpected raw device usage: %x\n", raw_devices[0].usUsage); + ok(raw_devices[0].usUsagePage == HID_USAGE_PAGE_GENERIC, "got usUsagePage: %x\n", raw_devices[0].usUsagePage); + ok(raw_devices[0].usUsage == HID_USAGE_GENERIC_GAMEPAD, "got usUsage: %x\n", raw_devices[0].usUsage); ok(raw_devices[0].dwFlags == 0, "Unexpected raw device flags: %#lx\n", raw_devices[0].dwFlags); ok(raw_devices[0].hwndTarget == hwnd, "Unexpected raw device target: %p\n", raw_devices[0].hwndTarget); + raw_devices[0].usUsagePage = HID_USAGE_PAGE_GENERIC; + raw_devices[0].usUsage = HID_USAGE_GENERIC_GAMEPAD; + raw_devices[0].dwFlags = RIDEV_REMOVE; + raw_devices[0].hwndTarget = 0; + raw_devices[1].usUsagePage = HID_USAGE_PAGE_GENERIC; + raw_devices[1].usUsage = HID_USAGE_GENERIC_KEYBOARD; + raw_devices[1].dwFlags = RIDEV_REMOVE; + raw_devices[1].hwndTarget = 0; + raw_devices[2].usUsagePage = HID_USAGE_PAGE_GENERIC; + raw_devices[2].usUsage = HID_USAGE_GENERIC_MOUSE; + raw_devices[2].dwFlags = RIDEV_REMOVE; + raw_devices[2].hwndTarget = 0; + raw_devices_count = ARRAY_SIZE(raw_devices); + hr = RegisterRawInputDevices(raw_devices, raw_devices_count, sizeof(RAWINPUTDEVICE)); + ok(hr == TRUE, "RegisterRawInputDevices failed\n"); + IDirectInputDevice8_Release(di_mouse); IDirectInputDevice8_Release(di_keyboard); IDirectInput8_Release(di);

1 0

Rémi Bernon : dinput/tests: Remove old physical joystick tests.
by Alexandre Julliard Dec. 19, 2022

Dec. 19, 2022

Module: wine Branch: master Commit: 8454e2e73065ffb21e34f359403e4fbe3520bb0d URL: https://gitlab.winehq.org/wine/wine/-/commit/8454e2e73065ffb21e34f359403e4f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Dec 19 11:39:38 2022 +0100 dinput/tests: Remove old physical joystick tests. They are now pretty much superseded by the more extensive tests in joystick8.c, using virtual devices. --- dlls/dinput/tests/Makefile.in | 1 - dlls/dinput/tests/joystick.c | 963 ------------------------------------------ 2 files changed, 964 deletions(-)

1 0

Ryan Hendrickson : wined3d: Recognize AMD as a vendor string.
by Alexandre Julliard Dec. 19, 2022

Dec. 19, 2022

Module: wine Branch: master Commit: 07ca9e9a81aa07280bddeb841bc1d56bc04fed25 URL: https://gitlab.winehq.org/wine/wine/-/commit/07ca9e9a81aa07280bddeb841bc1d5… Author: Ryan Hendrickson <ryan.hendrickson(a)alum.mit.edu> Date: Sun Dec 18 17:09:10 2022 -0500 wined3d: Recognize AMD as a vendor string. --- dlls/wined3d/adapter_gl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index f3810bad440..8cd8a883975 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -1216,6 +1216,7 @@ static enum wined3d_pci_vendor wined3d_guess_card_vendor(const char *gl_vendor_s if (strstr(gl_vendor_string, "ATI") || strstr(gl_vendor_string, "Advanced Micro Devices, Inc.") || strstr(gl_vendor_string, "X.Org R300 Project") + || strstr(gl_vendor_string, "AMD") || strstr(gl_renderer, "AMD") || strstr(gl_renderer, "FirePro") || strstr(gl_renderer, "Radeon")

1 0

Michael Stefaniuc : dmime: Split the segment object creation into a separate helper.
by Alexandre Julliard Dec. 19, 2022

Dec. 19, 2022

Module: wine Branch: master Commit: 354ccf3fdb342e45f81b0d8f0ba9816e6932613b URL: https://gitlab.winehq.org/wine/wine/-/commit/354ccf3fdb342e45f81b0d8f0ba981… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Dec 17 23:00:33 2022 +0100 dmime: Split the segment object creation into a separate helper. --- dlls/dmime/segment.c | 52 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 31 insertions(+), 21 deletions(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index b1dd21c1242..b7d7f2142b8 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -826,28 +826,38 @@ static const IPersistStreamVtbl persiststream_vtbl = { unimpl_IPersistStream_GetSizeMax }; +IDirectMusicSegment8Impl *create_segment(void) +{ + IDirectMusicSegment8Impl *obj; + + if (!(obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*obj)))) + return NULL; + + obj->IDirectMusicSegment8_iface.lpVtbl = &dmsegment8_vtbl; + obj->ref = 1; + dmobject_init(&obj->dmobj, &CLSID_DirectMusicSegment, (IUnknown *)&obj->IDirectMusicSegment8_iface); + obj->dmobj.IDirectMusicObject_iface.lpVtbl = &dmobject_vtbl; + obj->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; + list_init (&obj->Tracks); + + DMIME_LockModule(); + + return obj; +} + /* for ClassFactory */ -HRESULT create_dmsegment(REFIID lpcGUID, void **ppobj) +HRESULT create_dmsegment(REFIID guid, void **ret_iface) { - IDirectMusicSegment8Impl* obj; - HRESULT hr; + IDirectMusicSegment8Impl *obj; + HRESULT hr; - obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicSegment8Impl)); - if (NULL == obj) { - *ppobj = NULL; - return E_OUTOFMEMORY; - } - obj->IDirectMusicSegment8_iface.lpVtbl = &dmsegment8_vtbl; - obj->ref = 1; - dmobject_init(&obj->dmobj, &CLSID_DirectMusicSegment, - (IUnknown *)&obj->IDirectMusicSegment8_iface); - obj->dmobj.IDirectMusicObject_iface.lpVtbl = &dmobject_vtbl; - obj->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; - list_init (&obj->Tracks); - - DMIME_LockModule(); - hr = IDirectMusicSegment8_QueryInterface(&obj->IDirectMusicSegment8_iface, lpcGUID, ppobj); - IDirectMusicSegment8_Release(&obj->IDirectMusicSegment8_iface); - - return hr; + if (!(obj = create_segment())) { + *ret_iface = NULL; + return E_OUTOFMEMORY; + } + + hr = IDirectMusicSegment8_QueryInterface(&obj->IDirectMusicSegment8_iface, guid, ret_iface); + IDirectMusicSegment8_Release(&obj->IDirectMusicSegment8_iface); + + return hr; }

1 0

Michael Stefaniuc : dmime: Implement the IDirectMusicSegment8_Clone() method.
by Alexandre Julliard Dec. 19, 2022

Dec. 19, 2022

Module: wine Branch: master Commit: c92d01016b2034f3b173a5186cfa42f6bab87f72 URL: https://gitlab.winehq.org/wine/wine/-/commit/c92d01016b2034f3b173a5186cfa42… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Dec 17 23:01:38 2022 +0100 dmime: Implement the IDirectMusicSegment8_Clone() method. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53941 --- dlls/dmime/segment.c | 50 +++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 45 insertions(+), 5 deletions(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index b7d7f2142b8..bf44c5e73b3 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -35,6 +35,8 @@ typedef struct IDirectMusicSegment8Impl { struct list Tracks; } IDirectMusicSegment8Impl; +IDirectMusicSegment8Impl *create_segment(void); + static inline IDirectMusicSegment8Impl *impl_from_IDirectMusicSegment8(IDirectMusicSegment8 *iface) { return CONTAINING_RECORD(iface, IDirectMusicSegment8Impl, IDirectMusicSegment8_iface); @@ -410,12 +412,50 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_SetParam(IDirectMusicSegment8 *if return S_OK; } -static HRESULT WINAPI IDirectMusicSegment8Impl_Clone(IDirectMusicSegment8 *iface, - MUSIC_TIME mtStart, MUSIC_TIME mtEnd, IDirectMusicSegment **ppSegment) +static HRESULT WINAPI IDirectMusicSegment8Impl_Clone(IDirectMusicSegment8 *iface, MUSIC_TIME start, MUSIC_TIME end, + IDirectMusicSegment **segment) { - IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); - FIXME("(%p, %ld, %ld, %p): stub\n", This, mtStart, mtEnd, ppSegment); - return S_OK; + IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); + IDirectMusicSegment8Impl *clone; + IDirectMusicTrack *track; + DMUS_PRIVATE_SEGMENT_TRACK *track_item, *cloned_item; + HRESULT hr; + BOOL track_clone_fail = FALSE; + + TRACE("(%p, %ld, %ld, %p)\n", This, start, end, segment); + + if (!segment) + return E_POINTER; + + if (!(clone = create_segment())) { + *segment = NULL; + return E_OUTOFMEMORY; + } + + clone->header = This->header; + clone->pGraph = This->pGraph; + if (clone->pGraph) + IDirectMusicGraph_AddRef(clone->pGraph); + + LIST_FOR_EACH_ENTRY(track_item, &This->Tracks, DMUS_PRIVATE_SEGMENT_TRACK, entry) { + if (SUCCEEDED(hr = IDirectMusicTrack_Clone(track_item->pTrack, start, end, &track))) { + if ((cloned_item = HeapAlloc(GetProcessHeap(), 0, sizeof(*cloned_item)))) { + cloned_item->dwGroupBits = track_item->dwGroupBits; + cloned_item->flags = track_item->flags; + cloned_item->pTrack = track; + list_add_tail(&clone->Tracks, &cloned_item->entry); + continue; + } else { + IDirectMusicTrack_Release(track); + } + } + WARN("Failed to clone track %p: %#lx\n", track_item->pTrack, hr); + track_clone_fail = TRUE; + } + + *segment = (IDirectMusicSegment *)&clone->IDirectMusicSegment8_iface; + + return track_clone_fail ? S_FALSE : S_OK; } static HRESULT WINAPI IDirectMusicSegment8Impl_SetStartPoint(IDirectMusicSegment8 *iface,

1 0

Michael Stefaniuc : dmcompos: Return a valid pointer from ComposeSegmentFromTemplate().
by Alexandre Julliard Dec. 19, 2022

Dec. 19, 2022

Module: wine Branch: master Commit: 3f0afe8e5ca286b6b26e7a20b16e47f8a99a2a96 URL: https://gitlab.winehq.org/wine/wine/-/commit/3f0afe8e5ca286b6b26e7a20b16e47… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Dec 17 23:38:41 2022 +0100 dmcompos: Return a valid pointer from ComposeSegmentFromTemplate(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53941 --- dlls/dmcompos/composer.c | 36 +++++++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/dlls/dmcompos/composer.c b/dlls/dmcompos/composer.c index a13a77bff94..a2a58396ee5 100644 --- a/dlls/dmcompos/composer.c +++ b/dlls/dmcompos/composer.c @@ -77,12 +77,38 @@ static ULONG WINAPI IDirectMusicComposerImpl_Release(IDirectMusicComposer *iface /* IDirectMusicComposerImpl IDirectMusicComposer part: */ static HRESULT WINAPI IDirectMusicComposerImpl_ComposeSegmentFromTemplate(IDirectMusicComposer *iface, - IDirectMusicStyle *pStyle, IDirectMusicSegment *pTemplate, WORD wActivity, - IDirectMusicChordMap *pChordMap, IDirectMusicSegment **ppSegment) + IDirectMusicStyle *style, IDirectMusicSegment *template, WORD activity, IDirectMusicChordMap *chordmap, + IDirectMusicSegment **segment) { - IDirectMusicComposerImpl *This = impl_from_IDirectMusicComposer(iface); - FIXME("(%p, %p, %p, %d, %p, %p): stub\n", This, pStyle, pTemplate, wActivity, pChordMap, ppSegment); - return S_OK; + IDirectMusicComposerImpl *This = impl_from_IDirectMusicComposer(iface); + IDirectMusicTrack *track; + HRESULT hr; + + FIXME("(%p, %p, %p, %d, %p, %p): semi-stub\n", This, style, template, activity, chordmap, segment); + + if (!segment) + return E_POINTER; + if (!template) + return E_INVALIDARG; + + if (!style) { + hr = IDirectMusicSegment_GetTrack(template, &CLSID_DirectMusicStyleTrack, 0xFFFFFFFF, + DMUS_SEG_ANYTRACK, &track); + if (FAILED(hr)) + return E_INVALIDARG; + else + IDirectMusicTrack_Release(track); /* Temp to not leak memory */ + } + if (!chordmap) { + hr = IDirectMusicSegment_GetTrack(template, &CLSID_DirectMusicChordMapTrack, 0xFFFFFFFF, + DMUS_SEG_ANYTRACK, &track); + if (FAILED(hr)) + return E_INVALIDARG; + else + IDirectMusicTrack_Release(track); /* Temp to not leak memory */ + } + + return IDirectMusicSegment_Clone(template, -1, 0, segment); } static HRESULT WINAPI IDirectMusicComposerImpl_ComposeSegmentFromShape(IDirectMusicComposer *iface,

1 0

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard Dec. 19, 2022

Dec. 19, 2022

Module: wine Branch: master Commit: 2b1cfcd011b0c4b068903e0aff3d40114c7da7c1 URL: https://gitlab.winehq.org/wine/wine/-/commit/2b1cfcd011b0c4b068903e0aff3d40… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Dec 18 19:29:41 2022 +0900 po: Update Japanese translation. --- po/ja.po | 260 +++++++++++++++++++++------------------------------------------ 1 file changed, 86 insertions(+), 174 deletions(-)

1 0

Gerald Pfeifer : libwine: Only define exe_link when needed.
by Alexandre Julliard Dec. 19, 2022

Dec. 19, 2022

Module: wine Branch: master Commit: 208b824ecd24a22c0dd0cb9cbeaaefda3d78e4cd URL: https://gitlab.winehq.org/wine/wine/-/commit/208b824ecd24a22c0dd0cb9cbeaaef… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Dec 17 02:21:13 2022 +0100 libwine: Only define exe_link when needed. Revision 24b26f8bd6a49c855eec417a6585d44c9458e3ec changed FreeBSD (and DragonFly) not to use /proc any longer. Hence we also do not need the exe_link variable on those two platforms, either. Avoid declaring it there. (This avoids a compiler warning with GCC 12.) --- libs/wine/config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/wine/config.c b/libs/wine/config.c index 4eb446258cc..34ede6ed0a6 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -60,7 +60,7 @@ static void fatal_error( const char *err, ... ) __attribute__((noreturn,format( #if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) static const char exe_link[] = "/proc/self/exe"; -#else +#elif ! defined (__FreeBSD__) && ! defined(__DragonFly__) static const char exe_link[] = ""; #endif

1 0

Gerald Pfeifer : winebus.sys: Fix the build without HAVE_SYS_INOTIFY_H.
by Alexandre Julliard Dec. 19, 2022

Dec. 19, 2022

Module: wine Branch: master Commit: 443805b10a7b774767a564320c222aa9d183458d URL: https://gitlab.winehq.org/wine/wine/-/commit/443805b10a7b774767a564320c222a… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Dec 17 00:31:54 2022 +0100 winebus.sys: Fix the build without HAVE_SYS_INOTIFY_H. find_device_from_devnode was unnecessarily guarded by HAVE_SYS_INOTIFY_H, alas its use in process_monitor_event was not, so linking failed. Simply make find_device_from_devnode generally available. --- dlls/winebus.sys/bus_udev.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 71b9ef84530..3cd8bfd1ceb 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -260,6 +260,16 @@ static struct base_device *find_device_from_fd(int fd) return NULL; } +static struct base_device *find_device_from_devnode(const char *path) +{ + struct base_device *impl; + + LIST_FOR_EACH_ENTRY(impl, &device_list, struct base_device, unix_device.entry) + if (!strcmp(impl->devnode, path)) return impl; + + return NULL; +} + static void hidraw_device_destroy(struct unix_device *iface) { struct hidraw_device *impl = hidraw_impl_from_unix_device(iface); @@ -1546,16 +1556,6 @@ static int create_inotify(void) return fd; } -static struct base_device *find_device_from_devnode(const char *path) -{ - struct base_device *impl; - - LIST_FOR_EACH_ENTRY(impl, &device_list, struct base_device, unix_device.entry) - if (!strcmp(impl->devnode, path)) return impl; - - return NULL; -} - static void maybe_remove_devnode(const char *base, const char *dir) { struct base_device *impl;

1 0

Eric Pouech : kernel32/tests: Handle some variations in process start debug events.
by Alexandre Julliard Dec. 16, 2022

Dec. 16, 2022

Module: wine Branch: master Commit: 17e5ff74308f41ab662d46f684db2c6023a4a16b URL: https://gitlab.winehq.org/wine/wine/-/commit/17e5ff74308f41ab662d46f684db2c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Dec 16 16:38:56 2022 +0100 kernel32/tests: Handle some variations in process start debug events. Win10 and Win11 can have some variations in debug events order (linked to when thread start debug event are generated). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54159 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/kernel32/tests/debugger.c | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 52cc965f013..a3f09abaa70 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -436,24 +436,30 @@ static void process_attach_events(struct debugger_context *ctx, BOOL pass_except ok(ctx->dll_cnt > 2, "dll_cnt = %d\n", ctx->dll_cnt); /* a new thread is created and it executes DbgBreakPoint, which causes the exception */ - ok(ctx->ev.dwDebugEventCode == CREATE_THREAD_DEBUG_EVENT, "dwDebugEventCode = %ld\n", ctx->ev.dwDebugEventCode); + /* Win11 doesn't generate it at this point (Win <= 10 do) */ if (ctx->ev.dwDebugEventCode == CREATE_THREAD_DEBUG_EVENT) { - DWORD last_thread = ctx->ev.dwThreadId; - next_event(ctx, WAIT_EVENT_TIMEOUT); + DWORD last_thread; + + /* sometimes (at least Win10) several thread creations are reported here */ + do + { + last_thread = ctx->ev.dwThreadId; + next_event(ctx, WAIT_EVENT_TIMEOUT); + } while (ctx->ev.dwDebugEventCode == CREATE_THREAD_DEBUG_EVENT); ok(ctx->ev.dwThreadId == last_thread, "unexpected thread\n"); - } - ok(ctx->ev.dwDebugEventCode == EXCEPTION_DEBUG_EVENT, "dwDebugEventCode = %ld\n", ctx->ev.dwDebugEventCode); - ok(ctx->ev.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_BREAKPOINT, "ExceptionCode = %lx\n", - ctx->ev.u.Exception.ExceptionRecord.ExceptionCode); - ok(ctx->ev.u.Exception.ExceptionRecord.ExceptionAddress == pDbgBreakPoint, "ExceptionAddress != DbgBreakPoint\n"); + ok(ctx->ev.dwDebugEventCode == EXCEPTION_DEBUG_EVENT, "dwDebugEventCode = %ld\n", ctx->ev.dwDebugEventCode); + ok(ctx->ev.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_BREAKPOINT, "ExceptionCode = %lx\n", + ctx->ev.u.Exception.ExceptionRecord.ExceptionCode); + ok(ctx->ev.u.Exception.ExceptionRecord.ExceptionAddress == pDbgBreakPoint, "ExceptionAddress != DbgBreakPoint\n"); - if (pass_exception) - { - ret = ContinueDebugEvent(ctx->ev.dwProcessId, ctx->ev.dwThreadId, DBG_EXCEPTION_NOT_HANDLED); - ok(ret, "ContinueDebugEvent failed, last error %ld.\n", GetLastError()); - ctx->ev.dwDebugEventCode = -1; + if (pass_exception) + { + ret = ContinueDebugEvent(ctx->ev.dwProcessId, ctx->ev.dwThreadId, DBG_EXCEPTION_NOT_HANDLED); + ok(ret, "ContinueDebugEvent failed, last error %ld.\n", GetLastError()); + ctx->ev.dwDebugEventCode = -1; + } } /* flush debug events */

1 0

Eric Pouech : kernel32/tests: Improve loading of debugger's test children results.
by Alexandre Julliard Dec. 16, 2022

Dec. 16, 2022

Module: wine Branch: master Commit: 2486f5a0028de8bfd23c46e8f1d95064cf994be5 URL: https://gitlab.winehq.org/wine/wine/-/commit/2486f5a0028de8bfd23c46e8f1d950… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Dec 16 16:38:54 2022 +0100 kernel32/tests: Improve loading of debugger's test children results. Even if there's a synchronisation mechanism between kernel32:debugger and its children which ensures that child has finished writing to and closed the blackbox logging file before reading it, there's no guarantee that the file is not re-opened by another process: antivirus, file indexing... And according to [1], even the OS itself can still have opened references to it. So, always open/read the blackbox file in read share mode to work around this issue. Also, harden the code for potential errors, and be nicer in where failures come from. [1] https://learn.microsoft.com/en-us/windows-hardware/drivers/ifs/irp-mj-clean… Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53456 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/kernel32/tests/debugger.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 7d4fbb6c7c0..52cc965f013 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -132,38 +132,45 @@ static void save_blackbox(const char* logfile, void* blackbox, int size, const c { HANDLE hFile; DWORD written; + BOOL ret; - hFile=CreateFileA(logfile, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + hFile = CreateFileA(logfile, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, 0, 0); + ok(hFile != INVALID_HANDLE_VALUE, "Couldn't create %s: %lu\n", logfile, GetLastError()); if (hFile == INVALID_HANDLE_VALUE) return; - WriteFile(hFile, blackbox, size, &written, NULL); + ret = WriteFile(hFile, blackbox, size, &written, NULL); + ok(ret && written == size, "Error writing\n"); if (dbgtrace && dbgtrace[0]) - WriteFile(hFile, dbgtrace, strlen(dbgtrace), &written, NULL); + { + ret = WriteFile(hFile, dbgtrace, strlen(dbgtrace), &written, NULL); + ok(ret && written == strlen(dbgtrace), "Error writing\n"); + } CloseHandle(hFile); } -static int load_blackbox(const char* logfile, void* blackbox, int size) +#define load_blackbox(a, b, c) _load_blackbox(__LINE__, (a), (b), (c)) +static int _load_blackbox(unsigned int line, const char* logfile, void* blackbox, int size) { HANDLE hFile; DWORD read; BOOL ret; char buf[4096]; - hFile=CreateFileA(logfile, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + hFile = CreateFileA(logfile, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); if (hFile == INVALID_HANDLE_VALUE) { - ok(0, "unable to open '%s'\n", logfile); + ok_(__FILE__, line)(0, "unable to open '%s': %#lx\n", logfile, GetLastError()); return 0; } SetLastError(0xdeadbeef); - ret=ReadFile(hFile, blackbox, size, &read, NULL); + ret = ReadFile(hFile, blackbox, size, &read, NULL); ok(ret, "ReadFile failed: %ld\n", GetLastError()); ok(read == size, "wrong size for '%s': read=%ld\n", logfile, read); ret = ReadFile(hFile, buf, sizeof(buf) - 1, &read, NULL); if (ret && read) { buf[read] = 0; - trace("debugger traces:\n%s", buf); + trace("debugger traces:>>>\n%s\n<<< Done.\n", buf); } CloseHandle(hFile); return 1;

1 0

Eric Pouech : ntdll: Implement RtlU(short|long)ByteSwap() using fastcall bits.
by Alexandre Julliard Dec. 16, 2022

Dec. 16, 2022

Module: wine Branch: master Commit: 84cf6aa20d3506663f6ff5f8bc296f16c0137039 URL: https://gitlab.winehq.org/wine/wine/-/commit/84cf6aa20d3506663f6ff5f8bc296f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Dec 12 16:58:15 2022 +0100 ntdll: Implement RtlU(short|long)ByteSwap() using fastcall bits. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/rtl.c | 16 ++++++++-------- dlls/ntoskrnl.exe/ntoskrnl.c | 16 ++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 ++-- 4 files changed, 28 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 5b4cbbaa7fe..b41e29c0ff5 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1038,7 +1038,7 @@ @ stdcall RtlTryAcquireSRWLockShared(ptr) @ stdcall RtlTryEnterCriticalSection(ptr) @ stdcall RtlUTF8ToUnicodeN(ptr long ptr ptr long) -@ cdecl -i386 -norelay RtlUlongByteSwap() NTDLL_RtlUlongByteSwap +@ stdcall -fastcall -arch=i386 -norelay RtlUlongByteSwap(long) @ stdcall -fastcall -arch=i386 -norelay RtlUlonglongByteSwap(int64) # @ stub RtlUnhandledExceptionFilter2 # @ stub RtlUnhandledExceptionFilter @@ -1072,7 +1072,7 @@ @ stdcall RtlUpperString(ptr ptr) @ stub RtlUsageHeap @ stdcall -norelay RtlUserThreadStart(ptr ptr) -@ cdecl -i386 -norelay RtlUshortByteSwap() NTDLL_RtlUshortByteSwap +@ stdcall -fastcall -arch=i386 -norelay RtlUshortByteSwap(long) @ stdcall RtlValidAcl(ptr) @ stdcall RtlValidRelativeSecurityDescriptor(ptr long long) @ stdcall RtlValidSecurityDescriptor(ptr) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 00bc16bbfa5..59dde6359e3 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -659,10 +659,10 @@ __ASM_FASTCALL_FUNC(RtlUlonglongByteSwap, 8, * ix86 version takes argument in %ecx. Other systems use the inline version. */ #ifdef __i386__ -__ASM_GLOBAL_FUNC(NTDLL_RtlUlongByteSwap, - "movl %ecx,%eax\n\t" - "bswap %eax\n\t" - "ret") +__ASM_FASTCALL_FUNC(RtlUlongByteSwap, 4, + "movl %ecx,%eax\n\t" + "bswap %eax\n\t" + "ret") #endif /************************************************************************* @@ -674,10 +674,10 @@ __ASM_GLOBAL_FUNC(NTDLL_RtlUlongByteSwap, * i386 version takes argument in %cx. Other systems use the inline version. */ #ifdef __i386__ -__ASM_GLOBAL_FUNC(NTDLL_RtlUshortByteSwap, - "movb %ch,%al\n\t" - "movb %cl,%ah\n\t" - "ret") +__ASM_FASTCALL_FUNC(RtlUshortByteSwap, 4, + "movb %ch,%al\n\t" + "movb %cl,%ah\n\t" + "ret") #endif diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 9548eb98542..cc30750a160 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2187,6 +2187,22 @@ LONG FASTCALL NTOSKRNL_InterlockedIncrement( LONG volatile *dest ) #ifdef __i386__ +/************************************************************************* + * RtlUshortByteSwap (NTOSKRNL.EXE.@) + */ +__ASM_FASTCALL_FUNC(RtlUshortByteSwap, 4, + "movb %ch,%al\n\t" + "movb %cl,%ah\n\t" + "ret") + +/************************************************************************* + * RtlUlongByteSwap (NTOSKRNL.EXE.@) + */ +__ASM_FASTCALL_FUNC(RtlUlongByteSwap, 4, + "movl %ecx,%eax\n\t" + "bswap %eax\n\t" + "ret") + /************************************************************************* * RtlUlonglongByteSwap (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 321083e5ac4..2447d01458d 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -67,9 +67,9 @@ @ stdcall -fastcall ObfDereferenceObject(ptr) @ stdcall -fastcall ObfReferenceObject(ptr) @ stub RtlPrefetchMemoryNonTemporal -@ cdecl -i386 -norelay RtlUlongByteSwap() +@ stdcall -fastcall -arch=i386 -norelay RtlUlongByteSwap(long) @ stdcall -fastcall -arch=i386 -norelay RtlUlonglongByteSwap(int64) -@ cdecl -i386 -norelay RtlUshortByteSwap() +@ stdcall -fastcall -arch=i386 -norelay RtlUshortByteSwap(long) @ stub WmiGetClock @ stub Kei386EoiHelper @ stub Kii386SpinOnSpinLock

1 0

Eric Pouech : kernel32/tests: Fix failing debugger test on Win7.
by Alexandre Julliard Dec. 16, 2022

Dec. 16, 2022

Module: wine Branch: master Commit: 2acacb83d1cc8d44c45560be625c8f15b2a77c86 URL: https://gitlab.winehq.org/wine/wine/-/commit/2acacb83d1cc8d44c45560be625c8f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Dec 16 16:38:53 2022 +0100 kernel32/tests: Fix failing debugger test on Win7. Investigating the test failures in MR!1823, it turns out that sometimes in Win7, at process exit, not all the dll unload debug events are sent (in traces, only the last loaded dll gets the event). I don't know what it only shows now :-(, but that seems very replicable (it happens every time with new job to TestBot). So mark the case of missing unload dll debug event as broken (still checking that the load dll debug event has been received). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/kernel32/tests/debugger.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 1dc5bd5fb46..7d4fbb6c7c0 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -1014,7 +1014,8 @@ static void test_debug_loop(int argc, char **argv) if (!ret) break; } - ok( ole32_mod == (HMODULE)1, "ole32.dll was not reported\n" ); + /* sometimes not all unload events are sent on win7 */ + ok( ole32_mod == (HMODULE)1 || broken( ole32_mod != NULL ), "ole32.dll was not reported\n" ); ok( oleaut32_mod == (HMODULE)1, "oleaut32.dll was not reported\n" ); #ifdef _WIN64 ok( oleacc_mod == (HMODULE)1, "oleacc.dll was not reported\n" );

1 0

Eric Pouech : ntdll/tests: Add tests for RtlU(long|short)ByteSwap().
by Alexandre Julliard Dec. 16, 2022

Dec. 16, 2022

Module: wine Branch: master Commit: 4708bb745378f49589b6e9af045da58aa7db9063 URL: https://gitlab.winehq.org/wine/wine/-/commit/4708bb745378f49589b6e9af045da5… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Dec 12 16:58:13 2022 +0100 ntdll/tests: Add tests for RtlU(long|short)ByteSwap(). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/ntdll/tests/rtl.c | 47 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 44 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 8f698454957..1e5e8c2580c 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -27,6 +27,7 @@ #include "in6addr.h" #include "inaddr.h" #include "ip2string.h" +#include "wine/asm.h" #ifndef __WINE_WINTERNL_H @@ -61,6 +62,18 @@ static inline USHORT __my_ushort_swap(USHORT s) #endif /* WORDS_BIGENDIAN */ +#ifdef __ASM_USE_FASTCALL_WRAPPER +extern ULONG WINAPI wrap_fastcall_func1( void *func, ULONG a ); +__ASM_STDCALL_FUNC( wrap_fastcall_func1, 8, + "popl %ecx\n\t" + "popl %eax\n\t" + "xchgl (%esp),%ecx\n\t" + "jmp *%eax" ) +#define call_fastcall_func1(func,a) wrap_fastcall_func1(func,a) +#else +#define call_fastcall_func1(func,a) func(a) +#endif + /* Function ptrs for ntdll calls */ static HMODULE hntdll = 0; @@ -68,6 +81,8 @@ static VOID (WINAPI *pRtlMoveMemory)(LPVOID,LPCVOID,SIZE_T); static VOID (WINAPI *pRtlFillMemory)(LPVOID,SIZE_T,BYTE); static VOID (WINAPI *pRtlFillMemoryUlong)(LPVOID,SIZE_T,ULONG); static VOID (WINAPI *pRtlZeroMemory)(LPVOID,SIZE_T); +static USHORT (FASTCALL *pRtlUshortByteSwap)(USHORT source); +static ULONG (FASTCALL *pRtlUlongByteSwap)(ULONG source); static ULONGLONG (FASTCALL *pRtlUlonglongByteSwap)(ULONGLONG source); static DWORD (WINAPI *pRtlGetThreadErrorMode)(void); static NTSTATUS (WINAPI *pRtlSetThreadErrorMode)(DWORD, LPDWORD); @@ -108,7 +123,9 @@ static void InitFunctionPtrs(void) pRtlFillMemory = (void *)GetProcAddress(hntdll, "RtlFillMemory"); pRtlFillMemoryUlong = (void *)GetProcAddress(hntdll, "RtlFillMemoryUlong"); pRtlZeroMemory = (void *)GetProcAddress(hntdll, "RtlZeroMemory"); - pRtlUlonglongByteSwap = (void *)GetProcAddress(hntdll, "RtlUlonglongByteSwap"); + pRtlUshortByteSwap = (void *)GetProcAddress(hntdll, "RtlUshortByteSwap"); + pRtlUlongByteSwap = (void *)GetProcAddress(hntdll, "RtlUlongByteSwap"); + pRtlUlonglongByteSwap = (void *)GetProcAddress(hntdll, "RtlUlonglongByteSwap"); pRtlGetThreadErrorMode = (void *)GetProcAddress(hntdll, "RtlGetThreadErrorMode"); pRtlSetThreadErrorMode = (void *)GetProcAddress(hntdll, "RtlSetThreadErrorMode"); pRtlIpv4AddressToStringExA = (void *)GetProcAddress(hntdll, "RtlIpv4AddressToStringExA"); @@ -317,16 +334,40 @@ static void test_RtlZeroMemory(void) ZERO(9); MCMP("\0\0\0\0\0\0\0\0\0 test!"); } -static void test_RtlUlonglongByteSwap(void) +static void test_RtlByteSwap(void) { ULONGLONG llresult; + ULONG lresult; + USHORT sresult; #ifdef _WIN64 /* the Rtl*ByteSwap() are always inlined and not exported from ntdll on 64bit */ + sresult = RtlUshortByteSwap( 0x1234 ); + ok( 0x3412 == sresult, + "inlined RtlUshortByteSwap() returns 0x%x\n", sresult ); + lresult = RtlUlongByteSwap( 0x87654321 ); + ok( 0x21436587 == lresult, + "inlined RtlUlongByteSwap() returns 0x%lx\n", lresult ); llresult = RtlUlonglongByteSwap( 0x7654321087654321ull ); ok( 0x2143658710325476 == llresult, "inlined RtlUlonglongByteSwap() returns %#I64x\n", llresult ); #else + ok( pRtlUshortByteSwap != NULL, "RtlUshortByteSwap is not available\n" ); + if ( pRtlUshortByteSwap ) + { + sresult = call_fastcall_func1( pRtlUshortByteSwap, 0x1234u ); + ok( 0x3412u == sresult, + "ntdll.RtlUshortByteSwap() returns %#x\n", sresult ); + } + + ok( pRtlUlongByteSwap != NULL, "RtlUlongByteSwap is not available\n" ); + if ( pRtlUlongByteSwap ) + { + lresult = call_fastcall_func1( pRtlUlongByteSwap, 0x87654321ul ); + ok( 0x21436587ul == lresult, + "ntdll.RtlUlongByteSwap() returns %#lx\n", lresult ); + } + ok( pRtlUlonglongByteSwap != NULL, "RtlUlonglongByteSwap is not available\n"); if ( pRtlUlonglongByteSwap ) { @@ -3745,7 +3786,7 @@ START_TEST(rtl) test_RtlFillMemory(); test_RtlFillMemoryUlong(); test_RtlZeroMemory(); - test_RtlUlonglongByteSwap(); + test_RtlByteSwap(); test_RtlUniform(); test_RtlRandom(); test_RtlAreAllAccessesGranted();

1 0

Rémi Bernon : user32/tests: Use %d to print last_bpp instead of %u.
by Alexandre Julliard Dec. 16, 2022

Dec. 16, 2022

Module: wine Branch: master Commit: c20d32d392a49dca527f57ab6b84a82e5f0ad527 URL: https://gitlab.winehq.org/wine/wine/-/commit/c20d32d392a49dca527f57ab6b84a8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Dec 16 16:38:55 2022 +0100 user32/tests: Use %d to print last_bpp instead of %u. --- dlls/user32/tests/sysparams.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index debe05c42a3..5c199a07769 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -2475,7 +2475,7 @@ static void test_WM_DISPLAYCHANGE(void) todo_wine ok( res == WAIT_TIMEOUT || broken( !res ), "WaitForSingleObject returned %#lx\n", res ); todo_wine - ok( last_bpp == -1 || broken( last_bpp == default_bpp ), "got WM_DISPLAYCHANGE bpp %u\n", last_bpp ); + ok( last_bpp == -1 || broken( last_bpp == default_bpp ), "got WM_DISPLAYCHANGE bpp %d\n", last_bpp ); displaychange_ok = FALSE; for (i = 0; i < ARRAY_SIZE(test_bpps); i++) @@ -2496,7 +2496,7 @@ static void test_WM_DISPLAYCHANGE(void) /* Wait quite long for the message, screen setting changes can take some time */ res = WaitForSingleObject( displaychange_sem, 10000 ); ok( !res, "WaitForSingleObject returned %#lx\n", res ); - ok( last_bpp == bpp, "got WM_DISPLAYCHANGE bpp %u\n", last_bpp ); + ok( last_bpp == bpp, "got WM_DISPLAYCHANGE bpp %d\n", last_bpp ); } else { @@ -2504,7 +2504,7 @@ static void test_WM_DISPLAYCHANGE(void) win_skip( "ChangeDisplaySettingsExW returned %ld\n", res ); ok( res == DISP_CHANGE_BADMODE || broken( DISP_CHANGE_FAILED && bpp == 8 ), "ChangeDisplaySettingsExW returned %ld\n", res ); - ok( last_bpp == -1, "got WM_DISPLAYCHANGE bpp %u\n", last_bpp ); + ok( last_bpp == -1, "got WM_DISPLAYCHANGE bpp %d\n", last_bpp ); } displaychange_ok = FALSE; @@ -2525,7 +2525,7 @@ static void test_WM_DISPLAYCHANGE(void) todo_wine ok( res == WAIT_TIMEOUT || broken( !res ), "WaitForSingleObject returned %#lx\n", res ); todo_wine - ok( last_bpp == -1 || broken( last_bpp == default_bpp ), "got WM_DISPLAYCHANGE bpp %u\n", last_bpp ); + ok( last_bpp == -1 || broken( last_bpp == default_bpp ), "got WM_DISPLAYCHANGE bpp %d\n", last_bpp ); displaychange_ok = FALSE; CloseHandle( displaychange_sem );

1 0

Rémi Bernon : user32/tests: Don't expect WM_DISPLAYCHANGE with the default display mode.
by Alexandre Julliard Dec. 16, 2022

Dec. 16, 2022

Module: wine Branch: master Commit: e2bc3bc40d52310e178e38bd2d26f66417454576 URL: https://gitlab.winehq.org/wine/wine/-/commit/e2bc3bc40d52310e178e38bd2d26f6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Dec 16 15:30:01 2022 +0100 user32/tests: Don't expect WM_DISPLAYCHANGE with the default display mode. It looks like the behavior changes when only this test is run vs when it is run as part of the winetest suite. This is probably because ChangeDisplaySettingsExW only sends the message the first time it is called (since boot?). Having other tests run before it, one of them probably changed display settings already and we're not getting the message anymore. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53894 --- dlls/user32/tests/sysparams.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index a53c43b391a..debe05c42a3 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -2463,16 +2463,19 @@ static void test_WM_DISPLAYCHANGE(void) ok( settings.dmBitsPerPel == 32, "got dmBitsPerPel %lu\n", settings.dmBitsPerPel ); default_bpp = settings.dmBitsPerPel; - /* setting the default mode here sends a WM_DISPLAYCHANGE */ + /* setting default mode most of the time doesn't send WM_DISPLAYCHANGE, + * it only does the first time ChangeDisplaySettingsExW is called */ last_bpp = -1; change_counter = 0; displaychange_ok = TRUE; res = ChangeDisplaySettingsExW( NULL, &settings, NULL, 0, NULL ); ok( !res, "ChangeDisplaySettingsExW returned %ld\n", res ); - res = WaitForSingleObject( displaychange_sem, 10000 ); - ok( !res, "WaitForSingleObject returned %#lx\n", res ); - ok( last_bpp == default_bpp, "got WM_DISPLAYCHANGE bpp %u\n", last_bpp ); + res = WaitForSingleObject( displaychange_sem, 1000 ); + todo_wine + ok( res == WAIT_TIMEOUT || broken( !res ), "WaitForSingleObject returned %#lx\n", res ); + todo_wine + ok( last_bpp == -1 || broken( last_bpp == default_bpp ), "got WM_DISPLAYCHANGE bpp %u\n", last_bpp ); displaychange_ok = FALSE; for (i = 0; i < ARRAY_SIZE(test_bpps); i++)

1 0

Piotr Caban : shell32: Fix SHChangeNotify test failures.
by Alexandre Julliard Dec. 16, 2022

Dec. 16, 2022

Module: wine Branch: master Commit: b7380acb6c053ffacc96ee49bda8fc4cda1ef1c7 URL: https://gitlab.winehq.org/wine/wine/-/commit/b7380acb6c053ffacc96ee49bda8fc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 16 13:24:50 2022 +0100 shell32: Fix SHChangeNotify test failures. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53222 --- dlls/shell32/tests/shlfolder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 98064140107..dc0b6cb2ee2 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -5133,7 +5133,7 @@ static void test_SHChangeNotify(BOOL test_new_delivery) entries[0].fRecursive = TRUE; notifyID = SHChangeNotifyRegister(wnd, !test_new_delivery ? SHCNRF_ShellLevel : SHCNRF_ShellLevel|SHCNRF_NewDelivery, - SHCNE_ALLEVENTS, WM_USER_NOTIFY, 1, entries); + SHCNE_MKDIR | SHCNE_CREATE | SHCNE_RMDIR, WM_USER_NOTIFY, 1, entries); ok(notifyID != 0, "Failed to register a window for change notifications\n"); for (i = 0; i < ARRAY_SIZE(chnotify_tests); ++i)

1 0

Eric Pouech : ntdll: Fix export and calling convention of RtlUlonglongByteSwap().
by Alexandre Julliard Dec. 16, 2022

Dec. 16, 2022

Module: wine Branch: master Commit: 495711c251bad8d39e13af7addfaccc938a2a670 URL: https://gitlab.winehq.org/wine/wine/-/commit/495711c251bad8d39e13af7addfacc… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Dec 12 16:58:12 2022 +0100 ntdll: Fix export and calling convention of RtlUlonglongByteSwap(). The RtlU*ByteSwap() family: - has FASTCALL calling convention - is only exported from ntdll and ntoskrnl.exe in 32bit mode (didn't check ARM though) Wine's support for RtlUlonglongByteSwap() doesn't follow these constraints. Note: in __fastcall, 64bit paramaters are passed on the stack, to RtlUlonglongByteSwap() calling convention acts as __stdcall. So: - fix ntdll.spec (resp. ntoskrnl.exe.spec) to only export (resp. forward) RtlUlonglongByteSwap for i386 - always provide an inline implementation in winternl.h - reimplement ntdll.RtlUlonglongByteSwap() for i386 with __fastcall calling convention. - fix ntdll/tests/rtl.c to use correct calling convention. - add test in ntdll/tests/rtl.c for inlined version. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53536 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/rtl.c | 12 ++++++++---- dlls/ntdll/tests/rtl.c | 24 ++++++++++++++---------- dlls/ntoskrnl.exe/ntoskrnl.c | 13 +++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/winternl.h | 15 +++++++-------- 6 files changed, 44 insertions(+), 24 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 1e6576a5422..5b4cbbaa7fe 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1039,7 +1039,7 @@ @ stdcall RtlTryEnterCriticalSection(ptr) @ stdcall RtlUTF8ToUnicodeN(ptr long ptr ptr long) @ cdecl -i386 -norelay RtlUlongByteSwap() NTDLL_RtlUlongByteSwap -@ cdecl -ret64 RtlUlonglongByteSwap(int64) +@ stdcall -fastcall -arch=i386 -norelay RtlUlonglongByteSwap(int64) # @ stub RtlUnhandledExceptionFilter2 # @ stub RtlUnhandledExceptionFilter @ stdcall RtlUnicodeStringToAnsiSize(ptr) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 5ff6205fe05..00bc16bbfa5 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -641,10 +641,14 @@ DWORD WINAPI RtlComputeCrc32(DWORD dwInitial, const BYTE *pData, INT iLen) * RETURNS * The value with its bytes swapped. */ -ULONGLONG __cdecl RtlUlonglongByteSwap(ULONGLONG i) -{ - return ((ULONGLONG)RtlUlongByteSwap(i) << 32) | RtlUlongByteSwap(i>>32); -} +#ifdef __i386__ +__ASM_FASTCALL_FUNC(RtlUlonglongByteSwap, 8, + "movl 4(%esp),%edx\n\t" + "bswap %edx\n\t" + "movl 8(%esp),%eax\n\t" + "bswap %eax\n\t" + "ret $8") +#endif /************************************************************************* * RtlUlongByteSwap [NTDLL.@] diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 2e0bfb650e4..8f698454957 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -68,7 +68,7 @@ static VOID (WINAPI *pRtlMoveMemory)(LPVOID,LPCVOID,SIZE_T); static VOID (WINAPI *pRtlFillMemory)(LPVOID,SIZE_T,BYTE); static VOID (WINAPI *pRtlFillMemoryUlong)(LPVOID,SIZE_T,ULONG); static VOID (WINAPI *pRtlZeroMemory)(LPVOID,SIZE_T); -static ULONGLONG (WINAPIV *pRtlUlonglongByteSwap)(ULONGLONG source); +static ULONGLONG (FASTCALL *pRtlUlonglongByteSwap)(ULONGLONG source); static DWORD (WINAPI *pRtlGetThreadErrorMode)(void); static NTSTATUS (WINAPI *pRtlSetThreadErrorMode)(DWORD, LPDWORD); static NTSTATUS (WINAPI *pRtlIpv4AddressToStringExA)(const IN_ADDR *, USHORT, LPSTR, PULONG); @@ -319,18 +319,22 @@ static void test_RtlZeroMemory(void) static void test_RtlUlonglongByteSwap(void) { - ULONGLONG result; + ULONGLONG llresult; - if ( !pRtlUlonglongByteSwap ) +#ifdef _WIN64 + /* the Rtl*ByteSwap() are always inlined and not exported from ntdll on 64bit */ + llresult = RtlUlonglongByteSwap( 0x7654321087654321ull ); + ok( 0x2143658710325476 == llresult, + "inlined RtlUlonglongByteSwap() returns %#I64x\n", llresult ); +#else + ok( pRtlUlonglongByteSwap != NULL, "RtlUlonglongByteSwap is not available\n"); + if ( pRtlUlonglongByteSwap ) { - win_skip("RtlUlonglongByteSwap is not available\n"); - return; + llresult = pRtlUlonglongByteSwap( 0x7654321087654321ull ); + ok( 0x2143658710325476ull == llresult, + "ntdll.RtlUlonglongByteSwap() returns %#I64x\n", llresult ); } - - result = pRtlUlonglongByteSwap( ((ULONGLONG)0x76543210 << 32) | 0x87654321 ); - ok( (((ULONGLONG)0x21436587 << 32) | 0x10325476) == result, - "RtlUlonglongByteSwap(0x7654321087654321) returns 0x%s, expected 0x2143658710325476\n", - wine_dbgstr_longlong(result)); +#endif } diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index ce92f6805ab..9548eb98542 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2185,6 +2185,19 @@ LONG FASTCALL NTOSKRNL_InterlockedIncrement( LONG volatile *dest ) return InterlockedIncrement( dest ); } +#ifdef __i386__ + +/************************************************************************* + * RtlUlonglongByteSwap (NTOSKRNL.EXE.@) + */ +__ASM_FASTCALL_FUNC(RtlUlonglongByteSwap, 8, + "movl 4(%esp),%edx\n\t" + "bswap %edx\n\t" + "movl 8(%esp),%eax\n\t" + "bswap %eax\n\t" + "ret $8") + +#endif /* __i386__ */ /*********************************************************************** * ExAllocatePool (NTOSKRNL.EXE.@) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 0a484829ca3..321083e5ac4 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -68,7 +68,7 @@ @ stdcall -fastcall ObfReferenceObject(ptr) @ stub RtlPrefetchMemoryNonTemporal @ cdecl -i386 -norelay RtlUlongByteSwap() -@ cdecl -ret64 RtlUlonglongByteSwap(int64) +@ stdcall -fastcall -arch=i386 -norelay RtlUlonglongByteSwap(int64) @ cdecl -i386 -norelay RtlUshortByteSwap() @ stub WmiGetClock @ stub Kei386EoiHelper diff --git a/include/winternl.h b/include/winternl.h index 5a99827fe65..c720d962933 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4567,7 +4567,6 @@ NTSYSAPI BOOLEAN WINAPI RtlTryAcquireSRWLockExclusive(RTL_SRWLOCK *); NTSYSAPI BOOLEAN WINAPI RtlTryAcquireSRWLockShared(RTL_SRWLOCK *); NTSYSAPI BOOL WINAPI RtlTryEnterCriticalSection(RTL_CRITICAL_SECTION *); NTSYSAPI NTSTATUS WINAPI RtlUTF8ToUnicodeN(WCHAR*,DWORD,DWORD*,const char*,DWORD); -NTSYSAPI ULONGLONG __cdecl RtlUlonglongByteSwap(ULONGLONG); NTSYSAPI DWORD WINAPI RtlUnicodeStringToAnsiSize(const UNICODE_STRING*); NTSYSAPI NTSTATUS WINAPI RtlUnicodeStringToAnsiString(PANSI_STRING,PCUNICODE_STRING,BOOLEAN); NTSYSAPI NTSTATUS WINAPI RtlUnicodeStringToInteger(const UNICODE_STRING *,ULONG,ULONG *); @@ -4733,20 +4732,20 @@ static inline BOOLEAN RtlCheckBit(PCRTL_BITMAP lpBits, ULONG ulBit) return FALSE; } -/* These are implemented as __fastcall, so we can't let Winelib apps link with them */ +/* These are implemented as __fastcall, so we can't let Winelib apps link with them. + * Moreover, they're always inlined and not exported on 64bit systems. + */ static inline USHORT RtlUshortByteSwap(USHORT s) { return (s >> 8) | (s << 8); } static inline ULONG RtlUlongByteSwap(ULONG i) { -#if defined(__i386__) && defined(__GNUC__) - ULONG ret; - __asm__("bswap %0" : "=r" (ret) : "0" (i) ); - return ret; -#else return ((ULONG)RtlUshortByteSwap((USHORT)i) << 16) | RtlUshortByteSwap((USHORT)(i >> 16)); -#endif +} +static inline ULONGLONG RtlUlonglongByteSwap(ULONGLONG i) +{ + return ((ULONGLONG)RtlUlongByteSwap((ULONG)i) << 32) | RtlUlongByteSwap((ULONG)(i >> 32)); } /* list manipulation macros */

1 0

Piotr Caban : shell32: Add partial ControlPanel GetAttributesOf implementation.
by Alexandre Julliard Dec. 16, 2022

Dec. 16, 2022

Module: wine Branch: master Commit: 68e57283c3f68c69b5277e4a522bf295be223b3a URL: https://gitlab.winehq.org/wine/wine/-/commit/68e57283c3f68c69b5277e4a522bf2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 15 21:45:01 2022 +0100 shell32: Add partial ControlPanel GetAttributesOf implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52394 --- dlls/shell32/cpanelfolder.c | 39 ++++++++++++++++++++++++++++--- dlls/shell32/tests/shlfolder.c | 53 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/cpanelfolder.c b/dlls/shell32/cpanelfolder.c index 9619128d8b0..a45d36f35b0 100644 --- a/dlls/shell32/cpanelfolder.c +++ b/dlls/shell32/cpanelfolder.c @@ -536,6 +536,34 @@ static HRESULT WINAPI ISF_ControlPanel_fnCreateViewObject(IShellFolder2 *iface, return hr; } +static BOOL validate_name_space(const ITEMIDLIST *pidl) +{ + HKEY hkey, hitem; + WCHAR *guidW; + GUID *guid; + LSTATUS r; + + if (!_ILIsPidlSimple(pidl)) + return FALSE; + + guid = _ILGetGUIDPointer(pidl); + if (!guid) + return FALSE; + if (StringFromCLSID(guid, &guidW) != S_OK) + return FALSE; + + r = RegOpenKeyW(HKEY_LOCAL_MACHINE, name_spaceW, &hkey); + if (r == ERROR_SUCCESS) + { + r = RegOpenKeyW(hkey, guidW, &hitem); + if (r == ERROR_SUCCESS) + RegCloseKey(hitem); + RegCloseKey(hkey); + } + CoTaskMemFree(guidW); + return r == ERROR_SUCCESS; +} + /************************************************************************** * ISF_ControlPanel_fnGetAttributesOf */ @@ -559,12 +587,17 @@ static HRESULT WINAPI ISF_ControlPanel_fnGetAttributesOf(IShellFolder2 *iface, U while(cidl > 0 && *apidl) { pdump(*apidl); - SHELL32_GetItemAttributes(&This->IShellFolder2_iface, *apidl, rgfInOut); + + /* TODO: panel with GUID can contain sub-items but we don't support it yet */ + if (!(*rgfInOut & SFGAO_VALIDATE) || _ILGetCPanelPointer(*apidl) + || validate_name_space(*apidl)) + *rgfInOut &= SFGAO_CANLINK; + else + *rgfInOut &= SFGAO_VALIDATE; + apidl++; cidl--; } - /* make sure SFGAO_VALIDATE is cleared, some apps depend on that */ - *rgfInOut &= ~SFGAO_VALIDATE; TRACE("-- result=0x%08lx\n", *rgfInOut); return hr; diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 248fbd1df62..98064140107 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -956,6 +956,8 @@ static void test_GetAttributesOf(void) static WCHAR cTestDirW[] = {'t','e','s','t','d','i','r',0}; IShellFolder *IDesktopFolder, *testIShellFolder; ITEMIDLIST *newPIDL; + IEnumIDList *list; + ULONG fetch; int len; hr = SHGetDesktopFolder(&psfDesktop); @@ -1070,6 +1072,57 @@ static void test_GetAttributesOf(void) Cleanup(); + /* test Control Panel elements */ + hr = IShellFolder_ParseDisplayName(IDesktopFolder, NULL, NULL, + (WCHAR *)L"::{21EC2020-3AEA-1069-A2DD-08002B30309D}", NULL, &newPIDL, 0); + ok(hr == S_OK, "ParseDisplayName failed %08lx\n", hr); + hr = IShellFolder_BindToObject(IDesktopFolder, newPIDL, NULL, + &IID_IShellFolder, (void**)&testIShellFolder); + ok(hr == S_OK, "BindToObject failed %08lx\n", hr); + ILFree(newPIDL); + + hr = IShellFolder_EnumObjects(testIShellFolder, NULL, SHCONTF_NONFOLDERS, &list); + ok(hr == S_OK, "EnumObjects failed %08lx\n", hr); + + while (IEnumIDList_Next(list, 1, &newPIDL, &fetch) == S_OK) + { + WCHAR name[256]; + STRRET strret; + + hr = IShellFolder_GetDisplayNameOf(testIShellFolder, newPIDL, SHGDN_FORPARSING, &strret); + ok(hr == S_OK, "GetDisplayNameOf failed %08lx\n", hr); + StrRetToBufW(&strret, newPIDL, name, ARRAY_SIZE(name)); + + dwFlags = ~0; + hr = IShellFolder_GetAttributesOf(testIShellFolder, 1, + (LPCITEMIDLIST*)&newPIDL, &dwFlags); + ok(hr == S_OK, "ControlPanel->GetAttributesOf failed %08lx\n", hr); + ok(dwFlags == SFGAO_CANLINK || + broken(!wcsncmp(L"::{26EE0668-A00A-44D7-9371-BEB064C98683}\\", name, 41) + && dwFlags == SFGAO_VALIDATE), + "%s dwFlags = %08lx\n", debugstr_w(name), dwFlags); + ILFree(newPIDL); + } + IEnumIDList_Release(list); + + hr = IShellFolder_ParseDisplayName(IDesktopFolder, NULL, NULL, + (WCHAR*)L"c:\\", NULL, &newPIDL, 0); + ok(hr == S_OK, "ParseDisplayName failed %08lx\n", hr); + + dwFlags = ~0; + hr = IShellFolder_GetAttributesOf(testIShellFolder, 1, + (LPCITEMIDLIST*)&newPIDL, &dwFlags); + ok(hr == S_OK, "ControlPanel->GetAttributesOf failed %08lx\n", hr); + ok(dwFlags == SFGAO_VALIDATE, "dwFlags = %08lx\n", dwFlags); + + dwFlags = ~0 & ~SFGAO_VALIDATE; + hr = IShellFolder_GetAttributesOf(testIShellFolder, 1, + (LPCITEMIDLIST*)&newPIDL, &dwFlags); + ok(hr == S_OK, "ControlPanel->GetAttributesOf failed %08lx\n", hr); + ok(dwFlags == SFGAO_CANLINK, "dwFlags = %08lx\n", dwFlags); + + ILFree(newPIDL); + IShellFolder_Release(testIShellFolder); IShellFolder_Release(IDesktopFolder); }

1 0

Piotr Caban : shell32: Store NameSpace registry path in global variable.
by Alexandre Julliard Dec. 16, 2022

Dec. 16, 2022

Module: wine Branch: master Commit: e5c47b6a79c8a212057eda08691893743a3036a0 URL: https://gitlab.winehq.org/wine/wine/-/commit/e5c47b6a79c8a212057eda08691893… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 15 21:40:27 2022 +0100 shell32: Store NameSpace registry path in global variable. --- dlls/shell32/cpanelfolder.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/cpanelfolder.c b/dlls/shell32/cpanelfolder.c index 122c3180dd4..9619128d8b0 100644 --- a/dlls/shell32/cpanelfolder.c +++ b/dlls/shell32/cpanelfolder.c @@ -66,6 +66,8 @@ typedef struct { int dwAttributes; /* attributes returned by GetAttributesOf FIXME: use it */ } ICPanelImpl; +static const WCHAR name_spaceW[] = L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\ControlPanel\\NameSpace"; + static const IShellFolder2Vtbl vt_ShellFolder2; static const IPersistFolder2Vtbl vt_PersistFolder2; static const IShellExecuteHookWVtbl vt_ShellExecuteHookW; @@ -355,14 +357,14 @@ static int SHELL_RegisterRegistryCPanelApps(IEnumIDListImpl *list, HKEY hkey_roo return cnt; } -static int SHELL_RegisterCPanelFolders(IEnumIDListImpl *list, HKEY hkey_root, LPCSTR szRepPath) +static int SHELL_RegisterCPanelFolders(IEnumIDListImpl *list, HKEY hkey_root, const WCHAR *reg_path) { char name[MAX_PATH]; HKEY hkey; int cnt = 0; - if (RegOpenKeyA(hkey_root, szRepPath, &hkey) == ERROR_SUCCESS) + if (RegOpenKeyW(hkey_root, reg_path, &hkey) == ERROR_SUCCESS) { int idx = 0; for(;; ++idx) @@ -398,8 +400,7 @@ static BOOL CreateCPanelEnumList(IEnumIDListImpl *list, DWORD dwFlags) /* enumerate control panel folders */ if (dwFlags & SHCONTF_FOLDERS) - SHELL_RegisterCPanelFolders(list, HKEY_LOCAL_MACHINE, - "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\ControlPanel\\NameSpace"); + SHELL_RegisterCPanelFolders(list, HKEY_LOCAL_MACHINE, name_spaceW); /* enumerate the control panel applets */ if (dwFlags & SHCONTF_NONFOLDERS)

1 0

Alexandre Julliard : winebuild: Disable relay for non-standard fastcall parameters.
by Alexandre Julliard Dec. 16, 2022

Dec. 16, 2022

Module: wine Branch: master Commit: cb86bb92d2c35ed0d42c5f5677d5068a52b49203 URL: https://gitlab.winehq.org/wine/wine/-/commit/cb86bb92d2c35ed0d42c5f5677d506… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 16 17:07:28 2022 +0100 winebuild: Disable relay for non-standard fastcall parameters. --- tools/winebuild/parser.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c index 11b422bd435..141ed80eb26 100644 --- a/tools/winebuild/parser.c +++ b/tools/winebuild/parser.c @@ -309,16 +309,9 @@ static int parse_spec_arguments( ORDDEF *odp, DLLSPEC *spec, int optional ) error( "A fastcall function must use the stdcall convention\n" ); return 0; } - if (!i || (odp->u.func.args[0] != ARG_PTR && odp->u.func.args[0] != ARG_LONG)) - { - error( "First argument of a fastcall function must be a pointer or integer\n" ); - return 0; - } - if (i > 1 && odp->u.func.args[1] != ARG_PTR && odp->u.func.args[1] != ARG_LONG) - { - error( "Second argument of a fastcall function must be a pointer or integer\n" ); - return 0; - } + if ((i && odp->u.func.args[0] != ARG_PTR && odp->u.func.args[0] != ARG_LONG) || + (i > 1 && odp->u.func.args[1] != ARG_PTR && odp->u.func.args[1] != ARG_LONG)) + odp->flags |= FLAG_NORELAY; /* no relay debug possible for non-standard fastcall args */ } if (odp->flags & FLAG_SYSCALL) {

1 0

Alexandre Julliard : winegcc: Check for Mingw-style .dll.a import libraries.
by Alexandre Julliard Dec. 16, 2022

Dec. 16, 2022

Module: wine Branch: master Commit: 3c235e053c7ca472b9169d0ef07b82c77843a549 URL: https://gitlab.winehq.org/wine/wine/-/commit/3c235e053c7ca472b9169d0ef07b82… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 16 15:49:00 2022 +0100 winegcc: Check for Mingw-style .dll.a import libraries. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53918 --- tools/winegcc/utils.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tools/winegcc/utils.c b/tools/winegcc/utils.c index a93db878379..f79bfdf5877 100644 --- a/tools/winegcc/utils.c +++ b/tools/winegcc/utils.c @@ -138,7 +138,15 @@ static file_type guess_lib_type(struct target target, const char* dir, if ((*file = try_lib_path(dir, "", prefix, library, ".def", file_def))) return file_dll; } - else arch_dir = get_arch_dir( target ); + else + { + arch_dir = get_arch_dir( target ); + if (!strcmp( suffix, ".a" )) /* try Mingw-style .dll.a import lib */ + { + if ((*file = try_lib_path(dir, arch_dir, prefix, library, ".dll.a", file_arh))) + return file_arh; + } + } /* static archives */ if ((*file = try_lib_path(dir, arch_dir, prefix, library, suffix, file_arh)))

1 0

Alexandre Julliard : winebuild: Use new ELF tag ids also on 64-bit.
by Alexandre Julliard Dec. 16, 2022

Dec. 16, 2022

Module: wine Branch: master Commit: df31d3c7fe6365f0fc4098487311e93e186b0417 URL: https://gitlab.winehq.org/wine/wine/-/commit/df31d3c7fe6365f0fc4098487311e9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 16 10:36:44 2022 +0100 winebuild: Use new ELF tag ids also on 64-bit. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53912 --- tools/winebuild/spec32.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 97022996c95..0cf8d783633 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -1517,9 +1517,9 @@ static void fixup_elf64( const char *name, int fd, void *header, size_t header_s { switch (dyn[i].d_tag) { - case 25: dyn[i].d_tag = 0x60009990; break; /* DT_INIT_ARRAY */ - case 27: dyn[i].d_tag = 0x60009991; break; /* DT_INIT_ARRAYSZ */ - case 12: dyn[i].d_tag = 0x60009992; break; /* DT_INIT */ + case 25: dyn[i].d_tag = 0x60009994; break; /* DT_INIT_ARRAY */ + case 27: dyn[i].d_tag = 0x60009995; break; /* DT_INIT_ARRAYSZ */ + case 12: dyn[i].d_tag = 0x60009996; break; /* DT_INIT */ } } lseek( fd, phdr->p_offset, SEEK_SET );

1 0

Eric Pouech : kernel32/tests: Fix a debugger test failing on Windows.
by Alexandre Julliard Dec. 15, 2022

Dec. 15, 2022

Module: wine Branch: master Commit: 6e19585112fd358470e7cf62be18fd6a1a5e7605 URL: https://gitlab.winehq.org/wine/wine/-/commit/6e19585112fd358470e7cf62be18fd… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Dec 15 17:36:32 2022 +0100 kernel32/tests: Fix a debugger test failing on Windows. Testing: kernel32:debugger, there's sometimes the following error: debugger.c:1760: Test failed: unexpected instruction pointer 778B2A0C Current test code has a workaround when this happens on last thread, but this is clearly not sufficient. Fix the test so that it grabs the thread context only in a place we're sure it's in stopped state at breakpoint instruction. (Current code likely catches cases where the thread is in bp signal handling). Rewrote the test to be in more logical order. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53143 --- dlls/kernel32/tests/debugger.c | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index abd59c93f88..1dc5bd5fb46 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -318,16 +318,6 @@ static void set_thread_context_(unsigned line, struct debugger_context *ctx, str ok_(__FILE__,line)(ret, "SetThreadContext failed: %lu\n", GetLastError()); } -static void fetch_process_context(struct debugger_context *ctx) -{ - struct debuggee_thread *thread; - - WINE_RB_FOR_EACH_ENTRY(thread, &ctx->threads, struct debuggee_thread, entry) - { - fetch_thread_context(thread); - } -} - #define WAIT_EVENT_TIMEOUT 20000 #define POLL_EVENT_TIMEOUT 200 @@ -1706,8 +1696,6 @@ static void test_debugger(const char *argv0) if (sizeof(loop_code) > 1) { - struct debuggee_thread *prev_thread; - memset(buf, OP_BP, sizeof(buf)); memcpy(proc_code, &loop_code, sizeof(loop_code)); ret = WriteProcessMemory(pi.hProcess, mem, buf, sizeof(buf), NULL); @@ -1735,9 +1723,6 @@ static void test_debugger(const char *argv0) expect_breakpoint_exception(&ctx, thread_proc + 1); exception_cnt = 1; - prev_thread = ctx.current_thread; - fetch_process_context(&ctx); - byte = 0xc3; /* ret */ ret = WriteProcessMemory(pi.hProcess, thread_proc + 1, &byte, 1, NULL); ok(ret, "WriteProcessMemory failed: %lu\n", GetLastError()); @@ -1746,6 +1731,10 @@ static void test_debugger(const char *argv0) { DEBUG_EVENT ev; + fetch_thread_context(ctx.current_thread); + ok(get_ip(&ctx.current_thread->ctx) == thread_proc + 2 + || broken(get_ip(&ctx.current_thread->ctx) == thread_proc), /* sometimes observed on win10 */ + "unexpected instruction pointer2 %p (%p)\n", get_ip(&ctx.current_thread->ctx), thread_proc); /* even when there are more pending events, they are not reported until current event is continued */ ret = WaitForDebugEvent(&ev, 10); ok(GetLastError() == ERROR_SEM_TIMEOUT, "WaitForDebugEvent returned %x(%lu)\n", ret, GetLastError()); @@ -1757,18 +1746,9 @@ static void test_debugger(const char *argv0) ctx.ev.u.Exception.ExceptionRecord.ExceptionCode); ok(ctx.ev.u.Exception.ExceptionRecord.ExceptionAddress == thread_proc + 1, "ExceptionAddress = %p\n", ctx.ev.u.Exception.ExceptionRecord.ExceptionAddress); - ok(get_ip(&prev_thread->ctx) == thread_proc + 2 - || broken(get_ip(&prev_thread->ctx) == thread_proc), /* sometimes observed on win10 */ - "unexpected instruction pointer %p\n", get_ip(&prev_thread->ctx)); - prev_thread = ctx.current_thread; exception_cnt++; } - /* for some reason sometimes on Windows one thread has a different address. this is always the thread - * with the last reported exception, so we simply skip the check for the last exception unless it's the only one. */ - if (exception_cnt == 1) - ok(get_ip(&prev_thread->ctx) == thread_proc + 2, "unexpected instruction pointer %p\n", get_ip(&prev_thread->ctx)); - trace("received %u exceptions\n", exception_cnt); for (;;)

1 0

Alexandre Julliard : d3d9/tests: Mark a few more message tests as flaky.
by Alexandre Julliard Dec. 15, 2022

Dec. 15, 2022

Module: wine Branch: master Commit: d3fa1962a07fbb35c742caeb2586cdbf5858d0e6 URL: https://gitlab.winehq.org/wine/wine/-/commit/d3fa1962a07fbb35c742caeb2586cd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 15 18:38:29 2022 +0100 d3d9/tests: Mark a few more message tests as flaky. --- dlls/d3d9/tests/d3d9ex.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index d1ea5587f3a..41f930a2408 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -3094,6 +3094,7 @@ static void test_wndproc(void) expect_messages = focus_loss_messages_filtered; windowposchanged_received = 0; SetForegroundWindow(GetDesktopWindow()); + flaky_wine ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it, i=%u.\n", expect_messages->message, expect_messages->window, i); flaky_if(i == 0 || i == 1) @@ -3112,8 +3113,10 @@ static void test_wndproc(void) syscommand_received = 0; expect_messages = sc_restore_messages; SendMessageA(focus_window, WM_SYSCOMMAND, SC_RESTORE, 0); + flaky_wine ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it, i=%u.\n", expect_messages->message, expect_messages->window, i); + flaky ok(syscommand_received == 1, "Got unexpected number of WM_SYSCOMMAND messages: %ld.\n", syscommand_received); expect_messages = NULL; flush_events();

1 0

Alex Henrie : po: Update Catalan translation.
by Alexandre Julliard Dec. 15, 2022

Dec. 15, 2022

Module: wine Branch: master Commit: ed0e5d9fc6b918d81136ee81cfd0d16790c35dfa URL: https://gitlab.winehq.org/wine/wine/-/commit/ed0e5d9fc6b918d81136ee81cfd0d1… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Dec 15 12:32:51 2022 -0700 po: Update Catalan translation. --- po/ca.po | 162 ++++++++++++++++++--------------------------------------------- 1 file changed, 46 insertions(+), 116 deletions(-)

1 0

Fabian Maurer : urlmon: Pass correct parameter to realloc and simplify code (Coverity).
by Alexandre Julliard Dec. 15, 2022

Dec. 15, 2022

Module: wine Branch: master Commit: 7a6eeb8c34d714241a65dc7c254e700eaf374c2e URL: https://gitlab.winehq.org/wine/wine/-/commit/7a6eeb8c34d714241a65dc7c254e70… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sun Dec 11 20:29:58 2022 +0100 urlmon: Pass correct parameter to realloc and simplify code (Coverity). Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/urlmon/sec_mgr.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index e6d1864b1e7..78e4c96fd60 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -1276,13 +1276,12 @@ static LPDWORD build_zonemap_from_reg(void) if (used == allocated) { LPDWORD new_data; + allocated *= 2; new_data = realloc(data, allocated * sizeof(DWORD)); if (!new_data) goto cleanup; - memset(new_data + allocated, 0, allocated * sizeof(DWORD)); data = new_data; - allocated *= 2; } data[used] = wcstol(name, NULL, 10); }

1 0

Paul Gofman : bcrypt/tests: Test BCRYPT_PAD_NONE encryption result in test_rsa_encrypt().
by Alexandre Julliard Dec. 15, 2022

Dec. 15, 2022

Module: wine Branch: master Commit: a88cc503653c06b612429d98e4e6174278687b94 URL: https://gitlab.winehq.org/wine/wine/-/commit/a88cc503653c06b612429d98e4e617… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Dec 14 20:13:03 2022 -0600 bcrypt/tests: Test BCRYPT_PAD_NONE encryption result in test_rsa_encrypt(). --- dlls/bcrypt/tests/bcrypt.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 3bcdda0cf47..5d1a80f330b 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -2262,6 +2262,14 @@ static UCHAR rsaPublicBlobWithInvalidPublicExpSize[] = 0x87, 0x75, 0x33, 0x15, 0xb8, 0xde, 0x32, 0x30, 0xb4, 0x5e, 0xfd }; +static const UCHAR rsa_encrypted_no_padding[] = +{ + 0x4a, 0xc1, 0xfa, 0x4f, 0xe0, 0x3f, 0x36, 0x9a, 0x64, 0xbf, 0x2e, 0x00, 0xb4, 0xb5, 0x40, 0xbe, + 0x2d, 0x9a, 0x14, 0xf6, 0x8f, 0xa5, 0xc2, 0xe2, 0x20, 0xaf, 0x21, 0x79, 0xc6, 0x32, 0x7e, 0xea, + 0x73, 0x00, 0x01, 0xbb, 0x9a, 0x19, 0x73, 0x41, 0x96, 0xae, 0x88, 0x6e, 0x36, 0x56, 0xe9, 0x9c, + 0xac, 0x04, 0x82, 0xa8, 0x00, 0xdb, 0x4e, 0x29, 0x61, 0x7e, 0xaf, 0x64, 0xdb, 0xa2, 0x70, 0x0f, +}; + static void test_rsa_encrypt(void) { static UCHAR input[] = "Hello World!"; @@ -2287,7 +2295,15 @@ static void test_rsa_encrypt(void) /* Not finalized key */ ret = BCryptEncrypt(key, input, sizeof(input), NULL, NULL, 0, NULL, 0, &encrypted_size, 0); ok(ret == STATUS_INVALID_HANDLE, "got %lx\n", ret); - BCryptFinalizeKeyPair(key, 0); + BCryptDestroyKey(key); + + /* Import a different public key first to make sure a public key from private key improted next + * overrides it. */ + ret = BCryptImportKeyPair(rsa, NULL, BCRYPT_RSAPUBLIC_BLOB, &key, rsaPublicBlob, sizeof(rsaPublicBlob), 0); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + + ret = BCryptImportKeyPair(rsa, NULL, BCRYPT_RSAPRIVATE_BLOB, &key, rsaPrivateBlob, sizeof(rsaPrivateBlob), 0); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); todo_wine { /* No padding */ @@ -2313,6 +2329,7 @@ static void test_rsa_encrypt(void) ret = BCryptEncrypt(key, input_no_padding, sizeof(input_no_padding), NULL, NULL, 0, encrypted_b, encrypted_size, &encrypted_size, BCRYPT_PAD_NONE); ok(ret == STATUS_SUCCESS, "got %lx\n", ret); ok(!memcmp(encrypted_a, encrypted_b, encrypted_size), "Both outputs should be the same\n"); + ok(!memcmp(encrypted_b, rsa_encrypted_no_padding, encrypted_size), "Data mismatch.\n"); BCryptDecrypt(key, encrypted_a, encrypted_size, NULL, NULL, 0, NULL, 0, &decrypted_size, BCRYPT_PAD_NONE); decrypted = malloc(decrypted_size);

1 0

Paul Gofman : bcrypt: Return correct error from key_asymmetric_encrypt() if key is missing.
by Alexandre Julliard Dec. 15, 2022

Dec. 15, 2022

Module: wine Branch: master Commit: 6f455e10afaf95f64008f45cdb5b794308275504 URL: https://gitlab.winehq.org/wine/wine/-/commit/6f455e10afaf95f64008f45cdb5b79… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Dec 15 09:25:40 2022 -0600 bcrypt: Return correct error from key_asymmetric_encrypt() if key is missing. --- dlls/bcrypt/gnutls.c | 2 ++ dlls/bcrypt/tests/bcrypt.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index bb79e885652..a67030a3ae0 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -2205,6 +2205,8 @@ static NTSTATUS key_asymmetric_encrypt( void *args ) NTSTATUS status = STATUS_SUCCESS; int ret; + if (!key_data(params->key)->a.pubkey) return STATUS_INVALID_HANDLE; + d.data = params->input; d.size = params->input_len; if ((ret = pgnutls_pubkey_encrypt_data(key_data(params->key)->a.pubkey, 0, &d, &e))) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 39cdd015c90..3bcdda0cf47 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -2284,12 +2284,12 @@ static void test_rsa_encrypt(void) ret = BCryptGenerateKeyPair(rsa, &key, 512, 0); ok(ret == STATUS_SUCCESS, "got %lx\n", ret); - todo_wine { /* Not finalized key */ ret = BCryptEncrypt(key, input, sizeof(input), NULL, NULL, 0, NULL, 0, &encrypted_size, 0); ok(ret == STATUS_INVALID_HANDLE, "got %lx\n", ret); BCryptFinalizeKeyPair(key, 0); + todo_wine { /* No padding */ memset(input_no_padding, 0, sizeof(input_no_padding)); strcpy((char *)input_no_padding, "Hello World");

1 0

Paul Gofman : bcrypt: Set pubkey from privkey in key_asymmetric_import().
by Alexandre Julliard Dec. 15, 2022

Dec. 15, 2022

Module: wine Branch: master Commit: e1fb63168756c73ebd97a8c7f3b3aba00c52e444 URL: https://gitlab.winehq.org/wine/wine/-/commit/e1fb63168756c73ebd97a8c7f3b3ab… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Dec 14 20:02:28 2022 -0600 bcrypt: Set pubkey from privkey in key_asymmetric_import(). --- dlls/bcrypt/gnutls.c | 39 ++++++++++++++++++++++++++++++--------- 1 file changed, 30 insertions(+), 9 deletions(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index a67030a3ae0..89e5c91776d 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -713,8 +713,6 @@ static NTSTATUS key_export_rsa_public( struct key *key, UCHAR *buf, ULONG len, U if (key_data(key)->a.pubkey) ret = pgnutls_pubkey_export_rsa_raw( key_data(key)->a.pubkey, &m, &e ); - else if (key_data(key)->a.privkey) - ret = pgnutls_privkey_export_rsa_raw( key_data(key)->a.privkey, &m, &e, NULL, NULL, NULL, NULL, NULL, NULL ); else return STATUS_INVALID_PARAMETER; @@ -781,8 +779,6 @@ static NTSTATUS key_export_ecc_public( struct key *key, UCHAR *buf, ULONG len, U if (key_data(key)->a.pubkey) ret = pgnutls_pubkey_export_ecc_raw( key_data(key)->a.pubkey, &curve, &x, &y ); - else if (key_data(key)->a.privkey) - ret = pgnutls_privkey_export_ecc_raw( key_data(key)->a.privkey, &curve, &x, &y, NULL ); else return STATUS_INVALID_PARAMETER; @@ -831,8 +827,6 @@ static NTSTATUS key_export_dsa_public( struct key *key, UCHAR *buf, ULONG len, U if (key_data(key)->a.pubkey) ret = pgnutls_pubkey_export_dsa_raw( key_data(key)->a.pubkey, &p, &q, &g, &y ); - else if (key_data(key)->a.privkey) - ret = pgnutls_privkey_export_dsa_raw( key_data(key)->a.privkey, &p, &q, &g, &y, NULL ); else return STATUS_INVALID_PARAMETER; @@ -1574,6 +1568,8 @@ static NTSTATUS key_asymmetric_import( void *args ) const struct key_asymmetric_import_params *params = args; struct key *key = params->key; unsigned flags = params->flags; + gnutls_pubkey_t pubkey; + NTSTATUS ret; switch (key->alg_id) { @@ -1583,13 +1579,15 @@ static NTSTATUS key_asymmetric_import( void *args ) case ALG_ID_ECDSA_P384: if (flags & KEY_IMPORT_FLAG_PUBLIC) return key_import_ecc_public( key, params->buf, params->len ); - return key_import_ecc( key, params->buf, params->len ); + ret = key_import_ecc( key, params->buf, params->len ); + break; case ALG_ID_RSA: case ALG_ID_RSA_SIGN: if (flags & KEY_IMPORT_FLAG_PUBLIC) return key_import_rsa_public( key, params->buf, params->len ); - return key_import_rsa( key, params->buf, params->len ); + ret = key_import_rsa( key, params->buf, params->len ); + break; case ALG_ID_DSA: if (flags & KEY_IMPORT_FLAG_PUBLIC) @@ -1599,7 +1597,10 @@ static NTSTATUS key_asymmetric_import( void *args ) return key_import_dsa_public( key, params->buf, params->len ); } if (key->u.a.flags & KEY_FLAG_LEGACY_DSA_V2) - return key_import_dsa_capi( key, params->buf, params->len ); + { + ret = key_import_dsa_capi( key, params->buf, params->len ); + break; + } FIXME( "DSA private key not supported\n" ); return STATUS_NOT_IMPLEMENTED; @@ -1607,6 +1608,26 @@ static NTSTATUS key_asymmetric_import( void *args ) FIXME( "algorithm %u not yet supported\n", key->alg_id ); return STATUS_NOT_IMPLEMENTED; } + + if (ret) return ret; + + if ((ret = pgnutls_pubkey_init( &pubkey ))) + { + pgnutls_perror( ret ); + return STATUS_INTERNAL_ERROR; + } + + if (pgnutls_pubkey_import_privkey( pubkey, key_data(params->key)->a.privkey, 0, 0 )) + { + /* Imported private key may be legitimately missing public key, so ignore the failure here. */ + pgnutls_pubkey_deinit( pubkey ); + } + else + { + if (key_data(key)->a.pubkey) pgnutls_pubkey_deinit( key_data(key)->a.pubkey ); + key_data(key)->a.pubkey = pubkey; + } + return STATUS_SUCCESS; } static NTSTATUS prepare_gnutls_signature_dsa( struct key *key, UCHAR *signature, ULONG signature_len,

1 0

Paul Gofman : bcrypt: Use SecureZeroMemory() to zero magic values before free.
by Alexandre Julliard Dec. 15, 2022

Dec. 15, 2022

Module: wine Branch: master Commit: a7efc770f7b1e1da959367e3186d871dce50c6e2 URL: https://gitlab.winehq.org/wine/wine/-/commit/a7efc770f7b1e1da959367e3186d87… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Dec 14 21:13:12 2022 -0600 bcrypt: Use SecureZeroMemory() to zero magic values before free. The compiler may optimize out the assignment before free and then second free on the bcrypt handle finds magic values in the freed memory. --- dlls/bcrypt/bcrypt_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 72501faf90e..cf05e8b4d44 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -397,7 +397,7 @@ NTSTATUS WINAPI BCryptOpenAlgorithmProvider( BCRYPT_ALG_HANDLE *handle, const WC static void destroy_object( struct object *obj ) { - obj->magic = 0; + SecureZeroMemory( &obj->magic, sizeof(obj->magic) ); free( obj ); }

1 0

Zebediah Figura : win32u: Set the width and height when creating a caret from an existing bitmap.
by Alexandre Julliard Dec. 15, 2022

Dec. 15, 2022

Module: wine Branch: master Commit: 30398d6f3350914fc1bc127eaa43279d5e30bd0e URL: https://gitlab.winehq.org/wine/wine/-/commit/30398d6f3350914fc1bc127eaa4327… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Dec 14 14:13:45 2022 -0600 win32u: Set the width and height when creating a caret from an existing bitmap. This was omitted in b8732c80b11. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53485 --- dlls/win32u/input.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index eaad697a63e..fd16d03f733 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -1843,6 +1843,8 @@ BOOL WINAPI NtUserCreateCaret( HWND hwnd, HBITMAP bitmap, int width, int height BITMAP bitmap_data; if (!NtGdiExtGetObjectW( bitmap, sizeof(bitmap_data), &bitmap_data )) return FALSE; + width = bitmap_data.bmWidth; + height = bitmap_data.bmHeight; caret_bitmap = NtGdiCreateBitmap( bitmap_data.bmWidth, bitmap_data.bmHeight, bitmap_data.bmPlanes, bitmap_data.bmBitsPixel, NULL ); if (caret_bitmap)

1 0

Sven Baars : win32u: Account for 16-bit instances in find_class().
by Alexandre Julliard Dec. 15, 2022

Dec. 15, 2022

Module: wine Branch: master Commit: d904f84ed01edc7ec56fbd736c3610057c5173b2 URL: https://gitlab.winehq.org/wine/wine/-/commit/d904f84ed01edc7ec56fbd736c3610… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Wed Dec 14 17:17:12 2022 +0100 win32u: Account for 16-bit instances in find_class(). This mimics the condition in the server. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53384 --- dlls/win32u/class.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/win32u/class.c b/dlls/win32u/class.c index b18fd69edfc..9f3b4251e65 100644 --- a/dlls/win32u/class.c +++ b/dlls/win32u/class.c @@ -353,8 +353,9 @@ static void release_class_ptr( CLASS *ptr ) static CLASS *find_class( HINSTANCE module, UNICODE_STRING *name ) { ATOM atom = get_int_atom_value( name ); - ULONG_PTR instance = (UINT_PTR)module & ~0xffff; + ULONG_PTR instance = (UINT_PTR)module; CLASS *class; + int is_win16; user_lock(); LIST_FOR_EACH_ENTRY( class, &class_list, CLASS, entry ) @@ -368,7 +369,9 @@ static CLASS *find_class( HINSTANCE module, UNICODE_STRING *name ) if (wcsnicmp( class->name, name->Buffer, name->Length / sizeof(WCHAR) ) || class->name[name->Length / sizeof(WCHAR)]) continue; } - if (!class->local || !module || (class->instance & ~0xffff) == instance) + is_win16 = !(class->instance >> 16); + if (!instance || !class->local || class->instance == instance || + (!is_win16 && ((class->instance & ~0xffff) == (instance & ~0xffff)))) { TRACE( "%s %lx -> %p\n", debugstr_us(name), instance, class ); return class;

1 0

Gabriel Ivăncescu : jscript: Fix array ref leak when setting element.
by Alexandre Julliard Dec. 15, 2022

Dec. 15, 2022

Module: wine Branch: master Commit: d1f176b49749dafd42c2ff349ff228d9a2b052d5 URL: https://gitlab.winehq.org/wine/wine/-/commit/d1f176b49749dafd42c2ff349ff228… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Dec 14 22:06:07 2022 +0200 jscript: Fix array ref leak when setting element. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/engine.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 28ada7e53bd..b0557065e69 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1684,7 +1684,7 @@ static HRESULT interp_carray_set(script_ctx_t *ctx) array = stack_top(ctx); assert(is_object_instance(array)); - hres = jsdisp_propput_idx(iface_to_jsdisp(get_object(array)), index, value); + hres = jsdisp_propput_idx(to_jsdisp(get_object(array)), index, value); jsval_release(value); return hres; }

1 0

Gabriel Ivăncescu : jscript: Fix refcount trace's long type format specifier.
by Alexandre Julliard Dec. 15, 2022

Dec. 15, 2022

Module: wine Branch: master Commit: b77255f88b1f54c4ceea5713367f2fc82030f2bc URL: https://gitlab.winehq.org/wine/wine/-/commit/b77255f88b1f54c4ceea5713367f2f… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Dec 14 22:06:07 2022 +0200 jscript: Fix refcount trace's long type format specifier. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/dispex.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 06e44fcb129..2c35f2ae9cc 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -2247,7 +2247,7 @@ void jsdisp_free(jsdisp_t *obj) jsdisp_t *jsdisp_addref(jsdisp_t *jsdisp) { ULONG ref = ++jsdisp->ref; - TRACE("(%p) ref=%d\n", jsdisp, ref); + TRACE("(%p) ref=%ld\n", jsdisp, ref); return jsdisp; } @@ -2255,7 +2255,7 @@ void jsdisp_release(jsdisp_t *jsdisp) { ULONG ref = --jsdisp->ref; - TRACE("(%p) ref=%d\n", jsdisp, ref); + TRACE("(%p) ref=%ld\n", jsdisp, ref); if(!ref) jsdisp_free(jsdisp);

1 0

Gabriel Ivăncescu : jscript: Release converted args after invoking.
by Alexandre Julliard Dec. 15, 2022

Dec. 15, 2022

Module: wine Branch: master Commit: 2ecf699dca93c44dd14ee93cc4d47617dd7b6479 URL: https://gitlab.winehq.org/wine/wine/-/commit/2ecf699dca93c44dd14ee93cc4d476… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Dec 14 22:06:07 2022 +0200 jscript: Release converted args after invoking. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/dispex.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 04632f4c755..06e44fcb129 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1937,6 +1937,8 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc else hres = jsdisp_call_value(This, passed_this ? jsval_disp(passed_this) : jsval_undefined(), wFlags, argc, argv, pvarRes ? &r : NULL); + while(argc--) + jsval_release(argv[argc]); if(argv != buf) free(argv); if(SUCCEEDED(hres) && pvarRes) {

1 0

Gabriel Ivăncescu : mshtml: Fix document fragment's inner window leak.
by Alexandre Julliard Dec. 15, 2022

Dec. 15, 2022

Module: wine Branch: master Commit: d38c1c1076d04089eedc47fa532ed8ec0e69a5ee URL: https://gitlab.winehq.org/wine/wine/-/commit/d38c1c1076d04089eedc47fa532ed8… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Dec 14 22:06:07 2022 +0200 mshtml: Fix document fragment's inner window leak. Document fragments own reference to the inner window, so it must be unlinked. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmldoc.c | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 49640cff9da..90c4706abee 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5846,12 +5846,6 @@ void detach_document_node(HTMLDocumentNode *doc) doc->catmgr = NULL; } - if(!doc->dom_document && doc->window) { - /* document fragments own reference to inner window */ - IHTMLWindow2_Release(&doc->window->base.IHTMLWindow2_iface); - doc->window = NULL; - } - if(doc->browser) { list_remove(&doc->browser_entry); doc->browser = NULL; @@ -5935,6 +5929,19 @@ static HRESULT HTMLDocumentFragment_clone(HTMLDOMNode *iface, nsIDOMNode *nsnode return S_OK; } +static void HTMLDocumentFragment_unlink(HTMLDOMNode *iface) +{ + HTMLDocumentNode *This = impl_from_HTMLDOMNode(iface); + + if(This->window) { + detach_document_node(This); + + /* document fragments own reference to inner window */ + IHTMLWindow2_Release(&This->window->base.IHTMLWindow2_iface); + This->window = NULL; + } +} + static inline HTMLDocumentNode *impl_from_DispatchEx(DispatchEx *iface) { return CONTAINING_RECORD(iface, HTMLDocumentNode, node.event_target.dispex); @@ -6134,7 +6141,21 @@ static const NodeImplVtbl HTMLDocumentFragmentImplVtbl = { HTMLDocumentNode_QI, HTMLDocumentNode_destructor, HTMLDocumentNode_cpc, - HTMLDocumentFragment_clone + HTMLDocumentFragment_clone, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + HTMLDocumentFragment_unlink }; static const tid_t HTMLDocumentNode_iface_tids[] = {

1 0

Gabriel Ivăncescu : mshtml: Fix previous EventObj leak.
by Alexandre Julliard Dec. 15, 2022

Dec. 15, 2022

Module: wine Branch: master Commit: 10a6b80811af5965a393cfb62bb4e057f30184dd URL: https://gitlab.winehq.org/wine/wine/-/commit/10a6b80811af5965a393cfb62bb4e0… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Dec 14 22:06:07 2022 +0200 mshtml: Fix previous EventObj leak. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlevent.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 45db4719b10..bcde9f38bba 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -3683,11 +3683,14 @@ static HRESULT dispatch_event_object(EventTarget *event_target, DOMEvent *event, *r = variant_bool(!event->prevent_default); if(target_vtbl && target_vtbl->set_current_event) { - prev_event = target_vtbl->set_current_event(&event_target->dispex, prev_event); - if(prev_event) - IHTMLEventObj_Release(prev_event); + IHTMLEventObj *prev = target_vtbl->set_current_event(&event_target->dispex, prev_event); + if(prev) + IHTMLEventObj_Release(prev); } + if(prev_event) + IHTMLEventObj_Release(prev_event); + if(event_info[event->event_id].flags & EVENT_HASDEFAULTHANDLERS) { BOOL prevent_default = event->prevent_default; for(i = 0; !prevent_default && i < chain_cnt; i++) {

1 0

Francois Gouget : winetest/build-patterns: Fix the summary pattern for the success case.
by Alexandre Julliard Dec. 15, 2022

Dec. 15, 2022

Module: tools Branch: master Commit: e2c6973cac94d42664f786b94387ce21a3116d3a URL: https://gitlab.winehq.org/winehq/tools/-/commit/e2c6973cac94d42664f786b9438… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Dec 11 04:07:17 2022 +0100 winetest/build-patterns: Fix the summary pattern for the success case. The data for the summary pattern is stored under the "0" pseudo-test name. But that pseudo-test was never marked as present so that if no other test failed it would be marked as 'missing in this build' instead of as 'successful run'. --- winetest/build-patterns | 1 + 1 file changed, 1 insertion(+) diff --git a/winetest/build-patterns b/winetest/build-patterns index 14b1917c..d541d5a2 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -366,6 +366,7 @@ foreach my $build (@sortedbuilds) $reports{$reportdir} = $report; } $build->{hasreport}->{$reportdir} = 1; + $build->{hastest}->{0} = 1; # summary results are present in all builds } while (my $line = <$fh>)

1 0