- Wine-Devel - list.winehq.org

[PATCH 7/9] winemac.drv: Silence ImeSetActiveContext fixme.
by Piotr Caban Oct. 15, 2021

Oct. 15, 2021

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/winemac.drv/ime.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)

1 0

[PATCH 3/9] imm32: Use ImmSetActiveContext in ImmAssociateContext.
by Piotr Caban Oct. 15, 2021

Oct. 15, 2021

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/imm32/imm.c | 34 ++++++++++++---------------------- dlls/imm32/tests/imm32.c | 26 ++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 22 deletions(-)

1 0

[PATCH 2/9] imm32: Exit on invalid window in ImmAssociateContext.
by Piotr Caban Oct. 15, 2021

Oct. 15, 2021

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/imm32/imm.c | 45 +++++++++++++++++++++------------------------ 1 file changed, 21 insertions(+), 24 deletions(-)

1 0

[PATCH 1/9] imm32: Add ImmSetActiveContext implementation.
by Piotr Caban Oct. 15, 2021

Oct. 15, 2021

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/imm32/imm.c | 28 ++++++++++++++++++ dlls/imm32/imm32.spec | 2 +- dlls/imm32/tests/imm32.c | 62 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 91 insertions(+), 1 deletion(-)

1 0

[PATCH 1/7] user32/tests: Add a test for child window destruction on thread exit.
by Rémi Bernon Oct. 15, 2021

Oct. 15, 2021

