Ros-diffs February 2012

ros-diffs@reactos.org

22 participants
577 discussions

[ion] 55667: [NTOSKRNL]: This second part of Richard's patch implements MmFreeLoaderBlock, which results in 932KB less RAM being used on my 3rd stage test after first boot. It deletes the boot regi...

by ion＠svn.reactos.org

Author: ion Date: Fri Feb 17 07:23:27 2012 New Revision: 55667 URL: http://svn.reactos.org/svn/reactos?rev=55667&view=rev Log: [NTOSKRNL]: This second part of Richard's patch implements MmFreeLoaderBlock, which results in 932KB less RAM being used on my 3rd stage test after first boot. It deletes the boot registry, NLS, and heap data. Modified: trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/mm/ARM3/mminit.c Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=556… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Fri Feb 17 07:23:27 2012 @@ -1285,6 +1285,10 @@ SharedUserData->ImageNumberLow = IMAGE_FILE_MACHINE_NATIVE; SharedUserData->ImageNumberHigh = IMAGE_FILE_MACHINE_NATIVE; } + +VOID +NTAPI +MmFreeLoaderBlock(IN PLOADER_PARAMETER_BLOCK LoaderBlock); VOID NTAPI @@ -1906,6 +1910,7 @@ /* Make sure nobody touches the loader block again */ if (LoaderBlock == KeLoaderBlock) KeLoaderBlock = NULL; + MmFreeLoaderBlock(LoaderBlock); LoaderBlock = Context = NULL; /* Update progress bar */ Modified: trunk/reactos/ntoskrnl/mm/ARM3/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mminit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] Fri Feb 17 07:23:27 2012 @@ -1067,6 +1067,116 @@ VOID NTAPI INIT_FUNCTION +MmFreeLoaderBlock(IN PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + PLIST_ENTRY NextMd; + PMEMORY_ALLOCATION_DESCRIPTOR MdBlock; + ULONG i; + PFN_NUMBER BasePage, LoaderPages; + PMMPFN Pfn1; + KIRQL OldIrql; + PPHYSICAL_MEMORY_RUN Buffer, Entry; + + /* Loop the descriptors in order to count them */ + i = 0; + NextMd = LoaderBlock->MemoryDescriptorListHead.Flink; + while (NextMd != &LoaderBlock->MemoryDescriptorListHead) + { + MdBlock = CONTAINING_RECORD(NextMd, + MEMORY_ALLOCATION_DESCRIPTOR, + ListEntry); + i++; + NextMd = MdBlock->ListEntry.Flink; + } + + /* Allocate a structure to hold the physical runs */ + Buffer = ExAllocatePoolWithTag(NonPagedPool, + i * sizeof(PHYSICAL_MEMORY_RUN), + 'lMmM'); + ASSERT(Buffer != NULL); + Entry = Buffer; + + /* Loop the descriptors again */ + NextMd = LoaderBlock->MemoryDescriptorListHead.Flink; + while (NextMd != &LoaderBlock->MemoryDescriptorListHead) + { + /* Check what kind this was */ + MdBlock = CONTAINING_RECORD(NextMd, + MEMORY_ALLOCATION_DESCRIPTOR, + ListEntry); + switch (MdBlock->MemoryType) + { + /* Registry, NLS, and heap data */ + case LoaderRegistryData: + case LoaderOsloaderHeap: + case LoaderNlsData: + /* Are all a candidate for deletion */ + Entry->BasePage = MdBlock->BasePage; + Entry->PageCount = MdBlock->PageCount; + Entry++; + + /* We keep the rest */ + default: + break; + } + + /* Move to the next descriptor */ + NextMd = MdBlock->ListEntry.Flink; + } + + /* Acquire the PFN lock */ + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + + /* Loop the runs */ + LoaderPages = 0; + while (--Entry >= Buffer) + { + /* See how many pages are in this run */ + i = Entry->PageCount; + BasePage = Entry->BasePage; + + /* Loop each page */ + Pfn1 = MiGetPfnEntry(BasePage); + while (i--) + { + /* Check if it has references or is in any kind of list */ + if (!(Pfn1->u3.e2.ReferenceCount) && (!Pfn1->u1.Flink)) + { + /* Set the new PTE address and put this page into the free list */ + Pfn1->PteAddress = (PMMPTE)(BasePage << PAGE_SHIFT); + MiInsertPageInFreeList(BasePage); + LoaderPages++; + } + else if (BasePage) + { + /* It has a reference, so simply drop it */ + ASSERT(MI_IS_PHYSICAL_ADDRESS(MiPteToAddress(Pfn1->PteAddress)) == FALSE); + + /* Drop a dereference on this page, which should delete it */ + Pfn1->PteAddress->u.Long = 0; + MI_SET_PFN_DELETED(Pfn1); + MiDecrementShareCount(Pfn1, BasePage); + LoaderPages++; + } + + /* Move to the next page */ + Pfn1++; + BasePage++; + } + } + + /* Release the PFN lock and flush the TLB */ + DPRINT1("Loader pages freed: %lx\n", LoaderPages); + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + KeFlushCurrentTb(); + + /* Free our run structure */ + ExFreePool(Buffer); +} + +VOID +NTAPI +INIT_FUNCTION MiAdjustWorkingSetManagerParameters(IN BOOLEAN Client) { /* This function needs to do more work, for now, we tune page minimums */

12 years, 7 months

[ion] 55666: [NTOSKRNL]: This is kind of embarssing, but after doing a local grep for some of cgutman and zekflop's changes (respectively the patch that had added MmDeleteProcessPageDirectory, and ...

by ion＠svn.reactos.org

