Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 55936: [NTOSKRNL] Implement FsRtlNotifyFilterChangeDirectory
by pschweitzer＠svn.reactos.org 29 Feb '12

29 Feb '12

Author: pschweitzer Date: Wed Feb 29 20:11:51 2012 New Revision: 55936 URL: http://svn.reactos.org/svn/reactos?rev=55936&view=rev Log: [NTOSKRNL] Implement FsRtlNotifyFilterChangeDirectory Modified: trunk/reactos/ntoskrnl/fsrtl/notify.c Modified: trunk/reactos/ntoskrnl/fsrtl/notify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/notify.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/notify.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/notify.c [iso-8859-1] Wed Feb 29 20:11:51 2012 @@ -501,7 +501,180 @@ IN PSECURITY_SUBJECT_CONTEXT SubjectContext OPTIONAL, IN PFILTER_REPORT_CHANGE FilterCallback OPTIONAL) { - KeBugCheck(FILE_SYSTEM); + ULONG SavedLength; + PIO_STACK_LOCATION Stack; + PNOTIFY_CHANGE NotifyChange; + PREAL_NOTIFY_SYNC RealNotifySync; + + PAGED_CODE(); + + DPRINT("FsRtlNotifyFilterChangeDirectory(): %p, %p, %p, %wZ, %d, %d, %u, %p, %p, %p, %p\n", + NotifySync, NotifyList, FsContext, FullDirectoryName, WatchTree, IgnoreBuffer, CompletionFilter, NotifyIrp, + TraverseCallback, SubjectContext, FilterCallback); + + /* Get real structure hidden behind the opaque pointer */ + RealNotifySync = (PREAL_NOTIFY_SYNC)NotifySync; + + /* Acquire the fast mutex */ + FsRtlNotifyAcquireFastMutex(RealNotifySync); + + _SEH2_TRY + { + /* If we have no IRP, FSD is performing a cleanup */ + if (!NotifyIrp) + { + /* So, we delete */ + FsRtlCheckNotifyForDelete(NotifyList, FsContext); + _SEH2_LEAVE; + } + + NotifyIrp->IoStatus.Status = STATUS_SUCCESS; + NotifyIrp->IoStatus.Information = (ULONG_PTR)NULL; + + Stack = IoGetCurrentIrpStackLocation(NotifyIrp); + /* If FileObject's been cleaned up, just return */ + if (Stack->FileObject->Flags & FO_CLEANUP_COMPLETE) + { + IoMarkIrpPending(NotifyIrp); + NotifyIrp->IoStatus.Status = STATUS_NOTIFY_CLEANUP; + IofCompleteRequest(NotifyIrp, EVENT_INCREMENT); + _SEH2_LEAVE; + } + + /* Try to find a matching notification has been already registered */ + NotifyChange = FsRtlIsNotifyOnList(NotifyList, FsContext); + if (NotifyChange) + { + /* If it's been found, and is cleaned up, immediatly complete */ + if (NotifyChange->Flags & CLEANUP_IN_PROCESS) + { + IoMarkIrpPending(NotifyIrp); + NotifyIrp->IoStatus.Status = STATUS_NOTIFY_CLEANUP; + IofCompleteRequest(NotifyIrp, EVENT_INCREMENT); + } + /* Or if it's about to be deleted, complete */ + else if (NotifyChange->Flags & DELETE_IN_PROCESS) + { + IoMarkIrpPending(NotifyIrp); + NotifyIrp->IoStatus.Status = STATUS_DELETE_PENDING; + IofCompleteRequest(NotifyIrp, EVENT_INCREMENT); + } + /* Complete if there is directory enumeration and no buffer available any more */ + if ((NotifyChange->Flags & INVALIDATE_BUFFERS) && (NotifyChange->Flags & ENUMERATE_DIR)) + { + NotifyChange->Flags &= ~INVALIDATE_BUFFERS; + IoMarkIrpPending(NotifyIrp); + NotifyIrp->IoStatus.Status = STATUS_NOTIFY_ENUM_DIR; + IofCompleteRequest(NotifyIrp, EVENT_INCREMENT); + } + /* If no data yet, or directory enumeration, handle */ + else if (NotifyChange->DataLength == 0 || (NotifyChange->Flags & ENUMERATE_DIR)) + { + goto HandleIRP; + } + /* Else, just complete with we have */ + else + { + SavedLength = NotifyChange->DataLength; + NotifyChange->DataLength = 0; + FsRtlNotifyCompleteIrp(NotifyIrp, NotifyChange, SavedLength, STATUS_SUCCESS, FALSE); + } + + _SEH2_LEAVE; + } + + /* Allocate new notification */ + NotifyChange = ExAllocatePoolWithTag(PagedPool | POOL_RAISE_IF_ALLOCATION_FAILURE, + sizeof(NOTIFY_CHANGE), 'FSrN'); + RtlZeroMemory(NotifyChange, sizeof(NOTIFY_CHANGE)); + + /* Set basic information */ + NotifyChange->NotifySync = NotifySync; + NotifyChange->FsContext = FsContext; + NotifyChange->StreamID = Stack->FileObject->FsContext; + NotifyChange->TraverseCallback = TraverseCallback; + NotifyChange->SubjectContext = SubjectContext; + NotifyChange->FullDirectoryName = FullDirectoryName; + NotifyChange->FilterCallback = FilterCallback; + InitializeListHead(&(NotifyChange->NotifyIrps)); + + /* Keep trace of WatchTree */ + if (WatchTree) + { + NotifyChange->Flags |= WATCH_TREE; + } + + /* If string is empty, faulty to ANSI */ + if (FullDirectoryName->Length == 0) + { + NotifyChange->CharacterSize = sizeof(CHAR); + } + else + { + /* If it can't contain WCHAR, it's ANSI */ + if (FullDirectoryName->Length < sizeof(WCHAR)) + { + NotifyChange->CharacterSize = sizeof(CHAR); + } + /* First char is \, so in unicode, right part is 0 + * whereas in ANSI it contains next char + */ + else if (((CHAR*)FullDirectoryName->Buffer)[1] == 0) + { + NotifyChange->CharacterSize = sizeof(WCHAR); + } + else + { + NotifyChange->CharacterSize = sizeof(CHAR); + } + + /* Now, check is user is willing to watch root */ + if (FullDirectoryName->Length == NotifyChange->CharacterSize) + { + NotifyChange->Flags |= WATCH_ROOT; + } + } + + NotifyChange->CompletionFilter = CompletionFilter; + + /* In case we have not to ignore buffer , keep its length */ + if (!IgnoreBuffer) + { + NotifyChange->BufferLength = Stack->Parameters.NotifyDirectory.Length; + } + + NotifyChange->OwningProcess = NotifyIrp->Tail.Overlay.Thread->ThreadsProcess; + + /* Insert the notification into the notification list */ + InsertTailList(NotifyList, &(NotifyChange->NotifyList)); + + NotifyChange->ReferenceCount = 1; + +HandleIRP: + /* Associate the notification to the IRP */ + NotifyIrp->IoStatus.Information = (ULONG_PTR)NotifyChange; + /* The IRP is pending */ + IoMarkIrpPending(NotifyIrp); + /* Insert the IRP in the IRP list */ + InsertTailList(&(NotifyChange->NotifyIrps), &(NotifyIrp->Tail.Overlay.ListEntry)); + /* Increment reference count */ + InterlockedIncrement((PLONG)&(NotifyChange->ReferenceCount)); + /* Set cancel routine to FsRtl one */ + FsRtlNotifySetCancelRoutine(NotifyIrp, NULL); + } + _SEH2_FINALLY + { + /* Release fast mutex */ + FsRtlNotifyReleaseFastMutex(RealNotifySync); + + /* If the subject security context was captured and there's no notify */ + if (SubjectContext && (!NotifyChange || FullDirectoryName)) + { + SeReleaseSubjectContext(SubjectContext); + ExFreePool(SubjectContext); + } + } + _SEH2_END; } /*++

