marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

hid: Move preparsed data definition to global header. 

PHIDP_PREPARSED_DATA is supposed to be an opaque pointer, but the size
is accessible through user32.GetRawInputDeviceInfo(RIDI_PREPARSEDDATA),
so we will need to know the struct layout in user32, too.

Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
stable
Andrew Eikum 2019-10-30 14:25:58 -05:00 committed by Alexandre Julliard
parent fbda8db334
commit b466419c32
4 changed files with 2 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/hid/hidp.c
View File

@ -32,7 +32,7 @@
#include "hidusage.h"
#include "ddk/hidpi.h"
#include "parse.h"
#include "wine/hid.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(hidp);

2
dlls/hidclass.sys/hid.h
View File

@ -29,7 +29,7 @@
#include "ddk/hidpi.h"
#include "cfgmgr32.h"
#include "wine/list.h"
#include "parse.h"
#include "wine/hid.h"
#define DEFAULT_POLL_INTERVAL 200
#define MAX_POLL_INTERVAL_MSEC 10000

69
dlls/hidclass.sys/parse.h
View File

@ -1,69 +0,0 @@
/*
* Wine 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 __WINE_PARSE_H
#define __WINE_PARSE_H
#define HID_MAGIC 0x8491759
typedef enum __WINE_ELEMENT_TYPE {
UnknownElement = 0,
ButtonElement,
ValueElement,
} WINE_ELEMENT_TYPE;
typedef struct __WINE_ELEMENT
{
WINE_ELEMENT_TYPE ElementType;
UINT valueStartBit;
UINT bitCount;
union {
HIDP_VALUE_CAPS value;
HIDP_BUTTON_CAPS button;
} caps;
} WINE_HID_ELEMENT;
typedef struct __WINE_HID_REPORT
{
UCHAR reportID;
DWORD bitSize;
DWORD elementCount;
DWORD elementIdx;
} WINE_HID_REPORT;
typedef struct __WINE_HIDP_PREPARSED_DATA
{
DWORD magic;
DWORD dwSize;
HIDP_CAPS caps;
DWORD elementOffset;
DWORD reportCount[3];
BYTE reportIdx[3][256];
WINE_HID_REPORT reports[1];
} WINE_HIDP_PREPARSED_DATA, *PWINE_HIDP_PREPARSED_DATA;
#define HID_INPUT_REPORTS(d) ((d)->reports)
#define HID_OUTPUT_REPORTS(d) ((d)->reports + (d)->reportCount[0])
#define HID_FEATURE_REPORTS(d) ((d)->reports + (d)->reportCount[0] + (d)->reportCount[1])
#define HID_ELEMS(d) ((WINE_HID_ELEMENT*)((BYTE*)(d) + (d)->elementOffset))
#endif /* __WINE_PARSE_H */

0
dlls/hid/parse.h → include/wine/hid.h
View File