Author: ion Date: Fri Feb 17 07:07:47 2012 New Revision: 55666 URL: http://svn.reactos.org/svn/reactos?rev=55666&view=rev Log: [NTOSKRNL]: This is kind of embarssing, but after doing a local grep for some of cgutman and zekflop's changes (respectively the patch that had added MmDeleteProcessPageDirectory, and the mshtml fix patch), I fell upon a .patch file. It included 3 memory-leak-fixing patches from richard that had been sent to me during his last days -- which, had I paid attention, would've fixed the MSHTML bug and the memory leaks months ago! I've tried my best to now re-integrate a portion of the patch (the other two portions deal with freeing the loader block, and freeing .INIT sections, and I will commit them later) with the current state of trunk. Some things that patch did, no longer seem to work, and I've commented where appropriate. But in general it does seem to dereference/delete some PTEs that had been left behind before (such as deleted TEBs, and deleted VA mappings). It no longer seems to be able to delete the root PDE nor the shared data page however (this worked in the original patch's timeframe). Zekflop, tkreuzer, please take a look. I hope this will set us on a better path! Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c trunk/reactos/ntoskrnl/mm/ARM3/virtual.c trunk/reactos/ntoskrnl/mm/amd64/page.c trunk/reactos/ntoskrnl/mm/i386/page.c trunk/reactos/ntoskrnl/mm/marea.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/procsup.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] Fri Feb 17 07:07:47 2012 @@ -199,6 +199,9 @@ ASSERT(VadTree->NumberGenericTableElements >= 1); MiRemoveNode((PMMADDRESS_NODE)Vad, VadTree); + /* Delete the pages */ + MiDeleteVirtualAddresses((ULONG_PTR)Teb, TebEnd, NULL); + /* Release the working set */ MiUnlockProcessWorkingSet(Process, Thread); @@ -219,7 +222,7 @@ IN BOOLEAN GuiStack) { PMMPTE PointerPte; - PFN_NUMBER PageFrameNumber;//, PageTableFrameNumber; + PFN_NUMBER PageFrameNumber, PageTableFrameNumber; PFN_COUNT StackPages; PMMPFN Pfn1;//, Pfn2; ULONG i; @@ -253,13 +256,14 @@ /* Get the PTE's page */ PageFrameNumber = PFN_FROM_PTE(PointerPte); Pfn1 = MiGetPfnEntry(PageFrameNumber); -#if 0 // ARM3 might not own the page table, so don't take this risk. Leak it instead! +#if 1 // ARM3 might not own the page table, so don't take this risk. Leak it instead! /* Now get the page of the page table mapping it */ PageTableFrameNumber = Pfn1->u4.PteFrame; - Pfn2 = MiGetPfnEntry(PageTableFrameNumber); + //Pfn2 = MiGetPfnEntry(PageTableFrameNumber); /* Remove a shared reference, since the page is going away */ - MiDecrementShareCount(Pfn2, PageTableFrameNumber); + DPRINT("SystemPTE PDE: %lx\n", PageTableFrameNumber); + //MiDecrementShareCount(Pfn2, PageTableFrameNumber); #endif /* Set the special pending delete marker */ MI_SET_PFN_DELETED(Pfn1); @@ -1340,6 +1344,102 @@ MmUnlockAddressSpace(&Process->Vm); } +VOID +NTAPI +MmDeleteProcessAddressSpace2(IN PEPROCESS Process) +{ + PMMPFN Pfn1, Pfn2; + KIRQL OldIrql; + PFN_NUMBER PageFrameIndex; + PULONG PageDir; + ULONG i; + + //ASSERT(Process->CommitCharge == 0); + + /* Delete the shared user data section (Should be done in clean, not delete) */ + ASSERT(MmHighestUserAddress > (PVOID)USER_SHARED_DATA); + KeAttachProcess(&Process->Pcb); + //DPRINT1("Killing shared user data page no longer works -- has someone changed ARM3 in a way to make this fail now?\n"); + //MiDeleteVirtualAddresses(USER_SHARED_DATA, USER_SHARED_DATA, NULL); + //DPRINT1("Done\n"); + KeDetachProcess(); + + /* Acquire the PFN lock */ + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + + /* Check for fully initialized process */ + if (Process->AddressSpaceInitialized == 2) + { + /* Map the PDE */ + PageDir = MmCreateHyperspaceMapping(Process->Pcb.DirectoryTableBase[0] >> PAGE_SHIFT); + for (i = 0; i < ADDR_TO_PDE_OFFSET(MmSystemRangeStart); i++) + { + /* Loop all page tables */ + if (PageDir[i] != 0) + { + /* Check if they are RosMm-owned */ + if (MI_IS_ROS_PFN(MiGetPfnEntry(PageDir[i] >> PAGE_SHIFT))) + { + /* Free them through the RosMm ABI */ + //DPRINT1("Freeing MC_SYSTEM: %lx\n", PageDir[i]); + MmReleasePageMemoryConsumer(MC_SYSTEM, PageDir[i] >> PAGE_SHIFT); + } + } + } + + /* Unmap the PDE */ + //DPRINT1("Done\n"); + MmDeleteHyperspaceMapping(PageDir); + + /* Map the working set page and its page table */ + Pfn1 = MiGetPfnEntry(Process->WorkingSetPage); + Pfn2 = MiGetPfnEntry(Pfn1->u4.PteFrame); + + /* Nuke it */ + MI_SET_PFN_DELETED(Pfn1); + MiDecrementShareCount(Pfn2, Pfn1->u4.PteFrame); + MiDecrementShareCount(Pfn1, Process->WorkingSetPage); + ASSERT((Pfn1->u3.e2.ReferenceCount == 0) || (Pfn1->u3.e1.WriteInProgress)); + + /* Now map hyperspace and its page table */ + PageFrameIndex = Process->Pcb.DirectoryTableBase[1] >> PAGE_SHIFT; + Pfn1 = MiGetPfnEntry(PageFrameIndex); + Pfn2 = MiGetPfnEntry(Pfn1->u4.PteFrame); + + /* Nuke it */ + MI_SET_PFN_DELETED(Pfn1); + MiDecrementShareCount(Pfn2, Pfn1->u4.PteFrame); + MiDecrementShareCount(Pfn1, PageFrameIndex); + ASSERT((Pfn1->u3.e2.ReferenceCount == 0) || (Pfn1->u3.e1.WriteInProgress)); + + /* Finally, nuke the PDE itself */ + PageFrameIndex = Process->Pcb.DirectoryTableBase[0] >> PAGE_SHIFT; + Pfn1 = MiGetPfnEntry(PageFrameIndex); + MI_SET_PFN_DELETED(Pfn1); + MiDecrementShareCount(Pfn1, PageFrameIndex); + MiDecrementShareCount(Pfn1, PageFrameIndex); + + /* HACK: In Richard's original patch this ASSERT did work */ + //DPRINT1("Ref count: %lx %lx\n", Pfn1->u3.e2.ReferenceCount, Pfn1->u2.ShareCount); + //ASSERT((Pfn1->u3.e2.ReferenceCount == 0) || (Pfn1->u3.e1.WriteInProgress)); + } + else + { + /* A partly-initialized process should never exit through here */ + ASSERT(FALSE); + } + + /* Release the PFN lock */ + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + + /* No support for sessions yet */ + ASSERT(Process->Session == 0); + + /* Clear out the PDE pages */ + Process->Pcb.DirectoryTableBase[0] = 0; + Process->Pcb.DirectoryTableBase[1] = 0; +} + /* SESSION CODE TO MOVE TO SESSION.C ******************************************/ KGUARDED_MUTEX MiSessionIdMutex; Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Fri Feb 17 07:07:47 2012 @@ -264,8 +264,21 @@ /* Drop the share count */ MiDecrementShareCount(Pfn1, PageFrameIndex); - /* No fork yet */ - if (PointerPte <= MiHighestUserPte) ASSERT(PrototypePte == Pfn1->PteAddress); + /* Either a fork, or this is the shared user data page */ + if (PointerPte <= MiHighestUserPte) + { + /* If it's not the shared user page, then crash, since there's no fork() yet */ + if ((PAGE_ALIGN(VirtualAddress) != (PVOID)USER_SHARED_DATA) || + (MmHighestUserAddress <= (PVOID)USER_SHARED_DATA)) + { + /* Must be some sort of memory corruption */ + KeBugCheckEx(MEMORY_MANAGEMENT, + 0x400, + (ULONG_PTR)PointerPte, + (ULONG_PTR)PrototypePte, + (ULONG_PTR)Pfn1->PteAddress); + } + } } else { @@ -284,7 +297,8 @@ ASSERT(Pfn1->u2.ShareCount == 1); /* FIXME: Drop the reference on the page table. For now, leak it until RosMM is gone */ - //MiDecrementShareCount(MiGetPfnEntry(Pfn1->u4.PteFrame), Pfn1->u4.PteFrame); + //DPRINT1("Dropping a ref...\n"); + MiDecrementShareCount(MiGetPfnEntry(Pfn1->u4.PteFrame), Pfn1->u4.PteFrame); /* Mark the PFN for deletion and dereference what should be the last ref */ MI_SET_PFN_DELETED(Pfn1); @@ -312,6 +326,7 @@ KIRQL OldIrql; BOOLEAN AddressGap = FALSE; PSUBSECTION Subsection; + PUSHORT UsedPageTableEntries; /* Get out if this is a fake VAD, RosMm will free the marea pages */ if ((Vad) && (Vad->u.VadFlags.Spare == 1)) return; @@ -368,6 +383,7 @@ /* Now we should have a valid PDE, mapped in, and still have some VA */ ASSERT(PointerPde->u.Hard.Valid == 1); ASSERT(Va <= EndingAddress); + UsedPageTableEntries = &MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Va)]; /* Check if this is a section VAD with gaps in it */ if ((AddressGap) && (LastPrototypePte)) @@ -397,6 +413,11 @@ TempPte = *PointerPte; if (TempPte.u.Long) { + DPRINT("Decrement used PTEs by address: %lx\n", Va); + (*UsedPageTableEntries)--; + ASSERT((*UsedPageTableEntries) < PTE_COUNT); + DPRINT("Refs: %lx\n", (*UsedPageTableEntries)); + /* Check if the PTE is actually mapped in */ if (TempPte.u.Long & 0xFFFFFC01) { @@ -456,6 +477,22 @@ /* The PDE should still be valid at this point */ ASSERT(PointerPde->u.Hard.Valid == 1); + DPRINT("Should check if handles for: %p are zero (PDE: %lx)\n", Va, PointerPde->u.Hard.PageFrameNumber); + if (!(*UsedPageTableEntries)) + { + DPRINT("They are!\n"); + if (PointerPde->u.Long != 0) + { + DPRINT("PDE active: %lx in %16s\n", PointerPde->u.Hard.PageFrameNumber, CurrentProcess->ImageFileName); + + /* Delete the PTE proper */ + MiDeletePte(PointerPde, + MiPteToAddress(PointerPde), + CurrentProcess, + NULL); + } + } + /* Release the lock and get out if we're done */ KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); if (Va > EndingAddress) return; Modified: trunk/reactos/ntoskrnl/mm/amd64/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/amd64/page.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/amd64/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/amd64/page.c [iso-8859-1] Fri Feb 17 07:07:47 2012 @@ -188,29 +188,6 @@ } } -VOID -NTAPI -MmDeleteProcessPageDirectory(PEPROCESS Process) -{ - PFN_NUMBER TableBasePfn; - PMMPTE PageDir; - - /* Get the page directory PFN */ - TableBasePfn = Process->Pcb.DirectoryTableBase[0] >> PAGE_SHIFT; - - /* Map the page directory in hyperspace */ - PageDir = (PMMPTE)MmCreateHyperspaceMapping(TableBasePfn); - - /* Free the hyperspace mapping page (ARM3) */ - //MmDeletePageTablePfn(PageDir[ADDR_TO_PDE_OFFSET(HYPERSPACE)].u.Hard.PageFrameNumber, 3); - - /* Delete the hyperspace mapping */ - MmDeleteHyperspaceMapping(PageDir); - - /* Recursively free the page directories */ - MmDeletePageTablePfn(TableBasePfn, 4); -} - static PMMPTE MiGetPteForProcess( Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] Fri Feb 17 07:07:47 2012 @@ -198,62 +198,6 @@ return(Attributes); } -VOID -FORCEINLINE -MmDeletePageDirectoryEntry(PMMPDE PointerPde) -{ - KIRQL OldIrql; - PMMPFN Page; - - Page = MiGetPfnEntry(PointerPde->u.Hard.PageFrameNumber); - - /* This should not be a legacy allocation*/ - ASSERT(MI_IS_ROS_PFN(Page) == FALSE); - - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - - /* Free it using the ARM3 API */ - MI_SET_PFN_DELETED(Page); - MiDecrementShareCount(Page, PointerPde->u.Hard.PageFrameNumber); - - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); -} - -VOID -NTAPI -MmDeleteProcessPageDirectory(PEPROCESS Process) -{ - PMMPDE PdeBase, PointerPde; - ULONG PdeOffset; - KIRQL OldIrql; - - /* Map the page directory in hyperspace */ - PdeBase = MiMapPageInHyperSpace(PsGetCurrentProcess(), - Process->Pcb.DirectoryTableBase[0] >> PAGE_SHIFT, - &OldIrql); - - /* Loop the user land page directory */ - for (PdeOffset = 0; PdeOffset < MiGetPdeOffset(MmSystemRangeStart); PdeOffset++) - { - PointerPde = PdeBase + PdeOffset; - /* Check if a valid PDE exists here */ - if (PointerPde->u.Hard.Valid) - { - /* Free the page that backs it */ - MmDeletePageDirectoryEntry(PointerPde); - } - } - - /* Free the hyperspace mapping page (ARM3) */ - MmDeletePageDirectoryEntry(PdeBase + MiGetPdeOffset(HYPERSPACE)); - - /* Delete the hyperspace mapping */ - MiUnmapPageInHyperSpace(PsGetCurrentProcess(), PdeBase, OldIrql); - - /* Free the PDE page itself (ARM3) */ - MmDeletePageDirectoryEntry((PMMPDE)&Process->Pcb.DirectoryTableBase[0]); -} - /* Taken from ARM3/pagfault.c */ BOOLEAN FORCEINLINE Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=55… ============================================================================== --- trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Fri Feb 17 07:07:47 2012 @@ -994,6 +994,10 @@ } } +VOID +NTAPI +MmDeleteProcessAddressSpace2(IN PEPROCESS Process); + NTSTATUS NTAPI MmDeleteProcessAddressSpace(PEPROCESS Process) @@ -1036,11 +1040,10 @@ } } - MmDeleteProcessPageDirectory(Process); - MmUnlockAddressSpace(&Process->Vm); DPRINT("Finished MmReleaseMmInfo()\n"); + MmDeleteProcessAddressSpace2(Process); return(STATUS_SUCCESS); }

12 years, 7 months

[ion] 55665: [WIN32CSR/CSRSRV]: Make the outdated CSR_PLUGIN architecture as close to the CSR_SERVER_DLL architecture as possible for easier migration later. Main changes are return values/number o...

by ion＠svn.reactos.org

