opengl32: Fix empty glyph handling.

33e05eb6 · Akihiro Sagawa · Alexandre Julliard · 310a3b1d · 33e05eb6
Commit 33e05eb6 authored Sep 20, 2013 by Akihiro Sagawa Committed by Alexandre Julliard Sep 23, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 5 deletions

wgl.c dlls/opengl32/wgl.c +9 -5

No files found.
--- a/dlls/opengl32/wgl.c
+++ b/dlls/opengl32/wgl.c
@@ -1121,11 +1121,15 @@ static BOOL wglUseFontBitmaps_common( HDC hdc, DWORD first, DWORD count, DWORD l
             bitmap = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size);
             gl_bitmap = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size);
         }
-         if (unicode)
+         if (needed_size != 0) {
-             ret = (GetGlyphOutlineW(hdc, glyph, GGO_BITMAP, &gm, size, bitmap, &identity) != GDI_ERROR);
+             if (unicode)
-         else
+                 ret = (GetGlyphOutlineW(hdc, glyph, GGO_BITMAP, &gm,
-             ret = (GetGlyphOutlineA(hdc, glyph, GGO_BITMAP, &gm, size, bitmap, &identity) != GDI_ERROR);
+                                         size, bitmap, &identity) != GDI_ERROR);
-         if (!ret) break;
+             else
+                 ret = (GetGlyphOutlineA(hdc, glyph, GGO_BITMAP, &gm,
+                                         size, bitmap, &identity) != GDI_ERROR);
+             if (!ret) break;
+         }
         if (TRACE_ON(wgl)) {
             unsigned int bitmask;