shell32/tests: Use FAILED instead of !SUCCEEDED.
This commit is contained in:
parent
0c07d3ba37
commit
ca0074e706
|
@ -114,7 +114,7 @@ static void test_get_set(void)
|
||||||
r = CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER,
|
r = CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER,
|
||||||
&IID_IShellLinkA, (LPVOID*)&sl);
|
&IID_IShellLinkA, (LPVOID*)&sl);
|
||||||
ok(SUCCEEDED(r), "no IID_IShellLinkA (0x%08x)\n", r);
|
ok(SUCCEEDED(r), "no IID_IShellLinkA (0x%08x)\n", r);
|
||||||
if (!SUCCEEDED(r))
|
if (FAILED(r))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
/* Test Getting / Setting the description */
|
/* Test Getting / Setting the description */
|
||||||
|
@ -329,7 +329,7 @@ void create_lnk_(int line, const WCHAR* path, lnk_desc_t* desc, int save_fails)
|
||||||
r = CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER,
|
r = CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER,
|
||||||
&IID_IShellLinkA, (LPVOID*)&sl);
|
&IID_IShellLinkA, (LPVOID*)&sl);
|
||||||
lok(SUCCEEDED(r), "no IID_IShellLinkA (0x%08x)\n", r);
|
lok(SUCCEEDED(r), "no IID_IShellLinkA (0x%08x)\n", r);
|
||||||
if (!SUCCEEDED(r))
|
if (FAILED(r))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (desc->description)
|
if (desc->description)
|
||||||
|
@ -404,12 +404,12 @@ static void check_lnk_(int line, const WCHAR* path, lnk_desc_t* desc, int todo)
|
||||||
r = CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER,
|
r = CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER,
|
||||||
&IID_IShellLinkA, (LPVOID*)&sl);
|
&IID_IShellLinkA, (LPVOID*)&sl);
|
||||||
lok(SUCCEEDED(r), "no IID_IShellLinkA (0x%08x)\n", r);
|
lok(SUCCEEDED(r), "no IID_IShellLinkA (0x%08x)\n", r);
|
||||||
if (!SUCCEEDED(r))
|
if (FAILED(r))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
r = IShellLinkA_QueryInterface(sl, &IID_IPersistFile, (LPVOID*)&pf);
|
r = IShellLinkA_QueryInterface(sl, &IID_IPersistFile, (LPVOID*)&pf);
|
||||||
lok(SUCCEEDED(r), "no IID_IPersistFile (0x%08x)\n", r);
|
lok(SUCCEEDED(r), "no IID_IPersistFile (0x%08x)\n", r);
|
||||||
if (!SUCCEEDED(r))
|
if (FAILED(r))
|
||||||
{
|
{
|
||||||
IShellLinkA_Release(sl);
|
IShellLinkA_Release(sl);
|
||||||
return;
|
return;
|
||||||
|
@ -418,7 +418,7 @@ static void check_lnk_(int line, const WCHAR* path, lnk_desc_t* desc, int todo)
|
||||||
r = IPersistFile_Load(pf, path, STGM_READ);
|
r = IPersistFile_Load(pf, path, STGM_READ);
|
||||||
lok(SUCCEEDED(r), "load failed (0x%08x)\n", r);
|
lok(SUCCEEDED(r), "load failed (0x%08x)\n", r);
|
||||||
IPersistFile_Release(pf);
|
IPersistFile_Release(pf);
|
||||||
if (!SUCCEEDED(r))
|
if (FAILED(r))
|
||||||
{
|
{
|
||||||
IShellLinkA_Release(sl);
|
IShellLinkA_Release(sl);
|
||||||
return;
|
return;
|
||||||
|
@ -715,7 +715,7 @@ START_TEST(shelllink)
|
||||||
|
|
||||||
r = CoInitialize(NULL);
|
r = CoInitialize(NULL);
|
||||||
ok(SUCCEEDED(r), "CoInitialize failed (0x%08x)\n", r);
|
ok(SUCCEEDED(r), "CoInitialize failed (0x%08x)\n", r);
|
||||||
if (!SUCCEEDED(r))
|
if (FAILED(r))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
test_get_set();
|
test_get_set();
|
||||||
|
|
|
@ -1505,7 +1505,7 @@ static void init_test(void)
|
||||||
|
|
||||||
r = CoInitialize(NULL);
|
r = CoInitialize(NULL);
|
||||||
ok(SUCCEEDED(r), "CoInitialize failed (0x%08x)\n", r);
|
ok(SUCCEEDED(r), "CoInitialize failed (0x%08x)\n", r);
|
||||||
if (!SUCCEEDED(r))
|
if (FAILED(r))
|
||||||
exit(1);
|
exit(1);
|
||||||
|
|
||||||
rc=GetModuleFileName(NULL, argv0, sizeof(argv0));
|
rc=GetModuleFileName(NULL, argv0, sizeof(argv0));
|
||||||
|
|
|
@ -275,7 +275,7 @@ static void test_get_file_info_iconlist(void)
|
||||||
SHFILEINFOW shInfow;
|
SHFILEINFOW shInfow;
|
||||||
|
|
||||||
hr = SHGetSpecialFolderLocation(NULL, CSIDL_DESKTOP, &pidList);
|
hr = SHGetSpecialFolderLocation(NULL, CSIDL_DESKTOP, &pidList);
|
||||||
if (!SUCCEEDED(hr)) {
|
if (FAILED(hr)) {
|
||||||
skip("can't get desktop pidl\n");
|
skip("can't get desktop pidl\n");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1398,7 +1398,7 @@ static void testSHGetFolderPathAndSubDirA(void)
|
||||||
skip("SHGetFolderPathA not present!\n");
|
skip("SHGetFolderPathA not present!\n");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if(!SUCCEEDED(pSHGetFolderPathA(NULL, CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, appdata)))
|
if(FAILED(pSHGetFolderPathA(NULL, CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, appdata)))
|
||||||
{
|
{
|
||||||
skip("SHGetFolderPathA failed for CSIDL_LOCAL_APPDATA!\n");
|
skip("SHGetFolderPathA failed for CSIDL_LOCAL_APPDATA!\n");
|
||||||
return;
|
return;
|
||||||
|
|
Loading…
Reference in New Issue