Ros-diffs December 2011

ros-diffs@reactos.org

16 participants
242 discussions

[janderwald] 54758: - - rearrange hid stack
by janderwald＠svn.reactos.org 25 Dec '11

25 Dec '11

Author: janderwald Date: Sun Dec 25 18:28:57 2011 New Revision: 54758 URL: http://svn.reactos.org/svn/reactos?rev=54758&view=rev Log: - - rearrange hid stack Removed: branches/usb-bringup/drivers/usb/hidparse/

1 0

[janderwald] 54757: - rearrange hid stack
by janderwald＠svn.reactos.org 25 Dec '11

25 Dec '11

Author: janderwald Date: Sun Dec 25 18:25:18 2011 New Revision: 54757 URL: http://svn.reactos.org/svn/reactos?rev=54757&view=rev Log: - rearrange hid stack Added: branches/usb-bringup/drivers/hid/CMakeLists.txt (with props) Removed: branches/usb-bringup/drivers/usb/hidparse/CMakeLists.txt branches/usb-bringup/drivers/usb/hidparse/hidparse.c branches/usb-bringup/drivers/usb/hidparse/hidparse.h branches/usb-bringup/drivers/usb/hidparse/hidparse.rc branches/usb-bringup/drivers/usb/hidparse/hidparse.spec branches/usb-bringup/drivers/usb/hidusb/ Modified: branches/usb-bringup/drivers/CMakeLists.txt branches/usb-bringup/drivers/usb/CMakeLists.txt Modified: branches/usb-bringup/drivers/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/CMakeLists.… ============================================================================== --- branches/usb-bringup/drivers/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup/drivers/CMakeLists.txt [iso-8859-1] Sun Dec 25 18:25:18 2011 @@ -4,6 +4,7 @@ add_subdirectory(bus) add_subdirectory(directx) add_subdirectory(filesystems) +add_subdirectory(hid) add_subdirectory(input) add_subdirectory(ksfilter) add_subdirectory(network) Added: branches/usb-bringup/drivers/hid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/CMakeLi… ============================================================================== --- branches/usb-bringup/drivers/hid/CMakeLists.txt (added) +++ branches/usb-bringup/drivers/hid/CMakeLists.txt [iso-8859-1] Sun Dec 25 18:25:18 2011 @@ -1,0 +1,2 @@ +add_subdirectory(hidparse) +add_subdirectory(hidusb) Propchange: branches/usb-bringup/drivers/hid/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/usb-bringup/drivers/usb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/CMakeLi… ============================================================================== --- branches/usb-bringup/drivers/usb/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/CMakeLists.txt [iso-8859-1] Sun Dec 25 18:25:18 2011 @@ -1,4 +1,3 @@ -add_subdirectory(hidparse) add_subdirectory(nt4compat) add_subdirectory(usbd) add_subdirectory(usbehci_new) Removed: branches/usb-bringup/drivers/usb/hidparse/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/hidpars… ============================================================================== --- branches/usb-bringup/drivers/usb/hidparse/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/hidparse/CMakeLists.txt (removed) @@ -1,14 +1,0 @@ - -spec2def(hidparse.sys hidparse.spec) -add_definitions(-DDEBUG_MODE) - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -add_library(hidparse SHARED hidparse.c hidparse.rc ${CMAKE_CURRENT_BINARY_DIR}/hidparse.def) - -set_module_type(hidparse kernelmodedriver) -add_importlibs(hidparse ntoskrnl) -add_cab_target(hidparse 2) - -add_cab_target(hidparse 2) -add_importlib_target(hidparse.spec) Removed: branches/usb-bringup/drivers/usb/hidparse/hidparse.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/hidpars… ============================================================================== --- branches/usb-bringup/drivers/usb/hidparse/hidparse.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/hidparse/hidparse.c (removed) @@ -1,727 +1,0 @@ -/* - * PROJECT: ReactOS Universal Serial Bus Bulk Enhanced Host Controller Interface - * LICENSE: GPL - See COPYING in the top level directory - * FILE: drivers/usb/hidparse/hidparse.c - * PURPOSE: HID Parser - * PROGRAMMERS: - * Michael Martin (michael.martin(a)reactos.org) - * Johannes Anderwald (johannes.anderwald(a)reactos.org) - */ - -#include "hidparse.h" - - -VOID -NTAPI -HidP_FreeCollectionDescription ( - IN PHIDP_DEVICE_DESC DeviceDescription) -{ - DPRINT1("HidP_FreeCollectionDescription DeviceDescription %p\n", DeviceDescription); - - // - // free collection - // - ExFreePool(DeviceDescription->CollectionDesc); - - // - // free report ids - // - ExFreePool(DeviceDescription->ReportIDs); -} - -#undef HidP_GetButtonCaps - -HIDAPI -NTSTATUS -NTAPI -HidP_GetButtonCaps( - HIDP_REPORT_TYPE ReportType, - PHIDP_BUTTON_CAPS ButtonCaps, - PUSHORT ButtonCapsLength, - PHIDP_PREPARSED_DATA PreparsedData) -{ - return HidP_GetSpecificButtonCaps(ReportType, HID_USAGE_PAGE_UNDEFINED, 0, 0, ButtonCaps, (PULONG)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 PHIDP_PREPARSED_DATA PreparsedData) -{ - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; -} - - -HIDAPI -NTSTATUS -NTAPI -HidP_GetCaps( - IN PHIDP_PREPARSED_DATA PreparsedData, - OUT PHIDP_CAPS Capabilities) -{ - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -HidP_GetCollectionDescription( - IN PHIDP_REPORT_DESCRIPTOR ReportDesc, - IN ULONG DescLength, - IN POOL_TYPE PoolType, - OUT PHIDP_DEVICE_DESC DeviceDescription) -{ - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; -} - -HIDAPI -NTSTATUS -NTAPI -HidP_GetData( - IN HIDP_REPORT_TYPE ReportType, - OUT PHIDP_DATA DataList, - IN OUT PULONG DataLength, - IN PHIDP_PREPARSED_DATA PreparsedData, - IN PCHAR Report, - IN ULONG ReportLength) -{ - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; -} - -HIDAPI -NTSTATUS -NTAPI -HidP_GetExtendedAttributes( - IN HIDP_REPORT_TYPE ReportType, - IN USHORT DataIndex, - IN PHIDP_PREPARSED_DATA PreparsedData, - OUT PHIDP_EXTENDED_ATTRIBUTES Attributes, - IN OUT PULONG LengthAttributes) -{ - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; -} - -HIDAPI -NTSTATUS -NTAPI -HidP_GetLinkCollectionNodes( - OUT PHIDP_LINK_COLLECTION_NODE LinkCollectionNodes, - IN OUT PULONG LinkCollectionNodesLength, - IN PHIDP_PREPARSED_DATA PreparsedData) -{ - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; -} - -HIDAPI -NTSTATUS -NTAPI -HidP_GetScaledUsageValue( - IN HIDP_REPORT_TYPE ReportType, - IN USAGE UsagePage, - IN USHORT LinkCollection OPTIONAL, - IN USAGE Usage, - OUT PLONG UsageValue, - IN PHIDP_PREPARSED_DATA PreparsedData, - IN PCHAR Report, - IN ULONG ReportLength) -{ - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; -} - -HIDAPI -NTSTATUS -NTAPI -HidP_GetUsageValue( - IN HIDP_REPORT_TYPE ReportType, - IN USAGE UsagePage, - IN USHORT LinkCollection, - IN USAGE Usage, - OUT PULONG UsageValue, - IN PHIDP_PREPARSED_DATA PreparsedData, - IN PCHAR Report, - IN ULONG ReportLength) -{ - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; -} - - - -HIDAPI -NTSTATUS -NTAPI -HidP_UsageListDifference( - IN PUSAGE PreviousUsageList, - IN PUSAGE CurrentUsageList, - OUT PUSAGE BreakUsageList, - OUT PUSAGE MakeUsageList, - IN ULONG UsageListLength) -{ - ULONG Index, SubIndex, bFound, BreakUsageIndex = 0, MakeUsageIndex = 0; - USAGE CurrentUsage, Usage; - - if (UsageListLength) - { - Index = 0; - do - { - /* get current usage */ - CurrentUsage = PreviousUsageList[Index]; - - /* is the end of list reached? */ - if (!CurrentUsage) - break; - - /* start searching in current usage list */ - SubIndex = 0; - bFound = FALSE; - do - { - /* get usage of current list */ - Usage = CurrentUsageList[SubIndex]; - - /* end of list reached? */ - if (!Usage) - break; - - /* check if it matches the current one */ - if (CurrentUsage == Usage) - { - /* it does */ - bFound = TRUE; - break; - } - - /* move to next usage */ - SubIndex++; - }while(SubIndex < UsageListLength); - - /* was the usage found ?*/ - if (!bFound) - { - /* store it in the break usage list */ - BreakUsageList[BreakUsageIndex] = CurrentUsage; - BreakUsageIndex++; - } - - /* move to next usage */ - Index++; - - }while(Index < UsageListLength); - - /* now process the new items */ - Index = 0; - do - { - /* get current usage */ - CurrentUsage = CurrentUsageList[Index]; - - /* is the end of list reached? */ - if (!CurrentUsage) - break; - - /* start searching in current usage list */ - SubIndex = 0; - bFound = FALSE; - do - { - /* get usage of previous list */ - Usage = PreviousUsageList[SubIndex]; - - /* end of list reached? */ - if (!Usage) - break; - - /* check if it matches the current one */ - if (CurrentUsage == Usage) - { - /* it does */ - bFound = TRUE; - break; - } - - /* move to next usage */ - SubIndex++; - }while(SubIndex < UsageListLength); - - /* was the usage found ?*/ - if (!bFound) - { - /* store it in the make usage list */ - MakeUsageList[MakeUsageIndex] = CurrentUsage; - MakeUsageIndex++; - } - - /* move to next usage */ - Index++; - - }while(Index < UsageListLength); - } - - /* does the break list contain empty entries */ - if (BreakUsageIndex < UsageListLength) - { - /* zeroize entries */ - RtlZeroMemory(&BreakUsageList[BreakUsageIndex], sizeof(USAGE) * (UsageListLength - BreakUsageIndex)); - } - - /* does the make usage list contain empty entries */ - if (MakeUsageIndex < UsageListLength) - { - /* zeroize entries */ - RtlZeroMemory(&MakeUsageList[MakeUsageIndex], sizeof(USAGE) * (UsageListLength - MakeUsageIndex)); - } - - /* done */ - return HIDP_STATUS_SUCCESS; -} - -HIDAPI -NTSTATUS -NTAPI -HidP_GetSpecificValueCaps( - IN HIDP_REPORT_TYPE ReportType, - IN USAGE UsagePage, - IN USHORT LinkCollection, - IN USAGE Usage, - OUT PHIDP_VALUE_CAPS ValueCaps, - IN OUT PULONG ValueCapsLength, - IN PHIDP_PREPARSED_DATA PreparsedData) -{ - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; -} - -HIDAPI -ULONG -NTAPI -HidP_MaxUsageListLength( - IN HIDP_REPORT_TYPE ReportType, - IN USAGE UsagePage OPTIONAL, - IN PHIDP_PREPARSED_DATA PreparsedData) -{ - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; -} - -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 PHIDP_PREPARSED_DATA PreparsedData, - IN PCHAR Report, - IN ULONG ReportLength) -{ - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -HidP_SysPowerEvent ( - IN PCHAR HidPacket, - IN USHORT HidPacketLength, - IN PHIDP_PREPARSED_DATA Ppd, - OUT PULONG OutputBuffer) -{ - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -HidP_SysPowerCaps ( - IN PHIDP_PREPARSED_DATA Ppd, - OUT PULONG OutputBuffer) -{ - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; -} - -HIDAPI -NTSTATUS -NTAPI -HidP_GetUsageValueArray( - IN HIDP_REPORT_TYPE ReportType, - IN USAGE UsagePage, - IN USHORT LinkCollection OPTIONAL, - IN USAGE Usage, - OUT PCHAR UsageValue, - IN USHORT UsageValueByteLength, - IN PHIDP_PREPARSED_DATA PreparsedData, - IN PCHAR Report, - IN ULONG ReportLength) -{ - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; -} - -HIDAPI -NTSTATUS -NTAPI -HidP_GetUsagesEx( - IN HIDP_REPORT_TYPE ReportType, - IN USHORT LinkCollection, - OUT PUSAGE_AND_PAGE ButtonList, - IN OUT ULONG *UsageLength, - IN PHIDP_PREPARSED_DATA PreparsedData, - IN PCHAR Report, - IN ULONG ReportLength) -{ - return HidP_GetUsages(ReportType, HID_USAGE_PAGE_UNDEFINED, LinkCollection, (PUSAGE)ButtonList, UsageLength, PreparsedData, Report, ReportLength); -} - - -HIDAPI -NTSTATUS -NTAPI -HidP_UsageAndPageListDifference( - IN PUSAGE_AND_PAGE PreviousUsageList, - IN PUSAGE_AND_PAGE CurrentUsageList, - OUT PUSAGE_AND_PAGE BreakUsageList, - OUT PUSAGE_AND_PAGE MakeUsageList, - IN ULONG UsageListLength) -{ - ULONG Index, SubIndex, BreakUsageListIndex = 0, MakeUsageListIndex = 0, bFound; - PUSAGE_AND_PAGE CurrentUsage, Usage; - - if (UsageListLength) - { - /* process removed usages */ - Index = 0; - do - { - /* get usage from current index */ - CurrentUsage = &PreviousUsageList[Index]; - - /* end of list reached? */ - if (CurrentUsage->Usage == 0 && CurrentUsage->UsagePage == 0) - break; - - /* search in current list */ - SubIndex = 0; - bFound = FALSE; - do - { - /* get usage */ - Usage = &CurrentUsageList[SubIndex]; - - /* end of list reached? */ - if (Usage->Usage == 0 && Usage->UsagePage == 0) - break; - - /* does it match */ - if (Usage->Usage == CurrentUsage->Usage && Usage->UsagePage == CurrentUsage->UsagePage) - { - /* found match */ - bFound = TRUE; - } - - /* move to next index */ - SubIndex++; - - }while(SubIndex < UsageListLength); - - if (!bFound) - { - /* store it in break usage list */ - BreakUsageList[BreakUsageListIndex].Usage = CurrentUsage->Usage; - BreakUsageList[BreakUsageListIndex].UsagePage = CurrentUsage->UsagePage; - BreakUsageListIndex++; - } - - /* move to next index */ - Index++; - - }while(Index < UsageListLength); - - /* process new usages */ - Index = 0; - do - { - /* get usage from current index */ - CurrentUsage = &CurrentUsageList[Index]; - - /* end of list reached? */ - if (CurrentUsage->Usage == 0 && CurrentUsage->UsagePage == 0) - break; - - /* search in current list */ - SubIndex = 0; - bFound = FALSE; - do - { - /* get usage */ - Usage = &PreviousUsageList[SubIndex]; - - /* end of list reached? */ - if (Usage->Usage == 0 && Usage->UsagePage == 0) - break; - - /* does it match */ - if (Usage->Usage == CurrentUsage->Usage && Usage->UsagePage == CurrentUsage->UsagePage) - { - /* found match */ - bFound = TRUE; - } - - /* move to next index */ - SubIndex++; - - }while(SubIndex < UsageListLength); - - if (!bFound) - { - /* store it in break usage list */ - MakeUsageList[MakeUsageListIndex].Usage = CurrentUsage->Usage; - MakeUsageList[MakeUsageListIndex].UsagePage = CurrentUsage->UsagePage; - MakeUsageListIndex++; - } - - /* move to next index */ - Index++; - }while(Index < UsageListLength); - } - - /* are there remaining free list entries */ - if (BreakUsageListIndex < UsageListLength) - { - /* zero them */ - RtlZeroMemory(&BreakUsageList[BreakUsageListIndex], (UsageListLength - BreakUsageListIndex) * sizeof(USAGE_AND_PAGE)); - } - - /* are there remaining free list entries */ - if (MakeUsageListIndex < UsageListLength) - { - /* zero them */ - RtlZeroMemory(&MakeUsageList[MakeUsageListIndex], (UsageListLength - MakeUsageListIndex) * sizeof(USAGE_AND_PAGE)); - } - - /* done */ - return HIDP_STATUS_SUCCESS; -} - -HIDAPI -NTSTATUS -NTAPI -HidP_UnsetUsages( - IN HIDP_REPORT_TYPE ReportType, - IN USAGE UsagePage, - IN USHORT LinkCollection, - IN PUSAGE UsageList, - IN OUT PULONG UsageLength, - IN PHIDP_PREPARSED_DATA PreparsedData, - IN OUT PCHAR Report, - IN ULONG ReportLength) -{ - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; -} - -HIDAPI -NTSTATUS -NTAPI -HidP_TranslateUsagesToI8042ScanCodes( - IN PUSAGE ChangedUsageList, - IN ULONG UsageListLength, - IN HIDP_KEYBOARD_DIRECTION KeyAction, - IN OUT PHIDP_KEYBOARD_MODIFIER_STATE ModifierState, - IN PHIDP_INSERT_SCANCODES InsertCodesProcedure, - IN PVOID InsertCodesContext) -{ - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; -} - -HIDAPI -NTSTATUS -NTAPI -HidP_TranslateUsageAndPagesToI8042ScanCodes( - IN PUSAGE_AND_PAGE ChangedUsageList, - IN ULONG UsageListLength, - IN HIDP_KEYBOARD_DIRECTION KeyAction, - IN OUT PHIDP_KEYBOARD_MODIFIER_STATE ModifierState, - IN PHIDP_INSERT_SCANCODES InsertCodesProcedure, - IN PVOID InsertCodesContext) -{ - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; -} - -HIDAPI -NTSTATUS -NTAPI -HidP_SetUsages( - IN HIDP_REPORT_TYPE ReportType, - IN USAGE UsagePage, - IN USHORT LinkCollection, - IN PUSAGE UsageList, - IN OUT PULONG UsageLength, - IN PHIDP_PREPARSED_DATA PreparsedData, - IN OUT PCHAR Report, - IN ULONG ReportLength) -{ - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; -} - -HIDAPI -NTSTATUS -NTAPI -HidP_SetUsageValueArray( - IN HIDP_REPORT_TYPE ReportType, - IN USAGE UsagePage, - IN USHORT LinkCollection OPTIONAL, - IN USAGE Usage, - IN PCHAR UsageValue, - IN USHORT UsageValueByteLength, - IN PHIDP_PREPARSED_DATA PreparsedData, - OUT PCHAR Report, - IN ULONG ReportLength) -{ - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; -} - -HIDAPI -NTSTATUS -NTAPI -HidP_SetUsageValue( - IN HIDP_REPORT_TYPE ReportType, - IN USAGE UsagePage, - IN USHORT LinkCollection, - IN USAGE Usage, - IN ULONG UsageValue, - IN PHIDP_PREPARSED_DATA PreparsedData, - IN OUT PCHAR Report, - IN ULONG ReportLength) -{ - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; -} - -HIDAPI -NTSTATUS -NTAPI -HidP_SetScaledUsageValue( - IN HIDP_REPORT_TYPE ReportType, - IN USAGE UsagePage, - IN USHORT LinkCollection OPTIONAL, - IN USAGE Usage, - IN LONG UsageValue, - IN PHIDP_PREPARSED_DATA PreparsedData, - IN OUT PCHAR Report, - IN ULONG ReportLength) -{ - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; -} - -HIDAPI -NTSTATUS -NTAPI -HidP_SetData( - IN HIDP_REPORT_TYPE ReportType, - IN PHIDP_DATA DataList, - IN OUT PULONG DataLength, - IN PHIDP_PREPARSED_DATA PreparsedData, - IN OUT PCHAR Report, - IN ULONG ReportLength) -{ - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; -} - -HIDAPI -ULONG -NTAPI -HidP_MaxDataListLength( - IN HIDP_REPORT_TYPE ReportType, - IN PHIDP_PREPARSED_DATA PreparsedData) -{ - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; -} - -HIDAPI -NTSTATUS -NTAPI -HidP_InitializeReportForID( - IN HIDP_REPORT_TYPE ReportType, - IN UCHAR ReportID, - IN PHIDP_PREPARSED_DATA PreparsedData, - IN OUT PCHAR Report, - IN ULONG ReportLength) -{ - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; -} - -#undef HidP_GetValueCaps - -HIDAPI -NTSTATUS -NTAPI -HidP_GetValueCaps( - HIDP_REPORT_TYPE ReportType, - PHIDP_VALUE_CAPS ValueCaps, - PULONG ValueCapsLength, - PHIDP_PREPARSED_DATA PreparsedData) -{ - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -DriverEntry( - IN PDRIVER_OBJECT DriverObject, - IN PUNICODE_STRING RegPath) -{ - - DPRINT1("********* HID PARSE *********\n"); - return STATUS_SUCCESS; -} Removed: branches/usb-bringup/drivers/usb/hidparse/hidparse.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/hidpars… ============================================================================== --- branches/usb-bringup/drivers/usb/hidparse/hidparse.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/hidparse/hidparse.h (removed) @@ -1,8 +1,0 @@ -#pragma once - -#define _HIDPI_ -#define _HIDPI_NO_FUNCTION_MACROS_ -#include <ntddk.h> -#include <hidpddi.h> -#include <hidpi.h> -#include <debug.h> Removed: branches/usb-bringup/drivers/usb/hidparse/hidparse.rc URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/hidpars… ============================================================================== --- branches/usb-bringup/drivers/usb/hidparse/hidparse.rc [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/hidparse/hidparse.rc (removed) @@ -1,5 +1,0 @@ -#define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "USB HID Parser\0" -#define REACTOS_STR_INTERNAL_NAME "hidparse\0" -#define REACTOS_STR_ORIGINAL_FILENAME "hidparse.sys\0" -#include <reactos/version.rc> Removed: branches/usb-bringup/drivers/usb/hidparse/hidparse.spec URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/hidpars… ============================================================================== --- branches/usb-bringup/drivers/usb/hidparse/hidparse.spec [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/hidparse/hidparse.spec (removed) @@ -1,53 +1,0 @@ -@ stdcall HidP_FreeCollectionDescription(ptr) -@ stdcall HidP_GetButtonCaps(long ptr ptr ptr) -@ stdcall HidP_GetCaps(ptr ptr) -@ stdcall HidP_GetCollectionDescription(ptr long long ptr) -@ stdcall HidP_GetData(long ptr ptr ptr ptr long) -@ stdcall HidP_GetExtendedAttributes(long long ptr ptr long) -@ stdcall HidP_GetLinkCollectionNodes(ptr ptr ptr) -@ stdcall HidP_GetScaledUsageValue(long long long long ptr ptr ptr long) -@ stdcall HidP_GetSpecificButtonCaps(long long long long ptr ptr ptr) -@ stdcall HidP_GetSpecificValueCaps(long long long long ptr ptr ptr) -@ stdcall HidP_GetUsageValue(long long long long ptr ptr ptr long) -@ stdcall HidP_GetUsageValueArray(long long long long ptr long ptr ptr long) -@ stdcall HidP_GetUsages(long long long ptr ptr ptr ptr long) -@ stdcall HidP_GetUsagesEx(long long ptr ptr ptr ptr long) -@ stdcall HidP_GetValueCaps(long ptr ptr ptr) -@ stdcall HidP_InitializeReportForID(long long ptr ptr long) -@ stdcall HidP_MaxDataListLength(long ptr) -@ stdcall HidP_MaxUsageListLength(long long ptr) -@ stdcall HidP_SetData(long ptr ptr ptr ptr long) -@ stdcall HidP_SetScaledUsageValue(long long long long long ptr ptr long) -@ stdcall HidP_SetUsageValue(long long long long long ptr ptr long) -@ stdcall HidP_SetUsageValueArray(long long long long ptr long long ptr long) -@ stdcall HidP_SetUsages(long long long ptr ptr ptr ptr long) -@ stdcall HidP_SysPowerCaps(ptr ptr) -@ stdcall HidP_SysPowerEvent(ptr long ptr ptr) -@ stdcall HidP_TranslateUsageAndPagesToI8042ScanCodes(ptr long long ptr ptr ptr) -@ stdcall HidP_TranslateUsagesToI8042ScanCodes(ptr long long ptr ptr ptr) -@ stdcall HidP_UnsetUsages(long long long ptr ptr ptr ptr long) -@ stdcall HidP_UsageAndPageListDifference(ptr ptr ptr ptr long) -@ stdcall HidP_UsageListDifference(ptr ptr ptr ptr long) - - - - - - - - - - - - - - - - - - - - - - -

