Ros-diffs February 2012

ros-diffs@reactos.org

22 participants
577 discussions

[sir_richard] 55938: [NTOS]: A few other fixups to the page fault path: 1) Assert on empty kernel PTE instead of handling it as a bugcheck. Windows ASSERTs too. Also clarify some ASSERTs which Wind...

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Wed Feb 29 23:11:21 2012 New Revision: 55938 URL: http://svn.reactos.org/svn/reactos?rev=55938&view=rev Log: [NTOS]: A few other fixups to the page fault path: 1) Assert on empty kernel PTE instead of handling it as a bugcheck. Windows ASSERTs too. Also clarify some ASSERTs which Windows also does versus ASSERTs we are only doing due to lack of support for said feature. 2) User page fault path can now distinguish between a user-mode PTE fault, and a kernel-mode fault on a user PDE, both by creating a correct kernel PDE when needed instead of always creating user PTEs, as well as by only touching the UsedPageTableEntry reference counting mechanism when a user-address is in play. 3) Related to #2, also recognize when the faulting PTE is actually a PDE in the self-mapping region -- another scenario when the "user fault" is actually a kernel fault for a user PDE. 4) Add one more path where a Paged Pool PDE fixup can save the day instead of always faulting. 5) Finally, related to #2 and #3, handle the MI_IS_PAGE_TABLE_OR_HYPER_ADDRESS scenario for a User PDE by treating it as a user fault. The code looks deceptively similar but there are slight differences which require the separate codepaths with some duplicated code. The magic is in the ordering. In trunk, these changes should not cause any regressions (let's hope so). On the internal VAD-based Virtual Memory branch, they now allow booting to 3rd stage and a fully usable ReactOS environment. MEMORY_AREA_VIRTUAL_MEMORY is gone on that branch. It's coming. [NTOS]: Use PAGE_READWRITE as hardcoded protection instead of PAGE_EXECUTE_READWRITE -- the difference is meaningless on ReactOS Mm but actually causes issues on ARM3 with VADs. Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c trunk/reactos/ntoskrnl/mm/anonmem.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pagfault.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Wed Feb 29 23:11:21 2012 @@ -614,25 +614,17 @@ } // - // The PTE must be invalid + // The PTE must be invalid but not completely empty. It must also not be a + // prototype PTE as that scenario should've been handled above // ASSERT(TempPte.u.Hard.Valid == 0); - - /* Check if the PTE is completely empty */ - if (TempPte.u.Long == 0) - { - /* The address is not from any pageable area! */ - KeBugCheckEx(PAGE_FAULT_IN_NONPAGED_AREA, - (ULONG_PTR)Address, - StoreInstruction, - (ULONG_PTR)TrapInformation, - 2); - } - - // - // No prototype, transition or page file software PTEs in ARM3 yet - // ASSERT(TempPte.u.Soft.Prototype == 0); + ASSERT(TempPte.u.Long != 0); + + // + // No transition or page file software PTEs in ARM3 yet, so this must be a + // demand zero page + // ASSERT(TempPte.u.Soft.Transition == 0); ASSERT(TempPte.u.Soft.PageFileHigh == 0); @@ -770,22 +762,12 @@ /* Get the current thread */ CurrentThread = PsGetCurrentThread(); - // Check for a fault on the page table or hyperspace - if (MI_IS_PAGE_TABLE_OR_HYPER_ADDRESS(Address)) - { - ASSERT(TempPte.u.Long != (MM_READWRITE << MM_PTE_SOFTWARE_PROTECTION_BITS)); - ASSERT(TempPte.u.Soft.Prototype == 0); - - /* Use the process working set */ - CurrentProcess = (PEPROCESS)CurrentThread->Tcb.ApcState.Process; - WorkingSet = &CurrentProcess->Vm; - } - else - { - /* Otherwise use the system working set */ - WorkingSet = &MmSystemCacheWs; - CurrentProcess = NULL; - } + /* Check for a fault on the page table or hyperspace */ + if (MI_IS_PAGE_TABLE_OR_HYPER_ADDRESS(Address)) goto UserFault; + + /* Use the system working set */ + WorkingSet = &MmSystemCacheWs; + CurrentProcess = NULL; /* Acquire the working set lock */ KeRaiseIrql(APC_LEVEL, &LockIrql); @@ -884,6 +866,7 @@ } /* This is a user fault */ +UserFault: CurrentThread = PsGetCurrentThread(); CurrentProcess = (PEPROCESS)CurrentThread->Tcb.ApcState.Process; @@ -935,6 +918,9 @@ { /* Right now, we only handle scenarios where the PDE is totally empty */ ASSERT(PointerPde->u.Long == 0); + + /* Right now, we expect a valid protection mask on the VAD */ + ASSERT(ProtectionCode != MM_NOACCESS); /* And go dispatch the fault on the PDE. This should handle the demand-zero */ #if MI_TRACE_PFNS @@ -978,9 +964,16 @@ ProtoPte = MiCheckVirtualAddress(Address, &ProtectionCode, &Vad); if (ProtectionCode == MM_NOACCESS) { - /* This is a bogus VA */ +#if (_MI_PAGING_LEVELS == 2) + /* Could be a page table for paged pool */ + MiCheckPdeForPagedPool(Address); +#endif + /* Has the code above changed anything -- is this now a valid PTE? */ + Status = (PointerPte->u.Hard.Valid == 1) ? STATUS_SUCCESS : STATUS_ACCESS_VIOLATION; + + /* Either this was a bogus VA or we've fixed up a paged pool PDE */ MiUnlockProcessWorkingSet(CurrentProcess, CurrentThread); - return STATUS_ACCESS_VIOLATION; + return Status; } /* Check for non-demand zero PTE */ @@ -1007,17 +1000,34 @@ return Status; } -#if (_MI_PAGING_LEVELS == 2) - /* Add an additional page table reference */ - MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]++; - ASSERT(MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] <= PTE_COUNT); -#endif + /* + * Check if this is a real user-mode address or actually a kernel-mode + * page table for a user mode address + */ + if (Address <= MM_HIGHEST_USER_ADDRESS) + { + /* Add an additional page table reference */ + MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]++; + ASSERT(MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] <= PTE_COUNT); + } + + /* No guard page support yet */ + ASSERT((ProtectionCode & MM_DECOMMIT) == 0); /* Did we get a prototype PTE back? */ if (!ProtoPte) { - /* No, create a new PTE. First, write the protection */ - PointerPte->u.Soft.Protection = ProtectionCode; + /* Is this PTE actually part of the PDE-PTE self-mapping directory? */ + if (PointerPde == MiAddressToPde(PTE_BASE)) + { + /* Then it's really a demand-zero PDE (on behalf of user-mode) */ + MI_WRITE_INVALID_PTE(PointerPte, DemandZeroPde); + } + else + { + /* No, create a new PTE. First, write the protection */ + PointerPte->u.Soft.Protection = ProtectionCode; + } /* Lock the PFN database since we're going to grab a page */ OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); @@ -1052,17 +1062,30 @@ /* And we're done with the lock */ KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); - /* User fault, build a user PTE */ - MI_MAKE_HARDWARE_PTE_USER(&TempPte, - PointerPte, - PointerPte->u.Soft.Protection, - PageFrameIndex); + /* Fault on user PDE, or fault on user PTE? */ + if (PointerPte <= MiHighestUserPte) + { + /* User fault, build a user PTE */ + MI_MAKE_HARDWARE_PTE_USER(&TempPte, + PointerPte, + PointerPte->u.Soft.Protection, + PageFrameIndex); + } + else + { + /* This is a user-mode PDE, create a kernel PTE for it */ + MI_MAKE_HARDWARE_PTE(&TempPte, + PointerPte, + PointerPte->u.Soft.Protection, + PageFrameIndex); + } /* Write the dirty bit for writeable pages */ if (MI_IS_PAGE_WRITEABLE(&TempPte)) MI_MAKE_DIRTY_PAGE(&TempPte); /* And now write down the PTE, making the address valid */ MI_WRITE_VALID_PTE(PointerPte, TempPte); + ASSERT(MiGetPfnEntry(PageFrameIndex)->u1.Event == NULL); /* Demand zero */ Status = STATUS_PAGE_FAULT_DEMAND_ZERO; Modified: trunk/reactos/ntoskrnl/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/anonmem.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] Wed Feb 29 23:11:21 2012 @@ -789,9 +789,9 @@ MmLockAddressSpace(AddressSpace); // - // Force PAGE_EXECUTE_READWRITE for everything, for now + // Force PAGE_READWRITE for everything, for now // - Protect = PAGE_EXECUTE_READWRITE; + Protect = PAGE_READWRITE; if (PBaseAddress != 0) {

