Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 44146: fix x86 build
by tkreuzer＠svn.reactos.org 14 Nov '09

14 Nov '09

Author: tkreuzer Date: Sat Nov 14 03:11:01 2009 New Revision: 44146 URL: http://svn.reactos.org/svn/reactos?rev=44146&view=rev Log: fix x86 build Modified: branches/ros-amd64-bringup/reactos/lib/rtl/swprintf.c Modified: branches/ros-amd64-bringup/reactos/lib/rtl/swprintf.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/swprintf.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/swprintf.c [iso-8859-1] Sat Nov 14 03:11:01 2009 @@ -395,8 +395,10 @@ wchar_t * str, * end; const char *s; const wchar_t *sw; +#if 0 const wchar_t *ss; -// double _double; + double _double; +#endif int flags; /* flags to number() */

1 0

[pschweitzer] 44145: Updated Matt Wu's Ext2/Ext3 driver to V0.48
by pschweitzer＠svn.reactos.org 13 Nov '09

13 Nov '09

Author: pschweitzer Date: Sat Nov 14 00:43:11 2009 New Revision: 44145 URL: http://svn.reactos.org/svn/reactos?rev=44145&view=rev Log: Updated Matt Wu's Ext2/Ext3 driver to V0.48 Added: vendor/ext2fsd/Ext2Mgr/Ext2Mgr.vcproj (with props) vendor/ext2fsd/Ext2Mgr/ReadMe.txt (with props) Removed: vendor/ext2fsd/Ext2Mgr/Ext2Mgr.mak vendor/ext2fsd/Ext3Fsd/cp.bat Modified: vendor/ext2fsd/Ext2Mgr/Ext2Attribute.cpp vendor/ext2fsd/Ext2Mgr/Ext2Mgr.cpp vendor/ext2fsd/Ext2Mgr/Ext2Mgr.rc vendor/ext2fsd/Ext2Mgr/Ext2MgrDlg.cpp vendor/ext2fsd/Ext2Mgr/Ext2MgrDlg.h vendor/ext2fsd/Ext2Mgr/MountPoints.cpp vendor/ext2fsd/Ext2Mgr/Properties.cpp vendor/ext2fsd/Ext2Mgr/SelectDrvLetter.cpp vendor/ext2fsd/Ext2Mgr/ServiceManage.cpp vendor/ext2fsd/Ext2Mgr/ServiceManage.h vendor/ext2fsd/Ext2Mgr/enumDisk.cpp vendor/ext2fsd/Ext2Mgr/enumDisk.h vendor/ext2fsd/Ext2Mgr/resource.h vendor/ext2fsd/Ext3Fsd/Ext3Fsd.rc vendor/ext2fsd/Ext3Fsd/block.c vendor/ext2fsd/Ext3Fsd/cleanup.c vendor/ext2fsd/Ext3Fsd/close.c vendor/ext2fsd/Ext3Fsd/cmcb.c vendor/ext2fsd/Ext3Fsd/create.c vendor/ext2fsd/Ext3Fsd/devctl.c vendor/ext2fsd/Ext3Fsd/dirctl.c vendor/ext2fsd/Ext3Fsd/except.c vendor/ext2fsd/Ext3Fsd/ext3fsd.dsp vendor/ext2fsd/Ext3Fsd/fastio.c vendor/ext2fsd/Ext3Fsd/fileinfo.c vendor/ext2fsd/Ext3Fsd/flush.c vendor/ext2fsd/Ext3Fsd/fsctl.c vendor/ext2fsd/Ext3Fsd/include/common.h vendor/ext2fsd/Ext3Fsd/include/ext2fs.h vendor/ext2fsd/Ext3Fsd/include/ntifs.gnu.h vendor/ext2fsd/Ext3Fsd/init.c vendor/ext2fsd/Ext3Fsd/memory.c vendor/ext2fsd/Ext3Fsd/notes.txt vendor/ext2fsd/Ext3Fsd/pnp.c vendor/ext2fsd/Ext3Fsd/read.c vendor/ext2fsd/Ext3Fsd/readme.txt vendor/ext2fsd/Ext3Fsd/resource.h vendor/ext2fsd/Ext3Fsd/sys/Sources vendor/ext2fsd/Ext3Fsd/volinfo.c vendor/ext2fsd/Ext3Fsd/write.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: vendor/ext2fsd/Ext2Mgr/Ext2Attribute.cpp URL: http://svn.reactos.org/svn/reactos/vendor/ext2fsd/Ext2Mgr/Ext2Attribute.cpp… Modified: vendor/ext2fsd/Ext2Mgr/Ext2Mgr.cpp URL: http://svn.reactos.org/svn/reactos/vendor/ext2fsd/Ext2Mgr/Ext2Mgr.cpp?rev=4… Removed: vendor/ext2fsd/Ext2Mgr/Ext2Mgr.mak URL: http://svn.reactos.org/svn/reactos/vendor/ext2fsd/Ext2Mgr/Ext2Mgr.mak?rev=4… Modified: vendor/ext2fsd/Ext2Mgr/Ext2Mgr.rc URL: http://svn.reactos.org/svn/reactos/vendor/ext2fsd/Ext2Mgr/Ext2Mgr.rc?rev=44… Added: vendor/ext2fsd/Ext2Mgr/Ext2Mgr.vcproj URL: http://svn.reactos.org/svn/reactos/vendor/ext2fsd/Ext2Mgr/Ext2Mgr.vcproj?re… Modified: vendor/ext2fsd/Ext2Mgr/Ext2MgrDlg.cpp URL: http://svn.reactos.org/svn/reactos/vendor/ext2fsd/Ext2Mgr/Ext2MgrDlg.cpp?re… Modified: vendor/ext2fsd/Ext2Mgr/Ext2MgrDlg.h URL: http://svn.reactos.org/svn/reactos/vendor/ext2fsd/Ext2Mgr/Ext2MgrDlg.h?rev=… Modified: vendor/ext2fsd/Ext2Mgr/MountPoints.cpp URL: http://svn.reactos.org/svn/reactos/vendor/ext2fsd/Ext2Mgr/MountPoints.cpp?r… Modified: vendor/ext2fsd/Ext2Mgr/Properties.cpp URL: http://svn.reactos.org/svn/reactos/vendor/ext2fsd/Ext2Mgr/Properties.cpp?re… Added: vendor/ext2fsd/Ext2Mgr/ReadMe.txt URL: http://svn.reactos.org/svn/reactos/vendor/ext2fsd/Ext2Mgr/ReadMe.txt?rev=44… Modified: vendor/ext2fsd/Ext2Mgr/SelectDrvLetter.cpp URL: http://svn.reactos.org/svn/reactos/vendor/ext2fsd/Ext2Mgr/SelectDrvLetter.c… Modified: vendor/ext2fsd/Ext2Mgr/ServiceManage.cpp URL: http://svn.reactos.org/svn/reactos/vendor/ext2fsd/Ext2Mgr/ServiceManage.cpp… Modified: vendor/ext2fsd/Ext2Mgr/ServiceManage.h URL: http://svn.reactos.org/svn/reactos/vendor/ext2fsd/Ext2Mgr/ServiceManage.h?r… Modified: vendor/ext2fsd/Ext2Mgr/enumDisk.cpp URL: http://svn.reactos.org/svn/reactos/vendor/ext2fsd/Ext2Mgr/enumDisk.cpp?rev=… Modified: vendor/ext2fsd/Ext2Mgr/enumDisk.h URL: http://svn.reactos.org/svn/reactos/vendor/ext2fsd/Ext2Mgr/enumDisk.h?rev=44… Modified: vendor/ext2fsd/Ext2Mgr/resource.h URL: http://svn.reactos.org/svn/reactos/vendor/ext2fsd/Ext2Mgr/resource.h?rev=44… Modified: vendor/ext2fsd/Ext3Fsd/Ext3Fsd.rc URL: http://svn.reactos.org/svn/reactos/vendor/ext2fsd/Ext3Fsd/Ext3Fsd.rc?rev=44… Modified: vendor/ext2fsd/Ext3Fsd/block.c URL: http://svn.reactos.org/svn/reactos/vendor/ext2fsd/Ext3Fsd/block.c?rev=44145… Modified: vendor/ext2fsd/Ext3Fsd/cleanup.c URL: http://svn.reactos.org/svn/reactos/vendor/ext2fsd/Ext3Fsd/cleanup.c?rev=441… Modified: vendor/ext2fsd/Ext3Fsd/close.c URL: http://svn.reactos.org/svn/reactos/vendor/ext2fsd/Ext3Fsd/close.c?rev=44145… Modified: vendor/ext2fsd/Ext3Fsd/cmcb.c URL: http://svn.reactos.org/svn/reactos/vendor/ext2fsd/Ext3Fsd/cmcb.c?rev=44145&… Removed: vendor/ext2fsd/Ext3Fsd/cp.bat URL: http://svn.reactos.org/svn/reactos/vendor/ext2fsd/Ext3Fsd/cp.bat?rev=44144&… Modified: vendor/ext2fsd/Ext3Fsd/create.c URL: http://svn.reactos.org/svn/reactos/vendor/ext2fsd/Ext3Fsd/create.c?rev=4414… Modified: vendor/ext2fsd/Ext3Fsd/devctl.c URL: http://svn.reactos.org/svn/reactos/vendor/ext2fsd/Ext3Fsd/devctl.c?rev=4414… Modified: vendor/ext2fsd/Ext3Fsd/dirctl.c URL: http://svn.reactos.org/svn/reactos/vendor/ext2fsd/Ext3Fsd/dirctl.c?rev=4414… Modified: vendor/ext2fsd/Ext3Fsd/except.c URL: http://svn.reactos.org/svn/reactos/vendor/ext2fsd/Ext3Fsd/except.c?rev=4414… Modified: vendor/ext2fsd/Ext3Fsd/ext3fsd.dsp URL: http://svn.reactos.org/svn/reactos/vendor/ext2fsd/Ext3Fsd/ext3fsd.dsp?rev=4… Modified: vendor/ext2fsd/Ext3Fsd/fastio.c URL: http://svn.reactos.org/svn/reactos/vendor/ext2fsd/Ext3Fsd/fastio.c?rev=4414… Modified: vendor/ext2fsd/Ext3Fsd/fileinfo.c URL: http://svn.reactos.org/svn/reactos/vendor/ext2fsd/Ext3Fsd/fileinfo.c?rev=44… Modified: vendor/ext2fsd/Ext3Fsd/flush.c URL: http://svn.reactos.org/svn/reactos/vendor/ext2fsd/Ext3Fsd/flush.c?rev=44145… Modified: vendor/ext2fsd/Ext3Fsd/fsctl.c URL: http://svn.reactos.org/svn/reactos/vendor/ext2fsd/Ext3Fsd/fsctl.c?rev=44145… Modified: vendor/ext2fsd/Ext3Fsd/include/common.h URL: http://svn.reactos.org/svn/reactos/vendor/ext2fsd/Ext3Fsd/include/common.h?… Modified: vendor/ext2fsd/Ext3Fsd/include/ext2fs.h URL: http://svn.reactos.org/svn/reactos/vendor/ext2fsd/Ext3Fsd/include/ext2fs.h?… Modified: vendor/ext2fsd/Ext3Fsd/include/ntifs.gnu.h URL: http://svn.reactos.org/svn/reactos/vendor/ext2fsd/Ext3Fsd/include/ntifs.gnu… Modified: vendor/ext2fsd/Ext3Fsd/init.c URL: http://svn.reactos.org/svn/reactos/vendor/ext2fsd/Ext3Fsd/init.c?rev=44145&… Modified: vendor/ext2fsd/Ext3Fsd/memory.c URL: http://svn.reactos.org/svn/reactos/vendor/ext2fsd/Ext3Fsd/memory.c?rev=4414… Modified: vendor/ext2fsd/Ext3Fsd/notes.txt URL: http://svn.reactos.org/svn/reactos/vendor/ext2fsd/Ext3Fsd/notes.txt?rev=441… Modified: vendor/ext2fsd/Ext3Fsd/pnp.c URL: http://svn.reactos.org/svn/reactos/vendor/ext2fsd/Ext3Fsd/pnp.c?rev=44145&r… Modified: vendor/ext2fsd/Ext3Fsd/read.c URL: http://svn.reactos.org/svn/reactos/vendor/ext2fsd/Ext3Fsd/read.c?rev=44145&… Modified: vendor/ext2fsd/Ext3Fsd/readme.txt URL: http://svn.reactos.org/svn/reactos/vendor/ext2fsd/Ext3Fsd/readme.txt?rev=44… Modified: vendor/ext2fsd/Ext3Fsd/resource.h URL: http://svn.reactos.org/svn/reactos/vendor/ext2fsd/Ext3Fsd/resource.h?rev=44… Modified: vendor/ext2fsd/Ext3Fsd/sys/Sources URL: http://svn.reactos.org/svn/reactos/vendor/ext2fsd/Ext3Fsd/sys/Sources?rev=4… Modified: vendor/ext2fsd/Ext3Fsd/volinfo.c URL: http://svn.reactos.org/svn/reactos/vendor/ext2fsd/Ext3Fsd/volinfo.c?rev=441… Modified: vendor/ext2fsd/Ext3Fsd/write.c URL: http://svn.reactos.org/svn/reactos/vendor/ext2fsd/Ext3Fsd/write.c?rev=44145…

1 0

[tkreuzer] 44144: - Share some more inline functions between the kernel and freeldr - Use __ltr instead of Ke386SetTr - refactor KiInitializeTss - Update some Mm conatnts - Halfplement KeFlushEntireTb - Clean the mapping of page 0 in KiSystemStartup, as long as we don't clean mappings in freeldr - Fix a serious bug in KiPageFault, where ebp was used instead of rbp, resulting in recursive page faults as soon as usermode mappings were cleared - Refactor MmArmInitSystem and related. Pahse 0 initial
by tkreuzer＠svn.reactos.org 13 Nov '09

13 Nov '09

