Commit 50a25a8e authored by Greg Geldorp's avatar Greg Geldorp Committed by Alexandre Julliard

comctl32/tests: Fix failures for 120DPI display.

parent 40753023
...@@ -3309,7 +3309,7 @@ static void test_getitemrect(void) ...@@ -3309,7 +3309,7 @@ static void test_getitemrect(void)
expect(0, rect.left); expect(0, rect.left);
expect(0, rect.top); expect(0, rect.top);
hdc = GetDC(hwnd); 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); ReleaseDC(hwnd, hdc);
DestroyWindow(hwnd); DestroyWindow(hwnd);
...@@ -4163,7 +4163,7 @@ static void test_getcolumnwidth(void) ...@@ -4163,7 +4163,7 @@ static void test_getcolumnwidth(void)
SendMessage(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&itema); SendMessage(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&itema);
ret = SendMessage(hwnd, LVM_GETCOLUMNWIDTH, 0, 0); ret = SendMessage(hwnd, LVM_GETCOLUMNWIDTH, 0, 0);
hdc = GetDC(hwnd); hdc = GetDC(hwnd);
todo_wine expect(GetDeviceCaps(hdc, LOGPIXELSX), ret); todo_wine expect(((GetDeviceCaps(hdc, LOGPIXELSX) + 15) / 16) * 16, ret);
ReleaseDC(hwnd, hdc); ReleaseDC(hwnd, hdc);
DestroyWindow(hwnd); DestroyWindow(hwnd);
} }
......
...@@ -924,7 +924,7 @@ static void expect_band_content_(int line, HWND hRebar, UINT uBand, INT fStyle, ...@@ -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.cyIntegral, cyIntegral, int, "%x");
expect_eq(line, rb.cxIdeal, cxIdeal, int, "%d"); expect_eq(line, rb.cxIdeal, cxIdeal, int, "%d");
expect_eq(line, rb.lParam, lParam, LPARAM, "%ld"); 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); "expected %d for %d from line %d\n", cxHeader, rb.cxHeader, line);
} }
......
...@@ -91,6 +91,10 @@ static const struct message focus_seq[] = { ...@@ -91,6 +91,10 @@ static const struct message focus_seq[] = {
{ WM_NCCALCSIZE, sent|wparam|defwinproc, TRUE }, { WM_NCCALCSIZE, sent|wparam|defwinproc, TRUE },
{ WM_WINDOWPOSCHANGED, sent|defwinproc }, { WM_WINDOWPOSCHANGED, sent|defwinproc },
{ WM_SIZE, 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_PAINT, sent|defwinproc },
{ WM_NCPAINT, sent|wparam|defwinproc, 1 }, { WM_NCPAINT, sent|wparam|defwinproc, 1 },
{ WM_ERASEBKGND, sent|defwinproc }, { WM_ERASEBKGND, sent|defwinproc },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment