July 2015 - Wine-commits - list.winehq.org

Sebastian Lackner : ntdll: Implement threadpool work item functions.
by Alexandre Julliard 01 Jul '15

01 Jul '15

Module: wine Branch: master Commit: e4c38f6bad3df50c71eb9b05a03d38732a854de3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4c38f6bad3df50c71eb9b05a… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jul 1 02:57:57 2015 +0200 ntdll: Implement threadpool work item functions. --- dlls/ntdll/ntdll.spec | 4 +++ dlls/ntdll/threadpool.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 96 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index f889b04..4b5ece5 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -972,12 +972,16 @@ @ stdcall RtlxUnicodeStringToOemSize(ptr) RtlUnicodeStringToOemSize @ stdcall TpAllocCleanupGroup(ptr) @ stdcall TpAllocPool(ptr ptr) +@ stdcall TpAllocWork(ptr ptr ptr ptr) +@ stdcall TpPostWork(ptr) @ stdcall TpReleaseCleanupGroup(ptr) @ stdcall TpReleaseCleanupGroupMembers(ptr long ptr) @ stdcall TpReleasePool(ptr) +@ stdcall TpReleaseWork(ptr) @ stdcall TpSetPoolMaxThreads(ptr long) @ stdcall TpSetPoolMinThreads(ptr long) @ stdcall TpSimpleTryPost(ptr ptr ptr) +@ stdcall TpWaitForWork(ptr long) @ stdcall -ret64 VerSetConditionMask(int64 long long) @ stdcall WinSqmIsOptedIn() @ stdcall ZwAcceptConnectPort(ptr long ptr long long ptr) NtAcceptConnectPort diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 2e8568c..da41ba0 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -157,7 +157,8 @@ struct threadpool enum threadpool_objtype { - TP_OBJECT_TYPE_SIMPLE + TP_OBJECT_TYPE_SIMPLE, + TP_OBJECT_TYPE_WORK }; /* internal threadpool object representation */ @@ -185,6 +186,10 @@ struct threadpool_object { PTP_SIMPLE_CALLBACK callback; } simple; + struct + { + PTP_WORK_CALLBACK callback; + } work; } u; }; @@ -203,6 +208,13 @@ static inline struct threadpool *impl_from_TP_POOL( TP_POOL *pool ) return (struct threadpool *)pool; } +static inline struct threadpool_object *impl_from_TP_WORK( TP_WORK *work ) +{ + struct threadpool_object *object = (struct threadpool_object *)work; + assert( object->type == TP_OBJECT_TYPE_WORK ); + return object; +} + static inline struct threadpool_group *impl_from_TP_CLEANUP_GROUP( TP_CLEANUP_GROUP *group ) { return (struct threadpool_group *)group; @@ -1579,6 +1591,15 @@ static void CALLBACK threadpool_worker_proc( void *param ) break; } + case TP_OBJECT_TYPE_WORK: + { + TRACE( "executing work callback %p(NULL, %p, %p)\n", + object->u.work.callback, object->userdata, object ); + object->u.work.callback( NULL, object->userdata, (TP_WORK *)object ); + TRACE( "callback %p returned\n", object->u.work.callback ); + break; + } + default: assert(0); break; @@ -1641,6 +1662,49 @@ NTSTATUS WINAPI TpAllocPool( TP_POOL **out, PVOID reserved ) } /*********************************************************************** + * TpAllocWork (NTDLL.@) + */ +NTSTATUS WINAPI TpAllocWork( TP_WORK **out, PTP_WORK_CALLBACK callback, PVOID userdata, + TP_CALLBACK_ENVIRON *environment ) +{ + struct threadpool_object *object; + struct threadpool *pool; + NTSTATUS status; + + TRACE( "%p %p %p %p\n", out, callback, userdata, environment ); + + object = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*object) ); + if (!object) + return STATUS_NO_MEMORY; + + status = tp_threadpool_lock( &pool, environment ); + if (status) + { + RtlFreeHeap( GetProcessHeap(), 0, object ); + return status; + } + + object->type = TP_OBJECT_TYPE_WORK; + object->u.work.callback = callback; + tp_object_initialize( object, pool, userdata, environment ); + + *out = (TP_WORK *)object; + return STATUS_SUCCESS; +} + +/*********************************************************************** + * TpPostWork (NTDLL.@) + */ +VOID WINAPI TpPostWork( TP_WORK *work ) +{ + struct threadpool_object *this = impl_from_TP_WORK( work ); + + TRACE( "%p\n", work ); + + tp_object_submit( this ); +} + +/*********************************************************************** * TpReleaseCleanupGroup (NTDLL.@) */ VOID WINAPI TpReleaseCleanupGroup( TP_CLEANUP_GROUP *group ) @@ -1728,6 +1792,19 @@ VOID WINAPI TpReleasePool( TP_POOL *pool ) } /*********************************************************************** + * TpReleaseWork (NTDLL.@) + */ +VOID WINAPI TpReleaseWork( TP_WORK *work ) +{ + struct threadpool_object *this = impl_from_TP_WORK( work ); + + TRACE( "%p\n", work ); + + tp_object_shutdown( this ); + tp_object_release( this ); +} + +/*********************************************************************** * TpSetPoolMaxThreads (NTDLL.@) */ VOID WINAPI TpSetPoolMaxThreads( TP_POOL *pool, DWORD maximum ) @@ -1806,3 +1883,17 @@ NTSTATUS WINAPI TpSimpleTryPost( PTP_SIMPLE_CALLBACK callback, PVOID userdata, return STATUS_SUCCESS; } + +/*********************************************************************** + * TpWaitForWork (NTDLL.@) + */ +VOID WINAPI TpWaitForWork( TP_WORK *work, BOOL cancel_pending ) +{ + struct threadpool_object *this = impl_from_TP_WORK( work ); + + TRACE( "%p %u\n", work, cancel_pending ); + + if (cancel_pending) + tp_object_cancel( this ); + tp_object_wait( this ); +}

1 0

Sebastian Lackner : ntdll/tests: Add basic tests for threadpool work items.
by Alexandre Julliard 01 Jul '15

01 Jul '15