Author: tkreuzer Date: Sat Nov 14 00:30:44 2009 New Revision: 44144 URL: http://svn.reactos.org/svn/reactos?rev=44144&view=rev Log: - Share some more inline functions between the kernel and freeldr - Use __ltr instead of Ke386SetTr - refactor KiInitializeTss - Update some Mm conatnts - Halfplement KeFlushEntireTb - Clean the mapping of page 0 in KiSystemStartup, as long as we don't clean mappings in freeldr - Fix a serious bug in KiPageFault, where ebp was used instead of rbp, resulting in recursive page faults as soon as usermode mappings were cleared - Refactor MmArmInitSystem and related. Pahse 0 initialisation completes here now. we fail later in freelist setup code, which is not 64 bit safe. Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/windows/amd64/wlmemory.c branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/intrin_i.h branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/mm.h branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/init.c Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h [iso-8859-1] Sat Nov 14 00:30:44 2009 @@ -58,28 +58,6 @@ HARDWARE_PTE Pde[512]; } PAGE_DIRECTORY_AMD64, *PPAGE_DIRECTORY_AMD64; -PKGDTENTRY64 -FORCEINLINE -KiGetGdtEntry(PVOID pGdt, USHORT Index) -{ - return (PKGDTENTRY64)((ULONG64)pGdt + (Index & ~RPL_MASK)); -} - -VOID -FORCEINLINE -KiInitGdtEntry(PKGDTENTRY64 Entry, ULONG64 Base, ULONG Limit, UCHAR Type, UCHAR Dpl) -{ - Entry->Bits.Type = Type; - Entry->Bits.Present = 1; - Entry->Bits.Dpl = Dpl; - Entry->BaseLow = (USHORT)(Base & 0xFFFF); - Entry->Bytes.BaseMiddle = (UCHAR)(Base >> 16); - Entry->Bytes.BaseHigh = (UCHAR)(Base >> 24); - Entry->BaseUpper = (ULONG)(Base >> 32); - Entry->LimitLow = (USHORT)(Limit & 0xFFFF); - Entry->Bits.LimitHigh = (ULONG)((Limit >> 16) & 0xf); - Entry->MustBeZero = 0; -} VOID FrLdrSetupGdtIdt(); Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/windows/amd64/wlmemory.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/windows/amd64/wlmemory.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/windows/amd64/wlmemory.c [iso-8859-1] Sat Nov 14 00:30:44 2009 @@ -354,8 +354,8 @@ Ke386SetGs(KGDT_64_DATA | RPL_MASK); // 0x2b Ke386SetSs(KGDT_64_R0_SS); // 0x18 - // Load TSR - Ke386SetTr(KGDT_TSS); + /* Load TSR */ + __ltr(KGDT_TSS); DPRINTM(DPRINT_WINDOWS, "leave WinLdrSetProcessorContext\n"); } Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/intrin_i.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/intrin_i.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/intrin_i.h [iso-8859-1] Sat Nov 14 00:30:44 2009 @@ -9,6 +9,57 @@ #define KeSetCurrentIrql(x) __writecr8(x) +PKGDTENTRY64 +FORCEINLINE +KiGetGdtEntry(PVOID pGdt, USHORT Selector) +{ + return (PKGDTENTRY64)((ULONG64)pGdt + (Selector & ~RPL_MASK)); +} + +PVOID +FORCEINLINE +KiGetGdtDescriptorBase(PKGDTENTRY Entry) +{ + return (PVOID)((ULONG64)Entry->BaseLow | + (ULONG64)Entry->Bytes.BaseMiddle << 16 | + (ULONG64)Entry->Bytes.BaseHigh << 24 | + (ULONG64)Entry->BaseUpper << 32); +} + +VOID +FORCEINLINE +KiSetGdtDescriptorBase(PKGDTENTRY Entry, ULONG64 Base) +{ + Entry->BaseLow = Base & 0xffff; + Entry->Bits.BaseMiddle = (Base >> 16) & 0xff; + Entry->Bits.BaseHigh = (Base >> 24) & 0xff; + Entry->BaseUpper = Base >> 32; +} + +PVOID +FORCEINLINE +KiSetGdtDescriptorLimit(PKGDTENTRY Entry, ULONG Limit) +{ + Entry->LimitLow = Limit & 0xffff; + Entry->Bits.LimitHigh = Limit >> 16; +} + +VOID +FORCEINLINE +KiInitGdtEntry(PKGDTENTRY64 Entry, ULONG64 Base, ULONG Size, UCHAR Type, UCHAR Dpl) +{ + KiSetGdtDescriptorBase(Entry, Base); + KiSetGdtDescriptorLimit(Entry, Size - 1); + Entry->Bits.Type = Type; + Entry->Bits.Dpl = Dpl; + Entry->Bits.Present = 1; + Entry->Bits.System = 0; + Entry->Bits.LongMode = 0; + Entry->Bits.DefaultBig = 0; + Entry->Bits.Granularity = 0; + Entry->MustBeZero = 0; +} + #if defined(__GNUC__) static __inline__ __attribute__((always_inline)) void __lgdt(void *Source) @@ -41,9 +92,9 @@ __asm__ __volatile__("stmxcsr %0" : : "m"(*Destination) : "memory"); } -static __inline__ __attribute__((always_inline)) void __ltr(unsigned short *Source) -{ - __asm__ __volatile__("ltr %0" : : "m"(*Source)); +static __inline__ __attribute__((always_inline)) void __ltr(unsigned short Source) +{ + __asm__ __volatile__("ltr %0" : : "rm"(Source)); } static __inline__ __attribute__((always_inline)) void __str(unsigned short *Destination) @@ -51,25 +102,6 @@ __asm__ __volatile__("str %0" : : "m"(*Destination) : "memory"); } -#define Ke386GetLocalDescriptorTable(X) \ - __asm__("sldt %0\n\t" \ - : /* no outputs */ \ - : "m" (X)); - -#define Ke386SetLocalDescriptorTable(X) \ - __asm__("lldt %w0\n\t" \ - : /* no outputs */ \ - : "q" (X)); - -#define Ke386SetTr(X) __asm__ __volatile__("ltr %%ax" : :"a" (X)); - -#define Ke386GetTr(X) \ - __asm__("str %0\n\t" \ - : /* no outputs */ \ - : "m" (X)); - -#define Ke386SaveFlags(x) __asm__ __volatile__("pushfq ; popq %0":"=rm" (x): /* no input */) -#define Ke386RestoreFlags(x) __asm__ __volatile__("pushq %0 ; popfq": /* no output */ :"irm" (x):"memory") #define _Ke386GetSeg(N) ({ \ unsigned int __d; \ Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h [iso-8859-1] Sat Nov 14 00:30:44 2009 @@ -46,6 +46,8 @@ #define X86_MSR_CSTAR 0xC0000083 #define X86_MSR_SFMASK 0xC0000084 +#define AMD64_TSS 9 + #ifndef __ASM__ #include "intrin_i.h" @@ -118,21 +120,10 @@ } struct _KPCR; -VOID -KiInitializeGdt(struct _KPCR* Pcr); -VOID -Ki386ApplicationProcessorInitializeTSS(VOID); - -// Hack -VOID KiRosPrepareForSystemStartup(ULONG, PROS_LOADER_PARAMETER_BLOCK); VOID FASTCALL -Ki386InitializeTss( - IN PKTSS Tss, - IN PVOID GdtBase, - IN UINT64 Stack -); +KiInitializeTss(IN PKTSS Tss, IN UINT64 Stack); VOID KiDivideErrorFault(); VOID KiDebugTrapOrFault(); Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/mm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] Sat Nov 14 00:30:44 2009 @@ -5,11 +5,24 @@ #ifndef __NTOSKRNL_INCLUDE_INTERNAL_AMD64_MM_H #define __NTOSKRNL_INCLUDE_INTERNAL_AMD64_MM_H +/* Helper macros */ #define PAGE_MASK(x) ((x)&(~0xfff)) #define PAE_PAGE_MASK(x) ((x)&(~0xfffLL)) -#define HYPER_SPACE 0xFFFFF70000000000ULL -#define HYPER_SPACE_END 0xFFFFF77FFFFFFFFFULL +/* Memory layout base addresses */ +#define HYPER_SPACE 0xFFFFF70000000000ULL +#define HYPER_SPACE_END 0xFFFFF77FFFFFFFFFULL +#define MI_SESSION_VIEW_END (PVOID)0xFFFFF97FFF000000ULL +#define MI_SESSION_SPACE_END (PVOID)0xFFFFF98000000000ULL + +#define MI_PAGED_POOL_START (PVOID)0xFFFFFA8000000000ULL + +#define MI_NON_PAGED_SYSTEM_START_MIN 0xFFFFFAA000000000ULL +#define MI_NONPAGED_POOL_END (PVOID)0xFFFFFAE000000000ULL + +#define MI_DEBUG_MAPPING (PVOID)0xFFFFFFFF80000000ULL // FIXME + + PULONG64 FORCEINLINE @@ -87,8 +100,8 @@ #define MI_MIN_PAGES_FOR_NONPAGED_POOL_TUNING ((255*1024*1024) >> PAGE_SHIFT) #define MI_MIN_PAGES_FOR_SYSPTE_TUNING ((19*1024*1024) >> PAGE_SHIFT) #define MI_MIN_PAGES_FOR_SYSPTE_BOOST ((32*1024*1024) >> PAGE_SHIFT) -#define MI_MAX_INIT_NONPAGED_POOL_SIZE (128 * 1024 * 1024) -#define MI_MAX_NONPAGED_POOL_SIZE (128 * 1024 * 1024) +#define MI_MAX_INIT_NONPAGED_POOL_SIZE (128ULL * 1024 * 1024 * 1024) +#define MI_MAX_NONPAGED_POOL_SIZE (128ULL * 1024 * 1024 * 1024) #define MI_MAX_FREE_PAGE_LISTS 4 #define MI_MIN_INIT_PAGED_POOLSIZE (32 * 1024 * 1024) @@ -104,9 +117,6 @@ #define MI_SYSTEM_VIEW_SIZE (16 * 1024 * 1024) -#define MI_PAGED_POOL_START (PVOID)0xFFFFFA8000000000ULL -#define MI_NONPAGED_POOL_END (PVOID)0xFFFFFAE000000000ULL -#define MI_DEBUG_MAPPING (PVOID)0xFFFFFFFF80000000ULL // FIXME #define MM_HIGHEST_VAD_ADDRESS \ (PVOID)((ULONG_PTR)MM_HIGHEST_USER_ADDRESS - (16 * PAGE_SIZE)) Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c [iso-8859-1] Sat Nov 14 00:30:44 2009 @@ -46,6 +46,9 @@ KIRQL KiOldIrql; ULONG KiFreezeFlag; +/* Flush data */ +volatile LONG KiTbFlushTimeStamp; + /* CPU Signatures */ static const CHAR CmpIntelID[] = "GenuineIntel"; static const CHAR CmpAmdID[] = "AuthenticAMD"; @@ -90,7 +93,7 @@ KeGetCurrentPrcb()->CpuID = 0; /* Save EFlags */ - Ke386SaveFlags(EFlags); + EFlags = __readeflags(); /* Do CPUID 1 now */ __cpuid(Reg, 1); @@ -115,7 +118,7 @@ KeGetCurrentPrcb()->CpuStep = (USHORT)Stepping; /* Restore EFLAGS */ - Ke386RestoreFlags(EFlags); + __writeeflags(EFlags); } ULONG @@ -389,35 +392,19 @@ VOID FASTCALL -Ki386InitializeTss(IN PKTSS64 Tss, - IN PVOID GdtBase, - IN UINT64 Stack) +KiInitializeTss(IN PKTSS64 Tss, + IN UINT64 Stack) { PKGDTENTRY64 TssEntry; - /* Initialize the TSS descriptor entry */ - TssEntry = (PVOID)((ULONG64)GdtBase + KGDT_TSS); - TssEntry->Bits.Type = 9;//AMD64_TSS; - TssEntry->Bits.Dpl = 0; - TssEntry->Bits.Present = 1; - TssEntry->Bits.System = 0; - TssEntry->Bits.LongMode = 0; - TssEntry->Bits.DefaultBig = 0; - TssEntry->Bits.Granularity = 0; - TssEntry->MustBeZero = 0; - - /* Descriptor base is the TSS address */ - TssEntry->BaseLow = (ULONG64)Tss & 0xffff; - TssEntry->Bits.BaseMiddle = ((ULONG64)Tss >> 16) & 0xff; - TssEntry->Bits.BaseHigh = ((ULONG64)Tss >> 24) & 0xff; - TssEntry->BaseUpper = (ULONG64)Tss >> 32; - - /* Set the limit */ - TssEntry->LimitLow = sizeof(KTSS64) -1; - TssEntry->Bits.LimitHigh = 0; + /* Get pointer to the GDT entry */ + TssEntry = KiGetGdtEntry(KeGetPcr()->GdtBase, KGDT_TSS); + + /* Initialize the GDT entry */ + KiInitGdtEntry(TssEntry, (ULONG64)Tss, sizeof(KTSS64), AMD64_TSS, 0); /* Zero out the TSS */ - RtlZeroMemory(Tss, sizeof(KTSS)); + RtlZeroMemory(Tss, sizeof(KTSS64)); /* FIXME: I/O Map? */ Tss->IoMapBase = 0x68; @@ -435,8 +422,7 @@ Tss->Ist[3] = (ULONG64)KiDoubleFaultStack; /* Load the task register */ - Ke386SetTr(KGDT_TSS); - + __ltr(KGDT_TSS); } VOID @@ -535,7 +521,19 @@ KeFlushEntireTb(IN BOOLEAN Invalid, IN BOOLEAN AllProcessors) { - UNIMPLEMENTED; + KIRQL OldIrql; + + // FIXME: halfplemented + /* Raise the IRQL for the TB Flush */ + OldIrql = KeRaiseIrqlToSynchLevel(); + + /* Flush the TB for the Current CPU, and update the flush stamp */ + KeFlushCurrentTb(); + + /* Update the flush stamp and return to original IRQL */ + InterlockedExchangeAdd(&KiTbFlushTimeStamp, 1); + KeLowerIrql(OldIrql); + } KAFFINITY Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c [iso-8859-1] Sat Nov 14 00:30:44 2009 @@ -337,7 +337,7 @@ IN PVOID DpcStack) { KDESCRIPTOR GdtDescriptor = {{0},0,0}, IdtDescriptor = {{0},0,0}; - KGDTENTRY64 TssSelector; + PKGDTENTRY64 TssEntry; USHORT Tr = 0; /* Zero out the PCR */ @@ -375,19 +375,16 @@ Pcr->IdtBase = (PKIDTENTRY)IdtDescriptor.Base; /* Get TSS Selector */ - Ke386GetTr(Tr); // <- FIXME: this is ugly! - if (Tr != KGDT_TSS) Tr = KGDT_TSS; // FIXME: HACKHACK - - /* Get TSS Selector, mask it and get its GDT Entry */ - TssSelector = *(PKGDTENTRY)((ULONG_PTR)Pcr->GdtBase + (Tr & ~RPL_MASK)); + __str(&Tr); + ASSERT(Tr == KGDT_TSS); + + /* Get TSS Entry */ + TssEntry = KiGetGdtEntry(Pcr->GdtBase, Tr); /* Get the KTSS itself */ - Pcr->TssBase = (PKTSS)(ULONG_PTR)(TssSelector.BaseLow | - TssSelector.Bytes.BaseMiddle << 16 | - TssSelector.Bytes.BaseHigh << 24 | - (ULONG64)TssSelector.BaseUpper << 32); - - Pcr->Prcb.RspBase = Pcr->TssBase->Rsp0; + Pcr->TssBase = KiGetGdtDescriptorBase(TssEntry); + + Pcr->Prcb.RspBase = Pcr->TssBase->Rsp0; // FIXME /* Set DPC Stack */ Pcr->Prcb.DpcStack = DpcStack; @@ -403,7 +400,7 @@ Pcr->Prcb.CurrentThread = IdleThread; /* Start us out at PASSIVE_LEVEL */ -// Pcr->Irql = PASSIVE_LEVEL; + Pcr->Irql = PASSIVE_LEVEL; KeSetCurrentIrql(PASSIVE_LEVEL); } @@ -627,6 +624,9 @@ FrLdrDbgPrint = ((PLOADER_PARAMETER_BLOCK)Dummy)->u.I386.CommonDataArea; FrLdrDbgPrint("Hello from KiSystemStartup!!!\n"); + /* HACK, because freeldr maps page 0 */ + MiAddressToPte((PVOID)0)->u.Hard.Valid = 0; + KiSystemStartupReal((PLOADER_PARAMETER_BLOCK)Dummy); // KiRosPrepareForSystemStartup(Dummy, LoaderBlock); @@ -699,7 +699,7 @@ if (Cpu == 0) { /* Setup the TSS descriptors and entries */ - Ki386InitializeTss(Pcr->TssBase, Pcr->GdtBase, InitialStack); + KiInitializeTss(Pcr->TssBase, InitialStack); /* Setup the IDT */ KeInitExceptions(); @@ -711,7 +711,7 @@ KdInitSystem(0, KeLoaderBlock); /* Check for break-in */ -// if (KdPollBreakIn()) DbgBreakPointWithStatus(1); + if (KdPollBreakIn()) DbgBreakPointWithStatus(DBG_STATUS_CONTROL_C); /* Hack! Wait for the debugger! */ while (!KdPollBreakIn()); @@ -728,7 +728,7 @@ // DPRINT1("Gdt = %p, Idt = %p, Pcr = %p, Tss = %p\n", Gdt, Idt, Pcr, Tss); - DbgBreakPointWithStatus(0); + DbgBreakPointWithStatus(DBG_STATUS_CONTROL_C); /* Initialize the Processor with HAL */ HalInitializeProcessor(Cpu, KeLoaderBlock); Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] Sat Nov 14 00:30:44 2009 @@ -19,7 +19,7 @@ .asciz "WARNING: %s at %s:%d is UNIMPLEMENTED!\n" _MsgPageFault: -.ascii "Page fault 0x%x at %p!\n\0" +.ascii "Page fault! Code = 0x%x, RIP = %p, FaultingAddress = %p\n\0" _MsgGeneralProtFault: .ascii "General protection fault at %p!\n\0" @@ -333,9 +333,9 @@ ENTER_TRAP_FRAME (0x28), TRAPFLAG_ALL - lea rcx, _MsgBreakpointTrap[rip] - mov rdx, rbp - call _FrLdrDbgPrint[rip] +// lea rcx, _MsgBreakpointTrap[rip] +// mov rdx, rsp +// call _FrLdrDbgPrint[rip] /* Dispatch the exception */ mov ecx, STATUS_BREAKPOINT @@ -495,23 +495,25 @@ .pushframe 1 /* We have an error code */ -// lea rcx, _MsgPageFault[rip] -// mov rdx, [rsp] -// mov r8, [rsp+8] -// mov r9, rsp -// call _FrLdrDbgPrint[rip] - ENTER_TRAP_FRAME (0x28), TRAPFLAG_ALL + +#if 0 + lea rcx, _MsgPageFault[rip] + mov rdx, [rbp + KTRAP_FRAME_ErrorCode] + mov r8, [rbp + KTRAP_FRAME_Rip] + mov r9, [rbp + KTRAP_FRAME_FaultAddress] + call _FrLdrDbgPrint[rip] +#endif /* Save page fault address */ mov rdx, cr2 mov [rbp + KTRAP_FRAME_FaultAddress], rdx /* Call page fault handler */ - mov ecx, [ebp + KTRAP_FRAME_ErrorCode] // StoreInstruction + mov ecx, [rbp + KTRAP_FRAME_ErrorCode] // StoreInstruction and ecx, 1 // rdx == Address - mov r8b, [ebp + KTRAP_FRAME_SegCs] // Mode + mov r8b, [rbp + KTRAP_FRAME_SegCs] // Mode and r8b, 1 mov r9, rbp // TrapInformation // call _MmAccessFault @@ -524,7 +526,7 @@ jge PageFaultReturn /* Set parameter 1 to error code */ - mov r9d, [ebp + KTRAP_FRAME_ErrorCode] + mov r9d, [rbp + KTRAP_FRAME_ErrorCode] /* Set parameter2 to faulting address */ mov r10, cr2 // Param2 = faulting address Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/init.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/init.c [iso-8859-1] Sat Nov 14 00:30:44 2009 @@ -15,9 +15,7 @@ #include "../ARM3/miarm.h" -#define MI_SESSION_SPACE_END (PVOID)0xFFFFF98000000000ULL -#define MI_SESSION_VIEW_END 0xFFFFF97FFF000000ULL -#define MI_NON_PAGED_SYSTEM_START_MIN 0x0FFFFFAA000000000ULL +extern PMMPTE MmDebugPte; /* GLOBALS *****************************************************************/ @@ -65,10 +63,11 @@ ULONG64 MmBootImageSize; PPHYSICAL_MEMORY_DESCRIPTOR MmPhysicalMemoryBlock; RTL_BITMAP MiPfnBitMap; -ULONG MmNumberOfPhysicalPages, MmHighestPhysicalPage, MmLowestPhysicalPage = -1; +ULONG MmNumberOfPhysicalPages, MmHighestPhysicalPage, MmLowestPhysicalPage = -1; // FIXME: ULONG64 ULONG64 MmNumberOfSystemPtes; PMMPTE MmSystemPagePtes; ULONG64 MxPfnAllocation; +ULONG64 MxPfnSizeInBytes; PVOID MmSystemCacheStart; PVOID MmSystemCacheEnd; @@ -83,24 +82,59 @@ PFN_NUMBER MxFreePageBase; ULONG64 MxFreePageCount = 0; -VOID -NTAPI -MxSetupFreePageList(IN PLOADER_PARAMETER_BLOCK LoaderBlock) +ULONG +NoDbgPrint(const char *Format, ...) +{ + return 0; +} + +VOID +NTAPI +MiEvaluateMemoryDescriptors(IN PLOADER_PARAMETER_BLOCK LoaderBlock) { PMEMORY_ALLOCATION_DESCRIPTOR MdBlock; PLIST_ENTRY ListEntry; + PFN_NUMBER LastPage; /* Loop the memory descriptors */ for (ListEntry = LoaderBlock->MemoryDescriptorListHead.Flink; ListEntry != &LoaderBlock->MemoryDescriptorListHead; ListEntry = ListEntry->Flink) { - /* Get the memory block */ + /* Get the memory descriptor */ MdBlock = CONTAINING_RECORD(ListEntry, MEMORY_ALLOCATION_DESCRIPTOR, ListEntry); - /* Check if this is free memory */ + /* Skip pages that are not part of the PFN database */ + if ((MdBlock->MemoryType == LoaderFirmwarePermanent) || + (MdBlock->MemoryType == LoaderBBTMemory) || + (MdBlock->MemoryType == LoaderHALCachedMemory) || + (MdBlock->MemoryType == LoaderSpecialMemory) || + (MdBlock->MemoryType == LoaderBad)) + { + continue; + } + + /* Add this to the total of pages */ + MmNumberOfPhysicalPages += MdBlock->PageCount; + + /* Check if this is the new lowest page */ + if (MdBlock->BasePage < MmLowestPhysicalPage) + { + /* Update the lowest page */ + MmLowestPhysicalPage = MdBlock->BasePage; + } + + /* Check if this is the new highest page */ + LastPage = MdBlock->BasePage + MdBlock->PageCount - 1; + if (LastPage > MmHighestPhysicalPage) + { + /* Update the highest page */ + MmHighestPhysicalPage = LastPage; + } + + /* Check if this is currently free memory */ if ((MdBlock->MemoryType == LoaderFree) || (MdBlock->MemoryType == LoaderLoadedProgram) || (MdBlock->MemoryType == LoaderFirmwareTemporary) || @@ -142,14 +176,17 @@ return Pfn; } -VOID -MxMapPage(PVOID Address) +PMMPTE +NTAPI +MxGetPte(PVOID Address) { PMMPTE Pte; MMPTE TmpPte; + /* Setup template pte */ TmpPte.u.Long = 0; - TmpPte.u.Hard.Valid = 1; + TmpPte.u.Flush.Valid = 1; + TmpPte.u.Flush.Write = 1; /* Get a pointer to the PXE */ Pte = MiAddressToPxe(Address); @@ -180,163 +217,41 @@ /* Get a pointer to the PTE */ Pte = MiAddressToPte(Address); - if (!Pte->u.Hard.Valid) - { - /* It's not valid, map it! */ + return Pte; +} + +VOID +MxMapPageRange(PVOID Address, ULONG64 PageCount) +{ + MMPTE TmpPte, *Pte; + + /* Setup template pte */ + TmpPte.u.Long = 0; + TmpPte.u.Flush.Valid = 1; + TmpPte.u.Flush.Write = 1; + + while (PageCount--) + { + /* Get the PTE for that page */ + Pte = MxGetPte(Address); + ASSERT(Pte->u.Hard.Valid == 0); + + /* Map a physical page */ TmpPte.u.Hard.PageFrameNumber = MxGetNextPage(1); *Pte = TmpPte; - } -} - -VOID -MxMapPageRange(PVOID Address, ULONG64 PageCount) -{ - ULONG64 i; - - for (i = 0; i < PageCount; i++) - { - MxMapPage(Address); + + /* Goto next page */ Address = (PVOID)((ULONG64)Address + PAGE_SIZE); } } - -VOID -NTAPI -MiArmIninializeMemoryLayout(IN PLOADER_PARAMETER_BLOCK LoaderBlock) +VOID +NTAPI +MiArmConfigureMemorySizes(IN PLOADER_PARAMETER_BLOCK LoaderBloc) { /* Get the size of the boot loader's image allocations */ - MmBootImageSize = KeLoaderBlock->Extension->LoaderPagesSpanned; - MmBootImageSize *= PAGE_SIZE; - MmBootImageSize = (MmBootImageSize + (4 * 1024 * 1024) - 1) & ~((4 * 1024 * 1024) - 1); - ASSERT((MmBootImageSize % (4 * 1024 * 1024)) == 0); - - MiSessionSpaceEnd = (PVOID)MI_SESSION_SPACE_END; - - /* This is where we will load Win32k.sys and the video driver */ - MiSessionImageEnd = MiSessionSpaceEnd; - MiSessionImageStart = (PVOID)((ULONG_PTR)MiSessionImageEnd - - MmSessionImageSize); - - /* The view starts right below the session working set (itself below - * the image area) */ - MiSessionViewEnd = (PVOID)MI_SESSION_VIEW_END; - MiSessionViewStart = (PVOID)((ULONG_PTR)MiSessionViewStart - - MmSessionViewSize); - - /* Session pool follows */ - MiSessionPoolEnd = MiSessionViewStart; - MiSessionPoolStart = (PVOID)((ULONG_PTR)MiSessionPoolEnd - - MmSessionPoolSize); - - /* And it all begins here */ - MmSessionBase = MiSessionPoolStart; - - // Sanity check that our math is correct - //ASSERT((ULONG_PTR)MmSessionBase + MmSessionSize == PTE_BASE); - - /* System view space ends at session space, so now that we know where - * this is, we can compute the base address of system view space itself. */ - MiSystemViewStart = (PVOID)((ULONG_PTR)MmSessionBase - - MmSystemViewSize); - - /* Use the default */ - MmNumberOfSystemPtes = 22000; - - /* FIXME: should start below paged pool */ - MmPfnDatabase = (PVOID)0xFFFFFD5FC0000000ULL; - -} - -VOID -MiArmInitializePageTable() -{ - ULONG64 PageFrameOffset; - PMMPTE StartPte, EndPte; - - /* Set CR3 for the system process */ - PageFrameOffset = ((PMMPTE)PXE_BASE)->u.Hard.PageFrameNumber << PAGE_SHIFT; - PsGetCurrentProcess()->Pcb.DirectoryTableBase[0] = PageFrameOffset; - - /* Clear user mode mappings in PML4 */ - StartPte = MiAddressToPxe(0); - EndPte = MiAddressToPxe(MmSystemRangeStart); - RtlZeroMemory(StartPte, (EndPte - StartPte) * sizeof(MMPTE)); -} - - -VOID -NTAPI -MiArmEvaluateMemoryDescriptors(IN PLOADER_PARAMETER_BLOCK LoaderBlock) -{ - PMEMORY_ALLOCATION_DESCRIPTOR MdBlock; - PLIST_ENTRY ListEntry; - PFN_NUMBER BasePage, LastPage, PageCount; - - /* Loop the memory descriptors */ - for (ListEntry = LoaderBlock->MemoryDescriptorListHead.Flink; - ListEntry != &LoaderBlock->MemoryDescriptorListHead; - ListEntry = ListEntry->Flink) - { - /* Get the descriptor */ - MdBlock = CONTAINING_RECORD(ListEntry, - MEMORY_ALLOCATION_DESCRIPTOR, - ListEntry); - - /* Skip pages that are not part of the PFN database */ - if ((MdBlock->MemoryType == LoaderFirmwarePermanent) || - (MdBlock->MemoryType == LoaderBBTMemory) || - (MdBlock->MemoryType == LoaderHALCachedMemory) || // ??? - (MdBlock->MemoryType == LoaderSpecialMemory)) - { - continue; - } - - /* Check if BURNMEM was used */ - if (MdBlock->MemoryType != LoaderBad) - { - /* Count this in the total of pages */ - MmNumberOfPhysicalPages += MdBlock->PageCount; - } - - BasePage = MdBlock->BasePage; - LastPage = MdBlock->BasePage + MdBlock->PageCount - 1; - - /* Check if this is the new lowest page */ - if (BasePage < MmLowestPhysicalPage) - { - /* Update the lowest page */ - MmLowestPhysicalPage = BasePage; - } - - /* Check if this is the new highest page */ - if (LastPage > MmHighestPhysicalPage) - { - /* Update the highest page */ - MmHighestPhysicalPage = LastPage; - } -DPRINT1("BasePage = %ld, LastPage = %ld\n", BasePage, LastPage); -__debugbreak(); - /* Map pages for the PFN database */ - PageCount = PAGE_ROUND_UP(MdBlock->PageCount * sizeof(MMPFN)) / PAGE_SIZE; - MxMapPageRange(&MmPfnDatabase[BasePage], PageCount); - - /* Zero out the pages */ - RtlZeroMemory(&MmPfnDatabase[BasePage], PageCount * PAGE_SIZE); - } - - /* Calculate the number of bytes, and then convert to pages */ - MxPfnAllocation = (MmHighestPhysicalPage + 1) * sizeof(MMPFN); - MxPfnAllocation >>= PAGE_SHIFT; - MxPfnAllocation++; - -} - -VOID -NTAPI -MiArmPrepareNonPagedPool() -{ - PFN_NUMBER PageCount; + MmBootImageSize = KeLoaderBlock->Extension->LoaderPagesSpanned * PAGE_SIZE; + MmBootImageSize = ROUND_UP(MmBootImageSize, 4 * 1024 * 1024); /* Check if this is a machine with less than 256MB of RAM, and no overide */ if ((MmNumberOfPhysicalPages <= MI_MIN_PAGES_FOR_NONPAGED_POOL_TUNING) && @@ -396,14 +311,173 @@ MmMaximumNonPagedPoolInBytes = MI_MAX_NONPAGED_POOL_SIZE; } + // MmSessionImageSize +} + +VOID +NTAPI +MiArmInitializeMemoryLayout(IN PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + /* Set up session space */ + MiSessionSpaceEnd = (PVOID)MI_SESSION_SPACE_END; + + /* This is where we will load Win32k.sys and the video driver */ + MiSessionImageEnd = MiSessionSpaceEnd; + MiSessionImageStart = (PVOID)((ULONG_PTR)MiSessionImageEnd - + MmSessionImageSize); + + /* The view starts right below the session working set (itself below + * the image area) */ + MiSessionViewEnd = MI_SESSION_VIEW_END; + MiSessionViewStart = (PVOID)((ULONG_PTR)MiSessionViewStart - + MmSessionViewSize); + + /* Session pool follows */ + MiSessionPoolEnd = MiSessionViewStart; + MiSessionPoolStart = (PVOID)((ULONG_PTR)MiSessionPoolEnd - + MmSessionPoolSize); + + /* And it all begins here */ + MmSessionBase = MiSessionPoolStart; + + /* System view space ends at session space, so now that we know where + * this is, we can compute the base address of system view space itself. */ + MiSystemViewStart = (PVOID)((ULONG_PTR)MmSessionBase - + MmSystemViewSize); + + /* Use the default */ + MmNumberOfSystemPtes = 22000; + + ASSERT(MiSessionViewEnd <= MiSessionImageStart); + ASSERT(MmSessionBase <= MiSessionPoolStart); +} + +VOID +MiArmInitializePageTable() +{ + ULONG64 PageFrameOffset; + PMMPTE Pte, StartPte, EndPte; + + /* Get current directory base */ + PageFrameOffset = ((PMMPTE)PXE_SELFMAP)->u.Hard.PageFrameNumber << PAGE_SHIFT; + ASSERT(PageFrameOffset == __readcr3()); + + /* Set directory base for the system process */ + PsGetCurrentProcess()->Pcb.DirectoryTableBase[0] = PageFrameOffset; + + /* HACK: don't use freeldr debug pront anymore */ + FrLdrDbgPrint = NoDbgPrint; + +#if 1 + /* Clear user mode mappings in PML4 */ + StartPte = MiAddressToPxe(0); + EndPte = MiAddressToPxe(MmHighestUserAddress); + + for (Pte = StartPte; Pte <= EndPte; Pte++) + { + /* Zero the pte */ + Pte->u.Long = 0; + } +#else + /* Clear user mode mappings in PML4 */ + StartPte = MiAddressToPte(0); + EndPte = MiAddressToPte((PVOID)0xa00000); + + for (Pte = StartPte; Pte < EndPte; Pte++) + { + /* Zero the pte */ + //Pte->u.Long = 0; + } + + /* Flush the TLB */ + KeFlushCurrentTb(); + +// MiAddressToPde(0)->u.Long = 0; +// MiAddressToPde((PVOID)0x200000)->u.Long = 0; +// MiAddressToPde((PVOID)0x400000)->u.Long = 0; +// MiAddressToPde((PVOID)0x600000)->u.Long = 0; +// MiAddressToPde((PVOID)0x800000)->u.Long = 0; + + // MiAddressToPpe->u.Long = 0; + +#endif + + /* Flush the TLB */ + KeFlushCurrentTb(); + + /* Setup debug mapping pte */ + MmDebugPte = MxGetPte(MI_DEBUG_MAPPING); +} + + +VOID +NTAPI +MiArmPreparePfnDatabse(IN PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + PMEMORY_ALLOCATION_DESCRIPTOR MdBlock; + PLIST_ENTRY ListEntry; + PFN_COUNT PageCount; + PVOID PageBase; + + /* The PFN database is at the start of the non paged region */ + MmPfnDatabase = (PVOID)((ULONG64)MmNonPagedPoolEnd - MmMaximumNonPagedPoolInBytes); + + /* Loop the memory descriptors */ + for (ListEntry = LoaderBlock->MemoryDescriptorListHead.Flink; + ListEntry != &LoaderBlock->MemoryDescriptorListHead; + ListEntry = ListEntry->Flink) + { + /* Get the memory descriptor */ + MdBlock = CONTAINING_RECORD(ListEntry, + MEMORY_ALLOCATION_DESCRIPTOR, + ListEntry); + + /* Skip pages that are not part of the PFN database */ + if ((MdBlock->MemoryType == LoaderFirmwarePermanent) || + (MdBlock->MemoryType == LoaderBBTMemory) || + (MdBlock->MemoryType == LoaderHALCachedMemory) || + (MdBlock->MemoryType == LoaderSpecialMemory) || + (MdBlock->MemoryType != LoaderBad)) + { + continue; + } + + /* Map pages for the PFN database */ + PageCount = ROUND_TO_PAGES(MdBlock->PageCount * sizeof(MMPFN)) / PAGE_SIZE; + PageBase = PAGE_ALIGN(&MmPfnDatabase[MdBlock->BasePage]); + MxMapPageRange(PageBase, PageCount); + + /* Zero out the pages */ + RtlZeroMemory(PageBase, PageCount * PAGE_SIZE); + } + + /* Calculate the number of bytes, and then convert to pages */ + MxPfnSizeInBytes = ROUND_TO_PAGES(MmHighestPhysicalPage + 1) * sizeof(MMPFN); + MxPfnAllocation = MxPfnSizeInBytes >> PAGE_SHIFT; + + /* Reduce maximum pool size */ + MmMaximumNonPagedPoolInBytes -= MxPfnSizeInBytes; +} + + +VOID +NTAPI +MiArmPrepareNonPagedPool() +{ + PFN_NUMBER PageCount; + PVOID Address; + + /* Non paged pool comes after the PFN database */ + MmNonPagedPoolStart = (PVOID)((ULONG64)MmPfnDatabase + + MxPfnSizeInBytes); + ASSERT((ULONG64)MmNonPagedPoolEnd == (ULONG64)MmNonPagedPoolStart + + MmMaximumNonPagedPoolInBytes); + /* Calculate the nonpaged pool expansion start region */ MmNonPagedPoolExpansionStart = (PVOID)((ULONG_PTR)MmNonPagedPoolEnd - MmMaximumNonPagedPoolInBytes + MmSizeOfNonPagedPoolInBytes); MmNonPagedPoolExpansionStart = (PVOID)PAGE_ALIGN(MmNonPagedPoolExpansionStart); - - DPRINT("NP Pool has been tuned to: %d bytes and %d bytes\n", - MmSizeOfNonPagedPoolInBytes, MmMaximumNonPagedPoolInBytes); /* Now calculate the nonpaged system VA region, which includes the * nonpaged pool expansion (above) and the system PTEs. Note that it is @@ -427,15 +501,21 @@ ASSERT(MmNumberOfSystemPtes > 1000); } - /* Non paged pool comes after the PFN database */ - MmNonPagedPoolStart = (PVOID)((ULONG_PTR)MmPfnDatabase + - (MxPfnAllocation << PAGE_SHIFT)); - /* Map the nonpaged pool */ PageCount = (MmSizeOfNonPagedPoolInBytes + PAGE_SIZE - 1) / PAGE_SIZE; MxMapPageRange(MmNonPagedPoolStart, PageCount); - /* Sanity check: make sure we have properly defined the system PTE space */ + /* Create PTEs for the paged pool extension */ + for (Address = MmNonPagedPoolExpansionStart; + Address < MmNonPagedPoolEnd; + Address = (PVOID)((ULONG64)Address + PAGE_SIZE)) + { + /* Create PXE, PPE, PDE and set PTE to 0*/ + MxGetPte(Address)->u.Long = 0; + } + +//DPRINT1("MmNonPagedPoolStart = %p, Pte=%p \n", MmNonPagedPoolStart, MiAddressToPte(MmNonPagedPoolStart)); + /* Sanity check */ ASSERT(MiAddressToPte(MmNonPagedSystemStart) < MiAddressToPte(MmNonPagedPoolExpansionStart)); @@ -448,18 +528,22 @@ { if (Phase == 0) { - /* Get a continuous range of physical pages */ - MxSetupFreePageList(LoaderBlock); + /* Parse memory descriptors */ + MiEvaluateMemoryDescriptors(LoaderBlock); + + /* Configure the memory sizes */ + MiArmConfigureMemorySizes(LoaderBlock); /* Initialize the memory layout */ - MiArmIninializeMemoryLayout(LoaderBlock); - - /* Loop descriptors and prepare PFN database */ - MiArmEvaluateMemoryDescriptors(LoaderBlock); - + MiArmInitializeMemoryLayout(LoaderBlock); + + /* Prepare PFN database mappings */ + MiArmPreparePfnDatabse(LoaderBlock); + + /* Initialize some mappings */ MiArmInitializePageTable(); - /* Configure size of the non paged pool */ + /* Prepare paged pool mappings */ MiArmPrepareNonPagedPool(); /* Initialize the ARM3 nonpaged pool */ @@ -476,6 +560,7 @@ /* The PFN database was created, restore the free descriptor */ *MxFreeDescriptor = MxOldFreeDescriptor; + ASSERT(FALSE); }

