[HIDPARSER, HIDPARSE, INCLUDE]

- Fix function signatures
CORE-7183 #comment fixed #resolve

svn path=/trunk/; revision=59217
This commit is contained in:
Johannes Anderwald 2013-06-15 06:18:02 +00:00
parent d51f1d5cd8
commit 042a365171
7 changed files with 31 additions and 32 deletions

View file

@ -73,11 +73,10 @@ DebugFunction(
{
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 @@ HidP_GetSpecificValueCaps(
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 @@ HIDAPI
NTSTATUS
NTAPI
HidP_GetUsages(
IN HIDP_REPORT_TYPE ReportType,
IN USAGE UsagePage,
IN USHORT LinkCollection OPTIONAL,
OUT USAGE *UsageList,
IN OUT ULONG *UsageLength,
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)
IN PCHAR Report,
IN ULONG ReportLength)
{
HID_PARSER Parser;
@ -371,19 +370,19 @@ HidP_GetButtonCaps(
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 @@ NTSTATUS
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 @@ NTAPI
HidP_GetValueCaps(
HIDP_REPORT_TYPE ReportType,
PHIDP_VALUE_CAPS ValueCaps,
PULONG ValueCapsLength,
PUSHORT ValueCapsLength,
PHIDP_PREPARSED_DATA PreparsedData)
{
UNIMPLEMENTED

View file

@ -6,7 +6,7 @@
#include <hidpddi.h>
#include <hidpi.h>
#define NDEBUG
#include <debug.h>
//#include <debug.h>
#include "hidparser.h"
#include <stdio.h>

View file

@ -369,7 +369,7 @@ HidP_GetSpecificButtonCaps(
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 @@ HidP_GetSpecificValueCaps(
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

View file

@ -273,11 +273,11 @@ HidParser_GetSpecificValueCapsWithReport(
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;

View file

@ -350,7 +350,7 @@ HidParser_GetSpecificValueCaps(
IN USHORT LinkCollection,
IN USAGE Usage,
OUT PHIDP_VALUE_CAPS ValueCaps,
IN OUT PULONG ValueCapsLength)
IN OUT PUSHORT ValueCapsLength)
{
HIDPARSER_STATUS ParserStatus;

View file

@ -123,12 +123,12 @@ NTAPI
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

View file

@ -302,7 +302,7 @@ HidParser_GetSpecificValueCapsWithReport(
IN USHORT UsagePage,
IN USHORT Usage,
OUT PHIDP_VALUE_CAPS ValueCaps,
IN OUT PULONG ValueCapsLength);
IN OUT PUSHORT ValueCapsLength);
HIDPARSER_STATUS