On thread destroy, a WM_WINE_DESTROYWINDOW is sent to the child windows living in other threads. There's then a race condition between these threads peeking for messages and the current thread detaching its child windows from their threads and clearing their message queues, and the message may never be received from these threads and the windows kept alive. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/user32/tests/win.c | 240 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 240 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 6b13d93be14..00e20719ba7 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -719,6 +719,245 @@ static void test_enum_thread_windows(void) CloseHandle( handle ); } +struct test_thread_exit_parent_params +{ + HWND hwnd; + HANDLE created_event; + HANDLE stop_event; +}; + +static DWORD CALLBACK test_thread_exit_parent_thread( void *args ) +{ + struct test_thread_exit_parent_params *params = args; + DWORD ret; + MSG msg; + + params->hwnd = CreateWindowW( L"static", L"parent", WS_OVERLAPPEDWINDOW|WS_VISIBLE, + 100, 100, 200, 200, 0, 0, 0, NULL ); + ok( params->hwnd != 0, "CreateWindowExW failed, error %u\n", GetLastError() ); + flush_events( TRUE ); + SetEvent( params->created_event ); + + do + { + while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); + ret = MsgWaitForMultipleObjects( 1, &params->stop_event, FALSE, INFINITE, QS_ALLINPUT ); + } + while (ret != WAIT_OBJECT_0); + + return 0; +} + +static LRESULT CALLBACK test_thread_exit_wnd_proc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) +{ + if (msg == WM_USER) return 0xdeadbeef; + if (msg == WM_USER + 1) return 0xfeedcafe; + return DefWindowProcW( hwnd, msg, wp, lp ); +} + +static void test_thread_exit_destroy(void) +{ + struct test_thread_exit_parent_params params; + HWND adopter, child1, child2, child3; + WNDPROC old_wndproc, wndproc; + WCHAR buffer[MAX_PATH]; + HANDLE thread; + DWORD ret; + HRGN rgn; + HWND tmp; + MSG msg; + + params.created_event = CreateEventW( NULL, FALSE, FALSE, NULL ); + params.stop_event = CreateEventW( NULL, FALSE, FALSE, NULL ); + + adopter = CreateWindowW( L"static", L"adopter", WS_OVERLAPPEDWINDOW|WS_VISIBLE, + 300, 100, 200, 200, 0, 0, 0, NULL ); + ok( adopter != 0, "CreateWindowExW failed, error %u\n", GetLastError() ); + flush_events( TRUE ); + + thread = CreateThread( NULL, 0, test_thread_exit_parent_thread, &params, 0, NULL ); + ok( thread != 0, "CreateThread failed, error %u\n", GetLastError() ); + WaitForSingleObject( params.created_event, INFINITE ); + + child1 = CreateWindowW( L"static", L"child1", WS_CHILD|WS_VISIBLE, + 50, 50, 50, 50, params.hwnd, 0, 0, NULL ); + ok( child1 != 0, "CreateWindowExW failed, error %u\n", GetLastError() ); + child2 = CreateWindowW( L"static", L"child2", WS_CHILD|WS_VISIBLE, + 100, 50, 50, 50, params.hwnd, 0, 0, NULL ); + ok( child2 != 0, "CreateWindowExW failed, error %u\n", GetLastError() ); + child3 = CreateWindowW( L"static", L"child3", WS_CHILD|WS_VISIBLE, + 50, 100, 50, 50, params.hwnd, 0, 0, NULL ); + ok( child3 != 0, "CreateWindowExW failed, error %u\n", GetLastError() ); + flush_events( TRUE ); + + trace("parent %p adopter %p child1 %p child2 %p child3 %p\n", params.hwnd, adopter, child1, child2, child3); + + SetActiveWindow( child1 ); + SetFocus( child1 ); + SetCapture( child1 ); + + ok( GetActiveWindow() == params.hwnd, "GetActiveWindow %p, expected %p\n", GetActiveWindow(), params.hwnd ); + ok( GetFocus() == child1, "GetFocus %p, expected %p\n", GetFocus(), child1 ); + ok( GetCapture() == child1, "GetCapture %p, expected %p\n", GetCapture(), child1 ); + + ret = SetPropW( child1, L"myprop", UlongToHandle(0xdeadbeef) ); + ok( ret, "SetPropW failed, error %u\n", GetLastError() ); + ret = SetPropW( child2, L"myprop", UlongToHandle(0xdeadbeef) ); + ok( ret, "SetPropW failed, error %u\n", GetLastError() ); + + old_wndproc = (WNDPROC)GetWindowLongPtrW( child1, GWLP_WNDPROC ); + ok( old_wndproc != NULL, "GetWindowLongPtrW GWLP_WNDPROC failed, error %u\n", GetLastError() ); + + ret = GetWindowLongW( child1, GWL_STYLE ); + ok( ret == (WS_CHILD|WS_VISIBLE), "GetWindowLongW returned %#x\n", ret ); + + SetEvent( params.stop_event ); + ret = WaitForSingleObject( thread, INFINITE ); + ok( ret == WAIT_OBJECT_0, "WaitForSingleObject returned %#x\n", ret ); + CloseHandle( thread ); + + /* child windows should all still be alive but hidden */ + ret = IsWindow( child1 ); + ok( ret, "IsWindow returned %u\n", ret ); + ret = IsWindow( child2 ); + ok( ret, "IsWindow returned %u\n", ret ); + ret = IsWindow( child3 ); + ok( ret, "IsWindow returned %u\n", ret ); + + todo_wine + ok( GetActiveWindow() == adopter, "GetActiveWindow %p, expected %p\n", GetActiveWindow(), adopter ); + todo_wine + ok( GetFocus() == adopter, "GetFocus %p, expected %p\n", GetFocus(), adopter ); + todo_wine + ok( GetCapture() == child1, "GetCapture %p, expected %p\n", GetCapture(), child1 ); + + SetActiveWindow( child1 ); + SetFocus( child1 ); + SetCapture( child1 ); + + todo_wine + ok( GetActiveWindow() == adopter, "GetActiveWindow %p, expected %p\n", GetActiveWindow(), adopter ); + todo_wine + ok( GetFocus() == adopter, "GetFocus %p, expected %p\n", GetFocus(), adopter ); + todo_wine + ok( GetCapture() == child1, "GetCapture %p, expected %p\n", GetCapture(), child1 ); + + SetLastError( 0xdeadbeef ); + ret = GetWindowLongW( child1, GWL_STYLE ); + todo_wine + ok( ret == WS_CHILD, "GetWindowLongW returned %#x\n", ret ); + ok( GetLastError() == 0xdeadbeef, "GetWindowLongW error %u\n", GetLastError() ); + ret = SetWindowLongW( child1, GWL_STYLE, WS_CHILD|WS_VISIBLE ); + todo_wine + ok( ret, "SetWindowLongW failed, error %u\n", GetLastError() ); + ret = GetWindowLongW( child1, GWL_STYLE ); + ok( ret == (WS_CHILD|WS_VISIBLE), "GetWindowLongW returned %#x\n", ret ); + + /* and cannot be adopted */ + SetLastError( 0xdeadbeef ); + tmp = GetParent( child1 ); + ok( tmp == params.hwnd, "GetParent returned %p, error %u\n", tmp, GetLastError() ); + ok( GetLastError() == 0xdeadbeef, "GetWindowLongW error %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + tmp = SetParent( child1, adopter ); + ok( tmp == 0, "SetParent returned %p\n", tmp ); + todo_wine + ok( GetLastError() == ERROR_INVALID_PARAMETER, "got error %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + tmp = SetParent( child3, adopter ); + ok( tmp == 0, "SetParent returned %p\n", tmp ); + todo_wine + ok( GetLastError() == ERROR_INVALID_PARAMETER, "got error %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + tmp = GetParent( child1 ); + ok( tmp == params.hwnd, "GetParent returned %p, error %u\n", tmp, GetLastError() ); + ok( GetLastError() == 0xdeadbeef, "GetWindowLongW error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = GetWindowLongW( params.hwnd, GWL_STYLE ); + ok( ret == 0, "GetWindowLongW returned %#x\n", ret ); + ok( GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "GetWindowLongW error %u\n", GetLastError() ); + + wndproc = (WNDPROC)GetWindowLongPtrW( child1, GWLP_WNDPROC ); + ok( wndproc != NULL, "GetWindowLongPtrW GWLP_WNDPROC failed, error %u\n", GetLastError() ); + ok( wndproc == old_wndproc, "GetWindowLongPtrW GWLP_WNDPROC returned %p\n", wndproc ); + + tmp = GetPropW( child1, L"myprop" ); + todo_wine + ok( HandleToULong(tmp) == 0xdeadbeef, "GetPropW returned %p\n", tmp ); + tmp = GetPropW( child2, L"myprop" ); + todo_wine + ok( HandleToULong(tmp) == 0xdeadbeef, "GetPropW returned %p\n", tmp ); + + /* destroying child1 ourselves succeeds */ + ret = DestroyWindow( child1 ); + ok( ret, "DestroyWindow returned %u\n", ret ); + ret = DestroyWindow( child1 ); + ok( !ret, "DestroyWindow returned %u\n", ret ); + ret = IsWindow( child1 ); + ok( !ret, "IsWindow returned %u\n", ret ); + + tmp = GetPropW( child1, L"myprop" ); + ok( HandleToULong(tmp) == 0, "GetPropW returned %p\n", tmp ); + + /* child2 is still alive, for now */ + ret = IsWindow( child2 ); + ok( ret, "IsWindow returned %u\n", ret ); + + SetLastError( 0xdeadbeef ); + ret = SetWindowPos( child2, HWND_TOPMOST, 0, 0, 100, 100, SWP_NOSIZE|SWP_NOMOVE ); + ok( !ret, "SetWindowPos succeeded\n" ); + todo_wine + ok( GetLastError() == ERROR_INVALID_PARAMETER, "SetWindowPos returned error %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ret = SetWindowPos( child2, 0, 10, 10, 200, 200, SWP_NOZORDER | SWP_NOACTIVATE ); + ok( !ret, "SetWindowPos succeeded\n" ); + todo_wine + ok( GetLastError() == ERROR_INVALID_PARAMETER, "SetWindowPos returned error %u\n", GetLastError() ); + + rgn = CreateRectRgn( 5, 5, 15, 15 ); + SetLastError( 0xdeadbeef ); + ret = SetWindowRgn( child2, rgn, TRUE ); + todo_wine + ok( ret, "SetWindowRgn failed, error %u\n", GetLastError() ); + DeleteObject( rgn ); + + wndproc = (WNDPROC)SetWindowLongPtrW( child2, GWLP_WNDPROC, (LONG_PTR)test_thread_exit_wnd_proc ); + ret = SendMessageW( child2, WM_USER, 0, 0 ); + ok( ret == 0xdeadbeef, "SendMessageW returned %u, error %u\n", ret, GetLastError() ); + ret = SendMessageW( child2, WM_USER + 1, 0, 0 ); + ok( ret == 0xfeedcafe, "SendMessageW returned %u, error %u\n", ret, GetLastError() ); + ret = SendMessageW( child2, WM_USER + 2, 0, 0 ); + ok( ret == 0, "SendMessageW returned %u, error %u\n", ret, GetLastError() ); + + ret = GetWindowTextW( child2, buffer, ARRAY_SIZE(buffer) ); + ok( ret == 6, "GetWindowTextW returned %u\n", ret ); + ok( !wcscmp( buffer, L"child2" ), "GetWindowTextW returned %s\n", debugstr_w( buffer ) ); + ret = IsWindow( child2 ); + ok( ret, "IsWindow returned %u\n", ret ); + + /* but peeking any message should reap them all */ + PeekMessageW( &msg, child2, 0, 0, PM_REMOVE ); + + tmp = GetPropW( child2, L"myprop" ); + ok( HandleToULong(tmp) == 0, "GetPropW returned %p\n", tmp ); + + ret = IsWindow( child2 ); + todo_wine + ok( !ret, "IsWindow returned %u\n", ret ); + ret = IsWindow( child3 ); + todo_wine + ok( !ret, "IsWindow returned %u\n", ret ); + ret = DestroyWindow( child2 ); + todo_wine + ok( !ret, "DestroyWindow returned %u\n", ret ); + + DestroyWindow( adopter ); + + CloseHandle( params.created_event ); + CloseHandle( params.stop_event ); +} + static struct wm_gettext_override_data { BOOL enabled; /* when 1 bypasses default procedure */ @@ -12396,6 +12635,7 @@ START_TEST(win) test_CreateWindow(); test_parent_owner(); test_enum_thread_windows(); + test_thread_exit_destroy(); test_mdi(); test_icons(); -- 2.33.0