Module: wine Branch: master Commit: 17cd2a8b241889bcf842150990142825c4899f25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17cd2a8b241889bcf84215099… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jul 1 02:58:26 2015 +0200 ntdll/tests: Add basic tests for threadpool work items. --- dlls/ntdll/tests/threadpool.c | 59 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/dlls/ntdll/tests/threadpool.c b/dlls/ntdll/tests/threadpool.c index 4bab5d3..46857b7 100644 --- a/dlls/ntdll/tests/threadpool.c +++ b/dlls/ntdll/tests/threadpool.c @@ -23,10 +23,14 @@ static HMODULE hntdll = 0; static NTSTATUS (WINAPI *pTpAllocCleanupGroup)(TP_CLEANUP_GROUP **); static NTSTATUS (WINAPI *pTpAllocPool)(TP_POOL **,PVOID); +static NTSTATUS (WINAPI *pTpAllocWork)(TP_WORK **,PTP_WORK_CALLBACK,PVOID,TP_CALLBACK_ENVIRON *); +static VOID (WINAPI *pTpPostWork)(TP_WORK *); static VOID (WINAPI *pTpReleaseCleanupGroup)(TP_CLEANUP_GROUP *); static VOID (WINAPI *pTpReleaseCleanupGroupMembers)(TP_CLEANUP_GROUP *,BOOL,PVOID); static VOID (WINAPI *pTpReleasePool)(TP_POOL *); +static VOID (WINAPI *pTpReleaseWork)(TP_WORK *); static NTSTATUS (WINAPI *pTpSimpleTryPost)(PTP_SIMPLE_CALLBACK,PVOID,TP_CALLBACK_ENVIRON *); +static VOID (WINAPI *pTpWaitForWork)(TP_WORK *,BOOL); #define NTDLL_GET_PROC(func) \ do \ @@ -47,10 +51,14 @@ static BOOL init_threadpool(void) NTDLL_GET_PROC(TpAllocCleanupGroup); NTDLL_GET_PROC(TpAllocPool); + NTDLL_GET_PROC(TpAllocWork); + NTDLL_GET_PROC(TpPostWork); NTDLL_GET_PROC(TpReleaseCleanupGroup); NTDLL_GET_PROC(TpReleaseCleanupGroupMembers); NTDLL_GET_PROC(TpReleasePool); + NTDLL_GET_PROC(TpReleaseWork); NTDLL_GET_PROC(TpSimpleTryPost); + NTDLL_GET_PROC(TpWaitForWork); if (!pTpAllocPool) { @@ -167,10 +175,61 @@ static void test_tp_simple(void) CloseHandle(semaphore); } +static void CALLBACK work_cb(TP_CALLBACK_INSTANCE *instance, void *userdata, TP_WORK *work) +{ + trace("Running work callback\n"); + Sleep(10); + InterlockedIncrement((LONG *)userdata); +} + +static void test_tp_work(void) +{ + TP_CALLBACK_ENVIRON environment; + TP_WORK *work; + TP_POOL *pool; + NTSTATUS status; + LONG userdata; + int i; + + /* allocate new threadpool */ + pool = NULL; + status = pTpAllocPool(&pool, NULL); + ok(!status, "TpAllocPool failed with status %x\n", status); + ok(pool != NULL, "expected pool != NULL\n"); + + /* allocate new work item */ + work = NULL; + memset(&environment, 0, sizeof(environment)); + environment.Version = 1; + environment.Pool = pool; + status = pTpAllocWork(&work, work_cb, &userdata, &environment); + ok(!status, "TpAllocWork failed with status %x\n", status); + ok(work != NULL, "expected work != NULL\n"); + + /* post 10 identical work items at once */ + userdata = 0; + for (i = 0; i < 10; i++) + pTpPostWork(work); + pTpWaitForWork(work, FALSE); + ok(userdata == 10, "expected userdata = 10, got %u\n", userdata); + + /* add more tasks and cancel them immediately */ + userdata = 0; + for (i = 0; i < 10; i++) + pTpPostWork(work); + pTpWaitForWork(work, TRUE); + ok(userdata < 10, "expected userdata < 10, got %u\n", userdata); + + /* cleanup */ + pTpReleaseWork(work); + pTpReleasePool(pool); +} + START_TEST(threadpool) { if (!init_threadpool()) return; test_tp_simple(); + test_tp_work(); }

1 0

Sebastian Lackner : ntdll/tests: Add threadpool scheduler tests for work items.
by Alexandre Julliard 01 Jul '15

01 Jul '15

