[ros-diffs] [janderwald] 59217: [HIDPARSER, HIDPARSE, INCLUDE] - Fix function signatures CORE-7183 #comment fixed #resolve

Author: janderwald
Date: Sat Jun 15 06:18:02 2013
New Revision: 59217

URL: http://svn.reactos.org/svn/reactos?rev=59217&view=rev
Log:
[HIDPARSER, HIDPARSE, INCLUDE]
- Fix function signatures
CORE-7183 #comment fixed #resolve

Modified:
    trunk/reactos/drivers/hid/hidparse/hidparse.c
    trunk/reactos/drivers/hid/hidparse/hidparse.h
    trunk/reactos/include/psdk/hidpi.h
    trunk/reactos/lib/drivers/hidparser/api.c
    trunk/reactos/lib/drivers/hidparser/hidparser.c
    trunk/reactos/lib/drivers/hidparser/hidparser.h
    trunk/reactos/lib/drivers/hidparser/parser.h

Modified: trunk/reactos/drivers/hid/hidparse/hidparse.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidparse/hidpa…
==============================================================================
--- trunk/reactos/drivers/hid/hidparse/hidparse.c	[iso-8859-1] (original)
+++ trunk/reactos/drivers/hid/hidparse/hidparse.c	[iso-8859-1] Sat Jun 15 06:18:02 2013
@@ -73,11 +73,10 @@
 {
 
     va_list args;
-    unsigned int i;
     char printbuffer[1024];
 
     va_start(args, FormatStr);
-    i = vsprintf(printbuffer, FormatStr, args);
+    vsprintf(printbuffer, FormatStr, args);
     va_end(args);
 
     DbgPrint(printbuffer);
@@ -179,7 +178,7 @@
     IN USHORT  LinkCollection,
     IN USAGE  Usage,
     OUT PHIDP_VALUE_CAPS  ValueCaps,
-    IN OUT PULONG  ValueCapsLength,
+    IN OUT PUSHORT  ValueCapsLength,
     IN PHIDP_PREPARSED_DATA  PreparsedData)
 {
     HID_PARSER Parser;
@@ -204,14 +203,14 @@
 NTSTATUS
 NTAPI
 HidP_GetUsages(
-    IN HIDP_REPORT_TYPE  ReportType,
-    IN USAGE  UsagePage,
-    IN USHORT  LinkCollection  OPTIONAL,
-    OUT USAGE  *UsageList,
-    IN OUT ULONG  *UsageLength,
-    IN PHIDP_PREPARSED_DATA  PreparsedData,
-    IN PCHAR  Report,
-    IN ULONG  ReportLength)
+    IN HIDP_REPORT_TYPE ReportType,
+    IN USAGE UsagePage,
+    IN USHORT LinkCollection  OPTIONAL,
+    OUT PUSAGE UsageList,
+    IN OUT PULONG UsageLength,
+    IN PHIDP_PREPARSED_DATA  PreparsedData,
+    IN PCHAR Report,
+    IN ULONG ReportLength)
 {
     HID_PARSER Parser;
 
@@ -371,19 +370,19 @@
     PUSHORT ButtonCapsLength,
     PHIDP_PREPARSED_DATA PreparsedData)
 {
-    return HidP_GetSpecificButtonCaps(ReportType, HID_USAGE_PAGE_UNDEFINED, 0, 0,
ButtonCaps, (PULONG)ButtonCapsLength, PreparsedData);
+    return HidP_GetSpecificButtonCaps(ReportType, HID_USAGE_PAGE_UNDEFINED, 0, 0,
ButtonCaps, ButtonCapsLength, PreparsedData);
 }
 
 HIDAPI
 NTSTATUS
 NTAPI
 HidP_GetSpecificButtonCaps(
-    IN HIDP_REPORT_TYPE  ReportType,
-    IN USAGE  UsagePage,
-    IN USHORT  LinkCollection,
-    IN USAGE  Usage,
-    OUT PHIDP_BUTTON_CAPS  ButtonCaps,
-    IN OUT PULONG  ButtonCapsLength,
+    IN HIDP_REPORT_TYPE ReportType,
+    IN USAGE UsagePage,
+    IN USHORT LinkCollection,
+    IN USAGE Usage,
+    OUT PHIDP_BUTTON_CAPS ButtonCaps,
+    IN OUT PUSHORT ButtonCapsLength,
     IN PHIDP_PREPARSED_DATA  PreparsedData)
 {
     UNIMPLEMENTED
@@ -412,7 +411,7 @@
 NTAPI
 HidP_GetExtendedAttributes(
     IN HIDP_REPORT_TYPE  ReportType,
-    IN USAGE  UsagePage,
+    IN USHORT DataIndex,
     IN PHIDP_PREPARSED_DATA  PreparsedData,
     OUT PHIDP_EXTENDED_ATTRIBUTES  Attributes,
     IN OUT PULONG  LengthAttributes)
@@ -637,7 +636,7 @@
 HidP_GetValueCaps(
     HIDP_REPORT_TYPE ReportType,
     PHIDP_VALUE_CAPS ValueCaps,
-    PULONG ValueCapsLength,
+    PUSHORT ValueCapsLength,
     PHIDP_PREPARSED_DATA PreparsedData)
 {
     UNIMPLEMENTED

Modified: trunk/reactos/drivers/hid/hidparse/hidparse.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidparse/hidpa…
==============================================================================
--- trunk/reactos/drivers/hid/hidparse/hidparse.h	[iso-8859-1] (original)
+++ trunk/reactos/drivers/hid/hidparse/hidparse.h	[iso-8859-1] Sat Jun 15 06:18:02 2013
@@ -6,7 +6,7 @@
 #include <hidpddi.h>
 #include <hidpi.h>
 #define NDEBUG
-#include <debug.h>
+//#include <debug.h>
 #include "hidparser.h"
 #include <stdio.h>
 

Modified: trunk/reactos/include/psdk/hidpi.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/hidpi.h?rev=5…
==============================================================================
--- trunk/reactos/include/psdk/hidpi.h	[iso-8859-1] (original)
+++ trunk/reactos/include/psdk/hidpi.h	[iso-8859-1] Sat Jun 15 06:18:02 2013
@@ -369,7 +369,7 @@
   IN USHORT  LinkCollection,
   IN USAGE  Usage,
   OUT PHIDP_BUTTON_CAPS  ButtonCaps,
-  IN OUT PULONG  ButtonCapsLength,
+  IN OUT PUSHORT  ButtonCapsLength,
   IN PHIDP_PREPARSED_DATA  PreparsedData);
 
 HIDAPI
@@ -381,7 +381,7 @@
   IN USHORT  LinkCollection,
   IN USAGE  Usage,
   OUT PHIDP_VALUE_CAPS  ValueCaps,
-  IN OUT PULONG  ValueCapsLength,
+  IN OUT PUSHORT  ValueCapsLength,
   IN PHIDP_PREPARSED_DATA  PreparsedData);
 
 HIDAPI