2 10

[PATCH 1/2] winebus.sys: Fix inverted SDL joystick hat switch y axis.
by Rémi Bernon Oct. 15, 2021

Oct. 15, 2021

SDL_HAT_UP should work as SDL_CONTROLLER_BUTTON_DPAD_UP. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40658 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winebus.sys/bus_sdl.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 4fb91e4dc6d..16e7a2f6f30 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -161,14 +161,14 @@ static void set_hat_value(struct unix_device *iface, int index, int value) switch (value) { case SDL_HAT_CENTERED: break; - case SDL_HAT_UP: y = 1; break; - case SDL_HAT_RIGHTUP: y = x = 1; break; + case SDL_HAT_DOWN: y = 1; break; + case SDL_HAT_RIGHTDOWN: y = x = 1; break; case SDL_HAT_RIGHT: x = 1; break; - case SDL_HAT_RIGHTDOWN: x = 1; y = -1; break; - case SDL_HAT_DOWN: y = -1; break; - case SDL_HAT_LEFTDOWN: x = y = -1; break; + case SDL_HAT_RIGHTUP: x = 1; y = -1; break; + case SDL_HAT_UP: y = -1; break; + case SDL_HAT_LEFTUP: x = y = -1; break; case SDL_HAT_LEFT: x = -1; break; - case SDL_HAT_LEFTUP: x = -1; y = 1; break; + case SDL_HAT_LEFTDOWN: x = -1; y = 1; break; } hid_device_set_hatswitch_x(iface, index, x); hid_device_set_hatswitch_y(iface, index, y); -- 2.33.0

1 1

[PATCH] wbemprox: Add WMI namespace
by Alistair Leslie-Hughes Oct. 15, 2021

