mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-17 11:43:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12299 from sinusinu/master

Browse Source 
GDI: Fix non-ASCII text rendering
This commit is contained in:
Autechre 2021-04-22 14:24:47 +02:00 committed by GitHub
commit 5998c561ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gfx/drivers_font/gdi_font.c
View File

@ -142,9 +142,11 @@ static void gdi_render_msg(
blue = video_msg_color_b * 255.0f;
}
msg_strlen = strlen(msg);
char* msg_local = utf8_to_local_string_alloc(msg);
GetTextExtentPoint32(font->gdi->memDC, msg, msg_strlen, &textSize);
msg_strlen = strlen(msg_local);
GetTextExtentPoint32(font->gdi->memDC, msg_local, msg_strlen, &textSize);
switch (align)
{
@ -174,7 +176,7 @@ static void gdi_render_msg(
SetBkMode(font->gdi->memDC, TRANSPARENT);
string_list_initialize(&msg_list);
string_split_noalloc(&msg_list, msg, "\n");
string_split_noalloc(&msg_list, msg_local, "\n");
if (drop_x || drop_y)
{
@ -188,7 +190,7 @@ static void gdi_render_msg(
for (i = 0; i < msg_list.size; i++)
TextOut(font->gdi->memDC, newDropX, newDropY + (textSize.cy * i),
msg_list.elems[i].data,
utf8len(msg_list.elems[i].data));
strlen(msg_list.elems[i].data));
}
SetTextColor(font->gdi->memDC, RGB(red, green, blue));
@ -196,9 +198,10 @@ static void gdi_render_msg(
for (i = 0; i < msg_list.size; i++)
TextOut(font->gdi->memDC, newX, newY + (textSize.cy * i),
msg_list.elems[i].data,
utf8len(msg_list.elems[i].data));
strlen(msg_list.elems[i].data));
string_list_deinitialize(&msg_list);
free(msg_local);
SelectObject(font->gdi->memDC, font->gdi->bmp_old);
}