Owen Rudge : comctl32/tests: Fix imagelist v6 test failures on XP.
Alexandre Julliard
julliard at winehq.org
Thu Nov 19 10:15:20 CST 2009
Module: wine
Branch: master
Commit: 482c454e50a00070d34be3cd08b61bae5624a9da
URL: http://source.winehq.org/git/wine.git/?a=commit;h=482c454e50a00070d34be3cd08b61bae5624a9da
Author: Owen Rudge <orudge at codeweavers.com>
Date: Wed Nov 18 15:40:44 2009 -0600
comctl32/tests: Fix imagelist v6 test failures on XP.
---
dlls/comctl32/tests/imagelist.c | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c
index 22286d3..e06b974 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");
More information about the wine-cvs
mailing list