shell32: Use FAILED instead of !SUCCEEDED.
authorMichael Stefaniuc <mstefani@redhat.de>
Wed, 9 Sep 2009 22:28:56 +0000 (00:28 +0200)
committerAlexandre Julliard <julliard@winehq.org>
Thu, 10 Sep 2009 09:08:39 +0000 (11:08 +0200)
dlls/shell32/cpanelfolder.c
dlls/shell32/shellitem.c

index af3e0cacb481a8ce57080399ad816d2732ba266f..cd2f3b81d667671536a08f68b37defafc34114b2 100644 (file)
@@ -688,8 +688,7 @@ static HRESULT WINAPI ISF_ControlPanel_fnGetDisplayNameOf(IShellFolder2 * iface,
            PathAddBackslashW(wszPath);
            len = lstrlenW(wszPath);
 
-           if (!SUCCEEDED
-             (SHELL32_GetDisplayNameOfChild(iface, pidl, dwFlags | SHGDN_INFOLDER, wszPath + len, MAX_PATH + 1 - len)))
+            if (FAILED(SHELL32_GetDisplayNameOfChild(iface, pidl, dwFlags | SHGDN_INFOLDER, wszPath + len, MAX_PATH + 1 - len)))
                return E_OUTOFMEMORY;
            if (!WideCharToMultiByte(CP_ACP, 0, wszPath, -1, szPath, MAX_PATH, NULL, NULL))
                wszPath[0] = '\0';
index 13cb1f642a0ce9a58929dc075eca706a1fd43342..29f072fdb56181ebb24cef6643a69875a3e17899 100644 (file)
@@ -350,13 +350,13 @@ HRESULT WINAPI SHCreateShellItem(LPCITEMIDLIST pidlParent,
         {
             IPersistFolder2* ppf2Parent;
 
-            if (!SUCCEEDED(IPersistFolder2_QueryInterface(psfParent, &IID_IPersistFolder2, (void**)&ppf2Parent)))
+            if (FAILED(IPersistFolder2_QueryInterface(psfParent, &IID_IPersistFolder2, (void**)&ppf2Parent)))
             {
                 FIXME("couldn't get IPersistFolder2 interface of parent\n");
                 return E_NOINTERFACE;
             }
 
-            if (!SUCCEEDED(IPersistFolder2_GetCurFolder(ppf2Parent, &temp_parent)))
+            if (FAILED(IPersistFolder2_GetCurFolder(ppf2Parent, &temp_parent)))
             {
                 FIXME("couldn't get parent PIDL\n");
                 IPersistFolder2_Release(ppf2Parent);