Module: wine Branch: master Commit: b75d7f064c1e6af1a70119d3ce7b6e6250cf29d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b75d7f064c1e6af1a70119d3c… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jul 1 02:59:01 2015 +0200 ntdll/tests: Add threadpool scheduler tests for work items. --- dlls/ntdll/tests/threadpool.c | 83 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/dlls/ntdll/tests/threadpool.c b/dlls/ntdll/tests/threadpool.c index 46857b7..b261cd1 100644 --- a/dlls/ntdll/tests/threadpool.c +++ b/dlls/ntdll/tests/threadpool.c @@ -29,6 +29,7 @@ static VOID (WINAPI *pTpReleaseCleanupGroup)(TP_CLEANUP_GROUP *); static VOID (WINAPI *pTpReleaseCleanupGroupMembers)(TP_CLEANUP_GROUP *,BOOL,PVOID); static VOID (WINAPI *pTpReleasePool)(TP_POOL *); static VOID (WINAPI *pTpReleaseWork)(TP_WORK *); +static VOID (WINAPI *pTpSetPoolMaxThreads)(TP_POOL *,DWORD); static NTSTATUS (WINAPI *pTpSimpleTryPost)(PTP_SIMPLE_CALLBACK,PVOID,TP_CALLBACK_ENVIRON *); static VOID (WINAPI *pTpWaitForWork)(TP_WORK *,BOOL); @@ -57,6 +58,7 @@ static BOOL init_threadpool(void) NTDLL_GET_PROC(TpReleaseCleanupGroupMembers); NTDLL_GET_PROC(TpReleasePool); NTDLL_GET_PROC(TpReleaseWork); + NTDLL_GET_PROC(TpSetPoolMaxThreads); NTDLL_GET_PROC(TpSimpleTryPost); NTDLL_GET_PROC(TpWaitForWork); @@ -182,6 +184,13 @@ static void CALLBACK work_cb(TP_CALLBACK_INSTANCE *instance, void *userdata, TP_ InterlockedIncrement((LONG *)userdata); } +static void CALLBACK work2_cb(TP_CALLBACK_INSTANCE *instance, void *userdata, TP_WORK *work) +{ + trace("Running work2 callback\n"); + Sleep(10); + InterlockedExchangeAdd((LONG *)userdata, 0x10000); +} + static void test_tp_work(void) { TP_CALLBACK_ENVIRON environment; @@ -225,6 +234,79 @@ static void test_tp_work(void) pTpReleasePool(pool); } +static void test_tp_work_scheduler(void) +{ + TP_CALLBACK_ENVIRON environment; + TP_CLEANUP_GROUP *group; + TP_WORK *work, *work2; + TP_POOL *pool; + NTSTATUS status; + LONG userdata; + int i; + + /* allocate new threadpool */ + pool = NULL; + status = pTpAllocPool(&pool, NULL); + ok(!status, "TpAllocPool failed with status %x\n", status); + ok(pool != NULL, "expected pool != NULL\n"); + + /* we limit the pool to a single thread */ + pTpSetPoolMaxThreads(pool, 1); + + /* create a cleanup group */ + group = NULL; + status = pTpAllocCleanupGroup(&group); + ok(!status, "TpAllocCleanupGroup failed with status %x\n", status); + ok(group != NULL, "expected pool != NULL\n"); + + /* the first work item has no cleanup group associated */ + work = NULL; + memset(&environment, 0, sizeof(environment)); + environment.Version = 1; + environment.Pool = pool; + status = pTpAllocWork(&work, work_cb, &userdata, &environment); + ok(!status, "TpAllocWork failed with status %x\n", status); + ok(work != NULL, "expected work != NULL\n"); + + /* allocate a second work item with a cleanup group */ + work2 = NULL; + memset(&environment, 0, sizeof(environment)); + environment.Version = 1; + environment.Pool = pool; + environment.CleanupGroup = group; + status = pTpAllocWork(&work2, work2_cb, &userdata, &environment); + ok(!status, "TpAllocWork failed with status %x\n", status); + ok(work2 != NULL, "expected work2 != NULL\n"); + + /* the 'work' callbacks are not blocking execution of 'work2' callbacks */ + userdata = 0; + for (i = 0; i < 10; i++) + pTpPostWork(work); + for (i = 0; i < 10; i++) + pTpPostWork(work2); + Sleep(30); + pTpWaitForWork(work, TRUE); + pTpWaitForWork(work2, TRUE); + ok(userdata & 0xffff, "expected userdata & 0xffff != 0, got %u\n", userdata & 0xffff); + ok(userdata >> 16, "expected userdata >> 16 != 0, got %u\n", userdata >> 16); + + /* test TpReleaseCleanupGroupMembers on a work item */ + userdata = 0; + for (i = 0; i < 100; i++) + pTpPostWork(work); + for (i = 0; i < 10; i++) + pTpPostWork(work2); + pTpReleaseCleanupGroupMembers(group, FALSE, NULL); + pTpWaitForWork(work, TRUE); + ok((userdata & 0xffff) < 100, "expected userdata & 0xffff < 100, got %u\n", userdata & 0xffff); + ok((userdata >> 16) == 10, "expected userdata >> 16 == 10, got %u\n", userdata >> 16); + + /* cleanup */ + pTpReleaseWork(work); + pTpReleaseCleanupGroup(group); + pTpReleasePool(pool); +} + START_TEST(threadpool) { if (!init_threadpool()) @@ -232,4 +314,5 @@ START_TEST(threadpool) test_tp_simple(); test_tp_work(); + test_tp_work_scheduler(); }

1 0

Aric Stewart : hid: Implement HidP_GetCaps.
by Alexandre Julliard 01 Jul '15

01 Jul '15

Module: wine Branch: master Commit: 1e1599d961de93ba2d5bae2669a668a6553a030c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e1599d961de93ba2d5bae266… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jun 30 07:39:40 2015 -0500 hid: Implement HidP_GetCaps. --- dlls/hid/Makefile.in | 1 + dlls/hid/hid.spec | 2 +- dlls/hid/hidp.c | 53 ++++++++++++++++++++++++++++++++++++++ dlls/hid/parse.h | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 127 insertions(+), 1 deletion(-) diff --git a/dlls/hid/Makefile.in b/dlls/hid/Makefile.in index 3a115ca..97ae959 100644 --- a/dlls/hid/Makefile.in +++ b/dlls/hid/Makefile.in @@ -3,6 +3,7 @@ IMPORTLIB = hid C_SRCS = \ hidd.c \ + hidp.c \ main.c RC_SRCS = version.rc diff --git a/dlls/hid/hid.spec b/dlls/hid/hid.spec index f58953a..9d7899f 100644 --- a/dlls/hid/hid.spec +++ b/dlls/hid/hid.spec @@ -19,7 +19,7 @@ @ stub HidD_SetNumInputBuffers @ stub HidD_SetOutputReport @ stub HidP_GetButtonCaps -@ stub HidP_GetCaps +@ stdcall HidP_GetCaps(ptr ptr) @ stub HidP_GetData @ stub HidP_GetExtendedAttributes @ stub HidP_GetLinkCollectionNodes diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c new file mode 100644 index 0000000..a6f462c --- /dev/null +++ b/dlls/hid/hidp.c @@ -0,0 +1,53 @@ +/* + * Human Input Devices + * + * Copyright (C) 2015 Aric Stewart + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#define NONAMELESSUNION +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "winioctl.h" +#include "ddk/wdm.h" + +#include "hidusage.h" +#include "ddk/hidpi.h" +#include "parse.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(hidp); + +NTSTATUS WINAPI HidP_GetCaps(PHIDP_PREPARSED_DATA PreparsedData, + PHIDP_CAPS Capabilities) +{ + PWINE_HIDP_PREPARSED_DATA data = (PWINE_HIDP_PREPARSED_DATA)PreparsedData; + + TRACE("(%p, %p)\n",PreparsedData, Capabilities); + + if (data->magic != HID_MAGIC) + return HIDP_STATUS_INVALID_PREPARSED_DATA; + + *Capabilities = data->caps; + + return HIDP_STATUS_SUCCESS; +} diff --git a/dlls/hid/parse.h b/dlls/hid/parse.h new file mode 100644 index 0000000..1d902f8 --- /dev/null +++ b/dlls/hid/parse.h @@ -0,0 +1,72 @@ +/* + * Internal HID structures + * + * Copyright 2015 Aric Stewart + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __HID_PARSE_H +#define __HID_PARSE_H + +#define HID_MAGIC 0x8491759 + +typedef enum { + UnknownElement = 0, + ButtonElement, + ValueElement, +} WINE_ELEMENT_TYPE; + +typedef struct +{ + WINE_ELEMENT_TYPE ElementType; + UINT valueStartBit; + UINT bitCount; + union { + HIDP_VALUE_CAPS value; + HIDP_BUTTON_CAPS button; + } caps; +} WINE_HID_ELEMENT; + +typedef struct +{ + UCHAR reportID; + DWORD dwSize; + DWORD elementCount; + WINE_HID_ELEMENT Elements[1]; +} WINE_HID_REPORT; + +typedef struct +{ + DWORD magic; + DWORD dwSize; + HIDP_CAPS caps; + + DWORD dwInputReportCount; + DWORD dwOutputReportCount; + DWORD dwFeatureReportCount; + + DWORD dwOutputReportOffset; + DWORD dwFeatureReportOffset; + + WINE_HID_REPORT InputReports[1]; +} WINE_HIDP_PREPARSED_DATA, *PWINE_HIDP_PREPARSED_DATA; + +#define HID_NEXT_REPORT(d,r) ((r)?(WINE_HID_REPORT*)(((BYTE*)(r))+(r)->dwSize):(d)->InputReports) +#define HID_INPUT_REPORTS(d) ((d)->InputReports) +#define HID_OUTPUT_REPORTS(d) ((WINE_HID_REPORT*)(((BYTE*)(d)->InputReports)+(d)->dwOutputReportOffset)) +#define HID_FEATURE_REPORTS(d) ((WINE_HID_REPORT*)(((BYTE*)(d)->InputReports)+(d)->dwFeatureReportOffset)) + +#endif /* __HID_PARSE_H */

