Vincent Povirk : windowscodecs: Don't copy extra data from the end of a row .

[Alexandre Julliard]

Module: wine
Branch: master
Commit: e61e4719e52aafd47eb3d85f29fcdf5e621c0e47
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=e61e4719e52aafd47eb3d85f29...

Author: Vincent Povirk <vincent(a)codeweavers.com>
Date:   Wed Jan  2 14:12:27 2013 -0600

windowscodecs: Don't copy extra data from the end of a row.

---

 dlls/windowscodecs/main.c         |    3 ++-
 dlls/windowscodecs/tests/bitmap.c |    5 +----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/dlls/windowscodecs/main.c b/dlls/windowscodecs/main.c
index 2898d97..b63edf5 100644
--- a/dlls/windowscodecs/main.c
+++ b/dlls/windowscodecs/main.c
@@ -86,7 +86,8 @@ HRESULT copy_pixels(UINT bpp, const BYTE *srcbuffer,
         return E_INVALIDARG;
 
     /* if the whole bitmap is copied and the buffer format matches then it's a matter of a single memcpy */
-    if (rc->X == 0 && rc->Y == 0 && rc->Width == srcwidth && rc->Height == srcheight && srcstride == dststride)
+    if (rc->X == 0 && rc->Y == 0 && rc->Width == srcwidth && rc->Height == srcheight &&
+        srcstride == dststride && srcstride == bytesperrow)
     {
         memcpy(dstbuffer, srcbuffer, srcstride * srcheight);
         return S_OK;
diff --git a/dlls/windowscodecs/tests/bitmap.c b/dlls/windowscodecs/tests/bitmap.c
index f2f9cb6..68d681a 100644
--- a/dlls/windowscodecs/tests/bitmap.c
+++ b/dlls/windowscodecs/tests/bitmap.c
@@ -489,10 +489,7 @@ static void test_CreateBitmapFromMemory(void)
     hr = IWICBitmap_CopyPixels(bitmap, NULL, 13, sizeof(data), data);
     ok(hr == S_OK, "IWICBitmap_CopyPixels error %#x\n", hr);
     for (i = 0; i < sizeof(data); i++)
-        if ((i % 13) < 9)
-            ok(data[i] == data3x2[i], "%u: expected %u, got %u\n", i, data3x2[i], data[i]);
-        else
-            todo_wine ok(data[i] == data3x2[i], "%u: expected %u, got %u\n", i, data3x2[i], data[i]);
+        ok(data[i] == data3x2[i], "%u: expected %u, got %u\n", i, data3x2[i], data[i]);
 
     IWICBitmap_Release(bitmap);
 }