Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hyperion] 44216: Goodbye win32k_base, you won't be missed
by hyperion＠svn.reactos.org 17 Nov '09

17 Nov '09

Author: hyperion Date: Tue Nov 17 18:00:01 2009 New Revision: 44216 URL: http://svn.reactos.org/svn/reactos?rev=44216&view=rev Log: Goodbye win32k_base, you won't be missed Modified: trunk/reactos/subsystems/win32/win32k/win32k.rbuild Modified: trunk/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/wi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] Tue Nov 17 18:00:01 2009 @@ -1,10 +1,17 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> <group> -<module name="win32k_base" type="objectlibrary"> - <include base="win32k_base">.</include> - <include base="win32k_base">include</include> - <include base="win32k_base" root="intermediate">.</include> +<module name="win32k" type="kernelmodedriver" installbase="system32" installname="win32k.sys" crt="libcntpr"> + <importlibrary definition="win32k.pspec" /> + <library>pseh</library> + <library>ntoskrnl</library> + <library>hal</library> + <library>ftfd</library> + <library>dxguid</library> + <file>win32k.rc</file> + <include base="win32k">.</include> + <include base="win32k">include</include> + <include base="win32k" root="intermediate">.</include> <include base="ntoskrnl">include</include> <include base="freetype">include</include> <include base="ReactOS">include/reactos/subsys</include> @@ -202,14 +209,4 @@  <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </module> -<module name="win32k" type="kernelmodedriver" installbase="system32" installname="win32k.sys" crt="libcntpr"> - <importlibrary definition="win32k.pspec" /> - <library>win32k_base</library> - <library>pseh</library> - <library>ntoskrnl</library> - <library>hal</library> - <library>ftfd</library> - <library>dxguid</library> - <file>win32k.rc</file> -</module> </group>

1 0

[hyperion] 44215: Reapplying r44182. Thanks to r44208, it should actually work this time
by hyperion＠svn.reactos.org 17 Nov '09

17 Nov '09

Author: hyperion Date: Tue Nov 17 17:18:34 2009 New Revision: 44215 URL: http://svn.reactos.org/svn/reactos?rev=44215&view=rev Log: Reapplying r44182. Thanks to r44208, it should actually work this time Modified: trunk/reactos/tools/rbuild/backend/mingw/linkers/ld.mak trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/linkers/ld.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/linkers/ld.mak [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/linkers/ld.mak [iso-8859-1] Tue Nov 17 17:18:34 2009 @@ -5,7 +5,8 @@ LDFLAG_WINDOWS:=--subsystem=windows LDFLAG_NATIVE:=--subsystem=native -#(module, objs, deps, ldflags, output, def, libs, entry, base) +#~ #(module, objs, deps, ldflags, output, def, libs, entry, base) +#(module, objs, deps, ldflags, output, def, libs, entry, base, extralibs) define RBUILD_LINK ifneq ($(6),) @@ -38,7 +39,8 @@ $(5): ${call RBUILD_intermediate_dir,$(5)}$$(SEP)$(1)_objs.rsp $(7) $(3) $$(RSYM_TARGET) $$(PEFIXUP_TARGET) | ${call RBUILD_dir,$(5)} $$(ECHO_LD) - $${ld} --entry=$(8) --image-base=$(9) @${call RBUILD_intermediate_dir,$(5)}$$(SEP)$(1)_objs.rsp $(7) ${call RBUILD_ldflags,$(1),$(4)} -o $$@ +#~ $${ld} --entry=$(8) --image-base=$(9) @${call RBUILD_intermediate_dir,$(5)}$$(SEP)$(1)_objs.rsp $(7) ${call RBUILD_ldflags,$(1),$(4)} -o $$@ + $${ld} --entry=$(8) --image-base=$(9) @${call RBUILD_intermediate_dir,$(5)}$$(SEP)$(1)_objs.rsp $(10) $(7) $(10) ${call RBUILD_ldflags,$(1),$(4)} -o $$@ ifneq ($(or $(6),$$(MODULETYPE$$($(1)_TYPE)_KMODE)),) $$(ECHO_PEFIXUP) $$(Q)$$(PEFIXUP_TARGET) $$@ $(if $(6),-exports) $$(if $$(MODULETYPE$($(1)_TYPE)_KMODE),-sections) @@ -75,5 +77,7 @@ endef -#(module, def, deps, ldflags, libs, entry, base) -RBUILD_LINK_RULE=${call RBUILD_LINK,$(1),$(value $(1)_OBJS),$(3),$(4),$(value $(1)_TARGET),$(2),$(5) $(value $(1)_LIBS) $(5),$(6),$(7)} +#~ #(module, def, deps, ldflags, libs, entry, base) +#~ RBUILD_LINK_RULE=${call RBUILD_LINK,$(1),$(value $(1)_OBJS),$(3),$(4),$(value $(1)_TARGET),$(2),$(5) $(value $(1)_LIBS) $(5),$(6),$(7)} +#(module, def, deps, ldflags, libs, entry, base, extralibs) +RBUILD_LINK_RULE=${call RBUILD_LINK,$(1),$(value $(1)_OBJS),$(3),$(4),$(value $(1)_TARGET),$(2),$(value $(1)_LIBS),$(6),$(7),$(5)} Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Tue Nov 17 17:18:34 2009 @@ -479,8 +479,8 @@ // Would be nice to have our own C++ runtime fputs ( "BUILTIN_CXXINCLUDES+= $(TARGET_CPPFLAGS)\n", fMakefile ); - fprintf ( fMakefile, "PROJECT_CCLIBS := $(shell ${TARGET_CC} -print-libgcc-file-name)\n" ); - fprintf ( fMakefile, "PROJECT_CXXLIBS := $(shell ${TARGET_CPP} -print-file-name=libstdc++.a) $(shell ${TARGET_CPP} -print-file-name=libgcc.a) $(shell ${TARGET_CPP} -print-file-name=libmingw32.a) $(shell ${TARGET_CPP} -print-file-name=libmingwex.a) $(shell ${TARGET_CPP} -print-file-name=libcoldname.a)\n" ); + fprintf ( fMakefile, "PROJECT_CCLIBS := \"$(shell ${TARGET_CC} -print-libgcc-file-name)\"\n" ); + fprintf ( fMakefile, "PROJECT_CXXLIBS := \"$(shell ${TARGET_CPP} -print-file-name=libstdc++.a)\" \"$(shell ${TARGET_CPP} -print-file-name=libgcc.a)\" \"$(shell ${TARGET_CPP} -print-file-name=libmingw32.a)\" \"$(shell ${TARGET_CPP} -print-file-name=libmingwex.a)\" \"$(shell ${TARGET_CPP} -print-file-name=libcoldname.a)\"\n" ); /* hack to get libgcc_eh.a, should check mingw version or something */ if (Environment::GetArch() == "amd64")

