April 2021 - Wine-commits - list.winehq.org

Zebediah Figura : hidclass.sys: Always wait for the lower driver in hid_device_thread().
by Alexandre Julliard 15 Apr '21

15 Apr '21

Module: wine Branch: master Commit: fd25cc3c3b5ec6eab43d4974b2d6c49080a4fcd6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd25cc3c3b5ec6eab43d4974… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 14 23:22:07 2021 -0500 hidclass.sys: Always wait for the lower driver in hid_device_thread(). Doing otherwise may result in memory corruption. The lower driver should complete its IRPs on device removal anyway. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index fc1dfd07db1..6ca5e39e648 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -288,12 +288,11 @@ static DWORD CALLBACK hid_device_thread(void *args) IO_STATUS_BLOCK irp_status; HID_XFER_PACKET *packet; DWORD rc; - HANDLE events[2]; + HANDLE event; NTSTATUS ntrc; BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; - events[0] = CreateEventA(NULL, TRUE, FALSE, NULL); - events[1] = ext->halt_event; + event = CreateEventA(NULL, TRUE, FALSE, NULL); packet = HeapAlloc(GetProcessHeap(), 0, sizeof(*packet) + ext->preparseData->caps.InputReportByteLength); packet->reportBuffer = (BYTE *)packet + sizeof(*packet); @@ -302,7 +301,7 @@ static DWORD CALLBACK hid_device_thread(void *args) { while(1) { - ResetEvent(events[0]); + ResetEvent(event); packet->reportBufferLen = ext->preparseData->caps.InputReportByteLength; packet->reportId = 0; @@ -311,11 +310,11 @@ static DWORD CALLBACK hid_device_thread(void *args) device, NULL, 0, packet, sizeof(*packet), TRUE, NULL, &irp_status); - IoSetCompletionRoutine(irp, read_Completion, events[0], TRUE, TRUE, TRUE); + IoSetCompletionRoutine(irp, read_Completion, event, TRUE, TRUE, TRUE); ntrc = IoCallDriver(device, irp); if (ntrc == STATUS_PENDING) - WaitForMultipleObjects(2, events, FALSE, INFINITE); + WaitForSingleObject(event, INFINITE); if (irp->IoStatus.u.Status == STATUS_SUCCESS) { @@ -339,19 +338,19 @@ static DWORD CALLBACK hid_device_thread(void *args) while(1) { - ResetEvent(events[0]); + ResetEvent(event); irp = IoBuildDeviceIoControlRequest(IOCTL_HID_READ_REPORT, device, NULL, 0, packet->reportBuffer, ext->preparseData->caps.InputReportByteLength, TRUE, NULL, &irp_status); - IoSetCompletionRoutine(irp, read_Completion, events[0], TRUE, TRUE, TRUE); + IoSetCompletionRoutine(irp, read_Completion, event, TRUE, TRUE, TRUE); ntrc = IoCallDriver(device, irp); if (ntrc == STATUS_PENDING) { - WaitForMultipleObjects(2, events, FALSE, INFINITE); + WaitForSingleObject(event, INFINITE); } rc = WaitForSingleObject(ext->halt_event, 0); @@ -376,8 +375,7 @@ static DWORD CALLBACK hid_device_thread(void *args) } } - /* FIXME: releasing packet requires IRP cancellation support */ - CloseHandle(events[0]); + CloseHandle(event); TRACE("Device thread exiting\n"); return 1;

1 0

Paul Gofman : kernel32: Implement VirtualAllocFromApp().
by Alexandre Julliard 15 Apr '21

15 Apr '21

Module: wine Branch: master Commit: 61ca1128d1ee4c3d34010ad2002495c9fbcaf966 URL: https://source.winehq.org/git/wine.git/?a=commit;h=61ca1128d1ee4c3d34010ad2… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Apr 14 19:26:52 2021 +0300 kernel32: Implement VirtualAllocFromApp(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-memory-l1-1-3.spec | 2 +- dlls/kernel32/tests/virtual.c | 39 +++++++++++++++++++++- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/memory.c | 22 ++++++++++++ include/winbase.h | 1 + 5 files changed, 63 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-memory-l1-1-3/api-ms-win-core-memory-l1-1-3.spec b/dlls/api-ms-win-core-memory-l1-1-3/api-ms-win-core-memory-l1-1-3.spec index b0d402b24c7..5b143ec1af3 100644 --- a/dlls/api-ms-win-core-memory-l1-1-3/api-ms-win-core-memory-l1-1-3.spec +++ b/dlls/api-ms-win-core-memory-l1-1-3/api-ms-win-core-memory-l1-1-3.spec @@ -19,7 +19,7 @@ @ stdcall UnmapViewOfFile(ptr) kernel32.UnmapViewOfFile @ stub UnmapViewOfFileEx @ stdcall VirtualAlloc(ptr long long long) kernel32.VirtualAlloc -@ stub VirtualAllocFromApp +@ stdcall VirtualAllocFromApp(ptr long long long) kernelbase.VirtualAllocFromApp @ stdcall VirtualFree(ptr long long) kernel32.VirtualFree @ stdcall VirtualFreeEx(long ptr long long) kernel32.VirtualFreeEx @ stdcall VirtualLock(ptr long) kernel32.VirtualLock diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index e6d9e8621a9..4abaa5befd1 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -35,7 +35,7 @@ #define NUM_THREADS 4 #define MAPPING_SIZE 0x100000 -static HINSTANCE hkernel32, hntdll; +static HINSTANCE hkernel32, hkernelbase, hntdll; static SYSTEM_INFO si; static UINT (WINAPI *pGetWriteWatch)(DWORD,LPVOID,SIZE_T,LPVOID*,ULONG_PTR*,ULONG*); static UINT (WINAPI *pResetWriteWatch)(LPVOID,SIZE_T); @@ -50,6 +50,7 @@ static ULONG (WINAPI *pRtlRemoveVectoredExceptionHandler)(PVOID); static BOOL (WINAPI *pGetProcessDEPPolicy)(HANDLE, LPDWORD, PBOOL); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); static NTSTATUS (WINAPI *pNtProtectVirtualMemory)(HANDLE, PVOID *, SIZE_T *, ULONG, ULONG *); +static PVOID (WINAPI *pVirtualAllocFromApp)(PVOID, SIZE_T, DWORD, DWORD); /* ############################### */ @@ -443,6 +444,39 @@ static void test_VirtualAlloc(void) ok(VirtualFree(addr1, 0, MEM_RELEASE), "VirtualFree failed\n"); } +static void test_VirtualAllocFromApp(void) +{ + void *p; + BOOL ret; + if (!pVirtualAllocFromApp) + { + win_skip("VirtualAllocFromApp is not available.\n"); + return; + } + + p = GetProcAddress(hkernel32, "VirtualAllocFromApp"); + ok(!p, "Found VirtualAllocFromApp in kernel32.dll.\n"); + + SetLastError(0xdeadbeef); + p = pVirtualAllocFromApp(NULL, 0x1000, MEM_RESERVE, PAGE_READWRITE); + ok(p && GetLastError() == 0xdeadbeef, "Got unexpected mem %p, GetLastError() %u.\n", p, GetLastError()); + ret = VirtualFree(p, 0, MEM_RELEASE); + ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); + + SetLastError(0xdeadbeef); + p = pVirtualAllocFromApp(NULL, 0x1000, MEM_RESERVE, PAGE_EXECUTE); + ok(!p && GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected mem %p, GetLastError() %u.\n", + p, GetLastError()); + SetLastError(0xdeadbeef); + p = pVirtualAllocFromApp(NULL, 0x1000, MEM_RESERVE, PAGE_EXECUTE_READ); + ok(!p && GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected mem %p, GetLastError() %u.\n", + p, GetLastError()); + SetLastError(0xdeadbeef); + p = pVirtualAllocFromApp(NULL, 0x1000, MEM_RESERVE, PAGE_EXECUTE_READWRITE); + ok(!p && GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected mem %p, GetLastError() %u.\n", + p, GetLastError()); +} + static void test_MapViewOfFile(void) { static const char testfile[] = "testfile.xxx"; @@ -4238,6 +4272,7 @@ START_TEST(virtual) } hkernel32 = GetModuleHandleA("kernel32.dll"); + hkernelbase = GetModuleHandleA("kernelbase.dll"); hntdll = GetModuleHandleA("ntdll.dll"); pGetWriteWatch = (void *) GetProcAddress(hkernel32, "GetWriteWatch"); @@ -4252,6 +4287,7 @@ START_TEST(virtual) pRtlAddVectoredExceptionHandler = (void *)GetProcAddress( hntdll, "RtlAddVectoredExceptionHandler" ); pRtlRemoveVectoredExceptionHandler = (void *)GetProcAddress( hntdll, "RtlRemoveVectoredExceptionHandler" ); pNtProtectVirtualMemory = (void *)GetProcAddress( hntdll, "NtProtectVirtualMemory" ); + pVirtualAllocFromApp = (void *)GetProcAddress( hkernelbase, "VirtualAllocFromApp" ); GetSystemInfo(&si); trace("system page size %#x\n", si.dwPageSize); @@ -4266,6 +4302,7 @@ START_TEST(virtual) test_VirtualProtect(); test_VirtualAllocEx(); test_VirtualAlloc(); + test_VirtualAllocFromApp(); test_MapViewOfFile(); test_NtAreMappedFilesTheSame(); test_CreateFileMapping(); diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 615b928bd22..28cfd842223 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1678,7 +1678,7 @@ @ stdcall VirtualAlloc(ptr long long long) @ stdcall VirtualAllocEx(long ptr long long long) @ stdcall VirtualAllocExNuma(long ptr long long long long) -# @ stub VirtualAllocFromApp +@ stdcall VirtualAllocFromApp(ptr long long long) @ stdcall VirtualFree(ptr long long) @ stdcall VirtualFreeEx(long ptr long long) @ stdcall VirtualLock(ptr long) diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index 60333db242f..4b71c0cc6ec 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -314,6 +314,28 @@ LPVOID WINAPI DECLSPEC_HOTPATCH VirtualAlloc2( HANDLE process, void *addr, SIZE_ } +/*********************************************************************** + * VirtualAllocFromApp (kernelbase.@) + */ +LPVOID WINAPI DECLSPEC_HOTPATCH VirtualAllocFromApp( void *addr, SIZE_T size, + DWORD type, DWORD protect ) +{ + LPVOID ret = addr; + + TRACE_(virtual)( "addr %p, size %p, type %#x, protect %#x.\n", addr, (void *)size, type, protect ); + + if (protect == PAGE_EXECUTE || protect == PAGE_EXECUTE_READ || protect == PAGE_EXECUTE_READWRITE + || protect == PAGE_EXECUTE_WRITECOPY) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return NULL; + } + + if (!set_ntstatus( NtAllocateVirtualMemory( GetCurrentProcess(), &ret, 0, &size, type, protect ))) return NULL; + return ret; +} + + /*********************************************************************** * VirtualFree (kernelbase.@) */ diff --git a/include/winbase.h b/include/winbase.h index beb91371bb6..11a92fa84d9 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2748,6 +2748,7 @@ WINBASEAPI LPVOID WINAPI VirtualAlloc(LPVOID,SIZE_T,DWORD,DWORD); WINBASEAPI LPVOID WINAPI VirtualAlloc2(HANDLE,LPVOID,SIZE_T,DWORD,DWORD,MEM_EXTENDED_PARAMETER*,ULONG); WINBASEAPI LPVOID WINAPI VirtualAllocEx(HANDLE,LPVOID,SIZE_T,DWORD,DWORD); WINBASEAPI LPVOID WINAPI VirtualAllocExNuma(HANDLE,void*,SIZE_T,DWORD,DWORD,DWORD); +WINBASEAPI LPVOID WINAPI VirtualAllocFromApp(LPVOID,SIZE_T,DWORD,DWORD); WINBASEAPI BOOL WINAPI VirtualFree(LPVOID,SIZE_T,DWORD); WINBASEAPI BOOL WINAPI VirtualFreeEx(HANDLE,LPVOID,SIZE_T,DWORD); WINBASEAPI BOOL WINAPI VirtualLock(LPVOID,SIZE_T);

1 0

David Torok : ntdll: Add NtCreateThread stub.
by Alexandre Julliard 15 Apr '21

15 Apr '21

Module: wine Branch: master Commit: 11ae0ade89d2ec50b255ac666c81cfccee8e30ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=11ae0ade89d2ec50b255ac66… Author: David Torok <dt(a)zeroitlab.com> Date: Wed Apr 14 21:08:32 2021 +0200 ntdll: Add NtCreateThread stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50952 Signed-off-by: David Torok <dt(a)zeroitlab.com> Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/unix/thread.c | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 881b57eb80a..a93fa08c406 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -183,7 +183,7 @@ @ stdcall -syscall NtCreateSection(ptr long ptr ptr long long long) @ stdcall -syscall NtCreateSemaphore(ptr long ptr long long) @ stdcall -syscall NtCreateSymbolicLinkObject(ptr long ptr ptr) -@ stub NtCreateThread +@ stdcall -syscall NtCreateThread(ptr long ptr long ptr ptr ptr long) @ stdcall -syscall NtCreateThreadEx(ptr long ptr long ptr ptr long long long long ptr) @ stdcall -syscall NtCreateTimer(ptr long ptr long) @ stub NtCreateToken @@ -1191,7 +1191,7 @@ @ stdcall -private -syscall ZwCreateSection(ptr long ptr ptr long long long) NtCreateSection @ stdcall -private -syscall ZwCreateSemaphore(ptr long ptr long long) NtCreateSemaphore @ stdcall -private -syscall ZwCreateSymbolicLinkObject(ptr long ptr ptr) NtCreateSymbolicLinkObject -@ stub ZwCreateThread +@ stdcall -private -syscall ZwCreateThread(ptr long ptr long ptr ptr ptr long) NtCreateThread @ stdcall -private -syscall ZwCreateThreadEx(ptr long ptr long ptr ptr long long long long ptr) NtCreateThreadEx @ stdcall -private -syscall ZwCreateTimer(ptr long ptr long) NtCreateTimer @ stub ZwCreateToken diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 543a214e056..b1c64f6f7a8 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -144,6 +144,16 @@ static void update_attr_list( PS_ATTRIBUTE_LIST *attr, const CLIENT_ID *id, TEB } } +/*********************************************************************** + * NtCreateThread (NTDLL.@) + */ +NTSTATUS WINAPI NtCreateThread( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBUTES *attr, + HANDLE process, CLIENT_ID *id, CONTEXT *ctx, INITIAL_TEB *teb, + BOOLEAN suspended ) +{ + FIXME( "%p %d %p %p %p %p %p %d, stub!\n", handle, access, attr, process, id, ctx, teb, suspended ); + return STATUS_NOT_IMPLEMENTED; +} /*********************************************************************** * NtCreateThreadEx (NTDLL.@)

1 0

Rémi Bernon : user32: Add RAWINPUT parameter to __wine_send_input.
by Alexandre Julliard 15 Apr '21

15 Apr '21

Module: wine Branch: master Commit: 123c17aa92ebdf789c42dc72c082abea45639eff URL: https://source.winehq.org/git/wine.git/?a=commit;h=123c17aa92ebdf789c42dc72… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Apr 9 13:11:33 2021 +0200 user32: Add RAWINPUT parameter to __wine_send_input. And send_hardware_message. This makes it possible to use __wine_send_input to send extended input data, such as HID device notifications and WM_INPUT messages carrying HID reports. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50506 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/input.c | 6 +++--- dlls/user32/message.c | 2 +- dlls/user32/user32.spec | 2 +- dlls/user32/user_private.h | 2 +- dlls/wineandroid.drv/keyboard.c | 2 +- dlls/wineandroid.drv/window.c | 4 ++-- dlls/winemac.drv/ime.c | 4 ++-- dlls/winemac.drv/keyboard.c | 2 +- dlls/winemac.drv/mouse.c | 2 +- dlls/winex11.drv/keyboard.c | 2 +- dlls/winex11.drv/mouse.c | 8 ++++---- include/winuser.h | 2 +- 12 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 7cf7e53a6c8..805bfe3e9de 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -119,9 +119,9 @@ BOOL set_capture_window( HWND hwnd, UINT gui_flags, HWND *prev_ret ) * * Internal SendInput function to allow the graphics driver to inject real events. */ -BOOL CDECL __wine_send_input( HWND hwnd, const INPUT *input ) +BOOL CDECL __wine_send_input( HWND hwnd, const INPUT *input, const RAWINPUT *rawinput ) { - NTSTATUS status = send_hardware_message( hwnd, input, 0 ); + NTSTATUS status = send_hardware_message( hwnd, input, rawinput, 0 ); if (status) SetLastError( RtlNtStatusToDosError(status) ); return !status; } @@ -210,7 +210,7 @@ UINT WINAPI SendInput( UINT count, LPINPUT inputs, int size ) update_mouse_coords( &input ); /* fallthrough */ case INPUT_KEYBOARD: - status = send_hardware_message( 0, &input, SEND_HWMSG_INJECTED ); + status = send_hardware_message( 0, &input, NULL, SEND_HWMSG_INJECTED ); break; case INPUT_HARDWARE: SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); diff --git a/dlls/user32/message.c b/dlls/user32/message.c index def59998a52..f87ef9fb3af 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -3227,7 +3227,7 @@ static BOOL send_message( struct send_message_info *info, DWORD_PTR *res_ptr, BO /*********************************************************************** * send_hardware_message */ -NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, UINT flags ) +NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, const RAWINPUT *rawinput, UINT flags ) { struct user_key_state_info *key_state_info = get_user_thread_info()->key_state; struct send_message_info info; diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 4ef75247d71..190ee74fd6c 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -834,5 +834,5 @@ # All functions must be prefixed with '__wine_' (for internal functions) # or 'wine_' (for user-visible functions) to avoid namespace conflicts. # -@ cdecl __wine_send_input(long ptr) +@ cdecl __wine_send_input(long ptr ptr) @ cdecl __wine_set_pixel_format(long long) diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 7761a1ceb4f..dfd52421e66 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -263,7 +263,7 @@ extern RECT get_virtual_screen_rect(void) DECLSPEC_HIDDEN; extern LRESULT call_current_hook( HHOOK hhook, INT code, WPARAM wparam, LPARAM lparam ) DECLSPEC_HIDDEN; extern DWORD get_input_codepage( void ) DECLSPEC_HIDDEN; extern BOOL map_wparam_AtoW( UINT message, WPARAM *wparam, enum wm_char_mapping mapping ) DECLSPEC_HIDDEN; -extern NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, UINT flags ) DECLSPEC_HIDDEN; +extern NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, const RAWINPUT *rawinput, UINT flags ) DECLSPEC_HIDDEN; extern LRESULT MSG_SendInternalMessageTimeout( DWORD dest_pid, DWORD dest_tid, UINT msg, WPARAM wparam, LPARAM lparam, UINT flags, UINT timeout, PDWORD_PTR res_ptr ) DECLSPEC_HIDDEN; diff --git a/dlls/wineandroid.drv/keyboard.c b/dlls/wineandroid.drv/keyboard.c index 1c8a1e4f68f..0a6ede0ec5f 100644 --- a/dlls/wineandroid.drv/keyboard.c +++ b/dlls/wineandroid.drv/keyboard.c @@ -680,7 +680,7 @@ static void send_keyboard_input( HWND hwnd, WORD vkey, WORD scan, DWORD flags ) input.u.ki.time = 0; input.u.ki.dwExtraInfo = 0; - __wine_send_input( hwnd, &input ); + __wine_send_input( hwnd, &input, NULL ); } /*********************************************************************** diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index 79bc471a984..1cb1bbbadc9 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -521,7 +521,7 @@ static int process_events( DWORD mask ) } SERVER_END_REQ; } - __wine_send_input( capture ? capture : event->data.motion.hwnd, &event->data.motion.input ); + __wine_send_input( capture ? capture : event->data.motion.hwnd, &event->data.motion.input, NULL ); } break; @@ -535,7 +535,7 @@ static int process_events( DWORD mask ) event->data.kbd.input.u.ki.wVk, event->data.kbd.input.u.ki.wVk, event->data.kbd.input.u.ki.wScan ); update_keyboard_lock_state( event->data.kbd.input.u.ki.wVk, event->data.kbd.lock_state ); - __wine_send_input( 0, &event->data.kbd.input ); + __wine_send_input( 0, &event->data.kbd.input, NULL ); break; default: diff --git a/dlls/winemac.drv/ime.c b/dlls/winemac.drv/ime.c index dabe6654f98..f2368c10743 100644 --- a/dlls/winemac.drv/ime.c +++ b/dlls/winemac.drv/ime.c @@ -1427,10 +1427,10 @@ void macdrv_im_set_text(const macdrv_event *event) { input.ki.wScan = chars[i]; input.ki.dwFlags = KEYEVENTF_UNICODE; - __wine_send_input(hwnd, &input); + __wine_send_input(hwnd, &input, NULL); input.ki.dwFlags = KEYEVENTF_UNICODE | KEYEVENTF_KEYUP; - __wine_send_input(hwnd, &input); + __wine_send_input(hwnd, &input, NULL); } } diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c index 1b74300e93a..1ea15f59341 100644 --- a/dlls/winemac.drv/keyboard.c +++ b/dlls/winemac.drv/keyboard.c @@ -929,7 +929,7 @@ static void macdrv_send_keyboard_input(HWND hwnd, WORD vkey, WORD scan, DWORD fl input.ki.time = time; input.ki.dwExtraInfo = 0; - __wine_send_input(hwnd, &input); + __wine_send_input(hwnd, &input, NULL); } diff --git a/dlls/winemac.drv/mouse.c b/dlls/winemac.drv/mouse.c index dd6443fe1ba..d2278ae0e4c 100644 --- a/dlls/winemac.drv/mouse.c +++ b/dlls/winemac.drv/mouse.c @@ -165,7 +165,7 @@ static void send_mouse_input(HWND hwnd, macdrv_window cocoa_window, UINT flags, input.mi.time = time; input.mi.dwExtraInfo = 0; - __wine_send_input(top_level_hwnd, &input); + __wine_send_input(top_level_hwnd, &input, NULL); } diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 35a801fc895..01620c5e4a4 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1148,7 +1148,7 @@ static void X11DRV_send_keyboard_input( HWND hwnd, WORD vkey, WORD scan, DWORD f input.u.ki.time = time; input.u.ki.dwExtraInfo = 0; - __wine_send_input( hwnd, &input ); + __wine_send_input( hwnd, &input, NULL ); } diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 94dece652b6..42bac332664 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -659,7 +659,7 @@ static void send_mouse_input( HWND hwnd, Window window, unsigned int state, INPU sync_window_cursor( window ); last_cursor_change = input->u.mi.time; } - __wine_send_input( hwnd, input ); + __wine_send_input( hwnd, input, NULL ); return; } @@ -699,7 +699,7 @@ static void send_mouse_input( HWND hwnd, Window window, unsigned int state, INPU SERVER_END_REQ; } - __wine_send_input( hwnd, input ); + __wine_send_input( hwnd, input, NULL ); } #ifdef SONAME_LIBXCURSOR @@ -1669,7 +1669,7 @@ void move_resize_window( HWND hwnd, int dir ) input.u.mi.dwFlags = button_up_flags[button - 1] | MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE; input.u.mi.time = GetTickCount(); input.u.mi.dwExtraInfo = 0; - __wine_send_input( hwnd, &input ); + __wine_send_input( hwnd, &input, NULL ); } while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) @@ -1900,7 +1900,7 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie *xev ) TRACE( "pos %d,%d (event %f,%f)\n", input.u.mi.dx, input.u.mi.dy, dx, dy ); input.type = INPUT_MOUSE; - __wine_send_input( 0, &input ); + __wine_send_input( 0, &input, NULL ); return TRUE; } diff --git a/include/winuser.h b/include/winuser.h index 53661f6c788..0b1571c0a95 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -4406,7 +4406,7 @@ static inline BOOL WINAPI SetRectEmpty(LPRECT rect) WORD WINAPI SYSTEM_KillSystemTimer( WORD ); #ifdef __WINESRC__ -WINUSERAPI BOOL CDECL __wine_send_input( HWND hwnd, const INPUT *input ); +WINUSERAPI BOOL CDECL __wine_send_input( HWND hwnd, const INPUT *input, const RAWINPUT *rawinput ); #endif #ifdef __cplusplus

1 0

Rémi Bernon : hidclass.sys: Assign rawinput device handle in HID_LinkDevice.
by Alexandre Julliard 15 Apr '21

15 Apr '21

Module: wine Branch: master Commit: f4d5f7e88a28c8b3501602aa3bcc80447886a440 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4d5f7e88a28c8b3501602aa… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Apr 9 13:11:34 2021 +0200 hidclass.sys: Assign rawinput device handle in HID_LinkDevice. The handles are just numeric values and not real object handles, they are used in the hDevice field of the RAWINPUTHEADER struct. They will also be used as an HID rawinput device array index on the server side. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50506 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 17 +++++++++++++++++ dlls/hidclass.sys/hid.h | 1 + 2 files changed, 18 insertions(+) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 6ca5e39e648..7d198b99b34 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -71,6 +71,17 @@ NTSTATUS HID_CreateDevice(DEVICE_OBJECT *native_device, HID_MINIDRIVER_REGISTRAT return STATUS_SUCCESS; } +/* user32 reserves 1 & 2 for winemouse and winekeyboard, + * keep this in sync with user_private.h */ +#define WINE_MOUSE_HANDLE 1 +#define WINE_KEYBOARD_HANDLE 2 + +static UINT32 alloc_rawinput_handle(void) +{ + static LONG counter = WINE_KEYBOARD_HANDLE + 1; + return InterlockedIncrement(&counter); +} + NTSTATUS HID_LinkDevice(DEVICE_OBJECT *device) { WCHAR device_instance_id[MAX_DEVICE_ID_LEN]; @@ -125,7 +136,13 @@ NTSTATUS HID_LinkDevice(DEVICE_OBJECT *device) { if (!IoRegisterDeviceInterface(device, &GUID_DEVINTERFACE_MOUSE, NULL, &ext->mouse_link_name)) ext->is_mouse = TRUE; + ext->rawinput_handle = WINE_MOUSE_HANDLE; } + else if (ext->preparseData->caps.UsagePage == HID_USAGE_PAGE_GENERIC + && ext->preparseData->caps.Usage == HID_USAGE_GENERIC_KEYBOARD) + ext->rawinput_handle = WINE_KEYBOARD_HANDLE; + else + ext->rawinput_handle = alloc_rawinput_handle(); return STATUS_SUCCESS; diff --git a/dlls/hidclass.sys/hid.h b/dlls/hidclass.sys/hid.h index 889b8c625c0..41f3766a535 100644 --- a/dlls/hidclass.sys/hid.h +++ b/dlls/hidclass.sys/hid.h @@ -51,6 +51,7 @@ typedef struct _BASE_DEVICE_EXTENSION { struct ReportRingBuffer *ring_buffer; HANDLE halt_event; HANDLE thread; + UINT32 rawinput_handle; KSPIN_LOCK irp_queue_lock; LIST_ENTRY irp_queue;

1 0

Alexandre Julliard : ws2_32: Install network database files.
by Alexandre Julliard 15 Apr '21

15 Apr '21

Module: wine Branch: master Commit: 50c40b913a9ac99162f9729ab8a0869ebaae9917 URL: https://source.winehq.org/git/wine.git/?a=commit;h=50c40b913a9ac99162f9729a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 15 15:51:05 2021 +0200 ws2_32: Install network database files. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=12076 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/hosts | 1 + dlls/ws2_32/networks | 1 + dlls/ws2_32/protocol | 21 ++++ dlls/ws2_32/services | 325 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/ws2_32/version.rc | 12 ++ loader/wine.inf.in | 15 ++- 6 files changed, 371 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=50c40b913a9ac99162f9…

1 0

Zebediah Figura : hidclass.sys: Zero-initialize the HID_DEVICE_ATTRIBUTES structure.
by Alexandre Julliard 14 Apr '21

14 Apr '21

Module: wine Branch: master Commit: 8c87a2618eca349c59779690a9f09a7bc1f782a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c87a2618eca349c59779690… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 14 09:39:59 2021 -0500 hidclass.sys: Zero-initialize the HID_DEVICE_ATTRIBUTES structure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/pnp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index 5a4ebf8b42b..f7985d298d8 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -75,7 +75,7 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) DEVICE_OBJECT *device = NULL; NTSTATUS status; minidriver *minidriver; - HID_DEVICE_ATTRIBUTES attr; + HID_DEVICE_ATTRIBUTES attr = {0}; BASE_DEVICE_EXTENSION *ext = NULL; HID_DESCRIPTOR descriptor; BYTE *reportDescriptor;

