Ros-diffs May 2013

ros-diffs@reactos.org

16 participants
234 discussions

[jimtabor] 59000: [Win32k] - Thread ID to Thread Information.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sat May 11 19:33:40 2013 New Revision: 59000 URL: http://svn.reactos.org/svn/reactos?rev=59000&view=rev Log: [Win32k] - Thread ID to Thread Information. Modified: trunk/reactos/win32ss/user/ntuser/hook.c trunk/reactos/win32ss/user/ntuser/misc.c trunk/reactos/win32ss/user/ntuser/ntstubs.c trunk/reactos/win32ss/user/ntuser/userfuncs.h Modified: trunk/reactos/win32ss/user/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/hook.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/hook.c [iso-8859-1] Sat May 11 19:33:40 2013 @@ -1456,7 +1456,6 @@ UNICODE_STRING ModuleName; NTSTATUS Status; HHOOK Handle; - PETHREAD Thread = NULL; PTHREADINFO pti, ptiHook = NULL; DECLARE_RETURN(HHOOK); @@ -1491,14 +1490,12 @@ RETURN( NULL); } - if (!NT_SUCCESS(PsLookupThreadByThreadId((HANDLE)(DWORD_PTR) ThreadId, &Thread))) + if ( !(ptiHook = IntTID2PTI( (HANDLE)ThreadId ))) { ERR("Invalid thread id 0x%x\n", ThreadId); EngSetLastError(ERROR_INVALID_PARAMETER); RETURN( NULL); } - - ptiHook = Thread->Tcb.Win32Thread; if ( ptiHook->rpdesk != pti->rpdesk) // gptiCurrent->rpdesk) { @@ -1507,7 +1504,7 @@ RETURN( NULL); } - if (Thread->ThreadsProcess != PsGetCurrentProcess()) + if (ptiHook->ppi != pti->ppi) { if ( !Mod && (HookId == WH_GETMESSAGE || @@ -1674,6 +1671,9 @@ } Hook->ModuleName.Length = ModuleName.Length; + //// FIXME: Need to load from user32 to verify hMod before calling hook with hMod set!!!! + //// Mod + offPfn == new HookProc Justin Case module is from another process. + FIXME("NtUserSetWindowsHookEx Setting process hMod instance addressing.\n"); /* Make proc relative to the module base */ Hook->offPfn = (ULONG_PTR)((char *)HookProc - (char *)Mod); } @@ -1685,7 +1685,6 @@ CLEANUP: TRACE("Leave NtUserSetWindowsHookEx, ret=%i\n",_ret_); - if (Thread) ObDereferenceObject(Thread); UserLeave(); END_CLEANUP; } Modified: trunk/reactos/win32ss/user/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/misc.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/misc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/misc.c [iso-8859-1] Sat May 11 19:33:40 2013 @@ -2,12 +2,54 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Win32k subsystem * PURPOSE: Miscellaneous User functions - * FILE: subsystems/win32/win32k/ntuser/misc.c + * FILE: win32ss/user/ntuser/misc.c * PROGRAMER: Ge van Geldorp (ge(a)gse.nl) */ #include <win32k.h> DBG_DEFAULT_CHANNEL(UserMisc); + +/* + * Test the Thread to verify and validate it. Hard to the core tests are required. + */ +PTHREADINFO +FASTCALL +IntTID2PTI(HANDLE id) +{ + NTSTATUS Status; + PETHREAD Thread; + PTHREADINFO pti; + Status = PsLookupThreadByThreadId(id, &Thread); + if (!NT_SUCCESS(Status)) + { + return NULL; + } + if (PsIsThreadTerminating(Thread)) + { + ObDereferenceObject(Thread); + return NULL; + } + pti = PsGetThreadWin32Thread(Thread); + if (!pti) + { + ObDereferenceObject(Thread); + return NULL; + } + // Validate and verify! + _SEH2_TRY + { + if (pti->TIF_flags & TIF_INCLEANUP) pti = NULL; + if (pti && !(pti->TIF_flags & TIF_GUITHREADINITIALIZED)) pti = NULL; + if (PsGetThreadId(Thread) != id) pti = NULL; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + pti = NULL; + } + _SEH2_END + ObDereferenceObject(Thread); + return pti; +} SHORT FASTCALL Modified: trunk/reactos/win32ss/user/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntstub… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] Sat May 11 19:33:40 2013 @@ -29,30 +29,21 @@ IN BOOL fAttach) { NTSTATUS Status; - PETHREAD Thread, ThreadTo; PTHREADINFO pti, ptiTo; BOOL Ret = FALSE; UserEnterExclusive(); ERR("Enter NtUserAttachThreadInput %s\n",(fAttach ? "TRUE" : "FALSE" )); - Status = PsLookupThreadByThreadId((HANDLE)idAttach, &Thread); - if (!NT_SUCCESS(Status)) + + pti = IntTID2PTI((HANDLE)idAttach); + ptiTo = IntTID2PTI((HANDLE)idAttachTo); + + if ( !pti || !ptiTo ) { + ERR("AttachThreadInput pti or ptiTo NULL.\n"); EngSetLastError(ERROR_INVALID_PARAMETER); goto Exit; } - Status = PsLookupThreadByThreadId((HANDLE)idAttachTo, &ThreadTo); - if (!NT_SUCCESS(Status)) - { - EngSetLastError(ERROR_INVALID_PARAMETER); - ObDereferenceObject(Thread); - goto Exit; - } - - pti = PsGetThreadWin32Thread(Thread); - ptiTo = PsGetThreadWin32Thread(ThreadTo); - ObDereferenceObject(Thread); - ObDereferenceObject(ThreadTo); Status = UserAttachThreadInput( pti, ptiTo, fAttach); if (!NT_SUCCESS(Status)) Modified: trunk/reactos/win32ss/user/ntuser/userfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/userfu… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/userfuncs.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/userfuncs.h [iso-8859-1] Sat May 11 19:33:40 2013 @@ -87,6 +87,7 @@ VOID FASTCALL IntSetWindowState(PWND, UINT); VOID FASTCALL IntClearWindowState(PWND, UINT); +PTHREADINFO FASTCALL IntTID2PTI(HANDLE); /*************** MESSAGE.C ***************/

11 years, 7 months

[jimtabor] 58999: [Win32k] - Cleanup and one fix.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sat May 11 19:26:18 2013 New Revision: 58999 URL: http://svn.reactos.org/svn/reactos?rev=58999&view=rev Log: [Win32k] - Cleanup and one fix. Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.h trunk/reactos/win32ss/user/ntuser/object.c trunk/reactos/win32ss/user/ntuser/simplecall.c trunk/reactos/win32ss/user/ntuser/timer.c Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.h [iso-8859-1] Sat May 11 19:26:18 2013 @@ -47,8 +47,6 @@ struct _DESKTOP *Desktop; PTHREADINFO ptiSysLock; - /* Owner of the message queue */ -// struct _ETHREAD *Thread; PTHREADINFO ptiMouse; PTHREADINFO ptiKeyboard; Modified: trunk/reactos/win32ss/user/ntuser/object.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/object… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/object.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/object.c [iso-8859-1] Sat May 11 19:26:18 2013 @@ -475,7 +475,7 @@ if (!(entry = handle_to_entry( gHandleTable, h ))) { SetLastNtError( STATUS_INVALID_HANDLE ); - return FALSE; + return TRUE; } return (entry->flags & HANDLEENTRY_INDESTROY); } Modified: trunk/reactos/win32ss/user/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/simple… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/simplecall.c [iso-8859-1] Sat May 11 19:26:18 2013 @@ -559,9 +559,9 @@ break; case HWNDLOCK_ROUTINE_SETFOREGROUNDWINDOW: - TRACE("co_IntSetForegroundWindow 1 %p\n",hWnd); + TRACE("co_IntSetForegroundWindow 1 0x%p\n",hWnd); Ret = co_IntSetForegroundWindow(Window); - TRACE("co_IntSetForegroundWindow 2 \n"); + TRACE("co_IntSetForegroundWindow 2 0x%p\n",hWnd); break; case HWNDLOCK_ROUTINE_SETFOREGROUNDWINDOWMOUSE: Modified: trunk/reactos/win32ss/user/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/timer.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/timer.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/timer.c [iso-8859-1] Sat May 11 19:26:18 2013 @@ -386,14 +386,12 @@ PostTimerMessages(PWND Window) { PLIST_ENTRY pLE; - PUSER_MESSAGE_QUEUE ThreadQueue; MSG Msg; PTHREADINFO pti; BOOL Hit = FALSE; PTIMER pTmr; pti = PsGetCurrentThreadWin32Thread(); - ThreadQueue = pti->MessageQueue; TimerEnterExclusive(); pLE = TimersListHead.Flink;

