Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 23061: [AUDLT] This code are clean and written by filip.
by greatlrd＠svn.reactos.org 14 Jul '06

14 Jul '06

Author: greatlrd Date: Fri Jul 14 21:20:21 2006 New Revision: 23061 URL: http://svn.reactos.org/svn/reactos?rev=23061&view=rev Log: [AUDLT] This code are clean and written by filip. Modified: trunk/reactos/drivers/video/displays/framebuf/enable.c (props changed) trunk/reactos/drivers/video/displays/framebuf/framebuf.def (props changed) trunk/reactos/drivers/video/displays/framebuf/framebuf.h (props changed) trunk/reactos/drivers/video/displays/framebuf/framebuf.rc (props changed) trunk/reactos/drivers/video/displays/framebuf/palette.c (props changed) trunk/reactos/drivers/video/displays/framebuf/pointer.c (props changed) trunk/reactos/drivers/video/displays/framebuf/screen.c (props changed) trunk/reactos/drivers/video/displays/framebuf/surface.c (props changed) Propchange: trunk/reactos/drivers/video/displays/framebuf/enable.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/drivers/video/displays/framebuf/framebuf.def ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/drivers/video/displays/framebuf/framebuf.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/drivers/video/displays/framebuf/framebuf.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/drivers/video/displays/framebuf/palette.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/drivers/video/displays/framebuf/pointer.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/drivers/video/displays/framebuf/screen.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/drivers/video/displays/framebuf/surface.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[ion] 23060: - Implement Safe Referencing (an internal method for referencing objects when race conditions are possible) - Implement two Vista APIs and export them: ObIsKernelHandle and ObDeleteObjectDeferDelete. ZOMG! Vista APIs in the kernel!
by ion＠svn.reactos.org 14 Jul '06

14 Jul '06

Author: ion Date: Fri Jul 14 19:26:19 2006 New Revision: 23060 URL: http://svn.reactos.org/svn/reactos?rev=23060&view=rev Log: - Implement Safe Referencing (an internal method for referencing objects when race conditions are possible) - Implement two Vista APIs and export them: ObIsKernelHandle and ObDeleteObjectDeferDelete. ZOMG! Vista APIs in the kernel! Modified: trunk/reactos/ntoskrnl/ntoskrnl.def trunk/reactos/ntoskrnl/ob/obhandle.c trunk/reactos/ntoskrnl/ob/obref.c Modified: trunk/reactos/ntoskrnl/ntoskrnl.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.def?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.def (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.def Fri Jul 14 19:26:19 2006 @@ -841,12 +841,14 @@ ObCreateObject@36 ObCreateObjectType@16 ObDereferenceObject@4 +ObDereferenceObjectDeferDelete@4 ObDereferenceSecurityDescriptor@8 @ObfDereferenceObject@4 ObFindHandleForObject@20 @ObfReferenceObject@4 ObGetObjectSecurity@12 ObInsertObject@24 +ObIsKernelHandle@4 ObLogSecurityDescriptor@12 ObMakeTemporaryObject@4 ObOpenObjectByName@28 Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c Fri Jul 14 19:26:19 2006 @@ -2155,4 +2155,14 @@ ObDereferenceObject(SourceProcess); return Status; } + +#undef ObIsKernelHandle +BOOLEAN +NTAPI +ObIsKernelHandle(IN HANDLE Handle) +{ + /* We know we're kernel mode, so just check for the kernel handle flag */ + return (BOOLEAN)((ULONG_PTR)Handle & KERNEL_HANDLE_FLAG); +} + /* EOF */ Modified: trunk/reactos/ntoskrnl/ob/obref.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obref.c?rev=23… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obref.c (original) +++ trunk/reactos/ntoskrnl/ob/obref.c Fri Jul 14 19:26:19 2006 @@ -17,6 +17,37 @@ /* PRIVATE FUNCTIONS *********************************************************/ +BOOLEAN +FASTCALL +ObReferenceObjectSafe(IN PVOID Object) +{ + POBJECT_HEADER ObjectHeader; + LONG OldValue, NewValue; + + /* Get the object header */ + ObjectHeader = OBJECT_TO_OBJECT_HEADER(Object); + + /* Get the current reference count and fail if it's zero */ + OldValue = ObjectHeader->PointerCount; + if (!OldValue) return FALSE; + + /* Start reference loop */ + do + { + /* Increase the reference count */ + NewValue = InterlockedCompareExchange(&ObjectHeader->PointerCount, + OldValue + 1, + OldValue); + if (OldValue == NewValue) return TRUE; + + /* Keep looping */ + OldValue = NewValue; + } while (OldValue); + + /* If we got here, then the reference count is now 0 */ + return FALSE; +} + VOID NTAPI ObpDeferObjectDeletion(IN PVOID Object) @@ -129,7 +160,6 @@ /* Get the object and count */ Object = (PVOID)(Value &~ MAX_FAST_REFS); Count = Value & MAX_FAST_REFS; - DPRINT("Ref: %p\n", Object); /* Check if the reference count is over 1 */ if (Count > 1) return Object; @@ -172,7 +202,6 @@ ULONG_PTR Value, NewValue; /* Sanity checks */ - DPRINT("DeRef: %p\n", Object); ASSERT(Object); ASSERT(!(((ULONG_PTR)Object) & MAX_FAST_REFS)); @@ -287,10 +316,19 @@ } } -#ifdef ObDereferenceObject +VOID +NTAPI +ObDereferenceObjectDeferDelete(IN PVOID Object) +{ + /* Check whether the object can now be deleted. */ + if (!(InterlockedDecrement(&OBJECT_TO_OBJECT_HEADER(Object)->PointerCount))) + { + /* Add us to the deferred deletion list */ + ObpDeferObjectDeletion(Object); + } +} + #undef ObDereferenceObject -#endif - VOID NTAPI ObDereferenceObject(IN PVOID Object)