1 0

Aric Stewart : hid: Implement HidP_GetButtonCaps.
by Alexandre Julliard 01 Jul '15

01 Jul '15

Module: wine Branch: master Commit: b183dc3d6ed604f356a6fd468a356301455f6ff5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b183dc3d6ed604f356a6fd468… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jun 30 07:39:50 2015 -0500 hid: Implement HidP_GetButtonCaps. --- dlls/hid/hid.spec | 2 +- dlls/hid/hidp.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++ include/ddk/hidpi.h | 1 + 3 files changed, 60 insertions(+), 1 deletion(-) diff --git a/dlls/hid/hid.spec b/dlls/hid/hid.spec index 9d7899f..4bd9f4e 100644 --- a/dlls/hid/hid.spec +++ b/dlls/hid/hid.spec @@ -18,7 +18,7 @@ @ stdcall HidD_SetFeature(long ptr long) @ stub HidD_SetNumInputBuffers @ stub HidD_SetOutputReport -@ stub HidP_GetButtonCaps +@ stdcall HidP_GetButtonCaps(long ptr ptr ptr) @ stdcall HidP_GetCaps(ptr ptr) @ stub HidP_GetData @ stub HidP_GetExtendedAttributes diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index a6f462c..47864fa 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -37,6 +37,64 @@ WINE_DEFAULT_DEBUG_CHANNEL(hidp); +NTSTATUS WINAPI HidP_GetButtonCaps(HIDP_REPORT_TYPE ReportType, PHIDP_BUTTON_CAPS ButtonCaps, + PUSHORT ButtonCapsLength, PHIDP_PREPARSED_DATA PreparsedData) +{ + PWINE_HIDP_PREPARSED_DATA data = (PWINE_HIDP_PREPARSED_DATA)PreparsedData; + WINE_HID_REPORT *report = NULL; + USHORT b_count = 0, r_count = 0; + int i,j,u; + + TRACE("(%i, %p, %p, %p)\n",ReportType, ButtonCaps, ButtonCapsLength, PreparsedData); + + if (data->magic != HID_MAGIC) + return HIDP_STATUS_INVALID_PREPARSED_DATA; + + switch(ReportType) + { + case HidP_Input: + b_count = data->caps.NumberInputButtonCaps; + r_count = data->dwInputReportCount; + report = HID_INPUT_REPORTS(data); + break; + case HidP_Output: + b_count = data->caps.NumberOutputButtonCaps; + r_count = data->dwOutputReportCount; + report = HID_OUTPUT_REPORTS(data); + break; + case HidP_Feature: + b_count = data->caps.NumberFeatureButtonCaps; + r_count = data->dwFeatureReportCount; + report = HID_FEATURE_REPORTS(data); + break; + default: + return HIDP_STATUS_INVALID_REPORT_TYPE; + } + + if (!r_count || !b_count || !report) + { + *ButtonCapsLength = 0; + return HIDP_STATUS_SUCCESS; + } + + b_count = min(b_count, *ButtonCapsLength); + + u = 0; + for (j = 0; j < r_count && u < b_count; j++) + { + for (i = 0; i < report->elementCount && u < b_count; i++) + { + if (report->Elements[i].ElementType == ButtonElement) + ButtonCaps[u++] = report->Elements[i].caps.button; + } + report = HID_NEXT_REPORT(data, report); + } + + *ButtonCapsLength = b_count; + return HIDP_STATUS_SUCCESS; +} + + NTSTATUS WINAPI HidP_GetCaps(PHIDP_PREPARSED_DATA PreparsedData, PHIDP_CAPS Capabilities) { diff --git a/include/ddk/hidpi.h b/include/ddk/hidpi.h index 32f6625..729f2d9 100644 --- a/include/ddk/hidpi.h +++ b/include/ddk/hidpi.h @@ -136,6 +136,7 @@ typedef struct _HIDP_CAPS USHORT NumberFeatureDataIndices; } HIDP_CAPS, *PHIDP_CAPS; +NTSTATUS WINAPI HidP_GetButtonCaps(HIDP_REPORT_TYPE ReportType, PHIDP_BUTTON_CAPS ButtonCaps, PUSHORT ButtonCapsLength, PHIDP_PREPARSED_DATA PreparsedData); NTSTATUS WINAPI HidP_GetCaps(PHIDP_PREPARSED_DATA PreparsedData, PHIDP_CAPS Capabilities); #ifndef FACILITY_HID_ERROR_CODE

1 0

Aric Stewart : hid: Implement HidP_GetValueCaps.
by Alexandre Julliard 01 Jul '15

01 Jul '15

