From 532921729ec04fe7c6575db8db5e1ea679ffe35e Mon Sep 17 00:00:00 2001 From: Guy Albertelli Date: Sun, 24 Jan 1999 09:50:09 +0000 Subject: [PATCH] Finished GetTextCharsetInfo routine. --- objects/text.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/objects/text.c b/objects/text.c index a25997810c7..12bc9c84945 100644 --- a/objects/text.c +++ b/objects/text.c @@ -762,9 +762,8 @@ UINT32 WINAPI GetTextCharsetInfo( HGDIOBJ32 hFont; UINT32 charSet = DEFAULT_CHARSET; LOGFONT32W lf; + CHARSETINFO csinfo; - if (fs != NULL) - FIXME(text,"(0x%x,%p,%08lx): stub\n",hdc,fs,flags); hFont = GetCurrentObject(hdc, OBJ_FONT); if (hFont == 0) return(DEFAULT_CHARSET); @@ -772,7 +771,9 @@ UINT32 WINAPI GetTextCharsetInfo( charSet = lf.lfCharSet; if (fs != NULL) { - /* ... fill fontstruct too ... still to do*/ + if (!TranslateCharsetInfo(charSet, &csinfo, TCI_SRCCHARSET)) + return (DEFAULT_CHARSET); + memcpy(fs, &csinfo.fs, sizeof(FONTSIGNATURE)); } return charSet; }