1 0

[mbosma] 23059: Even more sizeof fixes.
by mbosma＠svn.reactos.org 14 Jul '06

14 Jul '06

Author: mbosma Date: Fri Jul 14 18:57:47 2006 New Revision: 23059 URL: http://svn.reactos.org/svn/reactos?rev=23059&view=rev Log: Even more sizeof fixes. Modified: branches/cache_manager_rewrite/mm/section.c Modified: branches/cache_manager_rewrite/mm/section.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/sectio… ============================================================================== --- branches/cache_manager_rewrite/mm/section.c (original) +++ branches/cache_manager_rewrite/mm/section.c Fri Jul 14 18:57:47 2006 @@ -3300,7 +3300,7 @@ RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); RtlInitUnicodeString(&Name, L"Section"); ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); - ObjectTypeInitializer.DefaultPagedPoolCharge = sizeof(SECTION_OBJECT); + ObjectTypeInitializer.DefaultPagedPoolCharge = sizeof(ROS_SECTION_OBJECT); ObjectTypeInitializer.PoolType = PagedPool; ObjectTypeInitializer.UseDefaultObject = TRUE; ObjectTypeInitializer.GenericMapping = MmpSectionMapping; @@ -3353,7 +3353,7 @@ ObjectAttributes, ExGetPreviousMode(), NULL, - sizeof(SECTION_OBJECT), + sizeof(ROS_SECTION_OBJECT), 0, 0, (PVOID*)(PVOID)&Section);

1 0

[mbosma] 23058: Merge changes from PS rewrite.
by mbosma＠svn.reactos.org 14 Jul '06

14 Jul '06

Author: mbosma Date: Fri Jul 14 14:10:39 2006 New Revision: 23058 URL: http://svn.reactos.org/svn/reactos?rev=23058&view=rev Log: Merge changes from PS rewrite. Modified: branches/cache_manager_rewrite/mm/mm.c branches/cache_manager_rewrite/mm/process.c Modified: branches/cache_manager_rewrite/mm/mm.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/mm.c?r… ============================================================================== --- branches/cache_manager_rewrite/mm/mm.c (original) +++ branches/cache_manager_rewrite/mm/mm.c Fri Jul 14 14:10:39 2006 @@ -22,65 +22,11 @@ PVOID MmHighestUserAddress = NULL; PBOOLEAN Mm64BitPhysicalAddress = FALSE; PVOID MmSystemRangeStart = NULL; +ULONG MmReadClusterSize; MM_STATS MmStats; /* FUNCTIONS ****************************************************************/ - - -NTSTATUS -NTAPI -MmReleaseMmInfo(PEPROCESS Process) -{ - PVOID Address; - PMEMORY_AREA MemoryArea; - - DPRINT("MmReleaseMmInfo(Process %x (%s))\n", Process, - Process->ImageFileName); - - MmLockAddressSpace((PMADDRESS_SPACE)&Process->VadRoot); - - while ((MemoryArea = ((PMADDRESS_SPACE)&Process->VadRoot)->MemoryAreaRoot) != NULL) - { - switch (MemoryArea->Type) - { - case MEMORY_AREA_SECTION_VIEW: - Address = (PVOID)MemoryArea->StartingAddress; - MmUnlockAddressSpace((PMADDRESS_SPACE)&Process->VadRoot); - MmUnmapViewOfSection((PEPROCESS)Process, Address); - MmLockAddressSpace((PMADDRESS_SPACE)&Process->VadRoot); - break; - - case MEMORY_AREA_VIRTUAL_MEMORY: - case MEMORY_AREA_PEB_OR_TEB: - MmFreeVirtualMemory(Process, MemoryArea); - break; - - case MEMORY_AREA_SHARED_DATA: - case MEMORY_AREA_NO_ACCESS: - MmFreeMemoryArea((PMADDRESS_SPACE)&Process->VadRoot, - MemoryArea, - NULL, - NULL); - break; - - case MEMORY_AREA_MDL_MAPPING: - KEBUGCHECK(PROCESS_HAS_LOCKED_PAGES); - break; - - default: - KEBUGCHECK(0); - } - } - - Mmi386ReleaseMmInfo(Process); - - MmUnlockAddressSpace((PMADDRESS_SPACE)&Process->VadRoot); - MmDestroyAddressSpace((PMADDRESS_SPACE)&Process->VadRoot); - - DPRINT("Finished MmReleaseMmInfo()\n"); - return(STATUS_SUCCESS); -} /* * @implemented Modified: branches/cache_manager_rewrite/mm/process.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/proces… ============================================================================== --- branches/cache_manager_rewrite/mm/process.c (original) +++ branches/cache_manager_rewrite/mm/process.c Fri Jul 14 14:10:39 2006 @@ -22,6 +22,33 @@ (PVOID)((ULONG_PTR)MM_HIGHEST_USER_ADDRESS - (16 * PAGE_SIZE)) /* FUNCTIONS *****************************************************************/ + +LCID +NTAPI +MmGetSessionLocaleId(VOID) +{ + PEPROCESS Process; + PAGED_CODE(); + + /* Get the current process */ + Process = PsGetCurrentProcess(); + + /* Check if it's the Session Leader */ + if (Process->Vm.Flags.SessionLeader) + { + /* Make sure it has a valid Session */ + if (Process->Session) + { + /* Get the Locale ID */ +#if ROS_HAS_SESSIONS + return ((PMM_SESSION_SPACE)Process->Session)->LocaleId; +#endif + } + } + + /* Not a session leader, return the default */ + return PsDefaultThreadLocaleId; +} PVOID STDCALL @@ -489,6 +516,9 @@ goto exit; } + /* The process now has an address space */ + Process->HasAddressSpace = TRUE; + /* Check if there's a Section Object */ if (Section) { @@ -559,3 +589,64 @@ /* Return status to caller */ return Status; } + +VOID +NTAPI +MmCleanProcessAddressSpace(IN PEPROCESS Process) +{ + /* FIXME: Add part of MmDeleteProcessAddressSpace here */ +} + +NTSTATUS +NTAPI +MmDeleteProcessAddressSpace(PEPROCESS Process) +{ + PVOID Address; + PMEMORY_AREA MemoryArea; + + DPRINT("MmDeleteProcessAddressSpace(Process %x (%s))\n", Process, + Process->ImageFileName); + + MmLockAddressSpace((PMADDRESS_SPACE)&Process->VadRoot); + + while ((MemoryArea = ((PMADDRESS_SPACE)&Process->VadRoot)->MemoryAreaRoot) != NULL) + { + switch (MemoryArea->Type) + { + case MEMORY_AREA_SECTION_VIEW: + Address = (PVOID)MemoryArea->StartingAddress; + MmUnlockAddressSpace((PMADDRESS_SPACE)&Process->VadRoot); + MmUnmapViewOfSection(Process, Address); + MmLockAddressSpace((PMADDRESS_SPACE)&Process->VadRoot); + break; + + case MEMORY_AREA_VIRTUAL_MEMORY: + case MEMORY_AREA_PEB_OR_TEB: + MmFreeVirtualMemory(Process, MemoryArea); + break; + + case MEMORY_AREA_SHARED_DATA: + case MEMORY_AREA_NO_ACCESS: + MmFreeMemoryArea((PMADDRESS_SPACE)&Process->VadRoot, + MemoryArea, + NULL, + NULL); + break; + + case MEMORY_AREA_MDL_MAPPING: + KEBUGCHECK(PROCESS_HAS_LOCKED_PAGES); + break; + + default: + KEBUGCHECK(0); + } + } + + Mmi386ReleaseMmInfo(Process); + + MmUnlockAddressSpace((PMADDRESS_SPACE)&Process->VadRoot); + MmDestroyAddressSpace((PMADDRESS_SPACE)&Process->VadRoot); + + DPRINT("Finished MmReleaseMmInfo()\n"); + return(STATUS_SUCCESS); +}

1 0

[ion] 23057: - Fix a serious bug in Kernel Queues. A condition existed where an inserted kernel queue with a timeout would crash the system once the thread waiting on it had its wait aborted or completed. - Thanks a lot to Thomas for his brutal test application which allowed me to discover this bug and the bugs addressed in the previous commits (related to the wait list and thread scheduler list corruption).
by ion＠svn.reactos.org 14 Jul '06

14 Jul '06

Author: ion Date: Fri Jul 14 06:26:44 2006 New Revision: 23057 URL: http://svn.reactos.org/svn/reactos?rev=23057&view=rev Log: - Fix a serious bug in Kernel Queues. A condition existed where an inserted kernel queue with a timeout would crash the system once the thread waiting on it had its wait aborted or completed. - Thanks a lot to Thomas for his brutal test application which allowed me to discover this bug and the bugs addressed in the previous commits (related to the wait list and thread scheduler list corruption). Modified: trunk/reactos/ntoskrnl/ke/kthread.c trunk/reactos/ntoskrnl/ke/queue.c trunk/reactos/ntoskrnl/ke/wait.c Modified: trunk/reactos/ntoskrnl/ke/kthread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/kthread.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/kthread.c (original) +++ trunk/reactos/ntoskrnl/ke/kthread.c Fri Jul 14 06:26:44 2006 @@ -764,7 +764,7 @@ /* Initialize the Suspend Semaphore */ KeInitializeSemaphore(&Thread->SuspendSemaphore, 0, 128); - /* FIXME OPTIMIZATION OF DOOM. DO NOT ENABLE FIXME */ + /* Setup the timer */ Timer = &Thread->Timer; KeInitializeTimer(Timer); TimerWaitBlock = &Thread->WaitBlock[TIMER_WAIT_BLOCK]; Modified: trunk/reactos/ntoskrnl/ke/queue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/queue.c?rev=23… ============================================================================== --- trunk/reactos/ntoskrnl/ke/queue.c (original) +++ trunk/reactos/ntoskrnl/ke/queue.c Fri Jul 14 06:26:44 2006 @@ -390,6 +390,10 @@ &WaitBlock->WaitListEntry; Timer->Header.WaitListHead.Blink = &WaitBlock->WaitListEntry; + WaitBlock->WaitListEntry.Flink = + &Timer->Header.WaitListHead; + WaitBlock->WaitListEntry.Blink = + &Timer->Header.WaitListHead; /* Create Timer */ KiInsertTimer(Timer, *Timeout); @@ -427,8 +431,8 @@ /* Check if we had a timeout */ if (Timeout) { - /* FIXME: Fixup interval */ - DPRINT1("FIXME!!!\n"); + DPRINT1("If you see this message, contact Alex ASAP\n"); + KEBUGCHECK(0); } } Modified: trunk/reactos/ntoskrnl/ke/wait.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/wait.c?rev=230… ============================================================================== --- trunk/reactos/ntoskrnl/ke/wait.c (original) +++ trunk/reactos/ntoskrnl/ke/wait.c Fri Jul 14 06:26:44 2006 @@ -360,7 +360,9 @@ return WaitStatus; } - /* FIXME: Fixup interval */ + /* Check if we had a timeout */ + DPRINT1("If you see this message, contact Alex ASAP\n"); + KEBUGCHECK(0); } /* Acquire again the lock */ @@ -533,7 +535,8 @@ /* Check if we had a timeout */ if (Timeout) { - /* FIXME: Fixup interval */ + DPRINT1("If you see this message, contact Alex ASAP\n"); + KEBUGCHECK(0); } } @@ -813,7 +816,8 @@ /* Check if we had a timeout */ if (Timeout) { - /* FIXME: Fixup interval */ + DPRINT1("If you see this message, contact Alex ASAP\n"); + KEBUGCHECK(0); } /* Acquire again the lock */