1 0

[janderwald] 54756: - rearrange hid stack
by janderwald＠svn.reactos.org 25 Dec '11

25 Dec '11

Author: janderwald Date: Sun Dec 25 18:23:22 2011 New Revision: 54756 URL: http://svn.reactos.org/svn/reactos?rev=54756&view=rev Log: - rearrange hid stack Added: branches/usb-bringup/drivers/hid/hidparse/ (props changed) - copied from r54755, branches/usb-bringup/drivers/usb/hidparse/ Propchange: branches/usb-bringup/drivers/hid/hidparse/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Dec 25 18:23:22 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/usb-bringup/drivers/hid/hidparse/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/usb-bringup/drivers/hid/hidparse/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/usb-bringup/drivers/hid/hidparse/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Sun Dec 25 18:23:22 2011 @@ -1,0 +1,6 @@ +/branches/header-work/drivers/usb/hidparse:45691-47721 +/branches/reactos-yarotows/drivers/usb/hidparse:45219-46371,46373-48025,48027-49273 +/branches/reactx/reactos/drivers/usb/hidparse:49994-49995 +/branches/ros-amd64-bringup/drivers/usb/hidparse:36852 +/branches/ros-amd64-bringup/reactos/drivers/usb/hidparse:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 +/trunk/reactos/drivers/usb/hidparse:48236-51323 Propchange: branches/usb-bringup/drivers/hid/hidparse/ ------------------------------------------------------------------------------ tsvn:logminsize = 10