1 0

[tkreuzer] 44143: Initialize MmDebugPte from MiDebugMapping variable instead of using MiAddressToPte for a constant initializer. This way the page can be set dynamically. Use MmDebugPte to determine if ready for mapping physical pages.
by tkreuzer＠svn.reactos.org 13 Nov '09

13 Nov '09

Author: tkreuzer Date: Sat Nov 14 00:23:53 2009 New Revision: 44143 URL: http://svn.reactos.org/svn/reactos?rev=44143&view=rev Log: Initialize MmDebugPte from MiDebugMapping variable instead of using MiAddressToPte for a constant initializer. This way the page can be set dynamically. Use MmDebugPte to determine if ready for mapping physical pages. Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/mm.h branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mmdbg.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mminit.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Sat Nov 14 00:23:53 2009 @@ -45,7 +45,8 @@ extern SIZE_T MmPeakCommitment; extern SIZE_T MmtotalCommitLimitMaximum; -extern BOOLEAN MiDbgReadyForPhysical; +extern PVOID MiDebugMapping; +extern PMMPTE MmDebugPte; struct _KTRAP_FRAME; struct _EPROCESS; Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mmdbg.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mmdbg.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mmdbg.c [iso-8859-1] Sat Nov 14 00:23:53 2009 @@ -21,8 +21,8 @@ /* GLOBALS ********************************************************************/ -PMMPTE MmDebugPte = MiAddressToPte(MI_DEBUG_MAPPING); -BOOLEAN MiDbgReadyForPhysical = FALSE; +PVOID MiDebugMapping = MI_DEBUG_MAPPING; +PMMPTE MmDebugPte = NULL; /* FUNCTIONS ******************************************************************/ @@ -48,7 +48,7 @@ // // Check if we are called too early // - if (MiDbgReadyForPhysical == FALSE) + if (MmDebugPte == NULL) { // // The structures we require aren't initialized yet, fail Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] Sat Nov 14 00:23:53 2009 @@ -388,7 +388,7 @@ // Everything required for the debugger to read and write // physical memory is now set up // - MiDbgReadyForPhysical = TRUE; + MmDebugPte = MiAddressToPte(MiDebugMapping); #endif /* Put the paged pool after the loaded modules */ @@ -508,7 +508,7 @@ // // Now get the PTE for shared data, and read the PFN that holds it // - PointerPte = MiAddressToPte(KI_USER_SHARED_DATA); + PointerPte = MiAddressToPte((PVOID)KI_USER_SHARED_DATA); ASSERT(PointerPte->u.Hard.Valid == 1); PageFrameNumber = PFN_FROM_PTE(PointerPte);

