Austin English <austinenglish(a)gmail.com> wrote:
- if (is_win9x)
- {
- expect_viewport_ext(hdc, dpi_x, dpi_y);
- expect_window_ext(hdc, 254, -254);
- }
- else
- {
- expect_viewport_ext(hdc, res_x, -res_y);
- ok( GetWindowExtEx( hdc, &size ), "GetWindowExtEx failed\n" );
- ok( rough_match( size.cx, size_cx * 10 ) ||
- rough_match( size.cx, MulDiv( res_x, 254, dpi_x )), /* Vista uses a more
precise method */
- "expected cx %d or %d, got %d\n", size_cx * 10, MulDiv( res_x,
254, dpi_x ), size.cx );
- ok( rough_match( size.cy, size_cy * 10 ) ||
- rough_match( size.cy, MulDiv( res_y, 254, dpi_y )), /* Vista uses a more
precise method */
- "expected cy %d or %d, got %d\n", size_cy * 10, MulDiv( res_y,
254, dpi_y ), size.cy );
- }
+ ok( GetWindowExtEx( hdc, &size ), "GetWindowExtEx failed\n" );
+ ok( rough_match( size.cx, size_cx * 10 ) ||
+ rough_match( size.cx, MulDiv( res_x, 254, dpi_x )), /* Vista uses a more
precise method */
+ "expected cx %d or %d, got %d\n", size_cx * 10, MulDiv( res_x, 254,
dpi_x ), size.cx );
+ ok( rough_match( size.cy, size_cy * 10 ) ||
+ rough_match( size.cy, MulDiv( res_y, 254, dpi_y )), /* Vista uses a more
precise method */
+ "expected cy %d or %d, got %d\n", size_cy * 10, MulDiv( res_y, 254,
dpi_y ), size.cy );
expect_world_transform(hdc, 1.0, 1.0);
expect_LPtoDP(hdc, MulDiv(1000 / 10, res_x, size_cx), -MulDiv(1000 / 10, res_y,
size_cy));
You've lost 'expect_viewport_ext(hdc, res_x, -res_y);' from the 'else'
block.
--
Dmitry.