From aed29dde4ef416d484c249e41c9db03f80f032e2 Mon Sep 17 00:00:00 2001
From: Dmitry Gorbachev <gorbachev@reactos.org>
Date: Thu, 4 Jun 2009 13:54:27 +0000
Subject: [PATCH] Remove KeBugCheckWithTf() hack, fix VBEResetHw(). Stefan
 Ginsberg, bug #4581.

svn path=/trunk/; revision=41284
---
 reactos/drivers/video/miniport/vbe/vbemp.c | 52 +---------------------
 reactos/ntoskrnl/ke/bug.c                  |  2 -
 2 files changed, 2 insertions(+), 52 deletions(-)

diff --git a/reactos/drivers/video/miniport/vbe/vbemp.c b/reactos/drivers/video/miniport/vbe/vbemp.c
index 3b2831ddfd7..4f32b94ab3b 100644
--- a/reactos/drivers/video/miniport/vbe/vbemp.c
+++ b/reactos/drivers/video/miniport/vbe/vbemp.c
@@ -546,56 +546,8 @@ VBEResetHw(
    ULONG Columns,
    ULONG Rows)
 {
-   INT10_BIOS_ARGUMENTS BiosRegisters;
-   PVBE_DEVICE_EXTENSION VBEDeviceExtension =
-     (PVBE_DEVICE_EXTENSION)DeviceExtension;
-
-   if (!VBEResetDevice(DeviceExtension, NULL))
-      return FALSE;
-
-   /* Change number of columns/rows */
-   VideoPortZeroMemory(&BiosRegisters, sizeof(BiosRegisters));
-
-   if (Columns == 80 && Rows == 25)
-   {
-      /* Default text size, don't change anything. */
-      return TRUE;
-   }
-   else if (Columns == 80 && Rows == 28)
-   {
-      /* Use 9x14 font (80x28) */
-      BiosRegisters.Eax = 0x1111;
-   }
-   else if (Columns == 80 && Rows == 43)
-   {
-      /* Use 8x8 font in 350 scans mode (80x43) */
-      BiosRegisters.Eax = 0x1201;
-      BiosRegisters.Ebx = 0x30;
-      VBEDeviceExtension->Int10Interface.Int10CallBios(
-         VBEDeviceExtension->Int10Interface.Context,
-         &BiosRegisters);
-
-      BiosRegisters.Eax = 0x3;
-      BiosRegisters.Ebx = 0;
-      VBEDeviceExtension->Int10Interface.Int10CallBios(
-         VBEDeviceExtension->Int10Interface.Context,
-         &BiosRegisters);
-
-      BiosRegisters.Eax = 0x1112;
-   }
-   else if (Columns == 80 && Rows == 50)
-   {
-      /* Use 8x8 font (80x50) */
-      BiosRegisters.Eax = 0x1112;
-   }
-   else
-      return FALSE;
-
-   VBEDeviceExtension->Int10Interface.Int10CallBios(
-      VBEDeviceExtension->Int10Interface.Context,
-      &BiosRegisters);
-
-   return TRUE;
+   /* Return FALSE to let HAL reset the display with INT10 */
+   return FALSE;
 }
 
 /*
diff --git a/reactos/ntoskrnl/ke/bug.c b/reactos/ntoskrnl/ke/bug.c
index 98f25b00e6b..5fea14bd2b7 100644
--- a/reactos/ntoskrnl/ke/bug.c
+++ b/reactos/ntoskrnl/ke/bug.c
@@ -1138,13 +1138,11 @@ KeBugCheckWithTf(IN ULONG BugCheckCode,
 #endif
 
         /* Display the BSOD */
-        KeLowerIrql(APC_LEVEL); // This is a nastier hack than any ever before
         KiDisplayBlueScreen(MessageId,
                             IsHardError,
                             HardErrCaption,
                             HardErrMessage,
                             AnsiName);
-        KeRaiseIrql(HIGH_LEVEL, &OldIrql);
 
         /* Check if the debugger is disabled but we can enable it */
         if (!(KdDebuggerEnabled) && !(KdPitchDebugger))