[ros-diffs] [ion] 25629: - Use WinXP style /SOS output when enabled. (TODO: Display banner/memory/cpu). - Make more init functions return TRUE/FALSE and bugcheck the system if they failed. - Add more progress bar update calls. - Merge MmInit2 and MmInit3 into MmInitSystem with different phase calls. - Clear KeLoaderBlock after drivers have been loaded. - Update kernel fun. - Update symbolic names of certain strings in ntoskrnl.mc. Use WINDOWS_NT... instead of REACTOS because these names are documented and should be kept for cross-code compatibility.
ion at svn.reactos.org
ion at svn.reactos.org
Thu Jan 25 18:51:46 CET 2007
Author: ion
Date: Thu Jan 25 20:51:45 2007
New Revision: 25629
URL: http://svn.reactos.org/svn/reactos?rev=25629&view=rev
Log:
- Use WinXP style /SOS output when enabled. (TODO: Display banner/memory/cpu).
- Make more init functions return TRUE/FALSE and bugcheck the system if they failed.
- Add more progress bar update calls.
- Merge MmInit2 and MmInit3 into MmInitSystem with different phase calls.
- Clear KeLoaderBlock after drivers have been loaded.
- Update kernel fun.
- Update symbolic names of certain strings in ntoskrnl.mc. Use WINDOWS_NT... instead of REACTOS because these names are documented and should be kept for cross-code compatibility.
Modified:
trunk/reactos/base/system/autochk/autochk.c
trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c
trunk/reactos/drivers/base/bootvid/vid_vgatext.c
trunk/reactos/ntoskrnl/KrnlFun.c
trunk/reactos/ntoskrnl/cc/cacheman.c
trunk/reactos/ntoskrnl/ex/init.c
trunk/reactos/ntoskrnl/fsrtl/fsrtlpc.c
trunk/reactos/ntoskrnl/include/internal/cc.h
trunk/reactos/ntoskrnl/include/internal/fsrtl.h
trunk/reactos/ntoskrnl/include/internal/lpc.h
trunk/reactos/ntoskrnl/include/internal/mm.h
trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h
trunk/reactos/ntoskrnl/io/iomgr/driver.c
trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c
trunk/reactos/ntoskrnl/lpc/port.c
trunk/reactos/ntoskrnl/mm/mminit.c
trunk/reactos/ntoskrnl/ntoskrnl.mc
trunk/reactos/subsystems/win32/csrss/csrss.c
Modified: trunk/reactos/base/system/autochk/autochk.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/autochk/autochk.c?rev=25629&r1=25628&r2=25629&view=diff
==============================================================================
--- trunk/reactos/base/system/autochk/autochk.c (original)
+++ trunk/reactos/base/system/autochk/autochk.c Thu Jan 25 20:51:45 2007
@@ -306,7 +306,7 @@
}
/* Call provider */
- PrintString(" Verifying volume %S\n", DrivePath);
+ //PrintString(" Verifying volume %S\n", DrivePath);
RtlInitUnicodeString(&DrivePathU, DrivePath);
Status = ChkdskFunc(&DrivePathU,
TRUE, // FixErrors
@@ -364,7 +364,7 @@
CheckVolume(DrivePath);
}
}
- PrintString(" Done\n\n");
+ //PrintString(" Done\n\n");
return 0;
}
Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c?rev=25629&r1=25628&r2=25629&view=diff
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c (original)
+++ trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c Thu Jan 25 20:51:45 2007
@@ -926,13 +926,13 @@
* Load boot drivers
*/
FrLdrLoadBootDrivers(szBootPath, 40);
- UiUnInitialize("Booting ReactOS...");
+ //UiUnInitialize("Booting ReactOS...");
/*
* Now boot the kernel
*/
DiskStopFloppyMotor();
- MachVideoPrepareForReactOS();
+ //MachVideoPrepareForReactOS();
FrLdrStartup(0x2badb002);
}
Modified: trunk/reactos/drivers/base/bootvid/vid_vgatext.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/vid_vgatext.c?rev=25629&r1=25628&r2=25629&view=diff
==============================================================================
--- trunk/reactos/drivers/base/bootvid/vid_vgatext.c (original)
+++ trunk/reactos/drivers/base/bootvid/vid_vgatext.c Thu Jan 25 20:51:45 2007
@@ -48,7 +48,7 @@
#define CRTC_CURLO 0x0f
#define CHAR_ATTRIBUTE_BLACK 0x00 /* black on black */
-#define CHAR_ATTRIBUTE 0x1F /* grey on blue */
+#define CHAR_ATTRIBUTE 0x07 /* grey on blue */
/* GLOBALS *******************************************************************/
@@ -65,7 +65,7 @@
ULONG i;
for (i = 0; i < SizeX * SizeY; i++, ptr++)
- *ptr = (0x1700 + ' ');
+ *ptr = (0x0000 + ' ');
}
static BOOLEAN NTAPI
Modified: trunk/reactos/ntoskrnl/KrnlFun.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/KrnlFun.c?rev=25629&r1=25628&r2=25629&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/KrnlFun.c (original)
+++ trunk/reactos/ntoskrnl/KrnlFun.c Thu Jan 25 20:51:45 2007
@@ -12,27 +12,26 @@
// - Use APC and DPC Interrupt Dispatchers.
// - CMOS Initialization and CMOS Spinlock.
//
-// Fstub:
-// - Implement IoAssignDriveLetters using mount manager support.
-//
-// Kd:
-// - Implement KD Kernel Debugging and WinDBG support.
+// Global:
+// - TODO: Complete the list of bufxies
+// - Fix process reference count leak.
+// - Fix atapi.sys loading one more time at each boot.
+// - Fix LiveCD.
//
///////////////////////////////////////////////////////////////////////////////
// REACTOS GUIDANCE PLAN
// ________________________________________________________________________________________________________
// / \
-// | OB, PS, LPC, DBGK, EX => "Code complete". No expected changes until 0.5.0 | |
+// | OB, PS, LPC, DBGK, EX, INIT => "Code complete". No expected changes until 0.5.0 | |
// | SE => Not looked at. Interaction with Ps/Io is minimal and currently hacked away. Preserve. |J|
-// | INIT => Boot sequence still needs work in terms of interaction with Ke and CPU features. |A|
-// | KD/KDBG => Laptop has special version of ROS without these components. Commit in branch. |N|
-// | HAL => Needs APC/DPC/IRQL implementation fixed ASAP in terms of interaction with Ke. | |
+// | KD/KDBG => Laptop has special version of ROS without these components. Commit in branch. |A|
+// | HAL => Needs APC/DPC/IRQL implementation fixed ASAP in terms of interaction with Ke. |N|
// | || || || || || || || || || || || || | |
// | \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ |F|
-// | KE => Enable new thread scheduler and ensure it works. |E|
-// | KD => Implement KD64 6.0, compatible with WinDBG |B|
-// | FSTUB => Needs IoAssignDriveLetters fixed ASAP but not critical to Ke/Ex. Interacts with Io. | |
+// | BUGFIXES BUGFIXES BUGFIXES BUGFIXES BUGFIXES BUGFIXES BUGFIXES BUGFIXES BUGFIXES BUGFIXES BUGFIXES |E|
+// | KE => Enable new thread scheduler and ensure it works. |B|
+// | KD => Implement KD64 6.0, compatible with WinDBG | |
// | || || || || || || || || || || || || |M|
// | \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ \/ |A|
// | CM => TOTAL REWRITE. |R|
Modified: trunk/reactos/ntoskrnl/cc/cacheman.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/cacheman.c?rev=25629&r1=25628&r2=25629&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/cc/cacheman.c (original)
+++ trunk/reactos/ntoskrnl/cc/cacheman.c Thu Jan 25 20:51:45 2007
@@ -16,11 +16,12 @@
/* FUNCTIONS *****************************************************************/
-VOID
+BOOLEAN
NTAPI
CcInitializeCacheManager(VOID)
{
- CcInitView();
+ CcInitView();
+ return TRUE;
}
/*
Modified: trunk/reactos/ntoskrnl/ex/init.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=25629&r1=25628&r2=25629&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/ex/init.c (original)
+++ trunk/reactos/ntoskrnl/ex/init.c Thu Jan 25 20:51:45 2007
@@ -312,42 +312,6 @@
/* Copy the table into the system process and set this as the base */
RtlCopyMemory(SectionBase, ExpNlsTableBase, ExpNlsTableSize);
ExpNlsTableBase = SectionBase;
-}
-
-VOID
-INIT_FUNCTION
-ExpDisplayNotice(VOID)
-{
- CHAR str[50];
-
- if (ExpInTextModeSetup)
- {
- HalDisplayString(
- "\n\n\n ReactOS " KERNEL_VERSION_STR " Setup \n");
- HalDisplayString(
- " \xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD");
- HalDisplayString(
- "\xCD\xCD\n");
- return;
- }
-
- HalDisplayString("Starting ReactOS "KERNEL_VERSION_STR" (Build "
- KERNEL_VERSION_BUILD_STR")\n");
- HalDisplayString(RES_STR_LEGAL_COPYRIGHT);
- HalDisplayString("\n\nReactOS is free software, covered by the GNU General "
- "Public License, and you\n");
- HalDisplayString("are welcome to change it and/or distribute copies of it "
- "under certain\n");
- HalDisplayString("conditions. There is absolutely no warranty for "
- "ReactOS.\n\n");
-
- /* Display number of Processors */
- sprintf(str,
- "Found %x system processor(s). [%lu MB Memory]\n",
- (int)KeNumberProcessors,
- (MmFreeLdrMemHigher + 1088)/ 1024);
- HalDisplayString(str);
-
}
NTSTATUS
@@ -1083,6 +1047,8 @@
InitWinPEModeType |= (strstr(CommandLine, "INRAM")) ? 0x80000000 : 1;
}
+ /* FIXME: Print product name, version, and build */
+
/* Initialize Power Subsystem in Phase 0 */
if (!PoInitSystem(0, AcpiTableDetected)) KeBugCheck(INTERNAL_POWER_ERROR);
@@ -1127,6 +1093,11 @@
/* Initialize all processors */
if (!HalAllProcessorsStarted()) KeBugCheck(HAL1_INITIALIZATION_FAILED);
+ /* FIXME: Print CPU and Memory */
+
+ /* Update the progress bar */
+ InbvUpdateProgressBar(5);
+
/* Call OB initialization again */
if (!ObInit()) KeBugCheck(OBJECT1_INITIALIZATION_FAILED);
@@ -1158,53 +1129,77 @@
}
/* Set up Region Maps, Sections and the Paging File */
- MmInit2();
+ if (!MmInitSystem(1, LoaderBlock)) KeBugCheck(MEMORY1_INITIALIZATION_FAILED);
/* Create NLS section */
ExpInitNls(KeLoaderBlock);
/* Initialize Cache Views */
- CcInitializeCacheManager();
+ if (!CcInitializeCacheManager()) KeBugCheck(CACHE_INITIALIZATION_FAILED);
/* Initialize the Registry */
if (!CmInitSystem1()) KeBugCheck(CONFIG_INITIALIZATION_FAILED);
+ /* Update progress bar */
+ InbvUpdateProgressBar(15);
+
/* Update timezone information */
ExRefreshTimeZoneInformation(&SystemBootTime);
/* Initialize the File System Runtime Library */
- FsRtlInitSystem();
+ if (!FsRtlInitSystem()) KeBugCheck(FILE_INITIALIZATION_FAILED);
/* Report all resources used by HAL */
HalReportResourceUsage();
+ /* Call the debugger DLL once we have KD64 6.0 support */
+ //KdDebuggerInitialize1(LoaderBlock);
+
+ /* Setup PnP Manager in phase 1 */
+ if (!PpInitSystem()) KeBugCheck(PP1_INITIALIZATION_FAILED);
+
+ /* Update progress bar */
+ InbvUpdateProgressBar(20);
+
/* Initialize LPC */
- LpcpInitSystem();
-
- /* Enter the kernel debugger before starting up the boot drivers */
- if (KdDebuggerEnabled && KdpEarlyBreak) DbgBreakPoint();
+ if (!LpcInitSystem()) KeBugCheck(LPC_INITIALIZATION_FAILED);
/* Initialize the I/O Subsystem */
if (!IoInitSystem(KeLoaderBlock)) KeBugCheck(IO1_INITIALIZATION_FAILED);
/* Unmap Low memory, and initialize the MPW and Balancer Thread */
- MmInit3();
-#if DBG
- extern ULONG Guard;
-#endif
- ASSERT(Guard == 0xCACA1234);
+ MmInitSystem(2, LoaderBlock);
+
+ /* Update progress bar */
+ InbvUpdateProgressBar(80);
/* Initialize VDM support */
KeI386VdmInitialize();
/* Initialize Power Subsystem in Phase 1*/
- PoInitSystem(1, AcpiTableDetected);
+ if (!PoInitSystem(1, AcpiTableDetected)) KeBugCheck(INTERNAL_POWER_ERROR);
/* Initialize the Process Manager at Phase 1 */
if (!PsInitSystem(LoaderBlock)) KeBugCheck(PROCESS1_INITIALIZATION_FAILED);
+ /* Update progress bar */
+ InbvUpdateProgressBar(85);
+
+ /* Make sure nobody touches the loader block again */
+ if (LoaderBlock == KeLoaderBlock) KeLoaderBlock = NULL;
+ LoaderBlock = Context = NULL;
+
+ /* Update progress bar */
+ InbvUpdateProgressBar(90);
+
/* Launch initial process */
Status = ExpLoadInitialProcess(ProcessInfo);
+
+ /* Update progress bar */
+ InbvUpdateProgressBar(100);
+
+ /* Allow strings to be displayed */
+ InbvEnableDisplayString(TRUE);
/* Wait 5 seconds for it to initialize */
Timeout.QuadPart = Int32x32To64(5, -10000000);
Modified: trunk/reactos/ntoskrnl/fsrtl/fsrtlpc.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/fsrtlpc.c?rev=25629&r1=25628&r2=25629&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/fsrtl/fsrtlpc.c (original)
+++ trunk/reactos/ntoskrnl/fsrtl/fsrtlpc.c Thu Jan 25 20:51:45 2007
@@ -153,7 +153,7 @@
/* PRIVATE FUNCTIONS *********************************************************/
-VOID
+BOOLEAN
NTAPI
FsRtlInitSystem(VOID)
{
@@ -179,6 +179,8 @@
{
ExInitializeResource(&FsRtlPagingIoResources[i]);
}
+
+ return TRUE;
}
/* PUBLIC FUNCTIONS **********************************************************/
Modified: trunk/reactos/ntoskrnl/include/internal/cc.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/cc.h?rev=25629&r1=25628&r2=25629&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/include/internal/cc.h (original)
+++ trunk/reactos/ntoskrnl/include/internal/cc.h Thu Jan 25 20:51:45 2007
@@ -110,7 +110,7 @@
NTAPI
WriteCacheSegment(PCACHE_SEGMENT CacheSeg);
-VOID
+BOOLEAN
NTAPI
CcInitializeCacheManager(VOID);
Modified: trunk/reactos/ntoskrnl/include/internal/fsrtl.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/fsrtl.h?rev=25629&r1=25628&r2=25629&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/include/internal/fsrtl.h (original)
+++ trunk/reactos/ntoskrnl/include/internal/fsrtl.h Thu Jan 25 20:51:45 2007
@@ -47,7 +47,7 @@
//
// Initialization Routines
//
-VOID
+BOOLEAN
NTAPI
FsRtlInitSystem(
VOID
Modified: trunk/reactos/ntoskrnl/include/internal/lpc.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/lpc.h?rev=25629&r1=25628&r2=25629&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/include/internal/lpc.h (original)
+++ trunk/reactos/ntoskrnl/include/internal/lpc.h Thu Jan 25 20:51:45 2007
@@ -117,9 +117,9 @@
//
// Initialization functions
//
-NTSTATUS
+BOOLEAN
NTAPI
-LpcpInitSystem(
+LpcInitSystem(
VOID
);
Modified: trunk/reactos/ntoskrnl/include/internal/mm.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/mm.h?rev=25629&r1=25628&r2=25629&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/include/internal/mm.h (original)
+++ trunk/reactos/ntoskrnl/include/internal/mm.h Thu Jan 25 20:51:45 2007
@@ -550,13 +550,10 @@
ULONG MaxMemInMeg
);
-VOID
-NTAPI
-MmInit2(VOID);
-
-VOID
-NTAPI
-MmInit3(VOID);
+BOOLEAN
+NTAPI
+MmInitSystem(IN ULONG Phase,
+ IN PLOADER_PARAMETER_BLOCK LoaderBlock);
VOID
NTAPI
Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h?rev=25629&r1=25628&r2=25629&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h (original)
+++ trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h Thu Jan 25 20:51:45 2007
@@ -66,7 +66,6 @@
/*
* Initalization functions (called once by main())
*/
-VOID MmInitSystem(ULONG Phase, PLOADER_PARAMETER_BLOCK LoaderBlock, ULONG LastKernelAddress);
BOOLEAN NTAPI ObInit(VOID);
BOOLEAN NTAPI CmInitSystem1(VOID);
VOID CmShutdownRegistry(VOID);
Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c?rev=25629&r1=25628&r2=25629&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/io/iomgr/driver.c (original)
+++ trunk/reactos/ntoskrnl/io/iomgr/driver.c Thu Jan 25 20:51:45 2007
@@ -280,14 +280,30 @@
BOOLEAN Unicode)
{
CHAR TextBuffer[256];
+ PCHAR Extra = ".sys";
+
if (ExpInTextModeSetup) return;
- if (Unicode)
- {
- sprintf(TextBuffer, "Loading %S...\n", (PWCHAR)ServiceName);
+ if (Unicode)
+ {
+ if (wcsstr(ServiceName, L".sys")) Extra = "";
+ sprintf(TextBuffer,
+ "%s%s%s\\%S%s\n",
+ KeLoaderBlock->ArcBootDeviceName,
+ KeLoaderBlock->NtBootPathName,
+ "System32\\Drivers",
+ (PWCHAR)ServiceName,
+ Extra);
}
else
{
- sprintf(TextBuffer, "Loading %s...\n", (PCHAR)ServiceName);
+ if (strstr(ServiceName, ".sys")) Extra = "";
+ sprintf(TextBuffer,
+ "%s%s%s\\%s%s\n",
+ KeLoaderBlock->ArcBootDeviceName,
+ KeLoaderBlock->NtBootPathName,
+ "System32\\Drivers",
+ (PCHAR)ServiceName,
+ Extra);
}
HalDisplayString(TextBuffer);
}
Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c?rev=25629&r1=25628&r2=25629&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c (original)
+++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Thu Jan 25 20:51:45 2007
@@ -3398,7 +3398,7 @@
case 1:
/* Do Phase 1 */
- return FALSE;
+ return TRUE;
//return PiInitPhase1();
default:
Modified: trunk/reactos/ntoskrnl/lpc/port.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/port.c?rev=25629&r1=25628&r2=25629&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/lpc/port.c (original)
+++ trunk/reactos/ntoskrnl/lpc/port.c Thu Jan 25 20:51:45 2007
@@ -31,10 +31,9 @@
/* PRIVATE FUNCTIONS *********************************************************/
-NTSTATUS
-INIT_FUNCTION
+BOOLEAN
NTAPI
-LpcpInitSystem(VOID)
+LpcInitSystem(VOID)
{
OBJECT_TYPE_INITIALIZER ObjectTypeInitializer;
UNICODE_STRING Name;
@@ -70,7 +69,7 @@
32);
/* We're done */
- return STATUS_SUCCESS;
+ return TRUE;
}
/* PUBLIC FUNCTIONS **********************************************************/
Modified: trunk/reactos/ntoskrnl/mm/mminit.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=25629&r1=25628&r2=25629&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/mm/mminit.c (original)
+++ trunk/reactos/ntoskrnl/mm/mminit.c Thu Jan 25 20:51:45 2007
@@ -453,44 +453,39 @@
BOOLEAN RmapReady, PageOpReady, SectionsReady, PagingReady;
-VOID
+BOOLEAN
NTAPI
-INIT_FUNCTION
-MmInit2(VOID)
-{
- MmInitializeRmapList();
- RmapReady = TRUE;
- MmInitializePageOp();
- PageOpReady = TRUE;
- MmInitSectionImplementation();
- SectionsReady = TRUE;
- MmInitPagingFile();
- PagingReady = TRUE;
-}
-
-VOID
-INIT_FUNCTION
-NTAPI
-MmInit3(VOID)
-{
- /*
- * Unmap low memory
- */
-#ifdef CONFIG_SMP
- /* In SMP mode we can unmap the low memory
- if all processors are started. */
- MmDeletePageTable(NULL, 0);
-#endif
-
- MmCreatePhysicalMemorySection();
- MiInitBalancerThread();
-
- /*
- * Initialise the modified page writer.
- */
- MmInitMpwThread();
-
- /* FIXME: Read parameters from memory */
+MmInitSystem(IN ULONG Phase,
+ IN PLOADER_PARAMETER_BLOCK LoaderBlock)
+{
+ if (Phase == 1)
+ {
+ MmInitializeRmapList();
+ RmapReady = TRUE;
+ MmInitializePageOp();
+ PageOpReady = TRUE;
+ MmInitSectionImplementation();
+ SectionsReady = TRUE;
+ MmInitPagingFile();
+ PagingReady = TRUE;
+ }
+ else if (Phase == 2)
+ {
+ /*
+ * Unmap low memory
+ */
+ MmCreatePhysicalMemorySection();
+ MiInitBalancerThread();
+
+ /*
+ * Initialise the modified page writer.
+ */
+ MmInitMpwThread();
+
+ /* FIXME: Read parameters from memory */
+ }
+
+ return TRUE;
}
VOID static
Modified: trunk/reactos/ntoskrnl/ntoskrnl.mc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.mc?rev=25629&r1=25628&r2=25629&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/ntoskrnl.mc (original)
+++ trunk/reactos/ntoskrnl/ntoskrnl.mc Thu Jan 25 20:51:45 2007
@@ -1089,6 +1089,14 @@
PP0_INITIALIZATION_FAILED
.
+MessageId=0x90
+Severity=Success
+Facility=System
+SymbolicName=PP1_INITIALIZATION_FAILED
+Language=English
+PP1_INITIALIZATION_FAILED
+.
+
MessageId=0x94
Severity=Success
Facility=System
@@ -1300,42 +1308,42 @@
IMPERSONATING_WORKER_THREAD
.
-MessageId=0x9A
+MessageId=0x7E
Severity=Informational
Facility=System
-SymbolicName=REACTOS_BANNER
-Language=English
-ReactOS Version %s (Build %s)
-.
-
-MessageId=0x9B
+SymbolicName=WINDOWS_NT_BANNER
+Language=English
+ReactOS (R) Version %hs (Build %u%hs)
+.
+
+MessageId=0x87
Severity=Informational
Facility=System
-SymbolicName=REACTOS_SERVICE_PACK
+SymbolicName=WINDOWS_NT_CSD_STRING
Language=English
Service Pack
.
-MessageId=0x9C
+MessageId=0x88
Severity=Informational
Facility=System
-SymbolicName=REACTOS_INFO_STRING_UNI_PROCESSOR
+SymbolicName=WINDOWS_NT_INFO_STRING
Language=English
%u System Processor [%u MB Memory] %Z
+.
+
+MessageId=0x89
+Severity=Informational
+Facility=System
+SymbolicName=WINDOWS_NT_MP_STRING
+Language=English
+MulitProcessor Kernel
.
MessageId=0x9D
Severity=Informational
Facility=System
-SymbolicName=REACTOS_MP_KERNEL
-Language=English
-MulitProcessor Kernel
-.
-
-MessageId=0x9E
-Severity=Informational
-Facility=System
-SymbolicName=REACTOS_INFO_STRING_MULTI_PROCESSOR
+SymbolicName=WINDOWS_NT_INFO_STRING_PLURAL
Language=English
%u System Processors [%u MB Memory] %Z
.
Modified: trunk/reactos/subsystems/win32/csrss/csrss.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csrss.c?rev=25629&r1=25628&r2=25629&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/csrss/csrss.c (original)
+++ trunk/reactos/subsystems/win32/csrss/csrss.c Thu Jan 25 20:51:45 2007
@@ -36,8 +36,8 @@
{
NTSTATUS Status = STATUS_SUCCESS;
- PrintString("ReactOS Client/Server Run-Time (Build %s)\n",
- KERNEL_VERSION_BUILD_STR);
+ //PrintString("ReactOS Client/Server Run-Time (Build %s)\n",
+ //KERNEL_VERSION_BUILD_STR);
/*==================================================================
* Initialize the Win32 environment subsystem server.
More information about the Ros-diffs
mailing list