Oct. 15, 2021

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wbemprox/builtin.c | 1 + dlls/wbemprox/wbemprox_private.h | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index d76602f4930..90bc5ae644f 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -4135,6 +4135,7 @@ builtin_namespaces[WBEMPROX_NAMESPACE_LAST] = { {L"cimv2", cimv2_builtin_classes, ARRAY_SIZE(cimv2_builtin_classes)}, {L"Microsoft\\Windows\\Storage", NULL, 0}, + {L"wmi", NULL, 0}, }; void init_table_list( void ) diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 6b94bbb9ef6..a2bf5071612 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -24,6 +24,7 @@ enum wbm_namespace { WBEMPROX_NAMESPACE_CIMV2, WBEMPROX_NAMESPACE_MS_WINDOWS_STORAGE, + WBEMPROX_NAMESPACE_WMI, WBEMPROX_NAMESPACE_LAST, }; -- 2.33.0

2 4

[PATCH 1/6] dinput: Add support for more HID axes usages.
by Rémi Bernon Oct. 15, 2021

Oct. 15, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/joystick_hid.c | 33 +++++++- dlls/dinput8/tests/hid.c | 157 +++++++++++++++++++++++-------------- 2 files changed, 128 insertions(+), 62 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 91b07f47cd8..03005964c67 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -229,6 +229,16 @@ static const GUID *object_usage_to_guid( USAGE usage_page, USAGE usage ) switch (usage_page) { case HID_USAGE_PAGE_BUTTON: return &GUID_Button; + case HID_USAGE_PAGE_SIMULATION: + switch (usage) + { + case HID_USAGE_SIMULATION_STEERING: return &GUID_XAxis; + case HID_USAGE_SIMULATION_ACCELERATOR: return &GUID_YAxis; + case HID_USAGE_SIMULATION_BRAKE: return &GUID_RzAxis; + case HID_USAGE_SIMULATION_RUDDER: return &GUID_RzAxis; + case HID_USAGE_SIMULATION_THROTTLE: return &GUID_Slider; + } + break; case HID_USAGE_PAGE_GENERIC: switch (usage) { @@ -378,7 +388,7 @@ static void check_pid_effect_axis_caps( struct hid_joystick *impl, DIDEVICEOBJEC static void set_axis_type( DIDEVICEOBJECTINSTANCEW *instance, BOOL *seen, DWORD i, DWORD *count ) { if (!seen[i]) instance->dwType = DIDFT_ABSAXIS | DIDFT_MAKEINSTANCE( i ); - else instance->dwType = DIDFT_ABSAXIS | DIDFT_MAKEINSTANCE( 6 + *count++ ); + else instance->dwType = DIDFT_ABSAXIS | DIDFT_MAKEINSTANCE( 6 + (*count)++ ); seen[i] = TRUE; } @@ -439,18 +449,37 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *header, set_axis_type( &instance, seen_axis, j - HID_USAGE_GENERIC_X, &axis ); instance.dwFlags = DIDOI_ASPECTPOSITION; break; + case MAKELONG(HID_USAGE_SIMULATION_STEERING, HID_USAGE_PAGE_SIMULATION): + set_axis_type( &instance, seen_axis, 0, &axis ); + instance.dwFlags = DIDOI_ASPECTPOSITION; + break; + case MAKELONG(HID_USAGE_SIMULATION_ACCELERATOR, HID_USAGE_PAGE_SIMULATION): + set_axis_type( &instance, seen_axis, 1, &axis ); + instance.dwFlags = DIDOI_ASPECTPOSITION; + break; case MAKELONG(HID_USAGE_GENERIC_WHEEL, HID_USAGE_PAGE_GENERIC): + case MAKELONG(HID_USAGE_SIMULATION_THROTTLE, HID_USAGE_PAGE_SIMULATION): set_axis_type( &instance, seen_axis, 2, &axis ); instance.dwFlags = DIDOI_ASPECTPOSITION; break; + case MAKELONG(HID_USAGE_SIMULATION_RUDDER, HID_USAGE_PAGE_SIMULATION): + case MAKELONG(HID_USAGE_SIMULATION_BRAKE, HID_USAGE_PAGE_SIMULATION): + set_axis_type( &instance, seen_axis, 5, &axis ); + instance.dwFlags = DIDOI_ASPECTPOSITION; + break; case MAKELONG(HID_USAGE_GENERIC_HATSWITCH, HID_USAGE_PAGE_GENERIC): instance.dwType = DIDFT_POV | DIDFT_MAKEINSTANCE( pov++ ); instance.dwFlags = 0; break; - default: + case MAKELONG(HID_USAGE_GENERIC_SLIDER, HID_USAGE_PAGE_GENERIC): + case MAKELONG(HID_USAGE_GENERIC_DIAL, HID_USAGE_PAGE_GENERIC): instance.dwType = DIDFT_ABSAXIS | DIDFT_MAKEINSTANCE( 6 + axis++ ); instance.dwFlags = DIDOI_ASPECTPOSITION; break; + default: + instance.dwType = DIDFT_ABSAXIS | DIDFT_MAKEINSTANCE( 6 + axis++ ); + instance.dwFlags = 0; + break; } instance.wUsagePage = caps->usage_page; instance.wUsage = j; diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index d42d3119785..8fda1289843 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -3451,12 +3451,15 @@ static void test_simple_joystick(void) USAGE(4, (0xff01u<<16)|(0x1234)), USAGE(1, HID_USAGE_GENERIC_X), USAGE(1, HID_USAGE_GENERIC_Y), + USAGE(4, (HID_USAGE_PAGE_SIMULATION<<16)|HID_USAGE_SIMULATION_RUDDER), + USAGE(4, (HID_USAGE_PAGE_DIGITIZER<<16)|HID_USAGE_DIGITIZER_TIP_PRESSURE), + USAGE(4, (HID_USAGE_PAGE_CONSUMER<<16)|HID_USAGE_CONSUMER_VOLUME), LOGICAL_MINIMUM(1, 0xe7), LOGICAL_MAXIMUM(1, 0x38), PHYSICAL_MINIMUM(1, 0xe7), PHYSICAL_MAXIMUM(1, 0x38), REPORT_SIZE(1, 8), - REPORT_COUNT(1, 4), + REPORT_COUNT(1, 7), INPUT(1, Data|Var|Abs), USAGE(1, HID_USAGE_GENERIC_HATSWITCH), @@ -3486,14 +3489,14 @@ static void test_simple_joystick(void) static const HIDP_CAPS hid_caps = { - .InputReportByteLength = 6, + .InputReportByteLength = 9, }; static const DIDEVCAPS expect_caps = { .dwSize = sizeof(DIDEVCAPS), .dwFlags = DIDC_ATTACHED | DIDC_EMULATED, .dwDevType = DIDEVTYPE_HID | (DI8DEVTYPEJOYSTICK_LIMITED << 8) | DI8DEVTYPE_JOYSTICK, - .dwAxes = 3, + .dwAxes = 6, .dwPOVs = 1, .dwButtons = 2, }; @@ -3501,27 +3504,27 @@ static void test_simple_joystick(void) { { .code = IOCTL_HID_READ_REPORT, - .report_buf = {1,0x10,0x10,0x10,0x10,0}, + .report_buf = {1,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0}, }, { .code = IOCTL_HID_READ_REPORT, - .report_buf = {1,0x10,0x10,0x38,0x38,0xf8}, + .report_buf = {1,0x10,0x10,0x38,0x38,0x10,0x10,0x10,0xf8}, }, { .code = IOCTL_HID_READ_REPORT, - .report_buf = {1,0x10,0x10,0x01,0x01,0x00}, + .report_buf = {1,0x10,0x10,0x01,0x01,0x10,0x10,0x10,0x00}, }, { .code = IOCTL_HID_READ_REPORT, - .report_buf = {1,0x10,0x10,0x01,0x01,0x00}, + .report_buf = {1,0x10,0x10,0x01,0x01,0x10,0x10,0x10,0x00}, }, { .code = IOCTL_HID_READ_REPORT, - .report_buf = {1,0x10,0x10,0x80,0x80,0xff}, + .report_buf = {1,0x10,0x10,0x80,0x80,0x10,0x10,0x10,0xff}, }, { .code = IOCTL_HID_READ_REPORT, - .report_buf = {1,0x10,0x10,0x10,0xee,0x54}, + .report_buf = {1,0x10,0x10,0x10,0xee,0x10,0x10,0x10,0x54}, }, }; static const struct DIJOYSTATE2 expect_state[] = @@ -3586,9 +3589,43 @@ static void test_simple_joystick(void) }; const DIDEVICEOBJECTINSTANCEW expect_objects[] = { + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_Unknown, + .dwType = DIDFT_ABSAXIS|DIDFT_MAKEINSTANCE(6), + .tszName = L"Volume", + .wCollectionNumber = 1, + .wUsagePage = HID_USAGE_PAGE_CONSUMER, + .wUsage = HID_USAGE_CONSUMER_VOLUME, + .wReportId = 1, + }, + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_Unknown, + .dwOfs = 0x4, + .dwType = DIDFT_ABSAXIS|DIDFT_MAKEINSTANCE(7), + .tszName = L"Tip Pressure", + .wCollectionNumber = 1, + .wUsagePage = HID_USAGE_PAGE_DIGITIZER, + .wUsage = HID_USAGE_DIGITIZER_TIP_PRESSURE, + .wReportId = 1, + }, + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_RzAxis, + .dwOfs = 0x8, + .dwType = DIDFT_ABSAXIS|DIDFT_MAKEINSTANCE(5), + .dwFlags = DIDOI_ASPECTPOSITION, + .tszName = L"Rudder", + .wCollectionNumber = 1, + .wUsagePage = HID_USAGE_PAGE_SIMULATION, + .wUsage = HID_USAGE_SIMULATION_RUDDER, + .wReportId = 1, + }, { .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), .guidType = GUID_YAxis, + .dwOfs = 0xc, .dwType = DIDFT_ABSAXIS|DIDFT_MAKEINSTANCE(1), .dwFlags = DIDOI_ASPECTPOSITION, .tszName = L"Y Axis", @@ -3600,7 +3637,7 @@ static void test_simple_joystick(void) { .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), .guidType = GUID_XAxis, - .dwOfs = 0x4, + .dwOfs = 0x10, .dwType = DIDFT_ABSAXIS|DIDFT_MAKEINSTANCE(0), .dwFlags = DIDOI_ASPECTPOSITION, .tszName = L"X Axis", @@ -3612,7 +3649,7 @@ static void test_simple_joystick(void) { .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), .guidType = GUID_ZAxis, - .dwOfs = 0xc, + .dwOfs = 0x18, .dwType = DIDFT_ABSAXIS|DIDFT_MAKEINSTANCE(2), .dwFlags = DIDOI_ASPECTPOSITION, .tszName = L"Wheel", @@ -3624,7 +3661,7 @@ static void test_simple_joystick(void) { .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), .guidType = GUID_POV, - .dwOfs = 0x10, + .dwOfs = 0x1c, .dwType = DIDFT_POV|DIDFT_MAKEINSTANCE(0), .tszName = L"Hat Switch", .wCollectionNumber = 1, @@ -3635,7 +3672,7 @@ static void test_simple_joystick(void) { .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), .guidType = GUID_Button, - .dwOfs = 0x14, + .dwOfs = 0x20, .dwType = DIDFT_PSHBUTTON|DIDFT_MAKEINSTANCE(0), .tszName = L"Button 0", .wCollectionNumber = 1, @@ -3646,7 +3683,7 @@ static void test_simple_joystick(void) { .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), .guidType = GUID_Button, - .dwOfs = 0x15, + .dwOfs = 0x21, .dwType = DIDFT_PSHBUTTON|DIDFT_MAKEINSTANCE(1), .tszName = L"Button 1", .wCollectionNumber = 1, @@ -4024,7 +4061,7 @@ static void test_simple_joystick(void) res = 0; hr = IDirectInputDevice8_EnumObjects( device, check_object_count, &res, DIDFT_AXIS | DIDFT_PSHBUTTON ); ok( hr == DI_OK, "EnumObjects returned %#x\n", hr ); - ok( res == 5, "got %u expected %u\n", res, 5 ); + ok( res == 8, "got %u expected %u\n", res, 8 ); hr = IDirectInputDevice8_EnumObjects( device, check_objects, &check_objects_params, DIDFT_ALL ); ok( hr == DI_OK, "EnumObjects returned %#x\n", hr ); ok( check_objects_params.index >= check_objects_params.expect_count, "missing %u objects\n", @@ -4045,21 +4082,21 @@ static void test_simple_joystick(void) hr = IDirectInputDevice8_GetObjectInfo( device, &objinst, res, DIPH_BYUSAGE ); ok( hr == DI_OK, "GetObjectInfo returned: %#x\n", hr ); - check_member( objinst, expect_objects[1], "%u", dwSize ); - check_member_guid( objinst, expect_objects[1], guidType ); - check_member( objinst, expect_objects[1], "%#x", dwOfs ); - check_member( objinst, expect_objects[1], "%#x", dwType ); - check_member( objinst, expect_objects[1], "%#x", dwFlags ); - if (!localized) todo_wine check_member_wstr( objinst, expect_objects[1], tszName ); - check_member( objinst, expect_objects[1], "%u", dwFFMaxForce ); - check_member( objinst, expect_objects[1], "%u", dwFFForceResolution ); - check_member( objinst, expect_objects[1], "%u", wCollectionNumber ); - check_member( objinst, expect_objects[1], "%u", wDesignatorIndex ); - check_member( objinst, expect_objects[1], "%#04x", wUsagePage ); - check_member( objinst, expect_objects[1], "%#04x", wUsage ); - check_member( objinst, expect_objects[1], "%#04x", dwDimension ); - check_member( objinst, expect_objects[1], "%#04x", wExponent ); - check_member( objinst, expect_objects[1], "%u", wReportId ); + check_member( objinst, expect_objects[4], "%u", dwSize ); + check_member_guid( objinst, expect_objects[4], guidType ); + check_member( objinst, expect_objects[4], "%#x", dwOfs ); + check_member( objinst, expect_objects[4], "%#x", dwType ); + check_member( objinst, expect_objects[4], "%#x", dwFlags ); + if (!localized) todo_wine check_member_wstr( objinst, expect_objects[4], tszName ); + check_member( objinst, expect_objects[4], "%u", dwFFMaxForce ); + check_member( objinst, expect_objects[4], "%u", dwFFForceResolution ); + check_member( objinst, expect_objects[4], "%u", wCollectionNumber ); + check_member( objinst, expect_objects[4], "%u", wDesignatorIndex ); + check_member( objinst, expect_objects[4], "%#04x", wUsagePage ); + check_member( objinst, expect_objects[4], "%#04x", wUsage ); + check_member( objinst, expect_objects[4], "%#04x", dwDimension ); + check_member( objinst, expect_objects[4], "%#04x", wExponent ); + check_member( objinst, expect_objects[4], "%u", wReportId ); hr = IDirectInputDevice8_GetObjectInfo( device, &objinst, 0x14, DIPH_BYOFFSET ); ok( hr == DIERR_NOTFOUND, "GetObjectInfo returned: %#x\n", hr ); @@ -4072,21 +4109,21 @@ static void test_simple_joystick(void) hr = IDirectInputDevice8_GetObjectInfo( device, &objinst, res, DIPH_BYID ); ok( hr == DI_OK, "GetObjectInfo returned: %#x\n", hr ); - check_member( objinst, expect_objects[5], "%u", dwSize ); - check_member_guid( objinst, expect_objects[5], guidType ); - check_member( objinst, expect_objects[5], "%#x", dwOfs ); - check_member( objinst, expect_objects[5], "%#x", dwType ); - check_member( objinst, expect_objects[5], "%#x", dwFlags ); - if (!localized) todo_wine check_member_wstr( objinst, expect_objects[5], tszName ); - check_member( objinst, expect_objects[5], "%u", dwFFMaxForce ); - check_member( objinst, expect_objects[5], "%u", dwFFForceResolution ); - check_member( objinst, expect_objects[5], "%u", wCollectionNumber ); - check_member( objinst, expect_objects[5], "%u", wDesignatorIndex ); - check_member( objinst, expect_objects[5], "%#04x", wUsagePage ); - check_member( objinst, expect_objects[5], "%#04x", wUsage ); - check_member( objinst, expect_objects[5], "%#04x", dwDimension ); - check_member( objinst, expect_objects[5], "%#04x", wExponent ); - check_member( objinst, expect_objects[5], "%u", wReportId ); + check_member( objinst, expect_objects[8], "%u", dwSize ); + check_member_guid( objinst, expect_objects[8], guidType ); + check_member( objinst, expect_objects[8], "%#x", dwOfs ); + check_member( objinst, expect_objects[8], "%#x", dwType ); + check_member( objinst, expect_objects[8], "%#x", dwFlags ); + if (!localized) todo_wine check_member_wstr( objinst, expect_objects[8], tszName ); + check_member( objinst, expect_objects[8], "%u", dwFFMaxForce ); + check_member( objinst, expect_objects[8], "%u", dwFFForceResolution ); + check_member( objinst, expect_objects[8], "%u", wCollectionNumber ); + check_member( objinst, expect_objects[8], "%u", wDesignatorIndex ); + check_member( objinst, expect_objects[8], "%#04x", wUsagePage ); + check_member( objinst, expect_objects[8], "%#04x", wUsage ); + check_member( objinst, expect_objects[8], "%#04x", dwDimension ); + check_member( objinst, expect_objects[8], "%#04x", wExponent ); + check_member( objinst, expect_objects[8], "%u", wReportId ); hr = IDirectInputDevice8_EnumEffects( device, NULL, NULL, DIEFT_ALL ); ok( hr == DIERR_INVALIDPARAM, "EnumEffects returned %#x\n", hr ); @@ -4130,21 +4167,21 @@ static void test_simple_joystick(void) hr = IDirectInputDevice8_GetObjectInfo( device, &objinst, DIJOFS_Y, DIPH_BYOFFSET ); ok( hr == DI_OK, "GetObjectInfo returned: %#x\n", hr ); - check_member( objinst, expect_objects[0], "%u", dwSize ); - check_member_guid( objinst, expect_objects[0], guidType ); - check_member( objinst, expect_objects[0], "%#x", dwOfs ); - check_member( objinst, expect_objects[0], "%#x", dwType ); - check_member( objinst, expect_objects[0], "%#x", dwFlags ); - if (!localized) todo_wine check_member_wstr( objinst, expect_objects[0], tszName ); - check_member( objinst, expect_objects[0], "%u", dwFFMaxForce ); - check_member( objinst, expect_objects[0], "%u", dwFFForceResolution ); - check_member( objinst, expect_objects[0], "%u", wCollectionNumber ); - check_member( objinst, expect_objects[0], "%u", wDesignatorIndex ); - check_member( objinst, expect_objects[0], "%#04x", wUsagePage ); - check_member( objinst, expect_objects[0], "%#04x", wUsage ); - check_member( objinst, expect_objects[0], "%#04x", dwDimension ); - check_member( objinst, expect_objects[0], "%#04x", wExponent ); - check_member( objinst, expect_objects[0], "%u", wReportId ); + check_member( objinst, expect_objects[3], "%u", dwSize ); + check_member_guid( objinst, expect_objects[3], guidType ); + check_member( objinst, expect_objects[3], "%#x", dwOfs ); + check_member( objinst, expect_objects[3], "%#x", dwType ); + check_member( objinst, expect_objects[3], "%#x", dwFlags ); + if (!localized) todo_wine check_member_wstr( objinst, expect_objects[3], tszName ); + check_member( objinst, expect_objects[3], "%u", dwFFMaxForce ); + check_member( objinst, expect_objects[3], "%u", dwFFForceResolution ); + check_member( objinst, expect_objects[3], "%u", wCollectionNumber ); + check_member( objinst, expect_objects[3], "%u", wDesignatorIndex ); + check_member( objinst, expect_objects[3], "%#04x", wUsagePage ); + check_member( objinst, expect_objects[3], "%#04x", wUsage ); + check_member( objinst, expect_objects[3], "%#04x", dwDimension ); + check_member( objinst, expect_objects[3], "%#04x", wExponent ); + check_member( objinst, expect_objects[3], "%u", wReportId ); hr = IDirectInputDevice8_SetEventNotification( device, (HANDLE)0xdeadbeef ); todo_wine -- 2.33.0

2 11

[PATCH] winhttp: Process end of read data before sending callback in read_data().
by Paul Gofman Oct. 15, 2021

Oct. 15, 2021

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- The read completion callback may call WineHttpReadData(). Which may either run synchronously (if the data is available and recursion depth limit is not reached) or queued to thread pool. Fallout76 always proceeds with last WinHttpReadData of size 0 with recursion limit reached, and finished_reading() is racing between the (synchronous) call which has read the last portion of data and the queued WinHttpReadData called with zero size sometimes causing a crash in cache_connection which may be called with NULL connection in this case. dlls/winhttp/request.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 2c064bb767b..a9c65d15fa8 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1850,6 +1850,7 @@ static DWORD read_data( struct request *request, void *buffer, DWORD size, DWORD done: TRACE( "retrieved %u bytes (%u/%u)\n", bytes_read, request->content_read, request->content_length ); + if (end_of_read_data( request )) finished_reading( request ); if (async) { if (!ret) send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_READ_COMPLETE, buffer, bytes_read ); @@ -1863,7 +1864,6 @@ done: } if (!ret && read) *read = bytes_read; - if (end_of_read_data( request )) finished_reading( request ); return ret; } -- 2.31.1