1 0

Zebediah Figura : ntoskrnl/tests: Add some tests for HID devices.
by Alexandre Julliard 14 Apr '21

14 Apr '21

Module: wine Branch: master Commit: e3460ceb625f82535ec9f66e4c628cb88f1eddea URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3460ceb625f82535ec9f66e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 14 09:40:00 2021 -0500 ntoskrnl/tests: Add some tests for HID devices. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/Makefile.in | 4 + dlls/ntoskrnl.exe/tests/driver.h | 2 + dlls/ntoskrnl.exe/tests/driver_hid.c | 276 ++++++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/tests/driver_hid.spec | 1 + dlls/ntoskrnl.exe/tests/driver_pnp.c | 1 - dlls/ntoskrnl.exe/tests/ntoskrnl.c | 268 +++++++++++++++++++++++++------ dlls/ntoskrnl.exe/tests/utils.h | 18 +++ 7 files changed, 516 insertions(+), 54 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e3460ceb625f82535ec9…

1 0

Jacek Caban : winevulkan: Remove native_vkGetInstanceProcAddrWINE.
by Alexandre Julliard 14 Apr '21

14 Apr '21

Module: wine Branch: master Commit: 1cc6b4921a21de5a3ccb8a4443a8ceac8a23187f URL: https://source.winehq.org/git/wine.git/?a=commit;h=1cc6b4921a21de5a3ccb8a44… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 14 17:58:21 2021 +0200 winevulkan: Remove native_vkGetInstanceProcAddrWINE. It was needed for use cases like DXVK winelib builds. It was never really adopted and it's problematic for PE builds. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 1 - dlls/winevulkan/vulkan.c | 14 -------------- dlls/winevulkan/winevulkan.spec | 1 - 3 files changed, 16 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index f090095a89b..fcb5c4610f2 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2684,7 +2684,6 @@ class VkGenerator(object): f.write("@ stdcall -private vk_icdGetInstanceProcAddr(ptr str) wine_vk_icdGetInstanceProcAddr\n") f.write("@ stdcall -private vk_icdGetPhysicalDeviceProcAddr(ptr str) wine_vk_icdGetPhysicalDeviceProcAddr\n") f.write("@ stdcall -private vk_icdNegotiateLoaderICDInterfaceVersion(ptr) wine_vk_icdNegotiateLoaderICDInterfaceVersion\n") - f.write("@ cdecl -norelay native_vkGetInstanceProcAddrWINE(ptr str)\n") # Export symbols for all Vulkan Core functions. for func in self.registry.funcs.values(): diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 45beea97240..8f65da35f52 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1972,17 +1972,3 @@ VkResult WINAPI wine_vkDebugMarkerSetObjectNameEXT(VkDevice device, const VkDebu return thunk_vkDebugMarkerSetObjectNameEXT(device, &wine_name_info); } - -/* - * Wrapper around driver vkGetInstanceProcAddr implementation. - * Allows winelib applications to access Vulkan functions with Wine - * additions and native ABI. - */ -void *native_vkGetInstanceProcAddrWINE(VkInstance instance, const char *name) -{ - wine_vk_init_once(); - if (!vk_funcs) - return NULL; - - return vk_funcs->p_vkGetInstanceProcAddr(instance, name); -} diff --git a/dlls/winevulkan/winevulkan.spec b/dlls/winevulkan/winevulkan.spec index b9644ac41bb..cad282b1978 100644 --- a/dlls/winevulkan/winevulkan.spec +++ b/dlls/winevulkan/winevulkan.spec @@ -11,7 +11,6 @@ @ stdcall -private vk_icdGetInstanceProcAddr(ptr str) wine_vk_icdGetInstanceProcAddr @ stdcall -private vk_icdGetPhysicalDeviceProcAddr(ptr str) wine_vk_icdGetPhysicalDeviceProcAddr @ stdcall -private vk_icdNegotiateLoaderICDInterfaceVersion(ptr) wine_vk_icdNegotiateLoaderICDInterfaceVersion -@ cdecl -norelay native_vkGetInstanceProcAddrWINE(ptr str) @ stdcall -private wine_vkAcquireNextImage2KHR(ptr ptr ptr) @ stdcall -private wine_vkAcquireNextImageKHR(ptr int64 int64 int64 int64 ptr) @ stdcall -private wine_vkAllocateCommandBuffers(ptr ptr ptr)

