September 2021 - Wine-Commits

Rémi Bernon : winebus.sys: Look for duplicate UDEV devices on the unix side.
by Alexandre Julliard Sept. 3, 2021

Sept. 3, 2021

Module: wine Branch: master Commit: 6ce5ba8f2f0940273140fd13229a3ea0344bddaf URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ce5ba8f2f0940273140fd13… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 3 09:30:50 2021 +0200 winebus.sys: Look for duplicate UDEV devices on the unix side. Devices are only added from a single thread but they may be destroyed concurrently so we need to guard the list against race conditions. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 73 ++++++++++++++++++++++++++++------------- dlls/winebus.sys/unix_private.h | 1 + 2 files changed, 52 insertions(+), 22 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index d87ee2c043e..cca1bf5e168 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -88,11 +88,21 @@ WINE_DEFAULT_DEBUG_CHANNEL(plugplay); WINE_DECLARE_DEBUG_CHANNEL(hid_report); +static CRITICAL_SECTION udev_cs; +static CRITICAL_SECTION_DEBUG udev_cs_debug = +{ + 0, 0, &udev_cs, + { &udev_cs_debug.ProcessLocksList, &udev_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": udev_cs") } +}; +static CRITICAL_SECTION udev_cs = { &udev_cs_debug, -1, 0, 0, 0, 0 }; + static struct udev *udev_context = NULL; static struct udev_monitor *udev_monitor; static int deviceloop_control[2]; static int udev_monitor_fd; static struct list event_queue = LIST_INIT(event_queue); +static struct list device_list = LIST_INIT(device_list); static const WCHAR hidraw_busidW[] = {'H','I','D','R','A','W',0}; static const WCHAR lnxev_busidW[] = {'L','N','X','E','V',0}; @@ -119,6 +129,29 @@ static inline struct platform_private *impl_from_DEVICE_OBJECT(DEVICE_OBJECT *de return impl_from_unix_device(get_unix_device(device)); } +static const char *get_device_syspath(struct udev_device *dev) +{ + struct udev_device *parent; + + if ((parent = udev_device_get_parent_with_subsystem_devtype(dev, "hid", NULL))) + return udev_device_get_syspath(parent); + + if ((parent = udev_device_get_parent_with_subsystem_devtype(dev, "usb", "usb_device"))) + return udev_device_get_syspath(parent); + + return ""; +} + +static struct platform_private *find_device_from_syspath(const char *path) +{ + struct platform_private *device; + + LIST_FOR_EACH_ENTRY(device, &device_list, struct platform_private, unix_device.entry) + if (!strcmp(get_device_syspath(device->udev_device), path)) return device; + + return NULL; +} + #ifdef HAS_PROPER_INPUT_HEADER static const BYTE ABS_TO_HID_MAP[][2] = { @@ -547,6 +580,10 @@ static void hidraw_device_destroy(struct unix_device *iface) { struct platform_private *private = impl_from_unix_device(iface); + EnterCriticalSection(&udev_cs); + list_remove(&private->unix_device.entry); + LeaveCriticalSection(&udev_cs); + if (private->report_thread) { write(private->control_pipe[1], "q", 1); @@ -858,6 +895,10 @@ static void lnxev_device_destroy(struct unix_device *iface) { struct wine_input_private *ext = input_impl_from_unix_device(iface); + EnterCriticalSection(&udev_cs); + list_remove(&ext->base.unix_device.entry); + LeaveCriticalSection(&udev_cs); + if (ext->base.report_thread) { write(ext->base.control_pipe[1], "q", 1); @@ -1005,25 +1046,6 @@ static const struct unix_device_vtbl lnxev_device_vtbl = }; #endif -static const char *get_device_syspath(struct udev_device *dev) -{ - struct udev_device *parent; - - if ((parent = udev_device_get_parent_with_subsystem_devtype(dev, "hid", NULL))) - return udev_device_get_syspath(parent); - - if ((parent = udev_device_get_parent_with_subsystem_devtype(dev, "usb", "usb_device"))) - return udev_device_get_syspath(parent); - - return ""; -} - -static int check_device_syspath(DEVICE_OBJECT *device, void* context) -{ - struct platform_private *private = impl_from_DEVICE_OBJECT(device); - return strcmp(get_device_syspath(private->udev_device), context); -} - static void get_device_subsystem_info(struct udev_device *dev, char const *subsystem, struct device_desc *desc) { struct udev_device *parent = NULL; @@ -1093,9 +1115,10 @@ static void udev_add_device(struct udev_device *dev) TRACE("udev %s syspath %s\n", debugstr_a(devnode), udev_device_get_syspath(dev)); #ifdef HAS_PROPER_INPUT_HEADER - device = bus_enumerate_hid_devices(lnxev_busidW, check_device_syspath, (void *)get_device_syspath(dev)); - if (!device) device = bus_enumerate_hid_devices(hidraw_busidW, check_device_syspath, (void *)get_device_syspath(dev)); - if (device) + EnterCriticalSection(&udev_cs); + private = find_device_from_syspath(get_device_syspath(dev)); + LeaveCriticalSection(&udev_cs); + if (private) { TRACE("duplicate device found, not adding the new one\n"); close(fd); @@ -1156,6 +1179,9 @@ static void udev_add_device(struct udev_device *dev) if (!(private = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct platform_private)))) return; private->unix_device.vtbl = &hidraw_device_vtbl; + EnterCriticalSection(&udev_cs); + list_add_tail(&device_list, &private->unix_device.entry); + LeaveCriticalSection(&udev_cs); device = bus_create_hid_device(&desc, &private->unix_device); if (!device) HeapFree(GetProcessHeap(), 0, private); @@ -1166,6 +1192,9 @@ static void udev_add_device(struct udev_device *dev) if (!(private = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct wine_input_private)))) return; private->unix_device.vtbl = &lnxev_device_vtbl; + EnterCriticalSection(&udev_cs); + list_add_tail(&device_list, &private->unix_device.entry); + LeaveCriticalSection(&udev_cs); device = bus_create_hid_device(&desc, &private->unix_device); if (!device) HeapFree(GetProcessHeap(), 0, private); diff --git a/dlls/winebus.sys/unix_private.h b/dlls/winebus.sys/unix_private.h index 874a837deff..81c4658068b 100644 --- a/dlls/winebus.sys/unix_private.h +++ b/dlls/winebus.sys/unix_private.h @@ -44,6 +44,7 @@ struct unix_device_vtbl struct unix_device { const struct unix_device_vtbl *vtbl; + struct list entry; }; extern NTSTATUS sdl_bus_init(void *) DECLSPEC_HIDDEN;

1 0

Rémi Bernon : xinput1_3/tests: Wait for the state to change before checking it.
by Alexandre Julliard Sept. 3, 2021

Sept. 3, 2021