Author: ion Date: Fri Feb 17 05:15:13 2012 New Revision: 55665 URL: http://svn.reactos.org/svn/reactos?rev=55665&view=rev Log: [WIN32CSR/CSRSRV]: Make the outdated CSR_PLUGIN architecture as close to the CSR_SERVER_DLL architecture as possible for easier migration later. Main changes are return values/number of parameters, importing csrsrv functions instead of using a manual export table, and other similar small changes. Also, add win32csr.dll to the registry command-line for CSRSS, but still load it hard-coded for now. Modified: trunk/reactos/boot/bootdata/hivesys_amd64.inf trunk/reactos/boot/bootdata/hivesys_arm.inf trunk/reactos/boot/bootdata/hivesys_i386.inf trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c trunk/reactos/subsystems/win32/csrss/csrsrv/csrsrv.spec trunk/reactos/subsystems/win32/csrss/csrsrv/init.c trunk/reactos/subsystems/win32/csrss/include/api.h trunk/reactos/subsystems/win32/csrss/include/csrplugin.h trunk/reactos/subsystems/win32/csrss/win32csr/console.c trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c trunk/reactos/subsystems/win32/csrss/win32csr/handle.c trunk/reactos/subsystems/win32/csrss/win32csr/harderror.c trunk/reactos/subsystems/win32/csrss/win32csr/w32csr.h trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.h trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.spec Modified: trunk/reactos/boot/bootdata/hivesys_amd64.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_amd6… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_amd64.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_amd64.inf [iso-8859-1] Fri Feb 17 05:15:13 2012 @@ -1077,7 +1077,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Optional",0x00010000,"Posix" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Posix",0x00020000,"%SystemRoot%\system32\psxss.exe" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Required",0x00010000,"Debug","Windows" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Windows",0x00020000,"%SystemRoot%\system32\csrss.exe ObjectDirectory=\Windows SharedSection=1024,12288,512 Windows=On SubSystemType=Windows ServerDll=basesrv,1 ServerDll=winsrv:UserServerDllInitialization,3 ServerDll=winsrv:ConServerDllInitialization,2 ProfileControl=Off MaxRequestThreads=16" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Windows",0x00020000,"%SystemRoot%\system32\csrss.exe ObjectDirectory=\Windows SharedSection=1024,12288,512 Windows=On SubSystemType=Windows ServerDll=basesrv,1 ServerDll=win32csr:Win32CsrInitialization,2 ProfileControl=Off MaxRequestThreads=16" ; WOW Support HKLM,"SYSTEM\CurrentControlSet\Control\Wow","",0x00000000,"" Modified: trunk/reactos/boot/bootdata/hivesys_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_arm.… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] Fri Feb 17 05:15:13 2012 @@ -793,7 +793,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Optional",0x00010000,"Posix" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Posix",0x00020000,"%SystemRoot%\system32\psxss.exe" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Required",0x00010000,"Debug","Windows" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Windows",0x00020000,"%SystemRoot%\system32\csrss.exe ObjectDirectory=\Windows SharedSection=1024,12288,512 Windows=On SubSystemType=Windows ServerDll=basesrv,1 ServerDll=winsrv:UserServerDllInitialization,3 ServerDll=winsrv:ConServerDllInitialization,2 ProfileControl=Off MaxRequestThreads=16" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Windows",0x00020000,"%SystemRoot%\system32\csrss.exe ObjectDirectory=\Windows SharedSection=1024,12288,512 Windows=On SubSystemType=Windows ServerDll=basesrv,1 ServerDll=win32csr:Win32CsrInitialization,2 ProfileControl=Off MaxRequestThreads=16" ; WOW Support HKLM,"SYSTEM\CurrentControlSet\Control\Wow","",0x00000000,"" Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Fri Feb 17 05:15:13 2012 @@ -1228,7 +1228,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Optional",0x00010000,"Posix" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Posix",0x00020000,"%SystemRoot%\system32\psxss.exe" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Required",0x00010000,"Debug","Windows" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Windows",0x00020000,"%SystemRoot%\system32\csrss.exe ObjectDirectory=\Windows SharedSection=1024,12288,512 Windows=On SubSystemType=Windows ServerDll=basesrv,1 ServerDll=winsrv:UserServerDllInitialization,3 ServerDll=winsrv:ConServerDllInitialization,2 ProfileControl=Off MaxRequestThreads=16" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Windows",0x00020000,"%SystemRoot%\system32\csrss.exe ObjectDirectory=\Windows SharedSection=1024,12288,512 Windows=On SubSystemType=Windows ServerDll=basesrv,1 ServerDll=win32csr:Win32CsrInitialization,2 ProfileControl=Off MaxRequestThreads=16" ; WOW Support HKLM,"SYSTEM\CurrentControlSet\Control\Wow","",0x00000000,"" Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c [iso-8859-1] Fri Feb 17 05:15:13 2012 @@ -13,7 +13,7 @@ #define NDEBUG #include <debug.h> -extern NTSTATUS CallProcessInherit(PCSR_PROCESS, PCSR_PROCESS); +extern NTSTATUS CallProcessCreated(PCSR_PROCESS, PCSR_PROCESS); extern NTSTATUS CallProcessDeleted(PCSR_PROCESS); /* GLOBALS *******************************************************************/ @@ -154,11 +154,9 @@ { NewProcessData->ParentConsole = ProcessData->Console; NewProcessData->bInheritHandles = Request->Data.CreateProcessRequest.bInheritHandles; - if (Request->Data.CreateProcessRequest.bInheritHandles) - { - CallProcessInherit(ProcessData, NewProcessData); - } - } + } + + CallProcessCreated(ProcessData, NewProcessData); if (Request->Data.CreateProcessRequest.Flags & CREATE_NEW_PROCESS_GROUP) { Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c [iso-8859-1] Fri Feb 17 05:15:13 2012 @@ -97,20 +97,20 @@ Request->Status = STATUS_INVALID_SYSTEM_SERVICE; } -BOOL -CallHardError(IN PCSR_PROCESS ProcessData, +VOID +CallHardError(IN PCSR_THREAD ThreadData, IN PHARDERROR_MSG HardErrorMessage); static VOID NTAPI -CsrHandleHardError(IN PCSR_PROCESS ProcessData, +CsrHandleHardError(IN PCSR_THREAD ThreadData, IN OUT PHARDERROR_MSG Message) { DPRINT1("CSR: received hard error %lx\n", Message->Status); /* Call the hard error handler in win32csr */ - (VOID)CallHardError(ProcessData, Message); + CallHardError(ThreadData, Message); } /*++ @@ -935,7 +935,9 @@ if (MessageType == LPC_ERROR_EVENT) { /* Call the Handler */ - CsrHandleHardError(ProcessData, (PHARDERROR_MSG)Request); + PCSR_THREAD Thread; + Thread = CsrLocateThreadByClientId(NULL, &Request->Header.ClientId); + CsrHandleHardError(Thread, (PHARDERROR_MSG)Request); } else { Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/csrsrv.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/csrsrv.spec [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/csrsrv.spec [iso-8859-1] Fri Feb 17 05:15:13 2012 @@ -12,6 +12,7 @@ ;@ stdcall CsrDereferenceWait(ptr) ;@ stdcall CsrDestroyProcess(ptr long) ;@ stdcall CsrDestroyThread(ptr) +@ stdcall CsrEnumProcesses(ptr ptr) ; Temporary hack ;@ stdcall CsrExecServerThread(ptr long) @ stdcall CsrGetProcessLuid(ptr ptr) @ stdcall CsrImpersonateClient(ptr) Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/init.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/init.c [iso-8859-1] Fri Feb 17 05:15:13 2012 @@ -64,26 +64,22 @@ return STATUS_SUCCESS; } -BOOL -CallHardError(IN PCSR_PROCESS ProcessData, +VOID +CallHardError(IN PCSR_THREAD ThreadData, IN PHARDERROR_MSG HardErrorMessage) { - BOOL Ok; unsigned i; DPRINT("CSR: %s called\n", __FUNCTION__); - Ok = TRUE; - for (i = 0; i < ServerProcCount && Ok; i++) - { - Ok = (*ServerProcs[i].HardErrorProc)(ProcessData, HardErrorMessage); - } - - return Ok; + for (i = 0; i < ServerProcCount; i++) + { + ServerProcs[i].HardErrorProc(ThreadData, HardErrorMessage); + } } NTSTATUS -CallProcessInherit(IN PCSR_PROCESS SourceProcessData, +CallProcessCreated(IN PCSR_PROCESS SourceProcessData, IN PCSR_PROCESS TargetProcessData) { NTSTATUS Status = STATUS_SUCCESS; @@ -91,8 +87,11 @@ DPRINT("CSR: %s called\n", __FUNCTION__); - for (i = 0; i < ServerProcCount && NT_SUCCESS(Status); i++) - Status = (*ServerProcs[i].ProcessInheritProc)(SourceProcessData, TargetProcessData); + for (i = 0; i < ServerProcCount; i++) + { + Status = ServerProcs[i].ProcessInheritProc(SourceProcessData, TargetProcessData); + if (!NT_SUCCESS(Status)) break; + } return Status; } @@ -100,15 +99,15 @@ NTSTATUS CallProcessDeleted(IN PCSR_PROCESS ProcessData) { - NTSTATUS Status = STATUS_SUCCESS; + ULONG Result = 0; unsigned i; DPRINT("CSR: %s called\n", __FUNCTION__); - for (i = 0; i < ServerProcCount && NT_SUCCESS(Status); i++) - Status = (*ServerProcs[i].ProcessDeletedProc)(ProcessData); - - return Status; + for (i = 0; i < ServerProcCount; i++) + Result = ServerProcs[i].ProcessDeletedProc(ProcessData, 0, FALSE); + + return Result; } /********************************************************************** @@ -131,7 +130,6 @@ HINSTANCE hInst; ANSI_STRING ProcName; CSRPLUGIN_INITIALIZE_PROC InitProc; - CSRSS_EXPORTED_FUNCS Exports; PCSRSS_API_DEFINITION ApiDefinitions; CSRPLUGIN_SERVER_PROCS ServerProcs; @@ -149,8 +147,8 @@ { return Status; } - Exports.CsrEnumProcessesProc = CsrEnumProcesses; - if (! (*InitProc)(&ApiDefinitions, &ServerProcs, &Exports, CsrHeap)) + + if (! (*InitProc)(&ApiDefinitions, &ServerProcs)) { return STATUS_UNSUCCESSFUL; } Modified: trunk/reactos/subsystems/win32/csrss/include/api.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/inc… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/include/api.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/include/api.h [iso-8859-1] Fri Feb 17 05:15:13 2012 @@ -312,6 +312,7 @@ extern PVOID CsrSrvSharedSectionHeap; extern PVOID *CsrSrvSharedStaticServerData; extern HANDLE CsrInitializationEvent; +extern PCSR_SERVER_DLL CsrLoadedServerDll[CSR_SERVER_DLL_MAX]; NTSTATUS NTAPI Modified: trunk/reactos/subsystems/win32/csrss/include/csrplugin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/inc… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/include/csrplugin.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/include/csrplugin.h [iso-8859-1] Fri Feb 17 05:15:13 2012 @@ -31,13 +31,13 @@ typedef BOOL (WINAPI *CSRPLUGIN_INIT_COMPLETE_PROC)(void); -typedef BOOL (WINAPI *CSRPLUGIN_HARDERROR_PROC)(IN PCSR_PROCESS ProcessData, +typedef VOID (WINAPI *CSRPLUGIN_HARDERROR_PROC)(IN PCSR_THREAD ThreadData, IN PHARDERROR_MSG HardErrorMessage); typedef NTSTATUS (WINAPI *CSRPLUGIN_PROCESS_INHERIT_PROC)(IN PCSR_PROCESS SourceProcessData, IN PCSR_PROCESS TargetProcessData); -typedef NTSTATUS (WINAPI *CSRPLUGIN_PROCESS_DELETED_PROC)(IN PCSR_PROCESS ProcessData); +typedef ULONG (WINAPI *CSRPLUGIN_PROCESS_DELETED_PROC)(IN PCSR_PROCESS ProcessData, IN ULONG Unused, IN BOOLEAN Flag); typedef struct tagCSRSS_SERVER_PROCS { @@ -48,8 +48,6 @@ } CSRPLUGIN_SERVER_PROCS, *PCSRPLUGIN_SERVER_PROCS; typedef BOOL (WINAPI *CSRPLUGIN_INITIALIZE_PROC)(PCSRSS_API_DEFINITION *ApiDefinitions, - PCSRPLUGIN_SERVER_PROCS ServerProcs, - PCSRSS_EXPORTED_FUNCS Exports, - HANDLE CsrssApiHeap); + PCSRPLUGIN_SERVER_PROCS ServerProcs); /* EOF */ Modified: trunk/reactos/subsystems/win32/csrss/win32csr/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/console.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/console.c [iso-8859-1] Fri Feb 17 05:15:13 2012 @@ -319,7 +319,7 @@ Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - return Win32CsrReleaseConsole(ProcessData); + return Win32CsrReleaseConsole(ProcessData, 0, 0); } VOID WINAPI Modified: trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] Fri Feb 17 05:15:13 2012 @@ -21,7 +21,6 @@ HANDLE Win32CsrApiHeap; HINSTANCE Win32CsrDllHandle = NULL; -static CSRSS_EXPORTED_FUNCS CsrExports; static CSRSS_API_DEFINITION Win32CsrApiDefinitions[] = { @@ -306,13 +305,7 @@ Win32CsrEnumProcesses(CSRSS_ENUM_PROCESS_PROC EnumProc, PVOID Context) { - return (CsrExports.CsrEnumProcessesProc)(EnumProc, Context); -} - -static BOOL WINAPI -Win32CsrInitComplete(void) -{ - return TRUE; + return CsrEnumProcesses(EnumProc, Context); } VOID @@ -331,18 +324,20 @@ return 0; } -BOOL WINAPI +NTSTATUS +WINAPI +#if 0 +Win32CsrInitialization(IN PCSR_SERVER_DLL ServerDll) +#else Win32CsrInitialization(PCSRSS_API_DEFINITION *ApiDefinitions, - PCSRPLUGIN_SERVER_PROCS ServerProcs, - PCSRSS_EXPORTED_FUNCS Exports, - HANDLE CsrHeap) + PCSRPLUGIN_SERVER_PROCS ServerProcs) +#endif { HANDLE ServerThread; CLIENT_ID ClientId; NTSTATUS Status; - CsrExports = *Exports; - Win32CsrApiHeap = CsrHeap; + Win32CsrApiHeap = RtlGetProcessHeap(); CsrpInitVideo(); @@ -351,11 +346,20 @@ PrivateCsrssManualGuiCheck(0); CsrInitConsoleSupport(); + /* HACK */ +#if 0 + ServerDll->DispatchTable = (PVOID)Win32CsrApiDefinitions; + ServerDll->HighestApiSupported = 0xDEADBABE; + + ServerDll->HardErrorCallback = Win32CsrHardError; + ServerDll->NewProcessCallback = Win32CsrDuplicateHandleTable; + ServerDll->ShutdownProcessCallback = Win32CsrReleaseConsole; +#else *ApiDefinitions = Win32CsrApiDefinitions; - ServerProcs->InitCompleteProc = Win32CsrInitComplete; ServerProcs->HardErrorProc = Win32CsrHardError; ServerProcs->ProcessInheritProc = Win32CsrDuplicateHandleTable; ServerProcs->ProcessDeletedProc = Win32CsrReleaseConsole; +#endif RtlInitializeCriticalSection(&Win32CsrDefineDosDeviceCritSec); InitializeListHead(&DosDeviceHistory); Modified: trunk/reactos/subsystems/win32/csrss/win32csr/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/handle.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/handle.c [iso-8859-1] Fri Feb 17 05:15:13 2012 @@ -132,10 +132,10 @@ ConioDeleteConsole(&Console->Header); } -NTSTATUS +ULONG WINAPI Win32CsrReleaseConsole( - PCSR_PROCESS ProcessData) + PCSR_PROCESS ProcessData, ULONG Flags, BOOLEAN First) { PCSRSS_CONSOLE Console; ULONG i; @@ -161,10 +161,10 @@ //CloseHandle(ProcessData->ConsoleEvent); //ProcessData->ConsoleEvent = NULL; RtlLeaveCriticalSection(&ProcessData->HandleTableLock); - return STATUS_SUCCESS; - } - RtlLeaveCriticalSection(&ProcessData->HandleTableLock); - return STATUS_INVALID_PARAMETER; + return 0; + } + RtlLeaveCriticalSection(&ProcessData->HandleTableLock); + return -1; } NTSTATUS @@ -223,6 +223,9 @@ PCSR_PROCESS TargetProcessData) { ULONG i; + + /* Only inherit if the flag was set */ + if (!TargetProcessData->bInheritHandles) return STATUS_SUCCESS; if (TargetProcessData->HandleTableSize) { Modified: trunk/reactos/subsystems/win32/csrss/win32csr/harderror.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/harderror.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/harderror.c [iso-8859-1] Fri Feb 17 05:15:13 2012 @@ -500,12 +500,13 @@ return ResponseNotHandled; } -BOOL +VOID WINAPI Win32CsrHardError( - IN PCSR_PROCESS ProcessData, + IN PCSR_THREAD ThreadData, IN PHARDERROR_MSG Message) { + PCSR_PROCESS ProcessData = ThreadData->Process; ULONG_PTR Parameters[MAXIMUM_HARDERROR_PARAMETERS]; OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING TextU, CaptionU; @@ -514,6 +515,7 @@ ULONG Size; /* Default to not handled */ + ASSERT(ProcessData != NULL); Message->Response = ResponseNotHandled; /* Make sure we don't have too many parameters */ @@ -532,7 +534,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("NtOpenProcess failed with code: %lx\n", Status); - return FALSE; + return; } /* Capture all string parameters from the process memory */ @@ -540,7 +542,7 @@ if (!NT_SUCCESS(Status)) { NtClose(hProcess); - return FALSE; + return; } /* Format the caption and message box text */ @@ -557,7 +559,7 @@ if (!NT_SUCCESS(Status)) { - return FALSE; + return; } /* Display the message box */ @@ -569,6 +571,6 @@ RtlFreeUnicodeString(&TextU); RtlFreeUnicodeString(&CaptionU); - return TRUE; + return; } Modified: trunk/reactos/subsystems/win32/csrss/win32csr/w32csr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/w32csr.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/w32csr.h [iso-8859-1] Fri Feb 17 05:15:13 2012 @@ -23,10 +23,10 @@ /* shared header with console.dll */ #include "console.h" -BOOL +VOID WINAPI Win32CsrHardError( - IN PCSR_PROCESS ProcessData, + IN PCSR_THREAD ThreadData, IN PHARDERROR_MSG Message); /* EOF */ Modified: trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.h [iso-8859-1] Fri Feb 17 05:15:13 2012 @@ -54,7 +54,7 @@ VOID FASTCALL Win32CsrUnlockObject(Object_t *Object); NTSTATUS FASTCALL Win32CsrReleaseObject(PCSR_PROCESS ProcessData, HANDLE Object); -NTSTATUS WINAPI Win32CsrReleaseConsole(PCSR_PROCESS ProcessData); +ULONG WINAPI Win32CsrReleaseConsole(PCSR_PROCESS ProcessData, ULONG Flags, BOOLEAN First); NTSTATUS WINAPI Win32CsrDuplicateHandleTable(PCSR_PROCESS SourceProcessData, PCSR_PROCESS TargetProcessData); CSR_API(CsrGetHandle); Modified: trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.spec [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.spec [iso-8859-1] Fri Feb 17 05:15:13 2012 @@ -1,1 +1,1 @@ -@ stdcall Win32CsrInitialization(ptr ptr ptr ptr) +@ stdcall Win32CsrInitialization(ptr ptr)