11 years, 7 months

[tfaber] 58998: [KBDHID][MOUHID] - Free the correct usage list buffer

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat May 11 17:15:54 2013 New Revision: 58998 URL: http://svn.reactos.org/svn/reactos?rev=58998&view=rev Log: [KBDHID][MOUHID] - Free the correct usage list buffer Modified: trunk/reactos/drivers/hid/kbdhid/kbdhid.c trunk/reactos/drivers/hid/kbdhid/kbdhid.h trunk/reactos/drivers/hid/mouhid/mouhid.c trunk/reactos/drivers/hid/mouhid/mouhid.h Modified: trunk/reactos/drivers/hid/kbdhid/kbdhid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/kbdhid/kbdhid.… ============================================================================== --- trunk/reactos/drivers/hid/kbdhid/kbdhid.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/kbdhid/kbdhid.c [iso-8859-1] Sat May 11 17:15:54 2013 @@ -729,6 +729,7 @@ ExFreePoolWithTag(PreparsedData, KBDHID_TAG); return STATUS_INSUFFICIENT_RESOURCES; } + DeviceExtension->UsageListBuffer = Buffer; /* init usage lists */ RtlZeroMemory(Buffer, sizeof(USAGE_AND_PAGE) * 4 * Buttons); @@ -788,9 +789,10 @@ DeviceExtension->PreparsedData = NULL; } - if (DeviceExtension->CurrentUsageList) - { - ExFreePoolWithTag(DeviceExtension->CurrentUsageList, KBDHID_TAG); + if (DeviceExtension->UsageListBuffer) + { + ExFreePoolWithTag(DeviceExtension->UsageListBuffer, KBDHID_TAG); + DeviceExtension->UsageListBuffer = NULL; DeviceExtension->CurrentUsageList = NULL; DeviceExtension->PreviousUsageList = NULL; DeviceExtension->MakeUsageList = NULL; Modified: trunk/reactos/drivers/hid/kbdhid/kbdhid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/kbdhid/kbdhid.… ============================================================================== --- trunk/reactos/drivers/hid/kbdhid/kbdhid.h [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/kbdhid/kbdhid.h [iso-8859-1] Sat May 11 17:15:54 2013 @@ -39,6 +39,11 @@ // class callback // PVOID ClassService; + + // + // buffer for the four usage lists below + // + PVOID UsageListBuffer; // // usage list length Modified: trunk/reactos/drivers/hid/mouhid/mouhid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/mouhid/mouhid.… ============================================================================== --- trunk/reactos/drivers/hid/mouhid/mouhid.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/mouhid/mouhid.c [iso-8859-1] Sat May 11 17:15:54 2013 @@ -720,7 +720,7 @@ ULONG ValueCapsLength; HIDP_VALUE_CAPS ValueCaps; PMOUHID_DEVICE_EXTENSION DeviceExtension; - PUSHORT Buffer; + PUSAGE Buffer; /* get device extension */ DeviceExtension = DeviceObject->DeviceExtension; @@ -816,6 +816,7 @@ ExFreePoolWithTag(PreparsedData, MOUHID_TAG); return STATUS_INSUFFICIENT_RESOURCES; } + DeviceExtension->UsageListBuffer = Buffer; /* init usage lists */ RtlZeroMemory(Buffer, sizeof(USAGE) * 4 * Buttons); @@ -919,9 +920,10 @@ DeviceExtension->PreparsedData = NULL; } - if (DeviceExtension->CurrentUsageList) - { - ExFreePoolWithTag(DeviceExtension->CurrentUsageList, MOUHID_TAG); + if (DeviceExtension->UsageListBuffer) + { + ExFreePoolWithTag(DeviceExtension->UsageListBuffer, MOUHID_TAG); + DeviceExtension->UsageListBuffer = NULL; DeviceExtension->CurrentUsageList = NULL; DeviceExtension->PreviousUsageList = NULL; DeviceExtension->MakeUsageList = NULL; Modified: trunk/reactos/drivers/hid/mouhid/mouhid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/mouhid/mouhid.… ============================================================================== --- trunk/reactos/drivers/hid/mouhid/mouhid.h [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/mouhid/mouhid.h [iso-8859-1] Sat May 11 17:15:54 2013 @@ -48,6 +48,11 @@ // wheel usage page // USHORT WheelUsagePage; + + // + // buffer for the four usage lists below + // + PVOID UsageListBuffer; // // usage list length

11 years, 7 months

[tfaber] 58997: [HIDPARSER] - Don't use a platform-dependent free function aka fix build

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat May 11 15:51:37 2013 New Revision: 58997 URL: http://svn.reactos.org/svn/reactos?rev=58997&view=rev Log: [HIDPARSER] - Don't use a platform-dependent free function aka fix build Modified: trunk/reactos/lib/drivers/hidparser/hidparser.c 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 May 11 15:51:37 2013 @@ -205,7 +205,7 @@ // // free report description // - ExFreePool(DeviceDescription->ReportIDs); + Parser->Free(DeviceDescription->ReportIDs); } HIDAPI

11 years, 7 months

[tfaber] 58996: [HIDPARSE] - Use pool tagging - Avoid a cast

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat May 11 15:41:22 2013 New Revision: 58996 URL: http://svn.reactos.org/svn/reactos?rev=58996&view=rev Log: [HIDPARSE] - Use pool tagging - Avoid a cast Modified: trunk/reactos/drivers/hid/hidparse/hidparse.c trunk/reactos/drivers/hid/hidparse/hidparse.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 May 11 15:41:22 2013 @@ -15,7 +15,7 @@ AllocFunction( IN ULONG ItemSize) { - PVOID Item = ExAllocatePool(NonPagedPool, ItemSize); + PVOID Item = ExAllocatePoolWithTag(NonPagedPool, ItemSize, HIDPARSE_TAG); if (Item) { // @@ -38,7 +38,7 @@ // // free item // - ExFreePool(Item); + ExFreePoolWithTag(Item, HIDPARSE_TAG); } VOID @@ -259,7 +259,7 @@ IN PCHAR Report, IN ULONG ReportLength) { - return HidP_GetUsages(ReportType, HID_USAGE_PAGE_UNDEFINED, LinkCollection, (PUSAGE)ButtonList, UsageLength, PreparsedData, Report, ReportLength); + return HidP_GetUsages(ReportType, HID_USAGE_PAGE_UNDEFINED, LinkCollection, &ButtonList->Usage, UsageLength, PreparsedData, Report, ReportLength); } HIDAPI 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 May 11 15:41:22 2013 @@ -8,4 +8,6 @@ #define NDEBUG #include <debug.h> #include "hidparser.h" -#include <stdio.h> +#include <stdio.h> + +#define HIDPARSE_TAG 'PdiH'

11 years, 7 months

