--- a/src/objects-msw.c	Fri Feb 05 12:11:12 2010 -0600
+++ b/src/objects-msw.c	Fri Feb 05 12:12:28 2010 -0600
@@ -1109,7 +1109,7 @@
    * weights unspecified. This means that we have to weed out duplicates of
    * those fonts that do get enumerated with different weights.
    */
-  TSTR_TO_C_STRING (lpelfe->elfLogFont.lfFaceName, facename);
+  facename = TSTR_TO_ITEXT (lpelfe->elfLogFont.lfFaceName);
   if (itext_ichar (facename) == '@')
     /* This is a font for writing vertically. We ignore it. */
     return 1;
@@ -1489,7 +1489,7 @@
     {
       Extbyte *extfontname;
 
-      C_STRING_TO_TSTR (fontname, extfontname);
+      extfontname = ITEXT_TO_TSTR (fontname);
       if (logfont)
 	{
           qxetcsncpy ((Extbyte *) logfont->lfFaceName, extfontname,