1 0

[arty] 44214: Forgot some NTAPI.
by arty＠svn.reactos.org 17 Nov '09

17 Nov '09

Author: arty Date: Tue Nov 17 04:58:44 2009 New Revision: 44214 URL: http://svn.reactos.org/svn/reactos?rev=44214&view=rev Log: Forgot some NTAPI. Modified: branches/arty-newcc/include/ndk/rtlfuncs.h Modified: branches/arty-newcc/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/include/ndk/rtlfuncs… ============================================================================== --- branches/arty-newcc/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ branches/arty-newcc/include/ndk/rtlfuncs.h [iso-8859-1] Tue Nov 17 04:58:44 2009 @@ -2713,6 +2713,7 @@ NTSYSAPI PVOID +NTAPI RtlGetElementGenericTable( IN PRTL_GENERIC_TABLE, IN ULONG I @@ -2720,6 +2721,7 @@ NTSYSAPI ULONG +NTAPI RtlNumberGenericTableElements( IN PRTL_GENERIC_TABLE Table );

1 0

[arty] 44213: pierre-fsd imported, minus changes under drivers/filesystems. Pierre should look this over.
by arty＠svn.reactos.org 17 Nov '09

17 Nov '09

Author: arty Date: Tue Nov 17 04:52:29 2009 New Revision: 44213 URL: http://svn.reactos.org/svn/reactos?rev=44213&view=rev Log: pierre-fsd imported, minus changes under drivers/filesystems. Pierre should look this over. Added: branches/arty-newcc/drivers/filesystems/ksecdd/ branches/arty-newcc/drivers/filesystems/ksecdd/dispatch.c (with props) branches/arty-newcc/drivers/filesystems/ksecdd/ksecdd.c (with props) branches/arty-newcc/drivers/filesystems/ksecdd/ksecdd.h (with props) branches/arty-newcc/drivers/filesystems/ksecdd/ksecdd.rbuild (with props) branches/arty-newcc/drivers/filesystems/ksecdd/ksecdd.rc (with props) branches/arty-newcc/include/psdk/ioevent.h (with props) branches/arty-newcc/include/reactos/ccros.h (with props) branches/arty-newcc/lib/sdk/ioevent/ branches/arty-newcc/lib/sdk/ioevent/ioevent.c (with props) branches/arty-newcc/lib/sdk/ioevent/ioevent.rbuild (with props) branches/arty-newcc/ntoskrnl/fsrtl/mcb.c (with props) Modified: branches/arty-newcc/boot/bootdata/hivesys_i386.inf branches/arty-newcc/boot/bootdata/packages/reactos.dff branches/arty-newcc/drivers/filesystems/directory.rbuild branches/arty-newcc/include/reactos/mc/bugcodes.mc branches/arty-newcc/lib/rtl/dos8dot3.c branches/arty-newcc/lib/sdk/sdk.rbuild branches/arty-newcc/ntoskrnl/cc/copy.c branches/arty-newcc/ntoskrnl/cc/view.c branches/arty-newcc/ntoskrnl/fsrtl/dbcsname.c branches/arty-newcc/ntoskrnl/fsrtl/fastio.c branches/arty-newcc/ntoskrnl/fsrtl/faulttol.c branches/arty-newcc/ntoskrnl/fsrtl/filtrctx.c branches/arty-newcc/ntoskrnl/fsrtl/fsrtlpc.c branches/arty-newcc/ntoskrnl/fsrtl/largemcb.c branches/arty-newcc/ntoskrnl/fsrtl/name.c branches/arty-newcc/ntoskrnl/fsrtl/notify.c branches/arty-newcc/ntoskrnl/fsrtl/oplock.c branches/arty-newcc/ntoskrnl/fsrtl/pnp.c branches/arty-newcc/ntoskrnl/fsrtl/tunnel.c branches/arty-newcc/ntoskrnl/include/internal/fsrtl.h branches/arty-newcc/ntoskrnl/include/internal/io.h branches/arty-newcc/ntoskrnl/include/internal/mm.h branches/arty-newcc/ntoskrnl/include/internal/newmm.h branches/arty-newcc/ntoskrnl/io/iomgr/device.c branches/arty-newcc/ntoskrnl/io/iomgr/rawfs.c branches/arty-newcc/ntoskrnl/io/pnpmgr/pnpreport.c branches/arty-newcc/ntoskrnl/ntoskrnl-generic.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/arty-newcc/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/boot/bootdata/hivesy… Modified: branches/arty-newcc/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/boot/bootdata/packag… Modified: branches/arty-newcc/drivers/filesystems/directory.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… Added: branches/arty-newcc/drivers/filesystems/ksecdd/dispatch.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… Added: branches/arty-newcc/drivers/filesystems/ksecdd/ksecdd.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… Added: branches/arty-newcc/drivers/filesystems/ksecdd/ksecdd.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… Added: branches/arty-newcc/drivers/filesystems/ksecdd/ksecdd.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… Added: branches/arty-newcc/drivers/filesystems/ksecdd/ksecdd.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… Added: branches/arty-newcc/include/psdk/ioevent.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/include/psdk/ioevent… Added: branches/arty-newcc/include/reactos/ccros.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/include/reactos/ccro… Modified: branches/arty-newcc/include/reactos/mc/bugcodes.mc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/include/reactos/mc/b… Modified: branches/arty-newcc/lib/rtl/dos8dot3.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/lib/rtl/dos8dot3.c?r… Added: branches/arty-newcc/lib/sdk/ioevent/ioevent.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/lib/sdk/ioevent/ioev… Added: branches/arty-newcc/lib/sdk/ioevent/ioevent.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/lib/sdk/ioevent/ioev… Modified: branches/arty-newcc/lib/sdk/sdk.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/lib/sdk/sdk.rbuild?r… Modified: branches/arty-newcc/ntoskrnl/cc/copy.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cc/copy.c?r… Modified: branches/arty-newcc/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cc/view.c?r… Modified: branches/arty-newcc/ntoskrnl/fsrtl/dbcsname.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/fsrtl/dbcsn… Modified: branches/arty-newcc/ntoskrnl/fsrtl/fastio.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/fsrtl/fasti… Modified: branches/arty-newcc/ntoskrnl/fsrtl/faulttol.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/fsrtl/fault… Modified: branches/arty-newcc/ntoskrnl/fsrtl/filtrctx.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/fsrtl/filtr… Modified: branches/arty-newcc/ntoskrnl/fsrtl/fsrtlpc.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/fsrtl/fsrtl… Modified: branches/arty-newcc/ntoskrnl/fsrtl/largemcb.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/fsrtl/large… Added: branches/arty-newcc/ntoskrnl/fsrtl/mcb.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/fsrtl/mcb.c… Modified: branches/arty-newcc/ntoskrnl/fsrtl/name.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/fsrtl/name.… Modified: branches/arty-newcc/ntoskrnl/fsrtl/notify.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/fsrtl/notif… Modified: branches/arty-newcc/ntoskrnl/fsrtl/oplock.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/fsrtl/oploc… Modified: branches/arty-newcc/ntoskrnl/fsrtl/pnp.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/fsrtl/pnp.c… Modified: branches/arty-newcc/ntoskrnl/fsrtl/tunnel.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/fsrtl/tunne… Modified: branches/arty-newcc/ntoskrnl/include/internal/fsrtl.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/include/int… Modified: branches/arty-newcc/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/include/int… Modified: branches/arty-newcc/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/include/int… Modified: branches/arty-newcc/ntoskrnl/include/internal/newmm.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/include/int… Modified: branches/arty-newcc/ntoskrnl/io/iomgr/device.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/io/iomgr/de… Modified: branches/arty-newcc/ntoskrnl/io/iomgr/rawfs.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/io/iomgr/ra… Modified: branches/arty-newcc/ntoskrnl/io/pnpmgr/pnpreport.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/io/pnpmgr/p… Modified: branches/arty-newcc/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/ntoskrnl-ge…

1 0

[arty] 44212: Some prototype changes.
by arty＠svn.reactos.org 17 Nov '09

17 Nov '09

Author: arty Date: Tue Nov 17 04:46:31 2009 New Revision: 44212 URL: http://svn.reactos.org/svn/reactos?rev=44212&view=rev Log: Some prototype changes. Modified: branches/arty-newcc/include/ndk/rtlfuncs.h branches/arty-newcc/ntoskrnl/mm/section/sptab.c Modified: branches/arty-newcc/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/include/ndk/rtlfuncs… ============================================================================== --- branches/arty-newcc/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ branches/arty-newcc/include/ndk/rtlfuncs.h [iso-8859-1] Tue Nov 17 04:46:31 2009 @@ -2706,6 +2706,27 @@ NTSYSAPI PVOID NTAPI +RtlEnumerateGenericTable( + IN PRTL_GENERIC_TABLE, + IN BOOLEAN Reset + ); + +NTSYSAPI +PVOID +RtlGetElementGenericTable( + IN PRTL_GENERIC_TABLE, + IN ULONG I + ); + +NTSYSAPI +ULONG +RtlNumberGenericTableElements( + IN PRTL_GENERIC_TABLE Table + ); + +NTSYSAPI +PVOID +NTAPI RtlInsertElementGenericTableFull( IN PRTL_GENERIC_TABLE Table, IN PVOID Buffer, Modified: branches/arty-newcc/ntoskrnl/mm/section/sptab.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/section/… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/section/sptab.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/section/sptab.c [iso-8859-1] Tue Nov 17 04:46:31 2009 @@ -32,9 +32,6 @@ /* TYPES *********************************************************************/ #define ENTRIES_PER_ELEMENT 244 - -PVOID NTAPI RtlGetElementGenericTable(PRTL_GENERIC_TABLE Table, PVOID Data); -ULONG NTAPI RtlNumberGenericTableElements(PRTL_GENERIC_TABLE Table); typedef struct _SECTION_PAGE_TABLE {

1 0

[arty] 44211: Somewhat stub. Needed by ntfs.
by arty＠svn.reactos.org 17 Nov '09

17 Nov '09

