Various logical fixes for jumplist

chrome/browser/win/jumplist_updater.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/win/jumplist_updater.h"
 
 #include <windows.h>
 #include <propkey.h>
 #include <shobjidl.h>
 
@@ skipping 172 matching lines @@
   // "Task" category.
   base::win::ScopedComPtr<IObjectCollection> collection;
   HRESULT result = collection.CreateInstance(CLSID_EnumerableObjectCollection,
                                              NULL, CLSCTX_INPROC_SERVER);
   if (FAILED(result))
     return false;
 
   // Add items to the "Task" category.
   for (ShellLinkItemList::const_iterator it = link_items.begin();
        it != link_items.end(); ++it) {
-    AddShellLink(collection, application_path.value(), *it);
+    if (!AddShellLink(collection, application_path.value(), *it))
+      return false;
   }
 
   // We can now add the new list to the JumpList.
   // ICustomDestinationList::AddUserTasks() also uses the IObjectArray
   // interface to retrieve each item in the list. So, we retrieve the
   // IObjectArray interface from the EnumerableObjectCollection object.
   base::win::ScopedComPtr<IObjectArray> object_array;
   result = collection.QueryInterface(object_array.Receive());
   if (FAILED(result))
     return false;
@@ skipping 25 matching lines @@
   // We once add the given items to this collection object and add this
   // collection to the JumpList.
   base::win::ScopedComPtr<IObjectCollection> collection;
   HRESULT result = collection.CreateInstance(CLSID_EnumerableObjectCollection,
                                              NULL, CLSCTX_INPROC_SERVER);
   if (FAILED(result))
     return false;
 
   for (ShellLinkItemList::const_iterator item = link_items.begin();
        item != link_items.end() && max_items > 0; ++item, --max_items) {
-    scoped_refptr<ShellLinkItem> link(*item);
-    AddShellLink(collection, application_path.value(), link);
+    if (!AddShellLink(collection, application_path.value(), *item))
+      return false;
   }
 
   // We can now add the new list to the JumpList.
   // The ICustomDestinationList::AppendCategory() function needs the
   // IObjectArray interface to retrieve each item in the list. So, we retrive
   // the IObjectArray interface from the IEnumerableObjectCollection object
   // and use it.
   // It seems the ICustomDestinationList::AppendCategory() function just
   // replaces all items in the given category with the ones in the new list.
   base::win::ScopedComPtr<IObjectArray> object_array;
   result = collection.QueryInterface(object_array.Receive());
   if (FAILED(result))
     return false;
 
   return SUCCEEDED(destination_list_->AppendCategory(category_name.c_str(),
                                                      object_array.get()));
 }