mirror of
https://github.com/reactos/reactos.git
synced 2024-08-27 21:58:49 +00:00
- Fix IopApplyReactOSCdRomHack to handle LiveCD case properly. LiveCD should now boot*.
- Fix invalid inbv called during shutdown. - Don't call HalResetDisplay during VidReset since it's not yet implemented and this will crash the system. - Temporarily disable bootvid in LiveCD until it works, and enable debugging output so LiveCDs can output some debugging information in case of bugs. * LiveCD won't actually work because for some time now, ReactOS needs to be "installed" because of missing PnP entries. LiveCD Boot will cause a message box saying "EnableUserModePnPManager" failed. hpoussin? svn path=/trunk/; revision=25746
This commit is contained in:
parent
a840459c37
commit
0883e06a43
|
@ -25,4 +25,4 @@ ReactOS="ReactOS"
|
||||||
[ReactOS]
|
[ReactOS]
|
||||||
BootType=ReactOS
|
BootType=ReactOS
|
||||||
SystemPath=LiveCD
|
SystemPath=LiveCD
|
||||||
Options=
|
Options=/DEBUGPORT=COM1 /NOGUIBOOT
|
||||||
|
|
|
@ -463,7 +463,7 @@ VidResetDisplay(IN BOOLEAN HalReset)
|
||||||
curr_y = 0;
|
curr_y = 0;
|
||||||
|
|
||||||
/* Clear the screen with HAL if we were asked to */
|
/* Clear the screen with HAL if we were asked to */
|
||||||
if (HalReset) HalResetDisplay();
|
//if (HalReset) HalResetDisplay();
|
||||||
|
|
||||||
/* Re-initialize the VGA Display */
|
/* Re-initialize the VGA Display */
|
||||||
VgaInterpretCmdStream(AT_Initialization);
|
VgaInterpretCmdStream(AT_Initialization);
|
||||||
|
|
|
@ -15,9 +15,7 @@
|
||||||
// Global:
|
// Global:
|
||||||
// - TODO: Complete the list of bufxies
|
// - TODO: Complete the list of bufxies
|
||||||
// - Fix DPCs interrupting code at DISPATCH_LEVEL
|
// - Fix DPCs interrupting code at DISPATCH_LEVEL
|
||||||
// - Fix process reference count leak.
|
|
||||||
// - Fix atapi.sys or serial.sys loading one more time at each boot.
|
// - Fix atapi.sys or serial.sys loading one more time at each boot.
|
||||||
// - Fix LiveCD.
|
|
||||||
//
|
//
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
|
|
@ -150,7 +150,7 @@ ShutdownThreadMain(PVOID Context)
|
||||||
InbvSetTextColor(15);
|
InbvSetTextColor(15);
|
||||||
InbvInstallDisplayStringFilter(NULL);
|
InbvInstallDisplayStringFilter(NULL);
|
||||||
InbvEnableDisplayString(TRUE);
|
InbvEnableDisplayString(TRUE);
|
||||||
InbvSetScrollRegion(0, 0, 639, 479);
|
//InbvSetScrollRegion(0, 0, 639, 479);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Action == ShutdownNoReboot)
|
if (Action == ShutdownNoReboot)
|
||||||
|
|
|
@ -86,17 +86,20 @@ IopApplyRosCdromArcHack(IN ULONG i)
|
||||||
RtlFreeUnicodeString(&DeviceName);
|
RtlFreeUnicodeString(&DeviceName);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Build the name */
|
if (!(strstr(KeLoaderBlock->LoadOptions, "MININT")))
|
||||||
sprintf(p, "cdrom(%lu)", DeviceNumber);
|
|
||||||
|
|
||||||
/* Adjust original command line */
|
|
||||||
q = strchr(p, ')');
|
|
||||||
if (q)
|
|
||||||
{
|
{
|
||||||
q++;
|
/* Build the name */
|
||||||
strcpy(Buffer, q);
|
|
||||||
sprintf(p, "cdrom(%lu)", DeviceNumber);
|
sprintf(p, "cdrom(%lu)", DeviceNumber);
|
||||||
strcat(p, Buffer);
|
|
||||||
|
/* Adjust original command line */
|
||||||
|
q = strchr(p, ')');
|
||||||
|
if (q)
|
||||||
|
{
|
||||||
|
q++;
|
||||||
|
strcpy(Buffer, q);
|
||||||
|
sprintf(p, "cdrom(%lu)", DeviceNumber);
|
||||||
|
strcat(p, Buffer);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -480,7 +480,7 @@ MmInitSystem(IN ULONG Phase,
|
||||||
/*
|
/*
|
||||||
* Initialise the modified page writer.
|
* Initialise the modified page writer.
|
||||||
*/
|
*/
|
||||||
MmInitMpwThread();
|
if (!strstr(LoaderBlock->LoadOptions, "MININT")) MmInitMpwThread();
|
||||||
|
|
||||||
/* Initialize the balance set manager */
|
/* Initialize the balance set manager */
|
||||||
MmInitBsmThread();
|
MmInitBsmThread();
|
||||||
|
|
Loading…
Reference in a new issue