James Hawkins : comctl32: Fix a few failing tests in win2000.

[Alexandre Julliard]

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

Author: James Hawkins <jhawkins at codeweavers.com>
Date:   Thu Aug 28 21:08:13 2008 -0500

comctl32: Fix a few failing tests in win2000.

---

 dlls/comctl32/tests/listview.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c
index 4f8b32d..8b47cdd 100644
--- a/dlls/comctl32/tests/listview.c
+++ b/dlls/comctl32/tests/listview.c
@@ -48,6 +48,7 @@ static const struct message create_parent_wnd_seq[] = {
     { WM_CREATE,            sent },
     { WM_SHOWWINDOW,        sent|wparam, 1 },
     { WM_WINDOWPOSCHANGING, sent|wparam, 0 },
+    { WM_QUERYNEWPALETTE,   sent|optional },
     { WM_WINDOWPOSCHANGING, sent|wparam, 0 },
     { WM_ACTIVATEAPP,       sent|wparam, 1 },
     { WM_NCACTIVATE,        sent|wparam, 1 },
@@ -872,7 +873,9 @@ static void test_icon_spacing(void)
     trace("test icon spacing\n");
 
     r = SendMessage(hwnd, LVM_SETICONSPACING, 0, (LPARAM) MAKELONG(20, 30));
-    expect(MAKELONG(w,h), r);
+    ok(r == MAKELONG(w, h) ||
+       broken(r == MAKELONG(w, w)), /* win98 */
+       "Expected %d, got %d\n", MAKELONG(w, h), r);
 
     r = SendMessage(hwnd, LVM_SETICONSPACING, 0, (LPARAM) MAKELONG(25, 35));
     expect(MAKELONG(20,30), r);