1 0

[pschweitzer] 55935: [NTOSKRNL] Forgot to commit that file
by pschweitzer＠svn.reactos.org 29 Feb '12

29 Feb '12

Author: pschweitzer Date: Wed Feb 29 20:03:46 2012 New Revision: 55935 URL: http://svn.reactos.org/svn/reactos?rev=55935&view=rev Log: [NTOSKRNL] Forgot to commit that file Modified: trunk/reactos/ntoskrnl/include/internal/fsrtl.h Modified: trunk/reactos/ntoskrnl/include/internal/fsrtl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/fsrtl.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/fsrtl.h [iso-8859-1] Wed Feb 29 20:03:46 2012 @@ -52,7 +52,12 @@ // // Notifications flags // -#define CLEANUP_IN_PROCESS 4 +#define WATCH_TREE 0x01 +#define INVALIDATE_BUFFERS 0x02 +#define CLEANUP_IN_PROCESS 0x04 +#define ENUMERATE_DIR 0x08 +#define WATCH_ROOT 0x10 +#define DELETE_IN_PROCESS 0x20 // // Internal structure for NOTIFY_SYNC

1 0

[pschweitzer] 55934: [NTOSKRNL] Stub FsRtlCancelNotify Implement FsRtlCheckNotifyForDelete, FsRtlNotifyCompleteIrp, FsRtlNotifyCompleteIrpList, FsRtlNotifySetCancelRoutine
by pschweitzer＠svn.reactos.org 29 Feb '12

29 Feb '12

