Module: wine Branch: master Commit: 4bf5c5f8a23cdfe6af012403a875a0a95bf07a27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bf5c5f8a23cdfe6af012403a8...
Author: Paul Vriens Paul.Vriens.Wine@gmail.com Date: Mon Oct 6 11:47:56 2008 +0200
gdi32/tests: Fix a few failures on win9x.
---
dlls/gdi32/tests/bitmap.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 12224c9..25f1fe7 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -308,8 +308,11 @@ static void test_dib_info(HBITMAP hbm, const void *bits, const BITMAPINFOHEADER buf = HeapAlloc(GetProcessHeap(), 0, bm.bmWidthBytes * bm.bmHeight + 4096);
/* GetBitmapBits returns not 32-bit aligned data */ + SetLastError(0xdeadbeef); ret = GetBitmapBits(hbm, 0, NULL); - ok(ret == bm_width_bytes * bm.bmHeight, "%d != %d\n", ret, bm_width_bytes * bm.bmHeight); + ok(ret == bm_width_bytes * bm.bmHeight || + broken(ret == 0 && GetLastError() == ERROR_INVALID_PARAMETER), /* Win9x */ + "%d != %d\n", ret, bm_width_bytes * bm.bmHeight);
memset(buf, 0xAA, bm.bmWidthBytes * bm.bmHeight + 4096); ret = GetBitmapBits(hbm, bm.bmWidthBytes * bm.bmHeight + 4096, buf);