1 0

Jacek Caban : winevulkan: Move fill_luid_property and its callers to loader.c.
by Alexandre Julliard 14 Apr '21

14 Apr '21

Module: wine Branch: master Commit: 2d3309d85491d14d6632cc5818e8a7270d75be9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d3309d85491d14d6632cc58… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 14 17:58:34 2021 +0200 winevulkan: Move fill_luid_property and its callers to loader.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/loader.c | 109 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/winevulkan/vulkan.c | 95 ----------------------------------------- 2 files changed, 109 insertions(+), 95 deletions(-) diff --git a/dlls/winevulkan/loader.c b/dlls/winevulkan/loader.c index 199349b98c2..0966e2d9468 100644 --- a/dlls/winevulkan/loader.c +++ b/dlls/winevulkan/loader.c @@ -23,6 +23,9 @@ #include "winbase.h" #include "winreg.h" #include "winuser.h" +#include "initguid.h" +#include "devguid.h" +#include "setupapi.h" #include "vulkan_private.h" @@ -33,10 +36,27 @@ WINE_DEFAULT_DEBUG_CHANNEL(vulkan); */ #define WINE_VULKAN_ICD_VERSION 4 +DEFINE_DEVPROPKEY(DEVPROPKEY_GPU_LUID, 0x60b193cb, 0x5276, 0x4d0f, 0x96, 0xfc, 0xf1, 0x73, 0xab, 0xad, 0x3e, 0xc6, 2); +DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_GPU_VULKAN_UUID, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5c, 2); + static HINSTANCE hinstance; static void *wine_vk_get_global_proc_addr(const char *name); +#define wine_vk_find_struct(s, t) wine_vk_find_struct_((void *)s, VK_STRUCTURE_TYPE_##t) +static void *wine_vk_find_struct_(void *s, VkStructureType t) +{ + VkBaseOutStructure *header; + + for (header = s; header; header = header->pNext) + { + if (header->sType == t) + return header; + } + + return NULL; +} + VkResult WINAPI wine_vkEnumerateInstanceLayerProperties(uint32_t *count, VkLayerProperties *properties) { TRACE("%p, %p\n", count, properties); @@ -186,6 +206,95 @@ VkResult WINAPI wine_vk_icdNegotiateLoaderICDInterfaceVersion(uint32_t *supporte return VK_SUCCESS; } +static HANDLE get_display_device_init_mutex(void) +{ + static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t',0}; + HANDLE mutex = CreateMutexW(NULL, FALSE, init_mutexW); + + WaitForSingleObject(mutex, INFINITE); + return mutex; +} + +static void release_display_device_init_mutex(HANDLE mutex) +{ + ReleaseMutex(mutex); + CloseHandle(mutex); +} + +/* Wait until graphics driver is loaded by explorer */ +static void wait_graphics_driver_ready(void) +{ + static BOOL ready = FALSE; + + if (!ready) + { + SendMessageW(GetDesktopWindow(), WM_NULL, 0, 0); + ready = TRUE; + } +} + +static void fill_luid_property(VkPhysicalDeviceProperties2 *properties2) +{ + static const WCHAR pci[] = {'P','C','I',0}; + VkPhysicalDeviceIDProperties *id; + SP_DEVINFO_DATA device_data; + DWORD type, device_idx = 0; + HDEVINFO devinfo; + HANDLE mutex; + GUID uuid; + LUID luid; + + if (!(id = wine_vk_find_struct(properties2, PHYSICAL_DEVICE_ID_PROPERTIES))) + return; + + wait_graphics_driver_ready(); + mutex = get_display_device_init_mutex(); + devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_DISPLAY, pci, NULL, 0); + device_data.cbSize = sizeof(device_data); + while (SetupDiEnumDeviceInfo(devinfo, device_idx++, &device_data)) + { + if (!SetupDiGetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_GPU_VULKAN_UUID, + &type, (BYTE *)&uuid, sizeof(uuid), NULL, 0)) + continue; + + if (!IsEqualGUID(&uuid, id->deviceUUID)) + continue; + + if (SetupDiGetDevicePropertyW(devinfo, &device_data, &DEVPROPKEY_GPU_LUID, &type, + (BYTE *)&luid, sizeof(luid), NULL, 0)) + { + memcpy(&id->deviceLUID, &luid, sizeof(id->deviceLUID)); + id->deviceLUIDValid = VK_TRUE; + id->deviceNodeMask = 1; + break; + } + } + SetupDiDestroyDeviceInfoList(devinfo); + release_display_device_init_mutex(mutex); + + TRACE("deviceName:%s deviceLUIDValid:%d LUID:%08x:%08x deviceNodeMask:%#x.\n", + properties2->properties.deviceName, id->deviceLUIDValid, luid.HighPart, luid.LowPart, + id->deviceNodeMask); +} + +void WINAPI wine_vkGetPhysicalDeviceProperties2(VkPhysicalDevice phys_dev, + VkPhysicalDeviceProperties2 *properties2) +{ + TRACE("%p, %p\n", phys_dev, properties2); + + thunk_vkGetPhysicalDeviceProperties2(phys_dev, properties2); + fill_luid_property(properties2); +} + +void WINAPI wine_vkGetPhysicalDeviceProperties2KHR(VkPhysicalDevice phys_dev, + VkPhysicalDeviceProperties2 *properties2) +{ + TRACE("%p, %p\n", phys_dev, properties2); + + thunk_vkGetPhysicalDeviceProperties2KHR(phys_dev, properties2); + fill_luid_property(properties2); +} + BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, void *reserved) { TRACE("%p, %u, %p\n", hinst, reason, reserved); diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 8f65da35f52..fbcbe4721a3 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -26,17 +26,11 @@ #include "winbase.h" #include "winreg.h" #include "winuser.h" -#include "initguid.h" -#include "devguid.h" -#include "setupapi.h" #include "vulkan_private.h" WINE_DEFAULT_DEBUG_CHANNEL(vulkan); -DEFINE_DEVPROPKEY(DEVPROPKEY_GPU_LUID, 0x60b193cb, 0x5276, 0x4d0f, 0x96, 0xfc, 0xf1, 0x73, 0xab, 0xad, 0x3e, 0xc6, 2); -DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_GPU_VULKAN_UUID, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5c, 2); - #define wine_vk_find_struct(s, t) wine_vk_find_struct_((void *)s, VK_STRUCTURE_TYPE_##t) static void *wine_vk_find_struct_(void *s, VkStructureType t) { @@ -1525,95 +1519,6 @@ VkResult WINAPI wine_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT(VkPhysicalDe return res; } -static HANDLE get_display_device_init_mutex(void) -{ - static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t',0}; - HANDLE mutex = CreateMutexW(NULL, FALSE, init_mutexW); - - WaitForSingleObject(mutex, INFINITE); - return mutex; -} - -static void release_display_device_init_mutex(HANDLE mutex) -{ - ReleaseMutex(mutex); - CloseHandle(mutex); -} - -/* Wait until graphics driver is loaded by explorer */ -static void wait_graphics_driver_ready(void) -{ - static BOOL ready = FALSE; - - if (!ready) - { - SendMessageW(GetDesktopWindow(), WM_NULL, 0, 0); - ready = TRUE; - } -} - -static void fill_luid_property(VkPhysicalDeviceProperties2 *properties2) -{ - static const WCHAR pci[] = {'P','C','I',0}; - VkPhysicalDeviceIDProperties *id; - SP_DEVINFO_DATA device_data; - DWORD type, device_idx = 0; - HDEVINFO devinfo; - HANDLE mutex; - GUID uuid; - LUID luid; - - if (!(id = wine_vk_find_struct(properties2, PHYSICAL_DEVICE_ID_PROPERTIES))) - return; - - wait_graphics_driver_ready(); - mutex = get_display_device_init_mutex(); - devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_DISPLAY, pci, NULL, 0); - device_data.cbSize = sizeof(device_data); - while (SetupDiEnumDeviceInfo(devinfo, device_idx++, &device_data)) - { - if (!SetupDiGetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_GPU_VULKAN_UUID, - &type, (BYTE *)&uuid, sizeof(uuid), NULL, 0)) - continue; - - if (!IsEqualGUID(&uuid, id->deviceUUID)) - continue; - - if (SetupDiGetDevicePropertyW(devinfo, &device_data, &DEVPROPKEY_GPU_LUID, &type, - (BYTE *)&luid, sizeof(luid), NULL, 0)) - { - memcpy(&id->deviceLUID, &luid, sizeof(id->deviceLUID)); - id->deviceLUIDValid = VK_TRUE; - id->deviceNodeMask = 1; - break; - } - } - SetupDiDestroyDeviceInfoList(devinfo); - release_display_device_init_mutex(mutex); - - TRACE("deviceName:%s deviceLUIDValid:%d LUID:%08x:%08x deviceNodeMask:%#x.\n", - properties2->properties.deviceName, id->deviceLUIDValid, luid.HighPart, luid.LowPart, - id->deviceNodeMask); -} - -void WINAPI wine_vkGetPhysicalDeviceProperties2(VkPhysicalDevice phys_dev, - VkPhysicalDeviceProperties2 *properties2) -{ - TRACE("%p, %p\n", phys_dev, properties2); - - thunk_vkGetPhysicalDeviceProperties2(phys_dev, properties2); - fill_luid_property(properties2); -} - -void WINAPI wine_vkGetPhysicalDeviceProperties2KHR(VkPhysicalDevice phys_dev, - VkPhysicalDeviceProperties2 *properties2) -{ - TRACE("%p, %p\n", phys_dev, properties2); - - thunk_vkGetPhysicalDeviceProperties2KHR(phys_dev, properties2); - fill_luid_property(properties2); -} - void WINAPI wine_vkGetPhysicalDeviceExternalSemaphoreProperties(VkPhysicalDevice phys_dev, const VkPhysicalDeviceExternalSemaphoreInfo *semaphore_info, VkExternalSemaphoreProperties *properties) {

1 0