diff --git a/reactos/subsystems/ntvdm/bios/bios32/bios32.c b/reactos/subsystems/ntvdm/bios/bios32/bios32.c index 4a14b6e2499..ba07df81faa 100644 --- a/reactos/subsystems/ntvdm/bios/bios32/bios32.c +++ b/reactos/subsystems/ntvdm/bios/bios32/bios32.c @@ -589,6 +589,10 @@ Bios32Post(VOID) InitializeBiosData(); InitializeBiosInfo(); + /* + * Initialize IVT and hardware + */ + /* Register the BIOS 32-bit Interrupts */ InitializeBiosInt32(); @@ -605,6 +609,16 @@ Bios32Post(VOID) return; } +#if 0 + /* Initialize the Keyboard and Video BIOS */ + if (!KbdBiosInitialize() || !VidBiosInitialize()) + { + /* Stop the VDM */ + EmulatorTerminate(); + return; + } +#endif + ///////////// MUST BE DONE AFTER IVT INITIALIZATION !! ///////////////////// /* Load some ROMs */ @@ -632,16 +646,6 @@ static VOID WINAPI Bios32ResetBop(LPWORD Stack) // - if the word is 1234h, perform a warm reboot (aka. Ctrl-Alt-Del); // - if the word is 0000h, perform a cold reboot (aka. Reset). - /* Initialize IVT and hardware */ - - /* Initialize the Keyboard and Video BIOS */ - if (!KbdBiosInitialize() || !VidBiosInitialize()) - { - /* Stop the VDM */ - EmulatorTerminate(); - return; - } - /* Do the POST */ Bios32Post(); diff --git a/reactos/subsystems/ntvdm/dos/dem.c b/reactos/subsystems/ntvdm/dos/dem.c index 0389ac1863b..84443dec46b 100644 --- a/reactos/subsystems/ntvdm/dos/dem.c +++ b/reactos/subsystems/ntvdm/dos/dem.c @@ -476,8 +476,6 @@ Quit: EmulatorTerminate(); } - - /* PUBLIC EXPORTED APIS *******************************************************/ // demLFNCleanup