Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-30 02:58:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NTVDM]: Do not rely on 0xCCCC for cold reboot checks. Fix some sentences.

Browse source 
svn path=/trunk/; revision=68003
This commit is contained in:
Hermès Bélusca-Maïto 2015-06-04 00:13:43 +00:00
parent 3461ea9719
commit e1aecc4b70
1 changed files with 14 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c
View file

@ -125,10 +125,8 @@ static BYTE Bootstrap[] =
}; };
/* /*
* Normally at F000:E05B there is the POST that finally calls the bootstrap * POST code at F000:E05B. All the POST is done in 32 bit
* interrupt. It should also check the value of Bda->SoftReset. Since we do * and only at the end it calls the bootstrap interrupt.
* all the POST in 32 bit from the start, we just place there the bootstrap
* interrupt call.
*/ */
static BYTE PostCode[] = static BYTE PostCode[] =
{ {
@ -828,7 +826,7 @@ Bios32Post(LPWORD Stack)
/* Shutdown after Block Move Test (unsupported) */ /* Shutdown after Block Move Test (unsupported) */
case 0x09: case 0x09:
{ {
DisplayMessage(L"Unsupported CMOS Shutdown Status value 0x%02X. The VDM is stopping...", ShutdownStatus); DisplayMessage(L"Unsupported CMOS Shutdown Status value 0x%02X. The VDM will shut down.", ShutdownStatus);
EmulatorTerminate(); EmulatorTerminate();
return; return;
} }
@ -883,19 +881,18 @@ Bios32Post(LPWORD Stack)
* - if the word is 1234h, perform a warm reboot (aka. Ctrl-Alt-Del). Some stuff is skipped. * - if the word is 1234h, perform a warm reboot (aka. Ctrl-Alt-Del). Some stuff is skipped.
*/ */
// FIXME: This is a debug temporary check: switch (Bda->SoftReset)
// Since NTVDM memory is by default initialized with 0xCC, it is also
// the case for the BDA. So at first boot we get SoftReset == 0xCCCC.
// After we zero out the BDA and put valid values in it.
// If for some reason an app calls the BIOS initialization code,
// SoftReset is normally zero (unless the app puts a non-null value in SoftReset)
// and we can detect that. With the current state of NTVDM, apps calling
// by hand the BIOS init code is a sign of a bug, e.g. see MSD.EXE version 2+.
if (Bda->SoftReset != 0xCCCC)
{ {
DisplayMessage(L"NTVDM is performing a COLD reboot! The program you are currently testing seems to not behave correctly! The VDM is stopping..."); case 0x0000:
EmulatorTerminate(); DisplayMessage(L"NTVDM is performing a COLD reboot! The program you are currently testing does not seem to behave correctly! The VDM will shut down...");
return; // Fall through
case 0x1234:
DisplayMessage(L"NTVDM is performing a WARM reboot! This is not supported at the moment. The VDM will shut down...");
EmulatorTerminate();
return;
default:
break;
} }
/* Initialize the BDA and the BIOS ROM Information */ /* Initialize the BDA and the BIOS ROM Information */