https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dcc512a2455689ad615ef…
commit dcc512a2455689ad615ef02335e3916a71d987ee
Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com>
AuthorDate: Tue Dec 31 12:36:08 2019 +0900
Commit: GitHub <noreply(a)github.com>
CommitDate: Tue Dec 31 12:36:08 2019 +0900
[SDK][INCLUDE] Rename Gdiplus::Brush::brush as nativeBrush (#2204)
Make it w32api-compatible. CORE-16585
---
sdk/include/psdk/gdiplusbrush.h | 4 +--
sdk/include/psdk/gdiplusgraphics.h | 55 +++++++++++++++++++++-----------------
sdk/include/psdk/gdipluspen.h | 2 +-
3 files changed, 34 insertions(+), 27 deletions(-)
diff --git a/sdk/include/psdk/gdiplusbrush.h b/sdk/include/psdk/gdiplusbrush.h
index e5b8b2f52fe..581f88d16f1 100644
--- a/sdk/include/psdk/gdiplusbrush.h
+++ b/sdk/include/psdk/gdiplusbrush.h
@@ -40,13 +40,13 @@ class Brush : public GdiplusBase
BrushType GetType(VOID)
{
BrushType type;
- SetStatus(DllExports::GdipGetBrushType(brush, &type));
+ SetStatus(DllExports::GdipGetBrushType(nativeBrush, &type));
return type;
}
private:
mutable Status status;
- GpBrush *brush;
+ GpBrush *nativeBrush;
Status
SetStatus(Status status) const
diff --git a/sdk/include/psdk/gdiplusgraphics.h b/sdk/include/psdk/gdiplusgraphics.h
index 679afe5763b..5b2ace1c496 100644
--- a/sdk/include/psdk/gdiplusgraphics.h
+++ b/sdk/include/psdk/gdiplusgraphics.h
@@ -719,53 +719,54 @@ class Graphics : public GdiplusBase
Status
FillClosedCurve(const Brush *brush, const Point *points, INT count)
{
- return SetStatus(DllExports::GdipFillClosedCurveI(graphics, brush ?
brush->brush : NULL, points, count));
+ return SetStatus(DllExports::GdipFillClosedCurveI(graphics, brush ?
brush->nativeBrush : NULL, points, count));
}
Status
FillClosedCurve(const Brush *brush, const Point *points, INT count, FillMode
fillMode, REAL tension)
{
- return SetStatus(
- DllExports::GdipFillClosedCurve2I(graphics, brush ? brush->brush : NULL,
points, count, tension, fillMode));
+ return SetStatus(DllExports::GdipFillClosedCurve2I(
+ graphics, brush ? brush->nativeBrush : NULL, points, count, tension,
fillMode));
}
Status
FillClosedCurve(const Brush *brush, const PointF *points, INT count)
{
- return SetStatus(DllExports::GdipFillClosedCurve(graphics, brush ?
brush->brush : NULL, points, count));
+ return SetStatus(DllExports::GdipFillClosedCurve(graphics, brush ?
brush->nativeBrush : NULL, points, count));
}
Status
FillClosedCurve(const Brush *brush, const PointF *points, INT count, FillMode
fillMode, REAL tension)
{
- return SetStatus(
- DllExports::GdipFillClosedCurve2(graphics, brush ? brush->brush : NULL,
points, count, tension, fillMode));
+ return SetStatus(DllExports::GdipFillClosedCurve2(
+ graphics, brush ? brush->nativeBrush : NULL, points, count, tension,
fillMode));
}
Status
FillEllipse(const Brush *brush, const Rect &rect)
{
return SetStatus(DllExports::GdipFillEllipseI(
- graphics, brush ? brush->brush : NULL, rect.X, rect.Y, rect.Width,
rect.Height));
+ graphics, brush ? brush->nativeBrush : NULL, rect.X, rect.Y, rect.Width,
rect.Height));
}
Status
FillEllipse(const Brush *brush, REAL x, REAL y, REAL width, REAL height)
{
- return SetStatus(DllExports::GdipFillEllipse(graphics, brush ? brush->brush :
NULL, x, y, width, height));
+ return SetStatus(DllExports::GdipFillEllipse(graphics, brush ?
brush->nativeBrush : NULL, x, y, width, height));
}
Status
FillEllipse(const Brush *brush, const RectF &rect)
{
return SetStatus(DllExports::GdipFillEllipse(
- graphics, brush ? brush->brush : NULL, rect.X, rect.Y, rect.Width,
rect.Height));
+ graphics, brush ? brush->nativeBrush : NULL, rect.X, rect.Y, rect.Width,
rect.Height));
}
Status
FillEllipse(const Brush *brush, INT x, INT y, INT width, INT height)
{
- return SetStatus(DllExports::GdipFillEllipseI(graphics, brush ? brush->brush :
NULL, x, y, width, height));
+ return SetStatus(
+ DllExports::GdipFillEllipseI(graphics, brush ? brush->nativeBrush : NULL,
x, y, width, height));
}
Status
@@ -778,90 +779,96 @@ class Graphics : public GdiplusBase
FillPie(const Brush *brush, const Rect &rect, REAL startAngle, REAL sweepAngle)
{
return SetStatus(DllExports::GdipFillPieI(
- graphics, brush ? brush->brush : NULL, rect.X, rect.Y, rect.Width,
rect.Height, startAngle, sweepAngle));
+ graphics, brush ? brush->nativeBrush : NULL, rect.X, rect.Y, rect.Width,
rect.Height, startAngle,
+ sweepAngle));
}
Status
FillPie(const Brush *brush, INT x, INT y, INT width, INT height, REAL startAngle,
REAL sweepAngle)
{
return SetStatus(DllExports::GdipFillPieI(
- graphics, brush ? brush->brush : NULL, x, y, width, height, startAngle,
sweepAngle));
+ graphics, brush ? brush->nativeBrush : NULL, x, y, width, height,
startAngle, sweepAngle));
}
Status
FillPie(const Brush *brush, REAL x, REAL y, REAL width, REAL height, REAL startAngle,
REAL sweepAngle)
{
return SetStatus(DllExports::GdipFillPie(
- graphics, brush ? brush->brush : NULL, x, y, width, height, startAngle,
sweepAngle));
+ graphics, brush ? brush->nativeBrush : NULL, x, y, width, height,
startAngle, sweepAngle));
}
Status
FillPie(const Brush *brush, RectF &rect, REAL startAngle, REAL sweepAngle)
{
return SetStatus(DllExports::GdipFillPie(
- graphics, brush ? brush->brush : NULL, rect.X, rect.Y, rect.Width,
rect.Height, startAngle, sweepAngle));
+ graphics, brush ? brush->nativeBrush : NULL, rect.X, rect.Y, rect.Width,
rect.Height, startAngle,
+ sweepAngle));
}
Status
FillPolygon(const Brush *brush, const Point *points, INT count)
{
- return SetStatus(DllExports::GdipFillPolygon2I(graphics, brush ? brush->brush
: NULL, points, count));
+ return SetStatus(DllExports::GdipFillPolygon2I(graphics, brush ?
brush->nativeBrush : NULL, points, count));
}
Status
FillPolygon(const Brush *brush, const PointF *points, INT count)
{
- return SetStatus(DllExports::GdipFillPolygon2(graphics, brush ? brush->brush :
NULL, points, count));
+ return SetStatus(DllExports::GdipFillPolygon2(graphics, brush ?
brush->nativeBrush : NULL, points, count));
}
Status
FillPolygon(const Brush *brush, const Point *points, INT count, FillMode fillMode)
{
- return SetStatus(DllExports::GdipFillPolygonI(graphics, brush ? brush->brush :
NULL, points, count, fillMode));
+ return SetStatus(
+ DllExports::GdipFillPolygonI(graphics, brush ? brush->nativeBrush : NULL,
points, count, fillMode));
}
Status
FillPolygon(const Brush *brush, const PointF *points, INT count, FillMode fillMode)
{
- return SetStatus(DllExports::GdipFillPolygon(graphics, brush ? brush->brush :
NULL, points, count, fillMode));
+ return SetStatus(
+ DllExports::GdipFillPolygon(graphics, brush ? brush->nativeBrush : NULL,
points, count, fillMode));
}
Status
FillRectangle(const Brush *brush, const Rect &rect)
{
return SetStatus(DllExports::GdipFillRectangleI(
- graphics, brush ? brush->brush : NULL, rect.X, rect.Y, rect.Width,
rect.Height));
+ graphics, brush ? brush->nativeBrush : NULL, rect.X, rect.Y, rect.Width,
rect.Height));
}
Status
FillRectangle(const Brush *brush, const RectF &rect)
{
return SetStatus(DllExports::GdipFillRectangle(
- graphics, brush ? brush->brush : NULL, rect.X, rect.Y, rect.Width,
rect.Height));
+ graphics, brush ? brush->nativeBrush : NULL, rect.X, rect.Y, rect.Width,
rect.Height));
}
Status
FillRectangle(const Brush *brush, REAL x, REAL y, REAL width, REAL height)
{
- return SetStatus(DllExports::GdipFillRectangle(graphics, brush ? brush->brush
: NULL, x, y, width, height));
+ return SetStatus(
+ DllExports::GdipFillRectangle(graphics, brush ? brush->nativeBrush : NULL,
x, y, width, height));
}
Status
FillRectangle(const Brush *brush, INT x, INT y, INT width, INT height)
{
- return SetStatus(DllExports::GdipFillRectangleI(graphics, brush ? brush->brush
: NULL, x, y, width, height));
+ return SetStatus(
+ DllExports::GdipFillRectangleI(graphics, brush ? brush->nativeBrush :
NULL, x, y, width, height));
}
Status
FillRectangles(const Brush *brush, const Rect *rects, INT count)
{
- return SetStatus(DllExports::GdipFillRectanglesI(graphics, brush ?
brush->brush : NULL, rects, count));
+ return SetStatus(DllExports::GdipFillRectanglesI(graphics, brush ?
brush->nativeBrush : NULL, rects, count));
}
Status
FillRectangles(const Brush *brush, const RectF *rects, INT count)
{
- return SetStatus(DllExports::GdipFillRectangles(graphics, brush ? brush->brush
: NULL, rects, count));
+ return SetStatus(DllExports::GdipFillRectangles(graphics, brush ?
brush->nativeBrush : NULL, rects, count));
}
Status
diff --git a/sdk/include/psdk/gdipluspen.h b/sdk/include/psdk/gdipluspen.h
index 18f73636d88..82b2cfdf6b2 100644
--- a/sdk/include/psdk/gdipluspen.h
+++ b/sdk/include/psdk/gdipluspen.h
@@ -210,7 +210,7 @@ class Pen : public GdiplusBase
Status
SetBrush(const Brush *brush)
{
- return SetStatus(DllExports::GdipSetPenBrushFill(pen, brush ? brush->brush :
NULL));
+ return SetStatus(DllExports::GdipSetPenBrushFill(pen, brush ?
brush->nativeBrush : NULL));
}
Status