# HG changeset patch
# User StephaneLenclud
# Date 1423999363 -3600
# Node ID 7ef0f9dc229c07d67f2716fa31b89df19c482884
# Parent  878e0b271c114eb196a1df1485e10e9d5b395933
HidDevice now fetching value capabilities.

diff -r 878e0b271c11 -r 7ef0f9dc229c HidDevice.cs
--- a/HidDevice.cs	Sun Feb 15 12:10:40 2015 +0100
+++ b/HidDevice.cs	Sun Feb 15 12:22:43 2015 +0100
@@ -30,6 +30,11 @@
         //Input Button Capabilities
         public HIDP_BUTTON_CAPS[] InputButtonCapabilities { get { return iInputButtonCapabilities; } }
         private HIDP_BUTTON_CAPS[] iInputButtonCapabilities;
+        //Input Value Capabilities
+        public HIDP_VALUE_CAPS[] InputValueCapabilities { get { return iInputValueCapabilities; } }
+        private HIDP_VALUE_CAPS[] iInputValueCapabilities;
+
+        
         
 
         /// <summary>
@@ -67,6 +72,9 @@
         private void Construct(IntPtr hRawInputDevice)
         {
             PreParsedData = IntPtr.Zero;
+            iInputButtonCapabilities = null;
+            iInputValueCapabilities = null;
+
             //Fetch various information defining the given HID device
             Name = Win32.Utils.RawInput.GetDeviceName(hRawInputDevice);
 
@@ -132,15 +140,30 @@
                 throw new Exception("HidDevice: HidP_GetCaps failed: " + status.ToString());
             }
 
-            //Get input button caps
-            iInputButtonCapabilities = new HIDP_BUTTON_CAPS[Capabilities.NumberInputButtonCaps];
-            ushort buttonCapabilitiesLength = Capabilities.NumberInputButtonCaps;
-            status = Win32.Function.HidP_GetButtonCaps(HIDP_REPORT_TYPE.HidP_Input, iInputButtonCapabilities, ref buttonCapabilitiesLength, PreParsedData);
-            if (status != HidStatus.HIDP_STATUS_SUCCESS || buttonCapabilitiesLength != Capabilities.NumberInputButtonCaps)
+            //Get input button caps if needed
+            if (Capabilities.NumberInputButtonCaps > 0)
             {
-                throw new Exception("HidDevice: HidP_GetButtonCaps failed: " + status.ToString());
+                iInputButtonCapabilities = new HIDP_BUTTON_CAPS[Capabilities.NumberInputButtonCaps];
+                ushort buttonCapabilitiesLength = Capabilities.NumberInputButtonCaps;
+                status = Win32.Function.HidP_GetButtonCaps(HIDP_REPORT_TYPE.HidP_Input, iInputButtonCapabilities, ref buttonCapabilitiesLength, PreParsedData);
+                if (status != HidStatus.HIDP_STATUS_SUCCESS || buttonCapabilitiesLength != Capabilities.NumberInputButtonCaps)
+                {
+                    throw new Exception("HidDevice: HidP_GetButtonCaps failed: " + status.ToString());
+                }
             }
-            
+
+            //Get input value caps if needed
+            if (Capabilities.NumberInputValueCaps > 0)
+            {
+                iInputValueCapabilities = new HIDP_VALUE_CAPS[Capabilities.NumberInputValueCaps];
+                ushort valueCapabilitiesLength = Capabilities.NumberInputValueCaps;
+                status = Win32.Function.HidP_GetValueCaps(HIDP_REPORT_TYPE.HidP_Input, iInputValueCapabilities, ref valueCapabilitiesLength, PreParsedData);
+                if (status != HidStatus.HIDP_STATUS_SUCCESS || valueCapabilitiesLength != Capabilities.NumberInputValueCaps)
+                {
+                    throw new Exception("HidDevice: HidP_GetValueCaps failed: " + status.ToString());
+                }
+            }
+
 
         }
 
diff -r 878e0b271c11 -r 7ef0f9dc229c Win32Hid.cs
--- a/Win32Hid.cs	Sun Feb 15 12:10:40 2015 +0100
+++ b/Win32Hid.cs	Sun Feb 15 12:22:43 2015 +0100
@@ -40,7 +40,7 @@
         ///ValueCapsLength: PUSHORT->USHORT*
         ///PreparsedData: PHIDP_PREPARSED_DATA->_HIDP_PREPARSED_DATA*
         [System.Runtime.InteropServices.DllImportAttribute("hid.dll", EntryPoint = "HidP_GetValueCaps", CallingConvention = System.Runtime.InteropServices.CallingConvention.StdCall)]
-        public static extern HidStatus HidP_GetValueCaps(HIDP_REPORT_TYPE ReportType, ref HIDP_VALUE_CAPS[] ValueCaps, ref ushort ValueCapsLength, System.IntPtr PreparsedData);
+        public static extern HidStatus HidP_GetValueCaps(HIDP_REPORT_TYPE ReportType, [Out, MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 2)] HIDP_VALUE_CAPS[] ValueCaps, ref ushort ValueCapsLength, System.IntPtr PreparsedData);
 
     }