Fix the path of shortcuts with an icon in the current install dir.

chrome/installer/setup/install.cc

 // Copyright (c) 2012 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/installer/setup/install.h"
 
 #include <windows.h>
 #include <shlobj.h>
 #include <time.h>
 
@@ skipping 243 matching lines @@
 }
 
 }  // namespace
 
 namespace installer {
 
 void UpdatePerUserShortcutsInLocation(
     const ShellUtil::ShortcutLocation shortcut_location,
     BrowserDistribution* dist,
     const base::FilePath& old_target_dir,
-    const base::FilePath& old_target_path_suffix,
+    const base::FilePath& old_target_name_suffix,
     const base::FilePath& new_target_path) {
   base::FilePath shortcut_path;
   const bool get_shortcut_path_return = ShellUtil::GetShortcutPath(
       shortcut_location, dist, ShellUtil::CURRENT_USER, &shortcut_path);
   DCHECK(get_shortcut_path_return);
 
   bool recursive = false;
 
   // TODO(fdoray): Modify GetShortcutPath such that it returns
   // ...\Quick Launch\User Pinned instead of
   // ...\Quick Launch\User Pinned\TaskBar for SHORTCUT_LOCATION_TASKBAR_PINS.
   if (shortcut_location == ShellUtil::SHORTCUT_LOCATION_TASKBAR_PINS) {
     shortcut_path = shortcut_path.DirName();
     recursive = true;
   }
 
+  WCHAR old_target_dir_full_path_buffer[MAX_PATH];
+  if (::GetFullPathName(old_target_dir.value().c_str(), MAX_PATH,
+                        old_target_dir_full_path_buffer, nullptr) == 0) {

[gab, 2016/03/18 20:07:11]

::GetFullPathName() also returns the size of the buffer required if it's not big
enough so the only valid return valid is == MAX_PATH

+    return;
+  }
+  const base::FilePath old_target_dir_full_path(
+      old_target_dir_full_path_buffer);
+
   base::FileEnumerator shortcuts_enum(shortcut_path, recursive,
                                       base::FileEnumerator::FILES);
   for (base::FilePath shortcut = shortcuts_enum.Next(); !shortcut.empty();
        shortcut = shortcuts_enum.Next()) {
-    base::FilePath existing_target_path;
-    if (!base::win::ResolveShortcut(shortcut, &existing_target_path, nullptr) ||
-        !base::StartsWith(existing_target_path.value(),
-                          old_target_dir.AsEndingWithSeparator().value(),
-                          base::CompareCase::INSENSITIVE_ASCII) ||
-        !base::EndsWith(existing_target_path.value(),
-                        old_target_path_suffix.value(),
-                        base::CompareCase::INSENSITIVE_ASCII)) {
+    base::win::ShortcutProperties shortcut_properties;
+    if (!base::win::ResolveShortcutProperties(
+            shortcut, (base::win::ShortcutProperties::PROPERTIES_TARGET |
+                       base::win::ShortcutProperties::PROPERTIES_ICON),
+            &shortcut_properties)) {
       continue;
     }
 
+    WCHAR shortcut_target_full_path_buffer[MAX_PATH];
+    WCHAR shortcut_icon_full_path_buffer[MAX_PATH];
+    if (::GetFullPathName(shortcut_properties.target.value().c_str(), MAX_PATH,
+                          shortcut_target_full_path_buffer, nullptr) == 0 ||
+        ::GetFullPathName(shortcut_properties.icon.value().c_str(), MAX_PATH,
+                          shortcut_icon_full_path_buffer, nullptr) == 0) {
+      return;
+    }
+    const base::FilePath shortcut_target_full_path(
+        shortcut_target_full_path_buffer);
+    const base::FilePath shortcut_icon_full_path(
+        shortcut_icon_full_path_buffer);
+
+    // Skip shortcuts whose target isn't a file rooted at |old_target_dir| with
+    // a name ending in |old_target_name_suffix|. Except for shortcuts whose
+    // icon is rooted at |old_target_dir|.
+    // TODO(fdoray): The second condition is only intended to fix Canary
+    // shortcuts broken by crbug.com/595374, remove it in May 2016.
+    if (!(old_target_dir_full_path.IsParent(shortcut_target_full_path) &&
+          base::EndsWith(shortcut_properties.target.BaseName().value(),
+                         old_target_name_suffix.value(),
+                         base::CompareCase::INSENSITIVE_ASCII)) &&
+        !old_target_dir_full_path.IsParent(shortcut_icon_full_path)) {
+      continue;
+    }
+
     base::win::ShortcutProperties updated_properties;
     updated_properties.set_target(new_target_path);
     base::win::CreateOrUpdateShortcutLink(shortcut, updated_properties,
                                           base::win::SHORTCUT_UPDATE_EXISTING);
   }
 }
 
 void EscapeXmlAttributeValueInSingleQuotes(base::string16* att_value) {
   base::ReplaceChars(*att_value, base::ASCIIToUTF16("&"),
                      base::ASCIIToUTF16("&"), att_value);
@@ skipping 407 matching lines @@
   // Read master_preferences copied beside chrome.exe at install.
   MasterPreferences prefs(installation_root.AppendASCII(kDefaultMasterPrefs));
   base::FilePath chrome_exe(installation_root.Append(kChromeExe));
   CreateOrUpdateShortcuts(
       chrome_exe, chrome, prefs, CURRENT_USER, install_operation);
 
   UpdateDefaultBrowserBeaconForPath(chrome_exe);
 }
 
 }  // namespace installer