From 482c454e50a00070d34be3cd08b61bae5624a9da Mon Sep 17 00:00:00 2001 From: Owen Rudge Date: Wed, 18 Nov 2009 15:40:44 -0600 Subject: [PATCH] comctl32/tests: Fix imagelist v6 test failures on XP. --- dlls/comctl32/tests/imagelist.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 22286d33c2e..e06b9746805 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1490,11 +1490,18 @@ static void DoTest3_v6(void) ok(SUCCEEDED(IImageList_Replace(imgl, 2, hbm3, 0)), "failed to replace bitmap 3\n"); memset(&imldp, 0, sizeof (imldp)); - ok(SUCCEEDED(!IImageList_Draw(imgl, &imldp)), "zero data succeeded!\n"); + ok(FAILED(IImageList_Draw(imgl, &imldp)), "zero data succeeded!\n"); + imldp.cbSize = sizeof (imldp); - ok(SUCCEEDED(!IImageList_Draw(imgl, &imldp)), "zero hdc succeeded!\n"); imldp.hdcDst = hdc; - ok(SUCCEEDED(!IImageList_Draw(imgl, &imldp)), "zero himl succeeded!\n"); + imldp.himl = himl; + + if (FAILED(IImageList_Draw(imgl, &imldp))) + { + /* Earlier versions of native comctl32 use a smaller structure */ + imldp.cbSize -= 3 * sizeof(DWORD); + ok(SUCCEEDED(IImageList_Draw(imgl, &imldp)), "should succeed\n"); + } REDRAW(hwndfortest); WAIT; @@ -1510,7 +1517,7 @@ static void DoTest3_v6(void) imldp.i ++; ok(SUCCEEDED(IImageList_Draw(imgl, &imldp)), "should succeed\n"); imldp.i ++; - ok(!SUCCEEDED(IImageList_Draw(imgl, &imldp)), "should fail\n"); + ok(FAILED(IImageList_Draw(imgl, &imldp)), "should fail\n"); /* remove three */ ok(SUCCEEDED(IImageList_Remove(imgl, 0)), "removing 1st bitmap\n");