Signed-off-by: Dmitry Timoshkov dmitry@baikal.ru --- dlls/shell32/tests/shell32_test.h | 4 ++-- dlls/shell32/tests/shelllink.c | 23 +++++++++++------------ dlls/shell32/tests/shlexec.c | 4 ++-- 3 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/dlls/shell32/tests/shell32_test.h b/dlls/shell32/tests/shell32_test.h index 42a74fb2d5..89d08e70c0 100644 --- a/dlls/shell32/tests/shell32_test.h +++ b/dlls/shell32/tests/shell32_test.h @@ -33,5 +33,5 @@ typedef struct WORD hotkey; } lnk_desc_t;
-#define create_lnk(a,b,c) create_lnk_(__LINE__, (a), (b), (c)) -void create_lnk_(int,const WCHAR*,lnk_desc_t*,int); +#define create_lnk(a,b) create_lnk_(__LINE__, (a), (b)) +void create_lnk_(int,const WCHAR*,lnk_desc_t*); diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index e4f176237f..4f650d801d 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -386,7 +386,7 @@ static void test_get_set(void) #define lok ok_(__FILE__, line) #define check_lnk(a,b,c) check_lnk_(__LINE__, (a), (b), (c))
-void create_lnk_(int line, const WCHAR* path, lnk_desc_t* desc, int save_fails) +void create_lnk_(int line, const WCHAR* path, lnk_desc_t* desc) { HRESULT r; IShellLinkA *sl; @@ -460,8 +460,7 @@ void create_lnk_(int line, const WCHAR* path, lnk_desc_t* desc, int save_fails) lok(str == NULL, "got %p\n", str);
r = IPersistFile_Save(pf, path, TRUE); - todo_wine_if (save_fails) - lok(r == S_OK, "save failed (0x%08x)\n", r); + lok(r == S_OK, "save failed (0x%08x)\n", r);
/* test GetCurFile after ::Save */ r = IPersistFile_GetCurFile(pf, &str); @@ -628,7 +627,7 @@ static void test_load_save(void)
/* Save an empty .lnk file */ memset(&desc, 0, sizeof(desc)); - create_lnk(lnkfile, &desc, 0); + create_lnk(lnkfile, &desc);
/* It should come back as a bunch of empty strings */ desc.description=""; @@ -648,7 +647,7 @@ static void test_load_save(void) desc.icon="c:\nonexistent\icon\file"; desc.icon_id=1234; desc.hotkey=0; - create_lnk(lnkfile, &desc, 0); + create_lnk(lnkfile, &desc); check_lnk(lnkfile, &desc, 0x0);
r=GetModuleFileNameA(NULL, mypath, sizeof(mypath)); @@ -672,7 +671,7 @@ static void test_load_save(void) desc.icon=mypath; desc.icon_id=0; desc.hotkey=0x1234; - create_lnk(lnkfile, &desc, 0); + create_lnk(lnkfile, &desc); check_lnk(lnkfile, &desc, 0x0);
/* Test omitting .exe from an absolute path */ @@ -689,7 +688,7 @@ static void test_load_save(void) desc.icon=mypath; desc.icon_id=0; desc.hotkey=0x1234; - create_lnk(lnkfile, &desc, 0); + create_lnk(lnkfile, &desc); strcat(realpath, ".exe"); check_lnk(lnkfile, &desc, 0x4);
@@ -703,7 +702,7 @@ static void test_load_save(void) desc.icon=mypath; desc.icon_id=0; desc.hotkey=0x1234; - create_lnk(lnkfile, &desc, 0); + create_lnk(lnkfile, &desc); /* Check that link is created to proper location */ SearchPathA( NULL, desc.path, NULL, MAX_PATH, realpath, NULL); desc.path=realpath; @@ -719,7 +718,7 @@ static void test_load_save(void) desc.icon=mypath; desc.icon_id=0; desc.hotkey=0x1234; - create_lnk(lnkfile, &desc, 0); + create_lnk(lnkfile, &desc); /* Check that link is created to proper location */ SearchPathA( NULL, "rundll32", NULL, MAX_PATH, realpath, NULL); desc.path=realpath; @@ -750,7 +749,7 @@ static void test_load_save(void) desc.icon=mypath; desc.icon_id=0; desc.hotkey=0x1234; - create_lnk(lnkfile, &desc, 0); + create_lnk(lnkfile, &desc); check_lnk(lnkfile, &desc, 0x0);
r = GetShortPathNameA(mydir, mypath, sizeof(mypath)); @@ -770,7 +769,7 @@ static void test_load_save(void) desc.icon=mypath; desc.icon_id=0; desc.hotkey=0x1234; - create_lnk(lnkfile, &desc, 0); + create_lnk(lnkfile, &desc); desc.path=realpath; check_lnk(lnkfile, &desc, 0x0);
@@ -800,7 +799,7 @@ static void test_load_save(void) desc.icon=mypath; desc.icon_id=0; desc.hotkey=0x1234; - create_lnk(lnkfile, &desc, 0); + create_lnk(lnkfile, &desc); desc.path = realpath; check_lnk(lnkfile, &desc, 0x4);
diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 8ee662321d..2481fb6faa 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -2742,7 +2742,7 @@ static void init_test(void) desc.icon=NULL; desc.icon_id=0; desc.hotkey=0; - create_lnk(lnkfile, &desc, 0); + create_lnk(lnkfile, &desc);
sprintf(filename, "%s\test_shortcut_exe.lnk", tmpdir); MultiByteToWideChar(CP_ACP, 0, filename, -1, lnkfile, ARRAY_SIZE(lnkfile)); @@ -2756,7 +2756,7 @@ static void init_test(void) desc.icon=NULL; desc.icon_id=0; desc.hotkey=0; - create_lnk(lnkfile, &desc, 0); + create_lnk(lnkfile, &desc);
/* Create a basic association suitable for most tests */ if (!create_test_association(".shlexec"))
Hi,
While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=83660
Your paranoid android.
=== w7u_el (32 bit report) ===
shell32: autocomplete.c:554: Test failed: Expected 5 expansions, got 4 autocomplete.c:556: Test failed: Expected 6 resets, got 5 autocomplete.c:561: Test failed: Expected 6 expansions, got 5 autocomplete.c:563: Test failed: Expected 7 resets, got 6
=== w8 (32 bit report) ===
shell32: autocomplete.c:513: Test failed: Expected 1 expansion, got 0 autocomplete.c:514: Test failed: Expected L"test\", got L"" autocomplete.c:515: Test failed: Expected 1 reset, got 0 autocomplete.c:520: Test failed: Expected 2 expansions, got 1 autocomplete.c:522: Test failed: Expected 2 resets, got 1 autocomplete.c:531: Test failed: Expected 2 expansions, got 1 autocomplete.c:532: Test failed: Expected 2 resets, got 1 autocomplete.c:535: Test failed: Expected 3 expansions, got 2 autocomplete.c:537: Test failed: Expected 3 resets, got 2 autocomplete.c:542: Test failed: Expected 4 expansions, got 3 autocomplete.c:544: Test failed: Expected 4 resets, got 3 autocomplete.c:548: Test failed: Expected 4 expansions, got 3 autocomplete.c:549: Test failed: Expected 5 resets, got 4 autocomplete.c:554: Test failed: Expected 5 expansions, got 4 autocomplete.c:556: Test failed: Expected 6 resets, got 5 autocomplete.c:561: Test failed: Expected 6 expansions, got 5 autocomplete.c:563: Test failed: Expected 7 resets, got 6
=== w10pro64 (32 bit report) ===
shell32: autocomplete.c:773: Test failed: Expected L"auto complete", got L"au" autocomplete.c:774: Test failed: Expected 2 resets, got 1 autocomplete.c:779: Test failed: AutoComplete DropDown should be visible autocomplete.c:784: Test failed: AutoComplete DropDown should have been hidden autocomplete.c:513: Test failed: Expected 1 expansion, got 0 autocomplete.c:514: Test failed: Expected L"test\", got L"" autocomplete.c:515: Test failed: Expected 1 reset, got 0 autocomplete.c:520: Test failed: Expected 2 expansions, got 1 autocomplete.c:522: Test failed: Expected 2 resets, got 1 autocomplete.c:531: Test failed: Expected 2 expansions, got 1 autocomplete.c:532: Test failed: Expected 2 resets, got 1 autocomplete.c:535: Test failed: Expected 3 expansions, got 2 autocomplete.c:537: Test failed: Expected 3 resets, got 2 autocomplete.c:542: Test failed: Expected 4 expansions, got 3 autocomplete.c:544: Test failed: Expected 4 resets, got 3 autocomplete.c:548: Test failed: Expected 4 expansions, got 3 autocomplete.c:549: Test failed: Expected 5 resets, got 4 autocomplete.c:554: Test failed: Expected 5 expansions, got 4 autocomplete.c:556: Test failed: Expected 6 resets, got 5 autocomplete.c:561: Test failed: Expected 6 expansions, got 5 autocomplete.c:563: Test failed: Expected 7 resets, got 6 autocomplete.c:637: Test failed: Expected L"www.ac", got L"www.a" autocomplete.c:638: Test failed: AutoComplete DropDown not visible autocomplete.c:638: Test failed: AutoComplete DropDown not visible autocomplete.c:638: Test failed: Expected L"https://www.ac", got (null) autocomplete.c:638: Test failed: AutoComplete DropDown not visible autocomplete.c:638: Test failed: Expected L"http://www.add", got (null) autocomplete.c:638: Test failed: AutoComplete DropDown not visible autocomplete.c:638: Test failed: Expected L"www.ax", got (null) autocomplete.c:638: Test failed: AutoComplete DropDown not visible autocomplete.c:675: Test failed: AutoComplete DropDown not visible autocomplete.c:675: Test failed: AutoComplete DropDown not visible autocomplete.c:675: Test failed: Expected L"http://a0", got (null) autocomplete.c:675: Test failed: AutoComplete DropDown not visible autocomplete.c:675: Test failed: Expected L"http://abc.aa.com", got (null) autocomplete.c:675: Test failed: AutoComplete DropDown not visible
=== w10pro64 (64 bit report) ===
shell32: autocomplete.c:520: Test failed: Expected 2 expansions, got 1 autocomplete.c:521: Test failed: Expected L"test\foo\bar\", got L"test\" autocomplete.c:531: Test failed: Expected 2 expansions, got 1 autocomplete.c:532: Test failed: Expected 2 resets, got 1 autocomplete.c:535: Test failed: Expected 3 expansions, got 2 autocomplete.c:537: Test failed: Expected 3 resets, got 2 autocomplete.c:542: Test failed: Expected 4 expansions, got 3 autocomplete.c:544: Test failed: Expected 4 resets, got 3 autocomplete.c:548: Test failed: Expected 4 expansions, got 3 autocomplete.c:549: Test failed: Expected 5 resets, got 4 autocomplete.c:554: Test failed: Expected 5 expansions, got 4 autocomplete.c:556: Test failed: Expected 6 resets, got 5 autocomplete.c:561: Test failed: Expected 6 expansions, got 5 autocomplete.c:563: Test failed: Expected 7 resets, got 6 autocomplete.c:667: Test failed: Expected L"http://a0", got L"http://a" autocomplete.c:668: Test failed: AutoComplete DropDown not visible autocomplete.c:668: Test failed: AutoComplete DropDown not visible autocomplete.c:668: Test failed: Expected L"http://a0", got (null) autocomplete.c:668: Test failed: AutoComplete DropDown not visible autocomplete.c:668: Test failed: Expected L"http://abc.aa.com", got (null) autocomplete.c:668: Test failed: AutoComplete DropDown not visible
=== w10pro64_he (64 bit report) ===
shell32: autocomplete.c:554: Test failed: Expected 5 expansions, got 4 autocomplete.c:556: Test failed: Expected 6 resets, got 5 autocomplete.c:561: Test failed: Expected 6 expansions, got 4 autocomplete.c:563: Test failed: Expected 7 resets, got 5
=== w1064v1809 (32 bit report) ===
shell32: shlfolder.c:4830: Test failed: MKDIR: expected notification type 8, got: 40000 shlfolder.c:4837: Test failed: GetDisplayNameOf failed: 0x80070057 shlfolder.c:4847: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 8) shlfolder.c:4847: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 40000) shlfolder.c:4847: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 40000)
=== w1064 (32 bit report) ===
shell32: shlfolder.c:4830: Test failed: CREATE: expected notification type 2, got: 4000000 shlfolder.c:4837: Test failed: GetDisplayNameOf failed: 0x80070057 shlfolder.c:4838: Test failed: Expected PIDL to be NULL shlfolder.c:4847: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 2) shlfolder.c:4847: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 4000000) shlfolder.c:4847: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 4000000) shlfolder.c:4847: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 40000) shlfolder.c:4847: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3)
=== w1064v1809 (64 bit report) ===
shell32: shlfolder.c:4847: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 40000) shlfolder.c:4847: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 40000)
=== w1064 (64 bit report) ===
shell32: shlfolder.c:4847: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 40000) shlfolder.c:4830: Test failed: RMDIR: expected notification type 10, got: 4000000 shlfolder.c:4837: Test failed: GetDisplayNameOf failed: 0x80070057 shlfolder.c:4838: Test failed: Expected PIDL to be NULL shlfolder.c:4847: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 10) shlfolder.c:4847: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 40000) shlfolder.c:4847: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 4000000) shlfolder.c:4847: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 4000000) shlfolder.c:4830: Test failed: RMDIR: expected notification type 10, got: 40000 shlfolder.c:4837: Test failed: GetDisplayNameOf failed: 0x80070057 shlfolder.c:4847: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 10) shlfolder.c:4830: Test failed: CREATE: expected notification type 2, got: 40000 shlfolder.c:4837: Test failed: GetDisplayNameOf failed: 0x80070057 shlfolder.c:4847: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3)
=== w1064_2qxl (64 bit report) ===
shell32: shlfolder.c:4847: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 4000000) shlfolder.c:4847: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 40000) shlfolder.c:4847: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 4000000) shlfolder.c:4847: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 4000000) shlfolder.c:4830: Test failed: RMDIR: expected notification type 10, got: 40000 shlfolder.c:4837: Test failed: GetDisplayNameOf failed: 0x80070057 shlfolder.c:4847: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 10)
=== w10pro64_ar (64 bit report) ===
shell32: shlfolder.c:4847: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3) shlfolder.c:4847: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3) shlfolder.c:4847: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3) shlfolder.c:4847: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3)
=== w10pro64_he (64 bit report) ===
shell32: shlfolder.c:4847: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 4000000) shlfolder.c:4830: Test failed: RMDIR: expected notification type 10, got: 40000 shlfolder.c:4837: Test failed: GetDisplayNameOf failed: 0x80070057 shlfolder.c:4847: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 10) shlfolder.c:4847: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3)
=== w10pro64_ja (64 bit report) ===
shell32: shlfolder.c:4847: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 40000)
=== w10pro64_zh_CN (64 bit report) ===
shell32: shlfolder.c:4830: Test failed: CREATE: expected notification type 2, got: 40000 shlfolder.c:4837: Test failed: GetDisplayNameOf failed: 0x80070057 shlfolder.c:4847: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 2) shlfolder.c:4847: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 4000000) shlfolder.c:4830: Test failed: RMDIR: expected notification type 10, got: 40000 shlfolder.c:4837: Test failed: GetDisplayNameOf failed: 0x80070057 shlfolder.c:4847: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 10) shlfolder.c:4847: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3) shlfolder.c:4847: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3) shlfolder.c:4830: Test failed: RMDIR: expected notification type 10, got: 40000 shlfolder.c:4837: Test failed: GetDisplayNameOf failed: 0x80070057 shlfolder.c:4847: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3)
Marvin testbot@winehq.org wrote:
While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=83660
Your paranoid android.
These are existing failures, here's a clean run of the merged patches: https://testbot.winehq.org/JobDetails.pl?Key=83659
-
Dmitry Timoshkov -
Marvin