Author: pschweitzer Date: Wed Feb 29 20:01:21 2012 New Revision: 55934 URL: http://svn.reactos.org/svn/reactos?rev=55934&view=rev Log: [NTOSKRNL] Stub FsRtlCancelNotify Implement FsRtlCheckNotifyForDelete, FsRtlNotifyCompleteIrp, FsRtlNotifyCompleteIrpList, FsRtlNotifySetCancelRoutine Modified: trunk/reactos/ntoskrnl/fsrtl/notify.c Modified: trunk/reactos/ntoskrnl/fsrtl/notify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/notify.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/notify.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/notify.c [iso-8859-1] Wed Feb 29 20:01:21 2012 @@ -13,6 +13,50 @@ #include <debug.h> /* PRIVATE FUNCTIONS *********************************************************/ + +VOID +FsRtlNotifyCompleteIrpList(IN PNOTIFY_CHANGE NotifyChange, + IN NTSTATUS Status); + +BOOLEAN +FsRtlNotifySetCancelRoutine(IN PIRP Irp, + IN PNOTIFY_CHANGE NotifyChange OPTIONAL); + +VOID +NTAPI +FsRtlCancelNotify(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + IoReleaseCancelSpinLock(Irp->CancelIrql); + UNIMPLEMENTED; +} + +/* + * @implemented + */ +VOID +FsRtlCheckNotifyForDelete(IN PLIST_ENTRY NotifyList, + IN PVOID FsContext) +{ + PLIST_ENTRY NextEntry; + PNOTIFY_CHANGE NotifyChange; + + if (!IsListEmpty(NotifyList)) + { + /* Browse the notifications list to find the matching entry */ + for (NextEntry = NotifyList->Flink; + NextEntry != NotifyList; + NextEntry = NextEntry->Flink) + { + NotifyChange = CONTAINING_RECORD(NextEntry, NOTIFY_CHANGE, NotifyList); + /* If the current record matches with the given context, it's the good one */ + if (NotifyChange->FsContext == FsContext && !IsListEmpty(&(NotifyChange->NotifyIrps))) + { + FsRtlNotifyCompleteIrpList(NotifyChange, STATUS_DELETE_PENDING); + } + } + } +} PNOTIFY_CHANGE FsRtlIsNotifyOnList(IN PLIST_ENTRY NotifyList, @@ -55,10 +99,138 @@ RealNotifySync->OwnerCount++; } +/* + * @implemented + */ +VOID +FsRtlNotifyCompleteIrp(IN PIRP Irp, + IN PNOTIFY_CHANGE NotifyChange, + IN ULONG DataLength, + IN NTSTATUS Status, + IN BOOLEAN SkipCompletion) +{ + PVOID Buffer; + PIO_STACK_LOCATION Stack; + + PAGED_CODE(); + + /* Check if we need to complete */ + if (!FsRtlNotifySetCancelRoutine(Irp, NotifyChange) && SkipCompletion) + { + return; + } + + /* No succes => no data to return just complete */ + if (Status != STATUS_SUCCESS) + { + goto Completion; + } + + /* Ensure there's something to return */ + Stack = IoGetCurrentIrpStackLocation(Irp); + if (!DataLength || Stack->Parameters.NotifyDirectory.Length < DataLength) + { + Status = STATUS_NOTIFY_ENUM_DIR; + goto Completion; + } + + /* Ensture there's a buffer where to find data */ + if (!NotifyChange->AllocatedBuffer) + { + Irp->IoStatus.Information = DataLength; + NotifyChange->Buffer = NULL; + goto Completion; + } + + /* Now, browse all the way to return data + * and find the one that will work. We will + * return data whatever happens + */ + if (Irp->AssociatedIrp.SystemBuffer) + { + Buffer = Irp->AssociatedIrp.SystemBuffer; + goto CopyAndComplete; + } + + if (Irp->MdlAddress) + { + Buffer = MmGetSystemAddressForMdl(Irp->MdlAddress); + goto CopyAndComplete; + } + + if (!(Stack->Control & SL_PENDING_RETURNED)) + { + Buffer = Irp->UserBuffer; + goto CopyAndComplete; + } + + Irp->Flags |= (IRP_BUFFERED_IO | IRP_DEALLOCATE_BUFFER | IRP_SYNCHRONOUS_PAGING_IO); + Irp->AssociatedIrp.SystemBuffer = NotifyChange->AllocatedBuffer; + /* Nothing to copy */ + goto ReleaseAndComplete; + +CopyAndComplete: + _SEH2_TRY + { + RtlCopyMemory(Buffer, NotifyChange->AllocatedBuffer, DataLength); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Do nothing */ + } + _SEH2_END; + +ReleaseAndComplete: + PsReturnProcessPagedPoolQuota(NotifyChange->OwningProcess, NotifyChange->ThisBufferLength); + + /* Release buffer UNLESS it's used */ + if (NotifyChange->AllocatedBuffer != Irp->AssociatedIrp.SystemBuffer && + NotifyChange->AllocatedBuffer) + { + ExFreePoolWithTag(NotifyChange->AllocatedBuffer, 0); + } + + /* Prepare for return */ + NotifyChange->AllocatedBuffer = 0; + NotifyChange->ThisBufferLength = 0; + Irp->IoStatus.Information = DataLength; + NotifyChange->Buffer = NULL; + + /* Finally complete */ +Completion: + IoMarkIrpPending(Irp); + Irp->IoStatus.Status = Status; + IofCompleteRequest(Irp, EVENT_INCREMENT); +} + +/* + * @implemented + */ VOID FsRtlNotifyCompleteIrpList(IN PNOTIFY_CHANGE NotifyChange, IN NTSTATUS Status) { + PIRP Irp; + ULONG DataLength; + PLIST_ENTRY NextEntry; + + DataLength = NotifyChange->DataLength; + + NotifyChange->Flags &= (INVALIDATE_BUFFERS | WATCH_TREE); + NotifyChange->DataLength = 0; + NotifyChange->LastEntry = 0; + + while (!IsListEmpty(&(NotifyChange->NotifyIrps))) + { + /* We take the first entry */ + NextEntry = RemoveHeadList(&(NotifyChange->NotifyIrps)); + Irp = CONTAINING_RECORD(NextEntry, IRP, Tail.Overlay.ListEntry); + /* We complete it */ + FsRtlNotifyCompleteIrp(Irp, NotifyChange, DataLength, Status, TRUE); + /* If we're notifying success, just notify first one */ + if (Status == STATUS_SUCCESS) + break; + } } VOID @@ -72,6 +244,55 @@ ExReleaseFastMutexUnsafe(&(RealNotifySync->FastMutex)); RealNotifySync->OwningThread = (ULONG_PTR)0; } +} + +/* + * @implemented + */ +BOOLEAN +FsRtlNotifySetCancelRoutine(IN PIRP Irp, + IN PNOTIFY_CHANGE NotifyChange OPTIONAL) +{ + PDRIVER_CANCEL CancelRoutine; + + /* Acquire cancel lock */ + IoAcquireCancelSpinLock(&Irp->CancelIrql); + + /* If NotifyChange was given */ + if (NotifyChange) + { + /* First get cancel routine */ + CancelRoutine = IoSetCancelRoutine(Irp, NULL); + Irp->IoStatus.Information = 0; + /* Release cancel lock */ + IoReleaseCancelSpinLock(Irp->CancelIrql); + /* If there was a cancel routine */ + if (CancelRoutine) + { + /* Decrease reference count */ + InterlockedDecrement((PLONG)&NotifyChange->ReferenceCount); + /* Notify that we removed cancel routine */ + return TRUE; + } + } + else + { + /* If IRP is cancel, call FsRtl cancel routine */ + if (Irp->Cancel) + { + FsRtlCancelNotify(NULL, Irp); + } + else + { + /* Otherwise, define FsRtl cancel routine as IRP cancel routine */ + IoSetCancelRoutine(Irp, FsRtlCancelNotify); + /* Release lock */ + IoReleaseCancelSpinLock(Irp->CancelIrql); + } + } + + /* Return that we didn't removed cancel routine */ + return FALSE; } /* PUBLIC FUNCTIONS **********************************************************/

1 0

[cgutman] 55933: [ROSAUTOTEST] - Flush file buffers after writing to the crash recovery journal
by cgutman＠svn.reactos.org 29 Feb '12

29 Feb '12