1 0

[janderwald] 44142: [CMIDRIVER] - Fix build breakage by Sylvain Petreolle
by janderwald＠svn.reactos.org 13 Nov '09

13 Nov '09

Author: janderwald Date: Fri Nov 13 18:47:03 2009 New Revision: 44142 URL: http://svn.reactos.org/svn/reactos?rev=44142&view=rev Log: [CMIDRIVER] - Fix build breakage by Sylvain Petreolle Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/adapter.hpp trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/mintopo.cpp Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/adapter.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/adapter.hpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/adapter.hpp [iso-8859-1] Fri Nov 13 18:47:03 2009 @@ -30,7 +30,7 @@ #include "interfaces.hpp" #include "debug.hpp" -#include "DMusicKS.h" +#include "dmusicks.h" #ifdef UART const ULONG MAX_MINIPORTS = 3; Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/mintopo.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/mintopo.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/mintopo.cpp [iso-8859-1] Fri Nov 13 18:47:03 2009 @@ -29,7 +29,7 @@ #include "mintopo.hpp" #include "mintopotables.hpp" #define NTSTRSAFE_LIB //for Windows 2000 compatibility -#include "NtStrsafe.h" +#include "ntstrsafe.h" #pragma code_seg("PAGE")

1 0

[janderwald] 44141: [KERNEL32] - Don't access freed memory in GetVolumeNameForVolumeMountPointW
by janderwald＠svn.reactos.org 13 Nov '09

13 Nov '09

Author: janderwald Date: Fri Nov 13 18:31:02 2009 New Revision: 44141 URL: http://svn.reactos.org/svn/reactos?rev=44141&view=rev Log: [KERNEL32] - Don't access freed memory in GetVolumeNameForVolumeMountPointW Modified: trunk/reactos/dll/win32/kernel32/file/volume.c Modified: trunk/reactos/dll/win32/kernel32/file/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/vo… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/volume.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/volume.c [iso-8859-1] Fri Nov 13 18:31:02 2009 @@ -996,15 +996,16 @@ MountPoints, BufferLength); if (!NT_SUCCESS(Status)) { - RtlFreeHeap(RtlGetProcessHeap(), 0, MountPoints); if (Status == STATUS_BUFFER_OVERFLOW) { BufferLength = MountPoints->Size; + RtlFreeHeap(RtlGetProcessHeap(), 0, MountPoints); continue; } else if (!NT_SUCCESS(Status)) { RtlFreeHeap(RtlGetProcessHeap(), 0, MountPoint); + RtlFreeHeap(RtlGetProcessHeap(), 0, MountPoints); NtClose(FileHandle); SetLastErrorByStatus(Status); return FALSE;

1 0

[arty] 44140: Correct 64-bit paths. Files > 4G and large volumes can now have arbitrary sections on them. Theoretically, even >4G as a single section on 64-bit reactos. Unfortunately some code is slightly uglified. Ext2 fixes likely reflect change in build environment, not the original author's bugs.
by arty＠svn.reactos.org 13 Nov '09

13 Nov '09

Author: arty Date: Fri Nov 13 16:35:12 2009 New Revision: 44140 URL: http://svn.reactos.org/svn/reactos?rev=44140&view=rev Log: Correct 64-bit paths. Files > 4G and large volumes can now have arbitrary sections on them. Theoretically, even >4G as a single section on 64-bit reactos. Unfortunately some code is slightly uglified. Ext2 fixes likely reflect change in build environment, not the original author's bugs. Modified: branches/arty-newcc/drivers/filesystems/ext2/src/DiskIO.c branches/arty-newcc/drivers/filesystems/ext2/src/fsctrl.c branches/arty-newcc/drivers/filesystems/ext2/src/io.c branches/arty-newcc/drivers/filesystems/ext2/src/metadata.c branches/arty-newcc/drivers/filesystems/ext2/src/read.c branches/arty-newcc/drivers/filesystems/ext2/src/write.c branches/arty-newcc/ntoskrnl/cache/copysup.c branches/arty-newcc/ntoskrnl/cache/pinsup.c branches/arty-newcc/ntoskrnl/include/internal/newcc.h branches/arty-newcc/ntoskrnl/include/internal/newmm.h branches/arty-newcc/ntoskrnl/mm/rmap.c branches/arty-newcc/ntoskrnl/mm/section/data.c branches/arty-newcc/ntoskrnl/mm/section/image.c branches/arty-newcc/ntoskrnl/mm/section/io.c branches/arty-newcc/ntoskrnl/mm/section/pagefile.c branches/arty-newcc/ntoskrnl/mm/section/physical.c branches/arty-newcc/ntoskrnl/mm/virtual.c Modified: branches/arty-newcc/drivers/filesystems/ext2/src/DiskIO.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… ============================================================================== --- branches/arty-newcc/drivers/filesystems/ext2/src/DiskIO.c [iso-8859-1] (original) +++ branches/arty-newcc/drivers/filesystems/ext2/src/DiskIO.c [iso-8859-1] Fri Nov 13 16:35:12 2009 @@ -18,7 +18,6 @@ #define EXT2_BUG_CHECK_ID EXT2_FILE_DISK_IO #define DEBUG_LEVEL ( DEBUG_TRACE_DISKIO ) - /************************************************************************* * @@ -80,9 +79,9 @@ LogicalBlockSize = EXT2_MIN_BLOCK_SIZE << PtrVCB->LogBlockSize; PhysicalBlockSize = PtrTargetDeviceObject->SectorSize; - NoOfPhysicalBlocks = NoOfLogicalBlocks * LogicalBlockSize / PhysicalBlockSize; - - StartPhysicalBlock.QuadPart = ( StartLogicalBlock.QuadPart ) * + NoOfPhysicalBlocks = (ULONGLONG)NoOfLogicalBlocks * LogicalBlockSize / PhysicalBlockSize; + + StartPhysicalBlock.QuadPart = (ULONGLONG)( StartLogicalBlock.QuadPart ) * ( LogicalBlockSize / PhysicalBlockSize ); Status = Ext2ReadPhysicalBlocks( PtrTargetDeviceObject, @@ -144,7 +143,7 @@ NumberOfBytesToRead = PhysicalBlockSize * NoOfBlocks; - ByteOffset.QuadPart = StartPhysicalBlock.QuadPart * PhysicalBlockSize; + ByteOffset.QuadPart = (ULONGLONG)StartPhysicalBlock.QuadPart * PhysicalBlockSize; try { Modified: branches/arty-newcc/drivers/filesystems/ext2/src/fsctrl.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… ============================================================================== --- branches/arty-newcc/drivers/filesystems/ext2/src/fsctrl.c [iso-8859-1] (original) +++ branches/arty-newcc/drivers/filesystems/ext2/src/fsctrl.c [iso-8859-1] Fri Nov 13 16:35:12 2009 @@ -393,12 +393,12 @@ if( PtrVCB->LogBlockSize ) { // First block contains the descriptors... - VolumeByteOffset.QuadPart = LogicalBlockSize; + VolumeByteOffset.QuadPart = (ULONGLONG)LogicalBlockSize; } else { // Second block contains the descriptors... - VolumeByteOffset.QuadPart = LogicalBlockSize * 2; + VolumeByteOffset.QuadPart = (ULONGLONG)LogicalBlockSize * 2; } NumberOfBytesToRead = PtrVCB->NoOfGroups * sizeof( struct ext2_group_desc ); Modified: branches/arty-newcc/drivers/filesystems/ext2/src/io.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… ============================================================================== --- branches/arty-newcc/drivers/filesystems/ext2/src/io.c [iso-8859-1] (original) +++ branches/arty-newcc/drivers/filesystems/ext2/src/io.c [iso-8859-1] Fri Nov 13 16:35:12 2009 @@ -140,13 +140,13 @@ { PtrIrpSp->Parameters.Read.Length = ReadWriteLength; PtrIrpSp->Parameters.Read.ByteOffset.QuadPart = - PtrIoRuns[i].LogicalBlock * ( LogicalBlockSize ); + (ULONGLONG)PtrIoRuns[i].LogicalBlock * ( LogicalBlockSize ); } else if( PtrIrpContext->MajorFunction == IRP_MJ_WRITE ) { PtrIrpSp->Parameters.Write.Length = ReadWriteLength; PtrIrpSp->Parameters.Write.ByteOffset.QuadPart = - PtrIoRuns[i].LogicalBlock * ( LogicalBlockSize ); + (ULONGLONG)PtrIoRuns[i].LogicalBlock * ( LogicalBlockSize ); } // PtrIrpSp->Parameters.Read.Length = ReadWriteLength; @@ -170,12 +170,12 @@ if( PtrIrpContext->MajorFunction == IRP_MJ_READ ) { PtrIrpSp->Parameters.Read.Length = ReadWriteLength; - PtrIrpSp->Parameters.Read.ByteOffset.QuadPart = PtrIoRuns[i].LogicalBlock * ( LogicalBlockSize ); + PtrIrpSp->Parameters.Read.ByteOffset.QuadPart = (ULONGLONG)PtrIoRuns[i].LogicalBlock * ( LogicalBlockSize ); } else if( PtrIrpContext->MajorFunction == IRP_MJ_WRITE ) { PtrIrpSp->Parameters.Write.Length = ReadWriteLength; - PtrIrpSp->Parameters.Write.ByteOffset.QuadPart = PtrIoRuns[i].LogicalBlock * ( LogicalBlockSize ); + PtrIrpSp->Parameters.Write.ByteOffset.QuadPart = (ULONGLONG)PtrIoRuns[i].LogicalBlock * ( LogicalBlockSize ); } // PtrIrpSp->Parameters.Read.Length = ReadWriteLength; Modified: branches/arty-newcc/drivers/filesystems/ext2/src/metadata.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… ============================================================================== --- branches/arty-newcc/drivers/filesystems/ext2/src/metadata.c [iso-8859-1] (original) +++ branches/arty-newcc/drivers/filesystems/ext2/src/metadata.c [iso-8859-1] Fri Nov 13 16:35:12 2009 @@ -101,8 +101,10 @@ LogicalBlockSize = EXT2_MIN_BLOCK_SIZE << PtrVcb->LogBlockSize; NumberOfBytesToRead = sizeof(EXT2_INODE); // LogicalBlockSize; - VolumeByteOffset.QuadPart = PtrVcb->PtrGroupDescriptors[ GroupNo ].InodeTablesBlock + VolumeByteOffset.QuadPart = (ULONGLONG)PtrVcb->PtrGroupDescriptors[ GroupNo ].InodeTablesBlock * LogicalBlockSize + Index * PtrVcb->InodeSize; + DebugTrace(DEBUG_TRACE_MISC, "VolumeByteOffset.HighPart %08x", VolumeByteOffset.HighPart); + DebugTrace(DEBUG_TRACE_MISC, "VolumeByteOffset.LowPart %08x", VolumeByteOffset.LowPart); //VolumeByteOffset.QuadPart = PtrVcb->InodeTableBlock[ GroupNo ] * LogicalBlockSize + // Index * PtrVcb->InodeSize; @@ -298,7 +300,7 @@ } VolumeByteOffset.QuadPart = - PtrVCB->PtrGroupDescriptors[ GroupNo ].InodeBitmapBlock * LogicalBlockSize; + (ULONGLONG)PtrVCB->PtrGroupDescriptors[ GroupNo ].InodeBitmapBlock * LogicalBlockSize; NumberOfBytesToRead = PtrVCB->InodesCount / PtrVCB->NoOfGroups; @@ -534,7 +536,7 @@ BitmapIndex = BitmapIndex - ( BlockIndex * LogicalBlockSize ); VolumeByteOffset.QuadPart = - ( PtrVCB->PtrGroupDescriptors[ GroupNo ].InodeBitmapBlock + BlockIndex ) + (ULONGLONG)( PtrVCB->PtrGroupDescriptors[ GroupNo ].InodeBitmapBlock + BlockIndex ) * LogicalBlockSize; // @@ -752,7 +754,7 @@ LogicalBlockSize = EXT2_MIN_BLOCK_SIZE << PtrVcb->LogBlockSize; NumberOfBytesToRead = sizeof(EXT2_INODE); - VolumeByteOffset.QuadPart = PtrVcb->PtrGroupDescriptors[ GroupNo ].InodeTablesBlock + VolumeByteOffset.QuadPart = (ULONGLONG)PtrVcb->PtrGroupDescriptors[ GroupNo ].InodeTablesBlock * LogicalBlockSize + Index * PtrVcb->InodeSize; TempOffset.QuadPart = Ext2Align64( VolumeByteOffset.QuadPart, LogicalBlockSize ); @@ -936,7 +938,7 @@ } } - VolumeByteOffset.QuadPart = BlockNo * LogicalBlockSize; + VolumeByteOffset.QuadPart = (ULONGLONG)BlockNo * LogicalBlockSize; CcMapData( PtrFileObject, &VolumeByteOffset, LogicalBlockSize, @@ -1243,7 +1245,7 @@ } // No of blocks CURRENTLY allocated... - NoOfBlocks = (ULONG) PtrFCB->NTRequiredFCB.CommonFCBHeader.AllocationSize.QuadPart / LogicalBlockSize; + NoOfBlocks = (ULONG) (PtrFCB->NTRequiredFCB.CommonFCBHeader.AllocationSize.QuadPart / LogicalBlockSize); if( NoOfBlocks < EXT2_NDIR_BLOCKS ) @@ -1311,7 +1313,7 @@ // Bring in the new block to the cache // Zero it out - VolumeByteOffset.QuadPart = PtrFCB->IBlock[ EXT2_IND_BLOCK ] * LogicalBlockSize; + VolumeByteOffset.QuadPart = (ULONGLONG)PtrFCB->IBlock[ EXT2_IND_BLOCK ] * LogicalBlockSize; if( !CcPreparePinWrite( PtrVCB->PtrStreamFileObject, @@ -1329,7 +1331,7 @@ { // Just bring in the SIB to the cache - VolumeByteOffset.QuadPart = PtrFCB->IBlock[ EXT2_IND_BLOCK ] * LogicalBlockSize; + VolumeByteOffset.QuadPart = (ULONGLONG)PtrFCB->IBlock[ EXT2_IND_BLOCK ] * LogicalBlockSize; if( !CcPreparePinWrite( PtrVCB->PtrStreamFileObject, &VolumeByteOffset, @@ -1402,7 +1404,7 @@ // Bring in the new block to the cache // Zero it out - VolumeByteOffset.QuadPart = PtrFCB->IBlock[ EXT2_DIND_BLOCK ] * LogicalBlockSize; + VolumeByteOffset.QuadPart = (ULONGLONG)PtrFCB->IBlock[ EXT2_DIND_BLOCK ] * LogicalBlockSize; if( !CcPreparePinWrite( PtrVCB->PtrStreamFileObject, @@ -1446,7 +1448,7 @@ DebugTrace(DEBUG_TRACE_SPECIAL, "Ext2AllocBlock", 0); PtrDIBBuffer[SBlockNo] = Ext2AllocBlock( PtrIrpContext, PtrVCB, 1 ); CcSetDirtyPinnedData( PtrDIBBCB, NULL ); - VolumeByteOffset.QuadPart = PtrDIBBuffer[SBlockNo] * LogicalBlockSize; + VolumeByteOffset.QuadPart = (ULONGLONG)PtrDIBBuffer[SBlockNo] * LogicalBlockSize; Inode.i_blocks += ( LogicalBlockSize / 512 ); @@ -1538,7 +1540,7 @@ // Bring in the new block to the cache // Zero it out - VolumeByteOffset.QuadPart = PtrFCB->IBlock[ EXT2_DIND_BLOCK ] * LogicalBlockSize; + VolumeByteOffset.QuadPart = (ULONGLONG)PtrFCB->IBlock[ EXT2_DIND_BLOCK ] * LogicalBlockSize; if( !CcPreparePinWrite( PtrVCB->PtrStreamFileObject, @@ -1580,7 +1582,7 @@ DebugTrace(DEBUG_TRACE_SPECIAL, "Ext2AllocBlock", 0); PtrDIBBuffer[SBlockNo] = Ext2AllocBlock( PtrIrpContext, PtrVCB, 1 ); CcSetDirtyPinnedData( PtrDIBBCB, NULL ); - VolumeByteOffset.QuadPart = PtrDIBBuffer[SBlockNo] * LogicalBlockSize; + VolumeByteOffset.QuadPart = (ULONGLONG)PtrDIBBuffer[SBlockNo] * LogicalBlockSize; Inode.i_blocks += ( LogicalBlockSize / 512 ); @@ -1715,7 +1717,7 @@ } VolumeByteOffset.QuadPart = - PtrVCB->PtrGroupDescriptors[ GroupNo ].BlockBitmapBlock * LogicalBlockSize; + (ULONGLONG)PtrVCB->PtrGroupDescriptors[ GroupNo ].BlockBitmapBlock * LogicalBlockSize; NumberOfBytesToRead = PtrVCB->BlocksCount / PtrVCB->NoOfGroups; @@ -1947,7 +1949,7 @@ BitmapIndex = BitmapIndex - ( BlockIndex * LogicalBlockSize ); VolumeByteOffset.QuadPart = - ( PtrVCB->PtrGroupDescriptors[ GroupNo ].BlockBitmapBlock + BlockIndex ) + (ULONGLONG)( PtrVCB->PtrGroupDescriptors[ GroupNo ].BlockBitmapBlock + BlockIndex ) * LogicalBlockSize; // @@ -2259,7 +2261,7 @@ ULONG TIndex, DIndex, SIndex; // Pin the Double Indirect Pointer Block... - VolumeByteOffset.QuadPart = PtrFCB->IBlock[ EXT2_TIND_BLOCK ] * LogicalBlockSize; + VolumeByteOffset.QuadPart = (ULONGLONG)PtrFCB->IBlock[ EXT2_TIND_BLOCK ] * LogicalBlockSize; if (!CcMapData( PtrVCB->PtrStreamFileObject, &VolumeByteOffset, LogicalBlockSize, @@ -2275,7 +2277,7 @@ { if( PtrPinnedTIndirectBlock[ TIndex ] ) { - VolumeByteOffset.QuadPart = PtrPinnedTIndirectBlock[TIndex] * LogicalBlockSize; + VolumeByteOffset.QuadPart = (ULONGLONG)PtrPinnedTIndirectBlock[TIndex] * LogicalBlockSize; if (!CcMapData( PtrVCB->PtrStreamFileObject, &VolumeByteOffset, LogicalBlockSize, @@ -2291,7 +2293,7 @@ { if( PtrPinnedDIndirectBlock[DIndex] ) { - VolumeByteOffset.QuadPart = PtrPinnedDIndirectBlock[DIndex] * LogicalBlockSize; + VolumeByteOffset.QuadPart = (ULONGLONG)PtrPinnedDIndirectBlock[DIndex] * LogicalBlockSize; if (!CcMapData( PtrVCB->PtrStreamFileObject, &VolumeByteOffset, LogicalBlockSize, @@ -2350,7 +2352,7 @@ ULONG DIndex, SIndex; // Pin the Double Indirect Pointer Block... - VolumeByteOffset.QuadPart = PtrFCB->IBlock[ EXT2_DIND_BLOCK ] * LogicalBlockSize; + VolumeByteOffset.QuadPart = (ULONGLONG)PtrFCB->IBlock[ EXT2_DIND_BLOCK ] * LogicalBlockSize; if (!CcMapData( PtrVCB->PtrStreamFileObject, &VolumeByteOffset, LogicalBlockSize, @@ -2366,7 +2368,7 @@ { if( PtrPinnedDIndirectBlock[DIndex] ) { - VolumeByteOffset.QuadPart = PtrPinnedDIndirectBlock[DIndex] * LogicalBlockSize; + VolumeByteOffset.QuadPart = (ULONGLONG)PtrPinnedDIndirectBlock[DIndex] * LogicalBlockSize; if (!CcMapData( PtrVCB->PtrStreamFileObject, &VolumeByteOffset, LogicalBlockSize, @@ -2416,7 +2418,7 @@ ULONG Index; // Pin the Single Indirect Pointer Block... - VolumeByteOffset.QuadPart = PtrFCB->IBlock[ EXT2_IND_BLOCK ] * LogicalBlockSize; + VolumeByteOffset.QuadPart = (ULONGLONG)PtrFCB->IBlock[ EXT2_IND_BLOCK ] * LogicalBlockSize; if (!CcMapData( PtrVCB->PtrStreamFileObject, &VolumeByteOffset, LogicalBlockSize, @@ -2513,7 +2515,7 @@ ULONG Index; // Pin the Single Indirect Pointer Block... - VolumeByteOffset.QuadPart = PtrFCB->IBlock[ EXT2_IND_BLOCK ] * LogicalBlockSize; + VolumeByteOffset.QuadPart = (ULONGLONG)PtrFCB->IBlock[ EXT2_IND_BLOCK ] * LogicalBlockSize; if (!CcMapData( PtrVCB->PtrStreamFileObject, &VolumeByteOffset, LogicalBlockSize, Modified: branches/arty-newcc/drivers/filesystems/ext2/src/read.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… ============================================================================== --- branches/arty-newcc/drivers/filesystems/ext2/src/read.c [iso-8859-1] (original) +++ branches/arty-newcc/drivers/filesystems/ext2/src/read.c [iso-8859-1] Fri Nov 13 16:35:12 2009 @@ -212,6 +212,7 @@ } DebugTrace(DEBUG_TRACE_READ_DETAILS, " ->ByteCount = 0x%8lx", PtrIoStackLocation->Parameters.Read.Length); + DebugTrace(DEBUG_TRACE_READ_DETAILS, " ->ByteOffset.HighPart = 0x%8lx", PtrIoStackLocation->Parameters.Read.ByteOffset.HighPart); DebugTrace(DEBUG_TRACE_READ_DETAILS, " ->ByteOffset.LowPart = 0x%8lx", PtrIoStackLocation->Parameters.Read.ByteOffset.LowPart); if( CanWait ) @@ -674,7 +675,7 @@ LARGE_INTEGER VolumeByteOffset; DebugTrace(DEBUG_TRACE_MISC, "Reading in some Single Indirect Blocks from IND block at %x", PtrFCB->IBlock[EXT2_IND_BLOCK]); - VolumeByteOffset.QuadPart = PtrFCB->IBlock[ EXT2_IND_BLOCK ] * LogicalBlockSize; + VolumeByteOffset.QuadPart = (ULONGLONG)PtrFCB->IBlock[ EXT2_IND_BLOCK ] * LogicalBlockSize; // // Asking the cache manager to oblige by pinning the single indirect block... @@ -713,7 +714,9 @@ DebugTrace(DEBUG_TRACE_MISC, "Reading in some Double Indirect Blocks", 0); - VolumeByteOffset.QuadPart = PtrFCB->IBlock[ EXT2_DIND_BLOCK ] * LogicalBlockSize; + VolumeByteOffset.QuadPart = (ULONGLONG)PtrFCB->IBlock[ EXT2_DIND_BLOCK ] * LogicalBlockSize; + DebugTrace(DEBUG_TRACE_MISC, "VolumeByteOffset.HighPart %08x", VolumeByteOffset.HighPart); + DebugTrace(DEBUG_TRACE_MISC, "VolumeByteOffset.LowPart %08x", VolumeByteOffset.LowPart); // // Asking the cache manager to oblige by pinning the double indirect block... @@ -772,7 +775,7 @@ for( i = 0; i < DIArrayCount; i++ ) { - VolumeByteOffset.QuadPart = PtrPinnedDIndirectBlock[StartIndirectBlock+i] * LogicalBlockSize; + VolumeByteOffset.QuadPart = (ULONGLONG)PtrPinnedDIndirectBlock[StartIndirectBlock+i] * LogicalBlockSize; if (!CcMapData( PtrVCB->PtrStreamFileObject, &VolumeByteOffset, LogicalBlockSize, @@ -817,7 +820,7 @@ DebugTrace(DEBUG_TRACE_MISC, "Reading in some Triple Indirect Blocks", 0); - VolumeByteOffset.QuadPart = PtrFCB->IBlock[ EXT2_TIND_BLOCK ] * LogicalBlockSize; + VolumeByteOffset.QuadPart = (ULONGLONG)PtrFCB->IBlock[ EXT2_TIND_BLOCK ] * LogicalBlockSize; DebugTrace(DEBUG_TRACE_TRIPLE, "ByteOffset = 0x%I64X", ByteOffset ); DebugTrace(DEBUG_TRACE_TRIPLE, "ReadLength = 0x%lX", ReadLength ); @@ -890,7 +893,7 @@ for( i = 0; i < Count; i++, ByteOffsetTillHere += DoubleIndirectBlockSize) { - VolumeByteOffset.QuadPart = PtrPinnedTIndirectBlock[StartDIndirectBlock+i] * LogicalBlockSize; + VolumeByteOffset.QuadPart = (ULONGLONG)PtrPinnedTIndirectBlock[StartDIndirectBlock+i] * LogicalBlockSize; DebugTrace(DEBUG_TRACE_TRIPLE, "Double VolOffset = 0x%I64X", VolumeByteOffset ); @@ -940,7 +943,7 @@ for( i = 0; i < (EndIndirectBlock - StartIndirectBlock); i++ ) { - VolumeByteOffset.QuadPart = TempDIBuffer[StartIndirectBlock+i] * LogicalBlockSize; + VolumeByteOffset.QuadPart = (ULONGLONG)TempDIBuffer[StartIndirectBlock+i] * LogicalBlockSize; DebugTrace(DEBUG_TRACE_TRIPLE, "Single VolOffset = 0x%I64X", VolumeByteOffset ); if (!CcMapData( PtrVCB->PtrStreamFileObject, Modified: branches/arty-newcc/drivers/filesystems/ext2/src/write.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… ============================================================================== --- branches/arty-newcc/drivers/filesystems/ext2/src/write.c [iso-8859-1] (original) +++ branches/arty-newcc/drivers/filesystems/ext2/src/write.c [iso-8859-1] Fri Nov 13 16:35:12 2009 @@ -627,6 +627,16 @@ PtrReqdFCB->CommonFCBHeader.FileSize.QuadPart = ByteOffset.QuadPart + WriteLength; + if ( PtrReqdFCB->CommonFCBHeader.FileSize.QuadPart > PtrReqdFCB->CommonFCBHeader.AllocationSize.QuadPart ) + { + DbgPrint + ("File size greater than allocation size: %08x%08x vs %08x%08x %wZ\n", + PtrReqdFCB->CommonFCBHeader.FileSize.HighPart, + PtrReqdFCB->CommonFCBHeader.FileSize.LowPart, + PtrReqdFCB->CommonFCBHeader.AllocationSize.HighPart, + PtrReqdFCB->CommonFCBHeader.AllocationSize.LowPart, + &PtrFileObject->FileName); + } ASSERT( PtrReqdFCB->CommonFCBHeader.FileSize.QuadPart <= PtrReqdFCB->CommonFCBHeader.AllocationSize.QuadPart ); Ext2UpdateFileSize( PtrIrpContext, PtrFileObject, PtrFCB ); @@ -796,7 +806,7 @@ DebugTrace(DEBUG_TRACE_WRITE_DETAILS, "Reading in some Indirect Blocks", 0); DebugTrace(DEBUG_TRACE_WRITE_DETAILS, "Indirect block at %x", PtrFCB->IBlock[EXT2_NDIR_BLOCKS]); - VolumeByteOffset.QuadPart = PtrFCB->IBlock[ EXT2_NDIR_BLOCKS ] * LogicalBlockSize; + VolumeByteOffset.QuadPart = (ULONGLONG)PtrFCB->IBlock[ EXT2_NDIR_BLOCKS ] * LogicalBlockSize; // // Asking the cache manager to oblige by pinning the single indirect block... @@ -836,7 +846,7 @@ DebugTrace(DEBUG_TRACE_MISC, "Reading in some Double Indirect Blocks", 0); - VolumeByteOffset.QuadPart = PtrFCB->IBlock[ EXT2_DIND_BLOCK ] * LogicalBlockSize; + VolumeByteOffset.QuadPart = (ULONGLONG)PtrFCB->IBlock[ EXT2_DIND_BLOCK ] * LogicalBlockSize; // // Asking the cache manager to oblige by pinning the double indirect block... @@ -895,7 +905,7 @@ for( i = 0; i < DIArrayCount; i++ ) { - VolumeByteOffset.QuadPart = PtrPinnedDIndirectBlock[StartIndirectBlock+i] * LogicalBlockSize; + VolumeByteOffset.QuadPart = (ULONGLONG)PtrPinnedDIndirectBlock[StartIndirectBlock+i] * LogicalBlockSize; if (!CcMapData( PtrVCB->PtrStreamFileObject, &VolumeByteOffset, LogicalBlockSize, @@ -928,7 +938,7 @@ DebugTrace(DEBUG_TRACE_MISC, "Reading in some Double Indirect Blocks", 0); - VolumeByteOffset.QuadPart = PtrFCB->IBlock[ EXT2_DIND_BLOCK ] * LogicalBlockSize; + VolumeByteOffset.QuadPart = (ULONGLONG)PtrFCB->IBlock[ EXT2_DIND_BLOCK ] * LogicalBlockSize; // // Asking the cache manager to oblige by pinning the double indirect block... @@ -991,7 +1001,7 @@ for( i = 0; i < DIArrayCount; i++ ) { - VolumeByteOffset.QuadPart = PtrPinnedDIndirectBlock[StartIndirectBlock+i] * LogicalBlockSize; + VolumeByteOffset.QuadPart = (ULONGLONG)PtrPinnedDIndirectBlock[StartIndirectBlock+i] * LogicalBlockSize; if (!CcMapData( PtrVCB->PtrStreamFileObject, &VolumeByteOffset, LogicalBlockSize, @@ -1036,7 +1046,7 @@ DebugTrace(DEBUG_TRACE_MISC, "Reading in some Triple Indirect Blocks", 0); - VolumeByteOffset.QuadPart = PtrFCB->IBlock[ EXT2_TIND_BLOCK ] * LogicalBlockSize; + VolumeByteOffset.QuadPart = (ULONGLONG)PtrFCB->IBlock[ EXT2_TIND_BLOCK ] * LogicalBlockSize; DebugTrace(DEBUG_TRACE_TRIPLE, "ByteOffset = 0x%I64X", ByteOffset ); DebugTrace(DEBUG_TRACE_TRIPLE, "WriteLength = 0x%lX", WriteLength ); @@ -1109,7 +1119,7 @@ for( i = 0; i < Count; i++, ByteOffsetTillHere += DoubleIndirectBlockSize) { - VolumeByteOffset.QuadPart = PtrPinnedTIndirectBlock[StartDIndirectBlock+i] * LogicalBlockSize; + VolumeByteOffset.QuadPart = (ULONGLONG)PtrPinnedTIndirectBlock[StartDIndirectBlock+i] * LogicalBlockSize; DebugTrace(DEBUG_TRACE_TRIPLE, "Double VolOffset = 0x%I64X", VolumeByteOffset ); @@ -1159,7 +1169,7 @@ for( i = 0; i < (EndIndirectBlock - StartIndirectBlock); i++ ) { - VolumeByteOffset.QuadPart = TempDIBuffer[StartIndirectBlock+i] * LogicalBlockSize; + VolumeByteOffset.QuadPart = (ULONGLONG)TempDIBuffer[StartIndirectBlock+i] * LogicalBlockSize; DebugTrace(DEBUG_TRACE_TRIPLE, "Single VolOffset = 0x%I64X", VolumeByteOffset ); if (!CcMapData( PtrVCB->PtrStreamFileObject, Modified: branches/arty-newcc/ntoskrnl/cache/copysup.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/copys… ============================================================================== --- branches/arty-newcc/ntoskrnl/cache/copysup.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/cache/copysup.c [iso-8859-1] Fri Nov 13 16:35:12 2009 @@ -54,41 +54,42 @@ while (CacheOffset.QuadPart < EndOfExtent.QuadPart) { - NextOffset.QuadPart = (CacheOffset.QuadPart + CACHE_STRIPE) & ~(CACHE_STRIPE-1); - ReadLen = EndOfExtent.QuadPart - CacheOffset.QuadPart; - if (CacheOffset.QuadPart + ReadLen > NextOffset.QuadPart) - { - ReadLen = NextOffset.QuadPart - CacheOffset.QuadPart; - } - - DPRINT("Reading %d bytes in this go (at %08x%08x)\n", ReadLen, CacheOffset.HighPart, CacheOffset.LowPart); - - if (!CcPinRead - (FileObject, - &CacheOffset, - ReadLen, - Wait ? PIN_WAIT : PIN_IF_BCB, - &Bcb, - (PVOID*)&ReadBuffer)) - { - IoStatus->Status = STATUS_UNSUCCESSFUL; - IoStatus->Information = 0; - DPRINT("Failed CcCopyRead\n"); - return FALSE; - } - - DPRINT("Copying %d bytes at %08x%08x\n", ReadLen, CacheOffset.HighPart, CacheOffset.LowPart); - RtlCopyMemory - (BufferTarget, - ReadBuffer, - ReadLen); - - BufferTarget += ReadLen; + NextOffset.QuadPart = CacheOffset.QuadPart; + NextOffset.LowPart = (NextOffset.LowPart + CACHE_STRIPE) & ~(CACHE_STRIPE-1); + ReadLen = EndOfExtent.QuadPart - CacheOffset.QuadPart; + if (CacheOffset.QuadPart + ReadLen > NextOffset.QuadPart) + { + ReadLen = NextOffset.QuadPart - CacheOffset.QuadPart; + } + + DPRINT("Reading %d bytes in this go (at %08x%08x)\n", ReadLen, CacheOffset.HighPart, CacheOffset.LowPart); + + if (!CcPinRead + (FileObject, + &CacheOffset, + ReadLen, + Wait ? PIN_WAIT : PIN_IF_BCB, + &Bcb, + (PVOID*)&ReadBuffer)) + { + IoStatus->Status = STATUS_UNSUCCESSFUL; + IoStatus->Information = 0; + DPRINT("Failed CcCopyRead\n"); + return FALSE; + } + + DPRINT("Copying %d bytes at %08x%08x\n", ReadLen, CacheOffset.HighPart, CacheOffset.LowPart); + RtlCopyMemory + (BufferTarget, + ReadBuffer, + ReadLen); + + BufferTarget += ReadLen; + + CacheOffset = NextOffset; + CcUnpinData(Bcb); + } - CacheOffset = NextOffset; - CcUnpinData(Bcb); - } - IoStatus->Status = STATUS_SUCCESS; IoStatus->Information = Length; @@ -139,7 +140,8 @@ while (CurrentOffset.QuadPart < EndOffset.QuadPart) { - NextOffset.QuadPart = (CurrentOffset.QuadPart + CACHE_STRIPE) & ~(CACHE_STRIPE - 1); + NextOffset.HighPart = CurrentOffset.HighPart; + NextOffset.LowPart = (CurrentOffset.LowPart + CACHE_STRIPE) & ~(CACHE_STRIPE - 1); DPRINT("NextOffset %08x%08x\n", NextOffset.u.HighPart, NextOffset.u.LowPart); WriteLen = MIN(NextOffset.QuadPart - CurrentOffset.QuadPart, Length); DPRINT("Copying %x bytes from %08x%08x\n", Modified: branches/arty-newcc/ntoskrnl/cache/pinsup.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/pinsu… ============================================================================== --- branches/arty-newcc/ntoskrnl/cache/pinsup.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/cache/pinsup.c [iso-8859-1] Fri Nov 13 16:35:12 2009 @@ -39,14 +39,14 @@ PETHREAD LastThread; VOID _CcpLock(const char *file, int line) { - DPRINT("<<<---<<< CC In Mutex(%s:%d %x)!\n", file, line, PsGetCurrentThread()); + //DPRINT("<<<---<<< CC In Mutex(%s:%d %x)!\n", file, line, PsGetCurrentThread()); ExAcquireFastMutex(&CcMutex); } VOID _CcpUnlock(const char *file, int line) { ExReleaseFastMutex(&CcMutex); - DPRINT(">>>--->>> CC Exit Mutex!\n", file, line); + //DPRINT(">>>--->>> CC Exit Mutex!\n", file, line); } PDEVICE_OBJECT @@ -301,11 +301,12 @@ return FALSE; } - DPRINT("CcMapData(F->%x,%x:%d)\n", FileObject, FileOffset->LowPart, Length); + DPRINT("CcMapData(F->%x,%08x%08x:%d)\n", FileObject, FileOffset->HighPart, FileOffset->LowPart, Length); ASSERT(KeGetCurrentIrql() < DISPATCH_LEVEL); - Target.QuadPart = CACHE_ROUND_DOWN(FileOffset->QuadPart); + Target.HighPart = FileOffset->HighPart; + Target.LowPart = CACHE_ROUND_DOWN(FileOffset->LowPart); CcpLock(); @@ -320,8 +321,9 @@ *BcbResult = Bcb; *Buffer = ((PCHAR)Bcb->BaseAddress) + (int)(FileOffset->QuadPart - Bcb->FileOffset.QuadPart); DPRINT - ("Bcb #%x Buffer maps (%x) At %x Length %x (Getting %x:%x) %wZ\n", + ("Bcb #%x Buffer maps (%08x%08x) At %x Length %x (Getting %x:%x) %wZ\n", Bcb - CcCacheSections, + Bcb->FileOffset.HighPart, Bcb->FileOffset.LowPart, Bcb->BaseAddress, Bcb->Length, @@ -430,8 +432,9 @@ *Buffer = ((PCHAR)Bcb->BaseAddress) + (int)(FileOffset->QuadPart - Bcb->FileOffset.QuadPart); DPRINT - ("Bcb #%x Buffer maps (%x) At %x Length %x (Getting %x:%x) %wZ\n", + ("Bcb #%x Buffer maps (%08x%08x) At %x Length %x (Getting %x:%x) %wZ\n", Bcb - CcCacheSections, + Bcb->FileOffset.HighPart, Bcb->FileOffset.LowPart, Bcb->BaseAddress, Bcb->Length, Modified: branches/arty-newcc/ntoskrnl/include/internal/newcc.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/include/int… ============================================================================== --- branches/arty-newcc/ntoskrnl/include/internal/newcc.h [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/include/internal/newcc.h [iso-8859-1] Fri Nov 13 16:35:12 2009 @@ -225,9 +225,6 @@ #define CACHE_NUM_SECTIONS (CACHE_OVERALL_SIZE / CACHE_STRIPE) #define CACHE_ROUND_UP(x) (((x) + (CACHE_STRIPE-1)) & ~(CACHE_STRIPE-1)) #define CACHE_ROUND_DOWN(x) ((x) & ~(CACHE_STRIPE-1)) -#define CACHE_NEED_SECTIONS(OFFSET,LENGTH) \ - ((CACHE_ROUND_UP((OFFSET)->QuadPart + (LENGTH)) - \ - CACHE_ROUND_DOWN((OFFSET)->QuadPart)) >> CACHE_SHIFT) #define INVALID_CACHE ((ULONG)~0) extern NOCC_BCB CcCacheSections[CACHE_NUM_SECTIONS]; Modified: branches/arty-newcc/ntoskrnl/include/internal/newmm.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/include/int… ============================================================================== --- branches/arty-newcc/ntoskrnl/include/internal/newmm.h [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/include/internal/newmm.h [iso-8859-1] Fri Nov 13 16:35:12 2009 @@ -326,8 +326,8 @@ struct { ROS_SECTION_OBJECT* Section; - ULONG ViewOffset; PMM_SECTION_SEGMENT Segment; + LARGE_INTEGER ViewOffset; BOOLEAN WriteCopyView; LIST_ENTRY RegionListHead; } SectionData; @@ -1859,7 +1859,7 @@ PVOID* BaseAddress, SIZE_T ViewSize, ULONG Protect, - ULONG ViewOffset, + PLARGE_INTEGER ViewOffset, ULONG AllocationType); /* section/image.c ***********************************************************/ Modified: branches/arty-newcc/ntoskrnl/mm/rmap.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/rmap.c?r… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/rmap.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/rmap.c [iso-8859-1] Fri Nov 13 16:35:12 2009 @@ -119,8 +119,8 @@ Type = MemoryArea->Type; if (Type == MEMORY_AREA_SECTION_VIEW) { - Offset = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress - + MemoryArea->Data.SectionData.ViewOffset; + Offset = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress; + /* * Get or create a pageop */ @@ -253,8 +253,7 @@ Type = MemoryArea->Type; if (Type == MEMORY_AREA_SECTION_VIEW) { - Offset = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress - + MemoryArea->Data.SectionData.ViewOffset; + Offset = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress; /* * Get or create a pageop @@ -286,8 +285,7 @@ #ifdef _NEWCC_ else if (Type == MEMORY_AREA_PAGE_FILE_SECTION) { - Offset = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress - + MemoryArea->Data.SectionData.ViewOffset; + Offset = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress; /* * Get or create a pageop @@ -318,8 +316,7 @@ } else if (Type == MEMORY_AREA_IMAGE_SECTION) { - Offset = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress - + MemoryArea->Data.SectionData.ViewOffset; + Offset = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress; /* * Get or create a pageop Modified: branches/arty-newcc/ntoskrnl/mm/section/data.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/section/… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/section/data.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/section/data.c [iso-8859-1] Fri Nov 13 16:35:12 2009 @@ -206,6 +206,7 @@ if (MmIsDirtyPageRmap(Page)) { + DPRINT("MiWriteBackPage(%wZ,%08x%08x)\n", &FileObject->FileName, Offset->u.HighPart, Offset->u.LowPart); Status = MiWriteBackPage(FileObject, Offset, PAGE_SIZE, Page); if (!NT_SUCCESS(Status)) { @@ -358,7 +359,7 @@ Region = MmFindRegion(MemoryArea->StartingAddress, &MemoryArea->Data.SectionData.RegionListHead, Address, NULL); - TotalOffset.QuadPart = Offset + MemoryArea->Data.SectionData.ViewOffset; + TotalOffset.QuadPart = MemoryArea->Data.SectionData.ViewOffset.QuadPart + Offset; /* * Lock the segment @@ -367,13 +368,13 @@ Entry = MiGetPageEntrySectionSegment(Segment, &TotalOffset); HasSwapEntry = MmIsPageSwapEntry(Process, (PVOID)PAddress); - DPRINT("Entry %x HasSwapEntry %x Offset %x\n", Entry, HasSwapEntry, TotalOffset.QuadPart); + DPRINT("Entry %x HasSwapEntry %x Offset %08x%08x\n", Entry, HasSwapEntry, TotalOffset.u.HighPart, TotalOffset.u.LowPart); if (Entry == 0 && !HasSwapEntry) { DPRINT("Segment->RawLength %08x%08x\n", Segment->RawLength.u.HighPart, Segment->RawLength.u.LowPart); DPRINT("Segment->Length %08x%08x\n", Segment->Length.u.HighPart, Segment->Length.u.LowPart); - DPRINT("Reading at offset %x (relative %x)\n", TotalOffset.LowPart, Offset); + DPRINT("Reading at offset %08x%08x (relative %x)\n", TotalOffset.HighPart, TotalOffset.LowPart, Offset); MmUnlockSectionSegment(Segment); MmUnlockAddressSpace(AddressSpace); @@ -616,8 +617,8 @@ * Find the offset of the page */ PAddress = MM_ROUND_DOWN(Address, PAGE_SIZE); - Offset.QuadPart = (ULONG_PTR)PAddress - (ULONG_PTR)MemoryArea->StartingAddress - + MemoryArea->Data.SectionData.ViewOffset; + Offset.QuadPart = (ULONG_PTR)PAddress - (ULONG_PTR)MemoryArea->StartingAddress + + MemoryArea->Data.SectionData.ViewOffset.QuadPart; Segment = MemoryArea->Data.SectionData.Segment; Section = MemoryArea->Data.SectionData.Section; @@ -728,7 +729,8 @@ PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); Address = MM_ROUND_DOWN(Address, PAGE_SIZE); - Offset.QuadPart = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress; + Offset.QuadPart = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress + + MemoryArea->Data.SectionData.ViewOffset.QuadPart; Region = MmFindRegion(MemoryArea->StartingAddress, &MemoryArea->Data.SectionData.RegionListHead, Address, NULL); @@ -819,9 +821,10 @@ } Segment = MemoryArea->Data.SectionData.Segment; - End.QuadPart = PAGE_ROUND_DOWN(FileOffset.QuadPart + Length); - FileOffset.QuadPart = PAGE_ROUND_UP(FileOffset.QuadPart); - FirstMapped.QuadPart = MemoryArea->Data.SectionData.ViewOffset; + End.QuadPart = FileOffset.QuadPart + Length; + End.LowPart = PAGE_ROUND_DOWN(End.LowPart); + FileOffset.LowPart = PAGE_ROUND_UP(FileOffset.LowPart); + FirstMapped.QuadPart = MemoryArea->Data.SectionData.ViewOffset.QuadPart; DPRINT1 ("Pulling zero pages for %08x%08x-%08x%08x\n", FileOffset.u.HighPart, FileOffset.u.LowPart, @@ -917,7 +920,6 @@ MM_SECTION_PAGEOUT_CONTEXT Context; SWAPENTRY SwapEntry; ULONG Entry; - LARGE_INTEGER FileOffset; NTSTATUS Status; PFILE_OBJECT FileObject; PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); @@ -929,9 +931,8 @@ */ Context.Segment = MemoryArea->Data.SectionData.Segment; Context.Section = MemoryArea->Data.SectionData.Section; - - Context.Offset.QuadPart = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress; - FileOffset = Context.Offset; + Context.Offset.QuadPart = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress + + MemoryArea->Data.SectionData.ViewOffset.QuadPart; FileObject = Context.Section->FileObject; @@ -984,7 +985,8 @@ if (Context.WasDirty) { - Status = MiWriteBackPage(FileObject, &FileOffset, PAGE_SIZE, Page); + DPRINT("MiWriteBackPage(%wZ,%08x%08x)\n", &FileObject->FileName, Context.Offset.u.HighPart, Context.Offset.u.LowPart); + Status = MiWriteBackPage(FileObject, &Context.Offset, PAGE_SIZE, Page); if (!NT_SUCCESS(Status)) { DPRINT1("CCRosUnmapCacheSegment failed, status = %x\n", Status); @@ -1161,7 +1163,8 @@ Address = (PVOID)PAGE_ROUND_DOWN(Address); - Offset.QuadPart = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress; + Offset.QuadPart = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress + + MemoryArea->Data.SectionData.ViewOffset.QuadPart; /* * Get the segment and section. @@ -1209,6 +1212,7 @@ if (!Private) { ASSERT(SwapEntry == 0); + DPRINT("MiWriteBackPage(%wZ,%08x%08x)\n", &FileObject->FileName, Offset.u.HighPart, Offset.u.LowPart); Status = PageOp->Status = MiWriteBackPage(FileObject, &Offset, PAGE_SIZE, Page); MmspCompleteAndReleasePageOp(PageOp); return(Status); @@ -1280,7 +1284,7 @@ BeginningAddress = PAGE_ROUND_DOWN((ULONG_PTR)MemoryArea->StartingAddress); EndingAddress = PAGE_ROUND_UP((ULONG_PTR)MemoryArea->EndingAddress); Segment = MemoryArea->Data.SectionData.Segment; - ViewOffset.QuadPart = MemoryArea->Data.SectionData.ViewOffset; + ViewOffset.QuadPart = MemoryArea->Data.SectionData.ViewOffset.QuadPart; MmLockSectionSegment(Segment); @@ -1325,6 +1329,7 @@ Page = Pages[(PageAddress - BeginningAddress) >> PAGE_SHIFT]; if (Page) { + DPRINT("MiWriteBackPage(%wZ,%08x%08x)\n", &Segment->FileObject->FileName, FileOffset.u.HighPart, FileOffset.u.LowPart); Status = MiWriteBackPage(Segment->FileObject, &FileOffset, PAGE_SIZE, Page); MmUnlockPage(Page); MmSetCleanAllRmaps(Page); @@ -1394,7 +1399,7 @@ PFN_TYPE Page; Offset.QuadPart = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress - + MemoryArea->Data.SectionData.ViewOffset; + + MemoryArea->Data.SectionData.ViewOffset.QuadPart; Entry = MiGetPageEntrySectionSegment(Segment, &Offset); Page = MmGetPfnForProcess(Process, Address); @@ -1919,7 +1924,7 @@ PVOID* BaseAddress, SIZE_T ViewSize, ULONG Protect, - ULONG ViewOffset, + PLARGE_INTEGER ViewOffset, ULONG AllocationType) { PMEMORY_AREA MArea; @@ -1954,7 +1959,10 @@ MArea->Data.SectionData.Segment = Segment; MArea->Data.SectionData.Section = Section; - MArea->Data.SectionData.ViewOffset = ViewOffset; + if (ViewOffset) + MArea->Data.SectionData.ViewOffset = *ViewOffset; + else + MArea->Data.SectionData.ViewOffset.QuadPart = 0; MArea->Data.SectionData.WriteCopyView = FALSE; MmInitializeRegion(&MArea->Data.SectionData.RegionListHead, ViewSize, 0, Protect); @@ -2219,7 +2227,7 @@ Address = (PVOID)PAGE_ROUND_DOWN(Address); Offset.QuadPart = ((ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress) + - MemoryArea->Data.SectionData.ViewOffset; + MemoryArea->Data.SectionData.ViewOffset.QuadPart; Section = MemoryArea->Data.SectionData.Section; Segment = MemoryArea->Data.SectionData.Segment; @@ -2352,7 +2360,7 @@ Offset -= PAGE_SIZE; PageOp = MmCheckForPageOp(MemoryArea, NULL, NULL, MemoryArea->Data.SectionData.Segment, - Offset + MemoryArea->Data.SectionData.ViewOffset); + Offset); if (PageOp) { MmUnlockAddressSpace(AddressSpace); @@ -2648,7 +2656,7 @@ MmLockSectionSegment(Segment); Segment->RawLength.QuadPart = NewSize->QuadPart; - Segment->Length.QuadPart = MAX(Segment->Length.QuadPart, PAGE_ROUND_UP(Segment->RawLength.QuadPart)); + Segment->Length.QuadPart = MAX(Segment->Length.QuadPart, PAGE_ROUND_UP(Segment->RawLength.LowPart)); MmUnlockSectionSegment(Segment); Section->MaximumSize = *NewSize; return STATUS_SUCCESS; @@ -2842,7 +2850,7 @@ { PROS_SECTION_OBJECT Section; PMMSUPPORT AddressSpace; - ULONG ViewOffset; + LARGE_INTEGER ViewOffset; NTSTATUS Status = STATUS_SUCCESS; ASSERT(Process); @@ -2900,14 +2908,14 @@ if (SectionOffset == NULL) { - ViewOffset = 0; + ViewOffset.QuadPart = 0; } else { - ViewOffset = SectionOffset->u.LowPart; + ViewOffset = *SectionOffset; } - if ((ViewOffset % PAGE_SIZE) != 0) + if ((ViewOffset.QuadPart % PAGE_SIZE) != 0) { MmUnlockAddressSpace(AddressSpace); return(STATUS_MAPPED_ALIGNMENT); @@ -2915,11 +2923,11 @@ if ((*ViewSize) == 0) { - (*ViewSize) = Section->MaximumSize.u.LowPart - ViewOffset; + (*ViewSize) = Section->MaximumSize.QuadPart - ViewOffset.QuadPart; } - else if (((*ViewSize)+ViewOffset) > Section->MaximumSize.u.LowPart) + else if (((*ViewSize)+ViewOffset.QuadPart) > Section->MaximumSize.QuadPart) { - (*ViewSize) = Section->MaximumSize.u.LowPart - ViewOffset; + (*ViewSize) = Section->MaximumSize.QuadPart - ViewOffset.QuadPart; } MmLockSectionSegment(Section->Segment); @@ -2929,7 +2937,7 @@ BaseAddress, *ViewSize, Protect, - ViewOffset, + &ViewOffset, AllocationType & (MEM_TOP_DOWN|SEC_NO_CHANGE)); MmUnlockSectionSegment(Section->Segment); if (!NT_SUCCESS(Status)) @@ -3085,7 +3093,7 @@ PMMSUPPORT AddressSpace; NTSTATUS Status; - DPRINT("MmMapViewInSystemSpaceAtOffset() called offset %x\n", FileOffset->LowPart); + DPRINT("MmMapViewInSystemSpaceAtOffset() called offset %08x%08x\n", FileOffset->HighPart, FileOffset->LowPart); Section = (PROS_SECTION_OBJECT)SectionObject; AddressSpace = MmGetKernelAddressSpace(); @@ -3100,7 +3108,7 @@ MappedBase, *ViewSize, Section->SectionPageProtection, - FileOffset->LowPart, + FileOffset, 0); MmUnlockSectionSegment(Section->Segment); Modified: branches/arty-newcc/ntoskrnl/mm/section/image.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/section/… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/section/image.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/section/image.c [iso-8859-1] Fri Nov 13 16:35:12 2009 @@ -1797,7 +1797,7 @@ Address = (PVOID)PAGE_ROUND_DOWN(Address); Offset.QuadPart = ((ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress) + - MemoryArea->Data.SectionData.ViewOffset; + MemoryArea->Data.SectionData.ViewOffset.QuadPart; Section = MemoryArea->Data.SectionData.Section; Segment = MemoryArea->Data.SectionData.Segment; Modified: branches/arty-newcc/ntoskrnl/mm/section/io.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/section/… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/section/io.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/section/io.c [iso-8859-1] Fri Nov 13 16:35:12 2009 @@ -239,9 +239,10 @@ ASSERT(DeviceObject); DPRINT - ("PAGING READ: FileObject %x <%wZ> Offset %x Length %d\n", + ("PAGING READ: FileObject %x <%wZ> Offset %08x%08x Length %d\n", &FileObject, &FileObject->FileName, + FileOffset->HighPart, FileOffset->LowPart, Length); Modified: branches/arty-newcc/ntoskrnl/mm/section/pagefile.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/section/… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/section/pagefile.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/section/pagefile.c [iso-8859-1] Fri Nov 13 16:35:12 2009 @@ -712,7 +712,7 @@ Address = (PVOID)PAGE_ROUND_DOWN(Address); Offset.QuadPart = ((ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress) + - MemoryArea->Data.SectionData.ViewOffset; + MemoryArea->Data.SectionData.ViewOffset.QuadPart; Section = MemoryArea->Data.SectionData.Section; Segment = MemoryArea->Data.SectionData.Segment; Modified: branches/arty-newcc/ntoskrnl/mm/section/physical.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/section/… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/section/physical.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/section/physical.c [iso-8859-1] Fri Nov 13 16:35:12 2009 @@ -75,11 +75,11 @@ * Just map the desired physical page */ PAddress = MM_ROUND_DOWN(Address, PAGE_SIZE); - Offset = (ULONG_PTR)PAddress - (ULONG_PTR)MemoryArea->StartingAddress + MemoryArea->Data.SectionData.ViewOffset; + Offset = (ULONG_PTR)PAddress - (ULONG_PTR)MemoryArea->StartingAddress; Region = MmFindRegion(MemoryArea->StartingAddress, &MemoryArea->Data.SectionData.RegionListHead, Address, NULL); - Page = Offset >> PAGE_SHIFT; + Page = (Offset + MemoryArea->Data.SectionData.ViewOffset.QuadPart) >> PAGE_SHIFT; Status = MmCreateVirtualMappingUnsafe(Process, Address, Region->Protect, Modified: branches/arty-newcc/ntoskrnl/mm/virtual.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/virtual.… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/virtual.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/virtual.c [iso-8859-1] Fri Nov 13 16:35:12 2009 @@ -81,6 +81,11 @@ break; case MEMORY_AREA_SECTION_VIEW: +#ifdef _NEWCC_ + case MEMORY_AREA_PHYSICAL_MEMORY_SECTION: + case MEMORY_AREA_PAGE_FILE_SECTION: + case MEMORY_AREA_IMAGE_SECTION: +#endif Status = MmQuerySectionView(MemoryArea, Address, Info, ResultLength); break;

1 0

[arty] 44139: It's a good thing the fat driver allocates blocks early in the partition. Likely also fixes some problems booting on partition number > 1.
by arty＠svn.reactos.org 13 Nov '09

13 Nov '09

Author: arty Date: Fri Nov 13 16:31:45 2009 New Revision: 44139 URL: http://svn.reactos.org/svn/reactos?rev=44139&view=rev Log: It's a good thing the fat driver allocates blocks early in the partition. Likely also fixes some problems booting on partition number > 1. Modified: branches/arty-newcc/boot/freeldr/freeldr/arch/i386/hardware.c Modified: branches/arty-newcc/boot/freeldr/freeldr/arch/i386/hardware.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/boot/freeldr/freeldr… ============================================================================== --- branches/arty-newcc/boot/freeldr/freeldr/arch/i386/hardware.c [iso-8859-1] (original) +++ branches/arty-newcc/boot/freeldr/freeldr/arch/i386/hardware.c [iso-8859-1] Fri Nov 13 16:31:45 2009 @@ -503,8 +503,7 @@ if (Position->LowPart & (Context->SectorSize - 1)) return EINVAL; - /* FIXME: take HighPart into account */ - Context->SectorNumber = Position->LowPart / Context->SectorSize; + Context->SectorNumber = Position->QuadPart / Context->SectorSize; return ESUCCESS; }

