October 2021 - Wine-commits

Huw Davies : winspool: Build with msvcrt.
by Alexandre Julliard 27 Oct '21

27 Oct '21

Module: wine Branch: master Commit: da0db2eb79a666921327bcb6d73ad082e9f5e82d URL: https://source.winehq.org/git/wine.git/?a=commit;h=da0db2eb79a666921327bcb6… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 27 08:14:46 2021 +0100 winspool: Build with msvcrt. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 - configure.ac | 1 - dlls/winspool.drv/Makefile.in | 3 +- dlls/winspool.drv/cups.c | 47 ++++++------- dlls/winspool.drv/info.c | 157 ++++++++++++++++++++++-------------------- dlls/winspool.drv/wspool.c | 16 ++--- dlls/winspool.drv/wspool.h | 17 +++-- include/config.h.in | 3 - 8 files changed, 121 insertions(+), 124 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=da0db2eb79a666921327…

1 0

Huw Davies : winspool: Add a helper to open various printer registry keys.
by Alexandre Julliard 27 Oct '21

27 Oct '21

Module: wine Branch: master Commit: 18697defa597985071ac5149ca8b73f8d2144a88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18697defa597985071ac5149… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 27 08:14:47 2021 +0100 winspool: Add a helper to open various printer registry keys. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/info.c | 255 ++++++++++++++++++++++++----------------------- 1 file changed, 128 insertions(+), 127 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=18697defa597985071ac…

1 0

Huw Davies : winspool: Use wide character string literals.
by Alexandre Julliard 27 Oct '21

27 Oct '21

Module: wine Branch: master Commit: e043d1d3af433ee4323e12a30892a6b2e932a362 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e043d1d3af433ee4323e12a3… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 27 08:14:48 2021 +0100 winspool: Use wide character string literals. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/info.c | 424 +++++++++++++++++++++-------------------------- 1 file changed, 189 insertions(+), 235 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e043d1d3af433ee4323e…

1 0

Rémi Bernon : dinput: Trace device entry points calls consistently.
by Alexandre Julliard 27 Oct '21

27 Oct '21

Module: wine Branch: master Commit: 69c9631081883fe0a47d9c0e6a44b32f2769ee04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=69c9631081883fe0a47d9c0e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 27 09:40:58 2021 +0200 dinput: Trace device entry points calls consistently. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 150 ++++++++++++++++++++++++--------------------------- 1 file changed, 69 insertions(+), 81 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=69c9631081883fe0a47d…

1 0

Rémi Bernon : dinput: Rename IDirectInputDeviceImpl to struct dinput_device.
by Alexandre Julliard 27 Oct '21

27 Oct '21

Module: wine Branch: master Commit: dac2e0b18779f8713681b88929a415eb7b5d2a19 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dac2e0b18779f8713681b889… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 27 09:40:59 2021 +0200 dinput: Rename IDirectInputDeviceImpl to struct dinput_device. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/ansi.c | 72 ++++++------ dlls/dinput/device.c | 258 +++++++++++++++++++++---------------------- dlls/dinput/device_private.h | 11 +- dlls/dinput/dinput_main.c | 124 ++++++++++----------- dlls/dinput/dinput_private.h | 6 +- dlls/dinput/joystick_hid.c | 12 +- dlls/dinput/keyboard.c | 10 +- dlls/dinput/mouse.c | 9 +- 8 files changed, 244 insertions(+), 258 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dac2e0b18779f8713681…

1 0

Rémi Bernon : dinput: Rename SysKeyboardImpl to struct keyboard.
by Alexandre Julliard 27 Oct '21

27 Oct '21

