fix bug reported in Issue #96

VincentWei · Nov 7, 2022 · 9b89614 · 9b89614
1 parent 0d170a6
commit 9b89614
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/src/newgdi/tabbedtextout.c b/src/newgdi/tabbedtextout.c
@@ -578,6 +578,9 @@ int GUIAPI GetTabbedTextExtentPoint (HDC hdc, const char* text,
             ach = devfont->charset_ops->get_char_value
                             (NULL, 0, (const unsigned char*)text, len_cur_char);
             char_type = devfont->charset_ops->char_type (ach);
+
+            if (devfont == mbc_devfont)
+                ach = SET_MBCHV(ach);
             gv = GetGlyphValueAlt(log_font, ach);
 
             switch (char_type & ACHARTYPE_BASIC_MASK) {

diff --git a/src/newgdi/textout.c b/src/newgdi/textout.c
@@ -476,6 +476,7 @@ int GUIAPI GetTextExtentPoint (HDC hdc, const char* text, int len,
 
             chv = (*mbc_devfont->charset_ops->get_char_value)(NULL,
                     0, (const unsigned char*)text, 0);
+            chv = SET_MBCHV(chv);
 
             gv = GetGlyphValueAlt(pdc->pLogFont, chv);
             advance_cur_char = _gdi_get_glyph_advance (pdc, gv,