1 0

[arty] 44138: Introduce a stub for STORAGE_HOTPLUG_INFO. Filesystems rely on it. We just report not being hotplugged or media-changing right now.
by arty＠svn.reactos.org 13 Nov '09

13 Nov '09

Author: arty Date: Fri Nov 13 16:27:43 2009 New Revision: 44138 URL: http://svn.reactos.org/svn/reactos?rev=44138&view=rev Log: Introduce a stub for STORAGE_HOTPLUG_INFO. Filesystems rely on it. We just report not being hotplugged or media-changing right now. Modified: branches/arty-newcc/drivers/storage/scsiport/scsiport.c branches/arty-newcc/include/ddk/ntddstor.h Modified: branches/arty-newcc/drivers/storage/scsiport/scsiport.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/storage/scsi… ============================================================================== --- branches/arty-newcc/drivers/storage/scsiport/scsiport.c [iso-8859-1] (original) +++ branches/arty-newcc/drivers/storage/scsiport/scsiport.c [iso-8859-1] Fri Nov 13 16:27:43 2009 @@ -2825,6 +2825,25 @@ case IOCTL_SCSI_MINIPORT: DPRINT1("IOCTL_SCSI_MINIPORT unimplemented!\n"); break; + + case IOCTL_STORAGE_GET_HOTPLUG_INFO: + if (Stack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(STORAGE_HOTPLUG_INFO)) + { + Status = STATUS_BUFFER_TOO_SMALL; + } + else + { + STORAGE_HOTPLUG_INFO HotplugInfo = { }; + HotplugInfo.Size = sizeof(HotplugInfo); + // XXX Stub + RtlCopyMemory + (Irp->AssociatedIrp.SystemBuffer, + &HotplugInfo, + sizeof(HotplugInfo)); + Irp->IoStatus.Information = sizeof(HotplugInfo); + Status = STATUS_SUCCESS; + } + break; case IOCTL_SCSI_PASS_THROUGH: DPRINT1("IOCTL_SCSI_PASS_THROUGH unimplemented!\n"); Modified: branches/arty-newcc/include/ddk/ntddstor.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/include/ddk/ntddstor… ============================================================================== --- branches/arty-newcc/include/ddk/ntddstor.h [iso-8859-1] (original) +++ branches/arty-newcc/include/ddk/ntddstor.h [iso-8859-1] Fri Nov 13 16:27:43 2009 @@ -349,6 +349,14 @@ BOOLEAN PreventMediaRemoval; } PREVENT_MEDIA_REMOVAL, *PPREVENT_MEDIA_REMOVAL; +typedef struct _STORAGE_HOTPLUG_INFO { + ULONG Size; + UCHAR MediaRemovable; + UCHAR MediaHotplug; + UCHAR DeviceHotplug; + UCHAR WriteCacheEnableOverride; +} STORAGE_HOTPLUG_INFO, *PSTORAGE_HOTPLUG_INFO; + #ifdef __cplusplus } #endif

