- Wine-Devel - list.winehq.org

[PATCH 5/8] winspool: Use configuration file for DocumentPropertiesW.
by Jacek Caban Sept. 13, 2021

Sept. 13, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winspool.drv/info.c | 77 ++++++++++++---------------------------- 1 file changed, 23 insertions(+), 54 deletions(-)

2 1

[PATCH 4/8] wineps: Introduce DrvDocumentProperties entry point.
by Jacek Caban Sept. 13, 2021

Sept. 13, 2021

This is not compatible with native. We should use DrvDevicePropertySheets instead, but that requires support for CPSUI support first. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/wineps.drv/driver.c | 116 +++++++++++++++++--------------- dlls/wineps.drv/wineps.drv.spec | 1 + 2 files changed, 62 insertions(+), 55 deletions(-)

2 1

[PATCH 3/8] winspool: Use DeviceCapabilitiesW for DeviceCapabilitiesA.
by Jacek Caban Sept. 13, 2021

Sept. 13, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winspool.drv/info.c | 67 ++++++++++++++++++++++++++-------------- 1 file changed, 43 insertions(+), 24 deletions(-)

2 1

[PATCH 2/8] winspool: Use configuration file for DeviceCapabilitiesW.
by Jacek Caban Sept. 13, 2021

Sept. 13, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winspool.drv/info.c | 228 ++++++++++++++++++++++++++------------- 1 file changed, 155 insertions(+), 73 deletions(-)

2 1

[PATCH 1/8] wineps.drv: Export DrvDeviceCapabilities.
by Jacek Caban Sept. 13, 2021

Sept. 13, 2021

Allows wineps.drv to act as printer configuration interface DLL. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/wineps.drv/driver.c | 101 +++++++++++++++++++++++--------- dlls/wineps.drv/wineps.drv.spec | 3 + include/ddk/winddiui.h | 1 + 3 files changed, 78 insertions(+), 27 deletions(-)

2 1

[PATCH 1/5] wbemprox: Copy correct substring to *namespace in parse_resource().
by Paul Gofman Sept. 13, 2021

Sept. 13, 2021

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/wbemprox/wbemlocator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wbemprox/wbemlocator.c b/dlls/wbemprox/wbemlocator.c index 5e86f2be86d..161d9845ca9 100644 --- a/dlls/wbemprox/wbemlocator.c +++ b/dlls/wbemprox/wbemlocator.c @@ -139,7 +139,7 @@ static HRESULT parse_resource( const WCHAR *resource, WCHAR **server, WCHAR **na if (!(*namespace = heap_alloc( (len + 1) * sizeof(WCHAR) ))) hr = E_OUTOFMEMORY; else { - memcpy( *namespace, p, len * sizeof(WCHAR) ); + memcpy( *namespace, q, len * sizeof(WCHAR) ); (*namespace)[len] = 0; hr = S_OK; } -- 2.31.1

2 5

[PATCH 1/6] winexinput.sys: Return native product strings on some devices.
by Rémi Bernon Sept. 13, 2021

Sept. 13, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winexinput.sys/main.c | 60 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/dlls/winexinput.sys/main.c b/dlls/winexinput.sys/main.c index 3832c97ef26..667ce867269 100644 --- a/dlls/winexinput.sys/main.c +++ b/dlls/winexinput.sys/main.c @@ -32,6 +32,7 @@ #include "ddk/wdm.h" #include "ddk/hidport.h" #include "ddk/hidpddi.h" +#include "ddk/hidtypes.h" #include "wine/asm.h" #include "wine/debug.h" @@ -314,17 +315,76 @@ static NTSTATUS try_complete_pending_read(DEVICE_OBJECT *device, IRP *irp) return IoCallDriver(fdo->bus_device, xinput_irp); } +struct device_strings +{ + const WCHAR *id; + const WCHAR *product; +}; + +static const struct device_strings device_strings[] = +{ + { .id = L"VID_045E&PID_028E&IG_00", .product = L"Controller (XBOX 360 For Windows)" }, + { .id = L"VID_045E&PID_028F&IG_00", .product = L"Controller (XBOX 360 For Windows)" }, + { .id = L"VID_045E&PID_02D1&IG_00", .product = L"Controller (XBOX One For Windows)" }, + { .id = L"VID_045E&PID_02DD&IG_00", .product = L"Controller (XBOX One For Windows)" }, + { .id = L"VID_045E&PID_02E3&IG_00", .product = L"Controller (XBOX One For Windows)" }, + { .id = L"VID_045E&PID_02EA&IG_00", .product = L"Controller (XBOX One For Windows)" }, + { .id = L"VID_045E&PID_02FD&IG_00", .product = L"Controller (XBOX One For Windows)" }, + { .id = L"VID_045E&PID_0719&IG_00", .product = L"Controller (XBOX 360 For Windows)" }, +}; + +static const WCHAR *find_product_string(const WCHAR *device_id) +{ + const WCHAR *match_id = wcsrchr(device_id, '\\') + 1; + DWORD i; + + for (i = 0; i < ARRAY_SIZE(device_strings); ++i) + if (!wcsicmp(device_strings[i].id, match_id)) + return device_strings[i].product; + + return NULL; +} + static NTSTATUS WINAPI gamepad_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) { IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); ULONG output_len = stack->Parameters.DeviceIoControl.OutputBufferLength; ULONG code = stack->Parameters.DeviceIoControl.IoControlCode; struct func_device *fdo = fdo_from_DEVICE_OBJECT(device); + struct device *impl = impl_from_DEVICE_OBJECT(device); + const WCHAR *str = NULL; TRACE("device %p, irp %p, code %#x, bus_device %p.\n", device, irp, code, fdo->bus_device); switch (code) { + case IOCTL_HID_GET_STRING: + switch ((ULONG_PTR)stack->Parameters.DeviceIoControl.Type3InputBuffer) + { + case HID_STRING_ID_IPRODUCT: + str = find_product_string(impl->device_id); + break; + } + + if (!str) + { + IoSkipCurrentIrpStackLocation(irp); + return IoCallDriver(fdo->bus_device, irp); + } + + irp->IoStatus.Information = (wcslen(str) + 1) * sizeof(WCHAR); + if (output_len < irp->IoStatus.Information) + { + irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; + IoCompleteRequest(irp, IO_NO_INCREMENT); + return STATUS_BUFFER_TOO_SMALL; + } + + wcscpy(irp->UserBuffer, str); + irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; + case IOCTL_HID_GET_DEVICE_DESCRIPTOR: { HID_DESCRIPTOR *descriptor = (HID_DESCRIPTOR *)irp->UserBuffer; -- 2.33.0

1 5

[PATCH] msi: Don't leak the file handle on error in cabinet_close_file_info().
by Hans Leidekker Sept. 13, 2021

Sept. 13, 2021

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/media.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/msi/media.c b/dlls/msi/media.c index cc4648481ba..af6e83b893e 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -507,16 +507,23 @@ static INT_PTR cabinet_close_file_info(FDINOTIFICATIONTYPE fdint, data->mi->is_continuous = FALSE; if (!DosDateTimeToFileTime(pfdin->date, pfdin->time, &ft)) + { + CloseHandle(handle); return -1; + } if (!LocalFileTimeToFileTime(&ft, &ftLocal)) + { + CloseHandle(handle); return -1; + } if (!SetFileTime(handle, &ftLocal, 0, &ftLocal)) + { + CloseHandle(handle); return -1; + } CloseHandle(handle); - - data->cb(data->package, data->curfile, MSICABEXTRACT_FILEEXTRACTED, NULL, NULL, - data->user); + data->cb(data->package, data->curfile, MSICABEXTRACT_FILEEXTRACTED, NULL, NULL, data->user); msi_free(data->curfile); data->curfile = NULL; -- 2.30.2

1 0

[PATCH 1/4] winexinput.sys: Register known XBox controllers hardware ids.
by Rémi Bernon Sept. 13, 2021

Sept. 13, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- * Send the patches separately from the others, they should not conflict * Force the &MI_00 suffix on all gamepad devices where we cannot figure the correct interface number (SDL and IOHID bus). dlls/winexinput.sys/winexinput.inf | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/winexinput.sys/winexinput.inf b/dlls/winexinput.sys/winexinput.inf index 2f388c190ca..a2b74863c63 100644 --- a/dlls/winexinput.sys/winexinput.inf +++ b/dlls/winexinput.sys/winexinput.inf @@ -8,6 +8,19 @@ Wine=mfg_section [mfg_section] Wine XInput compatible device=device_section,WINEBUS\WINE_COMP_XINPUT +Xbox Controller=device_section,WINEBUS\VID_045E&PID_0202&MI_00 +Xbox Controller S=device_section,WINEBUS\VID_045E&PID_0285&MI_00 +Xbox Controller S=device_section,WINEBUS\VID_045E&PID_0289&MI_00 +Xbox360 Controller=device_section,WINEBUS\VID_045E&PID_028E&MI_00 +Xbox360 Wireless Controller=device_section,WINEBUS\VID_045E&PID_028F&MI_00 +Xbox One Controller=device_section,WINEBUS\VID_045E&PID_02D1&MI_00 +Xbox One Controller (Covert Forces/Firmware 2015)=device_section,WINEBUS\VID_045E&PID_02DD&MI_00 +Xbox One X Controller=device_section,WINEBUS\VID_045E&PID_02E0&MI_00 +Xbox One Elite Controller=device_section,WINEBUS\VID_045E&PID_02E3&MI_00 +Wireless XBox Controller Dongle=device_section,WINEBUS\VID_045E&PID_02E6&MI_00 +Xbox One S Controller=device_section,WINEBUS\VID_045E&PID_02EA&MI_00 +Xbox One S Controller (Firmware 2017)=device_section,WINEBUS\VID_045E&PID_02FD&MI_00 +Xbox 360 Wireless Adapter=device_section,WINEBUS\VID_045E&PID_0719&MI_00 [device_section.Services] AddService = xinput,0x2,svc_section -- 2.33.0

1 4

[PATCH 1/8] dinput8/tests: Fix inverted winetest_win_skip condition.
by Rémi Bernon Sept. 13, 2021

Sept. 13, 2021

And change skipped test message. It's not really useful and it will fail the tests if the main test summary doesn't match the number of skipped messages. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- In order for the skipped tests to be counted correctly we would need a new winetest_add_skipped helper in wine/test.h and that would cause all tests to be rebuilt. This is simpler and I don't think driver skipped test count matter so much. It could also be added later. dlls/dinput8/tests/driver_hid.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput8/tests/driver_hid.h b/dlls/dinput8/tests/driver_hid.h index 8fad343157d..42d12a0cf27 100644 --- a/dlls/dinput8/tests/driver_hid.h +++ b/dlls/dinput8/tests/driver_hid.h @@ -326,7 +326,7 @@ static inline void winetest_vskip( const char *msg, __ms_va_list args ) { if (winetest_add_line() < winetest_mute_threshold) { - winetest_print_context( "Tests skipped: " ); + winetest_print_context( "Driver tests skipped: " ); kvprintf( msg, args ); InterlockedIncrement( &skipped ); } @@ -347,7 +347,7 @@ static inline void WINAPIV winetest_win_skip( const char *msg, ... ) { __ms_va_list args; __ms_va_start( args, msg ); - if (running_under_wine) winetest_vskip( msg, args ); + if (!running_under_wine) winetest_vskip( msg, args ); else winetest_vok( 0, msg, args ); __ms_va_end( args ); } -- 2.33.0

1 7