wine-commits October 2021

wine-commits@winehq.org

2 participants
1165 discussions

Alexandre Julliard : configure: Remove no longer needed poll() checks.
by Alexandre Julliard 04 Oct '21

04 Oct '21

Module: wine Branch: master Commit: 5a19769245c43c3f596322acffa818d920ac52f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a19769245c43c3f596322ac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 4 15:26:24 2021 +0200 configure: Remove no longer needed poll() checks. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 49 ------------------------------------------------- configure.ac | 7 ------- dlls/ws2_32/Makefile.in | 1 - include/config.h.in | 3 --- server/Makefile.in | 2 +- 5 files changed, 1 insertion(+), 61 deletions(-) diff --git a/configure b/configure index 2a429f4c13d..7e149e0ac9b 100755 --- a/configure +++ b/configure @@ -628,7 +628,6 @@ ALL_VARS_RULES LDAP_LIBS LDAP_CFLAGS RT_LIBS -POLL_LIBS TOOLSEXT MSVCRTFLAGS EXTRACFLAGS @@ -17914,7 +17913,6 @@ for ac_func in \ lstat \ mach_continuous_time \ pipe2 \ - poll \ port_create \ posix_fadvise \ posix_fallocate \ @@ -18015,52 +18013,6 @@ done LIBS="$ac_wine_check_funcs_save_LIBS" -if test "$ac_cv_func_poll" = no -then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for poll in -lpoll" >&5 -$as_echo_n "checking for poll in -lpoll... " >&6; } -if ${ac_cv_lib_poll_poll+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lpoll $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char poll (); -int -main () -{ -return poll (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_poll_poll=yes -else - ac_cv_lib_poll_poll=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_poll_poll" >&5 -$as_echo "$ac_cv_lib_poll_poll" >&6; } -if test "x$ac_cv_lib_poll_poll" = xyes; then : - $as_echo "#define HAVE_POLL 1" >>confdefs.h - POLL_LIBS="-lpoll" - -fi - -fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing gethostbyname" >&5 $as_echo_n "checking for library containing gethostbyname... " >&6; } if ${ac_cv_search_gethostbyname+:} false; then : @@ -19859,7 +19811,6 @@ VKD3D_CFLAGS = $VKD3D_CFLAGS VKD3D_LIBS = $VKD3D_LIBS VKD3D_SHADER_CFLAGS = $VKD3D_SHADER_CFLAGS VKD3D_SHADER_LIBS = $VKD3D_SHADER_LIBS -POLL_LIBS = $POLL_LIBS RT_LIBS = $RT_LIBS LDAP_CFLAGS = $LDAP_CFLAGS LDAP_LIBS = $LDAP_LIBS diff --git a/configure.ac b/configure.ac index 913692c828a..6e82e4fbb8d 100644 --- a/configure.ac +++ b/configure.ac @@ -2144,7 +2144,6 @@ AC_CHECK_FUNCS(\ lstat \ mach_continuous_time \ pipe2 \ - poll \ port_create \ posix_fadvise \ posix_fallocate \ @@ -2166,12 +2165,6 @@ dnl Check for -ldl AC_SEARCH_LIBS(dlopen, dl) WINE_CHECK_LIB_FUNCS(dladdr dlinfo,[$DL_LIBS]) -dnl Check for -lpoll for Mac OS X/Darwin -if test "$ac_cv_func_poll" = no -then - AC_CHECK_LIB(poll,poll,[AC_DEFINE(HAVE_POLL,1) AC_SUBST(POLL_LIBS,"-lpoll")]) -fi - dnl Check for -lnsl for Solaris AC_SEARCH_LIBS(gethostbyname, nsl) diff --git a/dlls/ws2_32/Makefile.in b/dlls/ws2_32/Makefile.in index bf9018260a4..232ce7f31fd 100644 --- a/dlls/ws2_32/Makefile.in +++ b/dlls/ws2_32/Makefile.in @@ -2,7 +2,6 @@ MODULE = ws2_32.dll UNIXLIB = ws2_32.so IMPORTLIB = ws2_32 DELAYIMPORTS = advapi32 iphlpapi user32 -EXTRALIBS = $(POLL_LIBS) C_SRCS = \ async.c \ diff --git a/include/config.h.in b/include/config.h.in index 80cc9c3a47f..c239b283f58 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -480,9 +480,6 @@ /* Define to 1 if you have the <png.h> header file. */ #undef HAVE_PNG_H -/* Define to 1 if you have the `poll' function. */ -#undef HAVE_POLL - /* Define to 1 if you have the <poll.h> header file. */ #undef HAVE_POLL_H diff --git a/server/Makefile.in b/server/Makefile.in index 4264e3db108..b6197cffec3 100644 --- a/server/Makefile.in +++ b/server/Makefile.in @@ -49,6 +49,6 @@ MANPAGES = \ wineserver.fr.UTF-8.man.in \ wineserver.man.in -EXTRALIBS = $(LDEXECFLAGS) $(POLL_LIBS) $(RT_LIBS) $(INOTIFY_LIBS) +EXTRALIBS = $(LDEXECFLAGS) $(RT_LIBS) $(INOTIFY_LIBS) unicode_EXTRADEFS = -DNLSDIR="\"${nlsdir}\"" -DBIN_TO_NLSDIR=\"`$(MAKEDEP) -R ${bindir} ${nlsdir}`\"