12 years, 7 months

[cgutman] 55664: [CLASS2] - Clear the DO_DEVICE_INITIALIZING flag on the new device objects

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Feb 17 04:34:10 2012 New Revision: 55664 URL: http://svn.reactos.org/svn/reactos?rev=55664&view=rev Log: [CLASS2] - Clear the DO_DEVICE_INITIALIZING flag on the new device objects Modified: trunk/reactos/drivers/storage/class/class2/class2.c Modified: trunk/reactos/drivers/storage/class/class2/class2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/clas… ============================================================================== --- trunk/reactos/drivers/storage/class/class2/class2.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/class2/class2.c [iso-8859-1] Fri Feb 17 04:34:10 2012 @@ -4604,6 +4604,8 @@ } } + deviceObject->Flags &= ~DO_DEVICE_INITIALIZING; + *DeviceObject = deviceObject; RtlFreeUnicodeString(&ntUnicodeString);

12 years, 7 months

[cgutman] 55663: [CLASS2] - Store the registry path passed in ScsiClassInitialize to pass in ScsiClassAddDevice

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Feb 17 04:21:51 2012 New Revision: 55663 URL: http://svn.reactos.org/svn/reactos?rev=55663&view=rev Log: [CLASS2] - Store the registry path passed in ScsiClassInitialize to pass in ScsiClassAddDevice Modified: trunk/reactos/drivers/storage/class/class2/class2.c Modified: trunk/reactos/drivers/storage/class/class2/class2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/clas… ============================================================================== --- trunk/reactos/drivers/storage/class/class2/class2.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/class2/class2.c [iso-8859-1] Fri Feb 17 04:21:51 2012 @@ -145,6 +145,7 @@ typedef struct _CLASS_DRIVER_EXTENSION { ULONG PortNumber; + UNICODE_STRING RegistryPath; CLASS_INIT_DATA InitializationData; } CLASS_DRIVER_EXTENSION, *PCLASS_DRIVER_EXTENSION; @@ -353,7 +354,7 @@ PDEVICE_OBJECT DeviceObject; NTSTATUS Status; - if (DriverExtension->InitializationData.ClassFindDevices(DriverObject, NULL, &DriverExtension->InitializationData, + if (DriverExtension->InitializationData.ClassFindDevices(DriverObject, &DriverExtension->RegistryPath, &DriverExtension->InitializationData, PhysicalDeviceObject, DriverExtension->PortNumber)) { /* Create a device object */ @@ -440,6 +441,7 @@ CCHAR deviceNameBuffer[256]; BOOLEAN deviceFound = FALSE; PCLASS_DRIVER_EXTENSION DriverExtension; + PUNICODE_STRING RegistryPath = Argument2; DebugPrint((3,"\n\nSCSI Class Driver\n")); @@ -479,6 +481,17 @@ RtlCopyMemory(&DriverExtension->InitializationData, InitializationData, sizeof(CLASS_INIT_DATA)); DriverExtension->PortNumber = 0; + + DriverExtension->RegistryPath.Buffer = ExAllocatePool(PagedPool, RegistryPath->MaximumLength); + if (!DriverExtension->RegistryPath.Buffer) + return STATUS_NO_MEMORY; + + DriverExtension->RegistryPath.Length = RegistryPath->Length; + DriverExtension->RegistryPath.MaximumLength = RegistryPath->MaximumLength; + + RtlCopyMemory(DriverExtension->RegistryPath.Buffer, + RegistryPath->Buffer, + RegistryPath->Length); // // Update driver object with entry points.

12 years, 7 months

[cgutman] 55662: [USBOHCI] - Remove massive hacks from our port reset code - We now wait for the reset complete interrupt instead of stalling 10ms and continuing - Don't wait for a port to stabiliz...

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Feb 17 03:45:46 2012 New Revision: 55662 URL: http://svn.reactos.org/svn/reactos?rev=55662&view=rev Log: [USBOHCI] - Remove massive hacks from our port reset code - We now wait for the reset complete interrupt instead of stalling 10ms and continuing - Don't wait for a port to stabilize unless there's actually a device connected [USBEHCI] - Fix very long delay between setting the reset bit and clearing it - Wait for the port to come back enabled before finishing the reset - Don't wait for a port to stabilize unless there's actually a device connected Modified: trunk/reactos/drivers/usb/usbehci/hardware.cpp trunk/reactos/drivers/usb/usbohci/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] Fri Feb 17 03:45:46 2012 @@ -977,20 +977,9 @@ EHCI_WRITE_REGISTER_ULONG(EHCI_PORTSC + (4 * PortIndex), PortStatus); // - // delay is 20 ms for port reset as per USB 2.0 spec - // - Timeout.QuadPart = 20; - DPRINT1("Waiting %d milliseconds for port reset\n", Timeout.LowPart); - - // - // convert to 100 ns units (absolute) - // - Timeout.QuadPart *= -10000; - - // - // perform the wait - // - KeDelayExecutionThread(KernelMode, FALSE, &Timeout); + // Wait for reset to start + // + KeStallExecutionProcessor(100); // // Clear reset @@ -1042,13 +1031,24 @@ } // - // this must be enabled now - // - if (PortStatus & EHCI_PRT_ENABLED) - { - DPRINT1("Port is not enabled after reset\n"); - //ASSERT(FALSE); - } + // this will be enabled now since we're high-speed + // + do + { + // + // wait + // + KeStallExecutionProcessor(100); + + // + // Check that the port is enabled + // + PortStatus = EHCI_READ_REGISTER_ULONG(EHCI_PORTSC + (4 * PortIndex)); + if (PortStatus & EHCI_PRT_ENABLED) + break; + } while (TRUE); + + DPRINT1("Port is back up after reset\n"); return STATUS_SUCCESS; } @@ -1143,6 +1143,13 @@ if (PortId > m_Capabilities.HCSParams.PortCount) return STATUS_UNSUCCESSFUL; + // + // reset status change bits + // + Value = EHCI_READ_REGISTER_ULONG(EHCI_PORTSC + (4 * PortId)); + Value |= EHCI_PRT_CONNECTSTATUSCHANGE | EHCI_PRT_ENABLEDSTATUSCHANGE; + EHCI_WRITE_REGISTER_ULONG(EHCI_PORTSC + (4 * PortId), Value); + if (Status == C_PORT_RESET) { // @@ -1151,16 +1158,9 @@ m_ResetInProgress[PortId] = FALSE; } - if (Status == C_PORT_CONNECTION) + if (Status == C_PORT_CONNECTION && (Value & EHCI_PRT_CONNECTED)) { LARGE_INTEGER Timeout; - - // - // reset status change bits - // - Value = EHCI_READ_REGISTER_ULONG(EHCI_PORTSC + (4 * PortId)); - Value |= EHCI_PRT_CONNECTSTATUSCHANGE | EHCI_PRT_ENABLEDSTATUSCHANGE; - EHCI_WRITE_REGISTER_ULONG(EHCI_PORTSC + (4 * PortId), Value); // // delay is 100 ms Modified: trunk/reactos/drivers/usb/usbohci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/hardwa… ============================================================================== --- trunk/reactos/drivers/usb/usbohci/hardware.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbohci/hardware.cpp [iso-8859-1] Fri Feb 17 03:45:46 2012 @@ -1193,7 +1193,6 @@ return STATUS_UNSUCCESSFUL; Value = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_PORT_STATUS(PortId))); - KeStallExecutionProcessor(100); if (Status == C_PORT_RESET) { @@ -1223,7 +1222,7 @@ // // wait for port to stabilize // - if (Status == C_PORT_CONNECTION) + if (Status == C_PORT_CONNECTION && (Value & OHCI_RH_PORTSTATUS_CCS)) { LARGE_INTEGER Timeout; @@ -1248,6 +1247,7 @@ // // re-enable root hub change // + DPRINT1("Enabling status change\n"); WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_INTERRUPT_ENABLE_OFFSET), OHCI_ROOT_HUB_STATUS_CHANGE); return STATUS_SUCCESS; @@ -1324,8 +1324,6 @@ } else if (Feature == PORT_RESET) { - LARGE_INTEGER Timeout; - // // assert // @@ -1343,7 +1341,8 @@ // Value = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_PORT_STATUS(PortId))); - if ((Value & OHCI_RH_PORTSTATUS_PRS) == 0) + if ((Value & OHCI_RH_PORTSTATUS_PRS) == 0 && + (Value & OHCI_RH_PORTSTATUS_PRSC) != 0) { // // reset is complete @@ -1357,32 +1356,6 @@ KeStallExecutionProcessor(100); }while(TRUE); - // - // delay is 10 ms - // - Timeout.QuadPart = 10; - DPRINT1("Waiting %d milliseconds for port to recover after reset\n", Timeout.LowPart); - - // - // convert to 100 ns units (absolute) - // - Timeout.QuadPart *= -10000; - - // - // perform the wait - // - KeDelayExecutionThread(KernelMode, FALSE, &Timeout); - - // - // is there a status change callback - // - if (m_SCECallBack != NULL) - { - // - // issue callback - // - m_SCECallBack(m_SCEContext); - } return STATUS_SUCCESS; } return STATUS_SUCCESS; @@ -1552,6 +1525,7 @@ // // disable interrupt as it will fire untill the port has been reset // + DPRINT1("Disabling status change interrupt\n"); WRITE_REGISTER_ULONG((PULONG)((PUCHAR)This->m_Base + OHCI_INTERRUPT_DISABLE_OFFSET), OHCI_ROOT_HUB_STATUS_CHANGE); Acknowledge |= OHCI_ROOT_HUB_STATUS_CHANGE; } @@ -1653,6 +1627,18 @@ // QueueSCEWorkItem = TRUE; } + else if (PortStatus & OHCI_RH_PORTSTATUS_PRSC) + { + // + // This is a port reset complete interrupt + // + DPRINT1("Port %d completed reset\n", Index); + + // + // Queue a work item + // + QueueSCEWorkItem = TRUE; + } } //