Module: wine Branch: master Commit: 0bb216ff35df078333656a43ffb1fe301444d605 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bb216ff35df078333656a43f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jun 30 07:39:55 2015 -0500 hid: Implement HidP_GetValueCaps. --- dlls/hid/hid.spec | 2 +- dlls/hid/hidp.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++ include/ddk/hidpi.h | 2 ++ 3 files changed, 61 insertions(+), 1 deletion(-) diff --git a/dlls/hid/hid.spec b/dlls/hid/hid.spec index 4bd9f4e..214fa9e 100644 --- a/dlls/hid/hid.spec +++ b/dlls/hid/hid.spec @@ -30,7 +30,7 @@ @ stub HidP_GetUsageValueArray @ stub HidP_GetUsages @ stub HidP_GetUsagesEx -@ stub HidP_GetValueCaps +@ stdcall HidP_GetValueCaps(long ptr ptr ptr) @ stub HidP_InitializeReportForID @ stub HidP_MaxDataListLength @ stub HidP_MaxUsageListLength diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 47864fa..5823cfb 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -109,3 +109,61 @@ NTSTATUS WINAPI HidP_GetCaps(PHIDP_PREPARSED_DATA PreparsedData, return HIDP_STATUS_SUCCESS; } + + +NTSTATUS WINAPI HidP_GetValueCaps(HIDP_REPORT_TYPE ReportType, PHIDP_VALUE_CAPS ValueCaps, + PUSHORT ValueCapsLength, PHIDP_PREPARSED_DATA PreparsedData) +{ + PWINE_HIDP_PREPARSED_DATA data = (PWINE_HIDP_PREPARSED_DATA)PreparsedData; + WINE_HID_REPORT *report = NULL; + USHORT v_count = 0, r_count = 0; + int i,j,u; + + TRACE("(%i, %p, %p, %p)\n", ReportType, ValueCaps, ValueCapsLength, PreparsedData); + + if (data->magic != HID_MAGIC) + return HIDP_STATUS_INVALID_PREPARSED_DATA; + + switch(ReportType) + { + case HidP_Input: + v_count = data->caps.NumberInputValueCaps; + r_count = data->dwInputReportCount; + report = HID_INPUT_REPORTS(data); + break; + case HidP_Output: + v_count = data->caps.NumberOutputValueCaps; + r_count = data->dwOutputReportCount; + report = HID_OUTPUT_REPORTS(data); + break; + case HidP_Feature: + v_count = data->caps.NumberFeatureValueCaps; + r_count = data->dwFeatureReportCount; + report = HID_FEATURE_REPORTS(data); + break; + default: + return HIDP_STATUS_INVALID_REPORT_TYPE; + } + + if (!r_count || !v_count || !report) + { + *ValueCapsLength = 0; + return HIDP_STATUS_SUCCESS; + } + + v_count = min(v_count, *ValueCapsLength); + + u = 0; + for (j = 0; j < r_count && u < v_count; j++) + { + for (i = 0; i < report->elementCount && u < v_count; i++) + { + if (report->Elements[i].ElementType == ValueElement) + ValueCaps[u++] = report->Elements[i].caps.value; + } + report = HID_NEXT_REPORT(data, report); + } + + *ValueCapsLength = v_count; + return HIDP_STATUS_SUCCESS; +} diff --git a/include/ddk/hidpi.h b/include/ddk/hidpi.h index 729f2d9..c63d3e3 100644 --- a/include/ddk/hidpi.h +++ b/include/ddk/hidpi.h @@ -138,6 +138,8 @@ typedef struct _HIDP_CAPS NTSTATUS WINAPI HidP_GetButtonCaps(HIDP_REPORT_TYPE ReportType, PHIDP_BUTTON_CAPS ButtonCaps, PUSHORT ButtonCapsLength, PHIDP_PREPARSED_DATA PreparsedData); NTSTATUS WINAPI HidP_GetCaps(PHIDP_PREPARSED_DATA PreparsedData, PHIDP_CAPS Capabilities); +NTSTATUS WINAPI HidP_GetValueCaps(HIDP_REPORT_TYPE ReportType, PHIDP_VALUE_CAPS ValueCaps, PUSHORT ValueCapsLength, PHIDP_PREPARSED_DATA PreparsedData); + #ifndef FACILITY_HID_ERROR_CODE #define FACILITY_HID_ERROR_CODE 0x11

1 0

Aric Stewart : hid: Implement HidP_GetUsages.
by Alexandre Julliard 01 Jul '15

01 Jul '15

