Aric Stewart : hid: Implement HidD_GetAttributes.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 674080da914c13d1e435ae08de79f657f941fc3e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=674080da914c13d1e435ae08de...

Author: Aric Stewart 
Date:   Tue Jun 30 07:40:27 2015 -0500

hid: Implement HidD_GetAttributes.

---

dlls/hid/hid.spec    |  2 +-
 dlls/hid/hidd.c      | 20 +++++++++++++++++++-
 include/ddk/hidsdi.h |  8 ++++++++
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/dlls/hid/hid.spec b/dlls/hid/hid.spec
index 9cb6440..2dad3c7 100644
--- a/dlls/hid/hid.spec
+++ b/dlls/hid/hid.spec
@@ -1,6 +1,6 @@
 @ stub HidD_FlushQueue
 @ stdcall HidD_FreePreparsedData(ptr)
-@ stub HidD_GetAttributes
+@ stdcall HidD_GetAttributes(long ptr)
 @ stub HidD_GetConfiguration
 @ stdcall HidD_GetFeature(long ptr long)
 @ stdcall HidD_GetHidGuid(ptr)
diff --git a/dlls/hid/hidd.c b/dlls/hid/hidd.c
index d880a5e..c83cdfd 100644
--- a/dlls/hid/hidd.c
+++ b/dlls/hid/hidd.c
@@ -34,7 +34,7 @@

#include "hidusage.h"
 #include "ddk/hidclass.h"
-#include "ddk/hidpi.h"
+#include "ddk/hidsdi.h"

WINE_DEFAULT_DEBUG_CHANNEL(hid);

@@ -45,6 +45,24 @@ BOOLEAN WINAPI HidD_FreePreparsedData(PHIDP_PREPARSED_DATA PreparsedData)
     return TRUE;
 }

+BOOLEAN WINAPI HidD_GetAttributes(HANDLE HidDeviceObject, PHIDD_ATTRIBUTES Attr)
+{
+    HID_COLLECTION_INFORMATION info;
+    BOOLEAN ret;
+
+    TRACE("(%p %p)\n", HidDeviceObject, Attr);
+
+    ret = DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_COLLECTION_INFORMATION, NULL, 0, &info, sizeof(HID_COLLECTION_INFORMATION), NULL, NULL);
+
+    if (ret)
+    {
+        Attr->VendorID = info.VendorID;
+        Attr->ProductID = info.ProductID;
+        Attr->VersionNumber = info.VersionNumber;
+    }
+    return ret;
+}
+
 BOOLEAN WINAPI HidD_GetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength)
 {
     TRACE("(%p %p %u)\n", HidDeviceObject, ReportBuffer, ReportBufferLength);
diff --git a/include/ddk/hidsdi.h b/include/ddk/hidsdi.h
index beac073..9ea89b5 100644
--- a/include/ddk/hidsdi.h
+++ b/include/ddk/hidsdi.h
@@ -27,6 +27,13 @@
 typedef LONG NTSTATUS;
 #endif

+typedef struct _HIDD_ATTRIBUTES {
+  ULONG  Size;
+  USHORT VendorID;
+  USHORT ProductID;
+  USHORT VersionNumber;
+} HIDD_ATTRIBUTES, *PHIDD_ATTRIBUTES;
+
 BOOLEAN WINAPI HidD_GetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength);
 void WINAPI HidD_GetHidGuid(LPGUID guid);
 BOOLEAN WINAPI HidD_GetInputReport(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength);
@@ -35,5 +42,6 @@ BOOLEAN WINAPI HidD_GetProductString(HANDLE HidDeviceObject, PVOID Buffer, ULONG
 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);
+BOOLEAN WINAPI HidD_GetAttributes(HANDLE HidDeviceObject, PHIDD_ATTRIBUTES Attr);

#endif  /* __WINE_HIDSDI_H */