Author: cgutman Date: Wed Feb 29 19:44:44 2012 New Revision: 55933 URL: http://svn.reactos.org/svn/reactos?rev=55933&view=rev Log: [ROSAUTOTEST] - Flush file buffers after writing to the crash recovery journal Modified: trunk/rostests/rosautotest/CJournaledTestList.cpp Modified: trunk/rostests/rosautotest/CJournaledTestList.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CJournaledTes… ============================================================================== --- trunk/rostests/rosautotest/CJournaledTestList.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CJournaledTestList.cpp [iso-8859-1] Wed Feb 29 19:44:44 2012 @@ -83,6 +83,7 @@ { DWORD BytesWritten; WriteFile(m_hJournal, String.c_str(), String.size() + 1, &BytesWritten, NULL); + FlushFileBuffers(m_hJournal); } /** @@ -98,6 +99,7 @@ { DWORD BytesWritten; WriteFile(m_hJournal, String.c_str(), (String.size() + 1) * sizeof(WCHAR), &BytesWritten, NULL); + FlushFileBuffers(m_hJournal); } /** @@ -169,6 +171,7 @@ } WriteFile(m_hJournal, &TerminatingNull, sizeof(TerminatingNull), &BytesWritten, NULL); + FlushFileBuffers(m_hJournal); CloseHandle(m_hJournal); m_hJournal = INVALID_HANDLE_VALUE; @@ -248,6 +251,7 @@ SetFilePointer(m_hJournal, sizeof(szJournalHeader), NULL, FILE_CURRENT); WriteFile(m_hJournal, &m_ListIterator, sizeof(m_ListIterator), &BytesWritten, NULL); + FlushFileBuffers(m_hJournal); CloseHandle(m_hJournal); m_hJournal = NULL;

1 0

[pschweitzer] 55932: [NTOSKRNL] Fix a bug in FsRtlNotifyCleanup: only remove notification from list when we're about to complete it.
by pschweitzer＠svn.reactos.org 29 Feb '12

29 Feb '12

Author: pschweitzer Date: Wed Feb 29 19:43:35 2012 New Revision: 55932 URL: http://svn.reactos.org/svn/reactos?rev=55932&view=rev Log: [NTOSKRNL] Fix a bug in FsRtlNotifyCleanup: only remove notification from list when we're about to complete it. Modified: trunk/reactos/ntoskrnl/fsrtl/notify.c Modified: trunk/reactos/ntoskrnl/fsrtl/notify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/notify.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/notify.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/notify.c [iso-8859-1] Wed Feb 29 19:43:35 2012 @@ -182,12 +182,13 @@ { FsRtlNotifyCompleteIrpList(NotifyChange, STATUS_NOTIFY_CLEANUP); } - /* Remove from the list */ - RemoveEntryList(&NotifyChange->NotifyList); - - /* Downcrease reference number and if 0 is reached, it's time to do complete cleanup */ + + /* Decrease reference number and if 0 is reached, it's time to do complete cleanup */ if (!InterlockedDecrement((PLONG)&(NotifyChange->ReferenceCount))) { + /* Remove it from the notifications list */ + RemoveEntryList(&NotifyChange->NotifyList); + /* In case there was an allocated buffer, free it */ if (NotifyChange->AllocatedBuffer) {

1 0

[pschweitzer] 55931: [NTOSKRNL] Fix formatting, no code change
by pschweitzer＠svn.reactos.org 29 Feb '12

29 Feb '12

Author: pschweitzer Date: Wed Feb 29 19:29:03 2012 New Revision: 55931 URL: http://svn.reactos.org/svn/reactos?rev=55931&view=rev Log: [NTOSKRNL] Fix formatting, no code change Modified: trunk/reactos/ntoskrnl/fsrtl/notify.c Modified: trunk/reactos/ntoskrnl/fsrtl/notify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/notify.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/notify.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/notify.c [iso-8859-1] Wed Feb 29 19:29:03 2012 @@ -208,15 +208,15 @@ } _SEH2_FINALLY { - /* Release fast mutex */ - FsRtlNotifyReleaseFastMutex(RealNotifySync); - - /* If the subject security context was captured, release and free it */ - if (SubjectContext) - { - SeReleaseSubjectContext(SubjectContext); - ExFreePool(SubjectContext); - } + /* Release fast mutex */ + FsRtlNotifyReleaseFastMutex(RealNotifySync); + + /* If the subject security context was captured, release and free it */ + if (SubjectContext) + { + SeReleaseSubjectContext(SubjectContext); + ExFreePool(SubjectContext); + } } _SEH2_END; }

1 0

[pschweitzer] 55930: [NTOSKRNL] Use LIST_ENTRY not pointer on them as head
by pschweitzer＠svn.reactos.org 29 Feb '12

29 Feb '12

Author: pschweitzer Date: Wed Feb 29 19:26:43 2012 New Revision: 55930 URL: http://svn.reactos.org/svn/reactos?rev=55930&view=rev Log: [NTOSKRNL] Use LIST_ENTRY not pointer on them as head Modified: trunk/reactos/ntoskrnl/fsrtl/notify.c trunk/reactos/ntoskrnl/include/internal/fsrtl.h Modified: trunk/reactos/ntoskrnl/fsrtl/notify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/notify.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/notify.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/notify.c [iso-8859-1] Wed Feb 29 19:26:43 2012 @@ -178,12 +178,12 @@ NotifyChange->Flags |= CLEANUP_IN_PROCESS; /* If there are pending IRPs, complete them using the STATUS_NOTIFY_CLEANUP status */ - if (!IsListEmpty(NotifyChange->NotifyIrps)) + if (!IsListEmpty(&NotifyChange->NotifyIrps)) { FsRtlNotifyCompleteIrpList(NotifyChange, STATUS_NOTIFY_CLEANUP); } /* Remove from the list */ - RemoveEntryList(NotifyChange->NotifyList); + RemoveEntryList(&NotifyChange->NotifyList); /* Downcrease reference number and if 0 is reached, it's time to do complete cleanup */ if (!InterlockedDecrement((PLONG)&(NotifyChange->ReferenceCount))) Modified: trunk/reactos/ntoskrnl/include/internal/fsrtl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/fsrtl.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/fsrtl.h [iso-8859-1] Wed Feb 29 19:26:43 2012 @@ -75,8 +75,8 @@ PCHECK_FOR_TRAVERSE_ACCESS TraverseCallback; PSECURITY_SUBJECT_CONTEXT SubjectContext; PSTRING FullDirectoryName; - PLIST_ENTRY NotifyList; - PLIST_ENTRY NotifyIrps; + LIST_ENTRY NotifyList; + LIST_ENTRY NotifyIrps; PFILTER_REPORT_CHANGE FilterCallback; USHORT Flags; UCHAR CharacterSize;

