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 possible crash with getsysfont=true (mentioned by @hlizard)

Browse Source
This commit is contained in:
Wengier
2021-11-21 00:21:29 -05:00
parent 43feede7b5
commit 38d3e89de8
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG
View File

@@ -102,6 +102,8 @@
after changing a CD image from the menu. (Wengier)
- Fixed copying full-screen or multi-line text from a
DBCS codepage in TTF output or PC98 mode. (Wengier)
- Fixed possible crash at start with getsysfont=true
on Traditional Chinese Windows systems. (Wengier)
- Fixed TTF color issue with some DOS GUI programs by
initializing the color scheme when with default
COLORS= setting in EGA or VGA mode. (Wengier)

24
src/ints/int_dosv.cpp
View File

@@ -547,7 +547,7 @@ bool GetWindowsFont(Bitu code, uint8_t *buff, int width, int height)
GetTextMetrics(hdc, &tm);
GLYPHMETRICS gm;
CONST MAT2 mat = { {0,1},{0,0},{0,0},{0,1} };
DWORD size = GetGlyphOutline(hdc, code, GGO_BITMAP, &gm, 0, NULL, &mat);
long size = GetGlyphOutline(hdc, code, GGO_BITMAP, &gm, 0, NULL, &mat);
if(size > 0) {
char *fontbuff = new char[size];
memset(fontbuff, 0, size);
@@ -587,10 +587,13 @@ bool GetWindowsFont(Bitu code, uint8_t *buff, int width, int height)
}
}
delete [] fontbuff;
SelectObject(hdc, old_font);
ReleaseDC(NULL, hdc);
} else {
SelectObject(hdc, old_font);
ReleaseDC(NULL, hdc);
return false;
}
SelectObject(hdc, old_font);
ReleaseDC(NULL, hdc);
return true;
}
#endif
@@ -1000,6 +1003,7 @@ void JFONT_Init() {
#if defined(LINUX) && C_X11
setlocale(LC_CTYPE,"");
#endif
bool reinit = jfont_init;
jfont_init = true;
if (fontdata14) {
free(fontdata14);
@@ -1029,7 +1033,7 @@ void JFONT_Init() {
#endif
Prop_path* pathprop = section->Get_path("fontxsbcs");
if (pathprop) {
if (pathprop && !reinit) {
std::string path=pathprop->realpath;
ResolvePath(path);
if(!LoadFontxFile(path.c_str(), 19, false)) {
@@ -1044,7 +1048,7 @@ void JFONT_Init() {
if(!CheckEmptyData(&jfont_sbcs_19[0x7f * 19], 19))
memcpy(&jfont_sbcs_19[0x5c * 19], &jfont_sbcs_19[0x7f * 19], 19);
}
} else {
} else if (!reinit) {
if(!MakeSbcs19Font())
LOG_MSG("MSG: SBCS 8x19 font file path is not specified.\n");
}
@@ -1065,7 +1069,7 @@ void JFONT_Init() {
autoboxdraw = true;
#endif
pathprop = section->Get_path("fontxsbcs16");
if(pathprop) {
if(pathprop && !reinit) {
std::string path=pathprop->realpath;
ResolvePath(path);
if(!LoadFontxFile(path.c_str(), 16, false)) {
@@ -1079,7 +1083,7 @@ void JFONT_Init() {
if(!CheckEmptyData(&jfont_sbcs_16[0x7f * 16], 16))
memcpy(&jfont_sbcs_16[0x5c * 16], &jfont_sbcs_16[0x7f * 16], 16);
}
} else {
} else if (!reinit) {
if(!MakeSbcs16Font()) {
LOG_MSG("MSG: SBCS 8x16 font file path is not specified.\n");
}
@@ -1091,7 +1095,7 @@ void JFONT_Init() {
LoadFontxFile(path.c_str(), 24, true);
}
pathprop = section->Get_path("fontxsbcs24");
if(pathprop) {
if(pathprop && !reinit) {
std::string path=pathprop->realpath;
ResolvePath(path);
if(!LoadFontxFile(path.c_str(), 24, false)) {
@@ -1102,7 +1106,7 @@ void JFONT_Init() {
if(!CheckEmptyData(&jfont_sbcs_24[0x7f * 2 * 24], 2 * 24))
memcpy(&jfont_sbcs_24[0x5c * 2 * 24], &jfont_sbcs_24[0x7f * 2 * 24], 2 * 24);
}
} else {
} else if (!reinit) {
if(!MakeSbcs24Font()) {
LOG_MSG("MSG: SBCS 12x24 font file path is not specified.\n");
}