Sync with trunk r55875

svn path=/branches/GSoC_2011/GdiFontDriver/; revision=55877

Author: tkreuzer

win32ss/gdi/font/dcfont.c

@@ -50,7 +50,7 @@ PRFONT
 NTAPI
 DC_prfnt(PDC pdc)
 {
-    PRFONT prfnt;
+    PRFONT prfnt = 0;
 
     /* Select "current" font */
     DC_hSelectFont(pdc, pdc->pdcattr->hlfntNew);

win32ss/gdi/font/fntdrvsup.c

@@ -38,6 +38,7 @@ InitFontSupport(VOID)
     ghsemFontDriver = EngCreateSemaphore();
     if (!ghsemFontDriver) return FALSE;
 
+    /* Initialize the global public font taböe */
     if (!PFT_bInit(&gpftPublic)) return FALSE;
 
     return TRUE;
@@ -272,6 +273,7 @@ EngLoadFontFileFD(
 }
 
 BOOL
+NTAPI
 EngLoadFontDriver(
     IN PWSTR pwszDriverName)
 {
@@ -306,7 +308,7 @@ EngLoadFontDriver(
                                             HS_DDI_MAX,
                                             pfntdev->ahsurf,
                                             sizeof(GDIINFO),
-                                            &pfntdev->gdiinfo,
+                                            (ULONG*)&pfntdev->gdiinfo,
                                             sizeof(DEVINFO),
                                             &pfntdev->devinfo,
                                             (HDEV)pfntdev,

win32ss/gdi/font/font.h

@@ -410,10 +410,16 @@ GreExtTextOutW(
     IN OPTIONAL LPINT Dx,
     IN DWORD dwCodePage);
 
-
-#define DbgDefaultChannel 0x0
-
 VOID
 NTAPI
 EngAcquireSemaphoreShared(
     IN HSEMAPHORE hsem);
+
+BOOL
+NTAPI
+GreGetTextExtentW(
+    HDC hdc,
+    LPWSTR lpwsz,
+    INT cwc,
+    LPSIZE psize,
+    UINT flOpts);

win32ss/gdi/font/textmetric.c

@@ -239,6 +239,19 @@ NtGdiGetOutlineTextMetricsInternalW(
     return 0;
 }
 
+BOOL
+NTAPI
+GreGetTextExtentW(
+    HDC hdc,
+    LPWSTR lpwsz,
+    INT cwc,
+    LPSIZE psize,
+    UINT flOpts)
+{
+    ASSERT(FALSE);
+    return FALSE;
+}
+
 W32KAPI
 BOOL
 APIENTRY
@@ -267,7 +280,7 @@ GreGetTextExtentExW(
 {
     PDC pdc;
     PRFONT prfnt;
-    BOOL bResult;
+    BOOL bResult = 0;
     ESTROBJ estro;
 
     DPRINT1("GreGetTextExtentExW()\n");

win32ss/gdi/ntgdi/path.c

@@ -2288,12 +2288,10 @@ PATH_ExtTextOut(
     if (!count) return TRUE;
     if (flags & ETO_GLYPH_INDEX) ggo_flags |= GGO_GLYPH_INDEX;
 
-ASSERT(FALSE);
-
     for (idx = 0; idx < count; idx++)
     {
         MAT2 identity = { {0, 1}, {0, 0}, {0, 0}, {0, 1} };
-        GLYPHMETRICS gm;
+        GLYPHMETRICS gm = {0};
         DWORD dwSize;
         void *outline;
 
@@ -2331,13 +2329,12 @@ ASSERT(FALSE);
                                  outline,
                                  &identity,
                                  TRUE);
-#endif
 
             PATH_add_outline(dc, pPath, x + offset.x, y + offset.y, outline, dwSize);
 
             ExFreePoolWithTag(outline, TAG_PATH);
         }
-
+#endif
         if (dx)
         {
             if (flags & ETO_PDY)