Module: wine Branch: master Commit: 80f4cce671edc66dedfd801cab0cd92542884312 URL: https://source.winehq.org/git/wine.git/?a=commit;h=80f4cce671edc66dedfd801c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 27 09:41:00 2021 +0200 dinput: Rename SysKeyboardImpl to struct keyboard. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/keyboard.c | 43 +++++++++++++++++++++---------------------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 713c5310322..ef125176ecb 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -36,16 +36,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(dinput); static const struct dinput_device_vtbl keyboard_vtbl; -typedef struct SysKeyboardImpl SysKeyboardImpl; -struct SysKeyboardImpl +struct keyboard { struct dinput_device base; }; -static inline SysKeyboardImpl *impl_from_IDirectInputDevice8W(IDirectInputDevice8W *iface) +static inline struct keyboard *impl_from_IDirectInputDevice8W( IDirectInputDevice8W *iface ) { return CONTAINING_RECORD( CONTAINING_RECORD( iface, struct dinput_device, IDirectInputDevice8W_iface ), - SysKeyboardImpl, base ); + struct keyboard, base ); } static BYTE map_dik_code(DWORD scanCode, DWORD vkCode, DWORD subType, DWORD version) @@ -86,9 +85,9 @@ static BYTE map_dik_code(DWORD scanCode, DWORD vkCode, DWORD subType, DWORD vers int dinput_keyboard_hook( IDirectInputDevice8W *iface, WPARAM wparam, LPARAM lparam ) { - SysKeyboardImpl *This = impl_from_IDirectInputDevice8W( iface ); - BYTE new_diks, subtype = GET_DIDEVICE_SUBTYPE( This->base.instance.dwDevType ); - int dik_code, ret = This->base.dwCoopLevel & DISCL_EXCLUSIVE; + struct keyboard *impl = impl_from_IDirectInputDevice8W( iface ); + BYTE new_diks, subtype = GET_DIDEVICE_SUBTYPE( impl->base.instance.dwDevType ); + int dik_code, ret = impl->base.dwCoopLevel & DISCL_EXCLUSIVE; KBDLLHOOKSTRUCT *hook = (KBDLLHOOKSTRUCT *)lparam; DWORD scan_code; @@ -109,21 +108,21 @@ int dinput_keyboard_hook( IDirectInputDevice8W *iface, WPARAM wparam, LPARAM lpa default: scan_code = hook->scanCode & 0xff; if (hook->flags & LLKHF_EXTENDED) scan_code |= 0x100; - dik_code = map_dik_code( scan_code, hook->vkCode, subtype, This->base.dinput->dwVersion ); + dik_code = map_dik_code( scan_code, hook->vkCode, subtype, impl->base.dinput->dwVersion ); } new_diks = hook->flags & LLKHF_UP ? 0 : 0x80; /* returns now if key event already known */ - if (new_diks == This->base.device_state[dik_code]) return ret; + if (new_diks == impl->base.device_state[dik_code]) return ret; - This->base.device_state[dik_code] = new_diks; - TRACE( " setting key %02x to %02x\n", dik_code, This->base.device_state[dik_code] ); + impl->base.device_state[dik_code] = new_diks; + TRACE( " setting key %02x to %02x\n", dik_code, impl->base.device_state[dik_code] ); - EnterCriticalSection(&This->base.crit); - queue_event(iface, DIDFT_MAKEINSTANCE(dik_code) | DIDFT_PSHBUTTON, - new_diks, GetCurrentTime(), This->base.dinput->evsequence++); - if (This->base.hEvent) SetEvent( This->base.hEvent ); - LeaveCriticalSection(&This->base.crit); + EnterCriticalSection( &impl->base.crit ); + queue_event( iface, DIDFT_MAKEINSTANCE( dik_code ) | DIDFT_PSHBUTTON, new_diks, + GetCurrentTime(), impl->base.dinput->evsequence++ ); + if (impl->base.hEvent) SetEvent( impl->base.hEvent ); + LeaveCriticalSection( &impl->base.crit ); return ret; } @@ -177,7 +176,7 @@ HRESULT keyboard_enum_device( DWORD type, DWORD flags, DIDEVICEINSTANCEW *instan HRESULT keyboard_create_device( IDirectInputImpl *dinput, const GUID *guid, IDirectInputDevice8W **out ) { - SysKeyboardImpl *impl; + struct keyboard *impl; HRESULT hr; TRACE( "dinput %p, guid %s, out %p\n", dinput, debugstr_guid( guid ), out ); @@ -185,9 +184,9 @@ HRESULT keyboard_create_device( IDirectInputImpl *dinput, const GUID *guid, IDir *out = NULL; if (!IsEqualGUID( &GUID_SysKeyboard, guid )) return DIERR_DEVICENOTREG; - if (FAILED(hr = dinput_device_alloc( sizeof(SysKeyboardImpl), &keyboard_vtbl, guid, dinput, (void **)&impl ))) + if (FAILED(hr = dinput_device_alloc( sizeof(struct keyboard), &keyboard_vtbl, guid, dinput, (void **)&impl ))) return hr; - impl->base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SysKeyboardImpl*->base.crit"); + impl->base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": struct keyboard*->base.crit"); keyboard_enum_device( 0, 0, &impl->base.instance, dinput->dwVersion, 0 ); impl->base.caps.dwDevType = impl->base.instance.dwDevType; @@ -217,8 +216,8 @@ static HRESULT keyboard_acquire( IDirectInputDevice8W *iface ) static HRESULT keyboard_unacquire( IDirectInputDevice8W *iface ) { - SysKeyboardImpl *This = impl_from_IDirectInputDevice8W( iface ); - memset( This->base.device_state, 0, sizeof(This->base.device_state) ); + struct keyboard *impl = impl_from_IDirectInputDevice8W( iface ); + memset( impl->base.device_state, 0, sizeof(impl->base.device_state) ); return DI_OK; } @@ -245,7 +244,7 @@ static BOOL try_enum_object( const DIPROPHEADER *filter, DWORD flags, LPDIENUMDE static HRESULT keyboard_enum_objects( IDirectInputDevice8W *iface, const DIPROPHEADER *filter, DWORD flags, LPDIENUMDEVICEOBJECTSCALLBACKW callback, void *context ) { - SysKeyboardImpl *impl = impl_from_IDirectInputDevice8W( iface ); + struct keyboard *impl = impl_from_IDirectInputDevice8W( iface ); BYTE subtype = GET_DIDEVICE_SUBTYPE( impl->base.instance.dwDevType ); DIDEVICEOBJECTINSTANCEW instance = {

1 0

Rémi Bernon : dinput: Rename SysMouseImpl to struct mouse.
by Alexandre Julliard 27 Oct '21

27 Oct '21

Module: wine Branch: master Commit: b7e23884915920d4c8b7bb62a47b95aba23786d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7e23884915920d4c8b7bb62… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 27 09:41:01 2021 +0200 dinput: Rename SysMouseImpl to struct mouse. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/mouse.c | 91 ++++++++++++++++++++++++----------------------------- 1 file changed, 41 insertions(+), 50 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b7e23884915920d4c8b7…

1 0

Rémi Bernon : winebus.sys: Drop the hid_report channel.
by Alexandre Julliard 27 Oct '21

27 Oct '21

Module: wine Branch: master Commit: 3ad0c002da26cb3a9a022614490b86b6d3eaef28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ad0c002da26cb3a9a022614… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 27 10:39:11 2021 +0200 winebus.sys: Drop the hid_report channel. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 4 +--- dlls/winebus.sys/bus_udev.c | 22 ++++++++++------------ dlls/winebus.sys/main.c | 7 +++---- 3 files changed, 14 insertions(+), 19 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index fe3a960649c..d172d5382fd 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -59,8 +59,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(plugplay); #ifdef SONAME_LIBSDL2 -WINE_DECLARE_DEBUG_CHANNEL(hid_report); - static pthread_mutex_t sdl_cs = PTHREAD_MUTEX_INITIALIZER; static struct sdl_bus_options options; @@ -847,7 +845,7 @@ static void process_device_event(SDL_Event *event) struct sdl_device *impl; SDL_JoystickID id; - TRACE_(hid_report)("Received action %x\n", event->type); + TRACE("Received action %x\n", event->type); pthread_mutex_lock(&sdl_cs); diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 4c00fe6ad39..780af549916 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -101,8 +101,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(plugplay); #ifdef HAVE_UDEV -WINE_DECLARE_DEBUG_CHANNEL(hid_report); - static pthread_mutex_t udev_cs = PTHREAD_MUTEX_INITIALIZER; static struct udev *udev_context = NULL; @@ -344,9 +342,9 @@ static void hidraw_device_read_report(struct unix_device *iface) int size = read(impl->base.device_fd, report_buffer, sizeof(report_buffer)); if (size == -1) - TRACE_(hid_report)("Read failed. Likely an unplugged device %d %s\n", errno, strerror(errno)); + TRACE("Read failed. Likely an unplugged device %d %s\n", errno, strerror(errno)); else if (size == 0) - TRACE_(hid_report)("Failed to read report\n"); + TRACE("Failed to read report\n"); else { /* As described in the Linux kernel driver, when connected over bluetooth, DS4 controllers @@ -380,7 +378,7 @@ static void hidraw_device_set_output_report(struct unix_device *iface, HID_XFER_ if ((buffer[0] = packet->reportId)) count = write(impl->base.device_fd, packet->reportBuffer, length); else if (length > sizeof(buffer) - 1) - ERR_(hid_report)("id %d length %u >= 8192, cannot write\n", packet->reportId, length); + ERR("id %d length %u >= 8192, cannot write\n", packet->reportId, length); else { memcpy(buffer + 1, packet->reportBuffer, length); @@ -394,7 +392,7 @@ static void hidraw_device_set_output_report(struct unix_device *iface, HID_XFER_ } else { - ERR_(hid_report)("id %d write failed error: %d %s\n", packet->reportId, errno, strerror(errno)); + ERR("id %d write failed error: %d %s\n", packet->reportId, errno, strerror(errno)); io->Information = 0; io->Status = STATUS_UNSUCCESSFUL; } @@ -412,7 +410,7 @@ static void hidraw_device_get_feature_report(struct unix_device *iface, HID_XFER if ((buffer[0] = packet->reportId) && length <= 0x1fff) count = ioctl(impl->base.device_fd, HIDIOCGFEATURE(length), packet->reportBuffer); else if (length > sizeof(buffer) - 1) - ERR_(hid_report)("id %d length %u >= 8192, cannot read\n", packet->reportId, length); + ERR("id %d length %u >= 8192, cannot read\n", packet->reportId, length); else { count = ioctl(impl->base.device_fd, HIDIOCGFEATURE(length + 1), buffer); @@ -426,7 +424,7 @@ static void hidraw_device_get_feature_report(struct unix_device *iface, HID_XFER } else { - ERR_(hid_report)("id %d read failed, error: %d %s\n", packet->reportId, errno, strerror(errno)); + ERR("id %d read failed, error: %d %s\n", packet->reportId, errno, strerror(errno)); io->Information = 0; io->Status = STATUS_UNSUCCESSFUL; } @@ -448,7 +446,7 @@ static void hidraw_device_set_feature_report(struct unix_device *iface, HID_XFER if ((buffer[0] = packet->reportId) && length <= 0x1fff) count = ioctl(impl->base.device_fd, HIDIOCSFEATURE(length), packet->reportBuffer); else if (length > sizeof(buffer) - 1) - ERR_(hid_report)("id %d length %u >= 8192, cannot write\n", packet->reportId, length); + ERR("id %d length %u >= 8192, cannot write\n", packet->reportId, length); else { memcpy(buffer + 1, packet->reportBuffer, length); @@ -462,7 +460,7 @@ static void hidraw_device_set_feature_report(struct unix_device *iface, HID_XFER } else { - ERR_(hid_report)("id %d write failed, error: %d %s\n", packet->reportId, errno, strerror(errno)); + ERR("id %d write failed, error: %d %s\n", packet->reportId, errno, strerror(errno)); io->Information = 0; io->Status = STATUS_UNSUCCESSFUL; } @@ -802,9 +800,9 @@ static void lnxev_device_read_report(struct unix_device *iface) size = read(impl->base.device_fd, &ie, sizeof(ie)); if (size == -1) - TRACE_(hid_report)("Read failed. Likely an unplugged device\n"); + TRACE("Read failed. Likely an unplugged device\n"); else if (size == 0) - TRACE_(hid_report)("Failed to read report\n"); + TRACE("Failed to read report\n"); else if (set_report_from_event(iface, &ie)) bus_event_queue_input_report(&event_queue, iface, state->report_buf, state->report_len); } diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 433963b44d4..1353df7d000 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -41,7 +41,6 @@ #include "unixlib.h" WINE_DEFAULT_DEBUG_CHANNEL(plugplay); -WINE_DECLARE_DEBUG_CHANNEL(hid_report); static DRIVER_OBJECT *driver_obj; @@ -1045,21 +1044,21 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) case IOCTL_HID_WRITE_REPORT: { HID_XFER_PACKET *packet = (HID_XFER_PACKET*)(irp->UserBuffer); - TRACE_(hid_report)("IOCTL_HID_WRITE_REPORT / IOCTL_HID_SET_OUTPUT_REPORT\n"); + TRACE("IOCTL_HID_WRITE_REPORT / IOCTL_HID_SET_OUTPUT_REPORT\n"); unix_device_set_output_report(device, packet, &irp->IoStatus); break; } case IOCTL_HID_GET_FEATURE: { HID_XFER_PACKET *packet = (HID_XFER_PACKET*)(irp->UserBuffer); - TRACE_(hid_report)("IOCTL_HID_GET_FEATURE\n"); + TRACE("IOCTL_HID_GET_FEATURE\n"); unix_device_get_feature_report(device, packet, &irp->IoStatus); break; } case IOCTL_HID_SET_FEATURE: { HID_XFER_PACKET *packet = (HID_XFER_PACKET*)(irp->UserBuffer); - TRACE_(hid_report)("IOCTL_HID_SET_FEATURE\n"); + TRACE("IOCTL_HID_SET_FEATURE\n"); unix_device_set_feature_report(device, packet, &irp->IoStatus); break; }

