commit ca0074e7067f6a21842462a69ca9b0172c65da29
author Michael Stefaniuc <mstefani@redhat.de> Wed Oct 08 01:32:27 2008 +0200
committer Alexandre Julliard <julliard@winehq.org> Wed Oct 08 13:43:27 2008 +0200
tree ce2dc505c959a9891195064c48d0aa1cea608642
parent 0c07d3ba37a511d6a64d65dc3624fca86a9adb6d

shell32/tests: Use FAILED instead of !SUCCEEDED.

dlls/shell32/tests/shelllink.c

diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c
index 47aa659..83aae3f 100644
--- a/dlls/shell32/tests/shelllink.c
+++ b/dlls/shell32/tests/shelllink.c
@@ -114,7 +114,7 @@
     r = CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER,
                          &IID_IShellLinkA, (LPVOID*)&sl);
     ok(SUCCEEDED(r), "no IID_IShellLinkA (0x%08x)\n", r);
-    if (!SUCCEEDED(r))
+    if (FAILED(r))
         return;
 
     /* Test Getting / Setting the description */
@@ -329,7 +329,7 @@
     r = CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER,
                          &IID_IShellLinkA, (LPVOID*)&sl);
     lok(SUCCEEDED(r), "no IID_IShellLinkA (0x%08x)\n", r);
-    if (!SUCCEEDED(r))
+    if (FAILED(r))
         return;
 
     if (desc->description)
@@ -404,12 +404,12 @@
     r = CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER,
                          &IID_IShellLinkA, (LPVOID*)&sl);
     lok(SUCCEEDED(r), "no IID_IShellLinkA (0x%08x)\n", r);
-    if (!SUCCEEDED(r))
+    if (FAILED(r))
         return;
 
     r = IShellLinkA_QueryInterface(sl, &IID_IPersistFile, (LPVOID*)&pf);
     lok(SUCCEEDED(r), "no IID_IPersistFile (0x%08x)\n", r);
-    if (!SUCCEEDED(r))
+    if (FAILED(r))
     {
         IShellLinkA_Release(sl);
         return;
@@ -418,7 +418,7 @@
     r = IPersistFile_Load(pf, path, STGM_READ);
     lok(SUCCEEDED(r), "load failed (0x%08x)\n", r);
     IPersistFile_Release(pf);
-    if (!SUCCEEDED(r))
+    if (FAILED(r))
     {
         IShellLinkA_Release(sl);
         return;
@@ -715,7 +715,7 @@
 
     r = CoInitialize(NULL);
     ok(SUCCEEDED(r), "CoInitialize failed (0x%08x)\n", r);
-    if (!SUCCEEDED(r))
+    if (FAILED(r))
         return;
 
     test_get_set();

dlls/shell32/tests/shlexec.c

diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c
index 5eed12b..3c62ac2 100644
--- a/dlls/shell32/tests/shlexec.c
+++ b/dlls/shell32/tests/shlexec.c
@@ -1505,7 +1505,7 @@
 
     r = CoInitialize(NULL);
     ok(SUCCEEDED(r), "CoInitialize failed (0x%08x)\n", r);
-    if (!SUCCEEDED(r))
+    if (FAILED(r))
         exit(1);
 
     rc=GetModuleFileName(NULL, argv0, sizeof(argv0));

dlls/shell32/tests/shlfileop.c

diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c
index a4d2559..11cc612 100644
--- a/dlls/shell32/tests/shlfileop.c
+++ b/dlls/shell32/tests/shlfileop.c
@@ -275,7 +275,7 @@
     SHFILEINFOW shInfow;
 
     hr = SHGetSpecialFolderLocation(NULL, CSIDL_DESKTOP, &pidList);
-    if (!SUCCEEDED(hr)) {
+    if (FAILED(hr)) {
          skip("can't get desktop pidl\n");
          return;
     }

dlls/shell32/tests/shlfolder.c

diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c
index a5fff49..30768b0 100644
--- a/dlls/shell32/tests/shlfolder.c
+++ b/dlls/shell32/tests/shlfolder.c
@@ -1398,7 +1398,7 @@
         skip("SHGetFolderPathA not present!\n");
         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");
         return;