[tfaber] 58995: [HIDPARSE] - Fix some whitespace

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat May 11 15:39:50 2013 New Revision: 58995 URL: http://svn.reactos.org/svn/reactos?rev=58995&view=rev Log: [HIDPARSE] - Fix some whitespace Modified: trunk/reactos/drivers/hid/hidparse/hidparse.c 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 May 11 15:39:50 2013 @@ -74,18 +74,18 @@ va_list args; unsigned int i; - char printbuffer[1024]; - - va_start(args, FormatStr); - i = vsprintf(printbuffer, FormatStr, args); - va_end(args); - - DbgPrint(printbuffer); + char printbuffer[1024]; + + va_start(args, FormatStr); + i = vsprintf(printbuffer, FormatStr, args); + va_end(args); + + DbgPrint(printbuffer); } VOID NTAPI -HidP_FreeCollectionDescription ( +HidP_FreeCollectionDescription( IN PHIDP_DEVICE_DESC DeviceDescription) { HID_PARSER Parser; @@ -147,9 +147,9 @@ ULONG NTAPI HidP_MaxUsageListLength( - IN HIDP_REPORT_TYPE ReportType, - IN USAGE UsagePage OPTIONAL, - IN PHIDP_PREPARSED_DATA PreparsedData) + IN HIDP_REPORT_TYPE ReportType, + IN USAGE UsagePage OPTIONAL, + IN PHIDP_PREPARSED_DATA PreparsedData) { HID_PARSER Parser; @@ -174,13 +174,13 @@ 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) + 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) { HID_PARSER Parser; @@ -204,14 +204,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 USAGE *UsageList, + IN OUT ULONG *UsageLength, + IN PHIDP_PREPARSED_DATA PreparsedData, + IN PCHAR Report, + IN ULONG ReportLength) { HID_PARSER Parser; @@ -238,11 +238,11 @@ NTSTATUS NTAPI HidP_UsageListDifference( - IN PUSAGE PreviousUsageList, - IN PUSAGE CurrentUsageList, - OUT PUSAGE BreakUsageList, - OUT PUSAGE MakeUsageList, - IN ULONG UsageListLength) + IN PUSAGE PreviousUsageList, + IN PUSAGE CurrentUsageList, + OUT PUSAGE BreakUsageList, + OUT PUSAGE MakeUsageList, + IN ULONG UsageListLength) { return HidParser_UsageListDifference(PreviousUsageList, CurrentUsageList, BreakUsageList, MakeUsageList, UsageListLength); } @@ -251,13 +251,13 @@ 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) + 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); } @@ -266,11 +266,11 @@ 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) + IN PUSAGE_AND_PAGE PreviousUsageList, + IN PUSAGE_AND_PAGE CurrentUsageList, + OUT PUSAGE_AND_PAGE BreakUsageList, + OUT PUSAGE_AND_PAGE MakeUsageList, + IN ULONG UsageListLength) { return HidParser_UsageAndPageListDifference(PreviousUsageList, CurrentUsageList, BreakUsageList, MakeUsageList, UsageListLength); } @@ -279,14 +279,14 @@ 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) + 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) { HID_PARSER Parser; @@ -310,14 +310,14 @@ 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) + 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) { HID_PARSER Parser; @@ -342,12 +342,12 @@ 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) + 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) { HID_PARSER Parser; @@ -361,8 +361,6 @@ // return HidParser_TranslateUsageAndPagesToI8042ScanCodes(&Parser, ChangedUsageList, UsageListLength, KeyAction, ModifierState, InsertCodesProcedure, InsertCodesContext); } - - HIDAPI NTSTATUS @@ -380,13 +378,13 @@ 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) + 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); @@ -397,12 +395,12 @@ 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) + 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); @@ -413,11 +411,11 @@ NTSTATUS NTAPI HidP_GetExtendedAttributes( - IN HIDP_REPORT_TYPE ReportType, - IN USAGE UsagePage, - IN PHIDP_PREPARSED_DATA PreparsedData, - OUT PHIDP_EXTENDED_ATTRIBUTES Attributes, - IN OUT PULONG LengthAttributes) + IN HIDP_REPORT_TYPE ReportType, + IN USAGE UsagePage, + IN PHIDP_PREPARSED_DATA PreparsedData, + OUT PHIDP_EXTENDED_ATTRIBUTES Attributes, + IN OUT PULONG LengthAttributes) { UNIMPLEMENTED ASSERT(FALSE); @@ -439,7 +437,7 @@ NTSTATUS NTAPI -HidP_SysPowerEvent ( +HidP_SysPowerEvent( IN PCHAR HidPacket, IN USHORT HidPacketLength, IN PHIDP_PREPARSED_DATA Ppd, @@ -452,7 +450,7 @@ NTSTATUS NTAPI -HidP_SysPowerCaps ( +HidP_SysPowerCaps( IN PHIDP_PREPARSED_DATA Ppd, OUT PULONG OutputBuffer) { @@ -465,15 +463,15 @@ 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) + 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); @@ -485,14 +483,14 @@ 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) + 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); @@ -503,12 +501,12 @@ 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) + 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); @@ -519,14 +517,14 @@ 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) + 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); @@ -537,15 +535,15 @@ 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) + 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); @@ -556,14 +554,14 @@ 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) + 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); @@ -574,14 +572,14 @@ 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) + 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); @@ -592,12 +590,12 @@ 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) + 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); @@ -608,8 +606,8 @@ ULONG NTAPI HidP_MaxDataListLength( - IN HIDP_REPORT_TYPE ReportType, - IN PHIDP_PREPARSED_DATA PreparsedData) + IN HIDP_REPORT_TYPE ReportType, + IN PHIDP_PREPARSED_DATA PreparsedData) { UNIMPLEMENTED ASSERT(FALSE); @@ -620,11 +618,11 @@ NTSTATUS NTAPI HidP_InitializeReportForID( - IN HIDP_REPORT_TYPE ReportType, - IN UCHAR ReportID, - IN PHIDP_PREPARSED_DATA PreparsedData, - IN OUT PCHAR Report, - IN ULONG ReportLength) + IN HIDP_REPORT_TYPE ReportType, + IN UCHAR ReportID, + IN PHIDP_PREPARSED_DATA PreparsedData, + IN OUT PCHAR Report, + IN ULONG ReportLength) { UNIMPLEMENTED ASSERT(FALSE); @@ -637,10 +635,10 @@ NTSTATUS NTAPI HidP_GetValueCaps( - HIDP_REPORT_TYPE ReportType, - PHIDP_VALUE_CAPS ValueCaps, - PULONG ValueCapsLength, - PHIDP_PREPARSED_DATA PreparsedData) + HIDP_REPORT_TYPE ReportType, + PHIDP_VALUE_CAPS ValueCaps, + PULONG ValueCapsLength, + PHIDP_PREPARSED_DATA PreparsedData) { UNIMPLEMENTED ASSERT(FALSE); @@ -653,7 +651,6 @@ IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegPath) { - DPRINT("********* HID PARSE *********\n"); return STATUS_SUCCESS; }

11 years, 7 months

