add a NULL check in IntGdiInitBrushInstance if XlateObj is NULL fall back to use...
authorMagnus Olsen <magnus@greatlord.com>
Sat, 7 Jun 2008 01:14:12 +0000 (01:14 +0000)
committerMagnus Olsen <magnus@greatlord.com>
Sat, 7 Jun 2008 01:14:12 +0000 (01:14 +0000)
svn path=/trunk/; revision=33877

reactos/subsystems/win32/win32k/objects/brush.c

index 123f5eb..14247c7 100644 (file)
@@ -173,11 +173,25 @@ IntGdiInitBrushInstance(GDIBRUSHINST *BrushInst, PGDIBRUSHOBJ BrushObj, XLATEOBJ
    ASSERT(BrushInst);
    ASSERT(BrushObj);
    if (BrushObj->flAttrs & GDIBRUSH_IS_NULL)
+   {
       BrushInst->BrushObject.iSolidColor = 0;
+   }
    else if (BrushObj->flAttrs & GDIBRUSH_IS_SOLID)
-      BrushInst->BrushObject.iSolidColor = XLATEOBJ_iXlate(XlateObj, BrushObj->BrushAttr.lbColor);
+   {
+      if (XlateObj)
+      {
+         BrushInst->BrushObject.iSolidColor = XLATEOBJ_iXlate(XlateObj, BrushObj->BrushAttr.lbColor);
+      }
+      else
+      {
+          BrushInst->BrushObject.iSolidColor = 0xFFFFFFFF;
+      }
+   }
    else
+   {
       BrushInst->BrushObject.iSolidColor = 0xFFFFFFFF;
+   }
+
    BrushInst->BrushObject.pvRbrush = BrushObj->ulRealization;
    BrushInst->BrushObject.flColorType = 0;
    BrushInst->GdiBrushObject = BrushObj;