Signed-off-by: Nikolay Sivov nsivov@codeweavers.com --- dlls/shell32/tests/shlfolder.c | 36 ++++++++++++++++------------------ 1 file changed, 17 insertions(+), 19 deletions(-)
diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 87e9141987..ebeaf4e20e 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -336,11 +336,11 @@ static void test_EnumObjects(IShellFolder *iFolder) /* Don't test for SFGAO_HASSUBFOLDER since we return real state and native cached */ static const ULONG attrs[5] = { - SFGAO_CAPABILITYMASK | SFGAO_FILESYSTEM | SFGAO_FOLDER | SFGAO_FILESYSANCESTOR, - SFGAO_CAPABILITYMASK | SFGAO_FILESYSTEM | SFGAO_FOLDER | SFGAO_FILESYSANCESTOR, - SFGAO_CAPABILITYMASK | SFGAO_FILESYSTEM, - SFGAO_CAPABILITYMASK | SFGAO_FILESYSTEM, - SFGAO_CAPABILITYMASK | SFGAO_FILESYSTEM, + SFGAO_DROPTARGET | SFGAO_CANLINK | SFGAO_CANCOPY | SFGAO_FILESYSTEM | SFGAO_FOLDER | SFGAO_FILESYSANCESTOR, + SFGAO_DROPTARGET | SFGAO_CANLINK | SFGAO_CANCOPY | SFGAO_FILESYSTEM | SFGAO_FOLDER | SFGAO_FILESYSANCESTOR, + SFGAO_DROPTARGET | SFGAO_CANLINK | SFGAO_CANCOPY | SFGAO_FILESYSTEM, + SFGAO_DROPTARGET | SFGAO_CANLINK | SFGAO_CANCOPY | SFGAO_FILESYSTEM, + SFGAO_DROPTARGET | SFGAO_CANLINK | SFGAO_CANCOPY | SFGAO_FILESYSTEM, }; static const ULONG full_attrs[5] = { @@ -380,30 +380,28 @@ static void test_EnumObjects(IShellFolder *iFolder) ok(hr == iResults[i][j], "Got %x expected [%d]-[%d]=%x\n", hr, i, j, iResults[i][j]); }
- - for (i = 0; i < 5; i++) + for (i = 0; i < ARRAY_SIZE(attrs); ++i) { SFGAOF flags; -#define SFGAO_VISTA SFGAO_DROPTARGET | SFGAO_CANLINK | SFGAO_CANCOPY - /* Native returns all flags no matter what we ask for */ + flags = SFGAO_CANCOPY; hr = IShellFolder_GetAttributesOf(iFolder, 1, (LPCITEMIDLIST*)(idlArr + i), &flags); flags &= SFGAO_testfor; - ok(hr == S_OK, "GetAttributesOf returns %08x\n", hr); - ok(flags == (attrs[i]) || - flags == ((attrs[i] & ~SFGAO_CAPABILITYMASK) | SFGAO_VISTA), /* Vista and higher */ - "GetAttributesOf[%i] got %08x, expected %08x\n", i, flags, attrs[i]); + ok(hr == S_OK, "Failed to get item attributes, hr %#x.\n", hr); + ok((flags & attrs[i]) == attrs[i], "%i: unexpected attributes got %#x, expected %#x.\n", i, flags, attrs[i]);
flags = SFGAO_testfor; hr = IShellFolder_GetAttributesOf(iFolder, 1, (LPCITEMIDLIST*)(idlArr + i), &flags); flags &= SFGAO_testfor; - ok(hr == S_OK, "GetAttributesOf returns %08x\n", hr); - ok(flags == attrs[i], "GetAttributesOf[%i] got %08x, expected %08x\n", i, flags, attrs[i]); + ok(hr == S_OK, "Failed to get item attributes, hr %#x.\n", hr); + ok(flags == (attrs[i] | SFGAO_CAPABILITYMASK), "%i: unexpected attributes got %#x, expected %#x.\n", + i, flags, attrs[i]);
flags = ~0u; hr = IShellFolder_GetAttributesOf(iFolder, 1, (LPCITEMIDLIST*)(idlArr + i), &flags); - ok(hr == S_OK, "GetAttributesOf returns %08x\n", hr); - ok((flags & ~(SFGAO_HASSUBFOLDER|SFGAO_COMPRESSED)) == full_attrs[i], "%d: got %08x expected %08x\n", i, flags, full_attrs[i]); + ok(hr == S_OK, "Failed to get item attributes, hr %#x.\n", hr); + ok((flags & ~(SFGAO_HASSUBFOLDER|SFGAO_COMPRESSED)) == full_attrs[i], "%d: unexpected attributes %#x, expected %#x\n", + i, flags, full_attrs[i]); }
for (i=0;i<5;i++) @@ -5263,7 +5261,7 @@ static void test_SHGetSetFolderCustomSettings(void)
if (!pSHGetSetFolderCustomSettings) { - win_skip("SHGetSetFolderCustomSetting not exported by name (only by ordinal) for version XP/win2003\n"); + win_skip("SHGetSetFolderCustomSetting is not available.\n"); return; }
@@ -5294,7 +5292,7 @@ static void test_SHGetSetFolderCustomSettings(void) todo_wine ok(!lstrcmpiW(iconpathW, fcs.pszIconFile), "Expected %s, got %s\n", wine_dbgstr_w(iconpathW), wine_dbgstr_w(fcs.pszIconFile));
hr = pSHGetSetFolderCustomSettings(&fcs, NULL, FCS_READ); - ok(hr == E_FAIL, "Expected E_FAIL, got %#x\n", hr); + ok(FAILED(hr), "Unexpected hr %#x.\n", hr);
lstrcpyW(bufferW, pathW); lstrcatW(bufferW, desktop_iniW);
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=58353
Your paranoid android.
=== w2003std (32 bit report) ===
shell32: shlfolder.c:4955: Test failed: MKDIR: Expected wndproc to be called shlfolder.c:4867: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 8) shlfolder.c:4955: Test failed: CREATE: Expected wndproc to be called shlfolder.c:4867: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 2) shlfolder.c:4955: Test failed: RMDIR: Expected wndproc to be called shlfolder.c:4867: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 10) shlfolder.c:4955: Test failed: MKDIR: Expected wndproc to be called shlfolder.c:4867: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 264) shlfolder.c:4955: Test failed: CREATE: Expected wndproc to be called shlfolder.c:4867: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 264) shlfolder.c:4955: Test failed: RMDIR: Expected wndproc to be called shlfolder.c:4867: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 264)
=== w1064v1809 (32 bit report) ===
shell32: shlfolder.c:4867: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 40000) shlfolder.c:4850: Test failed: MKDIR: expected notification type 8, got: 40000 shlfolder.c:4857: Test failed: GetDisplayNameOf failed: 0x80070057 shlfolder.c:4867: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 8) shlfolder.c:4867: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 40000)
=== w1064v1809_2scr (32 bit report) ===
shell32: shlfolder.c:4850: Test failed: MKDIR: expected notification type 8, got: 40000 shlfolder.c:4857: Test failed: GetDisplayNameOf failed: 0x80070057 shlfolder.c:4867: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 8) shlfolder.c:4867: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 40000) shlfolder.c:4867: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 40000) shlfolder.c:4850: Test failed: RMDIR: expected notification type 10, got: 40000 shlfolder.c:4857: Test failed: GetDisplayNameOf failed: 0x80070057 shlfolder.c:4867: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 10)
=== w1064v1809_ja (32 bit report) ===
shell32: shlfolder.c:4850: Test failed: RMDIR: expected notification type 10, got: 40000 shlfolder.c:4857: Test failed: GetDisplayNameOf failed: 0x80070057 shlfolder.c:4867: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 10)
=== w1064v1809 (64 bit report) ===
shell32: shlfolder.c:4867: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 40000) shlfolder.c:4867: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 40000) shlfolder.c:4850: Test failed: MKDIR: expected notification type 8, got: 40000 shlfolder.c:4857: Test failed: GetDisplayNameOf failed: 0x80070057 shlfolder.c:4867: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 8) shlfolder.c:4867: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 40000) shlfolder.c:4867: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 40000) shlfolder.c:4850: Test failed: CREATE: expected notification type 2, got: 40000 shlfolder.c:4857: Test failed: GetDisplayNameOf failed: 0x80070057 shlfolder.c:4867: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 2) shlfolder.c:4867: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3) shlfolder.c:4850: Test failed: RMDIR: expected notification type 10, got: 40000 shlfolder.c:4857: Test failed: GetDisplayNameOf failed: 0x80070057 shlfolder.c:4867: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3)
-
Marvin -
Nikolay Sivov