1 0

[janderwald] 44137: Silence for Christoph & buildbot
by janderwald＠svn.reactos.org 13 Nov '09

13 Nov '09

Author: janderwald Date: Fri Nov 13 16:08:00 2009 New Revision: 44137 URL: http://svn.reactos.org/svn/reactos?rev=44137&view=rev Log: Silence for Christoph & buildbot Modified: trunk/reactos/drivers/wdm/audio/sysaudio/dispatcher.c trunk/reactos/drivers/wdm/audio/sysaudio/main.c trunk/reactos/drivers/wdm/audio/sysaudio/pin.c Modified: trunk/reactos/drivers/wdm/audio/sysaudio/dispatcher.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/dispatcher.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/dispatcher.c [iso-8859-1] Fri Nov 13 16:08:00 2009 @@ -67,7 +67,7 @@ KSOBJECT_HEADER ObjectHeader; PKSOBJECT_CREATE_ITEM CreateItem; - DPRINT1("DispatchCreateSysAudio entered\n"); + DPRINT("DispatchCreateSysAudio entered\n"); /* allocate create item */ CreateItem = ExAllocatePool(NonPagedPool, sizeof(KSOBJECT_CREATE_ITEM)); @@ -89,7 +89,7 @@ /* allocate object header */ Status = KsAllocateObjectHeader(&ObjectHeader, 1, CreateItem, Irp, &DispatchTable); - DPRINT1("KsAllocateObjectHeader result %x\n", Status); + DPRINT("KsAllocateObjectHeader result %x\n", Status); /* complete the irp */ Irp->IoStatus.Information = 0; Irp->IoStatus.Status = Status; Modified: trunk/reactos/drivers/wdm/audio/sysaudio/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/main.c [iso-8859-1] Fri Nov 13 16:08:00 2009 @@ -37,7 +37,7 @@ PSYSAUDIODEVEXT DeviceExtension; PLIST_ENTRY Entry; - DPRINT1("SysAudio_Shutdown called\n"); + DPRINT("SysAudio_Shutdown called\n"); DeviceExtension = (PSYSAUDIODEVEXT)DeviceObject->DeviceExtension; @@ -46,7 +46,7 @@ Entry = RemoveHeadList(&DeviceExtension->KsAudioDeviceList); DeviceEntry = (PKSAUDIO_DEVICE_ENTRY)CONTAINING_RECORD(Entry, KSAUDIO_DEVICE_ENTRY, Entry); - DPRINT1("Freeing item %wZ\n", &DeviceEntry->DeviceName); + DPRINT("Freeing item %wZ\n", &DeviceEntry->DeviceName); /* dereference audio device file object */ ObDereferenceObject(DeviceEntry->FileObject); @@ -149,7 +149,7 @@ if (!NT_SUCCESS(Status)) { IoDeleteDevice(DeviceObject); - DPRINT("Failed to create sysaudio symlink!\n"); + DPRINT1("Failed to create sysaudio symlink!\n"); return Status; } } Modified: trunk/reactos/drivers/wdm/audio/sysaudio/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/pin.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/pin.c [iso-8859-1] Fri Nov 13 16:08:00 2009 @@ -362,7 +362,7 @@ DispatchContext->AudioEntry = DeviceEntry; - DPRINT1("RealPinHandle %p\n", RealPinHandle); + DPRINT("RealPinHandle %p\n", RealPinHandle); /* Do we need to transform the audio stream */ if (OutputFormat != NULL)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs