October 2021 - Wine-commits

Eric Pouech : winedbg: Use proper width when printing addresses with leading 0.
by Alexandre Julliard 12 Oct '21

12 Oct '21

Module: wine Branch: master Commit: 01ddc2f8e4e9e11655d6752b829316c033298abb URL: https://source.winehq.org/git/wine.git/?a=commit;h=01ddc2f8e4e9e11655d6752b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Oct 12 18:11:04 2021 +0200 winedbg: Use proper width when printing addresses with leading 0. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/info.c | 16 ++++++++-------- programs/winedbg/symbol.c | 4 ++-- programs/winedbg/types.c | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index 477438d83e3..b7f45086c5c 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -791,8 +791,8 @@ void info_win32_virtual(DWORD pid) type = ""; prot[0] = '\0'; } - dbg_printf("%08lx %08lx %s %s %s\n", - (DWORD_PTR)addr, (DWORD_PTR)addr + mbi.RegionSize - 1, state, type, prot); + dbg_printf("%0*lx %0*lx %s %s %s\n", + ADDRWIDTH, (DWORD_PTR)addr, ADDRWIDTH, (DWORD_PTR)addr + mbi.RegionSize - 1, state, type, prot); if (addr + mbi.RegionSize < addr) /* wrap around ? */ break; addr += mbi.RegionSize; @@ -893,10 +893,10 @@ void info_win32_exception(void) break; case EXCEPTION_ACCESS_VIOLATION: if (rec->NumberParameters == 2) - dbg_printf("page fault on %s access to 0x%08lx", + dbg_printf("page fault on %s access to 0x%0*lx", rec->ExceptionInformation[0] == EXCEPTION_WRITE_FAULT ? "write" : rec->ExceptionInformation[0] == EXCEPTION_EXECUTE_FAULT ? "execute" : "read", - rec->ExceptionInformation[1]); + ADDRWIDTH, rec->ExceptionInformation[1]); else dbg_printf("page fault"); break; @@ -961,15 +961,15 @@ void info_win32_exception(void) break; case EXCEPTION_WINE_CXX_EXCEPTION: if(rec->NumberParameters == 3 && rec->ExceptionInformation[0] == EXCEPTION_WINE_CXX_FRAME_MAGIC) - dbg_printf("C++ exception(object = 0x%08lx, type = 0x%08lx)", - rec->ExceptionInformation[1], rec->ExceptionInformation[2]); + dbg_printf("C++ exception(object = 0x%0*lx, type = 0x%0*lx)", + ADDRWIDTH, rec->ExceptionInformation[1], ADDRWIDTH, rec->ExceptionInformation[2]); else if(rec->NumberParameters == 4 && rec->ExceptionInformation[0] == EXCEPTION_WINE_CXX_FRAME_MAGIC) dbg_printf("C++ exception(object = %p, type = %p, base = %p)", (void*)rec->ExceptionInformation[1], (void*)rec->ExceptionInformation[2], (void*)rec->ExceptionInformation[3]); else - dbg_printf("C++ exception with strange parameter count %d or magic 0x%08lx", - rec->NumberParameters, rec->ExceptionInformation[0]); + dbg_printf("C++ exception with strange parameter count %d or magic 0x%0*lx", + rec->NumberParameters, ADDRWIDTH, rec->ExceptionInformation[0]); break; default: dbg_printf("0x%08x", rec->ExceptionCode); diff --git a/programs/winedbg/symbol.c b/programs/winedbg/symbol.c index b0ef59e49f0..7067b886f44 100644 --- a/programs/winedbg/symbol.c +++ b/programs/winedbg/symbol.c @@ -755,7 +755,7 @@ BOOL symbol_info_locals(void) addr.Mode = AddrModeFlat; addr.Offset = ihsf.InstructionOffset; print_address(&addr, FALSE); - dbg_printf(": (%08lx)\n", (DWORD_PTR)ihsf.FrameOffset); + dbg_printf(": (%0*lx)\n", ADDRWIDTH, (DWORD_PTR)ihsf.FrameOffset); SymEnumSymbols(dbg_curr_process->handle, 0, NULL, info_locals_cb, (void*)(DWORD_PTR)ihsf.FrameOffset); return TRUE; @@ -778,7 +778,7 @@ static BOOL CALLBACK symbols_info_cb(PSYMBOL_INFO sym, ULONG size, PVOID ctx) mi.ModuleName[len - 5] = '\0'; } - dbg_printf("%08lx: %s!%s", (ULONG_PTR)sym->Address, mi.ModuleName, sym->Name); + dbg_printf("%0*lx: %s!%s", ADDRWIDTH, (ULONG_PTR)sym->Address, mi.ModuleName, sym->Name); type.id = sym->TypeIndex; type.module = sym->ModBase; diff --git a/programs/winedbg/types.c b/programs/winedbg/types.c index 1fd40932557..5751ce095cc 100644 --- a/programs/winedbg/types.c +++ b/programs/winedbg/types.c @@ -571,7 +571,7 @@ static BOOL CALLBACK print_types_cb(PSYMBOL_INFO sym, ULONG size, void* ctx) struct dbg_type type; type.module = sym->ModBase; type.id = sym->TypeIndex; - dbg_printf("Mod: %08lx ID: %08x\n", type.module, type.id); + dbg_printf("Mod: %0*lx ID: %08x\n", ADDRWIDTH, type.module, type.id); types_print_type(&type, TRUE); dbg_printf("\n"); return TRUE;