Author: arty Date: Tue Nov 17 04:31:44 2009 New Revision: 44211 URL: http://svn.reactos.org/svn/reactos?rev=44211&view=rev Log: Somewhat stub. Needed by ntfs. Modified: branches/arty-newcc/ntoskrnl/cache/logsup.c branches/arty-newcc/ntoskrnl/include/internal/newcc.h Modified: branches/arty-newcc/ntoskrnl/cache/logsup.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/logsu… ============================================================================== --- branches/arty-newcc/ntoskrnl/cache/logsup.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/cache/logsup.c [iso-8859-1] Tue Nov 17 04:31:44 2009 @@ -32,8 +32,10 @@ IN PVOID LogHandle, IN PFLUSH_TO_LSN FlushToLsnRoutine) { - UNIMPLEMENTED; - while (TRUE); + PNOCC_CACHE_MAP Map = FileObject->SectionObjectPointer->SharedCacheMap; + if (!Map) return; + Map->LogHandle = LogHandle; + Map->FlushToLsn = FlushToLsnRoutine; } LARGE_INTEGER 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] Tue Nov 17 04:31:44 2009 @@ -134,6 +134,8 @@ CC_FILE_SIZES FileSizes; CACHE_MANAGER_CALLBACKS Callbacks; PVOID LazyContext; + PVOID LogHandle; + PFLUSH_TO_LSN FlushToLsn; } NOCC_CACHE_MAP, *PNOCC_CACHE_MAP; VOID

1 0

[arty] 44210: Revert some extra printing i introduced. No longer needed.
by arty＠svn.reactos.org 17 Nov '09

17 Nov '09

Author: arty Date: Tue Nov 17 04:28:54 2009 New Revision: 44210 URL: http://svn.reactos.org/svn/reactos?rev=44210&view=rev Log: Revert some extra printing i introduced. No longer needed. Modified: branches/arty-newcc/drivers/filesystems/cdfs/cdfs.h branches/arty-newcc/drivers/filesystems/cdfs/cdfs.rbuild branches/arty-newcc/drivers/filesystems/cdfs/create.c branches/arty-newcc/drivers/filesystems/cdfs/fcb.c branches/arty-newcc/drivers/filesystems/cdfs/rw.c Modified: branches/arty-newcc/drivers/filesystems/cdfs/cdfs.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… ============================================================================== --- branches/arty-newcc/drivers/filesystems/cdfs/cdfs.h [iso-8859-1] (original) +++ branches/arty-newcc/drivers/filesystems/cdfs/cdfs.h [iso-8859-1] Tue Nov 17 04:28:54 2009 @@ -4,6 +4,7 @@ #include <ntifs.h> #include <ntddk.h> #include <ntddcdrm.h> +#include <pseh/pseh.h> #define CDFS_BASIC_SECTOR 2048 #define CDFS_PRIMARY_DESCRIPTOR_LOCATION 16 @@ -227,8 +228,12 @@ ULONG LastOffset; } CCB, *PCCB; -#define TAG_CCB 'BCCI' -#define TAG_FCB 'BCFI' +#ifndef TAG +#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) +#endif + +#define TAG_CCB TAG('I', 'C', 'C', 'B') +#define TAG_FCB TAG('I', 'F', 'C', 'B') typedef struct { @@ -400,6 +405,7 @@ PUNICODE_STRING LongName, PUNICODE_STRING ShortName); + /* rw.c */ NTSTATUS NTAPI Modified: branches/arty-newcc/drivers/filesystems/cdfs/cdfs.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… ============================================================================== --- branches/arty-newcc/drivers/filesystems/cdfs/cdfs.rbuild [iso-8859-1] (original) +++ branches/arty-newcc/drivers/filesystems/cdfs/cdfs.rbuild [iso-8859-1] Tue Nov 17 04:28:54 2009 @@ -5,6 +5,7 @@ <include base="cdfs">.</include> <library>ntoskrnl</library> <library>hal</library> + <library>pseh</library> <file>cdfs.c</file> <file>cleanup.c</file> <file>close.c</file> Modified: branches/arty-newcc/drivers/filesystems/cdfs/create.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… ============================================================================== --- branches/arty-newcc/drivers/filesystems/cdfs/create.c [iso-8859-1] (original) +++ branches/arty-newcc/drivers/filesystems/cdfs/create.c [iso-8859-1] Tue Nov 17 04:28:54 2009 @@ -1,5 +1,3 @@ - - /* * ReactOS kernel * Copyright (C) 2002, 2003, 2004 ReactOS Team Modified: branches/arty-newcc/drivers/filesystems/cdfs/fcb.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… ============================================================================== --- branches/arty-newcc/drivers/filesystems/cdfs/fcb.c [iso-8859-1] (original) +++ branches/arty-newcc/drivers/filesystems/cdfs/fcb.c [iso-8859-1] Tue Nov 17 04:28:54 2009 @@ -313,7 +313,6 @@ return(Fcb); } -#define ch(x) (((x) < 127 && (x) > 31) ? (x) : '.') static VOID CdfsGetDirEntryName(PDEVICE_EXTENSION DeviceExt, @@ -333,34 +332,12 @@ } else { - int i; - for (i = 0; i < 32; i += 8) - { - DPRINT("%08x: %02x %02x %02x %02x-%02x %02x %02x %02x %c%c%c%c%c%c%c%c\n", ((char *)Record->FileId) + i, - ((char *)Record->FileId)[i+0] & 0xff, - ((char *)Record->FileId)[i+1] & 0xff, - ((char *)Record->FileId)[i+2] & 0xff, - ((char *)Record->FileId)[i+3] & 0xff, - ((char *)Record->FileId)[i+4] & 0xff, - ((char *)Record->FileId)[i+5] & 0xff, - ((char *)Record->FileId)[i+6] & 0xff, - ((char *)Record->FileId)[i+7] & 0xff, - ch(((char *)Record->FileId)[i+0] & 0xff), - ch(((char *)Record->FileId)[i+1] & 0xff), - ch(((char *)Record->FileId)[i+2] & 0xff), - ch(((char *)Record->FileId)[i+3] & 0xff), - ch(((char *)Record->FileId)[i+4] & 0xff), - ch(((char *)Record->FileId)[i+5] & 0xff), - ch(((char *)Record->FileId)[i+6] & 0xff), - ch(((char *)Record->FileId)[i+7] & 0xff)); - } if (DeviceExt->CdInfo.JolietLevel == 0) { ULONG i; + for (i = 0; i < Record->FileIdLength && Record->FileId[i] != ';'; i++) - { Name[i] = (WCHAR)Record->FileId[i]; - } Name[i] = 0; } else @@ -437,7 +414,7 @@ CdfsAddFCBToTable(Vcb, rcFCB); *fileFCB = rcFCB; - DPRINT("%S %d %I64d %x %x\n", LongName, Size, rcFCB->RFCB.AllocationSize.QuadPart, rcFCB->IndexNumber.u.HighPart, rcFCB->IndexNumber.u.LowPart); + DPRINT("%S %d %I64d\n", LongName, Size, rcFCB->RFCB.AllocationSize.QuadPart); return(STATUS_SUCCESS); } @@ -522,7 +499,6 @@ DirSize = DirectoryFcb->Entry.DataLengthL; StreamOffset.QuadPart = (LONGLONG)DirectoryFcb->Entry.ExtentLocationL * (LONGLONG)BLOCKSIZE; - DPRINT("Directory is at block %x, Offset %I64x\n", DirectoryFcb->Entry.ExtentLocationL, StreamOffset.QuadPart); if (!CcMapData(DeviceExt->StreamFileObject, &StreamOffset, BLOCKSIZE, @@ -547,7 +523,6 @@ while(TRUE) { - DPRINT("Record %x\n", Record); if (Record->RecordLength == 0) { DPRINT("RecordLength == 0 Stopped!\n"); Modified: branches/arty-newcc/drivers/filesystems/cdfs/rw.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… ============================================================================== --- branches/arty-newcc/drivers/filesystems/cdfs/rw.c [iso-8859-1] (original) +++ branches/arty-newcc/drivers/filesystems/cdfs/rw.c [iso-8859-1] Tue Nov 17 04:28:54 2009 @@ -208,18 +208,6 @@ ReadOffset.u.LowPart, Irp->Flags, &ReturnedReadLength); - - DPRINT("Status %x Returned read length %x\n", Status, ReturnedReadLength); - - int *buffer; - int carry, crc = 0; - for (buffer = (int *)Buffer; buffer < ((int *)Buffer) + ReadLength / sizeof(int); buffer++) - { - carry = !!(*buffer < 0 && crc < 0); - crc += carry + *buffer; - } - DPRINT("Sector: %08x crc %08x length %x\n", ReadOffset.u.LowPart, crc, ReadLength); - if (NT_SUCCESS(Status)) { if (FileObject->Flags & FO_SYNCHRONOUS_IO) @@ -249,7 +237,6 @@ Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp,IO_NO_INCREMENT); return(STATUS_NOT_SUPPORTED); }

1 0

[arty] 44209: This fixes broken makefiles for me. Not sure what the deal was.
by arty＠svn.reactos.org 17 Nov '09

17 Nov '09

Author: arty Date: Tue Nov 17 04:20:07 2009 New Revision: 44209 URL: http://svn.reactos.org/svn/reactos?rev=44209&view=rev Log: This fixes broken makefiles for me. Not sure what the deal was. Modified: branches/arty-newcc/tools/rbuild/backend/mingw/mingw.cpp Modified: branches/arty-newcc/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/tools/rbuild/backend… ============================================================================== --- branches/arty-newcc/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original) +++ branches/arty-newcc/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Tue Nov 17 04:20:07 2009 @@ -1275,14 +1275,14 @@ "install_registry: %s\n", registryTargetFiles.c_str () ); fprintf ( fMakefile, - "%s: %s %s $(MKHIVE_TARGET)\n", + "%s: %s %s $(mkhive_TARGET)\n", registryTargetFiles.c_str (), registrySourceFiles.c_str (), GetFullPath ( system32 ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_MKHIVE)\n" ); fprintf ( fMakefile, - "\t$(MKHIVE_TARGET) boot%cbootdata %s $(ARCH) boot%cbootdata%chiveinst_$(ARCH).inf\n", + "\t$(mkhive_TARGET) boot%cbootdata %s $(ARCH) boot%cbootdata%chiveinst_$(ARCH).inf\n", cSep, GetFullPath ( system32 ).c_str (), cSep, cSep ); fprintf ( fMakefile,

1 0

[hyperion] 44208: modified Makefile $(ECHO_DLLTOOL) -> $(ECHO_IMPLIB) New status line ECHO_RSP for built-in response file generator rule $(NL) variable that expands to a newline -- only known way to escape the newline character in GNU make modified tools/rbuild/backend/mingw/linkers/ld.mak $(ECHO DLLTOOL) -> $(ECHO_DLLTOOL) -> $(ECHO_IMPLIB) Generate a response file with the list of object files, instead of passing every single object file on the linker command line. Our really long linker comma
by hyperion＠svn.reactos.org 17 Nov '09

17 Nov '09

Author: hyperion Date: Tue Nov 17 03:54:29 2009 New Revision: 44208 URL: http://svn.reactos.org/svn/reactos?rev=44208&view=rev Log: modified Makefile $(ECHO_DLLTOOL) -> $(ECHO_IMPLIB) New status line ECHO_RSP for built-in response file generator rule $(NL) variable that expands to a newline -- only known way to escape the newline character in GNU make modified tools/rbuild/backend/mingw/linkers/ld.mak $(ECHO DLLTOOL) -> $(ECHO_DLLTOOL) -> $(ECHO_IMPLIB) Generate a response file with the list of object files, instead of passing every single object file on the linker command line. Our really long linker command lines should no longer be an issue modified tools/rbuild/backend/mingw/modulehandler.cpp Clean files generated by externally-defined rules Build issues fix 1/2 (1/3?) Modified: trunk/reactos/Makefile trunk/reactos/tools/rbuild/backend/mingw/linkers/ld.mak trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=44208&r1=4420… ============================================================================== --- trunk/reactos/Makefile [iso-8859-1] (original) +++ trunk/reactos/Makefile [iso-8859-1] Tue Nov 17 03:54:29 2009 @@ -151,6 +151,11 @@ $(error ReactOS's makefiles use GNU Make 3.80+ features, you have $(MAKE_VERSION), you MUST UPGRADE in order to build ReactOS - Sorry) endif # END of code borrowed from GMSL ( http://gmsl.sourceforge.net/ ) + +define NL + + +endef .PHONY: all .PHONY: clean @@ -234,7 +239,7 @@ ECHO_CVTRES =@echo $(QUOTE)[CVTRES] $@$(QUOTE) ECHO_WIDL =@echo $(QUOTE)[WIDL] $@$(QUOTE) ECHO_BIN2RES =@echo $(QUOTE)[BIN2RES] $<$(QUOTE) - ECHO_DLLTOOL =@echo $(QUOTE)[DLLTOOL] $@$(QUOTE) + ECHO_IMPLIB =@echo $(QUOTE)[IMPLIB] $@$(QUOTE) ECHO_LD =@echo $(QUOTE)[LD] $@$(QUOTE) ECHO_HOSTLD =@echo $(QUOTE)[HOST-LD] $@$(QUOTE) ECHO_LINK =@echo $(QUOTE)[LINK] $@$(QUOTE) @@ -254,6 +259,7 @@ ECHO_STRIP =@echo $(QUOTE)[STRIP] $@$(QUOTE) ECHO_RGENSTAT=@echo $(QUOTE)[RGENSTAT] $@$(QUOTE) ECHO_DEPENDS =@echo $(QUOTE)[DEPENDS] $<$(QUOTE) + ECHO_RSP =@echo $(QUOTE)[RSP] $@$(QUOTE) else ECHO_CP = ECHO_MKDIR = @@ -273,7 +279,7 @@ ECHO_CVTRES = ECHO_WIDL = ECHO_BIN2RES = - ECHO_DLLTOOL = + ECHO_IMPLIB = ECHO_LD = ECHO_HOSTLD = ECHO_NM = @@ -291,6 +297,7 @@ ECHO_STRIP = ECHO_RGENSTAT= ECHO_DEPENDS = + ECHO_RSP = endif # Set host compiler/linker Modified: trunk/reactos/tools/rbuild/backend/mingw/linkers/ld.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/linkers/ld.mak [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/linkers/ld.mak [iso-8859-1] Tue Nov 17 03:54:29 2009 @@ -10,15 +10,15 @@ ifneq ($(6),) ${call RBUILD_intermediate_dir,$(5)}$$(SEP)lib${call RBUILD_name,$(5)}.a: $(6) | ${call RBUILD_intermediate_path,$(5)} - $$(ECHO DLLTOOL) + $$(ECHO_IMPLIB) $${dlltool} --def $(6) --kill-at --output-lib=$$@ ${call RBUILD_intermediate_dir,$(5)}$$(SEP)lib${call RBUILD_name,$(5)}.delayimp.a: $(6) | ${call RBUILD_intermediate_path,$(5)} - $$(ECHO DLLTOOL) + $$(ECHO_IMPLIB) $${dlltool} --def $(6) --kill-at --output-delaylib=$$@ ${call RBUILD_intermediate_path_noext,$(5)}.exp: $(6) | ${call RBUILD_intermediate_path,$(5)} - $$(ECHO DLLTOOL) + $$(ECHO_IMPLIB) $${dlltool} --def $(6) --kill-at --output-exp=$$@ $(1)_CLEANFILES+=\ @@ -27,9 +27,18 @@ ${call RBUILD_intermediate_path_noext,$(5)}.exp endif -$(5): $(2) $$(if $(6),${call RBUILD_intermediate_path_noext,$(5)}.exp) $(7) $(3) $$(RSYM_TARGET) $$(PEFIXUP_TARGET) | ${call RBUILD_dir,$(5)} +# TODO: refactor this out of here and into rules.mak +${call RBUILD_intermediate_dir,$(5)}$$(SEP)$(1)_objs.rsp: $(2) $$(if $(6),${call RBUILD_intermediate_path_noext,$(5)}.exp) $(3) | ${call RBUILD_intermediate_dir,$(5)} + $$(ECHO_RSP) + -@$${rm} $$@ 2>$$(NUL) + $${cp} $$(NUL) $$@ >$$(NUL) + $$(foreach obj,$(2) $$(if $(6),${call RBUILD_intermediate_path_noext,$(5)}.exp),$$(Q)echo $$(QUOTE)$$(subst \,\\,$$(obj))$$(QUOTE)>>$$@$$(NL)) + +$(1)_CLEANFILES+=${call RBUILD_intermediate_dir,$(5)}$$(SEP)$(1)_objs.rsp + +$(5): ${call RBUILD_intermediate_dir,$(5)}$$(SEP)$(1)_objs.rsp $(7) $(3) $$(RSYM_TARGET) $$(PEFIXUP_TARGET) | ${call RBUILD_dir,$(5)} $$(ECHO_LD) - $${ld} --entry=$(8) --image-base=$(9) $(2) $$(if $(6),${call RBUILD_intermediate_path_noext,$(5)}.exp) $(7) ${call RBUILD_ldflags,$(1),$(4)} -o $$@ + $${ld} --entry=$(8) --image-base=$(9) @${call RBUILD_intermediate_dir,$(5)}$$(SEP)$(1)_objs.rsp $(7) ${call RBUILD_ldflags,$(1),$(4)} -o $$@ ifneq ($(or $(6),$$(MODULETYPE$$($(1)_TYPE)_KMODE)),) $$(ECHO_PEFIXUP) $$(Q)$$(PEFIXUP_TARGET) $$@ $(if $(6),-exports) $$(if $$(MODULETYPE$($(1)_TYPE)_KMODE),-sections) Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Tue Nov 17 03:54:29 2009 @@ -516,6 +516,9 @@ } fprintf ( fMakefile, " 2>$(NUL)\n" ); + // Clean files generated by external rules + fprintf ( fMakefile, "\t-@${rm} $(%s_CLEANFILES) 2>$(NUL)\n", module.name.c_str() ); + if( ProxyMakefile::GenerateProxyMakefile(module) ) { DirectoryLocation root;

1 0

[tkreuzer] 44207: [MM] - Implement the rest of MmArmInitSystem phase 1 except MiBuildPagedPool
by tkreuzer＠svn.reactos.org 16 Nov '09

16 Nov '09

Author: tkreuzer Date: Mon Nov 16 23:12:36 2009 New Revision: 44207 URL: http://svn.reactos.org/svn/reactos?rev=44207&view=rev Log: [MM] - Implement the rest of MmArmInitSystem phase 1 except MiBuildPagedPool Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/init.c 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] Mon Nov 16 23:12:36 2009 @@ -74,6 +74,8 @@ PVOID MmSystemCacheEnd; MMSUPPORT MmSystemCacheWs; +ULONG MiNumberDescriptors = 0; +BOOLEAN MiIncludeType[LoaderMaximum]; /////////////////////////////////////////////// @@ -96,6 +98,14 @@ PMEMORY_ALLOCATION_DESCRIPTOR MdBlock; PLIST_ENTRY ListEntry; PFN_NUMBER LastPage; + ULONG i; + + /* Instantiate memory that we don't consider RAM/usable */ + for (i = 0; i < LoaderMaximum; i++) MiIncludeType[i] = TRUE; + MiIncludeType[LoaderBad] = FALSE; + MiIncludeType[LoaderFirmwarePermanent] = FALSE; + MiIncludeType[LoaderSpecialMemory] = FALSE; + MiIncludeType[LoaderBBTMemory] = FALSE; /* Loop the memory descriptors */ for (ListEntry = LoaderBlock->MemoryDescriptorListHead.Flink; @@ -107,12 +117,11 @@ MEMORY_ALLOCATION_DESCRIPTOR, ListEntry); + /* Count it */ + MiNumberDescriptors++; + /* 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)) + if (!MiIncludeType[MdBlock->MemoryType]) { continue; } @@ -353,12 +362,16 @@ ASSERT(MmSessionBase <= MiSessionPoolStart); } + VOID MiArmInitializePageTable() { ULONG64 PageFrameOffset; PMMPTE Pte, StartPte, EndPte; - MMPTE TmpPte; + MMPTE TmplPte; + + /* HACK: don't use freeldr debug print anymore */ + FrLdrDbgPrint = NoDbgPrint; /* Get current directory base */ PageFrameOffset = ((PMMPTE)PXE_SELFMAP)->u.Hard.PageFrameNumber << PAGE_SHIFT; @@ -367,44 +380,58 @@ /* Set directory base for the system process */ PsGetCurrentProcess()->Pcb.DirectoryTableBase[0] = PageFrameOffset; - /* HACK: don't use freeldr debug print anymore */ -// FrLdrDbgPrint = NoDbgPrint; - - /* Clear user mode mappings in PML4 */ + /* Enable global pages */ + __writecr4(__readcr4() | CR4_PGE); + ASSERT(__readcr4() & CR4_PGE); + + /* Set user mode address range */ StartPte = MiAddressToPxe(0); EndPte = MiAddressToPxe(MmHighestUserAddress); /* Loop the user mode PXEs */ for (Pte = StartPte; Pte <= EndPte; Pte++) { - /* Zero the PXE */ -// Pte->u.Long = 0; - } - - /* Setup a template PTE */ - TmpPte.u.Long = 0; - TmpPte.u.Flush.Valid = 1; - TmpPte.u.Flush.Write = 1; - - HyperTemplatePte = TmpPte; - - /* Create PDPTs (1MB total) for shared system address space */ - StartPte = MiAddressToPxe(MmSystemRangeStart); + /* Zero the PXE, clear all mappings */ + Pte->u.Long = 0; + } + + /* Set up a template PTE */ + TmplPte.u.Long = 0; + TmplPte.u.Flush.Valid = 1; + TmplPte.u.Flush.Write = 1; + HyperTemplatePte = TmplPte; + + /* Create PDPTs (72 KB) for shared system address space, + * skip page tables and hyperspace */ + + /* Set the range */ + StartPte = MiAddressToPxe((PVOID)(HYPER_SPACE_END + 1)); EndPte = MiAddressToPxe(MI_HIGHEST_SYSTEM_ADDRESS); - /* Loop the system space PXEs */ + /* Loop the PXEs */ for (Pte = StartPte; Pte <= EndPte; Pte++) { /* Is the PXE already valid? */ if (!Pte->u.Hard.Valid) { - /* It's not Initialize it, creating a PDPT. */ - TmpPte.u.Flush.PageFrameNumber = MxGetNextPage(1); - *Pte = TmpPte; + /* It's not Initialize it */ + TmplPte.u.Flush.PageFrameNumber = MxGetNextPage(1); + *Pte = TmplPte; /* Zero the page. The PXE is the PTE for the PDPT. */ RtlZeroMemory(MiPteToAddress(Pte), PAGE_SIZE); } + } + + /* Set the range of system PTEs */ + StartPte = MiAddressToPte(MI_SYSTEM_PTE_START); + EndPte = StartPte + MmNumberOfSystemPtes - 1; + + /* Loop the system PTEs */ + for (Pte = StartPte; Pte <= EndPte; Pte++) + { + /* Make sure the PTE is valid */ + MxGetPte(MiPteToAddress(Pte)); } /* Flush the TLB */ @@ -443,11 +470,7 @@ 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)) + if (!MiIncludeType[MdBlock->MemoryType]) { continue; } @@ -540,40 +563,32 @@ } -PPHYSICAL_MEMORY_DESCRIPTOR -NTAPI -MmInitializeMemoryLimits(IN PLOADER_PARAMETER_BLOCK LoaderBlock, - IN PBOOLEAN IncludeType) -{ - UNIMPLEMENTED; - return 0; -} VOID NTAPI MiBuildPhysicalMemoryBlock(IN PLOADER_PARAMETER_BLOCK LoaderBlock) { - BOOLEAN IncludeType[LoaderMaximum]; - PPHYSICAL_MEMORY_RUN Run; + PPHYSICAL_MEMORY_DESCRIPTOR Buffer, NewBuffer; + PMEMORY_ALLOCATION_DESCRIPTOR MdBlock; + PLIST_ENTRY ListEntry; + PFN_NUMBER NextPage = -1; PULONG Bitmap; + ULONG Runs = 0; ULONG Size, i; - - /* Instantiate memory that we don't consider RAM/usable */ - for (i = 0; i < LoaderMaximum; i++) IncludeType[i] = TRUE; - IncludeType[LoaderBad] = FALSE; - IncludeType[LoaderFirmwarePermanent] = FALSE; - IncludeType[LoaderSpecialMemory] = FALSE; - IncludeType[LoaderBBTMemory] = FALSE; - - /* Build the physical memory block */ - MmPhysicalMemoryBlock = MmInitializeMemoryLimits(LoaderBlock, IncludeType); /* Calculate size for the PFN bitmap */ Size = (MmHighestPhysicalPage + sizeof(ULONG)) / sizeof(ULONG); /* Allocate the PFN bitmap */ Bitmap = ExAllocatePoolWithTag(NonPagedPool, Size, ' mM'); - if (!Bitmap) + + /* Allocate enough memory for the physical memory block */ + Buffer = ExAllocatePoolWithTag(NonPagedPool, + sizeof(PHYSICAL_MEMORY_DESCRIPTOR) + + sizeof(PHYSICAL_MEMORY_RUN) * + (MiNumberDescriptors - 1), + 'lMmM'); + if (!Bitmap || !Buffer) { /* This is critical */ KeBugCheckEx(INSTALL_MORE_MEMORY, @@ -583,26 +598,52 @@ 0x101); } - /* Initialize it and clear all the bits to begin with */ + /* Initialize the bitmap and clear all bits */ RtlInitializeBitMap(&MiPfnBitMap, Bitmap, MmHighestPhysicalPage + 1); RtlClearAllBits(&MiPfnBitMap); - /* Loop physical memory runs */ - for (i = 0; i < MmPhysicalMemoryBlock->NumberOfRuns; i++) - { - /* Get the run */ - Run = &MmPhysicalMemoryBlock->Run[i]; - DPRINT("PHYSICAL RAM [0x%08p to 0x%08p]\n", - Run->BasePage << PAGE_SHIFT, - (Run->BasePage + Run->PageCount) << PAGE_SHIFT); - - /* Make sure it has pages inside it */ - if (Run->PageCount) - { - /* Set the bits in the PFN bitmap */ - RtlSetBits(&MiPfnBitMap, Run->BasePage, Run->PageCount); - } - } + /* 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 (!MiIncludeType[MdBlock->MemoryType]) + { + continue; + } + + /* Does the memory block begin where the last ended? */ + if (MdBlock->BasePage == NextPage) + { + /* Add it to the current run */ + Buffer->Run[Runs - 1].PageCount += MdBlock->PageCount; + } + else + { + /* Create a new run */ + Runs++; + Buffer->Run[Runs - 1].BasePage = MdBlock->BasePage; + Buffer->Run[Runs - 1].PageCount = MdBlock->PageCount; + } + + /* Set the bits in the PFN bitmap */ + RtlSetBits(&MiPfnBitMap, MdBlock->BasePage, MdBlock->PageCount); + + /* Set the next page */ + NextPage = MdBlock->BasePage + MdBlock->PageCount; + } + + // FIXME: allocate a buffer of better size + + Buffer->NumberOfRuns = Runs; + Buffer->NumberOfPages = MmNumberOfPhysicalPages; + MmPhysicalMemoryBlock = Buffer; } VOID @@ -629,14 +670,14 @@ /* Initialize the memory layout */ MiArmInitializeMemoryLayout(LoaderBlock); + /* Prepare PFN database mappings */ + MiArmPreparePfnDatabse(LoaderBlock); + + /* Prepare paged pool mappings */ + MiArmPrepareNonPagedPool(); + /* Initialize some mappings */ MiArmInitializePageTable(); - - /* Prepare PFN database mappings */ - MiArmPreparePfnDatabse(LoaderBlock); - - /* Prepare paged pool mappings */ - MiArmPrepareNonPagedPool(); /* Initialize the ARM3 nonpaged pool */ MiInitializeArmPool(); @@ -653,17 +694,12 @@ ULONG OldCount; PPHYSICAL_MEMORY_RUN Run; - __debugbreak(); - /* The PFN database was created, restore the free descriptor */ *MxFreeDescriptor = MxOldFreeDescriptor; - __debugbreak(); - /* Initialize the nonpaged pool */ InitializePool(NonPagedPool, 0); -#if 0 /* Create the system PTE space */ Pte = MiAddressToPte(MI_SYSTEM_PTE_START); MiInitializeSystemPtes(Pte, MmNumberOfSystemPtes, SystemPteSpace); @@ -675,7 +711,6 @@ /* Set the counter to maximum */ MiFirstReservedZeroingPte->u.Hard.PageFrameNumber = MI_ZERO_PTES - 1; -#endif /* Build the physical memory block */ MiBuildPhysicalMemoryBlock(LoaderBlock);

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