commit 960de09ed1ff66fee8a0c14fc3f9cff3b64bbcbb
author Nikolay Sivov <bunglehead@gmail.com> Tue Aug 26 01:58:33 2008 +0400
committer Alexandre Julliard <julliard@winehq.org> Tue Aug 26 12:07:42 2008 +0200
tree f44597d9f99b847547d443763c597ce7e59e0398
parent 722e1f9fce1901107284569c4a6b5ac18be01188

gdiplus: GdipDeleteGraphics affected by busy state too. Test added.

dlls/gdiplus/graphics.c

diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c
index bff1c86..ef2aff7 100644
--- a/dlls/gdiplus/graphics.c
+++ b/dlls/gdiplus/graphics.c
@@ -889,6 +889,8 @@
 GpStatus WINGDIPAPI GdipDeleteGraphics(GpGraphics *graphics)
 {
     if(!graphics) return InvalidParameter;
+    if(graphics->busy) return ObjectBusy;
+
     if(graphics->hwnd)
         ReleaseDC(graphics->hwnd, graphics->hdc);
 

dlls/gdiplus/tests/graphics.c

diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c
index 90a416c..9770211 100644
--- a/dlls/gdiplus/tests/graphics.c
+++ b/dlls/gdiplus/tests/graphics.c
@@ -714,6 +714,9 @@
     status = GdipMultiplyWorldTransform(graphics, m, MatrixOrderPrepend);
     status = GdipGetClip(graphics, region);
     expect(ObjectBusy, status); status = Ok;
+    /* try to delete before release */
+    status = GdipDeleteGraphics(graphics);
+    expect(ObjectBusy, status);
 
     status = GdipReleaseDC(graphics, retdc);
     expect(Ok, status);