December 2022 - Wine-commits

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

21 Dec '22

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

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

21 Dec '22

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

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

21 Dec '22

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 21 Dec '22

21 Dec '22

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

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

21 Dec '22

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

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

21 Dec '22

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

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

21 Dec '22

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

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

21 Dec '22

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

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

21 Dec '22

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 21 Dec '22

21 Dec '22

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