Module: wine Branch: master Commit: 8bb231c4ae88f041e6d11e7929c850e3d55c04a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bb231c4ae88f041e6d11e792… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jun 30 07:40:00 2015 -0500 hid: Implement HidP_GetUsages. --- dlls/hid/hid.spec | 2 +- dlls/hid/hidp.c | 126 ++++++++++++++++++++++++++++++++++++++++++++++++++++ include/ddk/hidpi.h | 1 + 3 files changed, 128 insertions(+), 1 deletion(-) diff --git a/dlls/hid/hid.spec b/dlls/hid/hid.spec index 214fa9e..5b63267 100644 --- a/dlls/hid/hid.spec +++ b/dlls/hid/hid.spec @@ -28,7 +28,7 @@ @ stub HidP_GetSpecificValueCaps @ stub HidP_GetUsageValue @ stub HidP_GetUsageValueArray -@ stub HidP_GetUsages +@ stdcall HidP_GetUsages(long long long ptr ptr ptr ptr long) @ stub HidP_GetUsagesEx @ stdcall HidP_GetValueCaps(long ptr ptr ptr) @ stub HidP_InitializeReportForID diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 5823cfb..0cdad0c 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -37,6 +37,46 @@ WINE_DEFAULT_DEBUG_CHANNEL(hidp); +static NTSTATUS get_report_data(BYTE *report, INT reportLength, INT startBit, INT valueSize, PULONG value) +{ + + if ((startBit + valueSize) / 8 > reportLength) + return HIDP_STATUS_INVALID_REPORT_LENGTH; + + if (valueSize == 1) + { + ULONG byte_index = startBit / 8; + ULONG bit_index = startBit - (byte_index * 8); + INT mask = (1 << bit_index); + *value = (report[byte_index] & mask); + } + else + { + ULONG byte_index = (startBit + valueSize - 1) / 8; + ULONG data = 0; + ULONG remainingBits = valueSize; + while (remainingBits) + { + data <<= 8; + + if (remainingBits >= 8) + { + data |= report[byte_index]; + byte_index --; + remainingBits -= 8; + } + else if (remainingBits > 0) + { + BYTE mask = ~(0xff << (8-remainingBits)); + data |= report[byte_index] & mask; + remainingBits = 0; + } + } + *value = data; + } + return HIDP_STATUS_SUCCESS; +} + NTSTATUS WINAPI HidP_GetButtonCaps(HIDP_REPORT_TYPE ReportType, PHIDP_BUTTON_CAPS ButtonCaps, PUSHORT ButtonCapsLength, PHIDP_PREPARSED_DATA PreparsedData) { @@ -111,6 +151,92 @@ NTSTATUS WINAPI HidP_GetCaps(PHIDP_PREPARSED_DATA PreparsedData, } +NTSTATUS WINAPI HidP_GetUsages(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, + PUSAGE UsageList, PULONG UsageLength, PHIDP_PREPARSED_DATA PreparsedData, + PCHAR Report, ULONG ReportLength) +{ + PWINE_HIDP_PREPARSED_DATA data = (PWINE_HIDP_PREPARSED_DATA)PreparsedData; + WINE_HID_REPORT *report = NULL; + BOOL found = FALSE; + USHORT b_count = 0, r_count = 0; + int i,uCount; + + TRACE("(%i, %x, %i, %p, %p, %p, %p, %i)\n", ReportType, UsagePage, LinkCollection, UsageList, + UsageLength, PreparsedData, Report, ReportLength); + + if (data->magic != HID_MAGIC) + return HIDP_STATUS_INVALID_PREPARSED_DATA; + + switch(ReportType) + { + case HidP_Input: + b_count = data->caps.NumberInputButtonCaps; + r_count = data->dwInputReportCount; + report = HID_INPUT_REPORTS(data); + break; + case HidP_Output: + b_count = data->caps.NumberOutputButtonCaps; + r_count = data->dwOutputReportCount; + report = HID_OUTPUT_REPORTS(data); + break; + case HidP_Feature: + b_count = data->caps.NumberFeatureButtonCaps; + r_count = data->dwFeatureReportCount; + report = HID_FEATURE_REPORTS(data); + break; + default: + return HIDP_STATUS_INVALID_REPORT_TYPE; + } + + if (!r_count || !b_count || !report) + return HIDP_STATUS_USAGE_NOT_FOUND; + + for (i = 0; i < r_count; i++) + { + if (!report->reportID || report->reportID == Report[0]) + break; + report = HID_NEXT_REPORT(data, report); + } + + if (i == r_count) + return HIDP_STATUS_REPORT_DOES_NOT_EXIST; + + uCount = 0; + for (i = 0; i < report->elementCount && uCount < *UsageLength; i++) + { + if (report->Elements[i].ElementType == ButtonElement && + report->Elements[i].caps.button.UsagePage == UsagePage) + { + int k; + WINE_HID_ELEMENT *element = &report->Elements[i]; + for (k=0; k < element->bitCount; k++) + { + UINT v = 0; + NTSTATUS rc = get_report_data((BYTE*)Report, ReportLength, + element->valueStartBit + k, 1, &v); + if (rc != HIDP_STATUS_SUCCESS) + return rc; + found = TRUE; + if (v) + { + if (uCount == *UsageLength) + return HIDP_STATUS_BUFFER_TOO_SMALL; + UsageList[uCount] = element->caps.button.u.Range.UsageMin + k; + uCount++; + } + } + } + } + + if (!found) + return HIDP_STATUS_USAGE_NOT_FOUND; + + *UsageLength = uCount; + + return HIDP_STATUS_SUCCESS; +} + + NTSTATUS WINAPI HidP_GetValueCaps(HIDP_REPORT_TYPE ReportType, PHIDP_VALUE_CAPS ValueCaps, PUSHORT ValueCapsLength, PHIDP_PREPARSED_DATA PreparsedData) { diff --git a/include/ddk/hidpi.h b/include/ddk/hidpi.h index c63d3e3..fddfa02 100644 --- a/include/ddk/hidpi.h +++ b/include/ddk/hidpi.h @@ -138,6 +138,7 @@ typedef struct _HIDP_CAPS NTSTATUS WINAPI HidP_GetButtonCaps(HIDP_REPORT_TYPE ReportType, PHIDP_BUTTON_CAPS ButtonCaps, PUSHORT ButtonCapsLength, PHIDP_PREPARSED_DATA PreparsedData); NTSTATUS WINAPI HidP_GetCaps(PHIDP_PREPARSED_DATA PreparsedData, PHIDP_CAPS Capabilities); +NTSTATUS WINAPI HidP_GetUsages(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, PUSAGE UsageList, PULONG UsageLength, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength); NTSTATUS WINAPI HidP_GetValueCaps(HIDP_REPORT_TYPE ReportType, PHIDP_VALUE_CAPS ValueCaps, PUSHORT ValueCapsLength, PHIDP_PREPARSED_DATA PreparsedData);

1 0

Aric Stewart : hid: Implement HidP_GetUsageValue.
by Alexandre Julliard 01 Jul '15

01 Jul '15

Module: wine Branch: master Commit: ecc619650829db0ea6dd15ad59773598495efa48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecc619650829db0ea6dd15ad5… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jun 30 07:40:04 2015 -0500 hid: Implement HidP_GetUsageValue. --- dlls/hid/hid.spec | 2 +- dlls/hid/hidp.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++ include/ddk/hidpi.h | 1 + 3 files changed, 67 insertions(+), 1 deletion(-) diff --git a/dlls/hid/hid.spec b/dlls/hid/hid.spec index 5b63267..b8b4e7f 100644 --- a/dlls/hid/hid.spec +++ b/dlls/hid/hid.spec @@ -26,7 +26,7 @@ @ stub HidP_GetScaledUsageValue @ stub HidP_GetSpecificButtonCaps @ stub HidP_GetSpecificValueCaps -@ stub HidP_GetUsageValue +@ stdcall HidP_GetUsageValue(long long long long ptr ptr ptr long) @ stub HidP_GetUsageValueArray @ stdcall HidP_GetUsages(long long long ptr ptr ptr ptr long) @ stub HidP_GetUsagesEx diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 0cdad0c..07c82cf 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -151,6 +151,71 @@ NTSTATUS WINAPI HidP_GetCaps(PHIDP_PREPARSED_DATA PreparsedData, } +NTSTATUS WINAPI HidP_GetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, + USAGE Usage, PULONG UsageValue, PHIDP_PREPARSED_DATA PreparsedData, + PCHAR Report, ULONG ReportLength) +{ + PWINE_HIDP_PREPARSED_DATA data = (PWINE_HIDP_PREPARSED_DATA)PreparsedData; + WINE_HID_REPORT *report = NULL; + USHORT v_count = 0, r_count = 0; + int i; + + TRACE("(%i, %x, %i, %i, %p, %p, %p, %i)\n", ReportType, UsagePage, LinkCollection, Usage, UsageValue, + PreparsedData, Report, ReportLength); + + if (data->magic != HID_MAGIC) + return HIDP_STATUS_INVALID_PREPARSED_DATA; + + switch(ReportType) + { + case HidP_Input: + v_count = data->caps.NumberInputValueCaps; + r_count = data->dwInputReportCount; + report = HID_INPUT_REPORTS(data); + break; + case HidP_Output: + v_count = data->caps.NumberOutputValueCaps; + r_count = data->dwOutputReportCount; + report = HID_OUTPUT_REPORTS(data); + break; + case HidP_Feature: + v_count = data->caps.NumberFeatureValueCaps; + r_count = data->dwFeatureReportCount; + report = HID_FEATURE_REPORTS(data); + break; + default: + return HIDP_STATUS_INVALID_REPORT_TYPE; + } + + if (!r_count || !v_count || !report) + return HIDP_STATUS_USAGE_NOT_FOUND; + + for (i = 0; i < r_count; i++) + { + if (!report->reportID || report->reportID == Report[0]) + break; + report = HID_NEXT_REPORT(data, report); + } + + if (i == r_count) + return HIDP_STATUS_REPORT_DOES_NOT_EXIST; + + for (i = 0; i < report->elementCount; i++) + { + if (report->Elements[i].ElementType == ValueElement && + report->Elements[i].caps.value.UsagePage == UsagePage && + report->Elements[i].caps.value.u.NotRange.Usage == Usage) + { + return get_report_data((BYTE*)Report, ReportLength, + report->Elements[i].valueStartBit, + report->Elements[i].bitCount, UsageValue); + } + } + + return HIDP_STATUS_USAGE_NOT_FOUND; +} + + NTSTATUS WINAPI HidP_GetUsages(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, PUSAGE UsageList, PULONG UsageLength, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength) diff --git a/include/ddk/hidpi.h b/include/ddk/hidpi.h index fddfa02..45361d2 100644 --- a/include/ddk/hidpi.h +++ b/include/ddk/hidpi.h @@ -139,6 +139,7 @@ typedef struct _HIDP_CAPS NTSTATUS WINAPI HidP_GetButtonCaps(HIDP_REPORT_TYPE ReportType, PHIDP_BUTTON_CAPS ButtonCaps, PUSHORT ButtonCapsLength, PHIDP_PREPARSED_DATA PreparsedData); NTSTATUS WINAPI HidP_GetCaps(PHIDP_PREPARSED_DATA PreparsedData, PHIDP_CAPS Capabilities); NTSTATUS WINAPI HidP_GetUsages(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, PUSAGE UsageList, PULONG UsageLength, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength); +NTSTATUS WINAPI HidP_GetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, USAGE Usage, PULONG UsageValue, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength); NTSTATUS WINAPI HidP_GetValueCaps(HIDP_REPORT_TYPE ReportType, PHIDP_VALUE_CAPS ValueCaps, PUSHORT ValueCapsLength, PHIDP_PREPARSED_DATA PreparsedData);

