[aandrejevic] 59678: [NTVDM] - Enable TESTING by default until the correct way to load ntvdm is found. - Calculate the character height instead of hardcoding in the BDA.

Author: aandrejevic
Date: Fri Aug  9 13:14:56 2013
New Revision: 59678

URL: http://svn.reactos.org/svn/reactos?rev=59678&view=rev
Log:
[NTVDM]
- Enable TESTING by default until the correct way to load ntvdm is found.
- Calculate the character height instead of hardcoding in the BDA.

Modified:
    branches/ntvdm/subsystems/ntvdm/bios.c
    branches/ntvdm/subsystems/ntvdm/ntvdm.c

Modified: branches/ntvdm/subsystems/ntvdm/bios.c
URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.c?re...
==============================================================================
--- branches/ntvdm/subsystems/ntvdm/bios.c	[iso-8859-1] (original)
+++ branches/ntvdm/subsystems/ntvdm/bios.c	[iso-8859-1] Fri Aug  9 13:14:56 2013
@@ -306,7 +306,10 @@
     Bda->VideoPage = 0;
     Bda->VideoPageSize   = BIOS_PAGE_SIZE;
     Bda->VideoPageOffset = 0;
-    Bda->CharacterHeight = 16;
+
+    /* Get the character height */
+    VgaWritePort(VGA_CRTC_INDEX, VGA_CRTC_MAX_SCAN_LINE_REG);
+    Bda->CharacterHeight = 1 + (VgaReadPort(VGA_CRTC_DATA) & 0x1F);

Resolution = VgaGetDisplayResolution();
     Bda->ScreenColumns = Resolution.X;

Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.c
URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.c?r...
==============================================================================
--- branches/ntvdm/subsystems/ntvdm/ntvdm.c	[iso-8859-1] (original)
+++ branches/ntvdm/subsystems/ntvdm/ntvdm.c	[iso-8859-1] Fri Aug  9 13:14:56 2013
@@ -23,7 +23,7 @@
  * Activate this line if you want to be able to test NTVDM with:
  * ntvdm.exe <program>
  */
-// #define TESTING
+#define TESTING

/* PUBLIC VARIABLES ***********************************************************/