Module: wine Branch: master Commit: b680794c217c7ee5905c37273800a0f25f8a302d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b680794c217c7ee5905c3727… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 3 07:57:38 2021 +0200 xinput1_3/tests: Wait for the state to change before checking it. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/tests/xinput.c | 84 +++++++++++++++++++++++++++++-------------- 1 file changed, 57 insertions(+), 27 deletions(-) diff --git a/dlls/xinput1_3/tests/xinput.c b/dlls/xinput1_3/tests/xinput.c index 272a41c690c..811fe045d10 100644 --- a/dlls/xinput1_3/tests/xinput.c +++ b/dlls/xinput1_3/tests/xinput.c @@ -434,10 +434,10 @@ static void check_hid_caps(DWORD index, HANDLE device, PHIDP_PREPARSED_DATA pre HIDP_LINK_COLLECTION_NODE collections[16]; HIDP_BUTTON_CAPS button_caps[16]; HIDP_VALUE_CAPS value_caps[16]; + XINPUT_STATE last_state, state; XINPUT_CAPABILITIES xi_caps; char buffer[200] = {0}; ULONG length, value; - XINPUT_STATE state; USAGE usages[15]; NTSTATUS status; USHORT count; @@ -637,19 +637,31 @@ static void check_hid_caps(DWORD index, HANDLE device, PHIDP_PREPARSED_DATA pre else if (attrs->VendorID == 0x045e && attrs->ProductID == 0x02ff) skip("skipping interactive tests (Xbox One For Windows)\n"); else { - trace("press A button on gamepad %d\n", index); + res = pXInputGetState(index, &last_state); + ok(res == ERROR_SUCCESS, "XInputGetState returned %#x\n", res); - SetLastError(0xdeadbeef); - memset(buffer, 0, sizeof(buffer)); - length = hid_caps->InputReportByteLength; - ret = ReadFile(device, buffer, hid_caps->InputReportByteLength, &length, NULL); - ok(ret, "ReadFile failed, last error %u\n", GetLastError()); - ok(length == hid_caps->InputReportByteLength, "ReadFile returned length %u\n", length); + trace("press A button on gamepad %d\n", index); - res = pXInputGetState(index, &state); - ok(res == ERROR_SUCCESS, "XInputGetState returned %#x\n", res); + do + { + Sleep(5); + res = pXInputGetState(index, &state); + ok(res == ERROR_SUCCESS, "XInputGetState returned %#x\n", res); + } while (res == ERROR_SUCCESS && state.dwPacketNumber == last_state.dwPacketNumber); ok(state.Gamepad.wButtons & XINPUT_GAMEPAD_A, "unexpected button state %#x\n", state.Gamepad.wButtons); + /* now read as many reports from the device to get a consistent final state */ + for (i = 0; i < (state.dwPacketNumber - last_state.dwPacketNumber); ++i) + { + SetLastError(0xdeadbeef); + memset(buffer, 0, sizeof(buffer)); + length = hid_caps->InputReportByteLength; + ret = ReadFile(device, buffer, hid_caps->InputReportByteLength, &length, NULL); + ok(ret, "ReadFile failed, last error %u\n", GetLastError()); + ok(length == hid_caps->InputReportByteLength, "ReadFile returned length %u\n", length); + } + last_state = state; + length = ARRAY_SIZE(usages); status = HidP_GetUsages(HidP_Input, HID_USAGE_PAGE_BUTTON, 0, usages, &length, preparsed, buffer, hid_caps->InputReportByteLength); ok(status == HIDP_STATUS_SUCCESS, "HidP_GetUsages returned %#x\n", status); @@ -658,17 +670,26 @@ static void check_hid_caps(DWORD index, HANDLE device, PHIDP_PREPARSED_DATA pre trace("release A on gamepad %d\n", index); - SetLastError(0xdeadbeef); - memset(buffer, 0, sizeof(buffer)); - length = hid_caps->InputReportByteLength; - ret = ReadFile(device, buffer, hid_caps->InputReportByteLength, &length, NULL); - ok(ret, "ReadFile failed, last error %u\n", GetLastError()); - ok(length == hid_caps->InputReportByteLength, "ReadFile returned length %u\n", length); - - res = pXInputGetState(index, &state); - ok(res == ERROR_SUCCESS, "XInputGetState returned %#x\n", res); + do + { + Sleep(5); + res = pXInputGetState(index, &state); + ok(res == ERROR_SUCCESS, "XInputGetState returned %#x\n", res); + } while (res == ERROR_SUCCESS && state.dwPacketNumber == last_state.dwPacketNumber); ok(!state.Gamepad.wButtons, "unexpected button state %#x\n", state.Gamepad.wButtons); + /* now read as many reports from the device to get a consistent final state */ + for (i = 0; i < (state.dwPacketNumber - last_state.dwPacketNumber); ++i) + { + SetLastError(0xdeadbeef); + memset(buffer, 0, sizeof(buffer)); + length = hid_caps->InputReportByteLength; + ret = ReadFile(device, buffer, hid_caps->InputReportByteLength, &length, NULL); + ok(ret, "ReadFile failed, last error %u\n", GetLastError()); + ok(length == hid_caps->InputReportByteLength, "ReadFile returned length %u\n", length); + } + last_state = state; + length = ARRAY_SIZE(usages); status = HidP_GetUsages(HidP_Input, HID_USAGE_PAGE_BUTTON, 0, usages, &length, preparsed, buffer, hid_caps->InputReportByteLength); ok(status == HIDP_STATUS_SUCCESS, "HidP_GetUsages returned %#x\n", status); @@ -678,15 +699,24 @@ static void check_hid_caps(DWORD index, HANDLE device, PHIDP_PREPARSED_DATA pre do { - SetLastError(0xdeadbeef); - memset(buffer, 0, sizeof(buffer)); - length = hid_caps->InputReportByteLength; - ret = ReadFile(device, buffer, hid_caps->InputReportByteLength, &length, NULL); - ok(ret, "ReadFile failed, last error %u\n", GetLastError()); - ok(length == hid_caps->InputReportByteLength, "ReadFile returned length %u\n", length); + do + { + Sleep(5); + res = pXInputGetState(index, &state); + ok(res == ERROR_SUCCESS, "XInputGetState returned %#x\n", res); + } while (res == ERROR_SUCCESS && state.dwPacketNumber == last_state.dwPacketNumber); - res = pXInputGetState(index, &state); - ok(res == ERROR_SUCCESS, "XInputGetState returned %#x\n", res); + /* now read as many reports from the device to get a consistent final state */ + for (i = 0; i < (state.dwPacketNumber - last_state.dwPacketNumber); ++i) + { + SetLastError(0xdeadbeef); + memset(buffer, 0, sizeof(buffer)); + length = hid_caps->InputReportByteLength; + ret = ReadFile(device, buffer, hid_caps->InputReportByteLength, &length, NULL); + ok(ret, "ReadFile failed, last error %u\n", GetLastError()); + ok(length == hid_caps->InputReportByteLength, "ReadFile returned length %u\n", length); + } + last_state = state; value = 0; status = HidP_GetUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_X, &value, preparsed, buffer, hid_caps->InputReportByteLength);

1 0

Rémi Bernon : winexinput.sys: Create an additional internal xinput PDO.
by Alexandre Julliard Sept. 3, 2021

Sept. 3, 2021

Module: wine Branch: master Commit: 99614467c19482e24bcf7eef980710b56cc86f8c URL: https://source.winehq.org/git/wine.git/?a=commit;h=99614467c19482e24bcf7eef… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 3 07:57:37 2021 +0200 winexinput.sys: Create an additional internal xinput PDO. This internal xinput PDO is an HID compatible pass-through device, but it needs to be kept private and is listed on the internal WINEXINPUT device interface class, instead of the HID device interface class. This is a Wine extension for convenience and native XInput driver uses a different, undocumented, device interface. We now filter the report read requests to make sure only one is sent through to the lower bus device, and we complete both gamepad and xinput read requests at once using the returned data. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winexinput.sys/main.c | 158 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 157 insertions(+), 1 deletion(-) diff --git a/dlls/winexinput.sys/main.c b/dlls/winexinput.sys/main.c index afa3b20f1bf..60f7a8ed5dd 100644 --- a/dlls/winexinput.sys/main.c +++ b/dlls/winexinput.sys/main.c @@ -53,6 +53,7 @@ __ASM_STDCALL_FUNC(wrap_fastcall_func1, 8, struct device { BOOL is_fdo; + BOOL is_gamepad; BOOL removed; WCHAR device_id[MAX_DEVICE_ID_LEN]; }; @@ -75,12 +76,18 @@ struct func_device /* the bogus HID gamepad, as exposed by native XUSB */ DEVICE_OBJECT *gamepad_device; + + /* the Wine-specific hidden HID device, used by XInput */ + DEVICE_OBJECT *xinput_device; + WCHAR instance_id[MAX_DEVICE_ID_LEN]; /* everything below requires holding the cs */ CRITICAL_SECTION cs; ULONG report_len; char *report_buf; + IRP *pending_read; + BOOL pending_is_gamepad; }; static inline struct func_device *fdo_from_DEVICE_OBJECT(DEVICE_OBJECT *device) @@ -90,6 +97,108 @@ static inline struct func_device *fdo_from_DEVICE_OBJECT(DEVICE_OBJECT *device) else return CONTAINING_RECORD(impl, struct phys_device, base)->fdo; } +static NTSTATUS WINAPI read_completion(DEVICE_OBJECT *device, IRP *xinput_irp, void *context) +{ + IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(xinput_irp); + ULONG offset, read_len = stack->Parameters.DeviceIoControl.OutputBufferLength; + struct func_device *fdo = fdo_from_DEVICE_OBJECT(device); + char *read_buf = xinput_irp->UserBuffer; + IRP *gamepad_irp = context; + + gamepad_irp->IoStatus.Status = xinput_irp->IoStatus.Status; + gamepad_irp->IoStatus.Information = xinput_irp->IoStatus.Information; + + if (!xinput_irp->IoStatus.Status) + { + RtlEnterCriticalSection(&fdo->cs); + offset = fdo->report_buf[0] ? 0 : 1; + memcpy(fdo->report_buf + offset, read_buf, read_len); + memcpy(gamepad_irp->UserBuffer, read_buf, read_len); + RtlLeaveCriticalSection(&fdo->cs); + } + + IoCompleteRequest(gamepad_irp, IO_NO_INCREMENT); + if (xinput_irp->PendingReturned) IoMarkIrpPending(xinput_irp); + return STATUS_SUCCESS; +} + +/* check for a pending read from the other PDO, and complete both at a time. + * if there's none, save irp as pending, the other PDO will complete it. + * if the device is being removed, complete irp with an error. */ +static NTSTATUS try_complete_pending_read(DEVICE_OBJECT *device, IRP *irp) +{ + struct func_device *fdo = fdo_from_DEVICE_OBJECT(device); + struct device *impl = impl_from_DEVICE_OBJECT(device); + IRP *pending, *xinput_irp, *gamepad_irp; + BOOL removed, pending_is_gamepad; + + RtlEnterCriticalSection(&fdo->cs); + pending_is_gamepad = fdo->pending_is_gamepad; + if ((removed = impl->removed)) + pending = NULL; + else if ((pending = fdo->pending_read)) + fdo->pending_read = NULL; + else + { + fdo->pending_read = irp; + fdo->pending_is_gamepad = impl->is_gamepad; + IoMarkIrpPending(irp); + } + RtlLeaveCriticalSection(&fdo->cs); + + if (removed) + { + irp->IoStatus.Status = STATUS_DELETE_PENDING; + irp->IoStatus.Information = 0; + IoCompleteRequest(irp, IO_NO_INCREMENT); + return STATUS_DELETE_PENDING; + } + + if (!pending) return STATUS_PENDING; + + /* only one read at a time per device from hidclass.sys design */ + if (pending_is_gamepad == impl->is_gamepad) ERR("multiple read requests!\n"); + gamepad_irp = impl->is_gamepad ? irp : pending; + xinput_irp = impl->is_gamepad ? pending : irp; + + /* pass xinput irp down, and complete gamepad irp on its way back */ + IoCopyCurrentIrpStackLocationToNext(xinput_irp); + IoSetCompletionRoutine(xinput_irp, read_completion, gamepad_irp, TRUE, TRUE, TRUE); + return IoCallDriver(fdo->bus_device, xinput_irp); +} + +static NTSTATUS WINAPI gamepad_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) +{ + IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); + ULONG code = stack->Parameters.DeviceIoControl.IoControlCode; + struct func_device *fdo = fdo_from_DEVICE_OBJECT(device); + + TRACE("device %p, irp %p, code %#x, bus_device %p.\n", device, irp, code, fdo->bus_device); + + switch (code) + { + case IOCTL_HID_GET_INPUT_REPORT: + { + HID_XFER_PACKET *packet = (HID_XFER_PACKET *)irp->UserBuffer; + + RtlEnterCriticalSection(&fdo->cs); + memcpy(packet->reportBuffer, fdo->report_buf, fdo->report_len); + irp->IoStatus.Information = fdo->report_len; + RtlLeaveCriticalSection(&fdo->cs); + + irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; + } + + default: + IoSkipCurrentIrpStackLocation(irp); + return IoCallDriver(fdo->bus_device, irp); + } + + return STATUS_SUCCESS; +} + static NTSTATUS WINAPI internal_ioctl(DEVICE_OBJECT *device, IRP *irp) { IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); @@ -107,6 +216,9 @@ static NTSTATUS WINAPI internal_ioctl(DEVICE_OBJECT *device, IRP *irp) TRACE("device %p, irp %p, code %#x, bus_device %p.\n", device, irp, code, fdo->bus_device); + if (code == IOCTL_HID_READ_REPORT) return try_complete_pending_read(device, irp); + if (impl->is_gamepad) return gamepad_internal_ioctl(device, irp); + IoSkipCurrentIrpStackLocation(irp); return IoCallDriver(fdo->bus_device, irp); } @@ -172,6 +284,7 @@ static NTSTATUS WINAPI pdo_pnp(DEVICE_OBJECT *device, IRP *irp) struct device *impl = impl_from_DEVICE_OBJECT(device); ULONG code = stack->MinorFunction; NTSTATUS status; + IRP *pending; TRACE("device %p, irp %p, code %#x, bus_device %p.\n", device, irp, code, fdo->bus_device); @@ -184,6 +297,18 @@ static NTSTATUS WINAPI pdo_pnp(DEVICE_OBJECT *device, IRP *irp) case IRP_MN_SURPRISE_REMOVAL: status = STATUS_SUCCESS; if (InterlockedExchange(&impl->removed, TRUE)) break; + + RtlEnterCriticalSection(&fdo->cs); + pending = fdo->pending_read; + fdo->pending_read = NULL; + RtlLeaveCriticalSection(&fdo->cs); + + if (pending) + { + pending->IoStatus.Status = STATUS_DELETE_PENDING; + pending->IoStatus.Information = 0; + IoCompleteRequest(pending, IO_NO_INCREMENT); + } break; case IRP_MN_REMOVE_DEVICE: @@ -247,7 +372,7 @@ static NTSTATUS WINAPI pdo_pnp(DEVICE_OBJECT *device, IRP *irp) static NTSTATUS create_child_pdos(DEVICE_OBJECT *device) { struct func_device *fdo = fdo_from_DEVICE_OBJECT(device); - DEVICE_OBJECT *gamepad_device; + DEVICE_OBJECT *gamepad_device, *xinput_device; struct phys_device *pdo; UNICODE_STRING name_str; WCHAR *tmp, name[255]; @@ -264,10 +389,23 @@ static NTSTATUS create_child_pdos(DEVICE_OBJECT *device) return status; } + swprintf(name, ARRAY_SIZE(name), L"\\Device\\WINEXINPUT#%p&%p&1", + device->DriverObject, fdo->bus_device); + RtlInitUnicodeString(&name_str, name); + + if ((status = IoCreateDevice(device->DriverObject, sizeof(struct phys_device), + &name_str, 0, 0, FALSE, &xinput_device))) + { + ERR("failed to create xinput device, status %#x.\n", status); + IoDeleteDevice(gamepad_device); + return status; + } + fdo->gamepad_device = gamepad_device; pdo = gamepad_device->DeviceExtension; pdo->fdo = fdo; pdo->base.is_fdo = FALSE; + pdo->base.is_gamepad = TRUE; wcscpy(pdo->base.device_id, fdo->base.device_id); if ((tmp = wcsstr(pdo->base.device_id, L"&MI_"))) memcpy(tmp, L"&IG", 6); @@ -275,6 +413,18 @@ static NTSTATUS create_child_pdos(DEVICE_OBJECT *device) TRACE("device %p, gamepad device %p.\n", device, gamepad_device); + fdo->xinput_device = xinput_device; + pdo = xinput_device->DeviceExtension; + pdo->fdo = fdo; + pdo->base.is_fdo = FALSE; + pdo->base.is_gamepad = FALSE; + wcscpy(pdo->base.device_id, fdo->base.device_id); + + if ((tmp = wcsstr(pdo->base.device_id, L"&MI_"))) memcpy(tmp, L"&XI", 6); + else wcscat(pdo->base.device_id, L"&XI_00"); + + TRACE("device %p, xinput device %p.\n", device, xinput_device); + IoInvalidateDeviceRelations(fdo->bus_device, BusRelations); return STATUS_SUCCESS; } @@ -363,6 +513,12 @@ static NTSTATUS WINAPI fdo_pnp(DEVICE_OBJECT *device, IRP *irp) } devices->Count = 0; + if ((child = fdo->xinput_device)) + { + devices->Objects[devices->Count] = child; + call_fastcall_func1(ObfReferenceObject, child); + devices->Count++; + } if ((child = fdo->gamepad_device)) { devices->Objects[devices->Count] = child;

1 0

Rémi Bernon : hidclass.sys: Use a separate class for devices matching WINEXINPUT\*&XI_*.
by Alexandre Julliard Sept. 3, 2021

Sept. 3, 2021

Module: wine Branch: master Commit: ed63e1bcf0d5a56af52ce813691889cb7dd4e7ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed63e1bcf0d5a56af52ce813… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 3 07:57:36 2021 +0200 hidclass.sys: Use a separate class for devices matching WINEXINPUT\*&XI_*. Although these devices will be HID compatible we need to not have them listed on the HID class, as they should only be used internally by Wine XInput implementation. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/hid.h | 1 + dlls/hidclass.sys/pnp.c | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/hidclass.sys/hid.h b/dlls/hidclass.sys/hid.h index 1ca6a926872..e65fabb2aea 100644 --- a/dlls/hidclass.sys/hid.h +++ b/dlls/hidclass.sys/hid.h @@ -84,6 +84,7 @@ typedef struct _BASE_DEVICE_EXTENSION * for convenience. */ WCHAR device_id[MAX_DEVICE_ID_LEN]; WCHAR instance_id[MAX_DEVICE_ID_LEN]; + const GUID *class_guid; BOOL is_fdo; } BASE_DEVICE_EXTENSION; diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index db45aea2fd3..8755afbce6c 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -38,6 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(hid); DEFINE_DEVPROPKEY(DEVPROPKEY_HID_HANDLE, 0xbc62e415, 0xf4fe, 0x405c, 0x8e, 0xda, 0x63, 0x6f, 0xb5, 0x9f, 0x08, 0x98, 2); +DEFINE_GUID(GUID_DEVINTERFACE_WINEXINPUT, 0x6c53d5fd, 0x6480, 0x440f, 0xb6, 0x18, 0x47, 0x67, 0x50, 0xc5, 0xe1, 0xa6); #if defined(__i386__) && !defined(_WIN32) @@ -133,6 +134,7 @@ static NTSTATUS WINAPI driver_add_device(DRIVER_OBJECT *driver, DEVICE_OBJECT *b { WCHAR device_id[MAX_DEVICE_ID_LEN], instance_id[MAX_DEVICE_ID_LEN]; BASE_DEVICE_EXTENSION *ext; + BOOL is_xinput_class; DEVICE_OBJECT *fdo; NTSTATUS status; minidriver *minidriver; @@ -166,6 +168,10 @@ static NTSTATUS WINAPI driver_add_device(DRIVER_OBJECT *driver, DEVICE_OBJECT *b swprintf(ext->device_id, ARRAY_SIZE(ext->device_id), L"HID\\%s", wcsrchr(device_id, '\\') + 1); wcscpy(ext->instance_id, instance_id); + is_xinput_class = !wcsncmp(device_id, L"WINEXINPUT\\", 7) && wcsstr(device_id, L"&XI_") != NULL; + if (is_xinput_class) ext->class_guid = &GUID_DEVINTERFACE_WINEXINPUT; + else ext->class_guid = &GUID_DEVINTERFACE_HID; + status = minidriver->AddDevice(minidriver->minidriver.DriverObject, fdo); if (status != STATUS_SUCCESS) { @@ -220,6 +226,7 @@ static void create_child(minidriver *minidriver, DEVICE_OBJECT *fdo) KeInitializeSpinLock(&pdo_ext->u.pdo.irp_queue_lock); wcscpy(pdo_ext->device_id, fdo_ext->device_id); wcscpy(pdo_ext->instance_id, fdo_ext->instance_id); + pdo_ext->class_guid = fdo_ext->class_guid; pdo_ext->u.pdo.information.VendorID = attr.VendorID; pdo_ext->u.pdo.information.ProductID = attr.ProductID; @@ -445,7 +452,7 @@ static NTSTATUS pdo_pnp(DEVICE_OBJECT *device, IRP *irp) } case IRP_MN_START_DEVICE: - if ((status = IoRegisterDeviceInterface(device, &GUID_DEVINTERFACE_HID, NULL, &ext->u.pdo.link_name))) + if ((status = IoRegisterDeviceInterface(device, ext->class_guid, NULL, &ext->u.pdo.link_name))) { ERR("Failed to register interface, status %#x.\n", status); break;

1 0

Rémi Bernon : winexinput.sys: Request the bus device report descriptor on startup.
by Alexandre Julliard Sept. 3, 2021

Sept. 3, 2021

Module: wine Branch: master Commit: 90175a745c46d5054e474f2662b77553e014c13e URL: https://source.winehq.org/git/wine.git/?a=commit;h=90175a745c46d5054e474f26… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 3 07:57:35 2021 +0200 winexinput.sys: Request the bus device report descriptor on startup. So everything will be ready in the device fdo (or fail to start the device entirely), when we need it later. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winexinput.sys/Makefile.in | 2 +- dlls/winexinput.sys/main.c | 65 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 1 deletion(-) diff --git a/dlls/winexinput.sys/Makefile.in b/dlls/winexinput.sys/Makefile.in index 592c90295b2..2e9af1429d8 100644 --- a/dlls/winexinput.sys/Makefile.in +++ b/dlls/winexinput.sys/Makefile.in @@ -1,5 +1,5 @@ MODULE = winexinput.sys -IMPORTS = ntoskrnl +IMPORTS = ntoskrnl hidparse EXTRADLLFLAGS = -mno-cygwin -Wl,--subsystem,native C_SRCS = \ diff --git a/dlls/winexinput.sys/main.c b/dlls/winexinput.sys/main.c index 515d109a2ad..afa3b20f1bf 100644 --- a/dlls/winexinput.sys/main.c +++ b/dlls/winexinput.sys/main.c @@ -31,6 +31,7 @@ #include "cfgmgr32.h" #include "ddk/wdm.h" #include "ddk/hidport.h" +#include "ddk/hidpddi.h" #include "wine/asm.h" #include "wine/debug.h" @@ -75,6 +76,11 @@ struct func_device /* the bogus HID gamepad, as exposed by native XUSB */ DEVICE_OBJECT *gamepad_device; WCHAR instance_id[MAX_DEVICE_ID_LEN]; + + /* everything below requires holding the cs */ + CRITICAL_SECTION cs; + ULONG report_len; + char *report_buf; }; static inline struct func_device *fdo_from_DEVICE_OBJECT(DEVICE_OBJECT *device) @@ -273,6 +279,59 @@ static NTSTATUS create_child_pdos(DEVICE_OBJECT *device) return STATUS_SUCCESS; } +static NTSTATUS sync_ioctl(DEVICE_OBJECT *device, DWORD code, void *in_buf, DWORD in_len, void *out_buf, DWORD out_len) +{ + IO_STATUS_BLOCK io; + KEVENT event; + IRP *irp; + + KeInitializeEvent(&event, NotificationEvent, FALSE); + irp = IoBuildDeviceIoControlRequest(code, device, in_buf, in_len, out_buf, out_len, TRUE, &event, &io); + if (IoCallDriver(device, irp) == STATUS_PENDING) KeWaitForSingleObject(&event, Executive, KernelMode, FALSE, NULL); + + return io.Status; +} + +static NTSTATUS initialize_device(DEVICE_OBJECT *device) +{ + struct func_device *fdo = fdo_from_DEVICE_OBJECT(device); + ULONG i, report_desc_len, report_count; + PHIDP_REPORT_DESCRIPTOR report_desc; + PHIDP_PREPARSED_DATA preparsed; + HIDP_DEVICE_DESC device_desc; + HIDP_REPORT_IDS *reports; + HID_DESCRIPTOR hid_desc; + NTSTATUS status; + HIDP_CAPS caps; + + if ((status = sync_ioctl(fdo->bus_device, IOCTL_HID_GET_DEVICE_DESCRIPTOR, NULL, 0, &hid_desc, sizeof(hid_desc)))) + return status; + + if (!(report_desc_len = hid_desc.DescriptorList[0].wReportLength)) return STATUS_UNSUCCESSFUL; + if (!(report_desc = malloc(report_desc_len))) return STATUS_NO_MEMORY; + + status = sync_ioctl(fdo->bus_device, IOCTL_HID_GET_REPORT_DESCRIPTOR, NULL, 0, report_desc, report_desc_len); + if (!status) status = HidP_GetCollectionDescription(report_desc, report_desc_len, PagedPool, &device_desc); + free(report_desc); + if (status != HIDP_STATUS_SUCCESS) return status; + + preparsed = device_desc.CollectionDesc->PreparsedData; + status = HidP_GetCaps(preparsed, &caps); + if (status != HIDP_STATUS_SUCCESS) return status; + + reports = device_desc.ReportIDs; + report_count = device_desc.ReportIDsLength; + for (i = 0; i < report_count; ++i) if (!reports[i].ReportID || reports[i].InputLength) break; + if (i == report_count) i = 0; /* no input report?!, just use first ID */ + + fdo->report_len = caps.InputReportByteLength; + if (!(fdo->report_buf = malloc(fdo->report_len))) return STATUS_NO_MEMORY; + fdo->report_buf[0] = reports[i].ReportID; + + HidP_FreeCollectionDescription(&device_desc); + return STATUS_SUCCESS; +} + static NTSTATUS WINAPI set_event_completion(DEVICE_OBJECT *device, IRP *irp, void *context) { if (irp->PendingReturned) KeSetEvent((KEVENT *)context, IO_NO_INCREMENT, FALSE); @@ -329,6 +388,7 @@ static NTSTATUS WINAPI fdo_pnp(DEVICE_OBJECT *device, IRP *irp) KeWaitForSingleObject(&event, Executive, KernelMode, FALSE, NULL); status = irp->IoStatus.Status; } + if (!status) status = initialize_device(device); if (!status) status = create_child_pdos(device); if (status) irp->IoStatus.Status = status; @@ -339,6 +399,8 @@ static NTSTATUS WINAPI fdo_pnp(DEVICE_OBJECT *device, IRP *irp) IoSkipCurrentIrpStackLocation(irp); status = IoCallDriver(fdo->bus_device, irp); IoDetachDevice(fdo->bus_device); + RtlDeleteCriticalSection(&fdo->cs); + free(fdo->report_buf); IoDeleteDevice(device); return status; @@ -422,6 +484,9 @@ static NTSTATUS WINAPI add_device(DRIVER_OBJECT *driver, DEVICE_OBJECT *bus_devi fdo->bus_device = bus_device; wcscpy(fdo->instance_id, instance_id); + RtlInitializeCriticalSection(&fdo->cs); + fdo->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": func_device.cs"); + TRACE("device %p, bus_id %s, device_id %s, instance_id %s.\n", device, debugstr_w(bus_id), debugstr_w(fdo->base.device_id), debugstr_w(fdo->instance_id));

1 0

Rémi Bernon : winexinput.sys: Handle IRP_MN_QUERY_DEVICE_RELATIONS in pdo_pnp.
by Alexandre Julliard Sept. 3, 2021

Sept. 3, 2021

Module: wine Branch: master Commit: 1b9bb7f974b70cf74c56c74009efb7f468c432f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b9bb7f974b70cf74c56c740… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 3 07:57:34 2021 +0200 winexinput.sys: Handle IRP_MN_QUERY_DEVICE_RELATIONS in pdo_pnp. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winexinput.sys/main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/winexinput.sys/main.c b/dlls/winexinput.sys/main.c index 386b4bbb228..515d109a2ad 100644 --- a/dlls/winexinput.sys/main.c +++ b/dlls/winexinput.sys/main.c @@ -223,6 +223,10 @@ static NTSTATUS WINAPI pdo_pnp(DEVICE_OBJECT *device, IRP *irp) status = STATUS_SUCCESS; break; + case IRP_MN_QUERY_DEVICE_RELATIONS: + status = irp->IoStatus.Status; + break; + default: FIXME("code %#x, not implemented!\n", code); status = irp->IoStatus.Status;

1 0

Rémi Bernon : winexinput.sys: Don't set RawDeviceOk in IRP_MN_QUERY_CAPABILITIES.
by Alexandre Julliard Sept. 3, 2021

Sept. 3, 2021

Module: wine Branch: master Commit: 75adc44191d86758501874cb85d1bb816b65605b URL: https://source.winehq.org/git/wine.git/?a=commit;h=75adc44191d86758501874cb… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 3 07:57:33 2021 +0200 winexinput.sys: Don't set RawDeviceOk in IRP_MN_QUERY_CAPABILITIES. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winexinput.sys/main.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/winexinput.sys/main.c b/dlls/winexinput.sys/main.c index a0b6c9bf0eb..386b4bbb228 100644 --- a/dlls/winexinput.sys/main.c +++ b/dlls/winexinput.sys/main.c @@ -220,12 +220,8 @@ static NTSTATUS WINAPI pdo_pnp(DEVICE_OBJECT *device, IRP *irp) } case IRP_MN_QUERY_CAPABILITIES: - { - DEVICE_CAPABILITIES *caps = stack->Parameters.DeviceCapabilities.Capabilities; - caps->RawDeviceOK = 1; status = STATUS_SUCCESS; break; - } default: FIXME("code %#x, not implemented!\n", code);

1 0

Jacek Caban : gdi32: Get stock objects directly from GDI_SHARED_MEMORY in GetStockObject.
by Alexandre Julliard Sept. 3, 2021

Sept. 3, 2021

Module: wine Branch: master Commit: 951d8ace18c5677d7bc577a08c69a1c1af8bf2d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=951d8ace18c5677d7bc577a0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 3 13:59:50 2021 +0100 gdi32: Get stock objects directly from GDI_SHARED_MEMORY in GetStockObject. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/gdiobj.c | 131 +++++++++++++++++++++------------------------------ dlls/gdi32/objects.c | 52 ++++++++++++++++++++ 2 files changed, 107 insertions(+), 76 deletions(-) diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index ffb42ab88e2..50c337cd6c4 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -82,13 +82,6 @@ static const LOGBRUSH DkGrayBrush = { BS_SOLID, RGB(64,64,64), 0 }; static const LOGBRUSH DCBrush = { BS_SOLID, RGB(255,255,255), 0 }; -/* reserve one extra entry for the stock default bitmap */ -/* this is what Windows does too */ -#define NB_STOCK_OBJECTS (STOCK_LAST+2) - -static HGDIOBJ stock_objects[NB_STOCK_OBJECTS]; -static HGDIOBJ scaled_stock_objects[NB_STOCK_OBJECTS]; - static CRITICAL_SECTION gdi_section; static CRITICAL_SECTION_DEBUG critsect_debug = { @@ -617,14 +610,62 @@ static void set_gdi_shared(void) NtCurrentTeb()->Peb->GdiSharedHandleTable = &gdi_shared; } -static HGDIOBJ make_stock_object( HGDIOBJ obj ) +static void init_stock_objects(void) { - GDI_HANDLE_ENTRY *entry; + const struct DefaultFontInfo *deffonts; + unsigned int i; + HGDIOBJ obj; + + /* Create stock objects in order matching stock object macros, + * so that they use predictable handle slots. Our GetStockObject + * depends on it. */ + create_brush( &WhiteBrush ); + create_brush( &LtGrayBrush ); + create_brush( &GrayBrush ); + create_brush( &DkGrayBrush ); + create_brush( &BlackBrush ); + create_brush( &NullBrush ); + + create_pen( PS_SOLID, 0, RGB(255,255,255) ); + create_pen( PS_SOLID, 0, RGB(0,0,0) ); + create_pen( PS_NULL, 0, RGB(0,0,0) ); + + /* slot 9 is not used for non-scaled stock objects */ + create_scaled_font( &OEMFixedFont ); + + /* language-independent stock fonts */ + create_font( &OEMFixedFont ); + create_font( &AnsiFixedFont ); + create_font( &AnsiVarFont ); + + /* language-dependent stock fonts */ + deffonts = get_default_fonts(get_default_charset()); + create_font( &deffonts->SystemFont ); + create_font( &deffonts->DeviceDefaultFont ); + + PALETTE_Init(); + + create_font( &deffonts->SystemFixedFont ); + create_font( &deffonts->DefaultGuiFont ); - if (!(entry = handle_entry( obj ))) return 0; - entry_obj( entry )->system = TRUE; - entry->StockFlag = 1; - return entry_to_handle( entry ); + create_brush( &DCBrush ); + NtGdiCreatePen( PS_SOLID, 0, RGB(0,0,0), NULL ); + + obj = NtGdiCreateBitmap( 1, 1, 1, 1, NULL ); + + assert( (HandleToULong( obj ) & 0xffff) == FIRST_GDI_HANDLE + DEFAULT_BITMAP ); + + create_scaled_font( &deffonts->SystemFont ); + create_scaled_font( &deffonts->SystemFixedFont ); + create_scaled_font( &deffonts->DefaultGuiFont ); + + /* clear the NOSYSTEM bit on all stock objects*/ + for (i = 0; i < STOCK_LAST + 5; i++) + { + GDI_HANDLE_ENTRY *entry = &gdi_shared.Handles[FIRST_GDI_HANDLE + i]; + entry_obj( entry )->system = TRUE; + entry->StockFlag = 1; + } } /*********************************************************************** @@ -634,57 +675,13 @@ static HGDIOBJ make_stock_object( HGDIOBJ obj ) */ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) { - const struct DefaultFontInfo* deffonts; - int i; - if (reason != DLL_PROCESS_ATTACH) return TRUE; gdi32_module = inst; DisableThreadLibraryCalls( inst ); set_gdi_shared(); font_init(); - - /* create stock objects */ - stock_objects[WHITE_BRUSH] = create_brush( &WhiteBrush ); - stock_objects[LTGRAY_BRUSH] = create_brush( &LtGrayBrush ); - stock_objects[GRAY_BRUSH] = create_brush( &GrayBrush ); - stock_objects[DKGRAY_BRUSH] = create_brush( &DkGrayBrush ); - stock_objects[BLACK_BRUSH] = create_brush( &BlackBrush ); - stock_objects[NULL_BRUSH] = create_brush( &NullBrush ); - - stock_objects[WHITE_PEN] = create_pen( PS_SOLID, 0, RGB(255,255,255) ); - stock_objects[BLACK_PEN] = create_pen( PS_SOLID, 0, RGB(0,0,0) ); - stock_objects[NULL_PEN] = create_pen( PS_NULL, 0, RGB(0,0,0) ); - - stock_objects[DEFAULT_PALETTE] = PALETTE_Init(); - stock_objects[DEFAULT_BITMAP] = NtGdiCreateBitmap( 1, 1, 1, 1, NULL ); - - /* language-independent stock fonts */ - stock_objects[OEM_FIXED_FONT] = create_font( &OEMFixedFont ); - stock_objects[ANSI_FIXED_FONT] = create_font( &AnsiFixedFont ); - stock_objects[ANSI_VAR_FONT] = create_font( &AnsiVarFont ); - - /* language-dependent stock fonts */ - deffonts = get_default_fonts(get_default_charset()); - stock_objects[SYSTEM_FONT] = create_font( &deffonts->SystemFont ); - stock_objects[DEVICE_DEFAULT_FONT] = create_font( &deffonts->DeviceDefaultFont ); - stock_objects[SYSTEM_FIXED_FONT] = create_font( &deffonts->SystemFixedFont ); - stock_objects[DEFAULT_GUI_FONT] = create_font( &deffonts->DefaultGuiFont ); - - scaled_stock_objects[OEM_FIXED_FONT] = create_scaled_font( &OEMFixedFont ); - scaled_stock_objects[SYSTEM_FONT] = create_scaled_font( &deffonts->SystemFont ); - scaled_stock_objects[SYSTEM_FIXED_FONT] = create_scaled_font( &deffonts->SystemFixedFont ); - scaled_stock_objects[DEFAULT_GUI_FONT] = create_scaled_font( &deffonts->DefaultGuiFont ); - - stock_objects[DC_BRUSH] = create_brush( &DCBrush ); - stock_objects[DC_PEN] = create_pen( PS_SOLID, 0, RGB(0,0,0) ); - - /* clear the NOSYSTEM bit on all stock objects*/ - for (i = 0; i < NB_STOCK_OBJECTS; i++) - { - stock_objects[i] = make_stock_object( stock_objects[i] ); - scaled_stock_objects[i] = make_stock_object( scaled_stock_objects[i] ); - } + init_stock_objects(); return TRUE; } @@ -960,24 +957,6 @@ BOOL WINAPI NtGdiDeleteClientObj( HGDIOBJ handle ) return TRUE; } -/*********************************************************************** - * GetStockObject (GDI32.@) - */ -HGDIOBJ WINAPI GetStockObject( INT obj ) -{ - if ((obj < 0) || (obj >= NB_STOCK_OBJECTS)) return 0; - switch (obj) - { - case OEM_FIXED_FONT: - case SYSTEM_FONT: - case SYSTEM_FIXED_FONT: - case DEFAULT_GUI_FONT: - if (get_system_dpi() != 96) return scaled_stock_objects[obj]; - break; - } - return stock_objects[obj]; -} - /*********************************************************************** * NtGdiExtGetObjectW (win32u.@) diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index b656c2a3f1e..5b1145c52a2 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -39,6 +39,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdi); DEFINE_DEVPROPKEY(DEVPROPKEY_GPU_LUID, 0x60b193cb, 0x5276, 0x4d0f, 0x96, 0xfc, 0xf1, 0x73, 0xab, 0xad, 0x3e, 0xc6, 2); +#define FIRST_GDI_HANDLE 32 + struct hdc_list { HDC hdc; @@ -95,6 +97,12 @@ static inline GDI_HANDLE_ENTRY *handle_entry( HGDIOBJ handle ) return NULL; } +static HGDIOBJ entry_to_handle( GDI_HANDLE_ENTRY *entry ) +{ + unsigned int idx = entry - get_gdi_shared()->Handles; + return LongToHandle( idx | (entry->Unique << NTGDI_HANDLE_TYPE_SHIFT) ); +} + static DWORD get_object_type( HGDIOBJ obj ) { GDI_HANDLE_ENTRY *entry = handle_entry( obj ); @@ -379,6 +387,50 @@ HGDIOBJ WINAPI GetCurrentObject( HDC hdc, UINT type ) return NtGdiGetDCObject( hdc, obj_type ); } +/****************************************************************************** + * get_system_dpi + * + * Get the system DPI, based on the DPI awareness mode. + */ +static DWORD get_system_dpi(void) +{ + static UINT (WINAPI *pGetDpiForSystem)(void); + + if (!pGetDpiForSystem) + { + HMODULE user = GetModuleHandleW( L"user32.dll" ); + if (user) pGetDpiForSystem = (void *)GetProcAddress( user, "GetDpiForSystem" ); + } + return pGetDpiForSystem ? pGetDpiForSystem() : 96; +} + +/*********************************************************************** + * GetStockObject (GDI32.@) + */ +HGDIOBJ WINAPI GetStockObject( INT obj ) +{ + if (obj < 0 || obj > STOCK_LAST + 1 || obj == 9) return 0; + + /* Wine stores stock objects in predictable order, see init_stock_objects */ + switch (obj) + { + case OEM_FIXED_FONT: + if (get_system_dpi() != 96) obj = 9; + break; + case SYSTEM_FONT: + if (get_system_dpi() != 96) obj = STOCK_LAST + 2; + break; + case SYSTEM_FIXED_FONT: + if (get_system_dpi() != 96) obj = STOCK_LAST + 3; + break; + case DEFAULT_GUI_FONT: + if (get_system_dpi() != 96) obj = STOCK_LAST + 4; + break; + } + + return entry_to_handle( handle_entry( ULongToHandle( obj + FIRST_GDI_HANDLE ))); +} + /*********************************************************************** * GetObjectA (GDI32.@) */

1 0

Jacek Caban : gdi32: Use ntgdi functions to create stock objects.
by Alexandre Julliard Sept. 3, 2021

Sept. 3, 2021

Module: wine Branch: master Commit: c33b7b583b4067639ce8e4bbea2965cb2bf091de URL: https://source.winehq.org/git/wine.git/?a=commit;h=c33b7b583b4067639ce8e4bb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 3 13:59:49 2021 +0100 gdi32: Use ntgdi functions to create stock objects. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/gdiobj.c | 40 ++++++++++++++++++++++------------------ dlls/gdi32/ntgdi_private.h | 3 +++ dlls/gdi32/palette.c | 2 +- dlls/gdi32/pen.c | 18 +++++++++++------- 4 files changed, 37 insertions(+), 26 deletions(-) diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 14b65429d4a..ffb42ab88e2 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -80,12 +80,7 @@ static const LOGBRUSH LtGrayBrush = { BS_SOLID, RGB(192,192,192), 0 }; static const LOGBRUSH GrayBrush = { BS_SOLID, RGB(128,128,128), 0 }; static const LOGBRUSH DkGrayBrush = { BS_SOLID, RGB(64,64,64), 0 }; -static const LOGPEN WhitePen = { PS_SOLID, { 0, 0 }, RGB(255,255,255) }; -static const LOGPEN BlackPen = { PS_SOLID, { 0, 0 }, RGB(0,0,0) }; -static const LOGPEN NullPen = { PS_NULL, { 0, 0 }, 0 }; - static const LOGBRUSH DCBrush = { BS_SOLID, RGB(255,255,255), 0 }; -static const LOGPEN DCPen = { PS_SOLID, { 0, 0 }, RGB(0,0,0) }; /* reserve one extra entry for the stock default bitmap */ /* this is what Windows does too */ @@ -582,6 +577,15 @@ DWORD get_system_dpi(void) return pGetDpiForSystem ? pGetDpiForSystem() : 96; } +static HFONT create_font( const LOGFONTW *deffont ) +{ + ENUMLOGFONTEXDVW lf; + + memset( &lf, 0, sizeof(lf) ); + lf.elfEnumLogfontEx.elfLogFont = *deffont; + return NtGdiHfontCreate( &lf, sizeof(lf), 0, 0, NULL ); +} + static HFONT create_scaled_font( const LOGFONTW *deffont ) { LOGFONTW lf; @@ -595,7 +599,7 @@ static HFONT create_scaled_font( const LOGFONTW *deffont ) lf = *deffont; lf.lfHeight = MulDiv( lf.lfHeight, dpi, 96 ); - return CreateFontIndirectW( &lf ); + return create_font( &lf ); } static void set_gdi_shared(void) @@ -648,24 +652,24 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) stock_objects[BLACK_BRUSH] = create_brush( &BlackBrush ); stock_objects[NULL_BRUSH] = create_brush( &NullBrush ); - stock_objects[WHITE_PEN] = CreatePenIndirect( &WhitePen ); - stock_objects[BLACK_PEN] = CreatePenIndirect( &BlackPen ); - stock_objects[NULL_PEN] = CreatePenIndirect( &NullPen ); + stock_objects[WHITE_PEN] = create_pen( PS_SOLID, 0, RGB(255,255,255) ); + stock_objects[BLACK_PEN] = create_pen( PS_SOLID, 0, RGB(0,0,0) ); + stock_objects[NULL_PEN] = create_pen( PS_NULL, 0, RGB(0,0,0) ); stock_objects[DEFAULT_PALETTE] = PALETTE_Init(); - stock_objects[DEFAULT_BITMAP] = CreateBitmap( 1, 1, 1, 1, NULL ); + stock_objects[DEFAULT_BITMAP] = NtGdiCreateBitmap( 1, 1, 1, 1, NULL ); /* language-independent stock fonts */ - stock_objects[OEM_FIXED_FONT] = CreateFontIndirectW( &OEMFixedFont ); - stock_objects[ANSI_FIXED_FONT] = CreateFontIndirectW( &AnsiFixedFont ); - stock_objects[ANSI_VAR_FONT] = CreateFontIndirectW( &AnsiVarFont ); + stock_objects[OEM_FIXED_FONT] = create_font( &OEMFixedFont ); + stock_objects[ANSI_FIXED_FONT] = create_font( &AnsiFixedFont ); + stock_objects[ANSI_VAR_FONT] = create_font( &AnsiVarFont ); /* language-dependent stock fonts */ deffonts = get_default_fonts(get_default_charset()); - stock_objects[SYSTEM_FONT] = CreateFontIndirectW( &deffonts->SystemFont ); - stock_objects[DEVICE_DEFAULT_FONT] = CreateFontIndirectW( &deffonts->DeviceDefaultFont ); - stock_objects[SYSTEM_FIXED_FONT] = CreateFontIndirectW( &deffonts->SystemFixedFont ); - stock_objects[DEFAULT_GUI_FONT] = CreateFontIndirectW( &deffonts->DefaultGuiFont ); + stock_objects[SYSTEM_FONT] = create_font( &deffonts->SystemFont ); + stock_objects[DEVICE_DEFAULT_FONT] = create_font( &deffonts->DeviceDefaultFont ); + stock_objects[SYSTEM_FIXED_FONT] = create_font( &deffonts->SystemFixedFont ); + stock_objects[DEFAULT_GUI_FONT] = create_font( &deffonts->DefaultGuiFont ); scaled_stock_objects[OEM_FIXED_FONT] = create_scaled_font( &OEMFixedFont ); scaled_stock_objects[SYSTEM_FONT] = create_scaled_font( &deffonts->SystemFont ); @@ -673,7 +677,7 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) scaled_stock_objects[DEFAULT_GUI_FONT] = create_scaled_font( &deffonts->DefaultGuiFont ); stock_objects[DC_BRUSH] = create_brush( &DCBrush ); - stock_objects[DC_PEN] = CreatePenIndirect( &DCPen ); + stock_objects[DC_PEN] = create_pen( PS_SOLID, 0, RGB(0,0,0) ); /* clear the NOSYSTEM bit on all stock objects*/ for (i = 0; i < NB_STOCK_OBJECTS; i++) diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index a438a3f93ae..73870fcd2f8 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -453,6 +453,9 @@ extern HPALETTE PALETTE_Init(void) DECLSPEC_HIDDEN; extern UINT get_palette_entries( HPALETTE hpalette, UINT start, UINT count, PALETTEENTRY *entries ) DECLSPEC_HIDDEN; +/* pen.c */ +extern HPEN create_pen( INT style, INT width, COLORREF color ) DECLSPEC_HIDDEN; + /* region.c */ extern BOOL add_rect_to_region( HRGN rgn, const RECT *rect ) DECLSPEC_HIDDEN; extern INT mirror_region( HRGN dst, HRGN src, INT width ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/palette.c b/dlls/gdi32/palette.c index aa7745dc65f..0451adbdf80 100644 --- a/dlls/gdi32/palette.c +++ b/dlls/gdi32/palette.c @@ -89,7 +89,7 @@ HPALETTE PALETTE_Init(void) palPtr->palPalEntry[i].peBlue = entries[i < 10 ? i : 236 + i].rgbBlue; palPtr->palPalEntry[i].peFlags = 0; } - return CreatePalette( palPtr ); + return NtGdiCreatePaletteInternal( palPtr, palPtr->palNumEntries ); } diff --git a/dlls/gdi32/pen.c b/dlls/gdi32/pen.c index ff2a766d40c..f79eaca4185 100644 --- a/dlls/gdi32/pen.c +++ b/dlls/gdi32/pen.c @@ -50,17 +50,12 @@ static const struct gdi_obj_funcs pen_funcs = PEN_DeleteObject /* pDeleteObject */ }; - -/*********************************************************************** - * NtGdiCreatePen (win32u.@) - */ -HPEN WINAPI NtGdiCreatePen( INT style, INT width, COLORREF color, HBRUSH brush ) +HPEN create_pen( INT style, INT width, COLORREF color ) { PENOBJ *penPtr; HPEN hpen; TRACE( "%d %d %06x\n", style, width, color ); - if (brush) FIXME( "brush not supported\n" ); switch (style) { @@ -72,7 +67,6 @@ HPEN WINAPI NtGdiCreatePen( INT style, INT width, COLORREF color, HBRUSH brush ) case PS_INSIDEFRAME: break; case PS_NULL: - if ((hpen = GetStockObject( NULL_PEN ))) return hpen; width = 1; color = 0; break; @@ -92,6 +86,16 @@ HPEN WINAPI NtGdiCreatePen( INT style, INT width, COLORREF color, HBRUSH brush ) return hpen; } +/*********************************************************************** + * NtGdiCreatePen (win32u.@) + */ +HPEN WINAPI NtGdiCreatePen( INT style, INT width, COLORREF color, HBRUSH brush ) +{ + if (brush) FIXME( "brush not supported\n" ); + if (style == PS_NULL) return GetStockObject( NULL_PEN ); + return create_pen( style, width, color ); +} + /*********************************************************************** * NtGdiExtCreatePen (win32u.@) */

1 0

Zebediah Figura : server: Return void from the get_volume_info callback.
by Alexandre Julliard Sept. 3, 2021

Sept. 3, 2021

Module: wine Branch: master Commit: 6cc36a46ffb13edcfa97ea9a5dc7aee0ccab696f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6cc36a46ffb13edcfa97ea9a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 2 19:08:50 2021 -0500 server: Return void from the get_volume_info callback. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 5 ++--- server/device.c | 6 +++--- server/fd.c | 3 +-- server/file.h | 4 ++-- server/named_pipe.c | 5 ++--- 5 files changed, 10 insertions(+), 13 deletions(-) diff --git a/server/console.c b/server/console.c index 3360f680448..9c7fbaa003d 100644 --- a/server/console.c +++ b/server/console.c @@ -99,7 +99,7 @@ static const struct object_ops console_ops = static enum server_fd_type console_get_fd_type( struct fd *fd ); static void console_get_file_info( struct fd *fd, obj_handle_t handle, unsigned int info_class ); -static int console_get_volume_info( struct fd *fd, struct async *async, unsigned int info_class ); +static void console_get_volume_info( struct fd *fd, struct async *async, unsigned int info_class ); static int console_read( struct fd *fd, struct async *async, file_pos_t pos ); static int console_flush( struct fd *fd, struct async *async ); static int console_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); @@ -480,7 +480,7 @@ static void console_get_file_info( struct fd *fd, obj_handle_t handle, unsigned set_error( STATUS_INVALID_DEVICE_REQUEST ); } -static int console_get_volume_info( struct fd *fd, struct async *async, unsigned int info_class ) +static void console_get_volume_info( struct fd *fd, struct async *async, unsigned int info_class ) { switch (info_class) { @@ -500,7 +500,6 @@ static int console_get_volume_info( struct fd *fd, struct async *async, unsigned default: set_error( STATUS_NOT_IMPLEMENTED ); } - return 0; } static struct object *create_console(void) diff --git a/server/device.c b/server/device.c index 8892651d048..e4a5c2f9670 100644 --- a/server/device.c +++ b/server/device.c @@ -206,7 +206,7 @@ static int device_file_write( struct fd *fd, struct async *async, file_pos_t pos static int device_file_flush( struct fd *fd, struct async *async ); static int device_file_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); static void device_file_reselect_async( struct fd *fd, struct async_queue *queue ); -static int device_file_get_volume_info( struct fd *fd, struct async *async, unsigned int info_class ); +static void device_file_get_volume_info( struct fd *fd, struct async *async, unsigned int info_class ); static const struct object_ops device_file_ops = { @@ -614,7 +614,7 @@ static enum server_fd_type device_file_get_fd_type( struct fd *fd ) return FD_TYPE_DEVICE; } -static int device_file_get_volume_info( struct fd *fd, struct async *async, unsigned int info_class ) +static void device_file_get_volume_info( struct fd *fd, struct async *async, unsigned int info_class ) { struct device_file *file = get_fd_user( fd ); irp_params_t params; @@ -622,7 +622,7 @@ static int device_file_get_volume_info( struct fd *fd, struct async *async, unsi memset( &params, 0, sizeof(params) ); params.volume.type = IRP_CALL_VOLUME; params.volume.info_class = info_class; - return queue_irp( file, &params, async ); + queue_irp( file, &params, async ); } static int device_file_read( struct fd *fd, struct async *async, file_pos_t pos ) diff --git a/server/fd.c b/server/fd.c index e4ef29806f2..93359ea03a5 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2369,10 +2369,9 @@ void default_fd_get_file_info( struct fd *fd, obj_handle_t handle, unsigned int } /* default get_volume_info() routine */ -int no_fd_get_volume_info( struct fd *fd, struct async *async, unsigned int info_class ) +void no_fd_get_volume_info( struct fd *fd, struct async *async, unsigned int info_class ) { set_error( STATUS_OBJECT_TYPE_MISMATCH ); - return 0; } /* default ioctl() routine */ diff --git a/server/file.h b/server/file.h index 592ee6b4e6b..6b949537084 100644 --- a/server/file.h +++ b/server/file.h @@ -65,7 +65,7 @@ struct fd_ops /* query file info */ void (*get_file_info)( struct fd *, obj_handle_t, unsigned int ); /* query volume info */ - int (*get_volume_info)( struct fd *, struct async *, unsigned int ); + void (*get_volume_info)( struct fd *, struct async *, unsigned int ); /* perform an ioctl on the file */ int (*ioctl)(struct fd *fd, ioctl_code_t code, struct async *async ); /* queue an async operation */ @@ -114,7 +114,7 @@ extern int no_fd_write( struct fd *fd, struct async *async, file_pos_t pos ); extern int no_fd_flush( struct fd *fd, struct async *async ); extern void no_fd_get_file_info( struct fd *fd, obj_handle_t handle, unsigned int info_class ); extern void default_fd_get_file_info( struct fd *fd, obj_handle_t handle, unsigned int info_class ); -extern int no_fd_get_volume_info( struct fd *fd, struct async *async, unsigned int info_class ); +extern void no_fd_get_volume_info( struct fd *fd, struct async *async, unsigned int info_class ); extern int no_fd_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); extern int default_fd_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); extern void no_fd_queue_async( struct fd *fd, struct async *async, int type, int count ); diff --git a/server/named_pipe.c b/server/named_pipe.c index 20407badc4c..72a61253a54 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -146,7 +146,7 @@ static WCHAR *pipe_end_get_full_name( struct object *obj, data_size_t *len ); static int pipe_end_read( struct fd *fd, struct async *async, file_pos_t pos ); static int pipe_end_write( struct fd *fd, struct async *async_data, file_pos_t pos ); static int pipe_end_flush( struct fd *fd, struct async *async ); -static int pipe_end_get_volume_info( struct fd *fd, struct async *async, unsigned int info_class ); +static void pipe_end_get_volume_info( struct fd *fd, struct async *async, unsigned int info_class ); static void pipe_end_reselect_async( struct fd *fd, struct async_queue *queue ); static void pipe_end_get_file_info( struct fd *fd, obj_handle_t handle, unsigned int info_class ); @@ -740,7 +740,7 @@ static WCHAR *pipe_end_get_full_name( struct object *obj, data_size_t *len ) return pipe_end->pipe->obj.ops->get_full_name( &pipe_end->pipe->obj, len ); } -static int pipe_end_get_volume_info( struct fd *fd, struct async *async, unsigned int info_class ) +static void pipe_end_get_volume_info( struct fd *fd, struct async *async, unsigned int info_class ) { switch (info_class) { @@ -760,7 +760,6 @@ static int pipe_end_get_volume_info( struct fd *fd, struct async *async, unsigne default: set_error( STATUS_NOT_IMPLEMENTED ); } - return 0; } static void message_queue_read( struct pipe_end *pipe_end, struct async *async )

1 0