1 0

Rémi Bernon : dinput: Fix invalid use of post-incremented device_count value.
by Alexandre Julliard 12 Oct '21

12 Oct '21

Module: wine Branch: master Commit: 50f889fd19d329bef7c001f9eafd1030fc1e3a56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=50f889fd19d329bef7c001f9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 12 22:31:44 2021 +0200 dinput: Fix invalid use of post-incremented device_count value. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/dinput_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index b385cc7503c..bc35d6d77b3 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -833,7 +833,8 @@ static HRESULT WINAPI IDirectInput8WImpl_EnumDevicesBySemantics( if (enumSuccess == S_OK && should_enumerate_device(ptszUserName, dwFlags, &This->device_players, &didevi.guidInstance)) { - didevis = realloc( didevis, sizeof(DIDEVICEINSTANCEW) * device_count++ ); + device_count++; + didevis = realloc( didevis, sizeof(DIDEVICEINSTANCEW) * device_count ); didevis[device_count-1] = didevi; } }

1 0

Alexandre Julliard : kernelbase: Remove dead code.
by Alexandre Julliard 12 Oct '21

12 Oct '21

Module: wine Branch: master Commit: e8beac105c9119fa109862e88c795cee1e8d27ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8beac105c9119fa109862e8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 12 18:29:10 2021 +0200 kernelbase: Remove dead code. __APPLE__ is never defined in the PE build. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 89b35775053..1c2f4dda221 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -5579,9 +5579,6 @@ INT WINAPI DECLSPEC_HOTPATCH MultiByteToWideChar( UINT codepage, DWORD flags, co if (unix_cp == CP_UTF8) { ret = mbstowcs_utf8( flags, src, srclen, dst, dstlen ); -#ifdef __APPLE__ /* work around broken Mac OS X filesystem that enforces decomposed Unicode */ - if (ret && dstlen) RtlNormalizeString( NormalizationC, dst, ret, dst, &ret ); -#endif break; } codepage = unix_cp;

1 0

Rémi Bernon : maintainers: Add hidparse.sys under HID support.
by Alexandre Julliard 12 Oct '21

12 Oct '21

Module: wine Branch: master Commit: 902aadb722a2acb537be96ee95964f0a9eea2ccd URL: https://source.winehq.org/git/wine.git/?a=commit;h=902aadb722a2acb537be96ee… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 12 10:02:30 2021 +0200 maintainers: Add hidparse.sys under HID support. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index 5bf636cfd34..c44fe86c45f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -163,6 +163,7 @@ M: Aric Stewart <aric(a)codeweavers.com> P: Rémi Bernon <rbernon(a)codeweavers.com> F: dlls/hid/ F: dlls/hidclass.sys/ +F: dlls/hidparse.sys/ F: dlls/winehid.sys/ HTTP server

1 0

Rémi Bernon : maintainers: Replace DirectInput with a Joystick input section.
by Alexandre Julliard 12 Oct '21

12 Oct '21

Module: wine Branch: master Commit: 5dd12ecd38477307954af82d4d3faaf65c7cde59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5dd12ecd38477307954af82d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 12 10:02:31 2021 +0200 maintainers: Replace DirectInput with a Joystick input section. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index c44fe86c45f..e11186011fc 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -87,11 +87,6 @@ F: dlls/d3dx11*/ F: dlls/d3dx9*/ F: dlls/d3dxof/ -DirectInput -P: Andrew Eikum <aeikum(a)codeweavers.com> -P: Rémi Bernon <rbernon(a)codeweavers.com> -F: dlls/dinput/ - DirectMusic M: Michael Stefaniuc <mstefani(a)winehq.org> F: dlls/dm*/ @@ -185,6 +180,15 @@ JavaScript M: Jacek Caban <jacek(a)codeweavers.com> F: dlls/jscript/ +Joystick input +P: Andrew Eikum <aeikum(a)codeweavers.com> +P: Rémi Bernon <rbernon(a)codeweavers.com> +F: dlls/dinput*/ +F: dlls/windows.gaming.input/ +F: dlls/winebus.sys/ +F: dlls/winexinput.sys/ +F: dlls/xinput*/ + Mac OS X graphics driver M: Ken Thomases <ken(a)codeweavers.com> F: dlls/winemac.drv/

1 0

Rémi Bernon : maintainers: Assume maintainership of the Joystick input section.
by Alexandre Julliard 12 Oct '21

12 Oct '21

Module: wine Branch: master Commit: 33578878e6988879790a41f2eccbc37f0d70e0c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=33578878e6988879790a41f2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 12 10:02:32 2021 +0200 maintainers: Assume maintainership of the Joystick input section. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index e11186011fc..ea27dc41af3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -181,8 +181,8 @@ M: Jacek Caban <jacek(a)codeweavers.com> F: dlls/jscript/ Joystick input +M: Rémi Bernon <rbernon(a)codeweavers.com> P: Andrew Eikum <aeikum(a)codeweavers.com> -P: Rémi Bernon <rbernon(a)codeweavers.com> F: dlls/dinput*/ F: dlls/windows.gaming.input/ F: dlls/winebus.sys/

1 0

Rémi Bernon : dinput: Only dump the HID report data that has been read.
by Alexandre Julliard 12 Oct '21

12 Oct '21

Module: wine Branch: master Commit: cb8bc378c2d67989071e34790dde9d7f921ece00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb8bc378c2d67989071e3479… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 12 09:56:22 2021 +0200 dinput: Only dump the HID report data that has been read. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 48594e5d622..203a5d7788d 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -1607,14 +1607,14 @@ static HRESULT hid_joystick_read_state( IDirectInputDevice8W *iface ) if (ret && TRACE_ON(dinput)) { TRACE( "read size %u report:\n", count ); - for (i = 0; i < report_len;) + for (i = 0; i < count;) { char buffer[256], *buf = buffer; buf += sprintf(buf, "%08x ", i); do { buf += sprintf(buf, " %02x", (BYTE)report_buf[i] ); - } while (++i % 16 && i < report_len); + } while (++i % 16 && i < count); TRACE("%s\n", buffer); } }

1 0

Rémi Bernon : winebus.sys: Do not parse bluetooth "PRODUCT=" uevent field.
by Alexandre Julliard 12 Oct '21

12 Oct '21

Module: wine Branch: master Commit: de7032816bd71d0edda30a78721e79b5b6af735c URL: https://source.winehq.org/git/wine.git/?a=commit;h=de7032816bd71d0edda30a78… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 12 09:59:12 2021 +0200 winebus.sys: Do not parse bluetooth "PRODUCT=" uevent field. These contain the bluetooth dongle VID / PID instead. 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 | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 2ed9a031af6..b857ba25df8 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1085,12 +1085,12 @@ static const struct hid_device_vtbl lnxev_device_vtbl = }; #endif /* HAS_PROPER_INPUT_HEADER */ -static void get_device_subsystem_info(struct udev_device *dev, char const *subsystem, struct device_desc *desc) +static void get_device_subsystem_info(struct udev_device *dev, char const *subsystem, struct device_desc *desc, + int *bus) { struct udev_device *parent = NULL; const char *ptr, *next, *tmp; char buffer[MAX_PATH]; - DWORD bus = 0; if (!(parent = udev_device_get_parent_with_subsystem_devtype(dev, subsystem, NULL))) return; @@ -1121,16 +1121,16 @@ static void get_device_subsystem_info(struct udev_device *dev, char const *subsy } if (!strncmp(ptr, "HID_ID=", 7)) { - if (bus || desc->vid || desc->pid) continue; - sscanf(ptr, "HID_ID=%x:%x:%x\n", &bus, &desc->vid, &desc->pid); + if (*bus || desc->vid || desc->pid) continue; + sscanf(ptr, "HID_ID=%x:%x:%x\n", bus, &desc->vid, &desc->pid); } - if (!strncmp(ptr, "PRODUCT=", 8)) + if (!strncmp(ptr, "PRODUCT=", 8) && *bus != BUS_BLUETOOTH) { if (desc->version) continue; if (!strcmp(subsystem, "usb")) sscanf(ptr, "PRODUCT=%x/%x/%x\n", &desc->vid, &desc->pid, &desc->version); else - sscanf(ptr, "PRODUCT=%x/%x/%x/%x\n", &bus, &desc->vid, &desc->pid, &desc->version); + sscanf(ptr, "PRODUCT=%x/%x/%x/%x\n", bus, &desc->vid, &desc->pid, &desc->version); } } } @@ -1154,7 +1154,7 @@ static void udev_add_device(struct udev_device *dev) struct base_device *impl; const char *subsystem; const char *devnode; - int fd; + int fd, bus = 0; if (!(devnode = udev_device_get_devnode(dev))) return; @@ -1176,9 +1176,9 @@ static void udev_add_device(struct udev_device *dev) } #endif - get_device_subsystem_info(dev, "hid", &desc); - get_device_subsystem_info(dev, "input", &desc); - get_device_subsystem_info(dev, "usb", &desc); + get_device_subsystem_info(dev, "hid", &desc, &bus); + get_device_subsystem_info(dev, "input", &desc, &bus); + get_device_subsystem_info(dev, "usb", &desc, &bus); subsystem = udev_device_get_subsystem(dev); if (!strcmp(subsystem, "hidraw"))

1 0

Rémi Bernon : dinput8/tests: Add some more polled read tests.
by Alexandre Julliard 12 Oct '21

12 Oct '21

Module: wine Branch: master Commit: 12dc52cd4aeadfebe6021d0762b04eedd4c01a42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=12dc52cd4aeadfebe6021d07… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 12 10:33:22 2021 +0200 dinput8/tests: Add some more polled read tests. Showing that we should probably not queue reports in this mode. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index cdb19808fcd..7f933df3b06 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -2174,6 +2174,40 @@ static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polle "expected different report\n" ); ok( !memcmp( report, buffer, caps.InputReportByteLength ), "expected identical reports\n" ); + value = 10; + SetLastError( 0xdeadbeef ); + ret = sync_ioctl( file, IOCTL_HID_SET_POLL_FREQUENCY_MSEC, &value, sizeof(ULONG), NULL, NULL ); + ok( ret, "IOCTL_HID_SET_POLL_FREQUENCY_MSEC failed last error %u\n", GetLastError() ); + + Sleep( 600 ); + + SetLastError( 0xdeadbeef ); + ret = ReadFile( async_file, report, caps.InputReportByteLength, NULL, &overlapped ); + todo_wine + ok( !ret, "ReadFile succeeded\n" ); + todo_wine + ok( GetLastError() == ERROR_IO_PENDING, "ReadFile returned error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = ReadFile( async_file, buffer, caps.InputReportByteLength, NULL, &overlapped2 ); + todo_wine + ok( !ret, "ReadFile succeeded\n" ); + todo_wine + ok( GetLastError() == ERROR_IO_PENDING, "ReadFile returned error %u\n", GetLastError() ); + + /* wait for second report to be ready */ + ret = GetOverlappedResult( async_file, &overlapped2, &value, TRUE ); + ok( ret, "GetOverlappedResult failed, last error %u\n", GetLastError() ); + ok( value == (report_id ? 3 : 4), "GetOverlappedResult returned length %u, expected %u\n", + value, (report_id ? 3 : 4) ); + /* first report should be ready and the same */ + ret = GetOverlappedResult( async_file, &overlapped, &value, FALSE ); + ok( ret, "GetOverlappedResult failed, last error %u\n", GetLastError() ); + ok( value == (report_id ? 3 : 4), "GetOverlappedResult returned length %u, expected %u\n", + value, (report_id ? 3 : 4) ); + todo_wine + ok( !memcmp( report, buffer, caps.InputReportByteLength ), "expected identical reports\n" ); + CloseHandle( overlapped.hEvent ); CloseHandle( overlapped2.hEvent ); }

1 0

Rémi Bernon : hidclass.sys: Re-read the poll timeout on every iteration.
by Alexandre Julliard 12 Oct '21

12 Oct '21

Module: wine Branch: master Commit: 6a869a2a8c55764665e7e25c1abc59ecdbcc6905 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a869a2a8c55764665e7e25c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 12 10:33:23 2021 +0200 hidclass.sys: Re-read the poll timeout on every iteration. Otherwise it's pointless to have it configurable. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 29b9215aa22..d588970150e 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -313,9 +313,9 @@ static DWORD CALLBACK hid_device_thread(void *args) BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; HIDP_COLLECTION_DESC *desc = ext->u.pdo.device_desc.CollectionDesc; BOOL polled = ext->u.pdo.information.Polled; - ULONG report_id = 0, timeout = 0; HIDP_REPORT_IDS *report; HID_XFER_PACKET *packet; + ULONG report_id = 0; IO_STATUS_BLOCK io; BYTE *buffer; DWORD res; @@ -324,8 +324,6 @@ static DWORD CALLBACK hid_device_thread(void *args) buffer = (BYTE *)(packet + 1); packet->reportBuffer = buffer; - if (polled) timeout = ext->u.pdo.poll_interval; - report = find_report_with_type_and_id( ext, HidP_Input, 0, TRUE ); if (!report) WARN("no input report found.\n"); else report_id = report->ReportID; @@ -356,7 +354,7 @@ static DWORD CALLBACK hid_device_thread(void *args) hid_device_queue_input( device, packet ); } - res = WaitForSingleObject(ext->u.pdo.halt_event, timeout); + res = WaitForSingleObject(ext->u.pdo.halt_event, polled ? ext->u.pdo.poll_interval : 0); } while (res == WAIT_TIMEOUT); TRACE("device thread exiting, res %#x\n", res);

1 0