1 0

[ion] 23056: - Add KiCheckThreadStackSwap and KiAddThreadToWaitList macros - Initialize PRCBs' Wait Lists - Fix a ghastly implementation fault where the the queue code was correctly removing the thread from its wait list, but where this wait list was actually connected to the _SCHEDULER_ and ended up removing a thread behind its back, causing bizarre issues and w3seek's ASSERT(State == Ready) bug. Fixed this by using the macros above and PRCB Wait List and properly inserting a waiting thread int
by ion＠svn.reactos.org 14 Jul '06

14 Jul '06

Author: ion Date: Fri Jul 14 05:03:27 2006 New Revision: 23056 URL: http://svn.reactos.org/svn/reactos?rev=23056&view=rev Log: - Add KiCheckThreadStackSwap and KiAddThreadToWaitList macros - Initialize PRCBs' Wait Lists - Fix a ghastly implementation fault where the the queue code was correctly removing the thread from its wait list, but where this wait list was actually connected to the _SCHEDULER_ and ended up removing a thread behind its back, causing bizarre issues and w3seek's ASSERT(State == Ready) bug. Fixed this by using the macros above and PRCB Wait List and properly inserting a waiting thread into that list, and then removing it when unblocking it or removing a queue. Modified: trunk/reactos/ntoskrnl/include/internal/ke_x.h trunk/reactos/ntoskrnl/ke/i386/kernel.c trunk/reactos/ntoskrnl/ke/kthread.c trunk/reactos/ntoskrnl/ke/queue.c trunk/reactos/ntoskrnl/ke/wait.c Modified: trunk/reactos/ntoskrnl/include/internal/ke_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke_x.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ke_x.h Fri Jul 14 05:03:27 2006 @@ -156,6 +156,40 @@ } // +// Determines wether a thread should be added to the wait list +// +#define KiCheckThreadStackSwap(WaitMode, Thread, Swappable) \ +{ \ + /* Check the required conditions */ \ + if ((WaitMode != KernelMode) && \ + (Thread->EnableStackSwap) && \ + (Thread->Priority >= (LOW_REALTIME_PRIORITY + 9))) \ + { \ + /* We are go for swap */ \ + Swappable = TRUE; \ + } \ + else \ + { \ + /* Don't swap the thread */ \ + Swappable = FALSE; \ + } \ +} + +// +// Adds a thread to the wait list +// +#define KiAddThreadToWaitList(Thread, Swappable) \ +{ \ + /* Make sure it's swappable */ \ + if (Swappable) \ + { \ + /* Insert it into the PRCB's List */ \ + InsertTailList(&KeGetCurrentPrcb()->WaitListHead, \ + &Thread->WaitListEntry); \ + } \ +} + +// // Rules for checking alertability: // - For Alertable waits ONLY: // * We don't wait and return STATUS_ALERTED if the thread is alerted Modified: trunk/reactos/ntoskrnl/ke/i386/kernel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kernel.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kernel.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/kernel.c Fri Jul 14 05:03:27 2006 @@ -252,6 +252,7 @@ KiCheckFPU(); KeInitDpc(Pcr->Prcb); + InitializeListHead(&Pcr->PrcbData.WaitListHead); if (Pcr->PrcbData.FeatureBits & X86_FEATURE_SYSCALL) { @@ -332,6 +333,7 @@ KPCR->NtTib.ExceptionList = (PVOID)-1; KeInitDpc(KPCR->Prcb); + InitializeListHead(&KPCR->PrcbData.WaitListHead); KeInitExceptions (); KeInitInterrupts (); Modified: trunk/reactos/ntoskrnl/ke/kthread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/kthread.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/kthread.c (original) +++ trunk/reactos/ntoskrnl/ke/kthread.c Fri Jul 14 05:03:27 2006 @@ -83,7 +83,7 @@ if (current->State != Ready) { - DPRINT1("%d/%d\n", &current, current->State); + DPRINT1("%p/%d\n", current, current->State); } ASSERT(current->State == Ready); Modified: trunk/reactos/ntoskrnl/ke/queue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/queue.c?rev=23… ============================================================================== --- trunk/reactos/ntoskrnl/ke/queue.c (original) +++ trunk/reactos/ntoskrnl/ke/queue.c Fri Jul 14 05:03:27 2006 @@ -102,7 +102,7 @@ /* Remove the queue from the thread's wait list */ Thread->WaitStatus = (NTSTATUS)Entry; - RemoveEntryList(&Thread->WaitListEntry); + if (Thread->WaitListEntry.Flink) RemoveEntryList(&Thread->WaitListEntry); Thread->WaitReason = 0; /* Increase the active threads and set the status*/ @@ -248,6 +248,7 @@ PKQUEUE PreviousQueue; PKWAIT_BLOCK WaitBlock; PKTIMER Timer; + BOOLEAN Swappable; ASSERT_QUEUE(Queue); ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL); @@ -354,6 +355,10 @@ WaitBlock->Thread = Thread; Thread->WaitStatus = STATUS_WAIT_0; + /* Check if we can swap the thread's stack */ + Thread->WaitListEntry.Flink = NULL; + KiCheckThreadStackSwap(WaitMode, Thread, Swappable); + /* We need to wait for the object... check for a timeout */ if (Timeout) { @@ -406,6 +411,7 @@ Thread->State = Waiting; /* Find a new thread to run */ + KiAddThreadToWaitList(Thread, Swappable); Status = KiSwapThread(); /* Reset the wait reason */ Modified: trunk/reactos/ntoskrnl/ke/wait.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/wait.c?rev=230… ============================================================================== --- trunk/reactos/ntoskrnl/ke/wait.c (original) +++ trunk/reactos/ntoskrnl/ke/wait.c Fri Jul 14 05:03:27 2006 @@ -143,8 +143,8 @@ WaitBlock = WaitBlock->NextWaitBlock; } while (WaitBlock != Thread->WaitBlockList); - /* FIXME: Remove the thread from the wait list! */ - //RemoveEntryList(&Thread->WaitListEntry); + /* Remove the thread from the wait list! */ + if (Thread->WaitListEntry.Flink) RemoveEntryList(&Thread->WaitListEntry); /* Check if there's a Thread Timer */ Timer = &Thread->Timer; @@ -274,6 +274,7 @@ PKTIMER ThreadTimer; PKTHREAD CurrentThread = KeGetCurrentThread(); NTSTATUS WaitStatus = STATUS_SUCCESS; + BOOLEAN Swappable; /* Check if the lock is already held */ if (CurrentThread->WaitNext) @@ -305,6 +306,10 @@ { /* Check if we can do an alertable wait, if requested */ KiCheckAlertability(); + + /* Check if we can swap the thread's stack */ + CurrentThread->WaitListEntry.Flink = NULL; + KiCheckThreadStackSwap(WaitMode, CurrentThread, Swappable); /* Set status */ CurrentThread->WaitStatus = STATUS_WAIT_0; @@ -341,6 +346,7 @@ CurrentThread->State = Waiting; /* Find a new thread to run */ + KiAddThreadToWaitList(CurrentThread, Swappable); WaitStatus = KiSwapThread(); ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL); @@ -383,6 +389,7 @@ PKTIMER ThreadTimer; PKTHREAD CurrentThread = KeGetCurrentThread(); NTSTATUS WaitStatus = STATUS_SUCCESS; + BOOLEAN Swappable; /* Check if the lock is already held */ if (CurrentThread->WaitNext) @@ -461,6 +468,10 @@ /* Make sure we can satisfy the Alertable request */ KiCheckAlertability(); + /* Check if we can swap the thread's stack */ + CurrentThread->WaitListEntry.Flink = NULL; + KiCheckThreadStackSwap(WaitMode, CurrentThread, Swappable); + /* Enable the Timeout Timer if there was any specified */ if (Timeout) { @@ -512,6 +523,7 @@ CurrentThread->State = Waiting; /* Find a new thread to run */ + KiAddThreadToWaitList(CurrentThread, Swappable); WaitStatus = KiSwapThread(); ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL); @@ -564,6 +576,7 @@ ULONG AllObjectsSignaled; ULONG WaitIndex; NTSTATUS WaitStatus = STATUS_SUCCESS; + BOOLEAN Swappable; /* Set the Current Thread */ CurrentThread = KeGetCurrentThread(); @@ -727,6 +740,10 @@ /* Make sure we can satisfy the Alertable request */ KiCheckAlertability(); + /* Check if we can swap the thread's stack */ + CurrentThread->WaitListEntry.Flink = NULL; + KiCheckThreadStackSwap(WaitMode, CurrentThread, Swappable); + /* Enable the Timeout Timer if there was any specified */ if (Timeout) { @@ -786,6 +803,7 @@ CurrentThread->State = Waiting; /* Find a new thread to run */ + KiAddThreadToWaitList(CurrentThread, Swappable); WaitStatus = KiSwapThread(); ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL);

