joncampbell123/dosbox-x
1
0
Fork 0
mirror of https://github.com/joncampbell123/dosbox-x.git synced 2025-10-14 02:17:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

For ega200 or less than 128KB EGA, just use the CGA 640x200 2-color mode for splash screen

Browse Source
This commit is contained in:
Jonathan Campbell
2024-06-13 23:36:40 -07:00
parent 7e25d5a480
commit a4bbd19578
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG
View File

@@ -1,4 +1,7 @@
Next:
- Fix BIOS screen to use CGA 640x200 2-color mode if machine=ega with
less than 128KB of video ram, or machine=ega200, instead of showing
a garbled 640x350 display. (joncampbell123).
- Fix memory buffer overrun with machine=ega that can occur with
640x350 mode and less than 256KB of video RAM. (joncampbell123).
- The DOSBox clipboard API (via INT 2Fh) is now disabled by default, because

9
src/ints/bios.cpp
View File

@@ -75,6 +75,8 @@ extern bool PS1AudioCard;
# define S_ISREG(x) ((x & S_IFREG) == S_IFREG)
#endif
extern bool ega200;
unsigned char ACPI_ENABLE_CMD = 0xA1;
unsigned char ACPI_DISABLE_CMD = 0xA0;
unsigned int ACPI_IO_BASE = 0x820;
@@ -10775,9 +10777,10 @@ startfunction:
CALLBACK_RunRealInt(0x10);
DrawDOSBoxLogoVGA((unsigned int)logo_x*8u,(unsigned int)logo_y*(unsigned int)rowheight);
}
else if (machine == MCH_EGA && !textsplash) {
else if (machine == MCH_EGA && !textsplash && !ega200 && vga.mem.memsize >= (128*1024)) { /* not ega200 and at least 128KB of VRAM */
rowheight = 14;
reg_eax = 16; // 640x350 16-color
reg_eax = 16; // 640x350 16-color
CALLBACK_RunRealInt(0x10);
// color correction: change Dark Puke Yellow to brown
@@ -10789,7 +10792,7 @@ startfunction:
DrawDOSBoxLogoVGA((unsigned int)logo_x*8u,(unsigned int)logo_y*(unsigned int)rowheight);
}
else if ((machine == MCH_CGA || machine == MCH_MCGA || machine == MCH_PCJR || machine == MCH_AMSTRAD || machine == MCH_TANDY) && !textsplash) {
else if ((machine == MCH_CGA || machine == MCH_EGA || machine == MCH_MCGA || machine == MCH_PCJR || machine == MCH_AMSTRAD || machine == MCH_TANDY) && !textsplash) {
rowheight = 8;
reg_eax = 6; // 640x200 2-color
CALLBACK_RunRealInt(0x10);