From de0a20f43ed1c317733e8750d9488b2d15f40bf0 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Tue, 1 Mar 2016 19:12:27 +0000 Subject: [PATCH] [COMDLG32_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912 svn path=/trunk/; revision=70849 --- rostests/winetests/comdlg32/filedlg.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/rostests/winetests/comdlg32/filedlg.c b/rostests/winetests/comdlg32/filedlg.c index 5f80e4cb15f..f4fd4646d8d 100644 --- a/rostests/winetests/comdlg32/filedlg.c +++ b/rostests/winetests/comdlg32/filedlg.c @@ -403,8 +403,7 @@ static UINT_PTR WINAPI resize_template_hook(HWND dlg, UINT msg, WPARAM wParam, L } else if( count == 1){ resize = resize_testcases[index].resize_check; GetWindowRect( parent, &rc); - if( resize_testcases[index].todo){ - todo_wine { + todo_wine_if( resize_testcases[index].todo){ ok( resize == rc.right - rc.left - initrc.right + initrc.left, "testid %d size-x change %d expected %d\n", index, rc.right - rc.left - initrc.right + initrc.left, resize); @@ -412,14 +411,6 @@ static UINT_PTR WINAPI resize_template_hook(HWND dlg, UINT msg, WPARAM wParam, L "testid %d size-y change %d expected %d\n", index, rc.bottom - rc.top - initrc.bottom + initrc.top, resize); } - }else{ - ok( resize == rc.right - rc.left - initrc.right + initrc.left, - "testid %d size-x change %d expected %d\n", index, - rc.right - rc.left - initrc.right + initrc.left, resize); - ok( resize == rc.bottom - rc.top - initrc.bottom + initrc.top, - "testid %d size-y change %d expected %d\n", index, - rc.bottom - rc.top - initrc.bottom + initrc.top, resize); - } if( resize_testcases[index].testcontrols) { int i; RECT rc; @@ -789,7 +780,7 @@ static UINT_PTR WINAPI template_hook_arrange(HWND dlgChild, UINT msg, WPARAM wPa ok( wrcParent.right - wrcParent.left == expectx, "Wrong width of dialog %d, expected %d\n", wrcParent.right - wrcParent.left, expectx); - } else todo_wine { + } else { /* with the OFN_ENABLESIZING flag */ ok( wrcParent.bottom - wrcParent.top > expecty, "Wrong height of dialog %d, expected more than %d\n",