December 2022 - Wine-Commits

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

Dec. 19, 2022

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

1 0

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

Dec. 19, 2022

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

1 0

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

Dec. 19, 2022

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

1 0

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

Dec. 19, 2022

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

1 0

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

Dec. 19, 2022

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

1 0

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

Dec. 19, 2022

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

1 0

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

Dec. 19, 2022

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

1 0

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

Dec. 19, 2022

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

1 0

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

Dec. 19, 2022

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

1 0

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

Dec. 19, 2022

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

1 0