1 0

[tfaber] 54755: [NTOSKRNL/FORMATTING] - Trim trailing whitespace and get rid of tabs in Mm
by tfaber＠svn.reactos.org 25 Dec '11

25 Dec '11

Author: tfaber Date: Sun Dec 25 18:21:05 2011 New Revision: 54755 URL: http://svn.reactos.org/svn/reactos?rev=54755&view=rev Log: [NTOSKRNL/FORMATTING] - Trim trailing whitespace and get rid of tabs in Mm Modified: trunk/reactos/ntoskrnl/mm/ARM3/drvmgmt.c trunk/reactos/ntoskrnl/mm/ARM3/expool.c trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c trunk/reactos/ntoskrnl/mm/ARM3/pool.c trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c trunk/reactos/ntoskrnl/mm/anonmem.c trunk/reactos/ntoskrnl/mm/arm/stubs.c trunk/reactos/ntoskrnl/mm/freelist.c trunk/reactos/ntoskrnl/mm/i386/page.c trunk/reactos/ntoskrnl/mm/i386/pagepae.c trunk/reactos/ntoskrnl/mm/marea.c trunk/reactos/ntoskrnl/mm/mmfault.c trunk/reactos/ntoskrnl/mm/mminit.c trunk/reactos/ntoskrnl/mm/pagefile.c trunk/reactos/ntoskrnl/mm/pageop.c trunk/reactos/ntoskrnl/mm/powerpc/page.c trunk/reactos/ntoskrnl/mm/powerpc/pfault.c trunk/reactos/ntoskrnl/mm/rmap.c trunk/reactos/ntoskrnl/mm/section.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/ntoskrnl/mm/ARM3/drvmgmt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/drvmgmt.c… Modified: trunk/reactos/ntoskrnl/mm/ARM3/expool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/expool.c?… Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c… Modified: trunk/reactos/ntoskrnl/mm/ARM3/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pool.c?re… Modified: trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c?… Modified: trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c… Modified: trunk/reactos/ntoskrnl/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/anonmem.c?rev=… Modified: trunk/reactos/ntoskrnl/mm/arm/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/arm/stubs.c?re… Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… Modified: trunk/reactos/ntoskrnl/mm/i386/pagepae.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/pagepae.c… Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=54… Modified: trunk/reactos/ntoskrnl/mm/mmfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mmfault.c?rev=… Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=5… Modified: trunk/reactos/ntoskrnl/mm/pagefile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pagefile.c?rev… Modified: trunk/reactos/ntoskrnl/mm/pageop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pageop.c?rev=5… Modified: trunk/reactos/ntoskrnl/mm/powerpc/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/powerpc/page.c… Modified: trunk/reactos/ntoskrnl/mm/powerpc/pfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/powerpc/pfault… Modified: trunk/reactos/ntoskrnl/mm/rmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/rmap.c?rev=547… Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=…

