gdiplus: Copy the bits on bitmap unlock if the write flag is set.

The read and write flags are independent, so a read flag being set doesn't imply we can quit early.

gdiplus: Copy the bits on bitmap unlock if the write flag is set.
58eb96c9 · Vincent Povirk · Alexandre Julliard · d086af1d · 58eb96c9 · 58eb96c9
Commit 58eb96c9 authored Feb 24, 2011 by Vincent Povirk Committed by Alexandre Julliard Feb 25, 2011
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

image.c dlls/gdiplus/image.c +1 -1

image.c dlls/gdiplus/tests/image.c +1 -1

No files found.
--- a/dlls/gdiplus/image.c
+++ b/dlls/gdiplus/image.c
@@ -1048,7 +1048,7 @@ GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap* bitmap,
    if(lockeddata->Reserved & ImageLockModeUserInputBuf)
        return NotImplemented;

-    if(lockeddata->Reserved & ImageLockModeRead){
+    if(!(lockeddata->Reserved & ImageLockModeWrite)){
        if(!(--bitmap->numlocks))
            bitmap->lockmode = 0;


--- a/dlls/gdiplus/tests/image.c
+++ b/dlls/gdiplus/tests/image.c
@@ -657,7 +657,7 @@ static void test_LockBits(void)

    stat = GdipBitmapGetPixel(bm, 2, 3, &color);
    expect(Ok, stat);
-    todo_wine expect(0xffff8800, color);
+    expect(0xffff8800, color);

    /* write, conversion */
    stat = GdipBitmapLockBits(bm, &rect, ImageLockModeWrite, PixelFormat32bppARGB, &bd);