Author: akhaldi Date: Tue Mar 1 19:12:27 2016 New Revision: 70849
URL: http://svn.reactos.org/svn/reactos?rev=70849&view=rev Log: [COMDLG32_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912
Modified: trunk/rostests/winetests/comdlg32/filedlg.c
Modified: trunk/rostests/winetests/comdlg32/filedlg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comdlg32/filedlg... ============================================================================== --- trunk/rostests/winetests/comdlg32/filedlg.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comdlg32/filedlg.c [iso-8859-1] Tue Mar 1 19:12:27 2016 @@ -403,8 +403,7 @@ } 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 @@ "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 @@ 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",