1 0

[ion] 23055: - Fix utterly messed up unblocking/readying thread logic. - KiUnblockThread becomes KiReadyThread and doesn't perform priority modifications anymore. Also removed a large block of code that was #if 0ed out. - KiAbortWaitThread now does priority modifications (and better then before), then calls KiReadyThread. - Inserting a queue now *READIES A THREAD ONLY* instead of removing all its waits!
by ion＠svn.reactos.org 13 Jul '06

13 Jul '06

Author: ion Date: Fri Jul 14 02:52:18 2006 New Revision: 23055 URL: http://svn.reactos.org/svn/reactos?rev=23055&view=rev Log: - Fix utterly messed up unblocking/readying thread logic. - KiUnblockThread becomes KiReadyThread and doesn't perform priority modifications anymore. Also removed a large block of code that was #if 0ed out. - KiAbortWaitThread now does priority modifications (and better then before), then calls KiReadyThread. - Inserting a queue now *READIES A THREAD ONLY* instead of removing all its waits! Modified: trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/ke/gate.c trunk/reactos/ntoskrnl/ke/kthread.c trunk/reactos/ntoskrnl/ke/queue.c trunk/reactos/ntoskrnl/ke/wait.c trunk/reactos/ntoskrnl/ps/idle.c trunk/reactos/ntoskrnl/ps/thread.c Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h Fri Jul 14 02:52:18 2006 @@ -133,14 +133,9 @@ VOID ); -/* Removes a thread out of a block state. */ -VOID -STDCALL -KiUnblockThread( - PKTHREAD Thread, - PNTSTATUS WaitStatus, - KPRIORITY Increment -); +VOID +NTAPI +KiReadyThread(IN PKTHREAD Thread); NTSTATUS STDCALL @@ -331,9 +326,9 @@ VOID FASTCALL KiAbortWaitThread( - PKTHREAD Thread, - NTSTATUS WaitStatus, - KPRIORITY Increment + IN PKTHREAD Thread, + IN NTSTATUS WaitStatus, + IN KPRIORITY Increment ); VOID Modified: trunk/reactos/ntoskrnl/ke/gate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/gate.c?rev=230… ============================================================================== --- trunk/reactos/ntoskrnl/ke/gate.c (original) +++ trunk/reactos/ntoskrnl/ke/gate.c Fri Jul 14 02:52:18 2006 @@ -132,8 +132,8 @@ /* Increment the Queue's active threads */ if (WaitThread->Queue) WaitThread->Queue->CurrentCount++; - /* Reschedule the Thread */ - KiUnblockThread(WaitThread, &WaitStatus, EVENT_INCREMENT); + /* FIXME: This isn't really correct!!! */ + KiAbortWaitThread(WaitThread, WaitStatus, EVENT_INCREMENT); } quit: Modified: trunk/reactos/ntoskrnl/ke/kthread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/kthread.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/kthread.c (original) +++ trunk/reactos/ntoskrnl/ke/kthread.c Fri Jul 14 02:52:18 2006 @@ -202,84 +202,12 @@ } VOID -STDCALL -KiUnblockThread(PKTHREAD Thread, - PNTSTATUS WaitStatus, - KPRIORITY Increment) -{ - if (Terminated == Thread->State) { - - DPRINT1("Can't unblock thread 0x%x because it's terminating\n", - Thread); - - } else if (Ready == Thread->State || - Running == Thread->State) { - - DPRINT1("Can't unblock thread 0x%x because it's %s\n", - Thread, (Thread->State == Ready ? "ready" : "running")); - - } else { - - LONG Processor; - KAFFINITY Affinity; - - /* FIXME: This propably isn't the right way to do it... */ - /* No it's not... i'll fix it later-- Alex */ - if (Thread->Priority < LOW_REALTIME_PRIORITY && - Thread->BasePriority < LOW_REALTIME_PRIORITY - 2) { - - if (!Thread->PriorityDecrement && !Thread->DisableBoost) { - - Thread->Priority = Thread->BasePriority + Increment; - Thread->PriorityDecrement = Increment; - } - - /* Also decrease quantum */ - Thread->Quantum--; - - } else { - - Thread->Quantum = Thread->QuantumReset; - } - - if (WaitStatus != NULL) { - - Thread->WaitStatus = *WaitStatus; - } - - Thread->State = Ready; - KiInsertIntoThreadList(Thread->Priority, Thread); - Processor = KeGetCurrentProcessorNumber(); - Affinity = Thread->Affinity; - - if (!(IdleProcessorMask & (1 << Processor) & Affinity) && - (IdleProcessorMask & ~(1 << Processor) & Affinity)) { - - LONG i; - - for (i = 0; i < KeNumberProcessors - 1; i++) { - - Processor++; - - if (Processor >= KeNumberProcessors) { - - Processor = 0; - } - - if (IdleProcessorMask & (1 << Processor) & Affinity) { -#if 0 - /* FIXME: - * Reschedule the threads on an other processor - */ - KeReleaseDispatcherDatabaseLockFromDpcLevel(); - KiRequestReschedule(Processor); - KeAcquireDispatcherDatabaseLockAtDpcLevel(); -#endif - break; - } - } - } - } +NTAPI +KiReadyThread(IN PKTHREAD Thread) +{ + /* Makes a thread ready */ + Thread->State = Ready; + KiInsertIntoThreadList(Thread->Priority, Thread); } VOID Modified: trunk/reactos/ntoskrnl/ke/queue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/queue.c?rev=23… ============================================================================== --- trunk/reactos/ntoskrnl/ke/queue.c (original) +++ trunk/reactos/ntoskrnl/ke/queue.c Fri Jul 14 02:52:18 2006 @@ -117,7 +117,7 @@ } /* Reschedule the Thread */ - KiUnblockThread(Thread, NULL, 0); + KiReadyThread(Thread); } else { Modified: trunk/reactos/ntoskrnl/ke/wait.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/wait.c?rev=230… ============================================================================== --- trunk/reactos/ntoskrnl/ke/wait.c (original) +++ trunk/reactos/ntoskrnl/ke/wait.c Fri Jul 14 02:52:18 2006 @@ -127,6 +127,7 @@ { PKWAIT_BLOCK WaitBlock; PKTIMER Timer; + LONG NewPriority; /* Update wait status */ Thread->WaitStatus |= WaitStatus; @@ -158,8 +159,66 @@ /* Increment the Queue's active threads */ if (Thread->Queue) Thread->Queue->CurrentCount++; + /* Check if this is a non-RT thread */ + if (Thread->Priority < LOW_REALTIME_PRIORITY) + { + /* Check if boosting is enabled and we can boost */ + if (!(Thread->DisableBoost) && !(Thread->PriorityDecrement)) + { + /* We can boost, so calculate the new priority */ + NewPriority = Thread->BasePriority + Increment; + if (NewPriority > Thread->Priority) + { + /* Make sure the new priority wouldn't push the thread to RT */ + if (NewPriority >= LOW_REALTIME_PRIORITY) + { + /* Set it just before the RT zone */ + Thread->Priority = LOW_REALTIME_PRIORITY - 1; + } + else + { + /* Otherwise, set our calculated priority */ + Thread->Priority = NewPriority; + } + } + } + + /* Check if this is a high-priority thread */ + if (Thread->BasePriority >= 14) + { + /* It is, simply reset the quantum */ + Thread->Quantum = Thread->QuantumReset; + } + else + { + /* Otherwise, decrease quantum */ + Thread->Quantum--; + if (Thread->Quantum <= 0) + { + /* We've went below 0, reset it */ + Thread->Quantum = Thread->QuantumReset; + + /* Apply per-quantum priority decrement */ + Thread->Priority -= (Thread->PriorityDecrement + 1); + if (Thread->Priority < Thread->BasePriority) + { + /* We've went too low, reset it */ + Thread->Priority = Thread->BasePriority; + } + + /* Delete per-quantum decrement */ + Thread->PriorityDecrement = 0; + } + } + } + else + { + /* For real time threads, just reset the quantum */ + Thread->Quantum = Thread->QuantumReset; + } + /* Reschedule the Thread */ - KiUnblockThread(Thread, NULL, Increment); + KiReadyThread(Thread); } VOID Modified: trunk/reactos/ntoskrnl/ps/idle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/idle.c?rev=230… ============================================================================== --- trunk/reactos/ntoskrnl/ps/idle.c (original) +++ trunk/reactos/ntoskrnl/ps/idle.c Fri Jul 14 02:52:18 2006 @@ -110,7 +110,7 @@ FALSE); oldIrql = KeAcquireDispatcherDatabaseLock (); - KiUnblockThread(&IdleThread->Tcb, NULL, 0); + KiReadyThread(&IdleThread->Tcb); KeReleaseDispatcherDatabaseLock(oldIrql); KeGetCurrentPrcb()->IdleThread = &IdleThread->Tcb; Modified: trunk/reactos/ntoskrnl/ps/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/thread.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ps/thread.c (original) +++ trunk/reactos/ntoskrnl/ps/thread.c Fri Jul 14 02:52:18 2006 @@ -353,7 +353,7 @@ /* Dispatch thread */ OldIrql = KeAcquireDispatcherDatabaseLock (); - KiUnblockThread(&Thread->Tcb, NULL, 0); + KiReadyThread(&Thread->Tcb); KeReleaseDispatcherDatabaseLock(OldIrql); /* Return */