1 0

Rémi Bernon : winebus.sys: Consistently trace HID reports.
by Alexandre Julliard 27 Oct '21

27 Oct '21

Module: wine Branch: master Commit: 13453bb9a0cb63fa53f7fff85f20be55f7038b97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13453bb9a0cb63fa53f7fff8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 27 10:39:12 2021 +0200 winebus.sys: Consistently trace HID reports. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/main.c | 75 +++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 66 insertions(+), 9 deletions(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 1353df7d000..0e7889386dc 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -401,6 +401,7 @@ static BOOL deliver_next_report(struct device_extension *ext, IRP *irp) { struct hid_report *report; struct list *entry; + ULONG i; if (!(entry = list_head(&ext->reports))) return FALSE; report = LIST_ENTRY(entry, struct hid_report, entry); @@ -410,6 +411,19 @@ static BOOL deliver_next_report(struct device_extension *ext, IRP *irp) irp->IoStatus.Information = report->length; irp->IoStatus.Status = STATUS_SUCCESS; + if (TRACE_ON(plugplay)) + { + TRACE("read input report length %u:\n", report->length); + for (i = 0; i < report->length;) + { + char buffer[256], *buf = buffer; + buf += sprintf(buf, "%08x ", i); + do { buf += sprintf(buf, " %02x", report->buffer[i]); } + while (++i % 16 && i < report->length); + TRACE("%s\n", buffer); + } + } + RtlFreeHeap(GetProcessHeap(), 0, report); return TRUE; } @@ -937,11 +951,9 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation(irp); struct device_extension *ext = (struct device_extension *)device->DeviceExtension; - ULONG code, buffer_len = irpsp->Parameters.DeviceIoControl.OutputBufferLength; + ULONG i, code, buffer_len = irpsp->Parameters.DeviceIoControl.OutputBufferLength; NTSTATUS status; - TRACE("(%p, %p)\n", device, irp); - if (device == bus_fdo) { IoSkipCurrentIrpStackLocation(irp); @@ -1026,6 +1038,18 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) memcpy(packet->reportBuffer, ext->last_reports[packet->reportId], packet->reportBufferLen); irp->IoStatus.Information = packet->reportBufferLen; irp->IoStatus.Status = STATUS_SUCCESS; + if (TRACE_ON(plugplay)) + { + TRACE("read input report id %u length %u:\n", packet->reportId, packet->reportBufferLen); + for (i = 0; i < packet->reportBufferLen;) + { + char buffer[256], *buf = buffer; + buf += sprintf(buf, "%08x ", i); + do { buf += sprintf(buf, " %02x", packet->reportBuffer[i]); } + while (++i % 16 && i < packet->reportBufferLen); + TRACE("%s\n", buffer); + } + } break; } case IOCTL_HID_READ_REPORT: @@ -1043,22 +1067,55 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) case IOCTL_HID_SET_OUTPUT_REPORT: case IOCTL_HID_WRITE_REPORT: { - HID_XFER_PACKET *packet = (HID_XFER_PACKET*)(irp->UserBuffer); - TRACE("IOCTL_HID_WRITE_REPORT / IOCTL_HID_SET_OUTPUT_REPORT\n"); + HID_XFER_PACKET *packet = (HID_XFER_PACKET *)irp->UserBuffer; + if (TRACE_ON(plugplay)) + { + TRACE("write output report id %u length %u:\n", packet->reportId, packet->reportBufferLen); + for (i = 0; i < packet->reportBufferLen;) + { + char buffer[256], *buf = buffer; + buf += sprintf(buf, "%08x ", i); + do { buf += sprintf(buf, " %02x", packet->reportBuffer[i]); } + while (++i % 16 && i < packet->reportBufferLen); + TRACE("%s\n", buffer); + } + } unix_device_set_output_report(device, packet, &irp->IoStatus); break; } case IOCTL_HID_GET_FEATURE: { - HID_XFER_PACKET *packet = (HID_XFER_PACKET*)(irp->UserBuffer); - TRACE("IOCTL_HID_GET_FEATURE\n"); + HID_XFER_PACKET *packet = (HID_XFER_PACKET *)irp->UserBuffer; unix_device_get_feature_report(device, packet, &irp->IoStatus); + if (!irp->IoStatus.Status && TRACE_ON(plugplay)) + { + TRACE("read feature report id %u length %u:\n", packet->reportId, packet->reportBufferLen); + for (i = 0; i < packet->reportBufferLen;) + { + char buffer[256], *buf = buffer; + buf += sprintf(buf, "%08x ", i); + do { buf += sprintf(buf, " %02x", packet->reportBuffer[i]); } + while (++i % 16 && i < packet->reportBufferLen); + TRACE("%s\n", buffer); + } + } break; } case IOCTL_HID_SET_FEATURE: { - HID_XFER_PACKET *packet = (HID_XFER_PACKET*)(irp->UserBuffer); - TRACE("IOCTL_HID_SET_FEATURE\n"); + HID_XFER_PACKET *packet = (HID_XFER_PACKET *)irp->UserBuffer; + if (TRACE_ON(plugplay)) + { + TRACE("write feature report id %u length %u:\n", packet->reportId, packet->reportBufferLen); + for (i = 0; i < packet->reportBufferLen;) + { + char buffer[256], *buf = buffer; + buf += sprintf(buf, "%08x ", i); + do { buf += sprintf(buf, " %02x", packet->reportBuffer[i]); } + while (++i % 16 && i < packet->reportBufferLen); + TRACE("%s\n", buffer); + } + } unix_device_set_feature_report(device, packet, &irp->IoStatus); break; }

1 0

Alexandre Julliard : windowscodecs: Remove the no longer used icns encoder.
by Alexandre Julliard 27 Oct '21

27 Oct '21

Module: wine Branch: master Commit: bc58b627b025a8bdb9f4abea09a1630ca1f3961f URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc58b627b025a8bdb9f4abea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 27 12:05:47 2021 +0200 windowscodecs: Remove the no longer used icns encoder. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/Makefile.in | 2 - dlls/windowscodecs/clsfactory.c | 1 - dlls/windowscodecs/icnsencoder.c | 295 -------------------------- dlls/windowscodecs/main.c | 14 -- dlls/windowscodecs/regsvr.c | 15 -- dlls/windowscodecs/unix_lib.c | 3 - dlls/windowscodecs/wincodecs_private.h | 5 - dlls/windowscodecs/windowscodecs_wincodec.idl | 7 - 8 files changed, 342 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bc58b627b025a8bdb9f4…

1 0