1 0

[janderwald] 54754: - rearrange hid stack
by janderwald＠svn.reactos.org 25 Dec '11

25 Dec '11

Author: janderwald Date: Sun Dec 25 18:17:07 2011 New Revision: 54754 URL: http://svn.reactos.org/svn/reactos?rev=54754&view=rev Log: - rearrange hid stack Added: branches/usb-bringup/drivers/hid/hidusb/ (props changed) - copied from r54753, branches/usb-bringup/drivers/usb/hidusb/ Propchange: branches/usb-bringup/drivers/hid/hidusb/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Dec 25 18:17:07 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/usb-bringup/drivers/hid/hidusb/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/usb-bringup/drivers/hid/hidusb/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/usb-bringup/drivers/hid/hidusb/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Sun Dec 25 18:17:07 2011 @@ -1,0 +1,6 @@ +/branches/header-work/drivers/usb/hidusb:45691-47721 +/branches/reactos-yarotows/drivers/usb/hidusb:45219-46371,46373-48025,48027-49273 +/branches/reactx/reactos/drivers/usb/hidusb:49994-49995 +/branches/ros-amd64-bringup/drivers/usb/hidusb:36852 +/branches/ros-amd64-bringup/reactos/drivers/usb/hidusb:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 +/trunk/reactos/drivers/usb/hidusb:48236-51323 Propchange: branches/usb-bringup/drivers/hid/hidusb/ ------------------------------------------------------------------------------ tsvn:logminsize = 10