2 3

[v2 PATCH] d3dx9: Implement ID3DXTextureShader::GetFunction().
by Matteo Bruni Oct. 15, 2021

Oct. 15, 2021

From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v2: Slightly improved a couple of tests. dlls/d3dx9_36/shader.c | 28 ++++++++++++++++++++++++---- dlls/d3dx9_36/tests/texture.c | 34 ++++++++++++++++++++++++++++++++-- 2 files changed, 56 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index fe0f99180ac..d5b58222ca2 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -2349,6 +2349,8 @@ struct d3dx9_texture_shader { ID3DXTextureShader ID3DXTextureShader_iface; LONG ref; + + ID3DXBuffer *byte_code; }; static inline struct d3dx9_texture_shader *impl_from_ID3DXTextureShader(ID3DXTextureShader *iface) @@ -2392,6 +2394,8 @@ static ULONG WINAPI d3dx9_texture_shader_Release(ID3DXTextureShader *iface) if (!refcount) { + if (texture_shader->byte_code) + ID3DXBuffer_Release(texture_shader->byte_code); HeapFree(GetProcessHeap(), 0, texture_shader); } @@ -2400,9 +2404,14 @@ static ULONG WINAPI d3dx9_texture_shader_Release(ID3DXTextureShader *iface) static HRESULT WINAPI d3dx9_texture_shader_GetFunction(ID3DXTextureShader *iface, struct ID3DXBuffer **function) { - FIXME("iface %p, function %p stub.\n", iface, function); + struct d3dx9_texture_shader *texture_shader = impl_from_ID3DXTextureShader(iface); - return E_NOTIMPL; + TRACE("iface %p, function %p.\n", iface, function); + + *function = texture_shader->byte_code; + ID3DXBuffer_AddRef(*function); + + return S_OK; } static HRESULT WINAPI d3dx9_texture_shader_GetConstantBuffer(ID3DXTextureShader *iface, struct ID3DXBuffer **constant_buffer) @@ -2594,19 +2603,30 @@ static const struct ID3DXTextureShaderVtbl d3dx9_texture_shader_vtbl = HRESULT WINAPI D3DXCreateTextureShader(const DWORD *function, ID3DXTextureShader **texture_shader) { struct d3dx9_texture_shader *object; + unsigned int size; + HRESULT hr; TRACE("function %p, texture_shader %p.\n", function, texture_shader); if (!function || !texture_shader) return D3DERR_INVALIDCALL; - object = HeapAlloc(GetProcessHeap(), 0, sizeof(*object)); - if (!object) + if (!(size = D3DXGetShaderSize(function))) + return D3DXERR_INVALIDDATA; + + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; object->ID3DXTextureShader_iface.lpVtbl = &d3dx9_texture_shader_vtbl; object->ref = 1; + if (FAILED(hr = D3DXCreateBuffer(size, &object->byte_code))) + { + IUnknown_Release(&object->ID3DXTextureShader_iface); + return hr; + } + memcpy(ID3DXBuffer_GetBufferPointer(object->byte_code), function, size); + *texture_shader = &object->ID3DXTextureShader_iface; return D3D_OK; diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index bec7ba48279..26e5aa3dbb6 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -2353,17 +2353,20 @@ float4 main(float3 pos : POSITION, float3 size : PSIZE) : COLOR }; IDirect3DVolumeTexture9 *volume_texture; IDirect3DCubeTexture9 *cube_texture; + D3DXCONSTANTTABLE_DESC ctab_desc; + ID3DXBuffer *buffer, *buffer2; D3DPRESENT_PARAMETERS d3dpp; IDirect3DTexture9 *texture; IDirect3DDevice9 *device; ID3DXTextureShader *tx; unsigned int x, y, z; - ID3DXBuffer *buffer; unsigned int *data; D3DLOCKED_RECT lr; D3DLOCKED_BOX lb; IDirect3D9 *d3d; D3DCAPS9 caps; + D3DXHANDLE h; + DWORD size; HRESULT hr; HWND wnd; @@ -2386,15 +2389,42 @@ float4 main(float3 pos : POSITION, float3 size : PSIZE) : COLOR ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); hr = tx->lpVtbl->GetFunction(tx, &buffer); - todo_wine ok(SUCCEEDED(hr), "Failed to get texture shader bytecode.\n"); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + + hr = tx->lpVtbl->GetFunction(tx, &buffer2); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + ok(buffer2 == buffer, "Unexpected buffer object.\n"); + ID3DXBuffer_Release(buffer2); + + size = ID3DXBuffer_GetBufferSize(buffer); + ok(size == 224, "Unexpected buffer size %u.\n", size); + + ID3DXBuffer_Release(buffer); + + /* Constant buffer */ + hr = tx->lpVtbl->GetConstantBuffer(tx, &buffer); +todo_wine + ok(SUCCEEDED(hr), "Failed to get texture shader constant buffer.\n"); if (FAILED(hr)) { skip("Texture shaders not supported, skipping further tests.\n"); IUnknown_Release(tx); return; } + + size = ID3DXBuffer_GetBufferSize(buffer); + ok(!size, "Unexpected buffer size %u.\n", size); + ID3DXBuffer_Release(buffer); + hr = tx->lpVtbl->GetDesc(tx, &ctab_desc); + ok(hr == S_OK, "Failed to get constant description, hr %#x.\n", hr); + ok(!ctab_desc.Constants, "Unexpected number of constants %u.\n", ctab_desc.Constants); + + /* Constant table access calls, without constant table. */ + h = tx->lpVtbl->GetConstant(tx, NULL, 0); + ok(!h, "Unexpected handle %p.\n", h); + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, NULL, NULL, NULL, NULL))) { -- 2.26.3

1 0