[ros-diffs] [dgorbachev] 41284: Remove KeBugCheckWithTf() hack, fix VBEResetHw(). Stefan Ginsberg, bug #4581.

[dgorbachev at svn.reactos.org]

Author: dgorbachev
Date: Thu Jun  4 17:54:27 2009
New Revision: 41284

URL: http://svn.reactos.org/svn/reactos?rev=41284&view=rev
Log:
Remove KeBugCheckWithTf() hack, fix VBEResetHw(). Stefan Ginsberg, bug #4581.

Modified:
    trunk/reactos/drivers/video/miniport/vbe/vbemp.c
    trunk/reactos/ntoskrnl/ke/bug.c

Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/miniport/vbe/vbemp.c?rev=41284&r1=41283&r2=41284&view=diff
==============================================================================
--- trunk/reactos/drivers/video/miniport/vbe/vbemp.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/video/miniport/vbe/vbemp.c [iso-8859-1] Thu Jun  4 17:54:27 2009
@@ -546,56 +546,8 @@
    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;
 }
 
 /*

Modified: trunk/reactos/ntoskrnl/ke/bug.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/bug.c?rev=41284&r1=41283&r2=41284&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] Thu Jun  4 17:54:27 2009
@@ -1138,13 +1138,11 @@
 #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))