diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 2e9191eb1a5..83b0b083c48 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1224,9 +1224,6 @@ GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap* bitmap, GpStatus WINGDIPAPI GdipCloneBitmapArea(REAL x, REAL y, REAL width, REAL height, PixelFormat format, GpBitmap* srcBitmap, GpBitmap** dstBitmap) { - BitmapData lockeddata_src, lockeddata_dst; - int i; - UINT row_size; Rect area; GpStatus stat; @@ -1248,39 +1245,19 @@ GpStatus WINGDIPAPI GdipCloneBitmapArea(REAL x, REAL y, REAL width, REAL height, area.Width = gdip_round(width); area.Height = gdip_round(height); - stat = GdipBitmapLockBits(srcBitmap, &area, ImageLockModeRead, format, - &lockeddata_src); - if (stat != Ok) return stat; - - stat = GdipCreateBitmapFromScan0(lockeddata_src.Width, lockeddata_src.Height, - 0, lockeddata_src.PixelFormat, NULL, dstBitmap); + stat = GdipCreateBitmapFromScan0(area.Width, area.Height, 0, format, NULL, dstBitmap); if (stat == Ok) { - stat = GdipBitmapLockBits(*dstBitmap, NULL, ImageLockModeWrite, - lockeddata_src.PixelFormat, &lockeddata_dst); - - if (stat == Ok) - { - /* copy the image data */ - row_size = (lockeddata_src.Width * PIXELFORMATBPP(lockeddata_src.PixelFormat) +7)/8; - for (i=0; istride, (*dstBitmap)->bits, (*dstBitmap)->format, + srcBitmap->stride, + srcBitmap->bits + srcBitmap->stride * area.Y + PIXELFORMATBPP(srcBitmap->format) * area.X / 8, + srcBitmap->format, srcBitmap->image.palette); if (stat != Ok) GdipDisposeImage((GpImage*)*dstBitmap); } - GdipBitmapUnlockBits(srcBitmap, &lockeddata_src); - if (stat != Ok) - { *dstBitmap = NULL; - } return stat; } diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 650d12f7ceb..63d37cbf2f8 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -4257,7 +4257,6 @@ static void test_CloneBitmapArea(void) expect(WrongState, status); status = GdipCloneBitmapAreaI(0, 0, 1, 1, PixelFormat24bppRGB, bitmap, ©); -todo_wine expect(Ok, status); status = GdipBitmapUnlockBits(bitmap, &data);