Modified: trunk/reactos/lib/drivers/hidparser/api.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/hidparser/api.…
==============================================================================
--- trunk/reactos/lib/drivers/hidparser/api.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/hidparser/api.c	[iso-8859-1] Sat Jun 15 06:18:02 2013
@@ -273,11 +273,11 @@
     IN USHORT UsagePage,
     IN USHORT Usage,
     OUT PHIDP_VALUE_CAPS  ValueCaps,
-    IN OUT PULONG  ValueCapsLength)
+    IN OUT PUSHORT  ValueCapsLength)
 {
     ULONG Index;
     PHID_REPORT Report;
-    ULONG ItemCount = 0;
+    USHORT ItemCount = 0;
     USHORT CurrentUsagePage;
     USHORT CurrentUsage;
 

Modified: trunk/reactos/lib/drivers/hidparser/hidparser.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/hidparser/hidp…
==============================================================================
--- trunk/reactos/lib/drivers/hidparser/hidparser.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/hidparser/hidparser.c	[iso-8859-1] Sat Jun 15 06:18:02 2013
@@ -350,7 +350,7 @@
     IN USHORT  LinkCollection,
     IN USAGE  Usage,
     OUT PHIDP_VALUE_CAPS  ValueCaps,
-    IN OUT PULONG  ValueCapsLength)
+    IN OUT PUSHORT  ValueCapsLength)
 {
     HIDPARSER_STATUS ParserStatus;
 

Modified: trunk/reactos/lib/drivers/hidparser/hidparser.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/hidparser/hidp…
==============================================================================
--- trunk/reactos/lib/drivers/hidparser/hidparser.h	[iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/hidparser/hidparser.h	[iso-8859-1] Sat Jun 15 06:18:02 2013
@@ -123,12 +123,12 @@
 HidParser_GetSpecificValueCaps(
     IN PHID_PARSER Parser,
     IN PVOID CollectionContext,
-    IN HIDP_REPORT_TYPE  ReportType,
-    IN USAGE  UsagePage,
-    IN USHORT  LinkCollection,
-    IN USAGE  Usage,
-    OUT PHIDP_VALUE_CAPS  ValueCaps,
-    IN OUT PULONG  ValueCapsLength);
+    IN HIDP_REPORT_TYPE ReportType,
+    IN USAGE UsagePage,
+    IN USHORT LinkCollection,
+    IN USAGE Usage,
+    OUT PHIDP_VALUE_CAPS ValueCaps,
+    IN OUT PUSHORT ValueCapsLength);
 
 
 HIDAPI

Modified: trunk/reactos/lib/drivers/hidparser/parser.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/hidparser/pars…
==============================================================================
--- trunk/reactos/lib/drivers/hidparser/parser.h	[iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/hidparser/parser.h	[iso-8859-1] Sat Jun 15 06:18:02 2013
@@ -302,7 +302,7 @@
     IN USHORT UsagePage,
     IN USHORT Usage,
     OUT PHIDP_VALUE_CAPS  ValueCaps,
-    IN OUT PULONG  ValueCapsLength);
+    IN OUT PUSHORT  ValueCapsLength);
 
 
 HIDPARSER_STATUS