commit 532921729ec04fe7c6575db8db5e1ea679ffe35e
author Guy Albertelli <galberte@neo.lrun.com> Sun Jan 24 09:50:09 1999 +0000
committer Alexandre Julliard <julliard@winehq.org> Sun Jan 24 09:50:09 1999 +0000
tree f59166f5568eed69e8beea1a6dfc9c5f40f1ccfe
parent f7e185d2ae1046fbb19290086a7029371bc1e6bc

Finished GetTextCharsetInfo routine.

objects/text.c

diff --git a/objects/text.c b/objects/text.c
index a259978..12bc9c8 100644
--- a/objects/text.c
+++ b/objects/text.c
@@ -762,9 +762,8 @@
     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 @@
         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;
 }