system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-21 09:14:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

win32u: Read rawinput device preparsed data using virtual memory.

Browse source
This commit is contained in:
Rémi Bernon 2022-07-26 09:17:12 +02:00 committed by Alexandre Julliard
parent 689826a02c
commit 4c584fe773
2 changed files with 24 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
dlls/dinput/tests/joystick8.c
View file

@ -4308,7 +4308,12 @@ static void test_rawinput(void)
count = ARRAY_SIZE(raw_device_list);
res = GetRawInputDeviceList( raw_device_list, &count, sizeof(RAWINPUTDEVICELIST) );
todo_wine
if (!strcmp( winetest_platform, "wine" ) && res == device_count)
{
/* Wine refreshes its device list every 2s, but GetRawInputDeviceInfoW with an unknown handle will force it */
GetRawInputDeviceInfoW( (HANDLE)0xdeadbeef, RIDI_DEVICEINFO, NULL, &count );
res = GetRawInputDeviceList( raw_device_list, &count, sizeof(RAWINPUTDEVICELIST) );
}
ok( res == device_count + 1, "GetRawInputDeviceList returned %lu\n", res );
ok( count == ARRAY_SIZE(raw_device_list), "got count %u\n", count );
device_count = res;
@ -4326,9 +4331,7 @@ static void test_rawinput(void)
if (wcsstr( path, expect_vidpid_str )) break;
}
todo_wine
ok( !!wcsstr( path, expect_vidpid_str ), "got path %s\n", debugstr_w(path) );
if (!wcsstr( path, expect_vidpid_str )) goto done;
file = CreateFileW( path, FILE_READ_ACCESS | FILE_WRITE_ACCESS,
@ -4346,12 +4349,9 @@ static void test_rawinput(void)
while (PeekMessageW( &msg, hwnd, 0, 0, PM_REMOVE )) DispatchMessageW( &msg );
ok( !wm_input_device_change_count, "got %u WM_INPUT_DEVICE_CHANGE\n", wm_input_device_change_count );
todo_wine
ok( wm_input_count == 1, "got %u WM_INPUT\n", wm_input_count );
todo_wine
ok( wm_input_len == offsetof(RAWINPUT, data.hid.bRawData[desc.caps.InputReportByteLength]),
"got wm_input_len %u\n", wm_input_len );
todo_wine
ok( !memcmp( rawinput->data.hid.bRawData, injected_input[i].report_buf, desc.caps.InputReportByteLength ),
"got unexpected report data\n" );
wm_input_count = 0;

21
dlls/win32u/rawinput.c
View file

@ -253,6 +253,8 @@ static struct device *add_device( HKEY key, DWORD type )
NTSTATUS status;
unsigned int i;
UINT32 handle;
void *buffer;
SIZE_T size;
HANDLE file;
if (!query_reg_value( key, symbolic_linkW, value, sizeof(value_buffer) ))
@ -327,9 +329,22 @@ static struct device *add_device( HKEY key, DWORD type )
goto fail;
}
status = NtDeviceIoControlFile( file, NULL, NULL, NULL, &io,
IOCTL_HID_GET_COLLECTION_DESCRIPTOR,
NULL, 0, preparsed, hid_info.DescriptorSize );
/* NtDeviceIoControlFile checks that the output buffer is writable using ntdll virtual
* memory protection information, we need an NtAllocateVirtualMemory allocated buffer.
*/
buffer = NULL;
size = hid_info.DescriptorSize;
if (!(status = NtAllocateVirtualMemory( GetCurrentProcess(), &buffer, 0, &size,
MEM_RESERVE|MEM_COMMIT, PAGE_READWRITE )))
{
size = 0;
status = NtDeviceIoControlFile( file, NULL, NULL, NULL, &io,
IOCTL_HID_GET_COLLECTION_DESCRIPTOR,
NULL, 0, buffer, hid_info.DescriptorSize );
if (!status) memcpy( preparsed, buffer, hid_info.DescriptorSize );
NtFreeVirtualMemory( GetCurrentProcess(), &buffer, &size, MEM_RELEASE );
}
if (status)
{
ERR( "Failed to get collection descriptor, status %#x.\n", status );