Changeset 10605 for trunk/src/gdi32

Timestamp:

May 24, 2004, 10:51:25 AM (21 years ago)

Author:

sandervl

Message:

KOM: update

File:

• trunk/src/gdi32/font.cpp (modified) (9 diffs)

trunk/src/gdi32/font.cpp

@@ -1 @@
-/* $Id: font.cpp,v 1.35 2004-01-11 11:42:11 sandervl Exp $ */
+/* $Id: font.cpp,v 1.36 2004-05-24 08:50:31 sandervl Exp $ */
 
 /*
@@ -319 +319 @@
         strcpy( afont.lfFaceName, "WarpSans Combined" );
     }
+
+#if 1
+    if( afont.lfCharSet == ANSI_CHARSET )
+        afont.lfCharSet = DEFAULT_CHARSET;
+#endif
   }
 
@@ -901 +906 @@
     else {
         switch(charset) {
-        case OEM_CHARSET:
-            cp = GetOEMCP();
-            break;
-        case DEFAULT_CHARSET:
-            cp = GetACP();
-            break;
-
-        case VISCII_CHARSET:
-        case TCVN_CHARSET:
-        case KOI8_CHARSET:
-        case ISO3_CHARSET:
-        case ISO4_CHARSET:
-          /* FIXME: These have no place here, but because x11drv
-             enumerates fonts with these (made up) charsets some apps
-             might use them and then the FIXME below would become
-             annoying.  Now we could pick the intended codepage for
-             each of these, but since it's broken anyway we'll just
-             use CP_ACP and hope it'll go away...
-          */
-            cp = CP_ACP;
-            break;
-
-
-        default:
-            dprintf(("Can't find codepage for charset %d\n", charset));
-            break;
-        }
+    case OEM_CHARSET:
+        cp = GetOEMCP();
+        break;
+    case DEFAULT_CHARSET:
+        cp = GetACP();
+        break;
+
+    case VISCII_CHARSET:
+    case TCVN_CHARSET:
+    case KOI8_CHARSET:
+    case ISO3_CHARSET:
+    case ISO4_CHARSET:
+      /* FIXME: These have no place here, but because x11drv
+         enumerates fonts with these (made up) charsets some apps
+         might use them and then the FIXME below would become
+         annoying.  Now we could pick the intended codepage for
+         each of these, but since it's broken anyway we'll just
+         use CP_ACP and hope it'll go away...
+      */
+        cp = CP_ACP;
+        break;
+
+
+    default:
+        dprintf(("Can't find codepage for charset %d\n", charset));
+        break;
+    }
     }
 
@@ -935 +940 @@
     if(cp != CP_SYMBOL) {
         lenW = MultiByteToWideChar(cp, 0, str, count, NULL, 0);
-        strW = (WCHAR*)HeapAlloc(GetProcessHeap(), 0, (lenW + 1) * sizeof(WCHAR));
-        MultiByteToWideChar(cp, 0, str, count, strW, lenW);
+    strW = (WCHAR*)HeapAlloc(GetProcessHeap(), 0, (lenW + 1) * sizeof(WCHAR));
+    MultiByteToWideChar(cp, 0, str, count, strW, lenW);
     } else {
         lenW = count;
-        strW = (WCHAR*)HeapAlloc(GetProcessHeap(), 0, (lenW + 1) * sizeof(WCHAR));
-        for(i = 0; i < count; i++) strW[i] = (BYTE)str[i];
+    strW = (WCHAR*)HeapAlloc(GetProcessHeap(), 0, (lenW + 1) * sizeof(WCHAR));
+    for(i = 0; i < count; i++) strW[i] = (BYTE)str[i];
     }
     strW[lenW] = '\0';
@@ -953 +958 @@
  */
 DWORD WINAPI GetGlyphIndicesA(HDC hdc, LPCSTR lpstr, INT count,
-                              LPWORD pgi, DWORD flags)
+                  LPWORD pgi, DWORD flags)
 {
     DWORD ret;
@@ -973 +978 @@
  */
 DWORD WINAPI GetGlyphIndicesW(HDC hdc, LPCWSTR lpstr, INT count,
-                              LPWORD pgi, DWORD flags)
+                  LPWORD pgi, DWORD flags)
 {
     DWORD ret;
@@ -982 +987 @@
     if(!hdc) return GDI_ERROR;
 
-    ret = FT2Module.Ft2GetGlyphIndices(hdc, lpstr, count , pgi, flags); 
+    ret = FT2Module.Ft2GetGlyphIndices(hdc, lpstr, count , pgi, flags);
     if(ret != GDI_ERROR) {
         for(int i=0;i<ret;i++) {
@@ -1007 +1012 @@
         if (p)
         {
-            c = p[0];
-        }
-        else
-        {
+        c = p[0];
+    }
+    else
+    {
             SetLastError(ERROR_NOT_ENOUGH_MEMORY);
-            return GDI_ERROR;
-        }
+        return GDI_ERROR;
+    }
     }
     else
@@ -1019 +1024 @@
         c = uChar;
     }
-    
+
     ret = GetGlyphOutlineW (hdc, c, fuFormat, lpgm, cbBuffer, lpBuffer, lpmat2);
-    
+
     if (p != NULL)
     {
         HeapFree (GetProcessHeap(), 0, p);
     }
-    
+
     return ret;
 }