1 0

[greatlrd] 23054: Activate screensaver for bootcd rember fullpath should be c:\reactos\system32\matrix.scr but we use matrix.scr as key path for getting this working on livecd. But the desk.cpl apps should save full path to it. (and it does it in windows and reactos before ros cm broken it did in ros).
by greatlrd＠svn.reactos.org 13 Jul '06

13 Jul '06

Author: greatlrd Date: Fri Jul 14 02:42:40 2006 New Revision: 23054 URL: http://svn.reactos.org/svn/reactos?rev=23054&view=rev Log: Activate screensaver for bootcd rember fullpath should be c:\reactos\system32\matrix.scr but we use matrix.scr as key path for getting this working on livecd. But the desk.cpl apps should save full path to it. (and it does it in windows and reactos before ros cm broken it did in ros). Modified: trunk/reactos/boot/bootdata/hivedef.inf Modified: trunk/reactos/boot/bootdata/hivedef.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivedef.inf (original) +++ trunk/reactos/boot/bootdata/hivedef.inf Fri Jul 14 02:42:40 2006 @@ -10,6 +10,7 @@ HKCU,"Control Panel\Desktop","DragFullWindows",0x00000002,"0" HKCU,"Control Panel\Desktop","PaintDesktopVersion",0x00010001,"0" HKCU,"Control Panel\Desktop","HungAppTimeout",0x00000002,"5000" +HKCU,"Control Panel\Desktop","SCRNSAVE.EXE",0x00000000,"matrix.scr" HKCU,"Control Panel\Desktop","WaitToKillAppTimeout",0x00000002,"20000" HKCU,"Control Panel\Desktop","Wallpaper",0x00000000,"" HKCU,"Control Panel\International",,0x00000012

