Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 06:02:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

[GDI32] Fix ExtTextOutA with ETO_GLYPH_INDEX

Browse source 
CORE-18365
This commit is contained in:
Mark Jansen 2022-09-14 20:53:04 +02:00
parent 75125228be
commit d84b76a69e
No known key found for this signature in database
GPG key ID: B39240EE84BEAE8B
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
win32ss/gdi/gdi32/objects/text.c
View file

@ -465,9 +465,16 @@ ExtTextOutA(
UNICODE_STRING StringU; UNICODE_STRING StringU;
BOOL ret; BOOL ret;
RtlInitAnsiString(&StringA, (LPSTR)lpString); if (fuOptions & ETO_GLYPH_INDEX)
return ExtTextOutW(hdc, x, y, fuOptions, lprc, (LPCWSTR)lpString, cch, lpDx);
StringA.Buffer = (PCHAR)lpString;
StringA.Length = StringA.MaximumLength = cch;
RtlAnsiStringToUnicodeString(&StringU, &StringA, TRUE); RtlAnsiStringToUnicodeString(&StringU, &StringA, TRUE);
if (StringU.Length != StringA.Length * sizeof(WCHAR))
DPRINT1("ERROR: Should convert lpDx properly!\n");
ret = ExtTextOutW(hdc, x, y, fuOptions, lprc, StringU.Buffer, cch, lpDx); ret = ExtTextOutW(hdc, x, y, fuOptions, lprc, StringU.Buffer, cch, lpDx);
RtlFreeUnicodeString(&StringU); RtlFreeUnicodeString(&StringU);