Changeset 5795 for trunk/src

Timestamp:

May 24, 2001, 9:26:31 PM (24 years ago)

Author:

sandervl

Message:

GetTextExtentPointA fix; call WGSS

Location:

trunk/src/gdi32

Files:

• font.cpp (modified) (2 diffs)
• text.cpp (modified) (3 diffs)

trunk/src/gdi32/font.cpp

@@ -1 @@
-/* $Id: font.cpp,v 1.18 2001-04-25 20:53:02 sandervl Exp $ */
+/* $Id: font.cpp,v 1.19 2001-05-24 19:26:30 sandervl Exp $ */
 
 /*
@@ -164 +164 @@
   HFONT hFont;
 
+  if(lpszFace == NULL)
+      lpszFace = "";
+
+  if(strlen(lpszFace) >= LF_FACESIZE)
+  {
+      dprintf(("ERROR: Invalid string length for font name!!"));
+      SetLastError(ERROR_INVALID_PARAMETER);
+      return 0;
+  }
+
   iFontRename(lpszFace, lpstrFaceNew);
 
   dprintf(("lpszFace = %s -> %s\n", lpszFace, lpstrFaceNew));
 
-  hFont = O32_CreateFont(nHeight,
-                         nWidth,
-                         nEscapement,
-                         nOrientation,
-                         fnWeight,
-                         fdwItalic,
-                         fdwUnderline,
-                         fdwStrikeOut,
-                         fdwCharSet,
-                         fdwOutputPrecision,
-                         fdwClipPrecision,
-                         fdwQuality,
-                         fdwPitchAndFamily,
-                         lpszFace != NULL ? lpstrFaceNew : NULL);
-  return hFont;
+  LOGFONTA logFont =
+  {
+      nHeight,
+      nWidth,
+      nEscapement,
+      nOrientation,
+      fnWeight,
+      (BYTE)fdwItalic,
+      (BYTE)fdwUnderline,
+      (BYTE)fdwStrikeOut,
+      (BYTE)fdwCharSet,
+      (BYTE)fdwOutputPrecision,
+      (BYTE)fdwClipPrecision,
+      (BYTE)fdwQuality,
+      (BYTE)fdwPitchAndFamily
+  };
+  strcpy(logFont.lfFaceName, lpszFace);
+
+  return CreateFontIndirectA(&logFont);
 }
 //******************************************************************************

trunk/src/gdi32/text.cpp

@@ -1 @@
-/* $Id: text.cpp,v 1.20 2001-05-19 13:50:19 sandervl Exp $ */
+/* $Id: text.cpp,v 1.21 2001-05-24 19:26:31 sandervl Exp $ */
 
 /*
@@ -870 +870 @@
                                   LPSIZE lpsSize)
 {
+#if 1
+   //SvL: This works better than the code below. Can been seen clearly
+   //     in the Settings dialog box of VirtualPC. Strings are clipped.
+   //     (e.g.: Hard Disk 1 -> Hard Disk)
+   return O32_GetTextExtentPoint(hdc, lpsz, cbString, lpsSize);
+#else
    BOOL       rc;
    POINTLOS2  pts[TXTBOXOS_COUNT];
@@ -940 +946 @@
    SetLastError(ERROR_SUCCESS);
    return TRUE;
+#endif
 }
 //******************************************************************************