Skip to content

W
wine-winehq
Commit 11b797bb authored by Dmitry Timoshkov's avatar Dmitry Timoshkov Committed by Alexandre Julliard
Browse files
Options

shell32/tests: Remove workarounds for shell32 < 5.0.

Signed-off-by: 's avatarDmitry Timoshkov <dmitry@baikal.ru> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent d468dd2e
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 31 deletions
dlls/shell32/tests/shelllink.c
View file @ 11b797bb
...@@ -454,9 +454,7 @@ void create_lnk_(int line, const WCHAR* path, lnk_desc_t* desc) ...@@ -454,9 +454,7 @@ void create_lnk_(int line, const WCHAR* path, lnk_desc_t* desc)
/* test GetCurFile before ::Save */ /* test GetCurFile before ::Save */
str = (LPWSTR)0xdeadbeef; str = (LPWSTR)0xdeadbeef;
r = IPersistFile_GetCurFile(pf, &str); r = IPersistFile_GetCurFile(pf, &str);
lok(r == S_FALSE || lok(r == S_FALSE, "got 0x%08x\n", r);
broken(r == S_OK), /* shell32 < 5.0 */
"got 0x%08x\n", r);
lok(str == NULL, "got %p\n", str); lok(str == NULL, "got %p\n", str);
r = IPersistFile_Save(pf, path, TRUE); r = IPersistFile_Save(pf, path, TRUE);
...@@ -465,16 +463,9 @@ void create_lnk_(int line, const WCHAR* path, lnk_desc_t* desc) ...@@ -465,16 +463,9 @@ void create_lnk_(int line, const WCHAR* path, lnk_desc_t* desc)
/* test GetCurFile after ::Save */ /* test GetCurFile after ::Save */
r = IPersistFile_GetCurFile(pf, &str); r = IPersistFile_GetCurFile(pf, &str);
lok(r == S_OK, "got 0x%08x\n", r); lok(r == S_OK, "got 0x%08x\n", r);
lok(str != NULL || lok(str != NULL, "Didn't expect NULL\n");
broken(str == NULL), /* shell32 < 5.0 */ lok(!wcscmp(path, str), "Expected %s, got %s\n", wine_dbgstr_w(path), wine_dbgstr_w(str));
"Didn't expect NULL\n"); CoTaskMemFree(str);
if (str)
{
lok(!wcscmp(path, str), "Expected %s, got %s\n", wine_dbgstr_w(path), wine_dbgstr_w(str));
CoTaskMemFree(str);
}
else
win_skip("GetCurFile fails on shell32 < 5.0\n");
IPersistFile_Release(pf); IPersistFile_Release(pf);
} }
...@@ -507,9 +498,7 @@ static void check_lnk_(int line, const WCHAR* path, lnk_desc_t* desc, int todo) ...@@ -507,9 +498,7 @@ static void check_lnk_(int line, const WCHAR* path, lnk_desc_t* desc, int todo)
/* test GetCurFile before ::Load */ /* test GetCurFile before ::Load */
str = (LPWSTR)0xdeadbeef; str = (LPWSTR)0xdeadbeef;
r = IPersistFile_GetCurFile(pf, &str); r = IPersistFile_GetCurFile(pf, &str);
lok(r == S_FALSE || lok(r == S_FALSE, "got 0x%08x\n", r);
broken(r == S_OK), /* shell32 < 5.0 */
"got 0x%08x\n", r);
lok(str == NULL, "got %p\n", str); lok(str == NULL, "got %p\n", str);
r = IPersistFile_Load(pf, path, STGM_READ); r = IPersistFile_Load(pf, path, STGM_READ);
...@@ -518,23 +507,11 @@ static void check_lnk_(int line, const WCHAR* path, lnk_desc_t* desc, int todo) ...@@ -518,23 +507,11 @@ static void check_lnk_(int line, const WCHAR* path, lnk_desc_t* desc, int todo)
/* test GetCurFile after ::Save */ /* test GetCurFile after ::Save */
r = IPersistFile_GetCurFile(pf, &str); r = IPersistFile_GetCurFile(pf, &str);
lok(r == S_OK, "got 0x%08x\n", r); lok(r == S_OK, "got 0x%08x\n", r);
lok(str != NULL || lok(str != NULL, "Didn't expect NULL\n");
broken(str == NULL), /* shell32 < 5.0 */ lok(!wcscmp(path, str), "Expected %s, got %s\n", wine_dbgstr_w(path), wine_dbgstr_w(str));
"Didn't expect NULL\n"); CoTaskMemFree(str);
if (str != NULL)
{
lok(!wcscmp(path, str), "Expected %s, got %s\n", wine_dbgstr_w(path), wine_dbgstr_w(str));
CoTaskMemFree(str);
}
else
win_skip("GetCurFile fails on shell32 < 5.0\n");
IPersistFile_Release(pf); IPersistFile_Release(pf);
if (r != S_OK)
{
IShellLinkA_Release(sl);
return;
}
if (desc->description) if (desc->description)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment