commit a3f4e7ff3f25d2c54c321500405fb13dd6c1cf35
author Lionel Ulmer <lionel.ulmer@free.fr> Wed Jul 03 01:16:45 2002 +0000
committer Alexandre Julliard <julliard@winehq.org> Wed Jul 03 01:16:45 2002 +0000
tree 76d848fd4df4b8578d8d0320177a3ab08551913e
parent 62a329a5282f3b0fab47970e3a0bd63d3ea257ea

Detect DCs without fonts and return an error in wglUseBitmapFonts.

dlls/opengl32/wgl.c

diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c
index dfaf5d6..a2ec03f 100644
--- a/dlls/opengl32/wgl.c
+++ b/dlls/opengl32/wgl.c
@@ -445,7 +445,7 @@
   if (fuPlanes) {
     WARN("Following layers unhandled : %08x\n", fuPlanes);
   }
-  
+
   return TRUE;
 }
 
@@ -459,7 +459,9 @@
 {
   Font fid = get_font( hdc );
 
-  TRACE("(%08x, %ld, %ld, %ld)\n", hdc, first, count, listBase);
+  TRACE("(%08x, %ld, %ld, %ld) using font %ld\n", hdc, first, count, listBase, fid);
+
+  if (fid == 0) return FALSE;
 
   ENTER_GL();
   /* I assume that the glyphs are at the same position for X and for Windows */

graphics/x11drv/init.c

diff --git a/graphics/x11drv/init.c b/graphics/x11drv/init.c
index 0e6edbe..5e2d83b 100644
--- a/graphics/x11drv/init.c
+++ b/graphics/x11drv/init.c
@@ -290,6 +290,7 @@
                 if (out_count >= sizeof(Font))
                 {
                     fontObject* pfo = XFONT_GetFontObject( physDev->font );
+		    if (pfo == NULL) return FALSE;
                     *(Font *)out_data = pfo->fs->fid;
                     return TRUE;
                 }