1 0

Alexandre Julliard : winedbg: Build with msvcrt.
by Alexandre Julliard 04 Oct '21

04 Oct '21

Module: wine Branch: master Commit: 0ea9fe999c1ed3a8b645476d97d2e0221be17bb5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ea9fe999c1ed3a8b645476d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 4 15:19:20 2021 +0200 winedbg: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/Makefile.in | 2 +- programs/winedbg/break.c | 1 - programs/winedbg/crashdlg.c | 8 +++---- programs/winedbg/db_disasm64.c | 6 +++--- programs/winedbg/dbg.y | 3 --- programs/winedbg/debug.l | 1 - programs/winedbg/debugger.h | 4 ++-- programs/winedbg/expr.c | 2 -- programs/winedbg/gdbproxy.c | 46 +++++++++++++++++------------------------ programs/winedbg/info.c | 4 +--- programs/winedbg/memory.c | 4 ---- programs/winedbg/source.c | 1 - programs/winedbg/stack.c | 2 -- programs/winedbg/symbol.c | 1 - programs/winedbg/tgt_active.c | 9 +++----- programs/winedbg/tgt_minidump.c | 3 --- programs/winedbg/tgt_module.c | 2 -- programs/winedbg/types.c | 1 - programs/winedbg/winedbg.c | 11 ++++------ 19 files changed, 36 insertions(+), 75 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0ea9fe999c1ed3a8b645…

1 0

Alexandre Julliard : winedbg: Avoid using the 'long double' type.
by Alexandre Julliard 04 Oct '21

04 Oct '21

Module: wine Branch: master Commit: 13125b51cdf7ba8e8d658dcf35b8f32d40447619 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13125b51cdf7ba8e8d658dcf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 4 15:00:20 2021 +0200 winedbg: Avoid using the 'long double' type. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/be_arm.c | 6 ++---- programs/winedbg/be_arm64.c | 6 ++---- programs/winedbg/be_cpu.h | 2 +- programs/winedbg/be_i386.c | 26 +++++++++----------------- programs/winedbg/be_x86_64.c | 31 +++++++++---------------------- programs/winedbg/memory.c | 4 ++-- 6 files changed, 25 insertions(+), 50 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 98078e22640..fa25ce8dd2b 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -1851,10 +1851,9 @@ static BOOL be_arm_fetch_integer(const struct dbg_lvalue* lvalue, unsigned size, return TRUE; } -static BOOL be_arm_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, - long double* ret) +static BOOL be_arm_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, double *ret) { - char tmp[sizeof(long double)]; + char tmp[sizeof(double)]; /* FIXME: this assumes that debuggee and debugger use the same * representation for reals @@ -1863,7 +1862,6 @@ static BOOL be_arm_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, if (size == sizeof(float)) *ret = *(float*)tmp; else if (size == sizeof(double)) *ret = *(double*)tmp; - else if (size == sizeof(long double)) *ret = *(long double*)tmp; else return FALSE; return TRUE; diff --git a/programs/winedbg/be_arm64.c b/programs/winedbg/be_arm64.c index 50bb5bad0b9..d22f254013b 100644 --- a/programs/winedbg/be_arm64.c +++ b/programs/winedbg/be_arm64.c @@ -248,10 +248,9 @@ static BOOL be_arm64_fetch_integer(const struct dbg_lvalue* lvalue, unsigned siz return TRUE; } -static BOOL be_arm64_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, - long double* ret) +static BOOL be_arm64_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, double *ret) { - char tmp[sizeof(long double)]; + char tmp[sizeof(double)]; /* FIXME: this assumes that debuggee and debugger use the same * representation for reals @@ -260,7 +259,6 @@ static BOOL be_arm64_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, if (size == sizeof(float)) *ret = *(float*)tmp; else if (size == sizeof(double)) *ret = *(double*)tmp; - else if (size == sizeof(long double)) *ret = *(long double*)tmp; else return FALSE; return TRUE; diff --git a/programs/winedbg/be_cpu.h b/programs/winedbg/be_cpu.h index 354a6252d39..14746d6665b 100644 --- a/programs/winedbg/be_cpu.h +++ b/programs/winedbg/be_cpu.h @@ -121,7 +121,7 @@ struct backend_cpu /* Reads an integer from memory and stores it inside a long long int */ BOOL (*fetch_integer)(const struct dbg_lvalue* lvalue, unsigned size, BOOL is_signed, LONGLONG*); /* Reads a real from memory and stores it inside a long double */ - BOOL (*fetch_float)(const struct dbg_lvalue* lvalue, unsigned size, long double*); + BOOL (*fetch_float)(const struct dbg_lvalue* lvalue, unsigned size, double*); /* Writes an integer to memory */ BOOL (*store_integer)(const struct dbg_lvalue* lvalue, unsigned size, BOOL is_signed, LONGLONG); diff --git a/programs/winedbg/be_i386.c b/programs/winedbg/be_i386.c index 76f9b8f807b..08d0841a208 100644 --- a/programs/winedbg/be_i386.c +++ b/programs/winedbg/be_i386.c @@ -133,7 +133,6 @@ static void be_i386_all_print_context(HANDLE hThread, const dbg_ctx_t *pctx) "DM", "ZM", "OM", "UM", "PM", "R-", "R+", "FZ" }; const WOW64_CONTEXT *ctx = &pctx->x86; XSAVE_FORMAT *xmm_area; - long double ST[8]; /* These are for floating regs */ int cnt; /* Break out the FPU state and the floating point registers */ @@ -185,16 +184,12 @@ static void be_i386_all_print_context(HANDLE hThread, const dbg_ctx_t *pctx) /* Now for the floating point registers */ dbg_printf("Floating Point Registers:\n"); - for (cnt = 0; cnt < 4; cnt++) - { - memcpy(&ST[cnt], &ctx->FloatSave.RegisterArea[cnt * 10], 10); - dbg_printf(" ST%d:%Lf ", cnt, ST[cnt]); - } - dbg_printf("\n"); - for (cnt = 4; cnt < 8; cnt++) + for (cnt = 0; cnt < 8; cnt++) { - memcpy(&ST[cnt], &ctx->FloatSave.RegisterArea[cnt * 10], 10); - dbg_printf(" ST%d:%Lf ", cnt, ST[cnt]); + const BYTE *p = &ctx->FloatSave.RegisterArea[cnt * 10]; + if (cnt == 4) dbg_printf("\n"); + dbg_printf(" ST%d:%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x ", cnt, + p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7], p[8], p[9] ); } xmm_area = (XSAVE_FORMAT *) &ctx->ExtendedRegisters; @@ -802,20 +797,17 @@ static BOOL be_i386_fetch_integer(const struct dbg_lvalue* lvalue, unsigned size return TRUE; } -static BOOL be_i386_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, - long double* ret) +static BOOL be_i386_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, double *ret) { - char tmp[sizeof(long double)]; + char tmp[sizeof(double)]; /* FIXME: this assumes that debuggee and debugger use the same * representation for reals */ if (!memory_read_value(lvalue, size, tmp)) return FALSE; - /* float & double types have to be promoted to a long double */ - if (size == 4) *ret = *(float*)tmp; - else if (size == 8) *ret = *(double*)tmp; - else if (size == 10) *ret = *(long double*)tmp; + if (size == sizeof(float)) *ret = *(float*)tmp; + else if (size == sizeof(double)) *ret = *(double*)tmp; else return FALSE; return TRUE; diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index 7b6d94deb59..74481645081 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -73,14 +73,6 @@ static void be_x86_64_single_step(dbg_ctx_t *ctx, BOOL enable) else ctx->ctx.EFlags &= ~STEP_FLAG; } -static inline long double m128a_to_longdouble(const M128A m) -{ - /* gcc uses the same IEEE-754 representation as M128A for long double - * but 16 byte aligned (hence only the first 10 bytes out of the 16 are used) - */ - return *(long double*)&m; -} - static void be_x86_64_print_context(HANDLE hThread, const dbg_ctx_t *pctx, int all_regs) { @@ -154,14 +146,12 @@ static void be_x86_64_print_context(HANDLE hThread, const dbg_ctx_t *pctx, ctx->u.FltSave.ErrorSelector, ctx->u.FltSave.ErrorOffset, ctx->u.FltSave.DataSelector, ctx->u.FltSave.DataOffset ); - for (i = 0; i < 4; i++) - { - dbg_printf(" st%u:%-16Lg ", i, m128a_to_longdouble(ctx->u.FltSave.FloatRegisters[i])); - } - dbg_printf("\n"); - for (i = 4; i < 8; i++) + for (i = 0; i < 8; i++) { - dbg_printf(" st%u:%-16Lg ", i, m128a_to_longdouble(ctx->u.FltSave.FloatRegisters[i])); + M128A reg = ctx->u.FltSave.FloatRegisters[i]; + if (i == 4) dbg_printf("\n"); + dbg_printf(" ST%u:%08x%08x%08x%08x ", i, + (DWORD)(reg.High >> 32), (DWORD)reg.High, (DWORD)(reg.Low >> 32), (DWORD)reg.Low ); } dbg_printf("\n"); @@ -731,20 +721,17 @@ static BOOL be_x86_64_fetch_integer(const struct dbg_lvalue* lvalue, unsigned si return TRUE; } -static BOOL be_x86_64_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, - long double* ret) +static BOOL be_x86_64_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, double *ret) { - char tmp[sizeof(long double)]; + char tmp[sizeof(double)]; /* FIXME: this assumes that debuggee and debugger use the same * representation for reals */ if (!memory_read_value(lvalue, size, tmp)) return FALSE; - /* float & double types have to be promoted to a long double */ - if (size == 4) *ret = *(float*)tmp; - else if (size == 8) *ret = *(double*)tmp; - else if (size == 10) *ret = *(long double*)tmp; + if (size == sizeof(float)) *ret = *(float*)tmp; + else if (size == sizeof(double)) *ret = *(double*)tmp; else return FALSE; return TRUE; diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index ed537e121a9..ab8b2eb49b8 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -350,7 +350,7 @@ static void print_typed_basic(const struct dbg_lvalue* lvalue) { LONGLONG val_int; void* val_ptr; - long double val_real; + double val_real; DWORD64 size64; DWORD tag, size, count, bt; struct dbg_type type = lvalue->type; @@ -385,7 +385,7 @@ static void print_typed_basic(const struct dbg_lvalue* lvalue) break; case btFloat: if (!dbg_curr_process->be_cpu->fetch_float(lvalue, size, &val_real)) return; - dbg_printf("%Lf", val_real); + dbg_printf("%f", val_real); break; case btChar: case btWChar:

1 0

Alexandre Julliard : winedbg: Avoid using 'long' types.
by Alexandre Julliard 04 Oct '21

04 Oct '21

Module: wine Branch: master Commit: b9046a4936ff7958791a8686af6096330083227d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9046a4936ff7958791a8686… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 4 14:16:23 2021 +0200 winedbg: Avoid using 'long' types. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/be_arm.c | 4 ++-- programs/winedbg/be_arm64.c | 4 ++-- programs/winedbg/be_cpu.h | 8 ++++---- programs/winedbg/be_i386.c | 8 ++++---- programs/winedbg/be_x86_64.c | 6 +++--- programs/winedbg/db_disasm64.c | 7 +++++-- programs/winedbg/debugger.h | 20 ++++++++++---------- programs/winedbg/expr.c | 20 ++++++++++---------- programs/winedbg/gdbproxy.c | 14 +++++++------- programs/winedbg/memory.c | 2 +- programs/winedbg/symbol.c | 2 +- programs/winedbg/types.c | 20 ++++++++++---------- 12 files changed, 59 insertions(+), 56 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b9046a4936ff7958791a…

1 0

Alexandre Julliard : winedbg: Use winsock for the gdb socket.
by Alexandre Julliard 04 Oct '21

04 Oct '21

Module: wine Branch: master Commit: 6a2325609ceea306c6d7cbce56f29e6589a18903 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a2325609ceea306c6d7cbce… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 4 11:27:43 2021 +0200 winedbg: Use winsock for the gdb socket. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/Makefile.in | 3 +- programs/winedbg/gdbproxy.c | 271 +++++++++++++++++++------------------------ 2 files changed, 122 insertions(+), 152 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6a2325609ceea306c6d7…

1 0

Rémi Bernon : winebus.sys: Use type and size of the current event, not the previous one.
by Alexandre Julliard 04 Oct '21

04 Oct '21

Module: wine Branch: master Commit: 6bc71db09e95ce66142c2887b6fe23f59c63dd3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6bc71db09e95ce66142c2887… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 4 10:23:39 2021 +0200 winebus.sys: Use type and size of the current event, not the previous one. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51831 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/unixlib.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winebus.sys/unixlib.c b/dlls/winebus.sys/unixlib.c index 177b8f5ba70..29537170df7 100644 --- a/dlls/winebus.sys/unixlib.c +++ b/dlls/winebus.sys/unixlib.c @@ -364,8 +364,8 @@ BOOL bus_event_queue_pop(struct list *queue, struct bus_event *event) tmp = LIST_ENTRY(entry, struct bus_event, entry); list_remove(entry); - if (event->type != BUS_EVENT_TYPE_INPUT_REPORT) size = sizeof(*event); - else size = offsetof(struct bus_event, input_report.buffer[event->input_report.length]); + if (tmp->type != BUS_EVENT_TYPE_INPUT_REPORT) size = sizeof(*tmp); + else size = offsetof(struct bus_event, input_report.buffer[tmp->input_report.length]); memcpy(event, tmp, size); free(tmp);

1 0

Arkadiusz Hiler : hidclass.sys: Don't send WM_INPUT_DEVICE_CHANGE for WINEXINPUT devices.
by Alexandre Julliard 04 Oct '21

04 Oct '21

Module: wine Branch: master Commit: ac6f176441599af676c339ed47a87adb6ecffde7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac6f176441599af676c339ed… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Mon Oct 4 10:21:38 2021 +0200 hidclass.sys: Don't send WM_INPUT_DEVICE_CHANGE for WINEXINPUT devices. For the same reason we don't send WM_INPUT messages. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/pnp.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index a47af413dbd..dbf04c0a403 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -114,6 +114,8 @@ static void send_wm_input_device_change(BASE_DEVICE_EXTENSION *ext, LPARAM param RAWINPUT rawinput; INPUT input; + if (!IsEqualGUID( ext->class_guid, &GUID_DEVINTERFACE_HID )) return; + rawinput.header.dwType = RIM_TYPEHID; rawinput.header.dwSize = offsetof(RAWINPUT, data.hid.bRawData[2 * sizeof(USAGE)]); rawinput.header.hDevice = ULongToHandle(ext->u.pdo.rawinput_handle);

1 0

Rémi Bernon : hidclass.sys: Overwrite queued reports as FIFO instead of LIFO.
by Alexandre Julliard 04 Oct '21

04 Oct '21

Module: wine Branch: master Commit: 51ae926240f05ac6fe3538728aec1e65ad7abf2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=51ae926240f05ac6fe353872… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 4 10:20:19 2021 +0200 hidclass.sys: Overwrite queued reports as FIFO instead of LIFO. Based on a patch from Ivo Ivanov <logos128(a)gmail.com>. The issue causes severe skipping and non smooth movement tracking in apps/games, when the HidP/HidD APIs are used to control the device (joysticks, controllers, steering wheels, etc.). Usually such devices use constant stream of INPUT reports to report their coords, so any report skipping or change of the sequence, when the interested apps are reading, would lead to such issues. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51824 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index e4592c4d242..cebdc3e1e65 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -190,10 +190,12 @@ static void hid_queue_push_report( struct hid_queue *queue, struct hid_report *r KeAcquireSpinLock( &queue->lock, &irql ); prev = queue->reports[i]; queue->reports[i] = report; - if (next != queue->read_idx) queue->write_idx = next; + if (next == queue->read_idx) queue->read_idx = next + 1; + if (queue->read_idx >= queue->length) queue->read_idx = 0; KeReleaseSpinLock( &queue->lock, irql ); hid_report_decref( prev ); + queue->write_idx = next; } static struct hid_report *hid_queue_pop_report( struct hid_queue *queue )

1 0

Rémi Bernon : hidclass.sys: Drop reports when length doesn't match their declaration.
by Alexandre Julliard 04 Oct '21

04 Oct '21

Module: wine Branch: master Commit: 9411ecf6707bd40eddca4e21f43e1b09282db7a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9411ecf6707bd40eddca4e21… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 4 10:18:14 2021 +0200 hidclass.sys: Drop reports when length doesn't match their declaration. Based on a patch from Ivo Ivanov <logos128(a)gmail.com>. Instead of using the descriptor input report length, which is the maximum length of all input reports. Tests show that the reports should be dropped, in non-polled mode, when their length is invalid, but we were dropping too many of them. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51828 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 6530efcdb84..e4592c4d242 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -349,7 +349,8 @@ static DWORD CALLBACK hid_device_thread(void *args) packet->reportBuffer = buffer; packet->reportBufferLen = io.Information; - if (polled || io.Information == desc->InputLength) + report = find_report_with_type_and_id( ext, HidP_Input, buffer[0], FALSE ); + if (polled || (report && report->InputLength == io.Information)) hid_device_queue_input( device, packet ); }

1 0

Rémi Bernon : hidclass.sys: Introduce new find_report_with_type_and_id helper.
by Alexandre Julliard 04 Oct '21

04 Oct '21

Module: wine Branch: master Commit: 3c743180deeca2901c989797a0e88256e159d70a URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c743180deeca2901c989797… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 4 10:18:13 2021 +0200 hidclass.sys: Introduce new find_report_with_type_and_id helper. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51828 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 64 ++++++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 31 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 632e98ab740..6530efcdb84 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -289,15 +289,30 @@ static void hid_device_queue_input( DEVICE_OBJECT *device, HID_XFER_PACKET *pack hid_report_decref( last_report ); } +static HIDP_REPORT_IDS *find_report_with_type_and_id( BASE_DEVICE_EXTENSION *ext, BYTE type, BYTE id, BOOL any_id ) +{ + HIDP_REPORT_IDS *report, *reports = ext->u.pdo.device_desc.ReportIDs; + ULONG report_count = ext->u.pdo.device_desc.ReportIDsLength; + + for (report = reports; report != reports + report_count; report++) + { + if (!any_id && report->ReportID && report->ReportID != id) continue; + if (type == HidP_Input && report->InputLength) return report; + if (type == HidP_Output && report->OutputLength) return report; + if (type == HidP_Feature && report->FeatureLength) return report; + } + + return NULL; +} + static DWORD CALLBACK hid_device_thread(void *args) { DEVICE_OBJECT *device = (DEVICE_OBJECT*)args; BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; HIDP_COLLECTION_DESC *desc = ext->u.pdo.device_desc.CollectionDesc; - HIDP_REPORT_IDS *reports = ext->u.pdo.device_desc.ReportIDs; - ULONG report_count = ext->u.pdo.device_desc.ReportIDsLength; BOOL polled = ext->u.pdo.information.Polled; - ULONG i, report_id = 0, timeout = 0; + ULONG report_id = 0, timeout = 0; + HIDP_REPORT_IDS *report; HID_XFER_PACKET *packet; IO_STATUS_BLOCK io; BYTE *buffer; @@ -309,14 +324,9 @@ static DWORD CALLBACK hid_device_thread(void *args) if (polled) timeout = ext->u.pdo.poll_interval; - for (i = 0; i < report_count; ++i) - { - if (!reports[i].ReportID || reports[i].InputLength) - break; - } - - if (i == report_count) WARN("no input report found.\n"); - else report_id = reports[i].ReportID; + 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; do { @@ -414,10 +424,9 @@ static void handle_minidriver_string( BASE_DEVICE_EXTENSION *ext, IRP *irp, SHOR static void hid_device_xfer_report( BASE_DEVICE_EXTENSION *ext, ULONG code, IRP *irp ) { - HIDP_REPORT_IDS *reports = ext->u.pdo.device_desc.ReportIDs; - ULONG report_count = ext->u.pdo.device_desc.ReportIDsLength; IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation( irp ); - ULONG i, offset = 0, report_len = 0, buffer_len = 0; + ULONG offset = 0, report_len = 0, buffer_len = 0; + HIDP_REPORT_IDS *report = NULL; HID_XFER_PACKET packet; BYTE *buffer = NULL; @@ -444,39 +453,32 @@ static void hid_device_xfer_report( BASE_DEVICE_EXTENSION *ext, ULONG code, IRP return; } - for (i = 0; i < report_count; ++i) - { - if (!reports[i].ReportID || reports[i].ReportID == buffer[0]) - break; - } - if (i == report_count) - { - irp->IoStatus.Status = STATUS_INVALID_PARAMETER; - return; - } - if (!reports[i].ReportID) offset = 1; - switch (code) { case IOCTL_HID_GET_INPUT_REPORT: - report_len = reports[i].InputLength; + report = find_report_with_type_and_id( ext, HidP_Input, buffer[0], FALSE ); + if (report) report_len = report->InputLength; break; case IOCTL_HID_SET_OUTPUT_REPORT: case IOCTL_HID_WRITE_REPORT: - report_len = reports[i].OutputLength; + report = find_report_with_type_and_id( ext, HidP_Output, buffer[0], FALSE ); + if (report) report_len = report->OutputLength; break; case IOCTL_HID_GET_FEATURE: case IOCTL_HID_SET_FEATURE: - report_len = reports[i].FeatureLength; + report = find_report_with_type_and_id( ext, HidP_Feature, buffer[0], FALSE ); + if (report) report_len = report->FeatureLength; break; } - if (buffer_len < report_len) + + if (!report || buffer_len < report_len) { irp->IoStatus.Status = STATUS_INVALID_PARAMETER; return; } - packet.reportId = reports[i].ReportID; + if (!report->ReportID) offset = 1; + packet.reportId = report->ReportID; packet.reportBuffer = buffer + offset; switch (code)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2021