1 0

[janderwald] 54753: - add directory for hid stack
by janderwald＠svn.reactos.org 25 Dec '11

25 Dec '11

Author: janderwald Date: Sun Dec 25 18:16:35 2011 New Revision: 54753 URL: http://svn.reactos.org/svn/reactos?rev=54753&view=rev Log: - add directory for hid stack Added: branches/usb-bringup/drivers/hid/ (with props) Propchange: branches/usb-bringup/drivers/hid/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Dec 25 18:16:35 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/usb-bringup/drivers/hid/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/usb-bringup/drivers/hid/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/usb-bringup/drivers/hid/ ------------------------------------------------------------------------------ tsvn:logminsize = 10

1 0

[janderwald] 54752: [USB-BRINGUP] - Implement HidP_UsageListDifference, HidP_GetUsagesEx, HidP_UsageAndPageListDifference - Fix api prototypes - Fix HidP_GetUsages linking
by janderwald＠svn.reactos.org 25 Dec '11

25 Dec '11

Author: janderwald Date: Sun Dec 25 17:09:09 2011 New Revision: 54752 URL: http://svn.reactos.org/svn/reactos?rev=54752&view=rev Log: [USB-BRINGUP] - Implement HidP_UsageListDifference, HidP_GetUsagesEx, HidP_UsageAndPageListDifference - Fix api prototypes - Fix HidP_GetUsages linking Modified: branches/usb-bringup/drivers/usb/hidparse/hidparse.c branches/usb-bringup/drivers/usb/hidparse/hidparse.spec branches/usb-bringup/include/ddk/hidpddi.h Modified: branches/usb-bringup/drivers/usb/hidparse/hidparse.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/hidpars… ============================================================================== --- branches/usb-bringup/drivers/usb/hidparse/hidparse.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/hidparse/hidparse.c [iso-8859-1] Sun Dec 25 17:09:09 2011 @@ -12,6 +12,7 @@ VOID +NTAPI HidP_FreeCollectionDescription ( IN PHIDP_DEVICE_DESC DeviceDescription) { @@ -26,13 +27,9 @@ // free report ids // ExFreePool(DeviceDescription->ReportIDs); - - // - // free description itself - // - ExFreePool(DeviceDescription); - -} +} + +#undef HidP_GetButtonCaps HIDAPI NTSTATUS @@ -43,7 +40,7 @@ PUSHORT ButtonCapsLength, PHIDP_PREPARSED_DATA PreparsedData) { - return HidP_GetSpecificButtonCaps(ReportType, 0, 0, 0, ButtonCaps, (PULONG)ButtonCapsLength, PreparsedData); + return HidP_GetSpecificButtonCaps(ReportType, HID_USAGE_PAGE_UNDEFINED, 0, 0, ButtonCaps, (PULONG)ButtonCapsLength, PreparsedData); } HIDAPI @@ -77,6 +74,7 @@ } NTSTATUS +NTAPI HidP_GetCollectionDescription( IN PHIDP_REPORT_DESCRIPTOR ReportDesc, IN ULONG DescLength, @@ -180,9 +178,123 @@ OUT PUSAGE MakeUsageList, IN ULONG UsageListLength) { - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; + ULONG Index, SubIndex, bFound, BreakUsageIndex = 0, MakeUsageIndex = 0; + USAGE CurrentUsage, Usage; + + if (UsageListLength) + { + Index = 0; + do + { + /* get current usage */ + CurrentUsage = PreviousUsageList[Index]; + + /* is the end of list reached? */ + if (!CurrentUsage) + break; + + /* start searching in current usage list */ + SubIndex = 0; + bFound = FALSE; + do + { + /* get usage of current list */ + Usage = CurrentUsageList[SubIndex]; + + /* end of list reached? */ + if (!Usage) + break; + + /* check if it matches the current one */ + if (CurrentUsage == Usage) + { + /* it does */ + bFound = TRUE; + break; + } + + /* move to next usage */ + SubIndex++; + }while(SubIndex < UsageListLength); + + /* was the usage found ?*/ + if (!bFound) + { + /* store it in the break usage list */ + BreakUsageList[BreakUsageIndex] = CurrentUsage; + BreakUsageIndex++; + } + + /* move to next usage */ + Index++; + + }while(Index < UsageListLength); + + /* now process the new items */ + Index = 0; + do + { + /* get current usage */ + CurrentUsage = CurrentUsageList[Index]; + + /* is the end of list reached? */ + if (!CurrentUsage) + break; + + /* start searching in current usage list */ + SubIndex = 0; + bFound = FALSE; + do + { + /* get usage of previous list */ + Usage = PreviousUsageList[SubIndex]; + + /* end of list reached? */ + if (!Usage) + break; + + /* check if it matches the current one */ + if (CurrentUsage == Usage) + { + /* it does */ + bFound = TRUE; + break; + } + + /* move to next usage */ + SubIndex++; + }while(SubIndex < UsageListLength); + + /* was the usage found ?*/ + if (!bFound) + { + /* store it in the make usage list */ + MakeUsageList[MakeUsageIndex] = CurrentUsage; + MakeUsageIndex++; + } + + /* move to next usage */ + Index++; + + }while(Index < UsageListLength); + } + + /* does the break list contain empty entries */ + if (BreakUsageIndex < UsageListLength) + { + /* zeroize entries */ + RtlZeroMemory(&BreakUsageList[BreakUsageIndex], sizeof(USAGE) * (UsageListLength - BreakUsageIndex)); + } + + /* does the make usage list contain empty entries */ + if (MakeUsageIndex < UsageListLength) + { + /* zeroize entries */ + RtlZeroMemory(&MakeUsageList[MakeUsageIndex], sizeof(USAGE) * (UsageListLength - MakeUsageIndex)); + } + + /* done */ + return HIDP_STATUS_SUCCESS; } HIDAPI @@ -234,6 +346,7 @@ } NTSTATUS +NTAPI HidP_SysPowerEvent ( IN PCHAR HidPacket, IN USHORT HidPacketLength, @@ -246,6 +359,7 @@ } NTSTATUS +NTAPI HidP_SysPowerCaps ( IN PHIDP_PREPARSED_DATA Ppd, OUT PULONG OutputBuffer) @@ -286,9 +400,7 @@ IN PCHAR Report, IN ULONG ReportLength) { - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; + return HidP_GetUsages(ReportType, HID_USAGE_PAGE_UNDEFINED, LinkCollection, (PUSAGE)ButtonList, UsageLength, PreparsedData, Report, ReportLength); } @@ -302,9 +414,123 @@ OUT PUSAGE_AND_PAGE MakeUsageList, IN ULONG UsageListLength) { - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; + ULONG Index, SubIndex, BreakUsageListIndex = 0, MakeUsageListIndex = 0, bFound; + PUSAGE_AND_PAGE CurrentUsage, Usage; + + if (UsageListLength) + { + /* process removed usages */ + Index = 0; + do + { + /* get usage from current index */ + CurrentUsage = &PreviousUsageList[Index]; + + /* end of list reached? */ + if (CurrentUsage->Usage == 0 && CurrentUsage->UsagePage == 0) + break; + + /* search in current list */ + SubIndex = 0; + bFound = FALSE; + do + { + /* get usage */ + Usage = &CurrentUsageList[SubIndex]; + + /* end of list reached? */ + if (Usage->Usage == 0 && Usage->UsagePage == 0) + break; + + /* does it match */ + if (Usage->Usage == CurrentUsage->Usage && Usage->UsagePage == CurrentUsage->UsagePage) + { + /* found match */ + bFound = TRUE; + } + + /* move to next index */ + SubIndex++; + + }while(SubIndex < UsageListLength); + + if (!bFound) + { + /* store it in break usage list */ + BreakUsageList[BreakUsageListIndex].Usage = CurrentUsage->Usage; + BreakUsageList[BreakUsageListIndex].UsagePage = CurrentUsage->UsagePage; + BreakUsageListIndex++; + } + + /* move to next index */ + Index++; + + }while(Index < UsageListLength); + + /* process new usages */ + Index = 0; + do + { + /* get usage from current index */ + CurrentUsage = &CurrentUsageList[Index]; + + /* end of list reached? */ + if (CurrentUsage->Usage == 0 && CurrentUsage->UsagePage == 0) + break; + + /* search in current list */ + SubIndex = 0; + bFound = FALSE; + do + { + /* get usage */ + Usage = &PreviousUsageList[SubIndex]; + + /* end of list reached? */ + if (Usage->Usage == 0 && Usage->UsagePage == 0) + break; + + /* does it match */ + if (Usage->Usage == CurrentUsage->Usage && Usage->UsagePage == CurrentUsage->UsagePage) + { + /* found match */ + bFound = TRUE; + } + + /* move to next index */ + SubIndex++; + + }while(SubIndex < UsageListLength); + + if (!bFound) + { + /* store it in break usage list */ + MakeUsageList[MakeUsageListIndex].Usage = CurrentUsage->Usage; + MakeUsageList[MakeUsageListIndex].UsagePage = CurrentUsage->UsagePage; + MakeUsageListIndex++; + } + + /* move to next index */ + Index++; + }while(Index < UsageListLength); + } + + /* are there remaining free list entries */ + if (BreakUsageListIndex < UsageListLength) + { + /* zero them */ + RtlZeroMemory(&BreakUsageList[BreakUsageListIndex], (UsageListLength - BreakUsageListIndex) * sizeof(USAGE_AND_PAGE)); + } + + /* are there remaining free list entries */ + if (MakeUsageListIndex < UsageListLength) + { + /* zero them */ + RtlZeroMemory(&MakeUsageList[MakeUsageListIndex], (UsageListLength - MakeUsageListIndex) * sizeof(USAGE_AND_PAGE)); + } + + /* done */ + return HIDP_STATUS_SUCCESS; } HIDAPI @@ -473,6 +699,8 @@ return STATUS_NOT_IMPLEMENTED; } +#undef HidP_GetValueCaps + HIDAPI NTSTATUS NTAPI Modified: branches/usb-bringup/drivers/usb/hidparse/hidparse.spec URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/hidpars… ============================================================================== --- branches/usb-bringup/drivers/usb/hidparse/hidparse.spec [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/hidparse/hidparse.spec [iso-8859-1] Sun Dec 25 17:09:09 2011 @@ -10,7 +10,7 @@ @ stdcall HidP_GetSpecificValueCaps(long long long long ptr ptr ptr) @ stdcall HidP_GetUsageValue(long long long long ptr ptr ptr long) @ stdcall HidP_GetUsageValueArray(long long long long ptr long ptr ptr long) -@ stdcall HidP_GetUsages(long long ptr ptr ptr ptr long) +@ stdcall HidP_GetUsages(long long long ptr ptr ptr ptr long) @ stdcall HidP_GetUsagesEx(long long ptr ptr ptr ptr long) @ stdcall HidP_GetValueCaps(long ptr ptr ptr) @ stdcall HidP_InitializeReportForID(long long ptr ptr long) Modified: branches/usb-bringup/include/ddk/hidpddi.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/include/ddk/hidpddi… ============================================================================== --- branches/usb-bringup/include/ddk/hidpddi.h [iso-8859-1] (original) +++ branches/usb-bringup/include/ddk/hidpddi.h [iso-8859-1] Sun Dec 25 17:09:09 2011 @@ -52,11 +52,13 @@ ); VOID +NTAPI HidP_FreeCollectionDescription ( IN PHIDP_DEVICE_DESC DeviceDescription ); NTSTATUS +NTAPI HidP_SysPowerEvent ( IN PCHAR HidPacket, IN USHORT HidPacketLength, @@ -65,6 +67,7 @@ ); NTSTATUS +NTAPI HidP_SysPowerCaps ( IN PHIDP_PREPARSED_DATA Ppd, OUT PULONG OutputBuffer