[tfaber] 58994: [KBDHID][MOUHID] - Use pool tagging - Remove unnecessary casts

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat May 11 12:30:52 2013 New Revision: 58994 URL: http://svn.reactos.org/svn/reactos?rev=58994&view=rev Log: [KBDHID][MOUHID] - Use pool tagging - Remove unnecessary casts Modified: trunk/reactos/drivers/hid/kbdhid/kbdhid.c trunk/reactos/drivers/hid/kbdhid/kbdhid.h trunk/reactos/drivers/hid/mouhid/mouhid.c trunk/reactos/drivers/hid/mouhid/mouhid.h Modified: trunk/reactos/drivers/hid/kbdhid/kbdhid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/kbdhid/kbdhid.… ============================================================================== --- trunk/reactos/drivers/hid/kbdhid/kbdhid.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/kbdhid/kbdhid.c [iso-8859-1] Sat May 11 12:30:52 2013 @@ -48,7 +48,7 @@ CHAR Prefix = 0; /* get device extension */ - DeviceExtension = (PKBDHID_DEVICE_EXTENSION)Context; + DeviceExtension = Context; for(Index = 0; Index < Length; Index++) { @@ -104,7 +104,7 @@ ULONG ButtonLength; /* get device extension */ - DeviceExtension = (PKBDHID_DEVICE_EXTENSION)Context; + DeviceExtension = Context; if (Irp->IoStatus.Status == STATUS_PRIVILEGE_NOT_HELD || Irp->IoStatus.Status == STATUS_DEVICE_NOT_CONNECTED || @@ -247,7 +247,7 @@ DPRINT("[KBDHID]: IRP_MJ_CREATE\n"); /* get device extension */ - DeviceExtension = (PKBDHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + DeviceExtension = DeviceObject->DeviceExtension; /* get stack location */ IoStack = IoGetCurrentIrpStackLocation(Irp); @@ -318,7 +318,7 @@ PKBDHID_DEVICE_EXTENSION DeviceExtension; /* get device extension */ - DeviceExtension = (PKBDHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + DeviceExtension = DeviceObject->DeviceExtension; DPRINT("[KBDHID] IRP_MJ_CLOSE ReadReportActive %x\n", DeviceExtension->ReadReportActive); @@ -363,7 +363,7 @@ DPRINT("[KBDHID] InternalDeviceControl %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode); /* get device extension */ - DeviceExtension = (PKBDHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + DeviceExtension = DeviceObject->DeviceExtension; switch (IoStack->Parameters.DeviceIoControl.IoControlCode) { @@ -379,7 +379,7 @@ } /* get output buffer */ - Attributes = (PKEYBOARD_ATTRIBUTES)Irp->AssociatedIrp.SystemBuffer; + Attributes = Irp->AssociatedIrp.SystemBuffer; /* copy attributes */ RtlCopyMemory(Attributes, @@ -412,7 +412,7 @@ } /* get connect data */ - Data = (PCONNECT_DATA)IoStack->Parameters.DeviceIoControl.Type3InputBuffer; + Data = IoStack->Parameters.DeviceIoControl.Type3InputBuffer; /* store connect details */ DeviceExtension->ClassDeviceObject = Data->ClassDeviceObject; @@ -546,7 +546,7 @@ PKBDHID_DEVICE_EXTENSION DeviceExtension; /* get device extension */ - DeviceExtension = (PKBDHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + DeviceExtension = DeviceObject->DeviceExtension; /* skip stack location */ IoSkipCurrentIrpStackLocation(Irp); @@ -598,7 +598,7 @@ IO_STATUS_BLOCK IoStatus; /* get device extension */ - DeviceExtension = (PKBDHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + DeviceExtension = DeviceObject->DeviceExtension; /* init event */ KeInitializeEvent(&Event, NotificationEvent, FALSE); @@ -646,7 +646,7 @@ PUSAGE_AND_PAGE Buffer; /* get device extension */ - DeviceExtension = (PKBDHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + DeviceExtension = DeviceObject->DeviceExtension; /* query collection information */ Status = KbdHid_SubmitRequest(DeviceObject, @@ -663,7 +663,7 @@ } /* lets allocate space for preparsed data */ - PreparsedData = (PHIDP_PREPARSED_DATA)ExAllocatePool(NonPagedPool, Information.DescriptorSize); + PreparsedData = ExAllocatePoolWithTag(NonPagedPool, Information.DescriptorSize, KBDHID_TAG); if (!PreparsedData) { /* no memory */ @@ -682,7 +682,7 @@ { /* failed to get preparsed data */ DPRINT1("[KBDHID] failed to obtain collection information with %x\n", Status); - ExFreePool(PreparsedData); + ExFreePoolWithTag(PreparsedData, KBDHID_TAG); return Status; } @@ -692,7 +692,7 @@ { /* failed to get capabilities */ DPRINT1("[KBDHID] failed to obtain caps with %x\n", Status); - ExFreePool(PreparsedData); + ExFreePoolWithTag(PreparsedData, KBDHID_TAG); return Status; } @@ -701,7 +701,7 @@ /* init input report */ DeviceExtension->ReportLength = Capabilities.InputReportByteLength; ASSERT(DeviceExtension->ReportLength); - DeviceExtension->Report = (PCHAR)ExAllocatePool(NonPagedPool, DeviceExtension->ReportLength); + DeviceExtension->Report = ExAllocatePoolWithTag(NonPagedPool, DeviceExtension->ReportLength, KBDHID_TAG); ASSERT(DeviceExtension->Report); RtlZeroMemory(DeviceExtension->Report, DeviceExtension->ReportLength); @@ -722,11 +722,11 @@ ASSERT(Buttons > 0); /* now allocate an array for those buttons */ - Buffer = (PUSAGE_AND_PAGE)ExAllocatePool(NonPagedPool, sizeof(USAGE_AND_PAGE) * 4 * Buttons); + Buffer = ExAllocatePoolWithTag(NonPagedPool, sizeof(USAGE_AND_PAGE) * 4 * Buttons, KBDHID_TAG); if (!Buffer) { /* no memory */ - ExFreePool(PreparsedData); + ExFreePoolWithTag(PreparsedData, KBDHID_TAG); return STATUS_INSUFFICIENT_RESOURCES; } @@ -784,13 +784,13 @@ /* free resources */ if (DeviceExtension->PreparsedData) { - ExFreePool(DeviceExtension->PreparsedData); + ExFreePoolWithTag(DeviceExtension->PreparsedData, KBDHID_TAG); DeviceExtension->PreparsedData = NULL; } if (DeviceExtension->CurrentUsageList) { - ExFreePool(DeviceExtension->CurrentUsageList); + ExFreePoolWithTag(DeviceExtension->CurrentUsageList, KBDHID_TAG); DeviceExtension->CurrentUsageList = NULL; DeviceExtension->PreviousUsageList = NULL; DeviceExtension->MakeUsageList = NULL; @@ -805,7 +805,7 @@ if (DeviceExtension->Report) { - ExFreePool(DeviceExtension->Report); + ExFreePoolWithTag(DeviceExtension->Report, KBDHID_TAG); DeviceExtension->Report = NULL; } @@ -822,7 +822,7 @@ PKBDHID_DEVICE_EXTENSION DeviceExtension; /* get device extension */ - DeviceExtension = (PKBDHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + DeviceExtension = DeviceObject->DeviceExtension; /* skip current stack location */ IoSkipCurrentIrpStackLocation(Irp); @@ -850,7 +850,7 @@ PKBDHID_DEVICE_EXTENSION DeviceExtension; /* get device extension */ - DeviceExtension = (PKBDHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + DeviceExtension = DeviceObject->DeviceExtension; /* get current irp stack */ IoStack = IoGetCurrentIrpStackLocation(Irp); @@ -981,7 +981,7 @@ } /* get device extension */ - DeviceExtension = (PKBDHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + DeviceExtension = DeviceObject->DeviceExtension; /* zero extension */ RtlZeroMemory(DeviceExtension, sizeof(KBDHID_DEVICE_EXTENSION)); Modified: trunk/reactos/drivers/hid/kbdhid/kbdhid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/kbdhid/kbdhid.… ============================================================================== --- trunk/reactos/drivers/hid/kbdhid/kbdhid.h [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/kbdhid/kbdhid.h [iso-8859-1] Sat May 11 12:30:52 2013 @@ -120,9 +120,7 @@ // KEYBOARD_TYPEMATIC_PARAMETERS KeyboardTypematic; - - -}KBDHID_DEVICE_EXTENSION, *PKBDHID_DEVICE_EXTENSION; +} KBDHID_DEVICE_EXTENSION, *PKBDHID_DEVICE_EXTENSION; /* defaults from kbfiltr.h */ #define KEYBOARD_TYPEMATIC_RATE_MINIMUM 2 @@ -138,8 +136,8 @@ #define MICROSOFT_KBD_101_TYPE 0 - - NTSTATUS KbdHid_InitiateRead( IN PKBDHID_DEVICE_EXTENSION DeviceExtension); + +#define KBDHID_TAG 'diHK' Modified: trunk/reactos/drivers/hid/mouhid/mouhid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/mouhid/mouhid.… ============================================================================== --- trunk/reactos/drivers/hid/mouhid/mouhid.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/mouhid/mouhid.c [iso-8859-1] Sat May 11 12:30:52 2013 @@ -256,7 +256,7 @@ USHORT Flags; /* get device extension */ - DeviceExtension = (PMOUHID_DEVICE_EXTENSION)Context; + DeviceExtension = Context; if (Irp->IoStatus.Status == STATUS_PRIVILEGE_NOT_HELD || Irp->IoStatus.Status == STATUS_DEVICE_NOT_CONNECTED || @@ -397,7 +397,7 @@ DPRINT("MOUHID: IRP_MJ_CREATE\n"); /* get device extension */ - DeviceExtension = (PMOUHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + DeviceExtension = DeviceObject->DeviceExtension; /* get stack location */ IoStack = IoGetCurrentIrpStackLocation(Irp); @@ -468,7 +468,7 @@ PMOUHID_DEVICE_EXTENSION DeviceExtension; /* get device extension */ - DeviceExtension = (PMOUHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + DeviceExtension = DeviceObject->DeviceExtension; DPRINT("[MOUHID] IRP_MJ_CLOSE ReadReportActive %x\n", DeviceExtension->ReadReportActive); @@ -513,7 +513,7 @@ DPRINT("[MOUHID] InternalDeviceControl %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode); /* get device extension */ - DeviceExtension = (PMOUHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + DeviceExtension = DeviceObject->DeviceExtension; /* handle requests */ switch (IoStack->Parameters.DeviceIoControl.IoControlCode) @@ -530,7 +530,7 @@ } /* get output buffer */ - Attributes = (PMOUSE_ATTRIBUTES)Irp->AssociatedIrp.SystemBuffer; + Attributes = Irp->AssociatedIrp.SystemBuffer; /* type of mouse */ Attributes->MouseIdentifier = DeviceExtension->MouseIdentifier; @@ -575,7 +575,7 @@ } /* get connect data */ - Data = (PCONNECT_DATA)IoStack->Parameters.DeviceIoControl.Type3InputBuffer; + Data = IoStack->Parameters.DeviceIoControl.Type3InputBuffer; /* store connect details */ DeviceExtension->ClassDeviceObject = Data->ClassDeviceObject; @@ -621,7 +621,7 @@ PMOUHID_DEVICE_EXTENSION DeviceExtension; /* get device extension */ - DeviceExtension = (PMOUHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + DeviceExtension = DeviceObject->DeviceExtension; /* skip stack location */ IoSkipCurrentIrpStackLocation(Irp); @@ -673,7 +673,7 @@ IO_STATUS_BLOCK IoStatus; /* get device extension */ - DeviceExtension = (PMOUHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + DeviceExtension = DeviceObject->DeviceExtension; /* init event */ KeInitializeEvent(&Event, NotificationEvent, FALSE); @@ -723,7 +723,7 @@ PUSHORT Buffer; /* get device extension */ - DeviceExtension = (PMOUHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + DeviceExtension = DeviceObject->DeviceExtension; /* query collection information */ Status = MouHid_SubmitRequest(DeviceObject, @@ -740,7 +740,7 @@ } /* lets allocate space for preparsed data */ - PreparsedData = ExAllocatePool(NonPagedPool, Information.DescriptorSize); + PreparsedData = ExAllocatePoolWithTag(NonPagedPool, Information.DescriptorSize, MOUHID_TAG); if (!PreparsedData) { /* no memory */ @@ -759,7 +759,7 @@ { /* failed to get preparsed data */ DPRINT1("[MOUHID] failed to obtain collection information with %x\n", Status); - ExFreePool(PreparsedData); + ExFreePoolWithTag(PreparsedData, MOUHID_TAG); return Status; } @@ -769,7 +769,7 @@ { /* failed to get capabilities */ DPRINT1("[MOUHID] failed to obtain caps with %x\n", Status); - ExFreePool(PreparsedData); + ExFreePoolWithTag(PreparsedData, MOUHID_TAG); return Status; } @@ -779,14 +779,14 @@ if ((Capabilities.Usage != HID_USAGE_GENERIC_POINTER && Capabilities.Usage != HID_USAGE_GENERIC_MOUSE) || Capabilities.UsagePage != HID_USAGE_PAGE_GENERIC) { /* not supported */ - ExFreePool(PreparsedData); + ExFreePoolWithTag(PreparsedData, MOUHID_TAG); return STATUS_UNSUCCESSFUL; } - /* init input report*/ + /* init input report */ DeviceExtension->ReportLength = Capabilities.InputReportByteLength; ASSERT(DeviceExtension->ReportLength); - DeviceExtension->Report = (PCHAR)ExAllocatePool(NonPagedPool, DeviceExtension->ReportLength); + DeviceExtension->Report = ExAllocatePoolWithTag(NonPagedPool, DeviceExtension->ReportLength, MOUHID_TAG); ASSERT(DeviceExtension->Report); RtlZeroMemory(DeviceExtension->Report, DeviceExtension->ReportLength); @@ -809,11 +809,11 @@ ASSERT(Buttons > 0); /* now allocate an array for those buttons */ - Buffer = ExAllocatePool(NonPagedPool, sizeof(USAGE) * 4 * Buttons); + Buffer = ExAllocatePoolWithTag(NonPagedPool, sizeof(USAGE) * 4 * Buttons, MOUHID_TAG); if (!Buffer) { /* no memory */ - ExFreePool(PreparsedData); + ExFreePoolWithTag(PreparsedData, MOUHID_TAG); return STATUS_INSUFFICIENT_RESOURCES; } @@ -898,7 +898,7 @@ IN PIRP Irp, IN PVOID Context) { - KeSetEvent((PKEVENT)Context, 0, FALSE); + KeSetEvent(Context, 0, FALSE); return STATUS_MORE_PROCESSING_REQUIRED; } @@ -915,13 +915,13 @@ /* free resources */ if (DeviceExtension->PreparsedData) { - ExFreePool(DeviceExtension->PreparsedData); + ExFreePoolWithTag(DeviceExtension->PreparsedData, MOUHID_TAG); DeviceExtension->PreparsedData = NULL; } if (DeviceExtension->CurrentUsageList) { - ExFreePool(DeviceExtension->CurrentUsageList); + ExFreePoolWithTag(DeviceExtension->CurrentUsageList, MOUHID_TAG); DeviceExtension->CurrentUsageList = NULL; DeviceExtension->PreviousUsageList = NULL; DeviceExtension->MakeUsageList = NULL; @@ -936,7 +936,7 @@ if (DeviceExtension->Report) { - ExFreePool(DeviceExtension->Report); + ExFreePoolWithTag(DeviceExtension->Report, MOUHID_TAG); DeviceExtension->Report = NULL; } @@ -953,7 +953,7 @@ PMOUHID_DEVICE_EXTENSION DeviceExtension; /* get device extension */ - DeviceExtension = (PMOUHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + DeviceExtension = DeviceObject->DeviceExtension; /* skip current stack location */ IoSkipCurrentIrpStackLocation(Irp); @@ -981,7 +981,7 @@ PMOUHID_DEVICE_EXTENSION DeviceExtension; /* get device extension */ - DeviceExtension = (PMOUHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + DeviceExtension = DeviceObject->DeviceExtension; /* get current irp stack */ IoStack = IoGetCurrentIrpStackLocation(Irp); @@ -1124,7 +1124,7 @@ } /* get device extension */ - DeviceExtension = (PMOUHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + DeviceExtension = DeviceObject->DeviceExtension; /* zero extension */ RtlZeroMemory(DeviceExtension, sizeof(MOUHID_DEVICE_EXTENSION)); Modified: trunk/reactos/drivers/hid/mouhid/mouhid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/mouhid/mouhid.… ============================================================================== --- trunk/reactos/drivers/hid/mouhid/mouhid.h [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/mouhid/mouhid.h [iso-8859-1] Sat May 11 12:30:52 2013 @@ -124,11 +124,12 @@ // HIDP_VALUE_CAPS ValueCapsY; - -}MOUHID_DEVICE_EXTENSION, *PMOUHID_DEVICE_EXTENSION; +} MOUHID_DEVICE_EXTENSION, *PMOUHID_DEVICE_EXTENSION; #define WHEEL_DELTA 120 NTSTATUS MouHid_InitiateRead( IN PMOUHID_DEVICE_EXTENSION DeviceExtension); + +#define MOUHID_TAG 'diHM'

11 years, 7 months

[tfaber] 58993: [KBDHID][MOUHID] - Free device resources

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat May 11 12:17:36 2013 New Revision: 58993 URL: http://svn.reactos.org/svn/reactos?rev=58993&view=rev Log: [KBDHID][MOUHID] - Free device resources Modified: trunk/reactos/drivers/hid/kbdhid/kbdhid.c trunk/reactos/drivers/hid/mouhid/mouhid.c Modified: trunk/reactos/drivers/hid/kbdhid/kbdhid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/kbdhid/kbdhid.… ============================================================================== --- trunk/reactos/drivers/hid/kbdhid/kbdhid.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/kbdhid/kbdhid.c [iso-8859-1] Sat May 11 12:17:36 2013 @@ -773,6 +773,47 @@ NTSTATUS NTAPI +KbdHid_FreeResources( + IN PDEVICE_OBJECT DeviceObject) +{ + PKBDHID_DEVICE_EXTENSION DeviceExtension; + + /* get device extension */ + DeviceExtension = DeviceObject->DeviceExtension; + + /* free resources */ + if (DeviceExtension->PreparsedData) + { + ExFreePool(DeviceExtension->PreparsedData); + DeviceExtension->PreparsedData = NULL; + } + + if (DeviceExtension->CurrentUsageList) + { + ExFreePool(DeviceExtension->CurrentUsageList); + DeviceExtension->CurrentUsageList = NULL; + DeviceExtension->PreviousUsageList = NULL; + DeviceExtension->MakeUsageList = NULL; + DeviceExtension->BreakUsageList = NULL; + } + + if (DeviceExtension->ReportMDL) + { + IoFreeMdl(DeviceExtension->ReportMDL); + DeviceExtension->ReportMDL = NULL; + } + + if (DeviceExtension->Report) + { + ExFreePool(DeviceExtension->Report); + DeviceExtension->Report = NULL; + } + + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI KbdHid_Flush( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) @@ -818,6 +859,10 @@ switch (IoStack->MinorFunction) { case IRP_MN_STOP_DEVICE: + case IRP_MN_SURPRISE_REMOVAL: + /* free resources */ + KbdHid_FreeResources(DeviceObject); + /* fall through */ case IRP_MN_CANCEL_REMOVE_DEVICE: case IRP_MN_QUERY_STOP_DEVICE: case IRP_MN_CANCEL_STOP_DEVICE: @@ -836,6 +881,9 @@ /* cancel irp */ IoCancelIrp(DeviceExtension->Irp); + + /* free resources */ + KbdHid_FreeResources(DeviceObject); /* indicate success */ Irp->IoStatus.Status = STATUS_SUCCESS; Modified: trunk/reactos/drivers/hid/mouhid/mouhid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/mouhid/mouhid.… ============================================================================== --- trunk/reactos/drivers/hid/mouhid/mouhid.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/mouhid/mouhid.c [iso-8859-1] Sat May 11 12:17:36 2013 @@ -904,6 +904,47 @@ NTSTATUS NTAPI +MouHid_FreeResources( + IN PDEVICE_OBJECT DeviceObject) +{ + PMOUHID_DEVICE_EXTENSION DeviceExtension; + + /* get device extension */ + DeviceExtension = DeviceObject->DeviceExtension; + + /* free resources */ + if (DeviceExtension->PreparsedData) + { + ExFreePool(DeviceExtension->PreparsedData); + DeviceExtension->PreparsedData = NULL; + } + + if (DeviceExtension->CurrentUsageList) + { + ExFreePool(DeviceExtension->CurrentUsageList); + DeviceExtension->CurrentUsageList = NULL; + DeviceExtension->PreviousUsageList = NULL; + DeviceExtension->MakeUsageList = NULL; + DeviceExtension->BreakUsageList = NULL; + } + + if (DeviceExtension->ReportMDL) + { + IoFreeMdl(DeviceExtension->ReportMDL); + DeviceExtension->ReportMDL = NULL; + } + + if (DeviceExtension->Report) + { + ExFreePool(DeviceExtension->Report); + DeviceExtension->Report = NULL; + } + + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI MouHid_Flush( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) @@ -949,6 +990,9 @@ switch (IoStack->MinorFunction) { case IRP_MN_STOP_DEVICE: + case IRP_MN_SURPRISE_REMOVAL: + /* free resources */ + MouHid_FreeResources(DeviceObject); case IRP_MN_CANCEL_REMOVE_DEVICE: case IRP_MN_QUERY_STOP_DEVICE: case IRP_MN_CANCEL_STOP_DEVICE: @@ -970,6 +1014,9 @@ /* cancel irp */ IoCancelIrp(DeviceExtension->Irp); + + /* free resources */ + MouHid_FreeResources(DeviceObject); /* indicate success */ Irp->IoStatus.Status = STATUS_SUCCESS;

11 years, 7 months

[tfaber] 58992: [KBDHID][MOUHID] - Properly stub DispatchPower - Implement DispatchSystemControl

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat May 11 12:08:46 2013 New Revision: 58992 URL: http://svn.reactos.org/svn/reactos?rev=58992&view=rev Log: [KBDHID][MOUHID] - Properly stub DispatchPower - Implement DispatchSystemControl Modified: trunk/reactos/drivers/hid/kbdhid/kbdhid.c trunk/reactos/drivers/hid/mouhid/mouhid.c Modified: trunk/reactos/drivers/hid/kbdhid/kbdhid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/kbdhid/kbdhid.… ============================================================================== --- trunk/reactos/drivers/hid/kbdhid/kbdhid.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/kbdhid/kbdhid.c [iso-8859-1] Sat May 11 12:08:46 2013 @@ -50,7 +50,7 @@ /* get device extension */ DeviceExtension = (PKBDHID_DEVICE_EXTENSION)Context; - for (Index = 0; Index < Length; Index++) + for(Index = 0; Index < Length; Index++) { DPRINT("[KBDHID] ScanCode Index %lu ScanCode %x\n", Index, NewScanCodes[Index] & 0xFF); @@ -368,59 +368,59 @@ switch (IoStack->Parameters.DeviceIoControl.IoControlCode) { case IOCTL_KEYBOARD_QUERY_ATTRIBUTES: - /* verify output buffer length */ - if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(MOUSE_ATTRIBUTES)) - { - /* invalid request */ - DPRINT1("[MOUHID] IOCTL_MOUSE_QUERY_ATTRIBUTES Buffer too small\n"); - Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_BUFFER_TOO_SMALL; - } - - /* get output buffer */ - Attributes = (PKEYBOARD_ATTRIBUTES)Irp->AssociatedIrp.SystemBuffer; - - /* copy attributes */ + /* verify output buffer length */ + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(MOUSE_ATTRIBUTES)) + { + /* invalid request */ + DPRINT1("[MOUHID] IOCTL_MOUSE_QUERY_ATTRIBUTES Buffer too small\n"); + Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_BUFFER_TOO_SMALL; + } + + /* get output buffer */ + Attributes = (PKEYBOARD_ATTRIBUTES)Irp->AssociatedIrp.SystemBuffer; + + /* copy attributes */ RtlCopyMemory(Attributes, &DeviceExtension->Attributes, sizeof(KEYBOARD_ATTRIBUTES)); - /* complete request */ - Irp->IoStatus.Information = sizeof(MOUSE_ATTRIBUTES); - Irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_SUCCESS; + /* complete request */ + Irp->IoStatus.Information = sizeof(MOUSE_ATTRIBUTES); + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; case IOCTL_INTERNAL_KEYBOARD_CONNECT: /* verify input buffer length */ - if (IoStack->Parameters.DeviceIoControl.InputBufferLength < sizeof(CONNECT_DATA)) - { - /* invalid request */ - Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_INVALID_PARAMETER; - } - - /* is it already connected */ - if (DeviceExtension->ClassService) - { - /* already connected */ - Irp->IoStatus.Status = STATUS_SHARING_VIOLATION; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_SHARING_VIOLATION; - } - - /* get connect data */ - Data = (PCONNECT_DATA)IoStack->Parameters.DeviceIoControl.Type3InputBuffer; - - /* store connect details */ - DeviceExtension->ClassDeviceObject = Data->ClassDeviceObject; - DeviceExtension->ClassService = Data->ClassService; - - /* completed successfully */ - Irp->IoStatus.Status = STATUS_SUCCESS; + if (IoStack->Parameters.DeviceIoControl.InputBufferLength < sizeof(CONNECT_DATA)) + { + /* invalid request */ + Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_INVALID_PARAMETER; + } + + /* is it already connected */ + if (DeviceExtension->ClassService) + { + /* already connected */ + Irp->IoStatus.Status = STATUS_SHARING_VIOLATION; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SHARING_VIOLATION; + } + + /* get connect data */ + Data = (PCONNECT_DATA)IoStack->Parameters.DeviceIoControl.Type3InputBuffer; + + /* store connect details */ + DeviceExtension->ClassDeviceObject = Data->ClassDeviceObject; + DeviceExtension->ClassService = Data->ClassService; + + /* completed successfully */ + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_SUCCESS; case IOCTL_INTERNAL_KEYBOARD_DISCONNECT: @@ -444,11 +444,11 @@ case IOCTL_KEYBOARD_QUERY_INDICATORS: if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(KEYBOARD_INDICATOR_PARAMETERS)) { - /* invalid parameter */ - Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_INVALID_PARAMETER; - } + /* invalid parameter */ + Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_INVALID_PARAMETER; + } /* copy indicators */ RtlCopyMemory(Irp->AssociatedIrp.SystemBuffer, @@ -477,8 +477,8 @@ /* done */ Irp->IoStatus.Status = STATUS_SUCCESS; - Irp->IoStatus.Information = sizeof(KEYBOARD_TYPEMATIC_PARAMETERS); - IoCompleteRequest(Irp, IO_NO_INCREMENT); + Irp->IoStatus.Information = sizeof(KEYBOARD_TYPEMATIC_PARAMETERS); + IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_SUCCESS; case IOCTL_KEYBOARD_SET_INDICATORS: @@ -523,10 +523,10 @@ case IOCTL_KEYBOARD_QUERY_INDICATOR_TRANSLATION: /* not implemented */ - DPRINT1("IOCTL_KEYBOARD_QUERY_INDICATOR_TRANSLATION not implemented\n"); - Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_NOT_IMPLEMENTED; + DPRINT1("IOCTL_KEYBOARD_QUERY_INDICATOR_TRANSLATION not implemented\n"); + Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_NOT_IMPLEMENTED; } /* unknown control code */ @@ -561,8 +561,25 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; + PKBDHID_DEVICE_EXTENSION DeviceExtension; + + DeviceExtension = DeviceObject->DeviceExtension; + PoStartNextPowerIrp(Irp); + IoSkipCurrentIrpStackLocation(Irp); + return PoCallDriver(DeviceExtension->NextDeviceObject, Irp); +} + +NTSTATUS +NTAPI +KbdHid_SystemControl( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PKBDHID_DEVICE_EXTENSION DeviceExtension; + + DeviceExtension = DeviceObject->DeviceExtension; + IoSkipCurrentIrpStackLocation(Irp); + return IoCallDriver(DeviceExtension->NextDeviceObject, Irp); } NTSTATUS @@ -800,84 +817,84 @@ switch (IoStack->MinorFunction) { - case IRP_MN_STOP_DEVICE: - case IRP_MN_CANCEL_REMOVE_DEVICE: - case IRP_MN_QUERY_STOP_DEVICE: - case IRP_MN_CANCEL_STOP_DEVICE: - case IRP_MN_QUERY_REMOVE_DEVICE: - /* indicate success */ - Irp->IoStatus.Status = STATUS_SUCCESS; - - /* skip irp stack location */ - IoSkipCurrentIrpStackLocation(Irp); - - /* dispatch to lower device */ - return IoCallDriver(DeviceExtension->NextDeviceObject, Irp); - - case IRP_MN_REMOVE_DEVICE: - /* FIXME synchronization */ - - /* cancel irp */ - IoCancelIrp(DeviceExtension->Irp); - - /* indicate success */ - Irp->IoStatus.Status = STATUS_SUCCESS; - - /* skip irp stack location */ - IoSkipCurrentIrpStackLocation(Irp); - - /* dispatch to lower device */ - Status = IoCallDriver(DeviceExtension->NextDeviceObject, Irp); - - IoFreeIrp(DeviceExtension->Irp); - IoDetachDevice(DeviceExtension->NextDeviceObject); - IoDeleteDevice(DeviceObject); - return Status; - - case IRP_MN_START_DEVICE: - /* init event */ - KeInitializeEvent(&Event, NotificationEvent, FALSE); - - /* copy stack location */ - IoCopyCurrentIrpStackLocationToNext (Irp); - - /* set completion routine */ - IoSetCompletionRoutine(Irp, KbdHid_StartDeviceCompletion, &Event, TRUE, TRUE, TRUE); - Irp->IoStatus.Status = 0; - - /* pass request */ - Status = IoCallDriver(DeviceExtension->NextDeviceObject, Irp); - if (Status == STATUS_PENDING) - { - KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); - Status = Irp->IoStatus.Status; - } - - if (!NT_SUCCESS(Status)) - { - /* failed */ - Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return Status; - } - - /* lets start the device */ - Status = KbdHid_StartDevice(DeviceObject); - DPRINT("KbdHid_StartDevice %x\n", Status); - - /* complete request */ + case IRP_MN_STOP_DEVICE: + case IRP_MN_CANCEL_REMOVE_DEVICE: + case IRP_MN_QUERY_STOP_DEVICE: + case IRP_MN_CANCEL_STOP_DEVICE: + case IRP_MN_QUERY_REMOVE_DEVICE: + /* indicate success */ + Irp->IoStatus.Status = STATUS_SUCCESS; + + /* skip irp stack location */ + IoSkipCurrentIrpStackLocation(Irp); + + /* dispatch to lower device */ + return IoCallDriver(DeviceExtension->NextDeviceObject, Irp); + + case IRP_MN_REMOVE_DEVICE: + /* FIXME synchronization */ + + /* cancel irp */ + IoCancelIrp(DeviceExtension->Irp); + + /* indicate success */ + Irp->IoStatus.Status = STATUS_SUCCESS; + + /* skip irp stack location */ + IoSkipCurrentIrpStackLocation(Irp); + + /* dispatch to lower device */ + Status = IoCallDriver(DeviceExtension->NextDeviceObject, Irp); + + IoFreeIrp(DeviceExtension->Irp); + IoDetachDevice(DeviceExtension->NextDeviceObject); + IoDeleteDevice(DeviceObject); + return Status; + + case IRP_MN_START_DEVICE: + /* init event */ + KeInitializeEvent(&Event, NotificationEvent, FALSE); + + /* copy stack location */ + IoCopyCurrentIrpStackLocationToNext (Irp); + + /* set completion routine */ + IoSetCompletionRoutine(Irp, KbdHid_StartDeviceCompletion, &Event, TRUE, TRUE, TRUE); + Irp->IoStatus.Status = 0; + + /* pass request */ + Status = IoCallDriver(DeviceExtension->NextDeviceObject, Irp); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + Status = Irp->IoStatus.Status; + } + + if (!NT_SUCCESS(Status)) + { + /* failed */ Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); - - /* done */ return Status; - - default: - /* skip irp stack location */ - IoSkipCurrentIrpStackLocation(Irp); - - /* dispatch to lower device */ - return IoCallDriver(DeviceExtension->NextDeviceObject, Irp); + } + + /* lets start the device */ + Status = KbdHid_StartDevice(DeviceObject); + DPRINT("KbdHid_StartDevice %x\n", Status); + + /* complete request */ + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + /* done */ + return Status; + + default: + /* skip irp stack location */ + IoSkipCurrentIrpStackLocation(Irp); + + /* dispatch to lower device */ + return IoCallDriver(DeviceExtension->NextDeviceObject, Irp); } } @@ -980,6 +997,7 @@ DriverObject->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = KbdHid_InternalDeviceControl; DriverObject->MajorFunction[IRP_MJ_POWER] = KbdHid_Power; DriverObject->MajorFunction[IRP_MJ_PNP] = KbdHid_Pnp; + DriverObject->MajorFunction[IRP_MJ_SYSTEM_CONTROL] = KbdHid_SystemControl; DriverObject->DriverUnload = KbdHid_Unload; DriverObject->DriverExtension->AddDevice = KbdHid_AddDevice; Modified: trunk/reactos/drivers/hid/mouhid/mouhid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/mouhid/mouhid.… ============================================================================== --- trunk/reactos/drivers/hid/mouhid/mouhid.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/mouhid/mouhid.c [iso-8859-1] Sat May 11 12:08:46 2013 @@ -179,7 +179,7 @@ /* move to next index*/ Index++; - } while (Index < DeviceExtension->UsageListLength); + }while(Index < DeviceExtension->UsageListLength); } if (DeviceExtension->UsageListLength) @@ -200,7 +200,7 @@ /* move to next index*/ Index++; - } while (Index < DeviceExtension->UsageListLength); + }while(Index < DeviceExtension->UsageListLength); } /* now switch the previous list with current list */ @@ -636,8 +636,25 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; + PMOUHID_DEVICE_EXTENSION DeviceExtension; + + DeviceExtension = DeviceObject->DeviceExtension; + PoStartNextPowerIrp(Irp); + IoSkipCurrentIrpStackLocation(Irp); + return PoCallDriver(DeviceExtension->NextDeviceObject, Irp); +} + +NTSTATUS +NTAPI +MouHid_SystemControl( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PMOUHID_DEVICE_EXTENSION DeviceExtension; + + DeviceExtension = DeviceObject->DeviceExtension; + IoSkipCurrentIrpStackLocation(Irp); + return IoCallDriver(DeviceExtension->NextDeviceObject, Irp); } NTSTATUS @@ -843,7 +860,7 @@ &ValueCaps, &ValueCapsLength, PreparsedData); - if (Status == HIDP_STATUS_SUCCESS) + if (Status == HIDP_STATUS_SUCCESS ) { /* mouse has wheel support */ DeviceExtension->MouseIdentifier = WHEELMOUSE_HID_HARDWARE; @@ -931,97 +948,97 @@ switch (IoStack->MinorFunction) { - case IRP_MN_STOP_DEVICE: - case IRP_MN_CANCEL_REMOVE_DEVICE: - case IRP_MN_QUERY_STOP_DEVICE: - case IRP_MN_CANCEL_STOP_DEVICE: - case IRP_MN_QUERY_REMOVE_DEVICE: - /* indicate success */ - Irp->IoStatus.Status = STATUS_SUCCESS; - - /* skip irp stack location */ - IoSkipCurrentIrpStackLocation(Irp); - - /* dispatch to lower device */ - return IoCallDriver(DeviceExtension->NextDeviceObject, Irp); - - case IRP_MN_REMOVE_DEVICE: - /* FIXME synchronization */ - - /* request stop */ - DeviceExtension->StopReadReport = TRUE; - - /* cancel irp */ - IoCancelIrp(DeviceExtension->Irp); - - /* indicate success */ - Irp->IoStatus.Status = STATUS_SUCCESS; - - /* skip irp stack location */ - IoSkipCurrentIrpStackLocation(Irp); - - /* dispatch to lower device */ - Status = IoCallDriver(DeviceExtension->NextDeviceObject, Irp); - - /* wait for completion of stop event */ - KeWaitForSingleObject(&DeviceExtension->ReadCompletionEvent, Executive, KernelMode, FALSE, NULL); - - /* free irp */ - IoFreeIrp(DeviceExtension->Irp); - - /* detach device */ - IoDetachDevice(DeviceExtension->NextDeviceObject); - - /* delete device */ - IoDeleteDevice(DeviceObject); - - /* done */ - return Status; - - case IRP_MN_START_DEVICE: - /* init event */ - KeInitializeEvent(&Event, NotificationEvent, FALSE); - - /* copy stack location */ - IoCopyCurrentIrpStackLocationToNext (Irp); - - /* set completion routine */ - IoSetCompletionRoutine(Irp, MouHid_StartDeviceCompletion, &Event, TRUE, TRUE, TRUE); - Irp->IoStatus.Status = 0; - - /* pass request */ - Status = IoCallDriver(DeviceExtension->NextDeviceObject, Irp); - if (Status == STATUS_PENDING) - { - KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); - Status = Irp->IoStatus.Status; - } - - if (!NT_SUCCESS(Status)) - { - /* failed */ - Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return Status; - } - - /* lets start the device */ - Status = MouHid_StartDevice(DeviceObject); - DPRINT("MouHid_StartDevice %x\n", Status); - - /* complete request */ + case IRP_MN_STOP_DEVICE: + case IRP_MN_CANCEL_REMOVE_DEVICE: + case IRP_MN_QUERY_STOP_DEVICE: + case IRP_MN_CANCEL_STOP_DEVICE: + case IRP_MN_QUERY_REMOVE_DEVICE: + /* indicate success */ + Irp->IoStatus.Status = STATUS_SUCCESS; + + /* skip irp stack location */ + IoSkipCurrentIrpStackLocation(Irp); + + /* dispatch to lower device */ + return IoCallDriver(DeviceExtension->NextDeviceObject, Irp); + + case IRP_MN_REMOVE_DEVICE: + /* FIXME synchronization */ + + /* request stop */ + DeviceExtension->StopReadReport = TRUE; + + /* cancel irp */ + IoCancelIrp(DeviceExtension->Irp); + + /* indicate success */ + Irp->IoStatus.Status = STATUS_SUCCESS; + + /* skip irp stack location */ + IoSkipCurrentIrpStackLocation(Irp); + + /* dispatch to lower device */ + Status = IoCallDriver(DeviceExtension->NextDeviceObject, Irp); + + /* wait for completion of stop event */ + KeWaitForSingleObject(&DeviceExtension->ReadCompletionEvent, Executive, KernelMode, FALSE, NULL); + + /* free irp */ + IoFreeIrp(DeviceExtension->Irp); + + /* detach device */ + IoDetachDevice(DeviceExtension->NextDeviceObject); + + /* delete device */ + IoDeleteDevice(DeviceObject); + + /* done */ + return Status; + + case IRP_MN_START_DEVICE: + /* init event */ + KeInitializeEvent(&Event, NotificationEvent, FALSE); + + /* copy stack location */ + IoCopyCurrentIrpStackLocationToNext (Irp); + + /* set completion routine */ + IoSetCompletionRoutine(Irp, MouHid_StartDeviceCompletion, &Event, TRUE, TRUE, TRUE); + Irp->IoStatus.Status = 0; + + /* pass request */ + Status = IoCallDriver(DeviceExtension->NextDeviceObject, Irp); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + Status = Irp->IoStatus.Status; + } + + if (!NT_SUCCESS(Status)) + { + /* failed */ Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); - - /* done */ return Status; - - default: - /* skip irp stack location */ - IoSkipCurrentIrpStackLocation(Irp); - - /* dispatch to lower device */ - return IoCallDriver(DeviceExtension->NextDeviceObject, Irp); + } + + /* lets start the device */ + Status = MouHid_StartDevice(DeviceObject); + DPRINT("MouHid_StartDevice %x\n", Status); + + /* complete request */ + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + /* done */ + return Status; + + default: + /* skip irp stack location */ + IoSkipCurrentIrpStackLocation(Irp); + + /* dispatch to lower device */ + return IoCallDriver(DeviceExtension->NextDeviceObject, Irp); } } @@ -1116,6 +1133,7 @@ DriverObject->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = MouHid_InternalDeviceControl; DriverObject->MajorFunction[IRP_MJ_POWER] = MouHid_Power; DriverObject->MajorFunction[IRP_MJ_PNP] = MouHid_Pnp; + DriverObject->MajorFunction[IRP_MJ_SYSTEM_CONTROL] = MouHid_SystemControl; DriverObject->DriverUnload = MouHid_Unload; DriverObject->DriverExtension->AddDevice = MouHid_AddDevice;

11 years, 7 months

[akhaldi] 58991: [FS_REC] * Properly mark some unreferenced parameters as such.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat May 11 11:13:23 2013 New Revision: 58991 URL: http://svn.reactos.org/svn/reactos?rev=58991&view=rev Log: [FS_REC] * Properly mark some unreferenced parameters as such. Modified: trunk/reactos/drivers/filesystems/fs_rec/ext2.c trunk/reactos/drivers/filesystems/fs_rec/fs_rec.c trunk/reactos/drivers/filesystems/fs_rec/ntfs.c Modified: trunk/reactos/drivers/filesystems/fs_rec/ext2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fs_rec… ============================================================================== --- trunk/reactos/drivers/filesystems/fs_rec/ext2.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fs_rec/ext2.c [iso-8859-1] Sat May 11 11:13:23 2013 @@ -18,6 +18,7 @@ NTAPI FsRecIsExt2Volume(IN PVOID PackedBootSector) { + UNREFERENCED_PARAMETER(PackedBootSector); /* For now, always return failure... */ return FALSE; } Modified: trunk/reactos/drivers/filesystems/fs_rec/fs_rec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fs_rec… ============================================================================== --- trunk/reactos/drivers/filesystems/fs_rec/fs_rec.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fs_rec/fs_rec.c [iso-8859-1] Sat May 11 11:13:23 2013 @@ -84,6 +84,8 @@ NTSTATUS Status; PAGED_CODE(); + UNREFERENCED_PARAMETER(DeviceObject); + /* Make sure we have a file name */ if (IoStack->FileObject->FileName.Length) { @@ -110,6 +112,8 @@ IN PIRP Irp) { PAGED_CODE(); + + UNREFERENCED_PARAMETER(DeviceObject); /* Just complete the IRP and return success */ IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -296,6 +300,8 @@ PDEVICE_OBJECT UdfsObject; PAGED_CODE(); + UNREFERENCED_PARAMETER(RegistryPath); + /* Page the entire driver */ MmPageEntireDriver(DriverEntry); Modified: trunk/reactos/drivers/filesystems/fs_rec/ntfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fs_rec… ============================================================================== --- trunk/reactos/drivers/filesystems/fs_rec/ntfs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fs_rec/ntfs.c [iso-8859-1] Sat May 11 11:13:23 2013 @@ -23,6 +23,9 @@ { /* Assume failure */ BOOLEAN Result = FALSE; + + UNREFERENCED_PARAMETER(BytesPerSector); + UNREFERENCED_PARAMETER(NumberOfSectors); PAGED_CODE();

11 years, 7 months

← Newer
1
...
11
12
13
14
15
16
17
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2013