[GDI+: 4/5] added brush implementation and test

[Evan Stade]

Hi,

Changelog:
*added brush (solidfill only) and test

 dlls/gdiplus/Makefile.in       |    1 +
 dlls/gdiplus/brush.c           |   59 +++++++++++++++++++++++++++++++++++++++
 dlls/gdiplus/gdiplus.spec      |    6 ++--
 dlls/gdiplus/tests/Makefile.in |    1 +
 dlls/gdiplus/tests/brush.c     |   60 ++++++++++++++++++++++++++++++++++++++++
 5 files changed, 124 insertions(+), 3 deletions(-)

-Evan Stade
-------------- next part --------------
diff --git a/dlls/gdiplus/Makefile.in b/dlls/gdiplus/Makefile.in
index a3de5d4..7a5c7ad 100644
--- a/dlls/gdiplus/Makefile.in
+++ b/dlls/gdiplus/Makefile.in
@@ -7,6 +7,7 @@ IMPORTLIB = libgdiplus.$(IMPLIBEXT)
 IMPORTS   = gdi32 advapi32 kernel32 ntdll user32
 
 C_SRCS = \
+	brush.c \
 	gdiplus.c \
 	graphics.c \
 	pen.c
diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c
new file mode 100644
index 0000000..775019d
--- /dev/null
+++ b/dlls/gdiplus/brush.c
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2007 Google (Evan Stade)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include <stdarg.h>
+#include <math.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "gdiplus.h"
+#include "gdiplus_private.h"
+
+GpStatus WINGDIPAPI GdipCreateSolidFill(ARGB color, GpSolidFill **brush)
+{
+    COLORREF col = ARGB2COLORREF(color);
+
+    if(!brush)  return InvalidParameter;
+
+    *brush = (GpSolidFill*) GdipAlloc(sizeof(GpSolidFill));
+
+    (*brush)->brush.gdibrush = CreateSolidBrush(col);
+    (*brush)->brush.bt = BrushTypeSolidColor;
+    (*brush)->brush.color = col;
+
+    return Ok;
+}
+
+GpStatus WINGDIPAPI GdipGetBrushType(GpBrush *brush, GpBrushType *type)
+{
+    if(!brush)  return InvalidParameter;
+
+    *type = brush->bt;
+
+    return Ok;
+}
+
+GpStatus WINGDIPAPI GdipDeleteBrush(GpBrush *brush)
+{
+    if(!brush)  return InvalidParameter;
+    DeleteObject(brush->gdibrush);
+    GdipFree(brush);
+
+    return Ok;
+}
diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec
index dfb4e63..4268d26 100644
--- a/dlls/gdiplus/gdiplus.spec
+++ b/dlls/gdiplus/gdiplus.spec
@@ -119,7 +119,7 @@
 @ stub GdipCreateRegionRect
 @ stub GdipCreateRegionRectI
 @ stub GdipCreateRegionRgnData
-@ stub GdipCreateSolidFill
+@ stdcall GdipCreateSolidFill(long ptr)
 @ stub GdipCreateStreamOnFile
 @ stub GdipCreateStringFormat
 @ stub GdipCreateTexture2
@@ -127,7 +127,7 @@
 @ stub GdipCreateTexture
 @ stub GdipCreateTextureIA
 @ stub GdipCreateTextureIAI
-@ stub GdipDeleteBrush
+@ stdcall GdipDeleteBrush(ptr)
 @ stub GdipDeleteCachedBitmap
 @ stub GdipDeleteCustomLineCap
 @ stub GdipDeleteFont
@@ -228,7 +228,7 @@
 @ stub GdipGetAdjustableArrowCapMiddleInset
 @ stub GdipGetAdjustableArrowCapWidth
 @ stub GdipGetAllPropertyItems
-@ stub GdipGetBrushType
+@ stdcall GdipGetBrushType(ptr ptr)
 @ stub GdipGetCellAscent
 @ stub GdipGetCellDescent
 @ stub GdipGetClip
diff --git a/dlls/gdiplus/tests/Makefile.in b/dlls/gdiplus/tests/Makefile.in
index 4f3007d..7f9d836 100644
--- a/dlls/gdiplus/tests/Makefile.in
+++ b/dlls/gdiplus/tests/Makefile.in
@@ -6,6 +6,7 @@ TESTDLL   = gdiplus.dll
 IMPORTS   = user32 gdi32 kernel32 gdiplus
 
 CTESTS = \
+	brush.c \
 	graphics.c \
 	pen.c
 
diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c
new file mode 100644
index 0000000..ec55e3a
--- /dev/null
+++ b/dlls/gdiplus/tests/brush.c
@@ -0,0 +1,60 @@
+/*
+ * Unit test suite for brushes
+ *
+ * Copyright (C) 2007 Google (Evan Stade)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include <stdarg.h>
+
+#include "windef.h"
+#include "gdiplus.h"
+#include "wine/test.h"
+
+#define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got)
+
+static void test_constructor_destructor(void)
+{
+    GpStatus status;
+    GpSolidFill *brush = NULL;
+
+    status = GdipCreateSolidFill((ARGB)0xffff00ff, &brush);
+    expect(Ok, status);
+    ok(brush != NULL, "Expected brush to be initialized");
+
+    status = GdipDeleteBrush(NULL);
+    expect(InvalidParameter, status);
+
+    status = GdipDeleteBrush((GpBrush*) brush);
+    expect(Ok, status);
+}
+
+START_TEST(brush)
+{
+    GdiplusStartupInput gdiplusStartupInput;
+    ULONG_PTR gdiplusToken;
+
+    gdiplusStartupInput.GdiplusVersion              = 1;
+    gdiplusStartupInput.DebugEventCallback          = NULL;
+    gdiplusStartupInput.SuppressBackgroundThread    = 0;
+    gdiplusStartupInput.SuppressExternalCodecs      = 0;
+
+    GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL);
+
+    test_constructor_destructor();
+
+    GdiplusShutdown(gdiplusToken);
+}
-- 
1.4.1