1 0

[ekohl] 54751: [EVENTLOG] Partially revert r54678.
by ekohl＠svn.reactos.org 25 Dec '11

25 Dec '11

Author: ekohl Date: Sun Dec 25 00:57:16 2011 New Revision: 54751 URL: http://svn.reactos.org/svn/reactos?rev=54751&view=rev Log: [EVENTLOG] Partially revert r54678. Modified: trunk/reactos/base/services/eventlog/eventlog.c trunk/reactos/base/services/eventlog/eventlog.h trunk/reactos/base/services/eventlog/file.c trunk/reactos/base/services/eventlog/logport.c trunk/reactos/base/services/eventlog/rpc.c Modified: trunk/reactos/base/services/eventlog/eventlog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/eve… ============================================================================== --- trunk/reactos/base/services/eventlog/eventlog.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/eventlog.c [iso-8859-1] Sun Dec 25 00:57:16 2011 @@ -463,6 +463,20 @@ uUCT.ll = uUCT.ll * 10000000 + u1970.ll; FileTimeToLocalFileTime(&uUCT.ft, &ftLocal); FileTimeToSystemTime(&ftLocal, pSystemTime); +} + +VOID SystemTimeToEventTime(SYSTEMTIME * pSystemTime, DWORD * pEventTime) +{ + SYSTEMTIME st1970 = { 1970, 1, 0, 1, 0, 0, 0, 0 }; + union + { + FILETIME ft; + ULONGLONG ll; + } Time, u1970; + + SystemTimeToFileTime(pSystemTime, &Time.ft); + SystemTimeToFileTime(&st1970, &u1970.ft); + *pEventTime = (DWORD)((Time.ll - u1970.ll) / 10000000ull); } VOID PRINT_HEADER(PEVENTLOGHEADER header) Modified: trunk/reactos/base/services/eventlog/eventlog.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/eve… ============================================================================== --- trunk/reactos/base/services/eventlog/eventlog.h [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/eventlog.h [iso-8859-1] Sun Dec 25 00:57:16 2011 @@ -16,7 +16,6 @@ #include <windows.h> #include <netevent.h> #include <lpctypes.h> -#include <kefuncs.h> #include <lpcfuncs.h> #include <rtlfuncs.h> #include <obfuncs.h> @@ -169,7 +168,6 @@ PBYTE LogfAllocAndBuildNewRecord(LPDWORD lpRecSize, DWORD dwRecordNumber, - DWORD dwTime, WORD wType, WORD wCategory, DWORD dwEventId, @@ -201,6 +199,9 @@ VOID EventTimeToSystemTime(DWORD EventTime, SYSTEMTIME * SystemTime); +VOID SystemTimeToEventTime(SYSTEMTIME * pSystemTime, + DWORD * pEventTime); + /* eventsource.c */ VOID InitEventSourceList(VOID); Modified: trunk/reactos/base/services/eventlog/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/fil… ============================================================================== --- trunk/reactos/base/services/eventlog/file.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/file.c [iso-8859-1] Sun Dec 25 00:57:16 2011 @@ -870,18 +870,18 @@ { DWORD dwWritten; DWORD dwRead; + SYSTEMTIME st; EVENTLOGEOF EofRec; PEVENTLOGRECORD RecBuf; LARGE_INTEGER logFileSize; - LARGE_INTEGER SystemTime; ULONG RecOffSet; ULONG WriteOffSet; if (!Buffer) return FALSE; - NtQuerySystemTime(&SystemTime); - RtlTimeToSecondsSince1970(&SystemTime, &((PEVENTLOGRECORD) Buffer)->TimeWritten); + GetSystemTime(&st); + SystemTimeToEventTime(&st, &((PEVENTLOGRECORD) Buffer)->TimeWritten); EnterCriticalSection(&LogFile->cs); @@ -1125,7 +1125,6 @@ PBYTE LogfAllocAndBuildNewRecord(LPDWORD lpRecSize, DWORD dwRecordNumber, - DWORD dwTime, WORD wType, WORD wCategory, DWORD dwEventId, @@ -1140,6 +1139,7 @@ { DWORD dwRecSize; PEVENTLOGRECORD pRec; + SYSTEMTIME SysTime; WCHAR *str; UINT i, pos; PBYTE Buffer; @@ -1148,8 +1148,8 @@ sizeof(EVENTLOGRECORD) + (lstrlenW(ComputerName) + lstrlenW(SourceName) + 2) * sizeof(WCHAR); - if (dwRecSize % sizeof(DWORD) != 0) - dwRecSize += sizeof(DWORD) - (dwRecSize % sizeof(DWORD)); + if (dwRecSize % 4 != 0) + dwRecSize += 4 - (dwRecSize % 4); dwRecSize += dwSidLength; @@ -1160,10 +1160,10 @@ } dwRecSize += dwDataSize; - if (dwRecSize % sizeof(DWORD) != 0) - dwRecSize += sizeof(DWORD) - (dwRecSize % sizeof(DWORD)); - - dwRecSize += sizeof(DWORD); + if (dwRecSize % 4 != 0) + dwRecSize += 4 - (dwRecSize % 4); + + dwRecSize += 4; Buffer = HeapAlloc(MyHeap, HEAP_ZERO_MEMORY, dwRecSize); @@ -1178,8 +1178,9 @@ pRec->Reserved = LOGFILE_SIGNATURE; pRec->RecordNumber = dwRecordNumber; - pRec->TimeGenerated = dwTime; - pRec->TimeWritten = dwTime; + GetSystemTime(&SysTime); + SystemTimeToEventTime(&SysTime, &pRec->TimeGenerated); + SystemTimeToEventTime(&SysTime, &pRec->TimeWritten); pRec->EventID = dwEventId; pRec->EventType = wType; @@ -1194,8 +1195,8 @@ pRec->UserSidOffset = pos; - if (pos % sizeof(DWORD) != 0) - pos += sizeof(DWORD) - (pos % sizeof(DWORD)); + if (pos % 4 != 0) + pos += 4 - (pos % 4); if (dwSidLength) { @@ -1222,8 +1223,8 @@ pos += dwDataSize; } - if (pos % sizeof(DWORD) != 0) - pos += sizeof(DWORD) - (pos % sizeof(DWORD)); + if (pos % 4 != 0) + pos += 4 - (pos % 4); *((PDWORD) (Buffer + pos)) = dwRecSize; @@ -1248,8 +1249,6 @@ DWORD lastRec; DWORD recSize; DWORD dwError; - DWORD dwTime; - LARGE_INTEGER SystemTime; if (!GetComputerNameW(szComputerName, &dwComputerNameLength)) { @@ -1262,13 +1261,9 @@ return; } - NtQuerySystemTime(&SystemTime); - RtlTimeToSecondsSince1970(&SystemTime, &dwTime); - lastRec = LogfGetCurrentRecord(pEventSource->LogFile); logBuffer = LogfAllocAndBuildNewRecord(&recSize, - dwTime, lastRec, wType, wCategory, Modified: trunk/reactos/base/services/eventlog/logport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/log… ============================================================================== --- trunk/reactos/base/services/eventlog/logport.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/logport.c [iso-8859-1] Sun Dec 25 00:57:16 2011 @@ -109,8 +109,6 @@ DWORD dwRecSize; NTSTATUS Status; PLOGFILE SystemLog = NULL; - LARGE_INTEGER SystemTime; - ULONG Seconds; DPRINT("ProcessPortMessage() called\n"); @@ -147,10 +145,7 @@ Message = (PIO_ERROR_LOG_MESSAGE) & Request.Message; ulRecNum = SystemLog ? SystemLog->Header.CurrentRecordNumber : 0; - NtQuerySystemTime(&SystemTime); - RtlTimeToSecondsSince1970(&SystemTime, &Seconds); - - pRec = (PEVENTLOGRECORD) LogfAllocAndBuildNewRecord(&dwRecSize, Seconds, + pRec = (PEVENTLOGRECORD) LogfAllocAndBuildNewRecord(&dwRecSize, ulRecNum, Message->Type, Message->EntryData.EventCategory, Message->EntryData.ErrorCode, (WCHAR *) (((PBYTE) Message) + Message->DriverNameOffset), Modified: trunk/reactos/base/services/eventlog/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/rpc… ============================================================================== --- trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] Sun Dec 25 00:57:16 2011 @@ -496,7 +496,6 @@ if (UserSID) dwUserSidLength = FIELD_OFFSET(SID, SubAuthority[UserSID->SubAuthorityCount]); LogBuffer = LogfAllocAndBuildNewRecord(&recSize, - Time, lastRec, EventType, EventCategory,

