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

fix for GB2312

Browse Source
This commit is contained in:
Wengier
2021-11-10 00:42:18 -05:00
parent 80dfc9390f
commit 2a9fea3ee8
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/hardware/vga_draw.cpp
View File

@@ -3987,7 +3987,7 @@ static void VGA_VerticalTimer(Bitu /*val*/) {
} else if (dbw) {
(*draw).skipped = 1;
dbw=dex=false;
} else if (isDBCSCP() && dbcs_sbcs && col<ttf.cols-1 && isKanji1((*draw).chr) && (*(vidmem+2) & 0xFF) >= 0x40) {
} else if (isDBCSCP() && dbcs_sbcs && col<ttf.cols-1 && isKanji1((*draw).chr) && isKanji2(*(vidmem+2) & 0xFF)) {
bool boxdefault = (!autoboxdraw || col>=ttf.cols-3) && !bd[col];
if (!boxdefault && col<ttf.cols-3) {
if (CheckBoxDrawing((uint8_t)((*draw).chr), (uint8_t)*(vidmem+2), (uint8_t)*(vidmem+4), (uint8_t)*(vidmem+6)))
@@ -4059,7 +4059,7 @@ static void VGA_VerticalTimer(Bitu /*val*/) {
} else if (dbw) {
(*draw).skipped = 1;
dbw=dex=false;
} else if (isDBCSCP() && dbcs_sbcs && col<ttf.cols-1 && isKanji1((*draw).chr) && (*(vidmem+1) & 0xFF) >= 0x40) {
} else if (isDBCSCP() && dbcs_sbcs && col<ttf.cols-1 && isKanji1((*draw).chr) && isKanji2(*(vidmem+1) & 0xFF)) {
bool boxdefault = (!autoboxdraw || col>=ttf.cols-3) && !bd[col];
if (!boxdefault && col<ttf.cols-3) {
if (CheckBoxDrawing((uint8_t)((*draw).chr), (uint8_t)*(vidmem+1), (uint8_t)*(vidmem+2), (uint8_t)*(vidmem+3)))

2
src/ints/int_dosv.cpp
View File

@@ -138,7 +138,7 @@ bool isKanji2(uint8_t chr) {
#else
if (dos.loaded_codepage == 936 || dos.loaded_codepage == 949 || dos.loaded_codepage == 950 || (IS_DOSV && !IS_JDOSV))
#endif
return chr >= 0x40 && chr <= 0xfe;
return chr >= (dos.loaded_codepage == 936 && !gbk? 0xa1 : 0x40) && chr <= 0xfe;
else
return (chr >= 0x40 && chr <= 0x7e) || (del_flag && chr == 0x7f) || (chr >= 0x80 && chr <= 0xfc);
}