fix font

.github/workflows/hxdos.yml

@@ -53,7 +53,7 @@ jobs:
           cp $top/dosbox-x.reference.full.conf $top/package/dosbox-x.ref.full
           cp $top/contrib/windows/installer/inpout32.dll $top/package/INPOUT32.DLL
           cp $top/contrib/fonts/FREECG98.BMP $top/package/
-          cp $top/contrib/fonts/wqy_12pt.bdf $top/package/
+          cp $top/contrib/fonts/wqy_1?pt.bdf $top/package/
           cp $top/contrib/fonts/Nouveau_IBM.ttf $top/package/
           cp $top/build-scripts/mingw/hxdos/DPMILD32.EXE $top/package/
           cp $top/build-scripts/mingw/hxdos/HDPMI32.EXE $top/package/

.github/workflows/linux.yml

@@ -48,6 +48,22 @@ jobs:
           top=`pwd`
           $top/src/bin/dosbox-x-sdl1 -tests
           $top/src/bin/dosbox-x-sdl2 -tests
+      - name: Package build
+        run: |
+          top=`pwd`
+          mkdir -p $top/src/bin/drivez
+          mkdir -p $top/src/bin/glshaders
+          mkdir -p $top/src/bin/languages
+          cp $top/CHANGELOG $top/src/bin/CHANGELOG.txt
+          cp $top/dosbox-x.reference.conf $top/src/bin/dosbox-x.reference.conf
+          cp $top/dosbox-x.reference.full.conf $top/src/bin/dosbox-x.reference.full.conf
+          cp $top/contrib/fonts/FREECG98.BMP $top/src/bin/FREECG98.BMP
+          cp $top/contrib/fonts/wqy_1?pt.bdf $top/src/bin/
+          cp $top/contrib/fonts/Nouveau_IBM.ttf $top/src/bin/Nouveau_IBM.ttf
+          cp $top/contrib/fonts/SarasaGothicFixed.ttf $top/src/bin/SarasaGothicFixed.ttf
+          cp $top/contrib/windows/installer/drivez_readme.txt $top/src/bin/drivez/readme.txt
+          cp $top/contrib/glshaders/* $top/src/bin/glshaders/
+          for i in `ls $top/contrib/translations/` ; do cp $top/contrib/translations/$i/*.lng $top/src/bin/languages/; done
       - name: Upload release package
         uses: actions/upload-artifact@v3.1.0
         with:

.github/workflows/macos.yml

@@ -41,6 +41,22 @@ jobs:
           top=`pwd`
           $top/src/bin/dosbox-x-sdl1 -tests
           $top/src/bin/dosbox-x-sdl2 -tests
+      - name: Package build
+        run: |
+          top=`pwd`
+          mkdir -p $top/src/bin/drivez
+          mkdir -p $top/src/bin/glshaders
+          mkdir -p $top/src/bin/languages
+          cp $top/CHANGELOG $top/src/bin/CHANGELOG.txt
+          cp $top/dosbox-x.reference.conf $top/src/bin/dosbox-x.reference.conf
+          cp $top/dosbox-x.reference.full.conf $top/src/bin/dosbox-x.reference.full.conf
+          cp $top/contrib/fonts/FREECG98.BMP $top/src/bin/FREECG98.BMP
+          cp $top/contrib/fonts/wqy_1?pt.bdf $top/src/bin/
+          cp $top/contrib/fonts/Nouveau_IBM.ttf $top/src/bin/Nouveau_IBM.ttf
+          cp $top/contrib/fonts/SarasaGothicFixed.ttf $top/src/bin/SarasaGothicFixed.ttf
+          cp $top/contrib/windows/installer/drivez_readme.txt $top/src/bin/drivez/readme.txt
+          cp $top/contrib/glshaders/* $top/src/bin/glshaders/
+          for i in `ls $top/contrib/translations/` ; do cp $top/contrib/translations/$i/*.lng $top/src/bin/languages/; done
       - name: Upload release package
         uses: actions/upload-artifact@v3.1.0
         with:

.github/workflows/mingw32.yml

@@ -50,7 +50,7 @@ jobs:
           cp $top/contrib/windows/installer/readme.txt $top/package/mingw-build/mingw/README.txt
           cp $top/contrib/windows/installer/inpout32.dll $top/package/mingw-build/mingw/inpout32.dll
           cp $top/contrib/fonts/FREECG98.BMP $top/package/mingw-build/mingw/FREECG98.BMP
-          cp $top/contrib/fonts/wqy_12pt.bdf $top/package/mingw-build/mingw/wqy_12pt.bdf
+          cp $top/contrib/fonts/wqy_1?pt.bdf $top/package/mingw-build/mingw/
           cp $top/contrib/fonts/Nouveau_IBM.ttf $top/package/mingw-build/mingw/Nouveau_IBM.ttf
           cp $top/contrib/fonts/SarasaGothicFixed.ttf $top/package/mingw-build/mingw/SarasaGothicFixed.ttf
           cp $top/contrib/windows/installer/drivez_readme.txt $top/package/mingw-build/mingw/drivez/readme.txt
@@ -79,7 +79,7 @@ jobs:
           cp $top/contrib/windows/installer/readme.txt $top/package/mingw-build/mingw-sdl2/README.txt
           cp $top/contrib/windows/installer/inpout32.dll $top/package/mingw-build/mingw-sdl2/inpout32.dll
           cp $top/contrib/fonts/FREECG98.BMP $top/package/mingw-build/mingw-sdl2/FREECG98.BMP
-          cp $top/contrib/fonts/wqy_12pt.bdf $top/package/mingw-build/mingw-sdl2/wqy_12pt.bdf
+          cp $top/contrib/fonts/wqy_1?pt.bdf $top/package/mingw-build/mingw-sdl2/
           cp $top/contrib/fonts/Nouveau_IBM.ttf $top/package/mingw-build/mingw-sdl2/Nouveau_IBM.ttf
           cp $top/contrib/fonts/SarasaGothicFixed.ttf $top/package/mingw-build/mingw-sdl2/SarasaGothicFixed.ttf
           cp $top/contrib/windows/installer/drivez_readme.txt $top/package/mingw-build/mingw-sdl2/drivez/readme.txt
@@ -147,7 +147,7 @@ jobs:
           cp $top/contrib/windows/installer/readme.txt $top/package/mingw-build/mingw-lowend-sdl2/README.txt
           cp $top/contrib/windows/installer/inpout32.dll $top/package/mingw-build/mingw-lowend-sdl2/inpout32.dll
           cp $top/contrib/fonts/FREECG98.BMP $top/package/mingw-build/mingw-lowend-sdl2/FREECG98.BMP
-          cp $top/contrib/fonts/wqy_12pt.bdf $top/package/mingw-build/mingw-lowend-sdl2/wqy_12pt.bdf
+          cp $top/contrib/fonts/wqy_1?pt.bdf $top/package/mingw-build/mingw-lowend-sdl2/
           cp $top/contrib/fonts/Nouveau_IBM.ttf $top/package/mingw-build/mingw-lowend-sdl2/Nouveau_IBM.ttf
           cp $top/contrib/fonts/SarasaGothicFixed.ttf $top/package/mingw-build/mingw-lowend-sdl2/SarasaGothicFixed.ttf
           cp $top/contrib/windows/installer/drivez_readme.txt $top/package/mingw-build/mingw-lowend-sdl2/drivez/readme.txt
@@ -181,7 +181,7 @@ jobs:
           cp $top/contrib/windows/installer/readme.txt $top/package/mingw-build/mingw-lowend/README.txt
           cp $top/contrib/windows/installer/inpout32.dll $top/package/mingw-build/mingw-lowend/inpout32.dll
           cp $top/contrib/fonts/FREECG98.BMP $top/package/mingw-build/mingw-lowend/FREECG98.BMP
-          cp $top/contrib/fonts/wqy_12pt.bdf $top/package/mingw-build/mingw-lowend/wqy_12pt.bdf
+          cp $top/contrib/fonts/wqy_1?pt.bdf $top/package/mingw-build/mingw-lowend/
           cp $top/contrib/fonts/Nouveau_IBM.ttf $top/package/mingw-build/mingw-lowend/Nouveau_IBM.ttf
           cp $top/contrib/fonts/SarasaGothicFixed.ttf $top/package/mingw-build/mingw-lowend/SarasaGothicFixed.ttf
           cp $top/contrib/windows/installer/drivez_readme.txt $top/package/mingw-build/mingw-lowend/drivez/readme.txt

.github/workflows/mingw64.yml

@@ -50,7 +50,7 @@ jobs:
           cp $top/contrib/windows/installer/readme.txt $top/package/mingw-build/mingw/README.txt
           cp $top/contrib/windows/installer/inpoutx64.dll $top/package/mingw-build/mingw/inpoutx64.dll
           cp $top/contrib/fonts/FREECG98.BMP $top/package/mingw-build/mingw/FREECG98.BMP
-          cp $top/contrib/fonts/wqy_12pt.bdf $top/package/mingw-build/mingw/wqy_12pt.bdf
+          cp $top/contrib/fonts/wqy_1?pt.bdf $top/package/mingw-build/mingw/
           cp $top/contrib/fonts/Nouveau_IBM.ttf $top/package/mingw-build/mingw/Nouveau_IBM.ttf
           cp $top/contrib/fonts/SarasaGothicFixed.ttf $top/package/mingw-build/mingw/SarasaGothicFixed.ttf
           cp $top/contrib/windows/installer/drivez_readme.txt $top/package/mingw-build/mingw/drivez/readme.txt
@@ -79,7 +79,7 @@ jobs:
           cp $top/contrib/windows/installer/readme.txt $top/package/mingw-build/mingw-sdl2/README.txt
           cp $top/contrib/windows/installer/inpoutx64.dll $top/package/mingw-build/mingw-sdl2/inpoutx64.dll
           cp $top/contrib/fonts/FREECG98.BMP $top/package/mingw-build/mingw-sdl2/FREECG98.BMP
-          cp $top/contrib/fonts/wqy_12pt.bdf $top/package/mingw-build/mingw-sdl2/wqy_12pt.bdf
+          cp $top/contrib/fonts/wqy_1?pt.bdf $top/package/mingw-build/mingw-sdl2/
           cp $top/contrib/fonts/Nouveau_IBM.ttf $top/package/mingw-build/mingw-sdl2/Nouveau_IBM.ttf
           cp $top/contrib/fonts/SarasaGothicFixed.ttf $top/package/mingw-build/mingw-sdl2/SarasaGothicFixed.ttf
           cp $top/contrib/windows/installer/drivez_readme.txt $top/package/mingw-build/mingw-sdl2/drivez/readme.txt

.github/workflows/vsbuild32.yml

@@ -52,7 +52,7 @@ jobs:
           cp $top/contrib/windows/installer/readme.txt $top/package/bin/Win32/Release/README.txt
           cp $top/contrib/windows/installer/inpout32.dll $top/package/bin/Win32/Release/inpout32.dll
           cp $top/contrib/fonts/FREECG98.BMP $top/package/bin/Win32/Release/FREECG98.BMP
-          cp $top/contrib/fonts/wqy_12pt.bdf $top/package/bin/Win32/Release/wqy_12pt.bdf
+          cp $top/contrib/fonts/wqy_1?pt.bdf $top/package/bin/Win32/Release/
           cp $top/contrib/fonts/Nouveau_IBM.ttf $top/package/bin/Win32/Release/Nouveau_IBM.ttf
           cp $top/contrib/fonts/SarasaGothicFixed.ttf $top/package/bin/Win32/Release/SarasaGothicFixed.ttf
           cp $top/contrib/windows/installer/drivez_readme.txt $top/package/bin/Win32/Release/drivez/readme.txt
@@ -84,7 +84,7 @@ jobs:
           cp $top/contrib/windows/installer/readme.txt $top/package/bin/Win32/"Release SDL2"/README.txt
           cp $top/contrib/windows/installer/inpout32.dll $top/package/bin/Win32/"Release SDL2"/inpout32.dll
           cp $top/contrib/fonts/FREECG98.BMP $top/package/bin/Win32/"Release SDL2"/FREECG98.BMP
-          cp $top/contrib/fonts/wqy_12pt.bdf $top/package/bin/Win32/"Release SDL2"/wqy_12pt.bdf
+          cp $top/contrib/fonts/wqy_1?pt.bdf $top/package/bin/Win32/"Release SDL2"/
           cp $top/contrib/fonts/Nouveau_IBM.ttf $top/package/bin/Win32/"Release SDL2"/Nouveau_IBM.ttf
           cp $top/contrib/fonts/SarasaGothicFixed.ttf $top/package/bin/Win32/"Release SDL2"/SarasaGothicFixed.ttf
           cp $top/contrib/windows/installer/drivez_readme.txt $top/package/bin/Win32/"Release SDL2"/drivez/readme.txt
@@ -138,7 +138,7 @@ jobs:
           cp $top/dosbox-x.reference.full.conf $top/package/bin/ARM/Release/dosbox-x.reference.full.conf
           cp $top/contrib/windows/installer/readme.txt $top/package/bin/ARM/Release/README.txt
           cp $top/contrib/fonts/FREECG98.BMP $top/package/bin/ARM/Release/FREECG98.BMP
-          cp $top/contrib/fonts/wqy_12pt.bdf $top/package/bin/ARM/Release/wqy_12pt.bdf
+          cp $top/contrib/fonts/wqy_1?pt.bdf $top/package/bin/ARM/Release/
           cp $top/contrib/fonts/Nouveau_IBM.ttf $top/package/bin/ARM/Release/Nouveau_IBM.ttf
           cp $top/contrib/fonts/SarasaGothicFixed.ttf $top/package/bin/ARM/Release/SarasaGothicFixed.ttf
           cp $top/contrib/windows/installer/drivez_readme.txt $top/package/bin/ARM/Release/drivez/readme.txt
@@ -164,7 +164,7 @@ jobs:
           cp $top/dosbox-x.reference.full.conf $top/package/bin/ARM/"Release SDL2"/dosbox-x.reference.full.conf
           cp $top/contrib/windows/installer/readme.txt $top/package/bin/ARM/"Release SDL2"/README.txt
           cp $top/contrib/fonts/FREECG98.BMP $top/package/bin/ARM/"Release SDL2"/FREECG98.BMP
-          cp $top/contrib/fonts/wqy_12pt.bdf $top/package/bin/ARM/"Release SDL2"/wqy_12pt.bdf
+          cp $top/contrib/fonts/wqy_1?pt.bdf $top/package/bin/ARM/"Release SDL2"/
           cp $top/contrib/fonts/Nouveau_IBM.ttf $top/package/bin/ARM/"Release SDL2"/Nouveau_IBM.ttf
           cp $top/contrib/fonts/SarasaGothicFixed.ttf $top/package/bin/ARM/"Release SDL2"/SarasaGothicFixed.ttf
           cp $top/contrib/windows/installer/drivez_readme.txt $top/package/bin/ARM/"Release SDL2"/drivez/readme.txt

.github/workflows/vsbuild64.yml

@@ -135,7 +135,7 @@ jobs:
           cp $top/dosbox-x.reference.full.conf $top/package/bin/ARM64/Release/dosbox-x.reference.full.conf
           cp $top/contrib/windows/installer/readme.txt $top/package/bin/ARM64/Release/README.txt
           cp $top/contrib/fonts/FREECG98.BMP $top/package/bin/ARM64/Release/FREECG98.BMP
-          cp $top/contrib/fonts/wqy_12pt.bdf $top/package/bin/ARM64/Release/wqy_12pt.bdf
+          cp $top/contrib/fonts/wqy_1?pt.bdf $top/package/bin/ARM64/Release/
           cp $top/contrib/fonts/Nouveau_IBM.ttf $top/package/bin/ARM64/Release/Nouveau_IBM.ttf
           cp $top/contrib/fonts/SarasaGothicFixed.ttf $top/package/bin/ARM64/Release/SarasaGothicFixed.ttf
           cp $top/contrib/windows/installer/drivez_readme.txt $top/package/bin/ARM64/Release/drivez/readme.txt
@@ -161,7 +161,7 @@ jobs:
           cp $top/dosbox-x.reference.full.conf $top/package/bin/ARM64/"Release SDL2"/dosbox-x.reference.full.conf
           cp $top/contrib/windows/installer/readme.txt $top/package/bin/ARM64/"Release SDL2"/README.txt
           cp $top/contrib/fonts/FREECG98.BMP $top/package/bin/ARM64/"Release SDL2"/FREECG98.BMP
-          cp $top/contrib/fonts/wqy_12pt.bdf $top/package/bin/ARM64/"Release SDL2"/wqy_12pt.bdf
+          cp $top/contrib/fonts/wqy_1?pt.bdf $top/package/bin/ARM64/"Release SDL2"/
           cp $top/contrib/fonts/Nouveau_IBM.ttf $top/package/bin/ARM64/"Release SDL2"/Nouveau_IBM.ttf
           cp $top/contrib/fonts/SarasaGothicFixed.ttf $top/package/bin/ARM64/"Release SDL2"/SarasaGothicFixed.ttf
           cp $top/contrib/windows/installer/drivez_readme.txt $top/package/bin/ARM64/"Release SDL2"/drivez/readme.txt

build-scripts/mingw/make-mingw-hx-dos.sh

@@ -68,7 +68,7 @@ cp dosbox-x.reference.conf dosbox-x.ref || exit 1
 cp dosbox-x.reference.full.conf dosbox-x.ref.full || exit 1
 cp contrib/windows/installer/inpout32.dll INPOUT32.DLL || exit 1
 cp contrib/fonts/FREECG98.BMP . || exit 1
-cp contrib/fonts/wqy_12pt.bdf . || exit 1
+cp contrib/fonts/wqy_1?pt.bdf . || exit 1
 cp contrib/fonts/Nouveau_IBM.ttf . || exit 1
 cp $hxdir/DPMILD32.EXE . || exit 1
 cp $hxdir/HDPMI32.EXE . || exit 1

contrib/fonts/wqy_12pt.bdf

@@ -20208,15 +20208,6 @@ A844
 5444
 54EE
 ENDCHAR
-STARTCHAR U_4E00
-ENCODING 19968
-SWIDTH 1000 0
-DWIDTH 16 0
-BBX 15 2 0 6
-BITMAP
-0004
-FFFE
-ENDCHAR
 STARTCHAR U_4E01
 ENCODING 19969
 SWIDTH 1000 0

contrib/linux/dosbox-x

@@ -22,7 +22,7 @@ _dosbox-x()
   local -a \
        _main_opts=(
                     -fs -fullscreen -startmapper -noautoexec -securemode
-                    -scaler -forcescaler -lang -socket -exit -userconf
+                    -scaler -forcescaler -lang -langcp -socket -exit -userconf
                     -startui -startgui -starttool -promptfolder -nopromptfolder
                     -nogui -nomenu -showcycles -showrt -savedir -defaultdir
                     -defaultconf -defaultmapper -date-host-forced -display2

contrib/windows/installer/DOSBox-X-setup.iss

@@ -76,7 +76,7 @@ Source: ".\dosbox-x.reference.setup.conf"; DestDir: "{app}"; Flags: ignoreversio
 Source: "..\..\..\CHANGELOG"; DestDir: "{app}"; DestName: "changelog.txt"; Flags: ignoreversion; Components: full typical compact
 Source: "..\..\..\COPYING"; DestDir: "{app}"; DestName: "COPYING.txt"; Flags: ignoreversion; Components: full typical compact
 Source: "..\..\fonts\FREECG98.BMP"; DestDir: "{app}"; Flags: ignoreversion; Components: full typical
-Source: "..\..\fonts\wqy_12pt.bdf"; DestDir: "{app}"; Flags: ignoreversion; Components: full typical
+Source: "..\..\fonts\wqy_1?pt.bdf"; DestDir: "{app}"; Flags: ignoreversion; Components: full typical
 Source: "..\..\fonts\Nouveau_IBM.ttf"; DestDir: "{app}"; Flags: ignoreversion; Components: full typical compact
 Source: "..\..\fonts\SarasaGothicFixed.ttf"; DestDir: "{app}"; Flags: ignoreversion; Components: full typical compact
 Source: "..\..\translations\en\en_US.lng"; DestDir: "{app}\languages"; Flags: ignoreversion; Components: full typical compact

make-windows-release.pl

@@ -37,7 +37,7 @@ print "$zipname\n";
 
 my @platforms = ('ARM', 'ARM64', 'Win32', 'x64');
 my @builds = ('Release', 'Release SDL2');
-my @files = ('dosbox-x.reference.conf', 'dosbox-x.reference.full.conf', 'readme.txt', 'dosbox-x.exe', 'FREECG98.bmp', 'wqy_12pt.bdf', 'Nouveau_IBM.ttf', 'SarasaGothicFixed.ttf', 'changelog.txt', 'drivez', 'scripts', 'shaders', 'languages');
+my @files = ('dosbox-x.reference.conf', 'dosbox-x.reference.full.conf', 'readme.txt', 'dosbox-x.exe', 'FREECG98.bmp', 'wqy_11pt.bdf', 'wqy_12pt.bdf', 'Nouveau_IBM.ttf', 'SarasaGothicFixed.ttf', 'changelog.txt', 'drivez', 'scripts', 'shaders', 'languages');
 
 foreach $platform (@platforms) {
 	$plat = $platform;

src/gui/sdlmain.cpp

@@ -6688,7 +6688,7 @@ bool DOSBOX_parse_argv() {
 #if C_DEBUG
             fprintf(stderr,"  -display2 <color>                       Enable standard & monochrome dual-screen mode with <color>\n");
 #endif
-            fprintf(stderr,"  -lang <message file>                    Use specific message file instead of language= setting\n");
+            fprintf(stderr,"  -lang (or -langcp) <message file>       Use specific message file instead of language= setting\n");
             fprintf(stderr,"  -machine <type>                         Start DOSBox-X with a specific machine <type>\n");
             fprintf(stderr,"  -nodpiaware                             Ignore (do not signal) Windows DPI awareness\n");
             fprintf(stderr,"  -securemode                             Enable secure mode (no drive mounting etc)\n");

src/ints/int_dosv.cpp

@@ -119,7 +119,8 @@ bool del_flag = true;
 bool yen_flag = false;
 bool jfont_init = false;
 bool getsysfont = true;
-bool getunibit = false;
+bool getwqy14 = false;
+bool getwqy16 = false;
 uint8_t TrueVideoMode;
 void ResolvePath(std::string& in);
 void SetIMPosition();
@@ -128,6 +129,7 @@ bool INT10_SetDOSVModeVtext(uint16_t mode, enum DOSV_VTEXT_MODE vtext_mode);
 bool CodePageGuestToHostUTF8(char *d/*CROSS_LEN*/,const char *s/*CROSS_LEN*/);
 bool CodePageGuestToHostUTF16(uint16_t *d/*CROSS_LEN*/,const char *s/*CROSS_LEN*/);
 bool CodePageHostToGuestUTF16(char *d/*CROSS_LEN*/,const uint16_t *s/*CROSS_LEN*/);