1 0

[cgutman] 54750: [CDFS] - Fix infinite loop of verification and read attempts when a disc change occurs on VMware while ROS is running
by cgutman＠svn.reactos.org 25 Dec '11

25 Dec '11

Author: cgutman Date: Sun Dec 25 00:14:01 2011 New Revision: 54750 URL: http://svn.reactos.org/svn/reactos?rev=54750&view=rev Log: [CDFS] - Fix infinite loop of verification and read attempts when a disc change occurs on VMware while ROS is running Modified: trunk/reactos/drivers/filesystems/cdfs/common.c Modified: trunk/reactos/drivers/filesystems/cdfs/common.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/common.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/common.c [iso-8859-1] Sun Dec 25 00:14:01 2011 @@ -49,6 +49,7 @@ KEVENT Event; PIRP Irp; NTSTATUS Status; + BOOLEAN LastChance = FALSE; again: KeInitializeEvent(&Event, @@ -104,17 +105,25 @@ { PDEVICE_OBJECT DeviceToVerify; - DPRINT1("STATUS_VERIFY_REQUIRED\n"); DeviceToVerify = IoGetDeviceToVerify(PsGetCurrentThread()); IoSetDeviceToVerify(PsGetCurrentThread(), NULL); Status = IoVerifyVolume(DeviceToVerify, FALSE); - DPRINT1("IoVerifyVolume() returned (Status %lx)\n", Status); - - if (NT_SUCCESS(Status)) + + if (NT_SUCCESS(Status) && !LastChance) { - DPRINT1("Volume verify succeeded; trying request again\n"); + DPRINT("Volume verify succeeded; trying request again\n"); + LastChance = TRUE; goto again; + } + else if (NT_SUCCESS(Status)) + { + DPRINT1("Failed to read after successful verify, aborting\n"); + Status = STATUS_DEVICE_NOT_READY; + } + else + { + DPRINT1("IoVerifyVolume() failed (Status %lx)\n", Status); } }

