commit 802c4dee5793d8ee13f9ae6fbb9eab4190c45f53
author Aric Stewart <aric@codeweavers.com> Tue Jun 22 21:50:21 2010 +0900
committer Alexandre Julliard <julliard@winehq.org> Tue Jun 22 16:59:05 2010 +0200
tree 2f612a6140a9a4249afbb1f60780b4cffed2c28d
parent 302fb5f15a7079860d3f2386b4239ae6a25c896c

winex11.drv: Make UploadGlyph fallback to notdef and space so as to not fail.

dlls/winex11.drv/xrender.c

diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c
index 810b163..2fc804a 100644
--- a/dlls/winex11.drv/xrender.c
+++ b/dlls/winex11.drv/xrender.c
@@ -1205,7 +1205,7 @@
  *
  * Helper to ExtTextOut.  Must be called inside xrender_cs
  */
-static BOOL UploadGlyph(X11DRV_PDEVICE *physDev, int glyph, AA_Type format)
+static void UploadGlyph(X11DRV_PDEVICE *physDev, int glyph, AA_Type format)
 {
     unsigned int buflen;
     char *buf;
@@ -1252,8 +1252,16 @@
             buflen = GetGlyphOutlineW(physDev->hdc, glyph, ggo_format, &gm, 0, NULL, &identity);
         }
         if(buflen == GDI_ERROR) {
-            WARN("GetGlyphOutlineW failed\n");
-            return FALSE;
+            WARN("GetGlyphOutlineW failed using default glyph\n");
+            buflen = GetGlyphOutlineW(physDev->hdc, 0, ggo_format, &gm, 0, NULL, &identity);
+            if(buflen == GDI_ERROR) {
+                WARN("GetGlyphOutlineW failed for default glyph trying for space\n");
+                buflen = GetGlyphOutlineW(physDev->hdc, 0x20, ggo_format, &gm, 0, NULL, &identity);
+                if(buflen == GDI_ERROR) {
+                    ERR("GetGlyphOutlineW for all attempts unable to upload a glyph\n");
+                    return;
+                }
+            }
         }
         TRACE("Turning off antialiasing for this monochrome font\n");
     }
@@ -1423,8 +1431,6 @@
     }
 
     formatEntry->gis[glyph] = gi;
-
-    return TRUE;
 }
 
 static void SharpGlyphMono(X11DRV_PDEVICE *physDev, INT x, INT y,