12 years, 7 months

[janderwald] 55661: [USBSTOR] - Only send read format capacity when the device type is zero (direct access device) - Add fixme [INF] - Fix issue - USB CDROM installation now starts

by janderwald＠svn.reactos.org

Author: janderwald Date: Fri Feb 17 03:44:56 2012 New Revision: 55661 URL: http://svn.reactos.org/svn/reactos?rev=55661&view=rev Log: [USBSTOR] - Only send read format capacity when the device type is zero (direct access device) - Add fixme [INF] - Fix issue - USB CDROM installation now starts Modified: trunk/reactos/drivers/usb/usbstor/error.c trunk/reactos/drivers/usb/usbstor/pdo.c trunk/reactos/media/inf/cdrom.inf Modified: trunk/reactos/drivers/usb/usbstor/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/error.… ============================================================================== --- trunk/reactos/drivers/usb/usbstor/error.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbstor/error.c [iso-8859-1] Fri Feb 17 03:44:56 2012 @@ -210,7 +210,15 @@ if (NT_SUCCESS(Status)) { - DPRINT1("Retrying Count %x\n", Context->RetryCount); + // + // FIXME: inquiry cmd / read format capacity are send w/o irp + // + ASSERT(Context); + ASSERT(Context->PDODeviceExtension); + ASSERT(Context->PDODeviceExtension->Self); + ASSERT(Context->Irp); + + DPRINT1("Retrying Count %x %p\n", Context->RetryCount, Context->PDODeviceExtension->Self); // // re-schedule request Modified: trunk/reactos/drivers/usb/usbstor/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/pdo.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbstor/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbstor/pdo.c [iso-8859-1] Fri Feb 17 03:44:56 2012 @@ -964,6 +964,7 @@ PDEVICE_OBJECT PDO; NTSTATUS Status; PPDO_DEVICE_EXTENSION PDODeviceExtension; + PUFI_INQUIRY_RESPONSE Response; // // create child device object @@ -1012,22 +1013,36 @@ *ChildDeviceObject = PDO; // - // send inquiry command + // FIXME: send inquiry command by irp // USBSTOR_SendInquiryCmd(PDO, 0); // - // retrieve format capacity - // - if (NT_SUCCESS(USBSTOR_SendFormatCapacity(PDO, 0))) - { - // - // check if its a floppy - // - PDODeviceExtension->IsFloppy = USBSTOR_IsFloppy(PDODeviceExtension->FormatData, PAGE_SIZE /*FIXME*/, &PDODeviceExtension->MediumTypeCode); - DPRINT1("[USBSTOR] IsFloppy %x MediumTypeCode %x\n", PDODeviceExtension->IsFloppy, PDODeviceExtension->MediumTypeCode); - } - + // check response data + // + Response = (PUFI_INQUIRY_RESPONSE)PDODeviceExtension->InquiryData; + ASSERT(Response); + + if (Response->DeviceType == 0) + { + // + // check if it is a floppy + // + Status = USBSTOR_SendFormatCapacity(PDO, 0); + if (NT_SUCCESS(Status)) + { + // + // check if its a floppy + // + PDODeviceExtension->IsFloppy = USBSTOR_IsFloppy(PDODeviceExtension->FormatData, PAGE_SIZE /*FIXME*/, &PDODeviceExtension->MediumTypeCode); + DPRINT1("[USBSTOR] IsFloppy %x MediumTypeCode %x\n", PDODeviceExtension->IsFloppy, PDODeviceExtension->MediumTypeCode); + } + + // + // failing command is non critical + // + Status = STATUS_SUCCESS; + } // Modified: trunk/reactos/media/inf/cdrom.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/cdrom.inf?rev=55… ============================================================================== Binary files - no diff available.

12 years, 7 months

[janderwald] 55660: [USBSTOR] - Fix build

by janderwald＠svn.reactos.org

Author: janderwald Date: Fri Feb 17 03:04:32 2012 New Revision: 55660 URL: http://svn.reactos.org/svn/reactos?rev=55660&view=rev Log: [USBSTOR] - Fix build Modified: trunk/reactos/drivers/usb/usbstor/scsi.c Modified: trunk/reactos/drivers/usb/usbstor/scsi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/scsi.c… ============================================================================== --- trunk/reactos/drivers/usb/usbstor/scsi.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbstor/scsi.c [iso-8859-1] Fri Feb 17 03:04:32 2012 @@ -449,7 +449,7 @@ PVOID Ctx) { PIRP_CONTEXT Context; - NTSTATUS Status; + DPRINT("USBSTOR_DataCompletionRoutine Irp %p Ctx %p Status %x\n", Irp, Ctx, Irp->IoStatus.Status);

12 years, 7 months

[janderwald] 55659: [USBSTOR] - Implement timer routine which checks for hung srbs, not yet activated - Stop timer when the device is stopped - Implement function to check if the attached device is...

by janderwald＠svn.reactos.org