1 0

[tfaber] 54749: [RTL] - ASSERT on damaged heap data structures instead of producing an infinite loop See issue #5857 for more details.
by tfaber＠svn.reactos.org 24 Dec '11

24 Dec '11

Author: tfaber Date: Sat Dec 24 22:45:26 2011 New Revision: 54749 URL: http://svn.reactos.org/svn/reactos?rev=54749&view=rev Log: [RTL] - ASSERT on damaged heap data structures instead of producing an infinite loop See issue #5857 for more details. Modified: trunk/reactos/lib/rtl/heap.c Modified: trunk/reactos/lib/rtl/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap.c?rev=54749&r… ============================================================================== --- trunk/reactos/lib/rtl/heap.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heap.c [iso-8859-1] Sat Dec 24 22:45:26 2011 @@ -669,6 +669,7 @@ while (!(LastEntry->Flags & HEAP_ENTRY_LAST_ENTRY)) { + ASSERT(LastEntry->Size != 0); LastEntry += LastEntry->Size; } ASSERT((LastEntry + LastEntry->Size) == FirstEntry); @@ -683,7 +684,7 @@ DPRINT("Updating UcrDescriptor %p, new Address %p, size %d\n", UcrDescriptor, UcrDescriptor->Address, UcrDescriptor->Size); - /* Set various first entry fields*/ + /* Set various first entry fields */ FirstEntry->SegmentOffset = LastEntry->SegmentOffset; FirstEntry->Size = (USHORT)(*Size >> HEAP_ENTRY_SHIFT); FirstEntry->PreviousSize = LastEntry->Size;

1 0

← Newer
1
2
3
4
5
6
7
8
...
25
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2011