1 0

[greatlrd] 23053: last fix for getting screensaver working on livecd it is rugh hack
by greatlrd＠svn.reactos.org 13 Jul '06

13 Jul '06

Author: greatlrd Date: Fri Jul 14 02:38:30 2006 New Revision: 23053 URL: http://svn.reactos.org/svn/reactos?rev=23053&view=rev Log: last fix for getting screensaver working on livecd it is rugh hack Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/conio.c (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/conio.c Fri Jul 14 02:38:30 2006 @@ -3379,7 +3379,21 @@ } else { - DPRINT1("CsrStartScreenSaver : failed 0x%08X\n", result); + GetSystemDirectoryW(szCmdline,MAX_PATH); + wprintf(szCmdline, L"%s\\%s /s",szCmdline,szBuffer); + DPRINT1("CsrStartScreenSaver : OK %S, Name %S\n", szCmdline, szBuffer); + ZeroMemory( &si, sizeof(si) ); + si.cb = sizeof(si); + ZeroMemory( &pi, sizeof(pi) ); + if(CreateProcessW( NULL, szCmdline, NULL, NULL, FALSE, 0, NULL,NULL,&si, &pi )) + { + CloseHandle( pi.hProcess ); + CloseHandle( pi.hThread ); + } + else + { + DPRINT1("CsrStartScreenSaver : failed 0x%08X\n", result); + } } RegCloseKey(hKey); }

1 0

[hpoussin] 23052: In case of error, free the input data buffer only if we just allocated it.
by hpoussin＠svn.reactos.org 13 Jul '06

13 Jul '06