1 0

Aric Stewart : hid: Implement HidP_InitializeReportForID.
by Alexandre Julliard 01 Jul '15

01 Jul '15

Module: wine Branch: master Commit: 30480a236956d5e1c96d5368b4b418ead1e45d08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30480a236956d5e1c96d5368b… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jun 30 07:40:10 2015 -0500 hid: Implement HidP_InitializeReportForID. --- dlls/hid/hid.spec | 2 +- dlls/hid/hidp.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++ include/ddk/hidpi.h | 1 + 3 files changed, 65 insertions(+), 1 deletion(-) diff --git a/dlls/hid/hid.spec b/dlls/hid/hid.spec index b8b4e7f..5659a88 100644 --- a/dlls/hid/hid.spec +++ b/dlls/hid/hid.spec @@ -31,7 +31,7 @@ @ stdcall HidP_GetUsages(long long long ptr ptr ptr ptr long) @ stub HidP_GetUsagesEx @ stdcall HidP_GetValueCaps(long ptr ptr ptr) -@ stub HidP_InitializeReportForID +@ stdcall HidP_InitializeReportForID(long long ptr ptr long) @ stub HidP_MaxDataListLength @ stub HidP_MaxUsageListLength @ stub HidP_SetData diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 07c82cf..d680f78 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -358,3 +358,66 @@ NTSTATUS WINAPI HidP_GetValueCaps(HIDP_REPORT_TYPE ReportType, PHIDP_VALUE_CAPS *ValueCapsLength = v_count; return HIDP_STATUS_SUCCESS; } + +NTSTATUS WINAPI HidP_InitializeReportForID(HIDP_REPORT_TYPE ReportType, UCHAR ReportID, + PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, + ULONG ReportLength) +{ + int size; + PWINE_HIDP_PREPARSED_DATA data = (PWINE_HIDP_PREPARSED_DATA)PreparsedData; + WINE_HID_REPORT *report = NULL; + BOOL found=FALSE; + int r_count; + int i; + + TRACE("(%i, %i, %p, %p, %i)\n",ReportType, ReportID, PreparsedData, Report, ReportLength); + + if (data->magic != HID_MAGIC) + return HIDP_STATUS_INVALID_PREPARSED_DATA; + + switch(ReportType) + { + case HidP_Input: + size = data->caps.InputReportByteLength; + report = HID_INPUT_REPORTS(data); + r_count = data->dwInputReportCount; + break; + case HidP_Output: + size = data->caps.OutputReportByteLength; + report = HID_OUTPUT_REPORTS(data); + r_count = data->dwOutputReportCount; + break; + case HidP_Feature: + size = data->caps.FeatureReportByteLength; + report = HID_FEATURE_REPORTS(data); + r_count = data->dwFeatureReportCount; + break; + default: + return HIDP_STATUS_INVALID_REPORT_TYPE; + } + + if (!r_count || !size || !report) + return HIDP_STATUS_REPORT_DOES_NOT_EXIST; + + if (size != ReportLength) + return HIDP_STATUS_INVALID_REPORT_LENGTH; + + ZeroMemory(Report, size); + + for (i = 0; i < r_count; i++) + { + if (report->reportID == ReportID) + { + found = TRUE; + if (report->reportID) + Report[0] = ReportID; + /* TODO: Handle null and default values */ + } + report = HID_NEXT_REPORT(data, report); + } + + if (!found) + return HIDP_STATUS_REPORT_DOES_NOT_EXIST; + + return HIDP_STATUS_SUCCESS; +} diff --git a/include/ddk/hidpi.h b/include/ddk/hidpi.h index 45361d2..f4da89d 100644 --- a/include/ddk/hidpi.h +++ b/include/ddk/hidpi.h @@ -141,6 +141,7 @@ NTSTATUS WINAPI HidP_GetCaps(PHIDP_PREPARSED_DATA PreparsedData, PHIDP_CAPS Capa NTSTATUS WINAPI HidP_GetUsages(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, PUSAGE UsageList, PULONG UsageLength, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength); NTSTATUS WINAPI HidP_GetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, USAGE Usage, PULONG UsageValue, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength); NTSTATUS WINAPI HidP_GetValueCaps(HIDP_REPORT_TYPE ReportType, PHIDP_VALUE_CAPS ValueCaps, PUSHORT ValueCapsLength, PHIDP_PREPARSED_DATA PreparsedData); +NTSTATUS WINAPI HidP_InitializeReportForID(HIDP_REPORT_TYPE ReportType, UCHAR ReportID, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength); #ifndef FACILITY_HID_ERROR_CODE

