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