Author: hpoussin Date: Fri Jul 14 02:20:54 2006 New Revision: 23052 URL: http://svn.reactos.org/svn/reactos?rev=23052&view=rev Log: In case of error, free the input data buffer only if we just allocated it. Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c trunk/reactos/drivers/input/mouclass/mouclass.c Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbd… ============================================================================== --- trunk/reactos/drivers/input/kbdclass/kbdclass.c (original) +++ trunk/reactos/drivers/input/kbdclass/kbdclass.c Fri Jul 14 02:20:54 2006 @@ -126,7 +126,7 @@ PLIST_ENTRY Head = &((PCLASS_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->ListHead; if (Head->Flink != Head) { - /* We have at least one keyboard */ + /* We have at least one device */ PPORT_DEVICE_EXTENSION DevExt = CONTAINING_RECORD(Head->Flink, PORT_DEVICE_EXTENSION, ListEntry); IoGetCurrentIrpStackLocation(Irp)->MajorFunction = IRP_MJ_INTERNAL_DEVICE_CONTROL; IoSkipCurrentIrpStackLocation(Irp); @@ -553,6 +553,9 @@ CONNECT_DATA ConnectData; NTSTATUS Status; + DPRINT("Connecting PortDO %p [%wZ] to ClassDO %p\n", + PortDO, &PortDO->DriverObject->DriverName, ClassDO); + KeInitializeEvent(&Event, NotificationEvent, FALSE); ConnectData.ClassDeviceObject = ClassDO; @@ -588,6 +591,18 @@ } return IoStatus.Status; +} + +/* Send IOCTL_INTERNAL_*_DISCONNECT to port */ +static NTSTATUS +DisconnectPortDriver( + IN PDEVICE_OBJECT PortDO) +{ + DPRINT("Disconnecting PortDO %p [%wZ]\n", + PortDO, &PortDO->DriverObject->DriverName); + + DPRINT1("FIXME: Need to send IOCTL_INTERNAL_*_DISCONNECT\n"); + return STATUS_NOT_IMPLEMENTED; } static NTSTATUS NTAPI @@ -686,16 +701,17 @@ cleanup: if (!(Fdo->Flags & DO_DEVICE_INITIALIZING)) - DPRINT1("FIXME: Need to send IOCTL_INTERNAL_*_DISCONNECT\n"); + DisconnectPortDriver(Fdo); if (DeviceExtension) { if (DeviceExtension->LowerDevice) IoDetachDevice(DeviceExtension->LowerDevice); - if (DriverExtension->ConnectMultiplePorts && DeviceExtension->ClassDO) + if (!DriverExtension->ConnectMultiplePorts && DeviceExtension->ClassDO) { PCLASS_DEVICE_EXTENSION ClassDeviceExtension; ClassDeviceExtension = (PCLASS_DEVICE_EXTENSION)DeviceExtension->ClassDO->DeviceExtension; ExFreePool(ClassDeviceExtension->PortData); + IoDeleteDevice(DeviceExtension->ClassDO); } } if (Fdo) Modified: trunk/reactos/drivers/input/mouclass/mouclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/mouclass/mou… ============================================================================== --- trunk/reactos/drivers/input/mouclass/mouclass.c (original) +++ trunk/reactos/drivers/input/mouclass/mouclass.c Fri Jul 14 02:20:54 2006 @@ -123,7 +123,7 @@ PLIST_ENTRY Head = &((PCLASS_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->ListHead; if (Head->Flink != Head) { - /* We have at least one mouse */ + /* We have at least one device */ PPORT_DEVICE_EXTENSION DevExt = CONTAINING_RECORD(Head->Flink, PORT_DEVICE_EXTENSION, ListEntry); IoGetCurrentIrpStackLocation(Irp)->MajorFunction = IRP_MJ_INTERNAL_DEVICE_CONTROL; IoSkipCurrentIrpStackLocation(Irp); @@ -529,6 +529,9 @@ CONNECT_DATA ConnectData; NTSTATUS Status; + DPRINT("Connecting PortDO %p [%wZ] to ClassDO %p\n", + PortDO, &PortDO->DriverObject->DriverName, ClassDO); + KeInitializeEvent(&Event, NotificationEvent, FALSE); ConnectData.ClassDeviceObject = ClassDO; @@ -564,6 +567,18 @@ } return IoStatus.Status; +} + +/* Send IOCTL_INTERNAL_*_DISCONNECT to port */ +static NTSTATUS +DisconnectPortDriver( + IN PDEVICE_OBJECT PortDO) +{ + DPRINT("Disconnecting PortDO %p [%wZ]\n", + PortDO, &PortDO->DriverObject->DriverName); + + DPRINT1("FIXME: Need to send IOCTL_INTERNAL_*_DISCONNECT\n"); + return STATUS_NOT_IMPLEMENTED; } static NTSTATUS NTAPI @@ -662,16 +677,17 @@ cleanup: if (!(Fdo->Flags & DO_DEVICE_INITIALIZING)) - DPRINT1("FIXME: Need to send IOCTL_INTERNAL_*_DISCONNECT\n"); + DisconnectPortDriver(Fdo); if (DeviceExtension) { if (DeviceExtension->LowerDevice) IoDetachDevice(DeviceExtension->LowerDevice); - if (DriverExtension->ConnectMultiplePorts && DeviceExtension->ClassDO) + if (!DriverExtension->ConnectMultiplePorts && DeviceExtension->ClassDO) { PCLASS_DEVICE_EXTENSION ClassDeviceExtension; ClassDeviceExtension = (PCLASS_DEVICE_EXTENSION)DeviceExtension->ClassDO->DeviceExtension; ExFreePool(ClassDeviceExtension->PortData); + IoDeleteDevice(DeviceExtension->ClassDO); } } if (Fdo)

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