From 36d5265aee92837d217fdc3d6fbf315ba05a4b62 Mon Sep 17 00:00:00 2001 From: Rein Klazes Date: Sun, 12 Jul 2009 14:36:10 +0200 Subject: [PATCH] comdlg32/tests: Remove file dialog resize tests that rely on CDN_SELCHANGE notifications. These notifications are not always sent on some (but not all) win2k3/vista/win2k8 machines. --- dlls/comdlg32/tests/filedlg.c | 35 +++++++++++++---------------------- 1 file changed, 13 insertions(+), 22 deletions(-) diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index 63375bb2b9a..2bef8cefb45 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -273,23 +273,20 @@ static void test_create_view_template(void) /* test cases for resizing of the file dialog */ struct { DWORD flags; - int resize_folderchange; /* change in CDN_FOLDERCHANGE handler */ - int resize_selchange; /* change in CDN_SELCHANGE handler */ - int resize_timer1; /* change in first WM_TIMER handler */ - int resize_check; /* expected change (in second WM_TIMER handler) */ - BOOL todo; /* mark that test todo_wine */ - BOOL testcontrols; /* test resizing and moving of the controls */ + int resize_folderchange;/* change in CDN_FOLDERCHANGE handler */ + int resize_timer1; /* change in first WM_TIMER handler */ + int resize_check; /* expected change (in second WM_TIMER handler) */ + BOOL todo; /* mark that test todo_wine */ + BOOL testcontrols; /* test resizing and moving of the controls */ } resize_testcases[] = { - { 0 , 10, 10, 10, 30,FALSE,FALSE}, /* 0 */ - { 0 ,-10,-10,-10,-30,FALSE,FALSE}, - { OFN_ENABLESIZING , 0, 0, 0, 0,FALSE,FALSE}, - { OFN_ENABLESIZING , 0, 0,-10, 0,FALSE,FALSE}, - { OFN_ENABLESIZING , 0, 0, 10, 10,FALSE, TRUE}, - { OFN_ENABLESIZING , 0,-10, 0, 0,FALSE,FALSE}, /* 5 */ - { OFN_ENABLESIZING , 0, 10, 0, 10,FALSE,FALSE}, - { OFN_ENABLESIZING ,-10, 0, 0, 10,FALSE,FALSE}, - { OFN_ENABLESIZING , 10, 0, 0, 10,FALSE,FALSE}, - { OFN_ENABLESIZING , 0, 0, 10, 20,FALSE,FALSE}, + { 0 , 10, 10, 20,FALSE,FALSE}, /* 0 */ + { 0 ,-10,-10,-20,FALSE,FALSE}, + { OFN_ENABLESIZING , 0, 0, 0,FALSE,FALSE}, + { OFN_ENABLESIZING , 0,-10, 0,FALSE,FALSE}, + { OFN_ENABLESIZING , 0, 10, 10,FALSE, TRUE}, + { OFN_ENABLESIZING ,-10, 0, 10,FALSE,FALSE}, /* 5 */ + { OFN_ENABLESIZING , 10, 0, 10,FALSE,FALSE}, + { OFN_ENABLESIZING , 0, 10, 20,FALSE,FALSE}, /* mark the end */ { 0xffffffff } }; @@ -338,12 +335,6 @@ static LONG_PTR WINAPI resize_template_hook(HWND dlg, UINT msg, WPARAM wParam, L MoveWindow( parent, initrc.left,initrc.top, initrc.right - initrc.left + resize, initrc.bottom - initrc.top + resize, TRUE); } - } else if(( (LPNMHDR)lParam)->code == CDN_SELCHANGE){ - if( (resize = resize_testcases[index].resize_selchange)){ - GetWindowRect( parent, &rc); - MoveWindow( parent, rc.left,rc.top, rc.right - rc.left + resize, - rc.bottom - rc.top + resize, TRUE); - } SetTimer( dlg, 0, 100, 0); } break;