1 0

Aric Stewart : hid: Implement HidD_GetPreparsedData and HidD_FreePreparsedData.
by Alexandre Julliard 01 Jul '15

01 Jul '15

Module: wine Branch: master Commit: 5b790bde5e2045aaa6678da6ca5903fec46ddc6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b790bde5e2045aaa6678da6c… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jun 30 07:40:13 2015 -0500 hid: Implement HidD_GetPreparsedData and HidD_FreePreparsedData. --- dlls/hid/hid.spec | 4 ++-- dlls/hid/hidd.c | 32 ++++++++++++++++++++++++++++++++ include/ddk/hidclass.h | 9 +++++++++ include/ddk/hidsdi.h | 2 ++ 4 files changed, 45 insertions(+), 2 deletions(-) diff --git a/dlls/hid/hid.spec b/dlls/hid/hid.spec index 5659a88..c72b0b8 100644 --- a/dlls/hid/hid.spec +++ b/dlls/hid/hid.spec @@ -1,5 +1,5 @@ @ stub HidD_FlushQueue -@ stub HidD_FreePreparsedData +@ stdcall HidD_FreePreparsedData(ptr) @ stub HidD_GetAttributes @ stub HidD_GetConfiguration @ stdcall HidD_GetFeature(long ptr long) @@ -10,7 +10,7 @@ @ stub HidD_GetMsGenreDescriptor @ stub HidD_GetNumInputBuffers @ stub HidD_GetPhysicalDescriptor -@ stub HidD_GetPreparsedData +@ stdcall HidD_GetPreparsedData(ptr ptr) @ stdcall HidD_GetProductString(long ptr long) @ stub HidD_GetSerialNumberString @ stub HidD_Hello diff --git a/dlls/hid/hidd.c b/dlls/hid/hidd.c index 144e804..4c1c1fd 100644 --- a/dlls/hid/hidd.c +++ b/dlls/hid/hidd.c @@ -32,10 +32,19 @@ #include "winioctl.h" #include "ddk/wdm.h" +#include "hidusage.h" #include "ddk/hidclass.h" +#include "ddk/hidpi.h" WINE_DEFAULT_DEBUG_CHANNEL(hid); +BOOLEAN WINAPI HidD_FreePreparsedData(PHIDP_PREPARSED_DATA PreparsedData) +{ + TRACE("(%p)\n", PreparsedData); + HeapFree(GetProcessHeap(), 0, PreparsedData); + return TRUE; +} + BOOLEAN WINAPI HidD_GetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, ReportBuffer, ReportBufferLength); @@ -65,3 +74,26 @@ BOOLEAN WINAPI HidD_GetProductString(HANDLE HidDeviceObject, PVOID Buffer, ULONG TRACE("(%p %p %u)\n", HidDeviceObject, Buffer, BufferLength); return DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_PRODUCT_STRING, NULL, 0, Buffer, BufferLength, NULL, NULL); } + +BOOLEAN WINAPI HidD_GetPreparsedData(HANDLE HidDeviceObject, PHIDP_PREPARSED_DATA *PreparsedData) +{ + HID_COLLECTION_INFORMATION info; + PHIDP_PREPARSED_DATA data; + + TRACE("(%p %p)\n", HidDeviceObject, PreparsedData); + + if (!DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_COLLECTION_INFORMATION, NULL, 0, + &info, sizeof(HID_COLLECTION_INFORMATION), NULL, NULL)) + return FALSE; + + if (!(data = HeapAlloc(GetProcessHeap(), 0, info.DescriptorSize))) return FALSE; + + if (!DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_COLLECTION_DESCRIPTOR, NULL, 0, + data, info.DescriptorSize, NULL, NULL)) + { + HeapFree( GetProcessHeap(), 0, data ); + return FALSE; + } + *PreparsedData = data; + return TRUE; +} diff --git a/include/ddk/hidclass.h b/include/ddk/hidclass.h index 81f892d..09dc467 100644 --- a/include/ddk/hidclass.h +++ b/include/ddk/hidclass.h @@ -56,6 +56,15 @@ DEFINE_GUID (GUID_DEVINTERFACE_HID, \ #define IOCTL_HID_SET_DRIVER_CONFIG HID_BUFFER_CTL_CODE(101) #define IOCTL_HID_GET_MS_GENRE_DESCRIPTOR HID_OUT_CTL_CODE(121) +typedef struct _HID_COLLECTION_INFORMATION { + ULONG DescriptorSize; + BOOLEAN Polled; + UCHAR Reserved1[1]; + USHORT VendorID; + USHORT ProductID; + USHORT VersionNumber; +} HID_COLLECTION_INFORMATION, *PHID_COLLECTION_INFORMATION; + #ifdef __cplusplus } #endif diff --git a/include/ddk/hidsdi.h b/include/ddk/hidsdi.h index 5eb68ff..c8aae28 100644 --- a/include/ddk/hidsdi.h +++ b/include/ddk/hidsdi.h @@ -32,5 +32,7 @@ void WINAPI HidD_GetHidGuid(LPGUID guid); BOOLEAN WINAPI HidD_GetManufacturerString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength); BOOLEAN WINAPI HidD_GetProductString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength); BOOLEAN WINAPI HidD_SetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength); +BOOLEAN WINAPI HidD_GetPreparsedData( HANDLE HidDeviceObject, PHIDP_PREPARSED_DATA *PreparsedData); +BOOLEAN WINAPI HidD_FreePreparsedData(PHIDP_PREPARSED_DATA PreparsedData); #endif /* __WINE_HIDSDI_H */

1 0