May 2019 - Wine-commits - list.winehq.org

Nikolay Sivov : mf: Create presentation clock on session creation.
by Alexandre Julliard 14 May '19

14 May '19

Module: wine Branch: master Commit: 42ba38c14cc1b8f59e8c2f0b36f213f848fac850 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42ba38c14cc1b8f59e8c2f0b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 14 16:08:52 2019 +0300 mf: Create presentation clock on session creation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 46 +++++++++++++++++++++++++++++++++++++--------- dlls/mf/tests/mf.c | 5 ----- 2 files changed, 37 insertions(+), 14 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index e33a5ce..e92ae40 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -60,6 +60,7 @@ struct media_session IMFAsyncCallback commands_callback; LONG refcount; IMFMediaEventQueue *event_queue; + IMFPresentationClock *clock; struct list topologies; CRITICAL_SECTION cs; }; @@ -292,6 +293,8 @@ static ULONG WINAPI mfsession_Release(IMFMediaSession *iface) session_clear_topologies(session); if (session->event_queue) IMFMediaEventQueue_Release(session->event_queue); + if (session->clock) + IMFPresentationClock_Release(session->clock); DeleteCriticalSection(&session->cs); heap_free(session); } @@ -419,9 +422,14 @@ static HRESULT WINAPI mfsession_Shutdown(IMFMediaSession *iface) static HRESULT WINAPI mfsession_GetClock(IMFMediaSession *iface, IMFClock **clock) { - FIXME("(%p)->(%p)\n", iface, clock); + struct media_session *session = impl_from_IMFMediaSession(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, clock); + + *clock = (IMFClock *)session->clock; + IMFClock_AddRef(*clock); + + return S_OK; } static HRESULT WINAPI mfsession_GetSessionCapabilities(IMFMediaSession *iface, DWORD *caps) @@ -694,17 +702,22 @@ HRESULT WINAPI MFCreateMediaSession(IMFAttributes *config, IMFMediaSession **ses object->IMFRateControl_iface.lpVtbl = &session_rate_control_vtbl; object->commands_callback.lpVtbl = &session_commands_callback_vtbl; object->refcount = 1; - if (FAILED(hr = MFCreateEventQueue(&object->event_queue))) - { - IMFMediaSession_Release(&object->IMFMediaSession_iface); - return hr; - } list_init(&object->topologies); InitializeCriticalSection(&object->cs); + if (FAILED(hr = MFCreateEventQueue(&object->event_queue))) + goto failed; + + if (FAILED(hr = MFCreatePresentationClock(&object->clock))) + goto failed; + *session = &object->IMFMediaSession_iface; return S_OK; + +failed: + IMFMediaSession_Release(&object->IMFMediaSession_iface); + return hr; } static HRESULT WINAPI present_clock_QueryInterface(IMFPresentationClock *iface, REFIID riid, void **out) @@ -818,9 +831,24 @@ static HRESULT WINAPI present_clock_GetState(IMFPresentationClock *iface, DWORD static HRESULT WINAPI present_clock_GetProperties(IMFPresentationClock *iface, MFCLOCK_PROPERTIES *props) { - FIXME("%p, %p.\n", iface, props); + struct presentation_clock *clock = impl_from_IMFPresentationClock(iface); + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, props); + + EnterCriticalSection(&clock->cs); + + if (clock->time_source) + { + FIXME("%p, %p.\n", iface, props); + hr = E_NOTIMPL; + } + else + hr = MF_E_CLOCK_NO_TIME_SOURCE; + + LeaveCriticalSection(&clock->cs); + + return hr; } static HRESULT WINAPI present_clock_SetTimeSource(IMFPresentationClock *iface, diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index b64d3f9..18aa10d 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -976,11 +976,8 @@ static void test_media_session(void) IUnknown_Release(unk); hr = IMFMediaSession_GetClock(session, &clock); -todo_wine ok(hr == S_OK, "Failed to get clock, hr %#x.\n", hr); -if (SUCCEEDED(hr)) -{ hr = IMFClock_QueryInterface(clock, &IID_IMFRateControl, (void **)&rc2); ok(hr == S_OK, "Failed to get rate control, hr %#x.\n", hr); IMFRateControl_Release(rc2); @@ -988,7 +985,6 @@ if (SUCCEEDED(hr)) hr = IMFClock_GetProperties(clock, &clock_props); ok(hr == MF_E_CLOCK_NO_TIME_SOURCE, "Unexpected hr %#x.\n", hr); -} IMFRateControl_Release(rc); IMFRateSupport_Release(rs); @@ -1204,7 +1200,6 @@ todo_wine ok(value == 0, "Unexpected value %u.\n", value); hr = IMFPresentationClock_GetProperties(clock, &props); -todo_wine ok(hr == MF_E_CLOCK_NO_TIME_SOURCE, "Unexpected hr %#x.\n", hr); hr = IMFPresentationClock_GetState(clock, 0, &state);

1 0

Huw Davies : configure: Don't define HAVE_CLOCK_GETTIME on macOS.
by Alexandre Julliard 14 May '19

14 May '19

Module: wine Branch: master Commit: 5ddcfa019d027d9d690c98151c708eb4e7d5f72b URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ddcfa019d027d9d690c9815… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 14 09:53:41 2019 +0100 configure: Don't define HAVE_CLOCK_GETTIME on macOS. Using clock_gettime() on macOS is problematical; see commit 27c71e09ad51ba6aa672a46379efd10b5959863f for an explanation. Possible configure tests for this end up being quite ugly, so avoiding it altogether seems simplest. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 10 +++++++--- configure.ac | 12 ++++++++---- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/configure b/configure index ac543f0..d3253a2 100755 --- a/configure +++ b/configure @@ -17688,8 +17688,10 @@ fi done -ac_save_LIBS=$LIBS -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing clock_gettime" >&5 +case $host_os in + darwin*|macosx*) ;; + *) ac_save_LIBS=$LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing clock_gettime" >&5 $as_echo_n "checking for library containing clock_gettime... " >&6; } if ${ac_cv_search_clock_gettime+:} false; then : $as_echo_n "(cached) " >&6 @@ -17749,7 +17751,9 @@ $as_echo "#define HAVE_CLOCK_GETTIME 1" >>confdefs.h fi -LIBS=$ac_save_LIBS + LIBS=$ac_save_LIBS + ;; +esac if test "x$with_ldap" != "xno" then diff --git a/configure.ac b/configure.ac index 10cef9c..c7f5236 100644 --- a/configure.ac +++ b/configure.ac @@ -2169,11 +2169,15 @@ AC_CHECK_FUNCS(\ ) dnl Check for clock_gettime which may be in -lrt -ac_save_LIBS=$LIBS -AC_SEARCH_LIBS(clock_gettime, rt, - [AC_DEFINE(HAVE_CLOCK_GETTIME, 1, [Define to 1 if you have the `clock_gettime' function.]) +case $host_os in + darwin*|macosx*) ;; + *) ac_save_LIBS=$LIBS + AC_SEARCH_LIBS(clock_gettime, rt, + [AC_DEFINE(HAVE_CLOCK_GETTIME, 1, [Define to 1 if you have the `clock_gettime' function.]) test "$ac_res" = "none required" || AC_SUBST(RT_LIBS,"$ac_res")]) -LIBS=$ac_save_LIBS + LIBS=$ac_save_LIBS + ;; +esac dnl **** Check for OpenLDAP *** if test "x$with_ldap" != "xno"

1 0

Huw Davies : ntdll: Implement RtlGetSystemTimePrecise().
by Alexandre Julliard 14 May '19

14 May '19

Module: wine Branch: master Commit: aa4570feddabc7ca5b82c52cceb40dc83220eace URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa4570feddabc7ca5b82c52c… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 14 09:53:42 2019 +0100 ntdll: Implement RtlGetSystemTimePrecise(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/time.c | 33 +++++++++++++++++++++++++++++++++ include/winternl.h | 1 + 3 files changed, 35 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 292b0f6..aeb9735 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -680,6 +680,7 @@ @ stdcall RtlGetSaclSecurityDescriptor(ptr ptr ptr ptr) # @ stub RtlGetSecurityDescriptorRMControl # @ stub RtlGetSetBootStatusData +@ stdcall -ret64 RtlGetSystemTimePrecise() @ stdcall RtlGetThreadErrorMode() @ stdcall RtlGetUnloadEventTrace() @ stdcall RtlGetUnloadEventTraceEx(ptr ptr ptr) diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 443d8b2..ec0a187 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -474,6 +474,39 @@ NTSTATUS WINAPI NtQuerySystemTime( PLARGE_INTEGER Time ) return STATUS_SUCCESS; } +/*********************************************************************** + * RtlGetSystemTimePrecise [NTDLL.@] + * + * Get a more accurate current system time. + * + * RETURNS + * The current system time. + */ +LONGLONG WINAPI RtlGetSystemTimePrecise( void ) +{ + LONGLONG time; + +#ifdef HAVE_CLOCK_GETTIME + struct timespec ts; + + if (!clock_gettime( CLOCK_REALTIME, &ts )) + { + time = ts.tv_sec * (ULONGLONG)TICKSPERSEC + TICKS_1601_TO_1970; + time += (ts.tv_nsec + 50) / 100; + } + else +#endif + { + struct timeval now; + + gettimeofday( &now, 0 ); + time = now.tv_sec * (ULONGLONG)TICKSPERSEC + TICKS_1601_TO_1970; + time += now.tv_usec * 10; + } + + return time; +} + /****************************************************************************** * NtQueryPerformanceCounter [NTDLL.@] */ diff --git a/include/winternl.h b/include/winternl.h index 2b3fb94..e7f89b0 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2710,6 +2710,7 @@ NTSYSAPI NTSTATUS WINAPI RtlGetOwnerSecurityDescriptor(PSECURITY_DESCRIPTOR,PSI NTSYSAPI ULONG WINAPI RtlGetProcessHeaps(ULONG,HANDLE*); NTSYSAPI DWORD WINAPI RtlGetThreadErrorMode(void); NTSYSAPI NTSTATUS WINAPI RtlGetSaclSecurityDescriptor(PSECURITY_DESCRIPTOR,PBOOLEAN,PACL *,PBOOLEAN); +NTSYSAPI LONGLONG WINAPI RtlGetSystemTimePrecise(void); NTSYSAPI NTSTATUS WINAPI RtlGetVersion(RTL_OSVERSIONINFOEXW*); NTSYSAPI NTSTATUS WINAPI RtlGUIDFromString(PUNICODE_STRING,GUID*); NTSYSAPI PSID_IDENTIFIER_AUTHORITY WINAPI RtlIdentifierAuthoritySid(PSID);

1 0

Huw Davies : kernel32: Implement GetSystemTimePreciseAsFileTime() using RtlGetSystemTimePrecise().
by Alexandre Julliard 14 May '19

14 May '19

Module: wine Branch: master Commit: 074b7d9d097ac6cbbcbb272300b57f6ff334eb4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=074b7d9d097ac6cbbcbb2723… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 14 09:53:43 2019 +0100 kernel32: Implement GetSystemTimePreciseAsFileTime() using RtlGetSystemTimePrecise(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/time.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 256cd62..4174289 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -754,13 +754,16 @@ BOOL WINAPI TzSpecificLocalTimeToSystemTime( * * Get the current time in utc format. * + * PARAMS + * time [out] Destination for the current utc time + * * RETURNS * Nothing. */ -VOID WINAPI GetSystemTimeAsFileTime( - LPFILETIME time) /* [out] Destination for the current utc time */ +void WINAPI GetSystemTimeAsFileTime( FILETIME *time ) { LARGE_INTEGER t; + NtQuerySystemTime( &t ); time->dwLowDateTime = t.u.LowPart; time->dwHighDateTime = t.u.HighPart; @@ -770,15 +773,21 @@ VOID WINAPI GetSystemTimeAsFileTime( /*********************************************************************** * GetSystemTimePreciseAsFileTime (KERNEL32.@) * - * Get the current time in utc format, with <1 us precision. + * Get the current time in utc format with greater accuracy. + * + * PARAMS + * time [out] Destination for the current utc time * * RETURNS * Nothing. */ -VOID WINAPI GetSystemTimePreciseAsFileTime( - LPFILETIME time) /* [out] Destination for the current utc time */ +void WINAPI GetSystemTimePreciseAsFileTime( FILETIME *time ) { - GetSystemTimeAsFileTime(time); + LARGE_INTEGER t; + + t.QuadPart = RtlGetSystemTimePrecise(); + time->dwLowDateTime = t.u.LowPart; + time->dwHighDateTime = t.u.HighPart; }

1 0

Huw Davies : ntdll: Use CLOCK_REALTIME_COARSE for NtQuerySystemTime() if it has sufficient resolution.
by Alexandre Julliard 14 May '19

14 May '19

Module: wine Branch: master Commit: 5c8ea25014f4d40e68c20698bed5a54d4e9c75bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c8ea25014f4d40e68c20698… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 14 09:53:44 2019 +0100 ntdll: Use CLOCK_REALTIME_COARSE for NtQuerySystemTime() if it has sufficient resolution. This will only affect users running with HZ=1000. On an i7-8700 CPU @ 3.20GHz it cuts the call cost from ~30ns to ~12ns. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/time.c | 38 ++++++++++++++++++++++++++++++++------ 1 file changed, 32 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index ec0a187..3b28113 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -458,19 +458,45 @@ void WINAPI RtlTimeToElapsedTimeFields( const LARGE_INTEGER *Time, PTIME_FIELDS * Get the current system time. * * PARAMS - * Time [O] Destination for the current system time. + * time [O] Destination for the current system time. * * RETURNS * Success: STATUS_SUCCESS. * Failure: An NTSTATUS error code indicating the problem. */ -NTSTATUS WINAPI NtQuerySystemTime( PLARGE_INTEGER Time ) +NTSTATUS WINAPI NtQuerySystemTime( LARGE_INTEGER *time ) { - struct timeval now; +#ifdef HAVE_CLOCK_GETTIME + struct timespec ts; + static clockid_t clock_id = CLOCK_MONOTONIC; /* placeholder */ - gettimeofday( &now, 0 ); - Time->QuadPart = now.tv_sec * (ULONGLONG)TICKSPERSEC + TICKS_1601_TO_1970; - Time->QuadPart += now.tv_usec * 10; + if (clock_id == CLOCK_MONOTONIC) + { +#ifdef CLOCK_REALTIME_COARSE + struct timespec res; + + /* Use CLOCK_REALTIME_COARSE if it has 1 ms or better resolution */ + if (!clock_getres( CLOCK_REALTIME_COARSE, &res ) && res.tv_sec == 0 && res.tv_nsec <= 1000000) + clock_id = CLOCK_REALTIME_COARSE; + else +#endif /* CLOCK_REALTIME_COARSE */ + clock_id = CLOCK_REALTIME; + } + + if (!clock_gettime( clock_id, &ts )) + { + time->QuadPart = ts.tv_sec * (ULONGLONG)TICKSPERSEC + TICKS_1601_TO_1970; + time->QuadPart += (ts.tv_nsec + 50) / 100; + } + else +#endif /* HAVE_CLOCK_GETTIME */ + { + struct timeval now; + + gettimeofday( &now, 0 ); + time->QuadPart = now.tv_sec * (ULONGLONG)TICKSPERSEC + TICKS_1601_TO_1970; + time->QuadPart += now.tv_usec * 10; + } return STATUS_SUCCESS; }

1 0

Alexandre Julliard : dinput/tests: Remove duplicate const.
by Alexandre Julliard 14 May '19

14 May '19

Module: wine Branch: master Commit: 1d399dba61458bf3edfd022fea03f2c4b53faf8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d399dba61458bf3edfd022f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 14 20:37:34 2019 +0200 dinput/tests: Remove duplicate const. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/dinput.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput/tests/dinput.c b/dlls/dinput/tests/dinput.c index abf849f..c570ecf 100644 --- a/dlls/dinput/tests/dinput.c +++ b/dlls/dinput/tests/dinput.c @@ -269,7 +269,7 @@ static void test_QueryInterface(void) &IID_IDirectInput2A, &IID_IDirectInput2W, &IID_IDirectInput7A, &IID_IDirectInput7W}; - static const REFIID no_interface_list[] = + static REFIID no_interface_list[] = { &IID_IDirectInput8A, &IID_IDirectInput8W,

1 0

Alexandre Julliard : dinput8/tests: Remove duplicate const.
by Alexandre Julliard 14 May '19

14 May '19

Module: wine Branch: master Commit: a125baf4da84e82b2482815442ec724b7c93058d URL: https://source.winehq.org/git/wine.git/?a=commit;h=a125baf4da84e82b24828154… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 14 20:37:38 2019 +0200 dinput8/tests: Remove duplicate const. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/dinput.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput8/tests/dinput.c b/dlls/dinput8/tests/dinput.c index 594ba27..de9e6e4 100644 --- a/dlls/dinput8/tests/dinput.c +++ b/dlls/dinput8/tests/dinput.c @@ -222,7 +222,7 @@ static void test_QueryInterface(void) { static REFIID iid_list[] = {&IID_IUnknown, &IID_IDirectInput8A, &IID_IDirectInput8W, &IID_IDirectInputJoyConfig8}; - static const REFIID no_interface_list[] = + static REFIID no_interface_list[] = { &IID_IDirectInputA, &IID_IDirectInputW,

1 0

Alexandre Julliard : winebus.sys: Avoid ssize_t.
by Alexandre Julliard 14 May '19

14 May '19

Module: wine Branch: master Commit: c0604a934134d3d6ba545249a52b1ac7ba3899f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0604a934134d3d6ba545249… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 14 20:39:22 2019 +0200 winebus.sys: Avoid ssize_t. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index ddda78d..be953db 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -819,7 +819,7 @@ static NTSTATUS begin_report_processing(DEVICE_OBJECT *device) static NTSTATUS hidraw_set_output_report(DEVICE_OBJECT *device, UCHAR id, BYTE *report, DWORD length, ULONG_PTR *written) { struct platform_private* ext = impl_from_DEVICE_OBJECT(device); - ssize_t rc; + int rc; if (id != 0) rc = write(ext->device_fd, report, length);

1 0

Piotr Caban : hid: Fix error handling in HidP_SetUsages.
by Alexandre Julliard 14 May '19

14 May '19

Module: wine Branch: master Commit: 2b5efe1b1ce9def223cdc6abad4618b1e1dfbfdf URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b5efe1b1ce9def223cdc6ab… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 14 12:43:45 2019 +0200 hid: Fix error handling in HidP_SetUsages. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 0416426..8c04670 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -599,12 +599,12 @@ NTSTATUS WINAPI HidP_SetUsages(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USH { rc = set_report_data((BYTE*)Report, ReportLength, element.valueStartBit, element.bitCount, -1); + } - if (rc != HIDP_STATUS_SUCCESS) - { - *UsageLength = i; - return rc; - } + if (rc != HIDP_STATUS_SUCCESS) + { + *UsageLength = i; + return rc; } }

1 0

Piotr Caban : hidclass.sys: Limit written data to the actual report size.
by Alexandre Julliard 14 May '19

14 May '19

Module: wine Branch: master Commit: 99114803b80f6e687f1d4ed11e0808b821cdbf22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=99114803b80f6e687f1d4ed1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 14 12:52:58 2019 +0200 hidclass.sys: Limit written data to the actual report size. Linux hidraw devices are not accepting to large set feature ioctls. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 0654619..4495300 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -482,7 +482,9 @@ static NTSTATUS HID_get_feature(DEVICE_OBJECT *device, IRP *irp) static NTSTATUS HID_set_to_device(DEVICE_OBJECT *device, IRP *irp) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation(irp); + BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; HID_XFER_PACKET packet; + ULONG max_len; NTSTATUS rc; TRACE_(hid_report)("Device %p Buffer length %i Buffer %p\n", device, irpsp->Parameters.DeviceIoControl.InputBufferLength, irp->AssociatedIrp.SystemBuffer); @@ -491,12 +493,23 @@ static NTSTATUS HID_set_to_device(DEVICE_OBJECT *device, IRP *irp) { packet.reportBuffer = &((BYTE*)irp->AssociatedIrp.SystemBuffer)[1]; packet.reportBufferLen = irpsp->Parameters.DeviceIoControl.InputBufferLength - 1; + if (irpsp->Parameters.DeviceIoControl.IoControlCode == IOCTL_HID_SET_FEATURE) + max_len = ext->preparseData->caps.FeatureReportByteLength; + else + max_len = ext->preparseData->caps.OutputReportByteLength; } else { packet.reportBuffer = irp->AssociatedIrp.SystemBuffer; packet.reportBufferLen = irpsp->Parameters.DeviceIoControl.InputBufferLength; + if (irpsp->Parameters.DeviceIoControl.IoControlCode == IOCTL_HID_SET_FEATURE) + max_len = (ext->preparseData->reports[ext->preparseData->reportIdx[HidP_Feature][packet.reportId]].bitSize + 7) / 8; + else + max_len = (ext->preparseData->reports[ext->preparseData->reportIdx[HidP_Output][packet.reportId]].bitSize + 7) / 8; } + if (packet.reportBufferLen > max_len) + packet.reportBufferLen = max_len; + TRACE_(hid_report)("(id %i, len %i buffer %p)\n", packet.reportId, packet.reportBufferLen, packet.reportBuffer); rc = call_minidriver(irpsp->Parameters.DeviceIoControl.IoControlCode, @@ -740,7 +753,9 @@ NTSTATUS WINAPI HID_Device_read(DEVICE_OBJECT *device, IRP *irp) NTSTATUS WINAPI HID_Device_write(DEVICE_OBJECT *device, IRP *irp) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); + BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; HID_XFER_PACKET packet; + ULONG max_len; NTSTATUS rc; irp->IoStatus.Information = 0; @@ -751,12 +766,17 @@ NTSTATUS WINAPI HID_Device_write(DEVICE_OBJECT *device, IRP *irp) { packet.reportBuffer = &((BYTE*)irp->AssociatedIrp.SystemBuffer)[1]; packet.reportBufferLen = irpsp->Parameters.Write.Length - 1; + max_len = ext->preparseData->caps.OutputReportByteLength; } else { packet.reportBuffer = irp->AssociatedIrp.SystemBuffer; packet.reportBufferLen = irpsp->Parameters.Write.Length; + max_len = (ext->preparseData->reports[ext->preparseData->reportIdx[HidP_Output][packet.reportId]].bitSize + 7) / 8; } + if (packet.reportBufferLen > max_len) + packet.reportBufferLen = max_len; + TRACE_(hid_report)("(id %i, len %i buffer %p)\n", packet.reportId, packet.reportBufferLen, packet.reportBuffer); rc = call_minidriver(IOCTL_HID_WRITE_REPORT, device, NULL, 0, &packet, sizeof(packet));

1 0