1 0

[pschweitzer] 55929: [NTOSKRNL] Get rid off TAG macro
by pschweitzer＠svn.reactos.org 29 Feb '12

29 Feb '12

Author: pschweitzer Date: Wed Feb 29 19:12:59 2012 New Revision: 55929 URL: http://svn.reactos.org/svn/reactos?rev=55929&view=rev Log: [NTOSKRNL] Get rid off TAG macro Modified: trunk/reactos/ntoskrnl/fsrtl/notify.c trunk/reactos/ntoskrnl/include/internal/fsrtl.h Modified: trunk/reactos/ntoskrnl/fsrtl/notify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/notify.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/notify.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/notify.c [iso-8859-1] Wed Feb 29 19:12:59 2012 @@ -495,7 +495,7 @@ *NotifySync = NULL; RealNotifySync = ExAllocatePoolWithTag(NonPagedPool | POOL_RAISE_IF_ALLOCATION_FAILURE, - sizeof(REAL_NOTIFY_SYNC), TAG('F', 'S', 'N', 'S')); + sizeof(REAL_NOTIFY_SYNC), 'FSNS'); ExInitializeFastMutex(&(RealNotifySync->FastMutex)); RealNotifySync->OwningThread = 0; RealNotifySync->OwnerCount = 0; @@ -570,7 +570,7 @@ { if (*NotifySync) { - ExFreePoolWithTag(*NotifySync, TAG('F', 'S', 'N', 'S')); + ExFreePoolWithTag(*NotifySync, 'FSNS'); *NotifySync = NULL; } } Modified: trunk/reactos/ntoskrnl/include/internal/fsrtl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/fsrtl.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/fsrtl.h [iso-8859-1] Wed Feb 29 19:12:59 2012 @@ -5,10 +5,6 @@ * PURPOSE: Internal header for the File System Runtime Library * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ - -#ifndef TAG -#define TAG(w,x,y,z) (((w)<<24)|((x)<<16)|((y)<<8)|(z)) -#endif // // Define this if you want debugging support

1 0

[cgutman] 55928: [USBEHCI] - Add back the m_PortResetInProgress hack for broken vbox behavior
by cgutman＠svn.reactos.org 29 Feb '12

29 Feb '12

Author: cgutman Date: Wed Feb 29 19:05:16 2012 New Revision: 55928 URL: http://svn.reactos.org/svn/reactos?rev=55928&view=rev Log: [USBEHCI] - Add back the m_PortResetInProgress hack for broken vbox behavior Modified: trunk/reactos/drivers/usb/usbehci/hardware.cpp Modified: trunk/reactos/drivers/usb/usbehci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/hardwa… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/hardware.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/hardware.cpp [iso-8859-1] Wed Feb 29 19:05:16 2012 @@ -99,6 +99,7 @@ ULONG m_WorkItemActive; // work item status ULONG m_SyncFramePhysAddr; // periodic frame list physical address BUS_INTERFACE_STANDARD m_BusInterface; // pci bus interface + BOOLEAN m_PortResetInProgress[0xF]; // stores reset in progress (vbox hack) // read register ULONG EHCI_READ_REGISTER_ULONG(ULONG Offset); @@ -357,8 +358,8 @@ DPRINT1("Controller has %d Length\n", m_Capabilities.Length); DPRINT1("Controller EHCI Version %x\n", m_Capabilities.HCIVersion); - DPRINT1("Controler EHCI Caps HCSParamsLong %x\n", m_Capabilities.HCSParamsLong); - DPRINT1("Controler EHCI Caps HCCParamsLong %x\n", m_Capabilities.HCCParamsLong); + DPRINT1("Controller EHCI Caps HCSParamsLong %x\n", m_Capabilities.HCSParamsLong); + DPRINT1("Controller EHCI Caps HCCParamsLong %x\n", m_Capabilities.HCCParamsLong); DPRINT1("Controller has %d Ports\n", m_Capabilities.HCSParams.PortCount); // @@ -977,7 +978,7 @@ Status |= USB_PORT_STATUS_OVER_CURRENT; // In a reset state? - if (Value & EHCI_PRT_RESET) + if ((Value & EHCI_PRT_RESET) || m_PortResetInProgress[PortId]) { Status |= USB_PORT_STATUS_RESET; Change |= USB_PORT_STATUS_RESET; @@ -1013,6 +1014,9 @@ if (Status == C_PORT_RESET) { + // reset done + m_PortResetInProgress[PortId] = FALSE; + // Clear reset Value = EHCI_READ_REGISTER_ULONG(EHCI_PORTSC + (4 * PortId)); Value &= (EHCI_PORTSC_DATAMASK | EHCI_PRT_ENABLED); @@ -1136,6 +1140,9 @@ // call the helper // ResetPort(PortId); + + // reset in progress + m_PortResetInProgress[PortId] = TRUE; // // is there a status change callback

1 0

[janderwald] 55927: [USBHUB] - Check if FDO is root hub fdo - Partly implement fdo hub initialization - Implement IOCTL_INTERNAL_USB_GET_DEVICE_HANDLE, IOCTL_INTERNAL_USB_GET_ROOTHUB_PDO
by janderwald＠svn.reactos.org 29 Feb '12

29 Feb '12

