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 ---
This was already duplicated in both hid and hidclass.sys.
dlls/hid/hidp.c | 2 +- dlls/hidclass.sys/hid.h | 2 +- dlls/hidclass.sys/parse.h | 69 -------------------------- dlls/hid/parse.h => include/wine/hid.h | 0 4 files changed, 2 insertions(+), 71 deletions(-) delete mode 100644 dlls/hidclass.sys/parse.h rename dlls/hid/parse.h => include/wine/hid.h (100%)
diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 59a4078c6c5..9d631912c85 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -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); diff --git a/dlls/hidclass.sys/hid.h b/dlls/hidclass.sys/hid.h index 86d7bdf98f1..36d13c009d7 100644 --- a/dlls/hidclass.sys/hid.h +++ b/dlls/hidclass.sys/hid.h @@ -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 diff --git a/dlls/hidclass.sys/parse.h b/dlls/hidclass.sys/parse.h deleted file mode 100644 index 319105d286e..00000000000 --- a/dlls/hidclass.sys/parse.h +++ /dev/null @@ -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 */ diff --git a/dlls/hid/parse.h b/include/wine/hid.h similarity index 100% rename from dlls/hid/parse.h rename to include/wine/hid.h
-
Andrew Eikum