Patch for WordViewer95

Francois Gouget fgouget at free.fr
Sun Apr 8 18:42:22 CDT 2001


   WordViewer95 was crashing in GetDeviceCaps because dc->devCaps was
NULL.


Changelog:

 * objects/dc.c
   GetDeviceCaps: make sure the devCaps field is not NULL before
dereferencing it


--
Francois Gouget         fgouget at free.fr        http://fgouget.free.fr/
The nice thing about meditation is that it makes doing nothing quite respectable
                                  -- Paul Dean
-------------- next part --------------
Index: objects/dc.c
===================================================================
RCS file: /home/cvs/wine/wine/objects/dc.c,v
retrieving revision 1.52
diff -u -r1.52 dc.c
--- objects/dc.c	2001/03/20 01:55:18	1.52
+++ objects/dc.c	2001/04/08 22:56:24
@@ -841,9 +841,12 @@
                   hdc,cap );
         if ((dc = DC_GetDCPtr( hdc )))
         {
-            ret = *(WORD *)(((char *)dc->devCaps) + cap);
+            if (dc->devCaps)
+            {
+                ret = *(WORD *)(((char *)dc->devCaps) + cap);
+                if ((cap == NUMCOLORS) && (ret == 0xffff)) ret = -1;
+            }
             GDI_ReleaseObj( hdc );
-            if ((cap == NUMCOLORS) && (ret == 0xffff)) ret = -1;
         }
         break;
     }


More information about the wine-patches mailing list