Author: janderwald Date: Wed Feb 29 18:51:07 2012 New Revision: 55927 URL: http://svn.reactos.org/svn/reactos?rev=55927&view=rev Log: [USBHUB] - Check if FDO is root hub fdo - Partly implement fdo hub initialization - Implement IOCTL_INTERNAL_USB_GET_DEVICE_HANDLE, IOCTL_INTERNAL_USB_GET_ROOTHUB_PDO Added: trunk/reactos/drivers/usb/usbhub/hub_fdo.c (with props) Modified: trunk/reactos/drivers/usb/usbhub/CMakeLists.txt trunk/reactos/drivers/usb/usbhub/fdo.c trunk/reactos/drivers/usb/usbhub/misc.c trunk/reactos/drivers/usb/usbhub/pdo.c trunk/reactos/drivers/usb/usbhub/usbhub.h Modified: trunk/reactos/drivers/usb/usbhub/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/CMakeLi… ============================================================================== --- trunk/reactos/drivers/usb/usbhub/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub/CMakeLists.txt [iso-8859-1] Wed Feb 29 18:51:07 2012 @@ -3,7 +3,7 @@ include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) -add_library(usbhub SHARED fdo.c misc.c pdo.c usbhub.c usbhub.rc) +add_library(usbhub SHARED fdo.c misc.c pdo.c hub_fdo.c usbhub.c usbhub.rc) target_link_libraries(usbhub ${PSEH_LIB}) Modified: trunk/reactos/drivers/usb/usbhub/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/fdo.c?r… ============================================================================== --- trunk/reactos/drivers/usb/usbhub/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub/fdo.c [iso-8859-1] Wed Feb 29 18:51:07 2012 @@ -27,71 +27,6 @@ IN PDEVICE_OBJECT UsbHubDeviceObject, IN LONG PortId); -NTSTATUS -SubmitRequestToRootHub( - IN PDEVICE_OBJECT RootHubDeviceObject, - IN ULONG IoControlCode, - OUT PVOID OutParameter1, - OUT PVOID OutParameter2) -{ - KEVENT Event; - PIRP Irp; - IO_STATUS_BLOCK IoStatus; - NTSTATUS Status; - PIO_STACK_LOCATION Stack = NULL; - - KeInitializeEvent(&Event, NotificationEvent, FALSE); - - // - // Build Control Request - // - Irp = IoBuildDeviceIoControlRequest(IoControlCode, - RootHubDeviceObject, - NULL, 0, - NULL, 0, - TRUE, - &Event, - &IoStatus); - - if (Irp == NULL) - { - DPRINT("Usbhub: IoBuildDeviceIoControlRequest() failed\n"); - return STATUS_INSUFFICIENT_RESOURCES; - } - - // - // Initialize the status block before sending the IRP - // - IoStatus.Status = STATUS_NOT_SUPPORTED; - IoStatus.Information = 0; - - // - // Get Next Stack Location and Initialize it - // - Stack = IoGetNextIrpStackLocation(Irp); - Stack->Parameters.Others.Argument1 = OutParameter1; - Stack->Parameters.Others.Argument2 = OutParameter2; - - // - // Call RootHub - // - Status = IoCallDriver(RootHubDeviceObject, Irp); - - // - // Its ok to block here as this function is called in an nonarbitrary thread - // - if (Status == STATUS_PENDING) - { - KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL); - Status = IoStatus.Status; - } - - // - // The IO Manager will free the IRP - // - - return Status; -} NTSTATUS GetPortStatusAndChange( @@ -1506,6 +1441,31 @@ } } } + +BOOLEAN +USBHUB_IsRootHubFDO( + IN PDEVICE_OBJECT DeviceObject) +{ + NTSTATUS Status; + PDEVICE_OBJECT RootHubPhysicalDeviceObject = NULL; + PHUB_DEVICE_EXTENSION HubDeviceExtension; + + // get hub device extension + HubDeviceExtension = (PHUB_DEVICE_EXTENSION) DeviceObject->DeviceExtension; + + // Get the Root Hub Pdo + Status = SubmitRequestToRootHub(HubDeviceExtension->LowerDeviceObject, + IOCTL_INTERNAL_USB_GET_ROOTHUB_PDO, + &RootHubPhysicalDeviceObject, + NULL); + + // FIXME handle error + ASSERT(NT_SUCCESS(Status)); + + // physical device object is only obtained for root hubs + return (RootHubPhysicalDeviceObject != NULL); +} + NTSTATUS USBHUB_FdoStartDevice( @@ -1969,7 +1929,15 @@ { case IRP_MN_START_DEVICE: { - Status = USBHUB_FdoStartDevice(DeviceObject, Irp); + if (USBHUB_IsRootHubFDO(DeviceObject)) + { + // start root hub fdo + Status = USBHUB_FdoStartDevice(DeviceObject, Irp); + } + else + { + Status = USBHUB_ParentFDOStartDevice(DeviceObject, Irp); + } break; } Added: trunk/reactos/drivers/usb/usbhub/hub_fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/hub_fdo… ============================================================================== --- trunk/reactos/drivers/usb/usbhub/hub_fdo.c (added) +++ trunk/reactos/drivers/usb/usbhub/hub_fdo.c [iso-8859-1] Wed Feb 29 18:51:07 2012 @@ -1,0 +1,212 @@ +/* + * PROJECT: ReactOS Universal Serial Bus Hub Driver + * LICENSE: GPL - See COPYING in the top level directory + * FILE: drivers/usb/usbhub/hub_fdo.c + * PURPOSE: Hub FDO + * PROGRAMMERS: + * Michael Martin (michael.martin(a)reactos.org) + * Johannes Anderwald (johannes.anderwald(a)reactos.org) + */ +#include "usbhub.h" + +NTSTATUS +USBHUB_ParentFDOStartDevice( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PHUB_DEVICE_EXTENSION HubDeviceExtension; + PURB Urb, ConfigurationUrb; + PUSB_INTERFACE_DESCRIPTOR InterfaceDescriptor; + PUSBD_INTERFACE_LIST_ENTRY InterfaceList; + ULONG Index; + NTSTATUS Status; + + // get hub device extension + HubDeviceExtension = (PHUB_DEVICE_EXTENSION) DeviceObject->DeviceExtension; + + // Send the StartDevice to lower device object + Status = ForwardIrpAndWait(HubDeviceExtension->LowerDeviceObject, Irp); + + if (!NT_SUCCESS(Status)) + { + // failed to start pdo + DPRINT1("Failed to start the RootHub PDO\n"); + return Status; + } + + // FIXME get capabilities + + Urb = ExAllocatePool(NonPagedPool, sizeof(URB)); + if (!Urb) + { + // no memory + DPRINT1("No memory\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + + // lets get device descriptor + UsbBuildGetDescriptorRequest(Urb, + sizeof(Urb->UrbControlDescriptorRequest), + USB_DEVICE_DESCRIPTOR_TYPE, + 0, + 0, + &HubDeviceExtension->HubDeviceDescriptor, + NULL, + sizeof(USB_DEVICE_DESCRIPTOR), + NULL); + + + // get hub device descriptor + Status = SubmitRequestToRootHub(HubDeviceExtension->LowerDeviceObject, + IOCTL_INTERNAL_USB_SUBMIT_URB, + Urb, + NULL); + + if (!NT_SUCCESS(Status)) + { + // failed to get device descriptor of hub + DPRINT1("Failed to get hub device descriptor with Status %x!\n", Status); + ExFreePool(Urb); + return Status; + } + + // now get configuration descriptor + UsbBuildGetDescriptorRequest(Urb, + sizeof(Urb->UrbControlDescriptorRequest), + USB_CONFIGURATION_DESCRIPTOR_TYPE, + 0, + 0, + &HubDeviceExtension->HubConfigDescriptor, + NULL, + sizeof(USB_CONFIGURATION_DESCRIPTOR) + sizeof(USB_INTERFACE_DESCRIPTOR) + sizeof(USB_ENDPOINT_DESCRIPTOR), + NULL); + + // request configuration descriptor + Status = SubmitRequestToRootHub(HubDeviceExtension->LowerDeviceObject, + IOCTL_INTERNAL_USB_SUBMIT_URB, + Urb, + NULL); + + if (!NT_SUCCESS(Status)) + { + // failed to get configuration descriptor + DPRINT1("Failed to get hub configuration descriptor with status %x\n", Status); + ExFreePool(Urb); + return Status; + } + + // sanity checks + ASSERT(HubDeviceExtension->HubConfigDescriptor.wTotalLength == sizeof(USB_CONFIGURATION_DESCRIPTOR) + sizeof(USB_INTERFACE_DESCRIPTOR) + sizeof(USB_ENDPOINT_DESCRIPTOR)); + ASSERT(HubDeviceExtension->HubConfigDescriptor.bDescriptorType == USB_CONFIGURATION_DESCRIPTOR_TYPE); + ASSERT(HubDeviceExtension->HubConfigDescriptor.bLength == sizeof(USB_CONFIGURATION_DESCRIPTOR)); + ASSERT(HubDeviceExtension->HubConfigDescriptor.bNumInterfaces == 1); + ASSERT(HubDeviceExtension->HubInterfaceDescriptor.bLength == sizeof(USB_INTERFACE_DESCRIPTOR)); + ASSERT(HubDeviceExtension->HubInterfaceDescriptor.bDescriptorType == USB_INTERFACE_DESCRIPTOR_TYPE); + ASSERT(HubDeviceExtension->HubInterfaceDescriptor.bNumEndpoints == 1); + ASSERT(HubDeviceExtension->HubEndPointDescriptor.bDescriptorType == USB_ENDPOINT_DESCRIPTOR_TYPE); + ASSERT(HubDeviceExtension->HubEndPointDescriptor.bLength == sizeof(USB_ENDPOINT_DESCRIPTOR)); + ASSERT(HubDeviceExtension->HubEndPointDescriptor.bmAttributes == USB_ENDPOINT_TYPE_INTERRUPT); + ASSERT(HubDeviceExtension->HubEndPointDescriptor.bEndpointAddress == 0x81); // interrupt in + + // Build hub descriptor request + UsbBuildVendorRequest(Urb, + URB_FUNCTION_CLASS_DEVICE, + sizeof(Urb->UrbControlVendorClassRequest), + USBD_TRANSFER_DIRECTION_IN | USBD_SHORT_TRANSFER_OK, + 0, + USB_REQUEST_GET_DESCRIPTOR, + USB_DEVICE_CLASS_RESERVED, + 0, + &HubDeviceExtension->HubDescriptor, + NULL, + sizeof(USB_HUB_DESCRIPTOR), + NULL); + + // send request + Status = SubmitRequestToRootHub(HubDeviceExtension->LowerDeviceObject, + IOCTL_INTERNAL_USB_SUBMIT_URB, + Urb, + NULL); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to get Hub Descriptor Status %x!\n", Status); + ExFreePool(Urb); + return STATUS_UNSUCCESSFUL; + } + + // sanity checks + ASSERT(HubDeviceExtension->HubDescriptor.bDescriptorLength == sizeof(USB_HUB_DESCRIPTOR)); + ASSERT(HubDeviceExtension->HubDescriptor.bNumberOfPorts); + ASSERT(HubDeviceExtension->HubDescriptor.bDescriptorType == 0x29); + + // store number of ports + DPRINT1("NumberOfPorts %lu\n", HubDeviceExtension->HubDescriptor.bNumberOfPorts); + HubDeviceExtension->UsbExtHubInfo.NumberOfPorts = HubDeviceExtension->HubDescriptor.bNumberOfPorts; + + // allocate interface list + InterfaceList = ExAllocatePool(NonPagedPool, sizeof(USBD_INTERFACE_LIST_ENTRY) * (HubDeviceExtension->HubConfigDescriptor.bNumInterfaces + 1)); + if (!InterfaceList) + { + // no memory + DPRINT1("No memory\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + // zero list + RtlZeroMemory(InterfaceList, sizeof(USBD_INTERFACE_LIST_ENTRY) * (HubDeviceExtension->HubConfigDescriptor.bNumInterfaces + 1)); + + // grab all interface descriptors + for(Index = 0; Index < HubDeviceExtension->HubConfigDescriptor.bNumInterfaces; Index++) + { + // Get the first Configuration Descriptor + InterfaceDescriptor = USBD_ParseConfigurationDescriptorEx(&HubDeviceExtension->HubConfigDescriptor, + &HubDeviceExtension->HubConfigDescriptor, + Index, 0, -1, -1, -1); + + // store in list + InterfaceList[Index].InterfaceDescriptor = InterfaceDescriptor; + } + + // now create configuration request + ConfigurationUrb = USBD_CreateConfigurationRequestEx(&HubDeviceExtension->HubConfigDescriptor, + (PUSBD_INTERFACE_LIST_ENTRY)&InterfaceList); + if (ConfigurationUrb == NULL) + { + // failed to build urb + DPRINT1("Failed to build configuration urb\n"); + ExFreePool(Urb); + return STATUS_INSUFFICIENT_RESOURCES; + } + + // send request + Status = SubmitRequestToRootHub(HubDeviceExtension->LowerDeviceObject, + IOCTL_INTERNAL_USB_SUBMIT_URB, + ConfigurationUrb, + NULL); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to get Hub Descriptor Status %x!\n", Status); + ExFreePool(Urb); + ExFreePool(ConfigurationUrb); + return STATUS_UNSUCCESSFUL; + } + + // store configuration & pipe handle + HubDeviceExtension->ConfigurationHandle = ConfigurationUrb->UrbSelectConfiguration.ConfigurationHandle; + HubDeviceExtension->PipeHandle = ConfigurationUrb->UrbSelectConfiguration.Interface.Pipes[0].PipeHandle; + DPRINT("Hub Configuration Handle %x\n", HubDeviceExtension->ConfigurationHandle); + + // free urb + ExFreePool(ConfigurationUrb); + ExFreePool(Urb); + + // FIXME build SCE interrupt request + + // FIXME create pdos + + return Status; +} + Propchange: trunk/reactos/drivers/usb/usbhub/hub_fdo.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/usb/usbhub/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/misc.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbhub/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub/misc.c [iso-8859-1] Wed Feb 29 18:51:07 2012 @@ -143,3 +143,68 @@ return IoCallDriver(LowerDevice, Irp); } +NTSTATUS +SubmitRequestToRootHub( + IN PDEVICE_OBJECT RootHubDeviceObject, + IN ULONG IoControlCode, + OUT PVOID OutParameter1, + OUT PVOID OutParameter2) +{ + KEVENT Event; + PIRP Irp; + IO_STATUS_BLOCK IoStatus; + NTSTATUS Status; + PIO_STACK_LOCATION Stack = NULL; + + KeInitializeEvent(&Event, NotificationEvent, FALSE); + + // + // Build Control Request + // + Irp = IoBuildDeviceIoControlRequest(IoControlCode, + RootHubDeviceObject, + NULL, 0, + NULL, 0, + TRUE, + &Event, + &IoStatus); + + if (Irp == NULL) + { + DPRINT("Usbhub: IoBuildDeviceIoControlRequest() failed\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // Initialize the status block before sending the IRP + // + IoStatus.Status = STATUS_NOT_SUPPORTED; + IoStatus.Information = 0; + + // + // Get Next Stack Location and Initialize it + // + Stack = IoGetNextIrpStackLocation(Irp); + Stack->Parameters.Others.Argument1 = OutParameter1; + Stack->Parameters.Others.Argument2 = OutParameter2; + + // + // Call RootHub + // + Status = IoCallDriver(RootHubDeviceObject, Irp); + + // + // Its ok to block here as this function is called in an nonarbitrary thread + // + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL); + Status = IoStatus.Status; + } + + // + // The IO Manager will free the IRP + // + + return Status; +} Modified: trunk/reactos/drivers/usb/usbhub/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/pdo.c?r… ============================================================================== --- trunk/reactos/drivers/usb/usbhub/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub/pdo.c [iso-8859-1] Wed Feb 29 18:51:07 2012 @@ -339,8 +339,39 @@ DPRINT1("IOCTL_INTERNAL_USB_CYCLE_PORT\n"); break; case IOCTL_INTERNAL_USB_GET_DEVICE_HANDLE: + { DPRINT1("IOCTL_INTERNAL_USB_GET_DEVICE_HANDLE\n"); - break; + if (Stack->Parameters.Others.Argument1) + { + // store device handle + *(PVOID *)Stack->Parameters.Others.Argument1 = (PVOID)ChildDeviceExtension->UsbDeviceHandle; + Status = STATUS_SUCCESS; + } + else + { + // invalid parameter + Status = STATUS_INVALID_PARAMETER; + } + break; + } + case IOCTL_INTERNAL_USB_GET_ROOTHUB_PDO: + { + if (Stack->Parameters.Others.Argument1) + { + // inform caller that it is a real usb hub + *(PVOID *)Stack->Parameters.Others.Argument1 = NULL; + } + + if (Stack->Parameters.Others.Argument2) + { + // output device object + *(PVOID *)Stack->Parameters.Others.Argument2 = DeviceObject; + } + + // done + Status = STATUS_SUCCESS; + break; + } default: { DPRINT1("Unknown IOCTL code 0x%lx\n", Stack->Parameters.DeviceIoControl.IoControlCode); Modified: trunk/reactos/drivers/usb/usbhub/usbhub.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/usbhub.… ============================================================================== --- trunk/reactos/drivers/usb/usbhub/usbhub.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub/usbhub.h [iso-8859-1] Wed Feb 29 18:51:07 2012 @@ -142,6 +142,13 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); +NTSTATUS +SubmitRequestToRootHub( + IN PDEVICE_OBJECT RootHubDeviceObject, + IN ULONG IoControlCode, + OUT PVOID OutParameter1, + OUT PVOID OutParameter2); + // pdo.c NTSTATUS USBHUB_PdoHandlePnp( @@ -170,3 +177,10 @@ IN PDEVICE_OBJECT RootHubDeviceObject, IN ULONG PortId, OUT PPORT_STATUS_CHANGE StatusChange); + +// hub_fdo.c + +NTSTATUS +USBHUB_ParentFDOStartDevice( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs