4 May
2012
4 May
'12
5:37 p.m.
Author: tkreuzer
Date: Fri May 4 17:37:07 2012
New Revision: 56496
URL: http://svn.reactos.org/svn/reactos?rev=56496&view=rev
Log:
[WIN32K]
- Add cjMaxBits parameter to GreCreateDIBitmapInternal
- Rename GDIBRUSH_* constants to BR_*, as they are named in gdikdx
Modified:
trunk/reactos/win32ss/gdi/eng/engbrush.c
trunk/reactos/win32ss/gdi/eng/lineto.c
trunk/reactos/win32ss/gdi/ntgdi/bitblt.c
trunk/reactos/win32ss/gdi/ntgdi/bitmaps.h
trunk/reactos/win32ss/gdi/ntgdi/brush.c
trunk/reactos/win32ss/gdi/ntgdi/brush.h
trunk/reactos/win32ss/gdi/ntgdi/dibobj.c
trunk/reactos/win32ss/gdi/ntgdi/drawing.c
trunk/reactos/win32ss/gdi/ntgdi/fillshap.c
trunk/reactos/win32ss/gdi/ntgdi/line.c
trunk/reactos/win32ss/gdi/ntgdi/pen.c
trunk/reactos/win32ss/gdi/ntgdi/stockobj.c
Modified: trunk/reactos/win32ss/gdi/eng/engbrush.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/engbrush.c…
==============================================================================
--- trunk/reactos/win32ss/gdi/eng/engbrush.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/eng/engbrush.c [iso-8859-1] Fri May 4 17:37:07 2012
@@ -40,12 +40,12 @@
GDIOBJ_vReferenceObjectByPointer(&pebo->ppalSurf->BaseObject);
//pebo->ppalDC = pdc->dclevel.ppal;
- if (pbrush->flAttrs & GDIBRUSH_IS_NULL)
+ if (pbrush->flAttrs & BR_IS_NULL)
{
/* NULL brushes don't need a color */
pebo->BrushObject.iSolidColor = 0;
}
- else if (pbrush->flAttrs & GDIBRUSH_IS_SOLID)
+ else if (pbrush->flAttrs & BR_IS_SOLID)
{
/* Set the RGB color */
EBRUSHOBJ_vSetSolidRGBColor(pebo, pbrush->BrushAttr.lbColor);
@@ -56,7 +56,7 @@
pebo->BrushObject.iSolidColor = 0xFFFFFFFF;
/* Use foreground color of hatch brushes */
- if (pbrush->flAttrs & GDIBRUSH_IS_HATCH)
+ if (pbrush->flAttrs & BR_IS_HATCH)
pebo->crCurrentText = pbrush->BrushAttr.lbColor;
}
}
@@ -69,7 +69,7 @@
EXLATEOBJ exlo;
/* Never use with non-solid brushes */
- ASSERT(pebo->flattrs & GDIBRUSH_IS_SOLID);
+ ASSERT(pebo->flattrs & BR_IS_SOLID);
/* Set the RGB color */
pebo->crRealize = crColor;
@@ -217,7 +217,7 @@
psurfMask = NULL;
/* DIB brushes with DIB_PAL_COLORS usage need a new palette */
- if (pebo->pbrush->flAttrs & GDIBRUSH_IS_DIBPALCOLORS)
+ if (pebo->pbrush->flAttrs & BR_IS_DIBPALCOLORS)
{
ASSERT(FALSE);
ppalPattern = 0; //CreateDIBPalette(psurfPattern->ppal, pebo->ppalDC);
Modified: trunk/reactos/win32ss/gdi/eng/lineto.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/lineto.c?r…
==============================================================================
--- trunk/reactos/win32ss/gdi/eng/lineto.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/eng/lineto.c [iso-8859-1] Fri May 4 17:37:07 2012
@@ -519,7 +519,7 @@
ASSERT(GdiBrush);
ASSERT(GdiBrush->pbrush);
- if (GdiBrush->pbrush->flAttrs & GDIBRUSH_IS_NULL)
+ if (GdiBrush->pbrush->flAttrs & BR_IS_NULL)
return TRUE;
/* No success yet */
Modified: trunk/reactos/win32ss/gdi/ntgdi/bitblt.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/bitblt.c…
==============================================================================
--- trunk/reactos/win32ss/gdi/ntgdi/bitblt.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/ntgdi/bitblt.c [iso-8859-1] Fri May 4 17:37:07 2012
@@ -831,7 +831,7 @@
FIXUP_ROP(dwRop);
- if (pbrush->flAttrs & GDIBRUSH_IS_NULL)
+ if (pbrush->flAttrs & BR_IS_NULL)
{
return TRUE;
}
Modified: trunk/reactos/win32ss/gdi/ntgdi/bitmaps.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/bitmaps.…
==============================================================================
--- trunk/reactos/win32ss/gdi/ntgdi/bitmaps.h [iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/ntgdi/bitmaps.h [iso-8859-1] Fri May 4 17:37:07 2012
@@ -25,7 +25,7 @@
_In_ FLONG flags);
HBITMAP
-FASTCALL
+NTAPI
GreCreateDIBitmapInternal(
IN HDC hDc,
IN INT cx,
@@ -35,4 +35,5 @@
IN OPTIONAL PBITMAPINFO pbmi,
IN DWORD iUsage,
IN FLONG fl,
+ IN UINT cjMaxBits,
IN HANDLE hcmXform);
Modified: trunk/reactos/win32ss/gdi/ntgdi/brush.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/brush.c?…
==============================================================================
--- trunk/reactos/win32ss/gdi/ntgdi/brush.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/ntgdi/brush.c [iso-8859-1] Fri May 4 17:37:07 2012
@@ -40,7 +40,7 @@
IntGdiSetBrushOwner(PBRUSH pbr, ULONG ulOwner)
{
// FIXME:
- if (pbr->flAttrs & GDIBRUSH_IS_GLOBAL) return TRUE;
+ if (pbr->flAttrs & BR_IS_GLOBAL) return TRUE;
if ((ulOwner == GDI_OBJ_HMGR_PUBLIC) || ulOwner == GDI_OBJ_HMGR_NONE)
{
@@ -129,7 +129,7 @@
BRUSH_Cleanup(PVOID ObjectBody)
{
PBRUSH pbrush = (PBRUSH)ObjectBody;
- if (pbrush->flAttrs & (GDIBRUSH_IS_HATCH | GDIBRUSH_IS_BITMAP))
+ if (pbrush->flAttrs & (BR_IS_HATCH | BR_IS_BITMAP))
{
ASSERT(pbrush->hbmPattern);
GreSetObjectOwner(pbrush->hbmPattern, GDI_OBJ_HMGR_POWNED);
@@ -162,7 +162,7 @@
Buffer->lbColor = pbrush->BrushAttr.lbColor;
/* Set Hatch */
- if ((pbrush->flAttrs & GDIBRUSH_IS_HATCH)!=0)
+ if ((pbrush->flAttrs & BR_IS_HATCH)!=0)
{
/* FIXME: This is not the right value */
Buffer->lbHatch = (LONG)pbrush->hbmPattern;
@@ -175,23 +175,23 @@
Buffer->lbStyle = 0;
/* Get the type of style */
- if ((pbrush->flAttrs & GDIBRUSH_IS_SOLID)!=0)
+ if ((pbrush->flAttrs & BR_IS_SOLID)!=0)
{
Buffer->lbStyle = BS_SOLID;
}
- else if ((pbrush->flAttrs & GDIBRUSH_IS_NULL)!=0)
+ else if ((pbrush->flAttrs & BR_IS_NULL)!=0)
{
Buffer->lbStyle = BS_NULL; // BS_HOLLOW
}
- else if ((pbrush->flAttrs & GDIBRUSH_IS_HATCH)!=0)
+ else if ((pbrush->flAttrs & BR_IS_HATCH)!=0)
{
Buffer->lbStyle = BS_HATCHED;
}
- else if ((pbrush->flAttrs & GDIBRUSH_IS_BITMAP)!=0)
+ else if ((pbrush->flAttrs & BR_IS_BITMAP)!=0)
{
Buffer->lbStyle = BS_PATTERN;
}
- else if ((pbrush->flAttrs & GDIBRUSH_IS_DIB)!=0)
+ else if ((pbrush->flAttrs & BR_IS_DIB)!=0)
{
Buffer->lbStyle = BS_DIBPATTERN;
}
@@ -254,7 +254,7 @@
}
hBrush = pbrush->BaseObject.hHmgr;
- pbrush->flAttrs |= GDIBRUSH_IS_BITMAP | GDIBRUSH_IS_DIB;
+ pbrush->flAttrs |= BR_IS_BITMAP | BR_IS_DIB;
pbrush->hbmPattern = hPattern;
/* FIXME: Fill in the rest of fields!!! */
@@ -296,7 +296,7 @@
}
hBrush = pbrush->BaseObject.hHmgr;
- pbrush->flAttrs |= GDIBRUSH_IS_HATCH;
+ pbrush->flAttrs |= BR_IS_HATCH;
pbrush->hbmPattern = hPattern;
pbrush->BrushAttr.lbColor = Color & 0xFFFFFF;
@@ -332,7 +332,7 @@
}
hBrush = pbrush->BaseObject.hHmgr;
- pbrush->flAttrs |= GDIBRUSH_IS_BITMAP;
+ pbrush->flAttrs |= BR_IS_BITMAP;
pbrush->hbmPattern = hPattern;
/* FIXME: Fill in the rest of fields!!! */
@@ -359,7 +359,7 @@
}
hBrush = pbrush->BaseObject.hHmgr;
- pbrush->flAttrs |= GDIBRUSH_IS_SOLID;
+ pbrush->flAttrs |= BR_IS_SOLID;
pbrush->BrushAttr.lbColor = Color & 0x00FFFFFF;
/* FIXME: Fill in the rest of fields!!! */
@@ -384,7 +384,7 @@
}
hBrush = pbrush->BaseObject.hHmgr;
- pbrush->flAttrs |= GDIBRUSH_IS_NULL;
+ pbrush->flAttrs |= BR_IS_NULL;
GDIOBJ_vUnlockObject(&pbrush->BaseObject);
return hBrush;
@@ -397,7 +397,7 @@
PBRUSH pbrush;
pbrush = BRUSH_ShareLockBrush(hBrush);
- if (pbrush->flAttrs & GDIBRUSH_IS_SOLID)
+ if (pbrush->flAttrs & BR_IS_SOLID)
{
pbrush->BrushAttr.lbColor = Color & 0xFFFFFF;
}
Modified: trunk/reactos/win32ss/gdi/ntgdi/brush.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/brush.h?…
==============================================================================
--- trunk/reactos/win32ss/gdi/ntgdi/brush.h [iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/ntgdi/brush.h [iso-8859-1] Fri May 4 17:37:07 2012
@@ -19,7 +19,7 @@
ULONG ulStyle;
HBITMAP hbmPattern;
- HANDLE hbmClient;
+ HBITMAP hbmClient;
ULONG flAttrs;
ULONG ulBrushUnique;
@@ -67,24 +67,24 @@
} EBRUSHOBJ, *PEBRUSHOBJ;
/* GDI Brush Attributes */
-#define GDIBRUSH_NEED_FG_CLR 0x0001
-#define GDIBRUSH_NEED_BK_CLR 0x0002 /* Background color is needed */
-#define GDIBRUSH_DITHER_OK 0x0004 /* Allow color dithering */
-#define GDIBRUSH_IS_SOLID 0x0010 /* Solid brush */
-#define GDIBRUSH_IS_HATCH 0x0020 /* Hatch brush */
-#define GDIBRUSH_IS_BITMAP 0x0040 /* DDB pattern brush */
-#define GDIBRUSH_IS_DIB 0x0080 /* DIB pattern brush */
-#define GDIBRUSH_IS_NULL 0x0100 /* Null/hollow brush */
-#define GDIBRUSH_IS_GLOBAL 0x0200 /* Stock objects */
-#define GDIBRUSH_IS_PEN 0x0400 /* Pen */
-#define GDIBRUSH_IS_OLDSTYLEPEN 0x0800 /* Geometric pen */
-#define GDIBRUSH_IS_DIBPALCOLORS 0x1000
-#define GDIBRUSH_IS_DIBPALINDICE 0x2000
-#define GDIBRUSH_IS_DEFAULTSTYLE 0x4000
-#define GDIBRUSH_IS_MASKING 0x8000 /* Pattern bitmap is used as transparent mask (?) */
-#define GDIBRUSH_IS_INSIDEFRAME 0x00010000
-#define GDIBRUSH_CACHED_ENGINE 0x00040000
-#define GDIBRUSH_CACHED_IS_SOLID 0x80000000
+#define BR_NEED_FG_CLR 0x00000001
+#define BR_NEED_BK_CLR 0x00000002 /* Background color is needed */
+#define BR_DITHER_OK 0x00000004 /* Allow color dithering */
+#define BR_IS_SOLID 0x00000010 /* Solid brush */
+#define BR_IS_HATCH 0x00000020 /* Hatch brush */
+#define BR_IS_BITMAP 0x00000040 /* DDB pattern brush */
+#define BR_IS_DIB 0x00000080 /* DIB pattern brush */
+#define BR_IS_NULL 0x00000100 /* Null/hollow brush */
+#define BR_IS_GLOBAL 0x00000200 /* Stock objects */
+#define BR_IS_PEN 0x00000400 /* Pen */
+#define BR_IS_OLDSTYLEPEN 0x00000800 /* Geometric pen */
+#define BR_IS_DIBPALCOLORS 0x00001000
+#define BR_IS_DIBPALINDICE 0x00002000
+#define BR_IS_DEFAULTSTYLE 0x00004000
+#define BR_IS_MASKING 0x00008000 /* Pattern bitmap is used as transparent mask (?)
*/
+#define BR_IS_INSIDEFRAME 0x00010000
+#define BR_CACHED_ENGINE 0x00040000
+#define BR_CACHED_IS_SOLID 0x80000000
#define BRUSH_AllocBrush() ((PBRUSH) GDIOBJ_AllocObj(GDIObjType_BRUSH_TYPE))
#define BRUSH_AllocBrushWithHandle() ((PBRUSH)
GDIOBJ_AllocObjWithHandle(GDI_OBJECT_TYPE_BRUSH, sizeof(BRUSH)))
Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dibobj.c…
==============================================================================
--- trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] Fri May 4 17:37:07 2012
@@ -1294,6 +1294,7 @@
pbmi,
iUsage,
fl,
+ cjMaxBits,
hcmXform);
cleanup:
@@ -1302,7 +1303,7 @@
}
HBITMAP
-FASTCALL
+NTAPI
GreCreateDIBitmapInternal(
IN HDC hDc,
IN INT cx,
@@ -1312,6 +1313,7 @@
IN OPTIONAL PBITMAPINFO pbmi,
IN DWORD iUsage,
IN FLONG fl,
+ IN UINT cjMaxBits,
IN HANDLE hcmXform)
{
PDC Dc;
Modified: trunk/reactos/win32ss/gdi/ntgdi/drawing.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/drawing.…
==============================================================================
--- trunk/reactos/win32ss/gdi/ntgdi/drawing.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/ntgdi/drawing.c [iso-8859-1] Fri May 4 17:37:07 2012
@@ -1263,7 +1263,7 @@
return 0;
}
- if (!(pbrush->flAttrs & GDIBRUSH_IS_NULL))
+ if (!(pbrush->flAttrs & BR_IS_NULL))
{
pdcattr = dc->pdcattr;
Modified: trunk/reactos/win32ss/gdi/ntgdi/fillshap.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/fillshap…
==============================================================================
--- trunk/reactos/win32ss/gdi/ntgdi/fillshap.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/ntgdi/fillshap.c [iso-8859-1] Fri May 4 17:37:07 2012
@@ -85,7 +85,7 @@
ASSERT(psurf);
/* Now fill the polygon with the current fill brush. */
- if (!(pbrFill->flAttrs & GDIBRUSH_IS_NULL))
+ if (!(pbrFill->flAttrs & BR_IS_NULL))
{
BrushOrigin = *((PPOINTL)&pbrFill->ptOrigin);
BrushOrigin.x += dc->ptlDCOrig.x;
@@ -100,7 +100,7 @@
}
// Draw the Polygon Edges with the current pen ( if not a NULL pen )
- if (!(pbrLine->flAttrs & GDIBRUSH_IS_NULL))
+ if (!(pbrLine->flAttrs & BR_IS_NULL))
{
int i;
@@ -574,7 +574,7 @@
if (pbrFill)
{
- if (!(pbrFill->flAttrs & GDIBRUSH_IS_NULL))
+ if (!(pbrFill->flAttrs & BR_IS_NULL))
{
BrushOrigin = *((PPOINTL)&pbrFill->ptOrigin);
BrushOrigin.x += dc->ptlDCOrig.x;
@@ -597,7 +597,7 @@
ret = TRUE; // Change default to success
- if (!(pbrLine->flAttrs & GDIBRUSH_IS_NULL))
+ if (!(pbrLine->flAttrs & BR_IS_NULL))
{
Mix = ROP2_TO_MIX(pdcattr->jROP2);
ret = ret && IntEngLineTo(&psurf->SurfObj,
Modified: trunk/reactos/win32ss/gdi/ntgdi/line.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/line.c?r…
==============================================================================
--- trunk/reactos/win32ss/gdi/ntgdi/line.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/ntgdi/line.c [iso-8859-1] Fri May 4 17:37:07 2012
@@ -131,7 +131,7 @@
pbrLine = dc->dclevel.pbrLine;
ASSERT(pbrLine);
- if (!(pbrLine->flAttrs & GDIBRUSH_IS_NULL))
+ if (!(pbrLine->flAttrs & BR_IS_NULL))
{
Ret = IntEngLineTo(&psurf->SurfObj,
dc->rosdc.CombinedClip,
@@ -249,7 +249,7 @@
pbrLine = dc->dclevel.pbrLine;
ASSERT(pbrLine);
- if (!(pbrLine->flAttrs & GDIBRUSH_IS_NULL))
+ if (!(pbrLine->flAttrs & BR_IS_NULL))
{
Points = EngAllocMem(0, Count * sizeof(POINT), GDITAG_TEMP);
if (Points != NULL)
Modified: trunk/reactos/win32ss/gdi/ntgdi/pen.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/pen.c?re…
==============================================================================
--- trunk/reactos/win32ss/gdi/ntgdi/pen.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/ntgdi/pen.c [iso-8859-1] Fri May 4 17:37:07 2012
@@ -86,7 +86,7 @@
pbrushPen->dwStyleCount = dwStyleCount;
pbrushPen->pStyle = pStyle;
- pbrushPen->flAttrs = bOldStylePen? GDIBRUSH_IS_OLDSTYLEPEN : GDIBRUSH_IS_PEN;
+ pbrushPen->flAttrs = bOldStylePen? BR_IS_OLDSTYLEPEN : BR_IS_PEN;
// If dwPenStyle is PS_COSMETIC, the width must be set to 1.
if ( !(bOldStylePen) && ((dwPenStyle & PS_TYPE_MASK) == PS_COSMETIC)
&& ( dwWidth != 1) )
@@ -95,40 +95,40 @@
switch (dwPenStyle & PS_STYLE_MASK)
{
case PS_NULL:
- pbrushPen->flAttrs |= GDIBRUSH_IS_NULL;
+ pbrushPen->flAttrs |= BR_IS_NULL;
break;
case PS_SOLID:
- pbrushPen->flAttrs |= GDIBRUSH_IS_SOLID;
+ pbrushPen->flAttrs |= BR_IS_SOLID;
break;
case PS_ALTERNATE:
- pbrushPen->flAttrs |= GDIBRUSH_IS_BITMAP;
+ pbrushPen->flAttrs |= BR_IS_BITMAP;
pbrushPen->hbmPattern = GreCreateBitmap(24, 1, 1, 1,
(LPBYTE)PatternAlternate);
break;
case PS_DOT:
- pbrushPen->flAttrs |= GDIBRUSH_IS_BITMAP;
+ pbrushPen->flAttrs |= BR_IS_BITMAP;
pbrushPen->hbmPattern = GreCreateBitmap(24, 1, 1, 1, (LPBYTE)PatternDot);
break;
case PS_DASH:
- pbrushPen->flAttrs |= GDIBRUSH_IS_BITMAP;
+ pbrushPen->flAttrs |= BR_IS_BITMAP;
pbrushPen->hbmPattern = GreCreateBitmap(24, 1, 1, 1, (LPBYTE)PatternDash);
break;
case PS_DASHDOT:
- pbrushPen->flAttrs |= GDIBRUSH_IS_BITMAP;
+ pbrushPen->flAttrs |= BR_IS_BITMAP;
pbrushPen->hbmPattern = GreCreateBitmap(24, 1, 1, 1,
(LPBYTE)PatternDashDot);
break;
case PS_DASHDOTDOT:
- pbrushPen->flAttrs |= GDIBRUSH_IS_BITMAP;
+ pbrushPen->flAttrs |= BR_IS_BITMAP;
pbrushPen->hbmPattern = GreCreateBitmap(24, 1, 1, 1,
(LPBYTE)PatternDashDotDot);
break;
case PS_INSIDEFRAME:
- pbrushPen->flAttrs |= (GDIBRUSH_IS_SOLID|GDIBRUSH_IS_INSIDEFRAME);
+ pbrushPen->flAttrs |= (BR_IS_SOLID|BR_IS_INSIDEFRAME);
break;
case PS_USERSTYLE:
@@ -136,7 +136,7 @@
{
/* FIXME: PS_USERSTYLE workaround */
DPRINT1("PS_COSMETIC | PS_USERSTYLE not handled\n");
- pbrushPen->flAttrs |= GDIBRUSH_IS_SOLID;
+ pbrushPen->flAttrs |= BR_IS_SOLID;
break;
}
else
@@ -180,7 +180,7 @@
pbrPen = PEN_ShareLockPen(hPen);
if (pbrPen)
{
- if (pbrPen->flAttrs & GDIBRUSH_IS_SOLID)
+ if (pbrPen->flAttrs & BR_IS_SOLID)
{
pbrPen->BrushAttr.lbColor = Color & 0xFFFFFF;
}
@@ -195,7 +195,7 @@
PEXTLOGPEN pExtLogPen;
INT cbRetCount;
- if (pbrushPen->flAttrs & GDIBRUSH_IS_OLDSTYLEPEN)
+ if (pbrushPen->flAttrs & BR_IS_OLDSTYLEPEN)
{
cbRetCount = sizeof(LOGPEN);
if (pBuffer)
Modified: trunk/reactos/win32ss/gdi/ntgdi/stockobj.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/stockobj…
==============================================================================
--- trunk/reactos/win32ss/gdi/ntgdi/stockobj.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/ntgdi/stockobj.c [iso-8859-1] Fri May 4 17:37:07 2012
@@ -120,16 +120,16 @@
pbrushPen->hbmClient = (HANDLE)NULL;
pbrushPen->dwStyleCount = 0;
pbrushPen->pStyle = 0;
- pbrushPen->flAttrs = GDIBRUSH_IS_OLDSTYLEPEN;
+ pbrushPen->flAttrs = BR_IS_OLDSTYLEPEN;
switch (dwPenStyle & PS_STYLE_MASK)
{
case PS_NULL:
- pbrushPen->flAttrs |= GDIBRUSH_IS_NULL;
+ pbrushPen->flAttrs |= BR_IS_NULL;
break;
case PS_SOLID:
- pbrushPen->flAttrs |= GDIBRUSH_IS_SOLID;
+ pbrushPen->flAttrs |= BR_IS_SOLID;
break;
}
hPen = pbrushPen->BaseObject.hHmgr;