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

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

Dec. 19, 2022

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

1 0

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

Dec. 19, 2022

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

1 0

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

Dec. 19, 2022

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

1 0

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

Dec. 19, 2022

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

1 0

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

Dec. 19, 2022

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

1 0

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

Dec. 19, 2022

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

1 0

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

Dec. 19, 2022

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

1 0

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

Dec. 19, 2022

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

1 0

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

Dec. 19, 2022

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

1 0

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

Dec. 19, 2022

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

1 0

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

Dec. 16, 2022

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

1 0

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

Dec. 16, 2022

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

1 0

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

Dec. 16, 2022

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

1 0

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

Dec. 16, 2022

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

1 0

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

Dec. 16, 2022

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

1 0