Author: janderwald Date: Fri Feb 17 03:02:14 2012 New Revision: 55659 URL: http://svn.reactos.org/svn/reactos?rev=55659&view=rev Log: [USBSTOR] - Implement timer routine which checks for hung srbs, not yet activated - Stop timer when the device is stopped - Implement function to check if the attached device is a floppy device - Implement function to send read format capacity request - Implement missing hardware id / device id support for floppy - Add retry count parameter for debugging purposes - Tested in VBox + VmWare + RH Modified: trunk/reactos/drivers/usb/usbstor/error.c trunk/reactos/drivers/usb/usbstor/fdo.c trunk/reactos/drivers/usb/usbstor/misc.c trunk/reactos/drivers/usb/usbstor/pdo.c trunk/reactos/drivers/usb/usbstor/queue.c trunk/reactos/drivers/usb/usbstor/scsi.c trunk/reactos/drivers/usb/usbstor/usbstor.c trunk/reactos/drivers/usb/usbstor/usbstor.h Modified: trunk/reactos/drivers/usb/usbstor/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/error.… ============================================================================== --- trunk/reactos/drivers/usb/usbstor/error.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbstor/error.c [iso-8859-1] Fri Feb 17 03:02:14 2012 @@ -112,10 +112,8 @@ { NTSTATUS Status = STATUS_SUCCESS; PIO_STACK_LOCATION Stack; - //USBD_PIPE_HANDLE PipeHandle; PSCSI_REQUEST_BLOCK Request; PCDB pCDB; - // // first perform a mass storage reset step 1 in 5.3.4 USB Mass Storage Bulk Only Specification @@ -172,10 +170,20 @@ USBSTOR_QueueTerminateRequest(Context->PDODeviceExtension->LowerDeviceObject, Context->Irp); IoCompleteRequest(Context->Irp, IO_NO_INCREMENT); - // + // // Start the next request // USBSTOR_QueueNextRequest(Context->PDODeviceExtension->LowerDeviceObject); + + // + // srb handling finished + // + Context->FDODeviceExtension->SrbErrorHandlingActive = FALSE; + + // + // clear timer srb + // + Context->FDODeviceExtension->LastTimerActiveSrb = NULL; } } else @@ -187,13 +195,42 @@ // ASSERT(Context->Event); KeSetEvent(Context->Event, 0, FALSE); + + // + // srb handling finished + // + Context->FDODeviceExtension->SrbErrorHandlingActive = FALSE; + + // + // clear timer srb + // + Context->FDODeviceExtension->LastTimerActiveSrb = NULL; } } if (NT_SUCCESS(Status)) { - DPRINT1("Retrying\n"); - USBSTOR_HandleExecuteSCSI(*Context->PDODeviceExtension->PDODeviceObject, Context->Irp); + DPRINT1("Retrying Count %x\n", Context->RetryCount); + + // + // re-schedule request + // + USBSTOR_HandleExecuteSCSI(Context->PDODeviceExtension->Self, Context->Irp, Context->RetryCount + 1); + + // + // srb error handling finished + // + Context->FDODeviceExtension->SrbErrorHandlingActive = FALSE; + + // + // srb error handling finished + // + Context->FDODeviceExtension->TimerWorkQueueEnabled = TRUE; + + // + // clear timer srb + // + Context->FDODeviceExtension->LastTimerActiveSrb = NULL; } // @@ -213,8 +250,6 @@ PVOID Context) { NTSTATUS Status; - PIO_STACK_LOCATION IoStack; - PERRORHANDLER_WORKITEM_DATA WorkItemData = (PERRORHANDLER_WORKITEM_DATA)Context; // @@ -224,42 +259,9 @@ DPRINT1("USBSTOR_ResetPipeWithHandle Status %x\n", Status); // - // get next stack location - // - - IoStack = IoGetNextIrpStackLocation(WorkItemData->Irp); - - // - // now initialize the urb for sending the csw - // - UsbBuildInterruptOrBulkTransferRequest(&WorkItemData->Context->Urb, - sizeof(struct _URB_BULK_OR_INTERRUPT_TRANSFER), - WorkItemData->Context->FDODeviceExtension->InterfaceInformation->Pipes[WorkItemData->Context->FDODeviceExtension->BulkInPipeIndex].PipeHandle, - WorkItemData->Context->csw, - NULL, - 512, //FIXME - USBD_TRANSFER_DIRECTION_IN | USBD_SHORT_TRANSFER_OK, - NULL); - - // - // initialize stack location - // - IoStack->MajorFunction = IRP_MJ_INTERNAL_DEVICE_CONTROL; - IoStack->Parameters.DeviceIoControl.IoControlCode = IOCTL_INTERNAL_USB_SUBMIT_URB; - IoStack->Parameters.Others.Argument1 = (PVOID)&WorkItemData->Context->Urb; - IoStack->Parameters.DeviceIoControl.InputBufferLength = WorkItemData->Context->Urb.UrbHeader.Length; - WorkItemData->Irp->IoStatus.Status = STATUS_SUCCESS; - - - // - // setup completion routine - // - IoSetCompletionRoutine(WorkItemData->Irp, USBSTOR_CSWCompletionRoutine, Context, TRUE, TRUE, TRUE); - - // - // call driver - // - IoCallDriver(WorkItemData->Context->FDODeviceExtension->LowerDeviceObject, WorkItemData->Irp); + // now resend the csw as the stall got cleared + // + USBSTOR_SendCSW(WorkItemData->Context, WorkItemData->Irp); } VOID @@ -268,8 +270,14 @@ PVOID Context) { NTSTATUS Status; + PFDO_DEVICE_EXTENSION FDODeviceExtension; PERRORHANDLER_WORKITEM_DATA WorkItemData = (PERRORHANDLER_WORKITEM_DATA)Context; + // + // get fdo + // + FDODeviceExtension = WorkItemData->Context->FDODeviceExtension; + if (WorkItemData->Context->ErrorIndex == 2) { // @@ -290,3 +298,139 @@ // ExFreePool(WorkItemData); } + +VOID +NTAPI +USBSTOR_TimerWorkerRoutine( + IN PVOID Context) +{ + PFDO_DEVICE_EXTENSION FDODeviceExtension; + NTSTATUS Status; + PERRORHANDLER_WORKITEM_DATA WorkItemData = (PERRORHANDLER_WORKITEM_DATA)Context; + + // + // get device extension + // + FDODeviceExtension = (PFDO_DEVICE_EXTENSION)WorkItemData->DeviceObject->DeviceExtension; + ASSERT(FDODeviceExtension->Common.IsFDO); + + // + // first perform a mass storage reset step 1 in 5.3.4 USB Mass Storage Bulk Only Specification + // + Status = USBSTOR_ResetDevice(FDODeviceExtension->LowerDeviceObject, FDODeviceExtension); + if (NT_SUCCESS(Status)) + { + // + // step 2 reset bulk in pipe section 5.3.4 + // + Status = USBSTOR_ResetPipeWithHandle(FDODeviceExtension->LowerDeviceObject, FDODeviceExtension->InterfaceInformation->Pipes[FDODeviceExtension->BulkInPipeIndex].PipeHandle); + if (NT_SUCCESS(Status)) + { + // + // finally reset bulk out pipe + // + Status = USBSTOR_ResetPipeWithHandle(FDODeviceExtension->LowerDeviceObject, FDODeviceExtension->InterfaceInformation->Pipes[FDODeviceExtension->BulkOutPipeIndex].PipeHandle); + } + } + DPRINT1("Status %x\n", Status); + + // + // clear timer srb + // + FDODeviceExtension->LastTimerActiveSrb = NULL; + + // + // re-schedule request + // + //USBSTOR_HandleExecuteSCSI(WorkItemData->Context->PDODeviceExtension->Self, WorkItemData->Context->Irp, Context->RetryCount + 1); + + + + // + // do not retry for the same packet again + // + FDODeviceExtension->TimerWorkQueueEnabled = FALSE; + + // + // Free Work Item Data + // + ExFreePool(WorkItemData); +} + + +VOID +NTAPI +USBSTOR_TimerRoutine( + PDEVICE_OBJECT DeviceObject, + PVOID Context) +{ + PFDO_DEVICE_EXTENSION FDODeviceExtension; + BOOLEAN ResetDevice = FALSE; + PERRORHANDLER_WORKITEM_DATA WorkItemData; + + // + // get device extension + // + FDODeviceExtension = (PFDO_DEVICE_EXTENSION)Context; + DPRINT1("[USBSTOR] TimerRoutine entered\n"); + DPRINT1("[USBSTOR] ActiveSrb %p ResetInProgress %x LastTimerActiveSrb %p\n", FDODeviceExtension->ActiveSrb, FDODeviceExtension->ResetInProgress, FDODeviceExtension->LastTimerActiveSrb); + + // + // acquire spinlock + // + KeAcquireSpinLockAtDpcLevel(&FDODeviceExtension->IrpListLock); + + // + // is there an active srb and no global reset is in progress + // + if (FDODeviceExtension->ActiveSrb && FDODeviceExtension->ResetInProgress == FALSE && FDODeviceExtension->TimerWorkQueueEnabled) + { + if (FDODeviceExtension->LastTimerActiveSrb != NULL && FDODeviceExtension->LastTimerActiveSrb == FDODeviceExtension->ActiveSrb) + { + // + // check if empty + // + DPRINT1("[USBSTOR] ActiveSrb %p hang detected\n", FDODeviceExtension->ActiveSrb); + ResetDevice = TRUE; + } + else + { + // + // update pointer + // + FDODeviceExtension->LastTimerActiveSrb = FDODeviceExtension->ActiveSrb; + } + } + else + { + // + // reset srb + // + FDODeviceExtension->LastTimerActiveSrb = NULL; + } + + // + // release lock + // + KeReleaseSpinLockFromDpcLevel(&FDODeviceExtension->IrpListLock); + + + if (ResetDevice && FDODeviceExtension->TimerWorkQueueEnabled && FDODeviceExtension->SrbErrorHandlingActive == FALSE) + { + WorkItemData = (PERRORHANDLER_WORKITEM_DATA)ExAllocatePool(NonPagedPool, sizeof(ERRORHANDLER_WORKITEM_DATA)); + if (WorkItemData) + { + // + // Initialize and queue the work item to handle the error + // + ExInitializeWorkItem(&WorkItemData->WorkQueueItem, + USBSTOR_TimerWorkerRoutine, + WorkItemData); + + WorkItemData->DeviceObject = FDODeviceExtension->FunctionalDeviceObject; + + DPRINT1("[USBSTOR] Queing Timer WorkItem\n"); + ExQueueWorkItem(&WorkItemData->WorkQueueItem, DelayedWorkQueue); + } + } +} Modified: trunk/reactos/drivers/usb/usbstor/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/fdo.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbstor/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbstor/fdo.c [iso-8859-1] Fri Feb 17 03:02:14 2012 @@ -300,6 +300,13 @@ } #endif + + // + // start the timer + // + //IoStartTimer(DeviceObject); + + // // fdo is now initialized // @@ -341,8 +348,14 @@ case IRP_MN_STOP_DEVICE: { DPRINT1("USBSTOR_FdoHandlePnp: IRP_MN_STOP_DEVICE unimplemented\n"); - Status = STATUS_NOT_SUPPORTED; - break; + IoStopTimer(DeviceObject); + Irp->IoStatus.Status = STATUS_SUCCESS; + + // + // forward irp to next device object + // + IoSkipCurrentIrpStackLocation(Irp); + return IoCallDriver(DeviceExtension->LowerDeviceObject, Irp); } case IRP_MN_REMOVE_DEVICE: { Modified: trunk/reactos/drivers/usb/usbstor/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/misc.c… ============================================================================== --- trunk/reactos/drivers/usb/usbstor/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbstor/misc.c [iso-8859-1] Fri Feb 17 03:02:14 2012 @@ -418,3 +418,100 @@ return Status; } + +BOOLEAN +USBSTOR_IsFloppy( + IN PUCHAR Buffer, + IN ULONG BufferLength, + OUT PUCHAR MediumTypeCode) +{ + PUFI_CAPACITY_FORMAT_HEADER FormatHeader; + PUFI_CAPACITY_DESCRIPTOR Descriptor; + ULONG Length, Index, BlockCount, BlockLength; + + // + // get format header + // + FormatHeader = (PUFI_CAPACITY_FORMAT_HEADER)Buffer; + + // + // sanity checks + // + ASSERT(FormatHeader->Reserved1 == 0x00); + ASSERT(FormatHeader->Reserved2 == 0x00); + ASSERT(FormatHeader->Reserved3 == 0x00); + + // + // is there capacity data + // + if (!FormatHeader->CapacityLength) + { + // + // no data provided + // + DPRINT1("[USBSTOR] No capacity length\n"); + return FALSE; + } + + // + // the format header are always 8 bytes in length + // + ASSERT((FormatHeader->CapacityLength & 0x7) == 0); + DPRINT1("CapacityLength %x\n", FormatHeader->CapacityLength); + + // + // grab length and locate first descriptor + // + Length = FormatHeader->CapacityLength; + Descriptor = (PUFI_CAPACITY_DESCRIPTOR)(FormatHeader + 1); + for(Index = 0; Index < Length / sizeof(UFI_CAPACITY_DESCRIPTOR); Index++) + { + // + // blocks are little endian format + // + BlockCount = NTOHL(Descriptor->BlockCount); + + // + // get block length + // + BlockLength = NTOHL((Descriptor->BlockLengthByte0 << 24 | Descriptor->BlockLengthByte1 << 16 | Descriptor->BlockLengthByte2 << 8)); + + DPRINT1("BlockCount %x BlockLength %x Code %x\n", BlockCount, BlockLength, Descriptor->Code); + + if (BlockLength == 512 && BlockCount == 1440) + { + // + // 720 KB DD + // + *MediumTypeCode = 0x1E; + return TRUE; + } + else if (BlockLength == 1024 && BlockCount == 1232) + { + // + // 1,25 MB + // + *MediumTypeCode = 0x93; + return TRUE; + } + else if (BlockLength == 512 && BlockCount == 2880) + { + // + // 1,44MB KB DD + // + *MediumTypeCode = 0x94; + return TRUE; + } + + // + // move to next descriptor + // + Descriptor = (Descriptor + 1); + } + + // + // no floppy detected + // + return FALSE; +} + Modified: trunk/reactos/drivers/usb/usbstor/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/pdo.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbstor/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbstor/pdo.c [iso-8859-1] Fri Feb 17 03:02:14 2012 @@ -13,19 +13,24 @@ LPCSTR USBSTOR_GetDeviceType( - IN PUFI_INQUIRY_RESPONSE InquiryData) + IN PUFI_INQUIRY_RESPONSE InquiryData, + IN UCHAR IsFloppy) { // // check if device type is zero // if (InquiryData->DeviceType == 0) { + if (IsFloppy) + { + // + // floppy device + // + return "SFloppy"; + } + // // direct access device - // - - // - // FIXME: check if floppy // return "Disk"; } @@ -82,19 +87,24 @@ LPCSTR USBSTOR_GetGenericType( - IN PUFI_INQUIRY_RESPONSE InquiryData) + IN PUFI_INQUIRY_RESPONSE InquiryData, + IN UCHAR IsFloppy) { // // check if device type is zero // if (InquiryData->DeviceType == 0) { + if (IsFloppy) + { + // + // floppy device + // + return "GenSFloppy"; + } + // // direct access device - // - - // - // FIXME: check if floppy // return "GenDisk"; } @@ -286,7 +296,7 @@ // // get device type // - DeviceType = USBSTOR_GetDeviceType(InquiryData); + DeviceType = USBSTOR_GetDeviceType(InquiryData, DeviceExtension->IsFloppy); // // zero buffer @@ -434,8 +444,8 @@ // // get device type and generic type // - DeviceType = USBSTOR_GetDeviceType(InquiryData); - GenericType = USBSTOR_GetGenericType(InquiryData); + DeviceType = USBSTOR_GetDeviceType(InquiryData, PDODeviceExtension->IsFloppy); + GenericType = USBSTOR_GetGenericType(InquiryData, PDODeviceExtension->IsFloppy); ASSERT(GenericType); @@ -590,7 +600,7 @@ // // get target device type // - DeviceType = USBSTOR_GetDeviceType((PUFI_INQUIRY_RESPONSE)PDODeviceExtension->InquiryData); + DeviceType = USBSTOR_GetDeviceType((PUFI_INQUIRY_RESPONSE)PDODeviceExtension->InquiryData, PDODeviceExtension->IsFloppy); // // zero memory @@ -984,6 +994,7 @@ PDODeviceExtension->Common.IsFDO = FALSE; PDODeviceExtension->LowerDeviceObject = DeviceObject; PDODeviceExtension->PDODeviceObject = ChildDeviceObject; + PDODeviceExtension->Self = PDO; // // set device flags @@ -1000,7 +1011,24 @@ // *ChildDeviceObject = PDO; - USBSTOR_SendInquiryCmd(PDO); + // + // send inquiry command + // + USBSTOR_SendInquiryCmd(PDO, 0); + + // + // retrieve format capacity + // + if (NT_SUCCESS(USBSTOR_SendFormatCapacity(PDO, 0))) + { + // + // check if its a floppy + // + PDODeviceExtension->IsFloppy = USBSTOR_IsFloppy(PDODeviceExtension->FormatData, PAGE_SIZE /*FIXME*/, &PDODeviceExtension->MediumTypeCode); + DPRINT1("[USBSTOR] IsFloppy %x MediumTypeCode %x\n", PDODeviceExtension->IsFloppy, PDODeviceExtension->MediumTypeCode); + } + + // // done Modified: trunk/reactos/drivers/usb/usbstor/queue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/queue.… ============================================================================== --- trunk/reactos/drivers/usb/usbstor/queue.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbstor/queue.c [iso-8859-1] Fri Feb 17 03:02:14 2012 @@ -660,7 +660,7 @@ // // execute scsi // - Status = USBSTOR_HandleExecuteSCSI(IoStack->DeviceObject, Irp); + Status = USBSTOR_HandleExecuteSCSI(IoStack->DeviceObject, Irp, 0); // // FIXME: handle error Modified: trunk/reactos/drivers/usb/usbstor/scsi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/scsi.c… ============================================================================== --- trunk/reactos/drivers/usb/usbstor/scsi.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbstor/scsi.c [iso-8859-1] Fri Feb 17 03:02:14 2012 @@ -135,6 +135,16 @@ } // + // error handling started + // + Context->FDODeviceExtension->SrbErrorHandlingActive = TRUE; + + // + // srb error handling finished + // + Context->FDODeviceExtension->TimerWorkQueueEnabled = FALSE; + + // // Initialize and queue the work item to handle the error // ExInitializeWorkItem(&ErrorHandlerWorkItemData->WorkQueueItem, @@ -175,8 +185,6 @@ NTSTATUS Status; PURB Urb; - DPRINT("USBSTOR_CSWCompletionRoutine Irp %p Ctx %p\n", Irp, Ctx); - // // access context // @@ -212,7 +220,7 @@ } } - DPRINT1("USBSTOR_CSWCompletionRoutine Status %x\n", Irp->IoStatus.Status); + DPRINT("USBSTOR_CSWCompletionRoutine Status %x\n", Irp->IoStatus.Status); if (!NT_SUCCESS(Irp->IoStatus.Information)) { @@ -382,32 +390,16 @@ return STATUS_MORE_PROCESSING_REQUIRED; } -// -// driver verifier -// -IO_COMPLETION_ROUTINE USBSTOR_DataCompletionRoutine; - -NTSTATUS -NTAPI -USBSTOR_DataCompletionRoutine( - PDEVICE_OBJECT DeviceObject, - PIRP Irp, - PVOID Ctx) -{ - PIRP_CONTEXT Context; +VOID +USBSTOR_SendCSW( + PIRP_CONTEXT Context, + PIRP Irp) +{ PIO_STACK_LOCATION IoStack; - DPRINT("USBSTOR_DataCompletionRoutine Irp %p Ctx %p\n", Irp, Ctx); - - // - // access context - // - Context = (PIRP_CONTEXT)Ctx; - - // - // get next stack location - // - + // + // get next irp stack location + // IoStack = IoGetNextIrpStackLocation(Irp); // @@ -441,7 +433,52 @@ // call driver // IoCallDriver(Context->FDODeviceExtension->LowerDeviceObject, Irp); - +} + + +// +// driver verifier +// +IO_COMPLETION_ROUTINE USBSTOR_DataCompletionRoutine; + +NTSTATUS +NTAPI +USBSTOR_DataCompletionRoutine( + PDEVICE_OBJECT DeviceObject, + PIRP Irp, + PVOID Ctx) +{ + PIRP_CONTEXT Context; + NTSTATUS Status; + + DPRINT("USBSTOR_DataCompletionRoutine Irp %p Ctx %p Status %x\n", Irp, Ctx, Irp->IoStatus.Status); + + // + // access context + // + Context = (PIRP_CONTEXT)Ctx; + +#if 0 + if (!NT_SUCCESS(Irp->IoStatus.Status)) + { + // + // clear stall and resend cbw + // + Context->ErrorIndex = 1; + Status = USBSTOR_QueueWorkItem(Context, Irp); + ASSERT(Status == STATUS_MORE_PROCESSING_REQUIRED); + return STATUS_MORE_PROCESSING_REQUIRED; + } +#endif + + // + // send csw + // + USBSTOR_SendCSW(Context, Irp); + + // + // cancel completion + // return STATUS_MORE_PROCESSING_REQUIRED; } @@ -462,7 +499,7 @@ UCHAR Code; USBD_PIPE_HANDLE PipeHandle; - DPRINT("USBSTOR_CBWCompletionRoutine Irp %p Ctx %p\n", Irp, Ctx); + DPRINT("USBSTOR_CBWCompletionRoutine Irp %p Ctx %p Status %x\n", Irp, Ctx, Irp->IoStatus.Status); // // access context @@ -566,6 +603,37 @@ } +NTSTATUS +USBSTOR_SendCBW( + PIRP_CONTEXT Context, + PIRP Irp) +{ + PIO_STACK_LOCATION IoStack; + + // + // get next stack location + // + IoStack = IoGetNextIrpStackLocation(Irp); + + // + // initialize stack location + // + IoStack->MajorFunction = IRP_MJ_INTERNAL_DEVICE_CONTROL; + IoStack->Parameters.DeviceIoControl.IoControlCode = IOCTL_INTERNAL_USB_SUBMIT_URB; + IoStack->Parameters.Others.Argument1 = (PVOID)&Context->Urb; + IoStack->Parameters.DeviceIoControl.InputBufferLength = Context->Urb.UrbHeader.Length; + Irp->IoStatus.Status = STATUS_SUCCESS; + + // + // setup completion routine + // + IoSetCompletionRoutine(Irp, USBSTOR_CBWCompletionRoutine, Context, TRUE, TRUE, TRUE); + + // + // call driver + // + return IoCallDriver(Context->FDODeviceExtension->LowerDeviceObject, Irp); +} NTSTATUS USBSTOR_SendRequest( @@ -575,13 +643,13 @@ IN UCHAR CommandLength, IN PUCHAR Command, IN ULONG TransferDataLength, - IN PUCHAR TransferData) + IN PUCHAR TransferData, + IN ULONG RetryCount) { PIRP_CONTEXT Context; PPDO_DEVICE_EXTENSION PDODeviceExtension; PFDO_DEVICE_EXTENSION FDODeviceExtension; PIRP Irp; - PIO_STACK_LOCATION IoStack; PUCHAR MdlVirtualAddress; // @@ -640,6 +708,7 @@ Context->FDODeviceExtension = FDODeviceExtension; Context->PDODeviceExtension = PDODeviceExtension; Context->Event = Event; + Context->RetryCount = RetryCount; // // is there transfer data @@ -745,25 +814,6 @@ return STATUS_INSUFFICIENT_RESOURCES; } - // - // get next stack location - // - IoStack = IoGetNextIrpStackLocation(Irp); - - // - // initialize stack location - // - IoStack->MajorFunction = IRP_MJ_INTERNAL_DEVICE_CONTROL; - IoStack->Parameters.DeviceIoControl.IoControlCode = IOCTL_INTERNAL_USB_SUBMIT_URB; - IoStack->Parameters.Others.Argument1 = (PVOID)&Context->Urb; - IoStack->Parameters.DeviceIoControl.InputBufferLength = Context->Urb.UrbHeader.Length; - Irp->IoStatus.Status = STATUS_SUCCESS; - - // - // setup completion routine - // - IoSetCompletionRoutine(Irp, USBSTOR_CBWCompletionRoutine, Context, TRUE, TRUE, TRUE); - if (OriginalRequest) { // @@ -773,19 +823,84 @@ } // - // call driver - // - IoCallDriver(FDODeviceExtension->LowerDeviceObject, Irp); + // send request + // + USBSTOR_SendCBW(Context, Irp); // // done // return STATUS_PENDING; +} + +NTSTATUS +USBSTOR_SendFormatCapacity( + IN PDEVICE_OBJECT DeviceObject, + IN ULONG RetryCount) +{ + UFI_READ_FORMAT_CAPACITY Cmd; + NTSTATUS Status; + KEVENT Event; + PPDO_DEVICE_EXTENSION PDODeviceExtension; + PUCHAR Response; + + + // + // allocate inquiry response + // + Response = AllocateItem(NonPagedPool, PAGE_SIZE); + if (!Response) + { + // + // no memory + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // get PDO device extension + // + PDODeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + // + // initialize inquiry cmd + // + RtlZeroMemory(&Cmd, sizeof(UFI_READ_FORMAT_CAPACITY)); + Cmd.Code = SCSIOP_READ_FORMATTED_CAPACITY; + Cmd.LUN = (PDODeviceExtension->LUN & MAX_LUN) << 5; + Cmd.AllocationLengthLsb = 0xFC; // FIXME: compute some same value + + // + // initialize event + // + KeInitializeEvent(&Event, NotificationEvent, FALSE); + + // + // now send the request + // + Status = USBSTOR_SendRequest(DeviceObject, NULL, &Event, UFI_READ_FORMAT_CAPACITY_CMD_LEN, (PUCHAR)&Cmd, sizeof(UFI_INQUIRY_RESPONSE), (PUCHAR)Response, RetryCount); + + // + // wait for the action to complete + // + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + + // + // store inquiry data + // + PDODeviceExtension->FormatData = Response; + + // + // done + // + return Status; + } NTSTATUS USBSTOR_SendInquiryCmd( - IN PDEVICE_OBJECT DeviceObject) + IN PDEVICE_OBJECT DeviceObject, + IN ULONG RetryCount) { UFI_INQUIRY_CMD Cmd; NTSTATUS Status; @@ -827,7 +942,7 @@ // // now send the request // - Status = USBSTOR_SendRequest(DeviceObject, NULL, &Event, UFI_INQUIRY_CMD_LEN, (PUCHAR)&Cmd, sizeof(UFI_INQUIRY_RESPONSE), (PUCHAR)Response); + Status = USBSTOR_SendRequest(DeviceObject, NULL, &Event, UFI_INQUIRY_CMD_LEN, (PUCHAR)&Cmd, sizeof(UFI_INQUIRY_RESPONSE), (PUCHAR)Response, RetryCount); // // wait for the action to complete @@ -863,7 +978,8 @@ NTSTATUS USBSTOR_SendCapacityCmd( IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) + IN PIRP Irp, + IN ULONG RetryCount) { UFI_CAPACITY_CMD Cmd; PUFI_CAPACITY_RESPONSE Response; @@ -904,13 +1020,14 @@ // // send request, response will be freed in completion routine // - return USBSTOR_SendRequest(DeviceObject, Irp, NULL, UFI_READ_CAPACITY_CMD_LEN, (PUCHAR)&Cmd, sizeof(UFI_CAPACITY_RESPONSE), (PUCHAR)Response); + return USBSTOR_SendRequest(DeviceObject, Irp, NULL, UFI_READ_CAPACITY_CMD_LEN, (PUCHAR)&Cmd, sizeof(UFI_CAPACITY_RESPONSE), (PUCHAR)Response, RetryCount); } NTSTATUS USBSTOR_SendModeSenseCmd( IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) + IN PIRP Irp, + IN ULONG RetryCount) { #if 0 UFI_SENSE_CMD Cmd; @@ -1098,12 +1215,13 @@ NTSTATUS USBSTOR_SendReadWriteCmd( IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) + IN PIRP Irp, + IN ULONG RetryCount) { UFI_READ_WRITE_CMD Cmd; PPDO_DEVICE_EXTENSION PDODeviceExtension; PCDB pCDB; - ULONG BlockCount; + ULONG BlockCount, Temp; PIO_STACK_LOCATION IoStack; PSCSI_REQUEST_BLOCK Request; @@ -1155,18 +1273,25 @@ Cmd.LogicalBlockByte2 = pCDB->CDB10.LogicalBlockByte2; Cmd.LogicalBlockByte3 = pCDB->CDB10.LogicalBlockByte3; + // + // sanity check + // + Temp = (Cmd.ContiguousLogicBlocksByte0 << 8 | Cmd.ContiguousLogicBlocksByte1); + ASSERT(NTOHL(Temp == BlockCount)); + DPRINT("USBSTOR_SendReadWriteCmd BlockAddress %x%x%x%x BlockCount %lu BlockLength %lu\n", Cmd.LogicalBlockByte0, Cmd.LogicalBlockByte1, Cmd.LogicalBlockByte2, Cmd.LogicalBlockByte3, BlockCount, PDODeviceExtension->BlockLength); // // send request // - return USBSTOR_SendRequest(DeviceObject, Irp, NULL, UFI_READ_WRITE_CMD_LEN, (PUCHAR)&Cmd, Request->DataTransferLength, (PUCHAR)Request->DataBuffer); + return USBSTOR_SendRequest(DeviceObject, Irp, NULL, UFI_READ_WRITE_CMD_LEN, (PUCHAR)&Cmd, Request->DataTransferLength, (PUCHAR)Request->DataBuffer, RetryCount); } NTSTATUS USBSTOR_SendTestUnitCmd( IN PDEVICE_OBJECT DeviceObject, - IN OUT PIRP Irp) + IN OUT PIRP Irp, + IN ULONG RetryCount) { UFI_TEST_UNIT_CMD Cmd; PPDO_DEVICE_EXTENSION PDODeviceExtension; @@ -1203,14 +1328,15 @@ // // send the request // - return USBSTOR_SendRequest(DeviceObject, Irp, NULL, UFI_TEST_UNIT_CMD_LEN, (PUCHAR)&Cmd, 0, NULL); + return USBSTOR_SendRequest(DeviceObject, Irp, NULL, UFI_TEST_UNIT_CMD_LEN, (PUCHAR)&Cmd, 0, NULL, RetryCount); } NTSTATUS USBSTOR_HandleExecuteSCSI( IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) + IN PIRP Irp, + IN ULONG RetryCount) { PCDB pCDB; NTSTATUS Status; @@ -1253,7 +1379,7 @@ ASSERT(Request->DataBuffer); DPRINT("SCSIOP_READ_CAPACITY Length %lu\n", Request->DataTransferLength); - Status = USBSTOR_SendCapacityCmd(DeviceObject, Irp); + Status = USBSTOR_SendCapacityCmd(DeviceObject, Irp, RetryCount); } else if (pCDB->MODE_SENSE.OperationCode == SCSIOP_MODE_SENSE) { @@ -1264,7 +1390,7 @@ // // send mode sense command // - Status = USBSTOR_SendModeSenseCmd(DeviceObject, Irp); + Status = USBSTOR_SendModeSenseCmd(DeviceObject, Irp, RetryCount); } else if (pCDB->MODE_SENSE.OperationCode == SCSIOP_READ || pCDB->MODE_SENSE.OperationCode == SCSIOP_WRITE) { @@ -1273,7 +1399,7 @@ // // send read / write command // - Status = USBSTOR_SendReadWriteCmd(DeviceObject, Irp); + Status = USBSTOR_SendReadWriteCmd(DeviceObject, Irp, RetryCount); } else if (pCDB->AsByte[0] == SCSIOP_MEDIUM_REMOVAL) { @@ -1302,7 +1428,7 @@ // // send test unit command // - Status = USBSTOR_SendTestUnitCmd(DeviceObject, Irp); + Status = USBSTOR_SendTestUnitCmd(DeviceObject, Irp, RetryCount); } else { Modified: trunk/reactos/drivers/usb/usbstor/usbstor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/usbsto… ============================================================================== --- trunk/reactos/drivers/usb/usbstor/usbstor.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbstor/usbstor.c [iso-8859-1] Fri Feb 17 03:02:14 2012 @@ -60,6 +60,11 @@ DeviceExtension->LowerDeviceObject = IoAttachDeviceToDeviceStack(DeviceObject, PhysicalDeviceObject); // + // init timer + // + IoInitializeTimer(DeviceObject, USBSTOR_TimerRoutine, (PVOID)DeviceExtension); + + // // did attaching fail // if (!DeviceExtension->LowerDeviceObject) Modified: trunk/reactos/drivers/usb/usbstor/usbstor.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/usbsto… ============================================================================== --- trunk/reactos/drivers/usb/usbstor/usbstor.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbstor/usbstor.h [iso-8859-1] Fri Feb 17 03:02:14 2012 @@ -68,6 +68,9 @@ ULONG IrpPendingCount; // count of irp pending PSCSI_REQUEST_BLOCK ActiveSrb; // stores the current active SRB KEVENT NoPendingRequests; // set if no pending or in progress requests + PSCSI_REQUEST_BLOCK LastTimerActiveSrb; // last timer tick active srb + ULONG SrbErrorHandlingActive; // error handling of srb is activated + ULONG TimerWorkQueueEnabled; // timer work queue enabled }FDO_DEVICE_EXTENSION, *PFDO_DEVICE_EXTENSION; typedef struct @@ -76,10 +79,14 @@ PDEVICE_OBJECT LowerDeviceObject; // points to FDO UCHAR LUN; // lun id PVOID InquiryData; // USB SCSI inquiry data + PUCHAR FormatData; // USB SCSI Read Format Capacity Data UCHAR Claimed; // indicating if it has been claimed by upper driver ULONG BlockLength; // length of block ULONG LastLogicBlockAddress; // last block address PDEVICE_OBJECT *PDODeviceObject; // entry in pdo list + PDEVICE_OBJECT Self; // self + UCHAR MediumTypeCode; // floppy medium type code + UCHAR IsFloppy; // is device floppy }PDO_DEVICE_EXTENSION, *PPDO_DEVICE_EXTENSION; // @@ -247,6 +254,51 @@ UCHAR Reserved[3]; }UFI_TIMER_PROTECT_PAGE, *PUFI_TIMER_PROTECT_PAGE; C_ASSERT(sizeof(UFI_TIMER_PROTECT_PAGE) == 8); + +//-------------------------------------------------------------------------------------------------------------------------------------------- +// +// UFI read capacity cmd +// + +typedef struct +{ + UCHAR Code; + UCHAR LUN; + UCHAR Reserved[5]; + UCHAR AllocationLengthMsb; + UCHAR AllocationLengthLsb; + UCHAR Reserved1[3]; +}UFI_READ_FORMAT_CAPACITY, *PUFI_READ_FORMAT_CAPACITY; + +C_ASSERT(sizeof(UFI_READ_FORMAT_CAPACITY) == 12); + +#define UFI_READ_FORMAT_CAPACITY_CMD_LEN (10) + +typedef struct +{ + UCHAR Reserved1; + UCHAR Reserved2; + UCHAR Reserved3; + UCHAR CapacityLength; +}UFI_CAPACITY_FORMAT_HEADER, *PUFI_CAPACITY_FORMAT_HEADER; + +C_ASSERT(sizeof(UFI_CAPACITY_FORMAT_HEADER) == 4); + +typedef struct +{ + ULONG BlockCount; + UCHAR Code; + UCHAR BlockLengthByte0; + UCHAR BlockLengthByte1; + UCHAR BlockLengthByte2; +}UFI_CAPACITY_DESCRIPTOR, *PUFI_CAPACITY_DESCRIPTOR; + +#define UNFORMATED_MEDIA_CODE_DESCRIPTORY_TYPE (1) +#define FORMAT_MEDIA_CODE_DESCRIPTOR_TYPE (2) +#define CARTRIDGE_MEDIA_CODE_DESCRIPTOR_TYPE (3) + + + //-------------------------------------------------------------------------------------------------------------------------------------------- // @@ -280,6 +332,7 @@ PMDL TransferBufferMDL; PKEVENT Event; ULONG ErrorIndex; + ULONG RetryCount; }IRP_CONTEXT, *PIRP_CONTEXT; typedef struct _ERRORHANDLER_WORKITEM_DATA @@ -361,6 +414,12 @@ IN PDEVICE_OBJECT DeviceObject, IN PFDO_DEVICE_EXTENSION DeviceExtension); +BOOLEAN +USBSTOR_IsFloppy( + IN PUCHAR Buffer, + IN ULONG BufferLength, + OUT PUCHAR MediumTypeCode); + //--------------------------------------------------------------------- // // descriptor.c routines @@ -386,11 +445,20 @@ NTSTATUS USBSTOR_HandleExecuteSCSI( IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); + IN PIRP Irp, + IN ULONG RetryCount); NTSTATUS USBSTOR_SendInquiryCmd( - IN PDEVICE_OBJECT DeviceObject); + IN PDEVICE_OBJECT DeviceObject, + IN ULONG RetryCount); + +NTSTATUS +USBSTOR_SendFormatCapacity( + IN PDEVICE_OBJECT DeviceObject, + IN ULONG RetryCount); + + NTSTATUS NTAPI @@ -399,6 +467,17 @@ PIRP Irp, PVOID Ctx); +NTSTATUS +USBSTOR_SendCBW( + PIRP_CONTEXT Context, + PIRP Irp); + +VOID +USBSTOR_SendCSW( + PIRP_CONTEXT Context, + PIRP Irp); + + //--------------------------------------------------------------------- // // disk.c routines @@ -479,3 +558,9 @@ IN PDEVICE_OBJECT DeviceObject, IN USBD_PIPE_HANDLE PipeHandle); +VOID +NTAPI +USBSTOR_TimerRoutine( + PDEVICE_OBJECT DeviceObject, + PVOID Context); +

12 years, 7 months

[ion] 55658: [WIN32CSR]: link with CSRSRV in rbuild too.

by ion＠svn.reactos.org

Author: ion Date: Fri Feb 17 01:27:20 2012 New Revision: 55658 URL: http://svn.reactos.org/svn/reactos?rev=55658&view=rev Log: [WIN32CSR]: link with CSRSRV in rbuild too. Modified: trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild Modified: trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild [iso-8859-1] Fri Feb 17 01:27:20 2012 @@ -15,6 +15,7 @@ <library>win32ksys</library> <library>psapi</library> <library>pseh</library> + <library>csrsrv</library> <pch>w32csr.h</pch> <file>alias.c</file> <file>coninput.c</file>

12 years, 7 months

← Newer
1
...
25
26
27
28
29
30
31
...
58
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 February 2012