Signed-off-by: Nikolay Sivov nsivov@codeweavers.com --- dlls/shell32/tests/shlfolder.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 14d243a03b..c9606c6f10 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -83,13 +83,6 @@ static WCHAR *make_wstr(const char *str) return ret; }
-static int strcmp_wa(LPCWSTR strw, const char *stra) -{ - CHAR buf[512]; - WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, sizeof(buf), NULL, NULL); - return lstrcmpA(stra, buf); -} - static void init_function_pointers(void) { HMODULE hmod; @@ -4503,10 +4496,13 @@ static void r_verify_pidl(unsigned l, LPCITEMIDLIST pidl, const WCHAR *path) "didn't get expected path (%s), instead: %s\n", wine_dbgstr_w(path), wine_dbgstr_w(U(filename).pOleStr)); SHFree(U(filename).pOleStr); - }else if(filename.uType == STRRET_CSTR){ - ok_(__FILE__,l)(strcmp_wa(path, U(filename).cStr) == 0, - "didn't get expected path (%s), instead: %s\n", + } + else if(filename.uType == STRRET_CSTR) + { + WCHAR *strW = make_wstr(U(filename).cStr); + ok_(__FILE__,l)(!lstrcmpW(path, strW), "didn't get expected path (%s), instead: %s\n", wine_dbgstr_w(path), U(filename).cStr); + heap_free(strW); }
IShellFolder_Release(parent);
Signed-off-by: Nikolay Sivov nsivov@codeweavers.com --- dlls/shell32/tests/shlfolder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index c9606c6f10..e724448c7a 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -1782,7 +1782,7 @@ static void test_SHGetFolderPathAndSubDirA(void) static const char wine[] = "wine"; static const char winetemp[] = "wine\temp"; static char appdata[MAX_PATH]; - static char testpath[MAX_PATH]; + static char testpath[2 * MAX_PATH]; static char toolongpath[MAX_PATH+1];
if(FAILED(SHGetFolderPathA(NULL, CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, appdata)))
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=64714
Your paranoid android.
=== 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)
=== w1064v1809_ja (32 bit report) ===
shell32: 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)
=== w1064v1809 (64 bit report) ===
shell32: shlfolder.c:4847: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 40000)
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=64713
Your paranoid android.
=== w1064v1809_2scr (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)
=== w1064v1809_ar (32 bit report) ===
shell32: shlfolder.c:4847: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 3)
=== w1064v1809_ja (32 bit report) ===
shell32: shlfolder.c:4935: Test failed: RMDIR: Expected wndproc to be called
=== w1064v1809_zh_CN (32 bit report) ===
shell32: 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)
=== w1064v1809 (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)
-
Marvin -
Nikolay Sivov