12 years, 6 months

[khornicek] 55937: [BOOTDATA] reactos.dff was superseded by reactos.dff.in

by khornicek＠svn.reactos.org

Author: khornicek Date: Wed Feb 29 20:43:23 2012 New Revision: 55937 URL: http://svn.reactos.org/svn/reactos?rev=55937&view=rev Log: [BOOTDATA] reactos.dff was superseded by reactos.dff.in Removed: trunk/reactos/boot/bootdata/packages/reactos.dff Removed: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff (removed) @@ -1,889 +1,0 @@ -; Main ReactOS package - -.Set DiskLabelTemplate="ReactOS" ; Label of disk -.Set CabinetNameTemplate="reactos.cab" ; reactos.cab -.Set InfFileName="reactos.inf" ; reactos.inf - - -;.Set Cabinet=on -;.Set Compress=on - -.InfBegin -[Version] -Signature = "$ReactOS$" - -[Directories] -1 = system32 -2 = system32\drivers -3 = Fonts -4 = -5 = system32\drivers\etc -6 = inf -7 = bin -8 = media - -.InfEnd - -; Contents of disk -.InfBegin -[SourceFiles] -.InfEnd - - -; Base files -base\applications\cacls\cacls.exe 1 -base\applications\calc\calc.exe 1 -base\applications\charmap\charmap.exe 1 -base\applications\cmdutils\dbgprint\dbgprint.exe 1 -base\applications\cmdutils\doskey\doskey.exe 1 -base\applications\cmdutils\find\find.exe 1 -base\applications\cmdutils\hostname\hostname.exe 1 -base\applications\cmdutils\lodctr\lodctr.exe 1 -base\applications\cmdutils\more\more.exe 1 -base\applications\cmdutils\reg\reg.exe 1 -base\applications\cmdutils\xcopy\xcopy.exe 1 -base\applications\control\control.exe 1 -base\applications\dxdiag\dxdiag.exe 1 -base\applications\extrac32\extrac32.exe 1 -base\applications\findstr\findstr.exe 1 -base\applications\fontview\fontview.exe 1 -base\applications\iexplore\iexplore.exe 1 -base\applications\games\solitaire\sol.exe 1 -base\applications\games\spider\spider.exe 1 -base\applications\games\winmine\winmine.exe 1 -base\applications\hh\hh.exe 4 -base\applications\kbswitch\kbswitch.exe 1 -base\applications\kbswitch\kbsdll\kbsdll.dll 1 -base\applications\logoff\logoff.exe 1 -base\applications\magnify\magnify.exe 1 -base\applications\mplay32\mplay32.exe 1 -base\applications\msconfig\msconfig.exe 1 -base\applications\mscutils\devmgmt\devmgmt.exe 1 -base\applications\mscutils\eventvwr\eventvwr.exe 1 -base\applications\mscutils\servman\servman.exe 1 -base\applications\mspaint\mspaint.exe 1 -base\applications\mstsc\mstsc.exe 1 -base\applications\network\arp\arp.exe 1 -base\applications\network\dwnl\dwnl.exe 1 -base\applications\network\finger\finger.exe 1 -base\applications\network\ftp\ftp.exe 1 -base\applications\network\ipconfig\ipconfig.exe 1 -base\applications\network\net\net.exe 1 -base\applications\network\netstat\netstat.exe 1 -base\applications\network\nslookup\nslookup.exe 1 -base\applications\network\ping\ping.exe 1 -base\applications\network\route\route.exe 1 -base\applications\network\telnet\telnet.exe 1 -base\applications\network\tracert\tracert.exe 1 -base\applications\network\whois\whois.exe 1 -base\applications\network\wlanconf\wlanconf.exe 1 -base\applications\notepad\notepad.exe 1 -base\applications\rapps\rapps.exe 1 -base\applications\regedit\regedit.exe 4 -base\applications\regedit\clb\clb.dll 1 -base\applications\regedt32\regedt32.exe 1 -base\applications\sc\sc.exe 1 -base\applications\screensavers\3dtext\3dtext.scr 1 -base\applications\screensavers\logon\logon.scr 1 -base\applications\shutdown\shutdown.exe 1 -base\applications\sndrec32\sndrec32.exe 1 -base\applications\sndvol32\sndvol32.exe 1 -base\applications\taskmgr\taskmgr.exe 1 -base\applications\winhlp32\winhlp32.exe 4 -base\applications\winver\winver.exe 1 -base\applications\wordpad\wordpad.exe 1 -base\applications\write\write.exe 1 - -base\services\audiosrv\audiosrv.exe 1 -base\services\eventlog\eventlog.exe 1 -base\services\rpcss\rpcss.exe 1 -base\services\spoolsv\spoolsv.exe 1 -base\services\svchost\svchost.exe 1 -base\services\tcpsvcs\tcpsvcs.exe 1 -base\services\tcpsvcs\quotes 5 -base\services\telnetd\telnetd.exe 1 -base\services\thmsvc\thmsvc.exe 1 -base\services\umpnpmgr\umpnpmgr.exe 1 -base\services\wlansvc\wlansvc.exe 1 - -base\setup\setup\setup.exe 1 -base\setup\vmwinst\vmwinst.exe 1 - -base\shell\cmd\cmd.exe 1 -base\shell\explorer\explorer.exe 4 optional -base\shell\explorer\explorer-cfg-template.xml 4 optional -base\shell\explorer\notifyhook\notifyhook.dll 1 optional -base\shell\explorer-new\explorer_new.exe 4 optional - -base\system\autochk\autochk.exe 1 -base\system\bootok\bootok.exe 1 -base\system\diskpart\diskpart.exe 1 -base\system\expand\expand.exe 1 -base\system\subst\subst.exe 1 -base\system\format\format.exe 1 -base\system\lsass\lsass.exe 1 -base\system\msiexec\msiexec.exe 1 -base\system\regsvr32\regsvr32.exe 1 -base\system\rundll32\rundll32.exe 1 -base\system\runonce\runonce.exe 1 -base\system\services\services.exe 1 -base\system\smss2\smss.exe 1 -base\system\userinit\userinit.exe 1 -base\system\winlogon\winlogon.exe 1 - -; Dynamic Link Libraries -dll\3rdparty\dxtn\dxtn.dll 1 optional -dll\3rdparty\libjpeg\libjpeg.dll 1 -dll\3rdparty\libpng\libpng.dll 1 -dll\3rdparty\libtiff\libtiff.dll 1 -dll\3rdparty\libxslt\libxslt.dll 1 -dll\3rdparty\mesa32\mesa32.dll 1 - -dll\cpl\access\access.cpl 1 -dll\cpl\appwiz\appwiz.cpl 1 -dll\cpl\console\console.dll 1 -dll\cpl\desk\desk.cpl 1 -dll\cpl\hdwwiz\hdwwiz.cpl 1 -dll\cpl\input\input.dll 1 -dll\cpl\inetcpl\inetcpl.cpl 1 -dll\cpl\intl\intl.cpl 1 -dll\cpl\joy\joy.cpl 1 -;dll\cpl\liccpa\liccpa.cpl 1 -dll\cpl\main\main.cpl 1 -dll\cpl\mmsys\mmsys.cpl 1 -dll\cpl\ncpa\ncpa.cpl 1 -;dll\cpl\odbccp32\odbccp32.cpl 1 -dll\cpl\powercfg\powercfg.cpl 1 -dll\cpl\sysdm\sysdm.cpl 1 -;dll\cpl\telephon\telephon.cpl 1 -dll\cpl\timedate\timedate.cpl 1 -;dll\cpl\usrmgr\usrmgr.cpl 1 - -dll\directx\amstream\amstream.dll 1 -;dll\directx\bdaplgin\bdaplgin.ax 1 -dll\directx\d3d8thk\d3d8thk.dll 1 -dll\directx\devenum\devenum.dll 1 -dll\directx\dinput\dinput.dll 1 -dll\directx\dinput8\dinput8.dll 1 -dll\directx\dmusic\dmusic.dll 1 -dll\directx\dplay\dplay.dll 1 -dll\directx\dplayx\dplayx.dll 1 -dll\directx\dsound\dsound.dll 1 -dll\directx\dxdiagn\dxdiagn.dll 1 -dll\directx\ksproxy\ksproxy.ax 1 -dll\directx\ksuser\ksuser.dll 1 -dll\directx\msdmo\msdmo.dll 1 -;dll\directx\msdvbnp\msdvbnp.ax 1 -;dll\directx\msvidctl\msvidctl.dll 1 -dll\directx\qedit\qedit.dll 1 -dll\directx\quartz\quartz.dll 1 -dll\directx\wine\ddraw\ddraw.dll 1 -dll\directx\wine\d3d8\d3d8.dll 1 -dll\directx\wine\d3d9\d3d9.dll 1 -dll\directx\wine\wined3d\wined3d.dll 1 - -dll\keyboard\kbda1\kbda1.dll 1 -dll\keyboard\kbda2\kbda2.dll 1 -dll\keyboard\kbda3\kbda3.dll 1 -dll\keyboard\kbdal\kbdal.dll 1 -dll\keyboard\kbdarme\kbdarme.dll 1 -dll\keyboard\kbdarmw\kbdarmw.dll 1 -dll\keyboard\kbdaze\kbdaze.dll 1 -dll\keyboard\kbdazel\kbdazel.dll 1 -dll\keyboard\kbdbe\kbdbe.dll 1 -dll\keyboard\kbdbga\kbdbga.dll 1 -dll\keyboard\kbdbgm\kbdbgm.dll 1 -dll\keyboard\kbdbgt\kbdbgt.dll 1 -dll\keyboard\kbdblr\kbdblr.dll 1 -dll\keyboard\kbdbr\kbdbr.dll 1 -dll\keyboard\kbdbur\kbdbur.dll 1 -dll\keyboard\kbdcan\kbdcan.dll 1 -dll\keyboard\kbdcr\kbdcr.dll 1 -dll\keyboard\kbdcz\kbdcz.dll 1 -dll\keyboard\kbdcz1\kbdcz1.dll 1 -dll\keyboard\kbdda\kbdda.dll 1 -dll\keyboard\kbddv\kbddv.dll 1 -dll\keyboard\kbdes\kbdes.dll 1 -dll\keyboard\kbdest\kbdest.dll 1 -dll\keyboard\kbdfc\kbdfc.dll 1 -dll\keyboard\kbdfi\kbdfi.dll 1 -dll\keyboard\kbdfr\kbdfr.dll 1 -dll\keyboard\kbdgeo\kbdgeo.dll 1 -dll\keyboard\kbdgerg\kbdgerg.dll 1 -dll\keyboard\kbdgneo\kbdgneo.dll 1 -dll\keyboard\kbdgr\kbdgr.dll 1 -dll\keyboard\kbdgrist\kbdgrist.dll 1 -dll\keyboard\kbdhe\kbdhe.dll 1 -dll\keyboard\kbdheb\kbdheb.dll 1 -dll\keyboard\kbdhu\kbdhu.dll 1 -dll\keyboard\kbdic\kbdic.dll 1 -dll\keyboard\kbdinasa\kbdinasa.dll 1 -dll\keyboard\kbdinben\kbdinben.dll 1 -dll\keyboard\kbdindev\kbdindev.dll 1 -dll\keyboard\kbdinguj\kbdinguj.dll 1 -dll\keyboard\kbdinmal\kbdinmal.dll 1 -dll\keyboard\kbdir\kbdir.dll 1 -dll\keyboard\kbdit\kbdit.dll 1 -dll\keyboard\kbdja\kbdja.dll 1 -dll\keyboard\kbdkaz\kbdkaz.dll 1 -dll\keyboard\kbdko\kbdko.dll 1 -dll\keyboard\kbdla\kbdla.dll 1 -dll\keyboard\kbdlt1\kbdlt1.dll 1 -dll\keyboard\kbdlv\kbdlv.dll 1 -dll\keyboard\kbdmac\kbdmac.dll 1 -dll\keyboard\kbdne\kbdne.dll 1 -dll\keyboard\kbdno\kbdno.dll 1 -dll\keyboard\kbdpl\kbdpl.dll 1 -dll\keyboard\kbdpl1\kbdpl1.dll 1 -dll\keyboard\kbdpo\kbdpo.dll 1 -dll\keyboard\kbdro\kbdro.dll 1 -dll\keyboard\kbdru\kbdru.dll 1 -dll\keyboard\kbdru1\kbdru1.dll 1 -dll\keyboard\kbdsg\kbdsg.dll 1 -dll\keyboard\kbdsk\kbdsk.dll 1 -dll\keyboard\kbdsk1\kbdsk1.dll 1 -dll\keyboard\kbdsw\kbdsw.dll 1 -dll\keyboard\kbdtat\kbdtat.dll 1 -dll\keyboard\kbdth0\kbdth0.dll 1 -dll\keyboard\kbdth1\kbdth1.dll 1 -dll\keyboard\kbdth2\kbdth2.dll 1 -dll\keyboard\kbdth3\kbdth3.dll 1 -dll\keyboard\kbdtuf\kbdtuf.dll 1 -dll\keyboard\kbdtuq\kbdtuq.dll 1 -dll\keyboard\kbduk\kbduk.dll 1 -dll\keyboard\kbdur\kbdur.dll 1 -dll\keyboard\kbdurs\kbdurs.dll 1 -dll\keyboard\kbdus\kbdus.dll 1 -dll\keyboard\kbdusa\kbdusa.dll 1 -dll\keyboard\kbdusl\kbdusl.dll 1 -dll\keyboard\kbdusr\kbdusr.dll 1 -dll\keyboard\kbdusx\kbdusx.dll 1 -dll\keyboard\kbduzb\kbduzb.dll 1 -dll\keyboard\kbdvntc\kbdvntc.dll 1 -dll\keyboard\kbdycc\kbdycc.dll 1 -dll\keyboard\kbdycl\kbdycl.dll 1 - -dll\ntdll\ntdll.dll 1 - -dll\win32\acledit\acledit.dll 1 -dll\win32\aclui\aclui.dll 1 -dll\win32\activeds\activeds.dll 1 -dll\win32\actxprxy\actxprxy.dll 1 -dll\win32\advapi32\advapi32.dll 1 -dll\win32\advpack\advpack.dll 1 -dll\win32\atl\atl.dll 1 -dll\win32\authz\authz.dll 1 -dll\win32\avicap32\avicap32.dll 1 -dll\win32\avifil32\avifil32.dll 1 -dll\win32\batt\batt.dll 1 -dll\win32\bcrypt\bcrypt.dll 1 -dll\win32\beepmidi\beepmidi.dll 1 -dll\win32\browseui\browseui.dll 1 -dll\win32\cabinet\cabinet.dll 1 -dll\win32\cards\cards.dll 1 -dll\win32\cfgmgr32\cfgmgr32.dll 1 -dll\win32\clusapi\clusapi.dll 1 -dll\win32\comcat\comcat.dll 1 -dll\win32\comctl32\comctl32.dll 1 -dll\win32\comdlg32\comdlg32.dll 1 -dll\win32\compstui\compstui.dll 1 -dll\win32\credui\credui.dll 1 -dll\win32\crtdll\crtdll.dll 1 -dll\win32\crypt32\crypt32.dll 1 -dll\win32\cryptdlg\cryptdlg.dll 1 -dll\win32\cryptdll\cryptdll.dll 1 -dll\win32\cryptnet\cryptnet.dll 1 -dll\win32\cryptui\cryptui.dll 1 -dll\win32\dbghelp\dbghelp.dll 1 -dll\win32\dciman32\dciman32.dll 1 -dll\win32\devmgr\devmgr.dll 1 -dll\win32\dhcpcsvc\dhcpcsvc.dll 1 -dll\win32\dnsapi\dnsapi.dll 1 -dll\win32\dwmapi\dwmapi.dll 1 -dll\win32\faultrep\faultrep.dll 1 -dll\win32\fmifs\fmifs.dll 1 -dll\win32\fusion\fusion.dll 1 -dll\win32\gdi32\gdi32.dll 1 -dll\win32\gdiplus\gdiplus.dll 1 -dll\win32\getuname\getuname.dll 1 -dll\win32\glu32\glu32.dll 1 -dll\win32\hhctrl.ocx\hhctrl.ocx 1 -dll\win32\hid\hid.dll 1 -dll\win32\hlink\hlink.dll 1 -dll\win32\hnetcfg\hnetcfg.dll 1 -dll\win32\httpapi\httpapi.dll 1 -dll\win32\iccvid\iccvid.dll 1 -dll\win32\icmp\icmp.dll 1 -dll\win32\imaadp32.acm\imaadp32.acm 1 -dll\win32\imagehlp\imagehlp.dll 1 -dll\win32\imm32\imm32.dll 1 -dll\win32\inetcomm\inetcomm.dll 1 -dll\win32\inetmib1\inetmib1.dll 1 -dll\win32\initpki\initpki.dll 1 -dll\win32\inseng\inseng.dll 1 -dll\win32\iphlpapi\iphlpapi.dll 1 -dll\win32\itircl\itircl.dll 1 -dll\win32\itss\itss.dll 1 -dll\win32\jscript\jscript.dll 1 -dll\win32\kernel32\kernel32.dll 1 -dll\win32\loadperf\loadperf.dll 1 -dll\win32\localspl\localspl.dll 1 -dll\win32\localui\localui.dll 1 -dll\win32\lpk\lpk.dll 1 -dll\win32\lsasrv\lsasrv.dll 1 -dll\win32\lz32\lz32.dll 1 -dll\win32\mapi32\mapi32.dll 1 -dll\win32\mciavi32\mciavi32.dll 1 -dll\win32\mcicda\mcicda.dll 1 -dll\win32\mciqtz32\mciqtz32.dll 1 -dll\win32\mciseq\mciseq.dll 1 -dll\win32\mciwave\mciwave.dll 1 -dll\win32\mlang\mlang.dll 1 -dll\win32\mmdrv\mmdrv.dll 1 -dll\win32\modemui\modemui.dll 1 -dll\win32\mpr\mpr.dll 1 -dll\win32\mprapi\mprapi.dll 1 -dll\win32\msacm32\msacm32.dll 1 -dll\win32\msacm32\msacm32.drv\msacm32.drv 1 -dll\win32\msadp32.acm\msadp32.acm 1 -dll\win32\msafd\msafd.dll 1 -dll\win32\mscat32\mscat32.dll 1 -dll\win32\mscms\mscms.dll 1 -dll\win32\mscoree\mscoree.dll 1 -dll\win32\msctf\msctf.dll 1 -dll\win32\msftedit\msftedit.dll 1 -dll\win32\msg711.acm\msg711.acm 1 -dll\win32\msgina\msgina.dll 1 -dll\win32\msgsm32.acm\msgsm32.acm 1 -dll\win32\mshtml\mshtml.dll 1 -dll\win32\mshtml.tlb\mshtml.tlb 1 -dll\win32\msi\msi.dll 1 -dll\win32\msimg32\msimg32.dll 1 -dll\win32\msimtf\msimtf.dll 1 -dll\win32\msisip\msisip.dll 1 -dll\win32\msisys.ocx\msisys.ocx 1 -dll\win32\msnet32\msnet32.dll 1 -dll\win32\msports\msports.dll 1 -dll\win32\msrle32\msrle32.dll 1 -dll\win32\mssign32\mssign32.dll 1 -dll\win32\mssip32\mssip32.dll 1 -dll\win32\mstask\mstask.dll 1 -dll\win32\msvcrt\msvcrt.dll 1 -dll\win32\msvcrt20\msvcrt20.dll 1 -dll\win32\msvcrt40\msvcrt40.dll 1 -dll\win32\msvfw32\msvfw32.dll 1 -dll\win32\msvidc32\msvidc32.dll 1 -dll\win32\mswsock\mswsock.dll 1 -dll\win32\msxml3\msxml3.dll 1 -dll\win32\nddeapi\nddeapi.dll 1 -dll\win32\netapi32\netapi32.dll 1 -dll\win32\netcfgx\netcfgx.dll 1 -dll\win32\netevent\netevent.dll 1 -dll\win32\netid\netid.dll 1 -dll\win32\netshell\netshell.dll 1 -dll\win32\newdev\newdev.dll 1 -dll\win32\ntdsapi\ntdsapi.dll 1 -dll\win32\ntlanman\ntlanman.dll 1 -dll\win32\ntmarta\ntmarta.dll 1 -dll\win32\ntprint\ntprint.dll 1 -dll\win32\objsel\objsel.dll 1 -dll\win32\odbc32\odbc32.dll 1 -dll\win32\odbccp32\odbccp32.dll 1 -dll\win32\ole32\ole32.dll 1 -dll\win32\oleacc\oleacc.dll 1 -dll\win32\oleaut32\oleaut32.dll 1 -dll\win32\olecli32\olecli32.dll 1 -dll\win32\oledlg\oledlg.dll 1 -dll\win32\olepro32\olepro32.dll 1 -dll\win32\olesvr32\olesvr32.dll 1 -dll\win32\olethk32\olethk32.dll 1 -dll\win32\opengl32\opengl32.dll 1 -dll\win32\pdh\pdh.dll 1 -dll\win32\pidgen\pidgen.dll 1 -dll\win32\powrprof\powrprof.dll 1 -dll\win32\printui\printui.dll 1 -dll\win32\psapi\psapi.dll 1 -dll\win32\pstorec\pstorec.dll 1 -dll\win32\qmgr\qmgr.dll 1 -dll\win32\qmgrprxy\qmgrprxy.dll 1 -dll\win32\query\query.dll 1 -dll\win32\rasadhlp\rasadhlp.dll 1 -dll\win32\rasapi32\rasapi32.dll 1 -dll\win32\rasdlg\rasdlg.dll 1 -dll\win32\rasman\rasman.dll 1 -dll\win32\resutils\resutils.dll 1 -dll\win32\riched20\riched20.dll 1 -dll\win32\riched32\riched32.dll 1 -dll\win32\rpcrt4\rpcrt4.dll 1 -dll\win32\rsabase\rsabase.dll 1 -dll\win32\rsaenh\rsaenh.dll 1 -dll\win32\samlib\samlib.dll 1 -dll\win32\samsrv\samsrv.dll 1 -dll\win32\sccbase\sccbase.dll 1 -dll\win32\schannel\schannel.dll 1 -dll\win32\secur32\secur32.dll 1 -dll\win32\security\security.dll 1 -dll\win32\sensapi\sensapi.dll 1 -dll\win32\serialui\serialui.dll 1 -dll\win32\setupapi\setupapi.dll 1 -dll\win32\sfc\sfc.dll 1 -dll\win32\sfc_os\sfc_os.dll 1 -dll\win32\shdoclc\shdoclc.dll 1 -dll\win32\shdocvw\shdocvw.dll 1 -dll\win32\shell32\shell32.dll 1 -dll\win32\shfolder\shfolder.dll 1 -dll\win32\shimgvw\shimgvw.dll 1 -dll\win32\shlwapi\shlwapi.dll 1 -dll\win32\slbcsp\slbcsp.dll 1 -dll\win32\smdll\smdll.dll 1 -dll\win32\sndblst\sndblst.dll 1 -dll\win32\snmpapi\snmpapi.dll 1 -dll\win32\softpub\softpub.dll 1 -dll\win32\spoolss\spoolss.dll 1 -dll\win32\srclient\srclient.dll 1 -dll\win32\stdole2.tlb\stdole2.tlb 1 -dll\win32\stdole32.tlb\stdole32.tlb 1 -dll\win32\sti\sti.dll 1 -dll\win32\sxs\sxs.dll 1 -dll\win32\syssetup\syssetup.dll 1 -dll\win32\t2embed\t2embed.dll 1 -dll\win32\tapi32\tapi32.dll 1 -dll\win32\tapiui\tapiui.dll 1 -dll\win32\traffic\traffic.dll 1 -dll\win32\twain_32\twain_32.dll 1 -dll\win32\uext2\uext2.dll 1 -dll\win32\ufat\ufat.dll 1 -dll\win32\ufatx\ufatx.dll 1 optional -dll\win32\unicows\unicows.dll 1 -dll\win32\untfs\untfs.dll 1 -dll\win32\updspapi\updspapi.dll 1 -dll\win32\url\url.dll 1 -dll\win32\urlmon\urlmon.dll 1 -dll\win32\user32\user32.dll 1 -dll\win32\userenv\userenv.dll 1 -dll\win32\usp10\usp10.dll 1 -dll\win32\uxtheme\uxtheme.dll 1 -dll\win32\vdmdbg\vdmdbg.dll 1 -dll\win32\version\version.dll 1 -dll\win32\wdmaud.drv\wdmaud.drv 1 -dll\win32\wer\wer.dll 1 -dll\win32\windowscodecs\windowscodecs.dll 1 -dll\win32\winemp3.acm\winemp3.acm 1 -dll\win32\winfax\winfax.dll 1 -dll\win32\wing32\wing32.dll 1 -dll\win32\winhttp\winhttp.dll 1 -dll\win32\wininet\wininet.dll 1 -dll\win32\winmm\winmm.dll 1 -dll\win32\winmm\midimap\midimap.dll 1 -dll\win32\winspool\winspool.drv 1 -dll\win32\winsta\winsta.dll 1 -dll\win32\wintrust\wintrust.dll 1 -dll\win32\wlanapi\wlanapi.dll 1 -dll\win32\wldap32\wldap32.dll 1 -dll\win32\wmi\wmi.dll 1 -dll\win32\ws2_32\ws2_32.dll 1 -dll\win32\ws2help\ws2help.dll 1 -dll\win32\wshirda\wshirda.dll 1 -dll\win32\wshtcpip\wshtcpip.dll 1 -dll\win32\wsock32\wsock32.dll 1 -dll\win32\wtsapi32\wtsapi32.dll 1 -dll\win32\wuapi\wuapi.dll 1 -dll\win32\xinput1_1\xinput1_1.dll 1 -dll\win32\xinput1_2\xinput1_2.dll 1 -dll\win32\xinput1_3\xinput1_3.dll 1 -dll\win32\xinput9_1_0\xinput9_1_0.dll 1 -dll\win32\xmllite\xmllite.dll 1 - -; Shell Extensions -dll\shellext\deskadp\deskadp.dll 1 -dll\shellext\deskmon\deskmon.dll 1 -dll\shellext\devcpux\devcpux.dll 1 -dll\shellext\fontext\fontext.dll 1 -dll\shellext\slayer\slayer.dll 1 - -; Drivers -drivers\base\beep\beep.sys 2 -drivers\base\bootvid\bootvid.dll 1 -drivers\base\nmidebug\nmidebug.sys 2 -drivers\base\null\null.sys 2 - -drivers\battery\battc\battc.sys 2 - -drivers\bus\acpi\cmbatt\cmbatt.sys 2 -drivers\bus\acpi\compbatt\compbatt.sys 2 - -drivers\directx\dxapi\dxapi.sys 2 -drivers\directx\dxg\dxg.sys 2 -drivers\directx\dxgthk\dxgthk.sys 2 - -drivers\filesystems\fs_rec\fs_rec.sys 2 -drivers\filesystems\msfs\msfs.sys 2 -drivers\filesystems\mup\mup.sys 2 -drivers\filesystems\npfs\npfs.sys 2 - -drivers\input\mouclass\mouclass.sys 2 -drivers\input\sermouse\sermouse.sys 2 - -drivers\ksfilter\ks\ks.sys 2 -;drivers\multimedia\bdasup\bdasup.sys 2 - -drivers\network\afd\afd.sys 2 -drivers\network\ndis\ndis.sys 2 -drivers\network\tcpip\tcpip.sys 2 -drivers\network\tdi\tdi.sys 2 -drivers\network\dd\ne2000\ne2000.sys 2 -drivers\network\dd\pcnet\pcnet.sys 2 -drivers\network\ndisuio\ndisuio.sys 2 - -drivers\serial\serenum\serenum.sys 2 -drivers\serial\serial\serial.sys 2 - -drivers\storage\ide\pciide\pciide.sys 2 -drivers\storage\ide\pciidex\pciidex.sys 2 - -drivers\hid\mouhid\mouhid.sys 2 - -drivers\video\displays\vga\vgaddi.dll 1 -drivers\video\displays\framebuf\framebuf.dll 1 -drivers\video\miniport\vga\vgamp.sys 2 -drivers\video\miniport\vbe\vbemp.sys 2 -drivers\video\videoprt\videoprt.sys 2 -drivers\video\font\ftfd\ftfd.dll 1 - -drivers\wdm\audio\filters\kmixer\kmixer.sys 2 -drivers\wdm\audio\sysaudio\sysaudio.sys 2 -drivers\wdm\audio\legacy\wdmaud\wdmaud.sys 2 -drivers\wdm\audio\backpln\portcls\portcls.sys 2 -drivers\wdm\audio\drm\drmk\drmk.sys 2 -drivers\wmi\wmilib.sys 2 - -; Media -media\fonts\DejaVuSans.ttf 3 -media\fonts\DejaVuSans-Bold.ttf 3 -media\fonts\DejaVuSans-BoldOblique.ttf 3 -media\fonts\DejaVuSansMono.ttf 3 -media\fonts\DejaVuSansMono-Bold.ttf 3 -media\fonts\DejaVuSansMono-BoldOblique.ttf 3 -media\fonts\DejaVuSansMono-Oblique.ttf 3 -media\fonts\DejaVuSans-Oblique.ttf 3 -media\fonts\DejaVuSerif.ttf 3 -media\fonts\DejaVuSerif-Bold.ttf 3 -media\fonts\DejaVuSerif-BoldItalic.ttf 3 -media\fonts\DejaVuSerif-Italic.ttf 3 - -media\fonts\FreeMono.ttf 3 -media\fonts\FreeMonoBold.ttf 3 -media\fonts\FreeMonoBoldOblique.ttf 3 -media\fonts\FreeMonoOblique.ttf 3 - -media\fonts\LiberationMono-Bold.ttf 3 -media\fonts\LiberationMono-BoldItalic.ttf 3 -media\fonts\LiberationMono-Italic.ttf 3 -media\fonts\LiberationMono-Regular.ttf 3 -media\fonts\LiberationSans-Bold.ttf 3 -media\fonts\LiberationSans-BoldItalic.ttf 3 -media\fonts\LiberationSans-Italic.ttf 3 -media\fonts\LiberationSans-Regular.ttf 3 -media\fonts\LiberationSerif-Bold.ttf 3 -media\fonts\LiberationSerif-BoldItalic.ttf 3 -media\fonts\LiberationSerif-Italic.ttf 3 -media\fonts\LiberationSerif-Regular.ttf 3 - -media\fonts\Marlett.ttf 3 -media\fonts\symbol.ttf 3 -media\fonts\tahoma.ttf 3 -media\fonts\tahomabd.ttf 3 - -media\vgafonts\vgafonts.cab 4 - -media\nls\c_037.nls 1 -media\nls\c_424.nls 1 -media\nls\c_500.nls 1 -media\nls\c_737.nls 1 -media\nls\c_775.nls 1 -media\nls\c_850.nls 1 -media\nls\c_852.nls 1 -media\nls\c_855.nls 1 -media\nls\c_856.nls 1 -media\nls\c_857.nls 1 -media\nls\c_860.nls 1 -media\nls\c_861.nls 1 -media\nls\c_862.nls 1 -media\nls\c_863.nls 1 -media\nls\c_864.nls 1 -media\nls\c_865.nls 1 -media\nls\c_866.nls 1 -media\nls\c_869.nls 1 -media\nls\c_874.nls 1 -media\nls\c_875.nls 1 -media\nls\c_878.nls 1 -media\nls\c_932.nls 1 -media\nls\c_936.nls 1 -media\nls\c_949.nls 1 -media\nls\c_950.nls 1 -media\nls\c_1006.nls 1 -media\nls\c_1026.nls 1 -media\nls\c_1250.nls 1 -media\nls\c_1251.nls 1 -media\nls\c_1253.nls 1 -media\nls\c_1254.nls 1 -media\nls\c_1255.nls 1 -media\nls\c_1256.nls 1 -media\nls\c_1257.nls 1 -media\nls\c_1258.nls 1 -media\nls\c_10000.nls 1 -media\nls\c_10006.nls 1 -media\nls\c_10007.nls 1 -media\nls\c_10029.nls 1 -media\nls\c_10079.nls 1 -media\nls\c_10081.nls 1 -media\nls\c_20866.nls 1 -media\nls\c_21866.nls 1 -media\nls\c_28591.nls 1 -media\nls\c_28592.nls 1 -media\nls\c_28593.nls 1 -media\nls\c_28594.nls 1 -media\nls\c_28595.nls 1 -media\nls\c_28596.nls 1 -media\nls\c_28597.nls 1 -media\nls\c_28598.nls 1 -media\nls\c_28599.nls 1 -media\nls\c_28600.nls 1 -media\nls\c_28603.nls 1 -media\nls\c_28604.nls 1 -media\nls\c_28605.nls 1 -media\nls\c_28606.nls 1 -media\drivers\etc\hosts 5 -media\drivers\etc\services 5 -media\inf\audio.inf 6 -media\inf\acpi.inf 6 -media\inf\battery.inf 6 -media\inf\cdrom.inf 6 -media\inf\cpu.inf 6 -media\inf\disk.inf 6 -media\inf\display.inf 6 -media\inf\font.inf 6 -media\inf\fdc.inf 6 -media\inf\hal.inf 6 -media\inf\hdc.inf 6 -media\inf\input.inf 6 -media\inf\intl.inf 6 -media\inf\layout.inf 6 -media\inf\machine.inf 6 -media\inf\msmouse.inf 6 -media\inf\keyboard.inf 6 -media\inf\ks.inf 6 -media\inf\NET_NIC.inf 6 -media\inf\netamd.inf 6 -media\inf\netisa.inf 6 -media\inf\netrtpnt.inf 6 -media\inf\nettcpip.inf 6 -media\inf\ports.inf 6 -media\inf\scsi.inf 6 -media\inf\syssetup.inf 6 -media\inf\unknown.inf 6 -media\inf\usbport.inf 6 -media\inf\usb.inf 6 -media\inf\usbstor.inf 6 -media\inf\xboxdisp.inf 6 - - -; Media Files -media\sounds\ReactOS_LogOn.wav 8 - -; Ini Files -boot\bootdata\system.ini 4 - -; Regression Testing -boot\bootdata\bootcdregtest\regtest.cmd 7 optional - -; Subsystems -subsystems\win32\csrss\csrss.exe 1 -subsystems\win32\csrss\win32csr\win32csr.dll 1 -subsystems\win32\csrss\csrsrv\csrsrv.dll 1 -subsystems\ntvdm\ntvdm.exe 1 optional -subsystems\win32\win32k\win32k.sys 1 - -; Optional/proprietary files -modules\optional\DroidSansFallback.ttf 3 optional -modules\optional\NOTICE_for_Droid_Font.txt 4 optional -modules\optional\netkvm2k.inf 6 optional -modules\optional\netkvm2k.cat 6 optional -modules\optional\netkvm.sys 2 optional -modules\optional\alcxwdm.inf 6 optional -modules\optional\alcxwdm.sys 2 optional -modules\optional\mfc42.dll 1 optional -modules\optional\mfc42u.dll 1 optional -modules\optional\mfc71.dll 1 optional -modules\optional\mfc71u.dll 1 optional -modules\optional\msvbvm50.dll 1 optional -modules\optional\msvbvm60.dll 1 optional -modules\optional\msvcirt.dll 1 optional -modules\optional\msvcp71.dll 1 optional -modules\optional\msvcr71.dll 1 optional -modules\optional\vmx_fb.dll 1 optional -modules\optional\vmx_mode.dll 1 optional -modules\optional\vmx_svga.inf 6 optional -modules\optional\vmx_svga.sys 2 optional -modules\optional\wine_gecko-1.0.0-x86.cab 4 optional - -; Rosapps -modules\rosapps\applications\screensavers\cylfrac\cylfrac.scr 1 optional -modules\rosapps\applications\screensavers\matrix\matrix.scr 1 optional -modules\rosapps\applications\screensavers\blankscr\scrnsave.scr 1 optional -modules\rosapps\applications\screensavers\starfield\starfield.scr 1 optional -modules\rosapps\applications\screensavers\mazescr\mazescr.scr 1 optional -modules\rosapps\applications\screensavers\butterflies\butterflies.scr 1 optional -modules\rosapps\applications\cmdutils\comp\comp.exe 1 optional -modules\rosapps\applications\cmdutils\mode\mode.exe 1 optional -modules\rosapps\applications\cmdutils\sort\sort.exe 1 optional -modules\rosapps\applications\cmdutils\tee\tee.exe 1 optional -modules\rosapps\applications\cmdutils\touch\touch.exe 1 optional -modules\rosapps\applications\cmdutils\uptime\uptime.exe 1 optional -modules\rosapps\applications\cmdutils\y\y.exe 1 optional -modules\rosapps\applications\devutils\gdb2\gdb2.exe 1 optional -modules\rosapps\applications\devutils\gdihv\gdihv.exe 1 optional -modules\rosapps\applications\devutils\genguid\genguid.exe 1 optional -modules\rosapps\applications\sysutils\gettype\gettype.exe 1 optional -modules\rosapps\applications\net\ncftp\ncftp.exe 1 optional -modules\rosapps\applications\net\netreg\netreg.exe 1 optional -modules\rosapps\applications\net\niclist\niclist.exe 1 optional -modules\rosapps\applications\net\roshttpd\roshttpd.exe 1 optional -modules\rosapps\applications\notevil\notevil.exe 1 optional -modules\rosapps\applications\sysutils\chkdsk\chkdsk.exe 1 optional -modules\rosapps\applications\sysutils\systeminfo\systeminfo.exe 1 optional -modules\rosapps\applications\sysutils\chklib\chklib.exe 1 optional -modules\rosapps\applications\sysutils\ctm\ctm.exe 1 optional -modules\rosapps\applications\sysutils\kill\kill.exe 1 optional -modules\rosapps\applications\sysutils\lsdd\lsdd.exe 1 optional -modules\rosapps\applications\sysutils\man\man.exe 1 optional -modules\rosapps\applications\sysutils\pedump\pedump.exe 1 optional -modules\rosapps\applications\sysutils\regexpl\regexpl.exe 1 optional -modules\rosapps\applications\sysutils\tcat\tcat.exe 1 optional -modules\rosapps\applications\sysutils\tlist\tlist.exe 1 optional -modules\rosapps\applications\sysutils\screenshot\screenshot.exe 1 optional -modules\rosapps\applications\sysutils\utils\binpatch\binpatch.exe 1 optional -modules\rosapps\applications\sysutils\utils\cat\cat.exe 1 optional -modules\rosapps\applications\sysutils\utils\driver\load\load.exe 1 optional -modules\rosapps\applications\sysutils\utils\driver\unload\unload.exe 1 optional -modules\rosapps\applications\sysutils\utils\infinst\infinst.exe 1 optional -modules\rosapps\applications\sysutils\utils\nts2w32err\nts2w32err.exe 1 optional -modules\rosapps\applications\sysutils\utils\objdir\objdir.exe 1 optional -modules\rosapps\applications\sysutils\utils\partinfo\partinfo.exe 1 optional -modules\rosapps\applications\sysutils\utils\ps\ps.exe 1 optional -modules\rosapps\applications\sysutils\utils\rosperf\rosperf.exe 1 optional -modules\rosapps\applications\sysutils\utils\stats\stats.exe 1 optional -modules\rosapps\applications\sysutils\utils\tickcount\tickcount.exe 1 optional -modules\rosapps\applications\winfile\winfile.exe 1 optional -modules\rosapps\demos\maze\maze.exe 1 optional -modules\rosapps\drivers\green\green.sys 2 optional - -; Rostests -modules\rostests\rosautotest\rosautotest.exe 1 optional -modules\rostests\tests\pseh2\pseh2_test.exe 7 optional -modules\rostests\winetests\advapi32\advapi32_winetest.exe 7 optional -modules\rostests\winetests\advpack\advpack_winetest.exe 7 optional -modules\rostests\winetests\amstream\amstream_winetest.exe 7 optional -modules\rostests\winetests\atl\atl_winetest.exe 7 optional -modules\rostests\winetests\avifil32\avifil32_winetest.exe 7 optional -modules\rostests\winetests\browseui\browseui_winetest.exe 7 optional -modules\rostests\winetests\cabinet\cabinet_winetest.exe 7 optional -modules\rostests\winetests\comcat\comcat_winetest.exe 7 optional -modules\rostests\winetests\comctl32\comctl32_winetest.exe 7 optional -modules\rostests\winetests\comdlg32\comdlg32_winetest.exe 7 optional -modules\rostests\winetests\credui\credui_winetest.exe 7 optional -modules\rostests\winetests\crypt32\crypt32_winetest.exe 7 optional -modules\rostests\winetests\cryptnet\cryptnet_winetest.exe 7 optional -modules\rostests\winetests\cryptui\cryptui_winetest.exe 7 optional -modules\rostests\winetests\dnsapi\dnsapi_winetest.exe 7 optional -modules\rostests\winetests\dsound\dsound_winetest.exe 7 optional -modules\rostests\winetests\fusion\fusion_winetest.exe 7 optional -modules\rostests\winetests\gdi32\gdi32_winetest.exe 7 optional -modules\rostests\winetests\gdiplus\gdiplus_winetest.exe 7 optional -modules\rostests\winetests\hlink\hlink_winetest.exe 7 optional -modules\rostests\winetests\icmp\icmp_winetest.exe 7 optional -modules\rostests\winetests\imagehlp\imagehlp_winetest.exe 7 optional -modules\rostests\winetests\imm32\imm32_winetest.exe 7 optional -modules\rostests\winetests\inetcomm\inetcomm_winetest.exe 7 optional -modules\rostests\winetests\inetmib1\inetmib1_winetest.exe 7 optional -modules\rostests\winetests\iphlpapi\iphlpapi_winetest.exe 7 optional -modules\rostests\winetests\itss\itss_winetest.exe 7 optional -modules\rostests\winetests\jscript\jscript_winetest.exe 7 optional -modules\rostests\winetests\kernel32\kernel32_winetest.exe 7 optional -modules\rostests\winetests\localspl\localspl_winetest.exe 7 optional -modules\rostests\winetests\localui\localui_winetest.exe 7 optional -modules\rostests\winetests\lz32\lz32_winetest.exe 7 optional -modules\rostests\winetests\mapi32\mapi32_winetest.exe 7 optional -modules\rostests\winetests\mlang\mlang_winetest.exe 7 optional -modules\rostests\winetests\msacm32\msacm32_winetest.exe 7 optional -modules\rostests\winetests\mscms\mscms_winetest.exe 7 optional -modules\rostests\winetests\mscoree\mscoree_winetest.exe 7 optional -modules\rostests\winetests\msctf\msctf_winetest.exe 7 optional -modules\rostests\winetests\mshtml\mshtml_winetest.exe 7 optional -modules\rostests\winetests\msi\msi_winetest.exe 7 optional -modules\rostests\winetests\mstask\mstask_winetest.exe 7 optional -modules\rostests\winetests\msvcrt\msvcrt_winetest.exe 7 optional -modules\rostests\winetests\msvcrtd\msvcrtd_winetest.exe 7 optional -modules\rostests\winetests\msvfw32\msvfw32_winetest.exe 7 optional -modules\rostests\winetests\msxml3\msxml3_winetest.exe 7 optional -modules\rostests\winetests\netapi32\netapi32_winetest.exe 7 optional -modules\rostests\winetests\ntdll\ntdll_winetest.exe 7 optional -modules\rostests\winetests\ntdsapi\ntdsapi_winetest.exe 7 optional -modules\rostests\winetests\ntprint\ntprint_winetest.exe 7 optional -modules\rostests\winetests\odbccp32\odbccp32_winetest.exe 7 optional -modules\rostests\winetests\ole32\ole32_winetest.exe 7 optional -modules\rostests\winetests\oleacc\oleacc_winetest.exe 7 optional -modules\rostests\winetests\oleaut32\oleaut32_winetest.exe 7 optional -modules\rostests\winetests\opengl32\opengl32_winetest.exe 7 optional -modules\rostests\winetests\pdh\pdh_winetest.exe 7 optional -modules\rostests\winetests\powrprof\powrprof_winetest.exe 7 optional -modules\rostests\winetests\psapi\psapi_winetest.exe 7 optional -modules\rostests\winetests\qmgr\qmgr_winetest.exe 7 optional -modules\rostests\winetests\quartz\quartz_winetest.exe 7 optional -modules\rostests\winetests\rasapi32\rasapi32_winetest.exe 7 optional -modules\rostests\winetests\riched20\riched20_winetest.exe 7 optional -modules\rostests\winetests\riched32\riched32_winetest.exe 7 optional -modules\rostests\winetests\rpcrt4\rpcrt4_winetest.exe 7 optional -modules\rostests\winetests\rsabase\rsabase_winetest.exe 7 optional -modules\rostests\winetests\rsaenh\rsaenh_winetest.exe 7 optional -modules\rostests\winetests\schannel\schannel_winetest.exe 7 optional -modules\rostests\winetests\secur32\secur32_winetest.exe 7 optional -modules\rostests\winetests\serialui\serialui_winetest.exe 7 optional -modules\rostests\winetests\setupapi\setupapi_winetest.exe 7 optional -modules\rostests\winetests\shdocvw\shdocvw_winetest.exe 7 optional -modules\rostests\winetests\shell32\shell32_winetest.exe 7 optional -modules\rostests\winetests\shlwapi\shlwapi_winetest.exe 7 optional -modules\rostests\winetests\snmpapi\snmpapi_winetest.exe 7 optional -modules\rostests\winetests\spoolss\spoolss_winetest.exe 7 optional -modules\rostests\winetests\twain_32\twain_32_winetest.exe 7 optional -modules\rostests\winetests\urlmon\urlmon_winetest.exe 7 optional -modules\rostests\winetests\user32\user32_winetest.exe 7 optional -modules\rostests\winetests\userenv\userenv_winetest.exe 7 optional -modules\rostests\winetests\usp10\usp10_winetest.exe 7 optional -modules\rostests\winetests\uxtheme\uxtheme_winetest.exe 7 optional -modules\rostests\winetests\version\version_winetest.exe 7 optional -modules\rostests\winetests\winhttp\winhttp_winetest.exe 7 optional -modules\rostests\winetests\wininet\wininet_winetest.exe 7 optional -modules\rostests\winetests\winmm\winmm_winetest.exe 7 optional -modules\rostests\winetests\wintrust\wintrust_winetest.exe 7 optional -modules\rostests\winetests\wlanapi\wlanapi_winetest.exe 7 optional -modules\rostests\winetests\wldap32\wldap32_winetest.exe 7 optional -modules\rostests\winetests\ws2_32\ws2_32_winetest.exe 7 optional -modules\rostests\winetests\xmllite\xmllite_winetest.exe 7 optional - -modules\rostests\apitests\advapi32\advapi32_apitest.exe 7 optional -modules\rostests\apitests\dciman32\dciman32_apitest.exe 7 optional -modules\rostests\apitests\gdi32\gdi32_apitest.exe 7 optional -modules\rostests\apitests\kernel32\kernel32_apitest.exe 7 optional -modules\rostests\apitests\msvcrt\msvcrt_apitest.exe 7 optional -modules\rostests\apitests\ntdll\ntdll_apitest.exe 7 optional -modules\rostests\apitests\user32\user32_apitest.exe 7 optional -modules\rostests\apitests\ws2_32\ws2_32_apitest.exe 7 optional - -modules\rostests\kmtests\kmtest_.exe 7 optional -modules\rostests\kmtests\kmtest_drv.sys 7 optional -modules\rostests\kmtests\example\example_drv.sys 7 optional -modules\rostests\kmtests\ntos_io\iodeviceobject_drv.sys 7 optional -modules\rostests\kmtests\ntos_io\iohelper_drv.sys 7 optional - -modules\wallpaper\Angelus_02_ROSWP.bmp 4 optional