+std::string GetDOSBoxXPath(bool withexe=false);
 
 bool isKanji1(uint8_t chr) {
     if (dos.loaded_codepage == 936 || IS_PDOSV)
@@ -304,8 +306,7 @@ void bit_order_invert(uint8_t *data, int size) {
 
 void two_byte_swap(uint8_t *data, int size) {
   size &= ~1;
-  for (int i = 0; i < size; i += 2)
+  for (int i = 0; i < size; i += 2) {
-  {
     uint8_t tmp = data[i];
     data[i] = data[i + 1];
     data[i + 1] = tmp;
@@ -314,8 +315,7 @@ void two_byte_swap(uint8_t *data, int size) {
 
 void four_byte_swap(uint8_t *data, int size) {
   size &= ~3;
-  for (int i = 0; i < size; i += 4)
+  for (int i = 0; i < size; i += 4) {
-  {
     uint8_t tmp = data[i];
     data[i] = data[i + 3];
     data[i + 3] = tmp;
@@ -327,8 +327,7 @@ void four_byte_swap(uint8_t *data, int size) {
 
 bool seek(FILE *file, type32 type) {
   for (int i = 0; i < nTables; i++)
-    if (tables[i].type == type)
+    if (tables[i].type == type) {
-    {
       int s = tables[i].offset - read_bytes;
       if (s < 0)
           return false;
@@ -1171,9 +1170,9 @@ uint8_t *GetDbcsFont(Bitu code)
 				Bitu oldcode = code;
 				code = GetConvertedCode(code, 932);
 				if (!code) {
-                    if (!getunibit) {
+                    if (!getwqy16) {
-                        getunibit=true;
+                        getwqy16=true;
-                        std::string config_path, GetDOSBoxXPath(bool withexe=false), exepath=GetDOSBoxXPath(), fname="wqy_12pt.bdf";
+                        std::string config_path, exepath=GetDOSBoxXPath(), fname="wqy_12pt.bdf";
                         Cross::GetPlatformConfigDir(config_path);
                         FILE * mfile=fopen(fname.c_str(),"rb");
                         if (!mfile && exepath.size()) mfile=fopen((exepath + fname).c_str(),"rb");
@@ -1267,6 +1266,24 @@ uint8_t *GetDbcs14Font(Bitu code, bool &is14)
                 Bitu oldcode = code;
                 code = GetConvertedCode(code, 932);
                 if (!code) {
+                    if (!getwqy14) {
+                        getwqy14=true;
+                        std::string config_path, exepath=GetDOSBoxXPath(), fname="wqy_11pt.bdf";
+                        Cross::GetPlatformConfigDir(config_path);
+                        FILE * mfile=fopen(fname.c_str(),"rb");
+                        if (!mfile && exepath.size()) mfile=fopen((exepath + fname).c_str(),"rb");
+                        if (!mfile && config_path.size()) mfile=fopen((config_path + fname).c_str(),"rb");
+                        fname="wqy_11pt.pcf";
+                        if (!mfile) mfile=fopen(fname.c_str(),"rb");
+                        if (!mfile && exepath.size()) mfile=fopen((exepath + fname).c_str(),"rb");
+                        if (!mfile && config_path.size()) mfile=fopen((config_path + fname).c_str(),"rb");
+                        if (!mfile) return jfont_dbcs;
+                        if (readBDF(mfile, 14) || readPCF(mfile, 14)) {
+                           fclose(mfile);
+                           if (jfont_cache_dbcs_14[oldcode] != 0) return &jfont_dbcs_14[oldcode * 28];
+                        } else
+                           fclose(mfile);
+                    }
                     is14 = false;
                     return GetDbcsFont(oldcode);
                 }
@@ -1433,6 +1450,7 @@ void InitFontHandle()
 }
 
 void clearFontCache() {
+    getwqy14 = getwqy16 = false;
     memset(jfont_cache_dbcs_16, 0, sizeof(jfont_cache_dbcs_16));
     memset(jfont_cache_dbcs_14, 0, sizeof(jfont_cache_dbcs_14));
     memset(jfont_cache_dbcs_24, 0, sizeof(jfont_cache_dbcs_24));

vs/dosbox-x.vcxproj

@@ -372,7 +372,7 @@
     </CustomBuildStep>
     <PostBuildEvent>
       <Command>copy "$(SolutionDir)\..\contrib\fonts\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
-copy "$(SolutionDir)\..\contrib\fonts\wqy_12pt.bdf" "$(OutputPath)\wqy_12pt.bdf"
+copy "$(SolutionDir)\..\contrib\fonts\wqy_1?pt.bdf" "$(OutputPath)\wqy_1?pt.bdf"
 copy "$(SolutionDir)\..\contrib\fonts\Nouveau_IBM.ttf" "$(OutputPath)\Nouveau_IBM.ttf"
 copy "$(SolutionDir)\..\contrib\fonts\SarasaGothicFixed.ttf" "$(OutputPath)\SarasaGothicFixed.ttf"
 copy "$(SolutionDir)\..\dosbox-x.reference.conf" "$(OutputPath)\dosbox-x.reference.conf"
@@ -420,7 +420,7 @@ for /d %%i in ($(SolutionDir)\..\contrib\translations\*) do copy %%i\*.lng "$(Ou
     </CustomBuildStep>
     <PostBuildEvent>
       <Command>copy "$(SolutionDir)\..\contrib\fonts\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
-copy "$(SolutionDir)\..\contrib\fonts\wqy_12pt.bdf" "$(OutputPath)\wqy_12pt.bdf"
+copy "$(SolutionDir)\..\contrib\fonts\wqy_1?pt.bdf" "$(OutputPath)\wqy_1?pt.bdf"
 copy "$(SolutionDir)\..\contrib\fonts\Nouveau_IBM.ttf" "$(OutputPath)\Nouveau_IBM.ttf"
 copy "$(SolutionDir)\..\contrib\fonts\SarasaGothicFixed.ttf" "$(OutputPath)\SarasaGothicFixed.ttf"
 copy "$(SolutionDir)\..\dosbox-x.reference.conf" "$(OutputPath)\dosbox-x.reference.conf"
@@ -464,7 +464,7 @@ for /d %%i in ($(SolutionDir)\..\contrib\translations\*) do copy %%i\*.lng "$(Ou
     </Link>
     <PostBuildEvent>
       <Command>copy "$(SolutionDir)\..\contrib\fonts\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
-copy "$(SolutionDir)\..\contrib\fonts\wqy_12pt.bdf" "$(OutputPath)\wqy_12pt.bdf"
+copy "$(SolutionDir)\..\contrib\fonts\wqy_1?pt.bdf" "$(OutputPath)\wqy_1?pt.bdf"
 copy "$(SolutionDir)\..\contrib\fonts\Nouveau_IBM.ttf" "$(OutputPath)\Nouveau_IBM.ttf"
 copy "$(SolutionDir)\..\contrib\fonts\SarasaGothicFixed.ttf" "$(OutputPath)\SarasaGothicFixed.ttf"
 copy "$(SolutionDir)\..\dosbox-x.reference.conf" "$(OutputPath)\dosbox-x.reference.conf"
@@ -509,7 +509,7 @@ for /d %%i in ($(SolutionDir)\..\contrib\translations\*) do copy %%i\*.lng "$(Ou
     </Link>
     <PostBuildEvent>
       <Command>copy "$(SolutionDir)\..\contrib\fonts\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
-copy "$(SolutionDir)\..\contrib\fonts\wqy_12pt.bdf" "$(OutputPath)\wqy_12pt.bdf"
+copy "$(SolutionDir)\..\contrib\fonts\wqy_1?pt.bdf" "$(OutputPath)\wqy_1?pt.bdf"
 copy "$(SolutionDir)\..\contrib\fonts\Nouveau_IBM.ttf" "$(OutputPath)\Nouveau_IBM.ttf"
 copy "$(SolutionDir)\..\contrib\fonts\SarasaGothicFixed.ttf" "$(OutputPath)\SarasaGothicFixed.ttf"
 copy "$(SolutionDir)\..\dosbox-x.reference.conf" "$(OutputPath)\dosbox-x.reference.conf"
@@ -551,7 +551,7 @@ for /d %%i in ($(SolutionDir)\..\contrib\translations\*) do copy %%i\*.lng "$(Ou
     </Link>
     <PostBuildEvent>
       <Command>copy "$(SolutionDir)\..\contrib\fonts\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
-copy "$(SolutionDir)\..\contrib\fonts\wqy_12pt.bdf" "$(OutputPath)\wqy_12pt.bdf"
+copy "$(SolutionDir)\..\contrib\fonts\wqy_1?pt.bdf" "$(OutputPath)\wqy_1?pt.bdf"
 copy "$(SolutionDir)\..\contrib\fonts\Nouveau_IBM.ttf" "$(OutputPath)\Nouveau_IBM.ttf"
 copy "$(SolutionDir)\..\contrib\fonts\SarasaGothicFixed.ttf" "$(OutputPath)\SarasaGothicFixed.ttf"
 copy "$(SolutionDir)\..\dosbox-x.reference.conf" "$(OutputPath)\dosbox-x.reference.conf"
@@ -595,7 +595,7 @@ for /d %%i in ($(SolutionDir)\..\contrib\translations\*) do copy %%i\*.lng "$(Ou
     </Link>
     <PostBuildEvent>
       <Command>copy "$(SolutionDir)\..\contrib\fonts\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
-copy "$(SolutionDir)\..\contrib\fonts\wqy_12pt.bdf" "$(OutputPath)\wqy_12pt.bdf"
+copy "$(SolutionDir)\..\contrib\fonts\wqy_1?pt.bdf" "$(OutputPath)\wqy_1?pt.bdf"
 copy "$(SolutionDir)\..\contrib\fonts\Nouveau_IBM.ttf" "$(OutputPath)\Nouveau_IBM.ttf"
 copy "$(SolutionDir)\..\contrib\fonts\SarasaGothicFixed.ttf" "$(OutputPath)\SarasaGothicFixed.ttf"
 copy "$(SolutionDir)\..\dosbox-x.reference.conf" "$(OutputPath)\dosbox-x.reference.conf"
@@ -640,7 +640,7 @@ for /d %%i in ($(SolutionDir)\..\contrib\translations\*) do copy %%i\*.lng "$(Ou
     </Link>
     <PostBuildEvent>
       <Command>copy "$(SolutionDir)\..\contrib\fonts\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
-copy "$(SolutionDir)\..\contrib\fonts\wqy_12pt.bdf" "$(OutputPath)\wqy_12pt.bdf"
+copy "$(SolutionDir)\..\contrib\fonts\wqy_1?pt.bdf" "$(OutputPath)\wqy_1?pt.bdf"
 copy "$(SolutionDir)\..\contrib\fonts\Nouveau_IBM.ttf" "$(OutputPath)\Nouveau_IBM.ttf"
 copy "$(SolutionDir)\..\contrib\fonts\SarasaGothicFixed.ttf" "$(OutputPath)\SarasaGothicFixed.ttf"
 copy "$(SolutionDir)\..\dosbox-x.reference.conf" "$(OutputPath)\dosbox-x.reference.conf"
@@ -682,7 +682,7 @@ for /d %%i in ($(SolutionDir)\..\contrib\translations\*) do copy %%i\*.lng "$(Ou
     </Link>
     <PostBuildEvent>
       <Command>copy "$(SolutionDir)\..\contrib\fonts\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
-copy "$(SolutionDir)\..\contrib\fonts\wqy_12pt.bdf" "$(OutputPath)\wqy_12pt.bdf"
+copy "$(SolutionDir)\..\contrib\fonts\wqy_1?pt.bdf" "$(OutputPath)\wqy_1?pt.bdf"
 copy "$(SolutionDir)\..\contrib\fonts\Nouveau_IBM.ttf" "$(OutputPath)\Nouveau_IBM.ttf"
 copy "$(SolutionDir)\..\contrib\fonts\SarasaGothicFixed.ttf" "$(OutputPath)\SarasaGothicFixed.ttf"
 copy "$(SolutionDir)\..\dosbox-x.reference.conf" "$(OutputPath)\dosbox-x.reference.conf"
@@ -730,7 +730,7 @@ for /d %%i in ($(SolutionDir)\..\contrib\translations\*) do copy %%i\*.lng "$(Ou
     </CustomBuildStep>
     <PostBuildEvent>
       <Command>copy "$(SolutionDir)\..\contrib\fonts\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
-copy "$(SolutionDir)\..\contrib\fonts\wqy_12pt.bdf" "$(OutputPath)\wqy_12pt.bdf"
+copy "$(SolutionDir)\..\contrib\fonts\wqy_1?pt.bdf" "$(OutputPath)\wqy_1?pt.bdf"
 copy "$(SolutionDir)\..\contrib\fonts\Nouveau_IBM.ttf" "$(OutputPath)\Nouveau_IBM.ttf"
 copy "$(SolutionDir)\..\contrib\fonts\SarasaGothicFixed.ttf" "$(OutputPath)\SarasaGothicFixed.ttf"
 copy "$(SolutionDir)\..\dosbox-x.reference.conf" "$(OutputPath)\dosbox-x.reference.conf"
@@ -779,7 +779,7 @@ for /d %%i in ($(SolutionDir)\..\contrib\translations\*) do copy %%i\*.lng "$(Ou
     </CustomBuildStep>
     <PostBuildEvent>
       <Command>copy "$(SolutionDir)\..\contrib\fonts\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
-copy "$(SolutionDir)\..\contrib\fonts\wqy_12pt.bdf" "$(OutputPath)\wqy_12pt.bdf"
+copy "$(SolutionDir)\..\contrib\fonts\wqy_1?pt.bdf" "$(OutputPath)\wqy_1?pt.bdf"
 copy "$(SolutionDir)\..\contrib\fonts\Nouveau_IBM.ttf" "$(OutputPath)\Nouveau_IBM.ttf"
 copy "$(SolutionDir)\..\contrib\fonts\SarasaGothicFixed.ttf" "$(OutputPath)\SarasaGothicFixed.ttf"
 copy "$(SolutionDir)\..\dosbox-x.reference.conf" "$(OutputPath)\dosbox-x.reference.conf"
@@ -824,7 +824,7 @@ for /d %%i in ($(SolutionDir)\..\contrib\translations\*) do copy %%i\*.lng "$(Ou
     </Link>
     <PostBuildEvent>
       <Command>copy "$(SolutionDir)\..\contrib\fonts\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
-copy "$(SolutionDir)\..\contrib\fonts\wqy_12pt.bdf" "$(OutputPath)\wqy_12pt.bdf"
+copy "$(SolutionDir)\..\contrib\fonts\wqy_1?pt.bdf" "$(OutputPath)\wqy_1?pt.bdf"
 copy "$(SolutionDir)\..\contrib\fonts\Nouveau_IBM.ttf" "$(OutputPath)\Nouveau_IBM.ttf"
 copy "$(SolutionDir)\..\contrib\fonts\SarasaGothicFixed.ttf" "$(OutputPath)\SarasaGothicFixed.ttf"
 copy "$(SolutionDir)\..\dosbox-x.reference.conf" "$(OutputPath)\dosbox-x.reference.conf"
@@ -870,7 +870,7 @@ for /d %%i in ($(SolutionDir)\..\contrib\translations\*) do copy %%i\*.lng "$(Ou
     </Link>
     <PostBuildEvent>
       <Command>copy "$(SolutionDir)\..\contrib\fonts\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
-copy "$(SolutionDir)\..\contrib\fonts\wqy_12pt.bdf" "$(OutputPath)\wqy_12pt.bdf"
+copy "$(SolutionDir)\..\contrib\fonts\wqy_1?pt.bdf" "$(OutputPath)\wqy_1?pt.bdf"
 copy "$(SolutionDir)\..\contrib\fonts\Nouveau_IBM.ttf" "$(OutputPath)\Nouveau_IBM.ttf"
 copy "$(SolutionDir)\..\contrib\fonts\SarasaGothicFixed.ttf" "$(OutputPath)\SarasaGothicFixed.ttf"
 copy "$(SolutionDir)\..\dosbox-x.reference.conf" "$(OutputPath)\dosbox-x.reference.conf"
@@ -913,7 +913,7 @@ for /d %%i in ($(SolutionDir)\..\contrib\translations\*) do copy %%i\*.lng "$(Ou
     </Link>
     <PostBuildEvent>
       <Command>copy "$(SolutionDir)\..\contrib\fonts\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
-copy "$(SolutionDir)\..\contrib\fonts\wqy_12pt.bdf" "$(OutputPath)\wqy_12pt.bdf"
+copy "$(SolutionDir)\..\contrib\fonts\wqy_1?pt.bdf" "$(OutputPath)\wqy_1?pt.bdf"
 copy "$(SolutionDir)\..\contrib\fonts\Nouveau_IBM.ttf" "$(OutputPath)\Nouveau_IBM.ttf"
 copy "$(SolutionDir)\..\contrib\fonts\SarasaGothicFixed.ttf" "$(OutputPath)\SarasaGothicFixed.ttf"
 copy "$(SolutionDir)\..\dosbox-x.reference.conf" "$(OutputPath)\dosbox-x.reference.conf"
@@ -958,7 +958,7 @@ for /d %%i in ($(SolutionDir)\..\contrib\translations\*) do copy %%i\*.lng "$(Ou
     </Link>
     <PostBuildEvent>
       <Command>copy "$(SolutionDir)\..\contrib\fonts\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
-copy "$(SolutionDir)\..\contrib\fonts\wqy_12pt.bdf" "$(OutputPath)\wqy_12pt.bdf"
+copy "$(SolutionDir)\..\contrib\fonts\wqy_1?pt.bdf" "$(OutputPath)\wqy_1?pt.bdf"
 copy "$(SolutionDir)\..\contrib\fonts\Nouveau_IBM.ttf" "$(OutputPath)\Nouveau_IBM.ttf"
 copy "$(SolutionDir)\..\contrib\fonts\SarasaGothicFixed.ttf" "$(OutputPath)\SarasaGothicFixed.ttf"
 copy "$(SolutionDir)\..\dosbox-x.reference.conf" "$(OutputPath)\dosbox-x.reference.conf"
@@ -1004,7 +1004,7 @@ for /d %%i in ($(SolutionDir)\..\contrib\translations\*) do copy %%i\*.lng "$(Ou
     </Link>
     <PostBuildEvent>
       <Command>copy "$(SolutionDir)\..\contrib\fonts\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
-copy "$(SolutionDir)\..\contrib\fonts\wqy_12pt.bdf" "$(OutputPath)\wqy_12pt.bdf"
+copy "$(SolutionDir)\..\contrib\fonts\wqy_1?pt.bdf" "$(OutputPath)\wqy_1?pt.bdf"
 copy "$(SolutionDir)\..\contrib\fonts\Nouveau_IBM.ttf" "$(OutputPath)\Nouveau_IBM.ttf"
 copy "$(SolutionDir)\..\contrib\fonts\SarasaGothicFixed.ttf" "$(OutputPath)\SarasaGothicFixed.ttf"
 copy "$(SolutionDir)\..\dosbox-x.reference.conf" "$(OutputPath)\dosbox-x.reference.conf"
@@ -1047,7 +1047,7 @@ for /d %%i in ($(SolutionDir)\..\contrib\translations\*) do copy %%i\*.lng "$(Ou
     </Link>
     <PostBuildEvent>
       <Command>copy "$(SolutionDir)\..\contrib\fonts\FREECG98.BMP" "$(OutputPath)\FREECG98.BMP"
-copy "$(SolutionDir)\..\contrib\fonts\wqy_12pt.bdf" "$(OutputPath)\wqy_12pt.bdf"
+copy "$(SolutionDir)\..\contrib\fonts\wqy_1?pt.bdf" "$(OutputPath)\wqy_1?pt.bdf"
 copy "$(SolutionDir)\..\contrib\fonts\Nouveau_IBM.ttf" "$(OutputPath)\Nouveau_IBM.ttf"
 copy "$(SolutionDir)\..\contrib\fonts\SarasaGothicFixed.ttf" "$(OutputPath)\SarasaGothicFixed.ttf"
 copy "$(SolutionDir)\..\dosbox-x.reference.conf" "$(OutputPath)\dosbox-x.reference.conf"