Module: wine Branch: master Commit: b7a852b1df82079dc54546f94e965b30b1990cd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7a852b1df82079dc54546f94e...
Author: Rein Klazes wijn@online.nl Date: Mon Aug 10 11:11:23 2009 +0200
comdlg32/tests: Fix some test failures on Win95 and NT4.
Reported by Paul Vriens.
---
dlls/comdlg32/tests/filedlg.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index cb9508e..ade7f8d 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -736,6 +736,7 @@ static LONG_PTR WINAPI template_hook_arrange(HWND dlgChild, UINT msg, WPARAM wPa /* the real tests */ int withhelp; int expectx, expecty; + DWORD style;
withhelp = (arrange_tests[index].ofnflags & OFN_SHOWHELP) != 0; GetWindowRect( dlgParent, &wrcParent); @@ -762,7 +763,9 @@ static LONG_PTR WINAPI template_hook_arrange(HWND dlgChild, UINT msg, WPARAM wPa else expectx += clrcChild.right - ( rcStc32.right - rcStc32.left) ; } - if( !(arrange_tests[index].ofnflags & OFN_ENABLESIZING)) { + style = GetWindowLong( dlgParent, GWL_STYLE); + if( !(style & WS_SIZEBOX)) { + /* without the OFN_ENABLESIZING flag */ ok( wrcParent.bottom - wrcParent.top == expecty, "Wrong height of dialog %d, expected %d\n", wrcParent.bottom - wrcParent.top, expecty); @@ -770,6 +773,7 @@ static LONG_PTR WINAPI template_hook_arrange(HWND dlgChild, UINT msg, WPARAM wPa "Wrong width of dialog %d, expected %d\n", wrcParent.right - wrcParent.left, expectx); } else todo_wine { + /* with the OFN_ENABLESIZING flag */ ok( wrcParent.bottom - wrcParent.top > expecty, "Wrong height of dialog %d, expected more than %d\n", wrcParent.bottom - wrcParent.top, expecty);