From fd8e3415c85f46ed105d0059fcdf23e072c83f0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Fri, 17 Oct 2014 22:27:34 +0000 Subject: [PATCH] [NTVDM]: simplify code and add a reference link concerning the CrtColorPaletteMask mask. svn path=/trunk/; revision=64794 --- reactos/subsystems/ntvdm/bios/vidbios.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/reactos/subsystems/ntvdm/bios/vidbios.c b/reactos/subsystems/ntvdm/bios/vidbios.c index 2ef6aa2b7f0..3948121b74c 100644 --- a/reactos/subsystems/ntvdm/bios/vidbios.c +++ b/reactos/subsystems/ntvdm/bios/vidbios.c @@ -2652,9 +2652,9 @@ VOID WINAPI VidBiosVideoService(LPWORD Stack) { #ifdef DOSBOX BYTE Index = getBL(); - BYTE CrtColorPaletteMask = Bda->CrtColorPaletteMask; - CrtColorPaletteMask = (CrtColorPaletteMask & 0xE0) | (Index & 0x1F); - Bda->CrtColorPaletteMask = CrtColorPaletteMask; + + /* See: http://www.bioscentral.com/misc/bda.htm */ + Bda->CrtColorPaletteMask = (Bda->CrtColorPaletteMask & 0xE0) | (Index & 0x1F); Index = ((Index << 1) & 0x10) | (Index & 0x7); @@ -2666,7 +2666,7 @@ VOID WINAPI VidBiosVideoService(LPWORD Stack) VgaSetSinglePaletteRegister(0x00, Index); - Index = (CrtColorPaletteMask & 0x10) | 0x02 | ((CrtColorPaletteMask & 0x20) >> 5); + Index = (Bda->CrtColorPaletteMask & 0x10) | 0x02 | ((Bda->CrtColorPaletteMask & 0x20) >> 5); VgaSetSinglePaletteRegister(0x01, Index); Index += 2; @@ -2687,14 +2687,15 @@ VOID WINAPI VidBiosVideoService(LPWORD Stack) case 0x01: /* Set Palette */ { BYTE Index = getBL(); - BYTE CrtColorPaletteMask = Bda->CrtColorPaletteMask; - CrtColorPaletteMask = (CrtColorPaletteMask & 0xDF) | ((Index & 1) ? 0x20 : 0x0); - Bda->CrtColorPaletteMask = CrtColorPaletteMask; + + /* See: http://www.bioscentral.com/misc/bda.htm */ + /* Reset bit 5: foreground colors index (0: green/red/yellow; 1: cyan/magenta/white) */ + Bda->CrtColorPaletteMask = (Bda->CrtColorPaletteMask & 0xDF) | ((Index & 1) ? 0x20 : 0x00); /* Don't set any extra colors when in text mode */ if (Bda->VideoMode <= 3) break; - Index = (CrtColorPaletteMask & 0x10) | 0x02 | Index; + Index = (Bda->CrtColorPaletteMask & 0x10) | 0x02 | Index; VgaSetSinglePaletteRegister(0x01, Index); Index += 2;