Austin Lund : comctl32/tests: Fixed rebar layout tests which depend on system font height.
Module: wine Branch: master Commit: 293e4292968b7f7817fff2a489911f48a2891c89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=293e4292968b7f7817fff2a489... Author: Austin Lund <austin.lund(a)gmail.com> Date: Thu Nov 11 09:12:54 2010 +1000 comctl32/tests: Fixed rebar layout tests which depend on system font height. --- dlls/comctl32/tests/rebar.c | 122 +++++++++++++++++++++--------------------- 1 files changed, 61 insertions(+), 61 deletions(-) diff --git a/dlls/comctl32/tests/rebar.c b/dlls/comctl32/tests/rebar.c index 7a92c9e..1a61b51 100644 --- a/dlls/comctl32/tests/rebar.c +++ b/dlls/comctl32/tests/rebar.c @@ -304,59 +304,59 @@ static void rbsize_results_init(void) rbsize_add_band(&rbsize_results[11], 0, 0, 604, 34, 0x00, 200); rbsize_add_band(&rbsize_results[11], 606, 0, 672, 34, 0x04, 66); - rbsize_results[12] = rbsize_init(0, 0, 672, 40, 40, 2, 5); - rbsize_add_row(&rbsize_results[12], 20); - rbsize_add_row(&rbsize_results[12], 20); - rbsize_add_band(&rbsize_results[12], 0, 0, 114, 20, 0x00, 40); - rbsize_add_band(&rbsize_results[12], 114, 0, 184, 20, 0x00, 70); - rbsize_add_band(&rbsize_results[12], 184, 0, 424, 20, 0x00, 240); - rbsize_add_band(&rbsize_results[12], 424, 0, 672, 20, 0x00, 60); - rbsize_add_band(&rbsize_results[12], 0, 20, 672, 40, 0x00, 200); - - rbsize_results[13] = rbsize_init(0, 0, 672, 40, 40, 2, 5); - rbsize_add_row(&rbsize_results[13], 20); - rbsize_add_row(&rbsize_results[13], 20); - rbsize_add_band(&rbsize_results[13], 0, 0, 114, 20, 0x00, 40); - rbsize_add_band(&rbsize_results[13], 114, 0, 227, 20, 0x00, 113); - rbsize_add_band(&rbsize_results[13], 227, 0, 424, 20, 0x00, 197); - rbsize_add_band(&rbsize_results[13], 424, 0, 672, 20, 0x00, 60); - rbsize_add_band(&rbsize_results[13], 0, 20, 672, 40, 0x00, 200); - - rbsize_results[14] = rbsize_init(0, 0, 672, 40, 40, 2, 5); - rbsize_add_row(&rbsize_results[14], 20); - rbsize_add_row(&rbsize_results[14], 20); - rbsize_add_band(&rbsize_results[14], 0, 0, 114, 20, 0x00, 40); - rbsize_add_band(&rbsize_results[14], 114, 0, 328, 20, 0x00, 214); - rbsize_add_band(&rbsize_results[14], 328, 0, 511, 20, 0x00, 183); - rbsize_add_band(&rbsize_results[14], 511, 0, 672, 20, 0x00, 161); - rbsize_add_band(&rbsize_results[14], 0, 20, 672, 40, 0x00, 200); - - rbsize_results[15] = rbsize_init(0, 0, 672, 40, 40, 2, 5); - rbsize_add_row(&rbsize_results[15], 20); - rbsize_add_row(&rbsize_results[15], 20); - rbsize_add_band(&rbsize_results[15], 0, 0, 114, 20, 0x00, 40); - rbsize_add_band(&rbsize_results[15], 114, 0, 167, 20, 0x00, 53); - rbsize_add_band(&rbsize_results[15], 167, 0, 511, 20, 0x00, 344); - rbsize_add_band(&rbsize_results[15], 511, 0, 672, 20, 0x00, 161); - rbsize_add_band(&rbsize_results[15], 0, 20, 672, 40, 0x00, 200); - - rbsize_results[16] = rbsize_init(0, 0, 672, 40, 40, 2, 5); - rbsize_add_row(&rbsize_results[16], 20); - rbsize_add_row(&rbsize_results[16], 20); - rbsize_add_band(&rbsize_results[16], 0, 0, 114, 20, 0x00, 40); - rbsize_add_band(&rbsize_results[16], 114, 0, 328, 20, 0x00, 214); - rbsize_add_band(&rbsize_results[16], 328, 0, 511, 20, 0x00, 183); - rbsize_add_band(&rbsize_results[16], 511, 0, 672, 20, 0x00, 161); - rbsize_add_band(&rbsize_results[16], 0, 20, 672, 40, 0x00, 200); - - rbsize_results[17] = rbsize_init(0, 0, 672, 40, 40, 2, 5); - rbsize_add_row(&rbsize_results[17], 20); - rbsize_add_row(&rbsize_results[17], 20); - rbsize_add_band(&rbsize_results[17], 0, 0, 114, 20, 0x00, 40); - rbsize_add_band(&rbsize_results[17], 114, 0, 328, 20, 0x00, 214); - rbsize_add_band(&rbsize_results[17], 328, 0, 511, 20, 0x00, 183); - rbsize_add_band(&rbsize_results[17], 511, 0, 672, 20, 0x00, 161); - rbsize_add_band(&rbsize_results[17], 0, 20, 672, 40, 0x00, 200); + rbsize_results[12] = rbsize_init(0, 0, 672, 8 + 2*system_font_height, 40, 2, 5); + rbsize_add_row(&rbsize_results[12], 4 + system_font_height); + rbsize_add_row(&rbsize_results[12], 4 + system_font_height); + rbsize_add_band(&rbsize_results[12], 0, 0, 114, 4 + system_font_height, 0x00, 40); + rbsize_add_band(&rbsize_results[12], 114, 0, 184, 4 + system_font_height, 0x00, 70); + rbsize_add_band(&rbsize_results[12], 184, 0, 424, 4 + system_font_height, 0x00, 240); + rbsize_add_band(&rbsize_results[12], 424, 0, 672, 4 + system_font_height, 0x00, 60); + rbsize_add_band(&rbsize_results[12], 0, 4 + system_font_height, 672, 8 + 2*system_font_height, 0x00, 200); + + rbsize_results[13] = rbsize_init(0, 0, 672, 8 + 2*system_font_height, 40, 2, 5); + rbsize_add_row(&rbsize_results[13], 4 + system_font_height); + rbsize_add_row(&rbsize_results[13], 4 + system_font_height); + rbsize_add_band(&rbsize_results[13], 0, 0, 114, 4 + system_font_height, 0x00, 40); + rbsize_add_band(&rbsize_results[13], 114, 0, 227, 4 + system_font_height, 0x00, 113); + rbsize_add_band(&rbsize_results[13], 227, 0, 424, 4 + system_font_height, 0x00, 197); + rbsize_add_band(&rbsize_results[13], 424, 0, 672, 4 + system_font_height, 0x00, 60); + rbsize_add_band(&rbsize_results[13], 0, 4 + system_font_height, 672, 8 + 2*system_font_height, 0x00, 200); + + rbsize_results[14] = rbsize_init(0, 0, 672, 8 + 2*system_font_height, 40, 2, 5); + rbsize_add_row(&rbsize_results[14], 4 + system_font_height); + rbsize_add_row(&rbsize_results[14], 4 + system_font_height); + rbsize_add_band(&rbsize_results[14], 0, 0, 114, 4 + system_font_height, 0x00, 40); + rbsize_add_band(&rbsize_results[14], 114, 0, 328, 4 + system_font_height, 0x00, 214); + rbsize_add_band(&rbsize_results[14], 328, 0, 511, 4 + system_font_height, 0x00, 183); + rbsize_add_band(&rbsize_results[14], 511, 0, 672, 4 + system_font_height, 0x00, 161); + rbsize_add_band(&rbsize_results[14], 0, 4 + system_font_height, 672, 8 + 2*system_font_height, 0x00, 200); + + rbsize_results[15] = rbsize_init(0, 0, 672, 8 + 2*system_font_height, 40, 2, 5); + rbsize_add_row(&rbsize_results[15], 4 + system_font_height); + rbsize_add_row(&rbsize_results[15], 4 + system_font_height); + rbsize_add_band(&rbsize_results[15], 0, 0, 114, 4 + system_font_height, 0x00, 40); + rbsize_add_band(&rbsize_results[15], 114, 0, 167, 4 + system_font_height, 0x00, 53); + rbsize_add_band(&rbsize_results[15], 167, 0, 511, 4 + system_font_height, 0x00, 344); + rbsize_add_band(&rbsize_results[15], 511, 0, 672, 4 + system_font_height, 0x00, 161); + rbsize_add_band(&rbsize_results[15], 0, 4 + system_font_height, 672, 8 + 2*system_font_height, 0x00, 200); + + rbsize_results[16] = rbsize_init(0, 0, 672, 8 + 2*system_font_height, 40, 2, 5); + rbsize_add_row(&rbsize_results[16], 4 + system_font_height); + rbsize_add_row(&rbsize_results[16], 4 + system_font_height); + rbsize_add_band(&rbsize_results[16], 0, 0, 114, 4 + system_font_height, 0x00, 40); + rbsize_add_band(&rbsize_results[16], 114, 0, 328, 4 + system_font_height, 0x00, 214); + rbsize_add_band(&rbsize_results[16], 328, 0, 511, 4 + system_font_height, 0x00, 183); + rbsize_add_band(&rbsize_results[16], 511, 0, 672, 4 + system_font_height, 0x00, 161); + rbsize_add_band(&rbsize_results[16], 0, 4 + system_font_height, 672, 8 + 2*system_font_height, 0x00, 200); + + rbsize_results[17] = rbsize_init(0, 0, 672, 8 + 2*system_font_height, 40, 2, 5); + rbsize_add_row(&rbsize_results[17], 4 + system_font_height); + rbsize_add_row(&rbsize_results[17], 4 + system_font_height); + rbsize_add_band(&rbsize_results[17], 0, 0, 114, 4 + system_font_height, 0x00, 40); + rbsize_add_band(&rbsize_results[17], 114, 0, 328, 4 + system_font_height, 0x00, 214); + rbsize_add_band(&rbsize_results[17], 328, 0, 511, 4 + system_font_height, 0x00, 183); + rbsize_add_band(&rbsize_results[17], 511, 0, 672, 4 + system_font_height, 0x00, 161); + rbsize_add_band(&rbsize_results[17], 0, 4 + system_font_height, 672, 8 + 2*system_font_height, 0x00, 200); rbsize_results[18] = rbsize_init(0, 0, 672, 56, 56, 2, 5); rbsize_add_row(&rbsize_results[18], 28); @@ -367,14 +367,14 @@ static void rbsize_results_init(void) rbsize_add_band(&rbsize_results[18], 511, 0, 672, 28, 0x00, 161); rbsize_add_band(&rbsize_results[18], 0, 28, 672, 56, 0x00, 200); - rbsize_results[19] = rbsize_init(0, 0, 672, 40, 40, 2, 5); - rbsize_add_row(&rbsize_results[19], 20); - rbsize_add_row(&rbsize_results[19], 20); - rbsize_add_band(&rbsize_results[19], 0, 0, 114, 20, 0x00, 40); - rbsize_add_band(&rbsize_results[19], 114, 0, 328, 20, 0x00, 214); - rbsize_add_band(&rbsize_results[19], 328, 0, 511, 20, 0x00, 183); - rbsize_add_band(&rbsize_results[19], 511, 0, 672, 20, 0x00, 161); - rbsize_add_band(&rbsize_results[19], 0, 20, 672, 40, 0x00, 200); + rbsize_results[19] = rbsize_init(0, 0, 672, 8 + 2*system_font_height, 40, 2, 5); + rbsize_add_row(&rbsize_results[19], 4 + system_font_height); + rbsize_add_row(&rbsize_results[19], 4 + system_font_height); + rbsize_add_band(&rbsize_results[19], 0, 0, 114, 4 + system_font_height, 0x00, 40); + rbsize_add_band(&rbsize_results[19], 114, 0, 328, 4 + system_font_height, 0x00, 214); + rbsize_add_band(&rbsize_results[19], 328, 0, 511, 4 + system_font_height, 0x00, 183); + rbsize_add_band(&rbsize_results[19], 511, 0, 672, 4 + system_font_height, 0x00, 161); + rbsize_add_band(&rbsize_results[19], 0, 4 + system_font_height, 672, 8 + 2*system_font_height, 0x00, 200); rbsize_results[20] = rbsize_init(0, 0, 672, 56, 56, 2, 5); rbsize_add_row(&rbsize_results[20], 28);
participants (1)
-
Alexandre Julliard