October 2021 - Wine-Commits

Paul Gofman : kernelbase: Fix string size variable overflow in GetModuleFileNameW().
by Alexandre Julliard Oct. 4, 2021

Oct. 4, 2021

Module: wine Branch: master Commit: 7c523f48677abb5d8cf7d2b2f1cff919e57c8e99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c523f48677abb5d8cf7d2b2… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Oct 4 12:21:10 2021 +0300 kernelbase: Fix string size variable overflow in GetModuleFileNameW(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51833 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/module.c | 5 +++++ dlls/kernelbase/loader.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index 2487b9d65ab..60654754302 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -190,6 +190,11 @@ static void testGetModuleFileName(const char* name) ok(len1A / 2 == len2A, "Correct length in GetModuleFilenameA with buffer too small (%d/%d)\n", len1A / 2, len2A); + + len1A = GetModuleFileNameA(hMod, bufA, 0x10000); + ok(len1A > 0, "Getting module filename for handle %p\n", hMod); + len1W = GetModuleFileNameW(hMod, bufW, 0x10000); + ok(len1W > 0, "Getting module filename for handle %p\n", hMod); } static void testGetModuleFileName_Wrong(void) diff --git a/dlls/kernelbase/loader.c b/dlls/kernelbase/loader.c index 145d721bc26..de9ff2ba1a5 100644 --- a/dlls/kernelbase/loader.c +++ b/dlls/kernelbase/loader.c @@ -311,7 +311,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH GetModuleFileNameW( HMODULE module, LPWSTR filena } name.Buffer = filename; - name.MaximumLength = size * sizeof(WCHAR); + name.MaximumLength = min( size, UNICODE_STRING_MAX_CHARS ) * sizeof(WCHAR); status = LdrGetDllFullName( module, &name ); if (!status || status == STATUS_BUFFER_TOO_SMALL) len = name.Length / sizeof(WCHAR); SetLastError( RtlNtStatusToDosError( status ));

1 0

Huw Davies : nsiproxy: Actually send the ICMP ECHO request.
by Alexandre Julliard Oct. 4, 2021

Oct. 4, 2021

Module: wine Branch: master Commit: aa4e0d466b961b999900f5ab73e41859130ddcfc URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa4e0d466b961b999900f5ab… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 4 12:23:21 2021 +0100 nsiproxy: Actually send the ICMP ECHO request. However, don't yet wait for the reply. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsiproxy.sys/Makefile.in | 1 + dlls/nsiproxy.sys/device.c | 37 +++- dlls/nsiproxy.sys/icmp_echo.c | 321 +++++++++++++++++++++++++++++++++++ dlls/nsiproxy.sys/nsi.c | 1 + dlls/nsiproxy.sys/nsiproxy_private.h | 28 +++ dlls/nsiproxy.sys/unix_private.h | 2 + 6 files changed, 387 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=aa4e0d466b961b999900…

1 0

Alexandre Julliard : winedbg: Build with msvcrt.
by Alexandre Julliard Oct. 4, 2021

Oct. 4, 2021

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 'long' types.
by Alexandre Julliard Oct. 4, 2021

Oct. 4, 2021

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 : configure: Remove no longer needed poll() checks.
by Alexandre Julliard Oct. 4, 2021

Oct. 4, 2021

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

Arkadiusz Hiler : hidclass.sys: Don't send WM_INPUT_DEVICE_CHANGE for WINEXINPUT devices.
by Alexandre Julliard Oct. 4, 2021

Oct. 4, 2021

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: Drop reports when length doesn't match their declaration.
by Alexandre Julliard Oct. 4, 2021

Oct. 4, 2021

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

Nikolay Sivov : widl: Allow modules without attributes.
by Alexandre Julliard Oct. 4, 2021

Oct. 4, 2021

Module: wine Branch: master Commit: e3893d6bfd6f72c367efd776a8b41696f096b015 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3893d6bfd6f72c367efd776… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 4 13:09:15 2021 +0300 widl: Allow modules without attributes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 4c361e81dd1..51050a24fa3 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1082,7 +1082,7 @@ dispinterfaceref: module: tMODULE typename { $$ = type_module_declare($2); } ; -moduledef: attributes module '{' int_statements '}' semicolon_opt +moduledef: m_attributes module '{' int_statements '}' semicolon_opt { $$ = type_module_define($2, $1, $4); } ;

1 0

Ivo Ivanov : hidclass.sys: Use the report length when copying report data.
by Alexandre Julliard Oct. 4, 2021

Oct. 4, 2021

Module: wine Branch: master Commit: 62d89cee7cbdcdb3cc1c5e133a2334bffda1d042 URL: https://source.winehq.org/git/wine.git/?a=commit;h=62d89cee7cbdcdb3cc1c5e13… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Mon Oct 4 10:18:12 2021 +0200 hidclass.sys: Use the report length when copying report data. Instead of the HID descriptor input report length. 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 | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 026ec1efeb1..632e98ab740 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -216,7 +216,6 @@ static struct hid_report *hid_queue_pop_report( struct hid_queue *queue ) static void hid_device_queue_input( DEVICE_OBJECT *device, HID_XFER_PACKET *packet ) { BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; - HIDP_COLLECTION_DESC *desc = ext->u.pdo.device_desc.CollectionDesc; const BOOL polled = ext->u.pdo.information.Polled; struct hid_report *last_report, *report; struct hid_queue *queue; @@ -270,7 +269,7 @@ static void hid_device_queue_input( DEVICE_OBJECT *device, HID_XFER_PACKET *pack if (!(irp = hid_queue_pop_irp( queue ))) break; if (!(report = hid_queue_pop_report( queue ))) hid_report_incref( (report = last_report) ); - memcpy( irp->AssociatedIrp.SystemBuffer, report->buffer, desc->InputLength ); + memcpy( irp->AssociatedIrp.SystemBuffer, report->buffer, report->length ); irp->IoStatus.Information = report->length; irp->IoStatus.Status = STATUS_SUCCESS; hid_report_decref( report ); @@ -652,7 +651,7 @@ NTSTATUS WINAPI pdo_read(DEVICE_OBJECT *device, IRP *irp) irp->IoStatus.Information = 0; if ((report = hid_queue_pop_report( queue ))) { - memcpy( irp->AssociatedIrp.SystemBuffer, report->buffer, desc->InputLength ); + memcpy( irp->AssociatedIrp.SystemBuffer, report->buffer, report->length ); irp->IoStatus.Information = report->length; irp->IoStatus.Status = STATUS_SUCCESS; hid_report_decref( report );

1 0

Rémi Bernon : hidclass.sys: Introduce new find_report_with_type_and_id helper.
by Alexandre Julliard Oct. 4, 2021

Oct. 4, 2021

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