12 years, 6 months

[pschweitzer] 55936: [NTOSKRNL] Implement FsRtlNotifyFilterChangeDirectory

by pschweitzer＠svn.reactos.org

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

12 years, 6 months

[pschweitzer] 55935: [NTOSKRNL] Forgot to commit that file

by pschweitzer＠svn.reactos.org

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

12 years, 6 months

[pschweitzer] 55934: [NTOSKRNL] Stub FsRtlCancelNotify Implement FsRtlCheckNotifyForDelete, FsRtlNotifyCompleteIrp, FsRtlNotifyCompleteIrpList, FsRtlNotifySetCancelRoutine

by pschweitzer＠svn.reactos.org

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

12 years, 6 months

[cgutman] 55933: [ROSAUTOTEST] - Flush file buffers after writing to the crash recovery journal

by cgutman＠svn.reactos.org

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

12 years, 6 months

[pschweitzer] 55932: [NTOSKRNL] Fix a bug in FsRtlNotifyCleanup: only remove notification from list when we're about to complete it.

by pschweitzer＠svn.reactos.org

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

12 years, 6 months

[pschweitzer] 55931: [NTOSKRNL] Fix formatting, no code change

by pschweitzer＠svn.reactos.org

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

12 years, 6 months

[pschweitzer] 55930: [NTOSKRNL] Use LIST_ENTRY not pointer on them as head

by pschweitzer＠svn.reactos.org

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

12 years, 6 months

[pschweitzer] 55929: [NTOSKRNL] Get rid off TAG macro

by pschweitzer＠svn.reactos.org

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

12 years, 6 months

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