Greg Geldorp : comctl32/tests: Fix failures for 120DPI display.

[Alexandre Julliard]

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

Author: Greg Geldorp <ggeldorp(a)vmware.com>
Date:   Thu Jan 20 11:40:17 2011 +0100

comctl32/tests: Fix failures for 120DPI display.

---

 dlls/comctl32/tests/listview.c |    4 ++--
 dlls/comctl32/tests/rebar.c    |    2 +-
 dlls/comctl32/tests/treeview.c |    4 ++++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c
index 89619f7..5e71a6b 100644
--- a/dlls/comctl32/tests/listview.c
+++ b/dlls/comctl32/tests/listview.c
@@ -3309,7 +3309,7 @@ static void test_getitemrect(void)
     expect(0, rect.left);
     expect(0, rect.top);
     hdc = GetDC(hwnd);
-    todo_wine expect(GetDeviceCaps(hdc, LOGPIXELSX), rect.right);
+    todo_wine expect(((GetDeviceCaps(hdc, LOGPIXELSX) + 15) / 16) * 16, rect.right);
     ReleaseDC(hwnd, hdc);
     DestroyWindow(hwnd);
 
@@ -4163,7 +4163,7 @@ static void test_getcolumnwidth(void)
     SendMessage(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&itema);
     ret = SendMessage(hwnd, LVM_GETCOLUMNWIDTH, 0, 0);
     hdc = GetDC(hwnd);
-    todo_wine expect(GetDeviceCaps(hdc, LOGPIXELSX), ret);
+    todo_wine expect(((GetDeviceCaps(hdc, LOGPIXELSX) + 15) / 16) * 16, ret);
     ReleaseDC(hwnd, hdc);
     DestroyWindow(hwnd);
 }
diff --git a/dlls/comctl32/tests/rebar.c b/dlls/comctl32/tests/rebar.c
index 3a01756..d9ceb71 100644
--- a/dlls/comctl32/tests/rebar.c
+++ b/dlls/comctl32/tests/rebar.c
@@ -924,7 +924,7 @@ static void expect_band_content_(int line, HWND hRebar, UINT uBand, INT fStyle,
     expect_eq(line, rb.cyIntegral, cyIntegral, int, "%x");
     expect_eq(line, rb.cxIdeal, cxIdeal, int, "%d");
     expect_eq(line, rb.lParam, lParam, LPARAM, "%ld");
-    ok(rb.cxHeader == cxHeader || broken(rb.cxHeader == cxHeader_broken),
+    ok(rb.cxHeader == cxHeader || rb.cxHeader == cxHeader + 1 || broken(rb.cxHeader == cxHeader_broken),
         "expected %d for %d from line %d\n", cxHeader, rb.cxHeader, line);
 }
 
diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c
index ffc0e3e..457dd70 100644
--- a/dlls/comctl32/tests/treeview.c
+++ b/dlls/comctl32/tests/treeview.c
@@ -91,6 +91,10 @@ static const struct message focus_seq[] = {
     { WM_NCCALCSIZE, sent|wparam|defwinproc, TRUE },
     { WM_WINDOWPOSCHANGED, sent|defwinproc },
     { WM_SIZE, sent|defwinproc },
+    { WM_WINDOWPOSCHANGING, sent|defwinproc|optional },
+    { WM_NCCALCSIZE, sent|wparam|defwinproc|optional, TRUE },
+    { WM_WINDOWPOSCHANGED, sent|defwinproc|optional },
+    { WM_SIZE, sent|defwinproc|optional },
     { WM_PAINT, sent|defwinproc },
     { WM_NCPAINT, sent|wparam|defwinproc, 1 },
     { WM_ERASEBKGND, sent|defwinproc },