summaryrefslogtreecommitdiffstats
path: root/base/win
diff options
context:
space:
mode:
authorasvitkine@chromium.org <asvitkine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-20 17:43:00 +0000
committerasvitkine@chromium.org <asvitkine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-20 17:43:00 +0000
commit15ed9ee9d5cfe92eb22180607bd2e52f2d5b1ae9 (patch)
tree49179ccf3a95e28c7a79c1df6cd074f18f1e34f2 /base/win
parenta643786c2cdedf4202244a3d0594e56b2b0253e7 (diff)
downloadchromium_src-15ed9ee9d5cfe92eb22180607bd2e52f2d5b1ae9.zip
chromium_src-15ed9ee9d5cfe92eb22180607bd2e52f2d5b1ae9.tar.gz
chromium_src-15ed9ee9d5cfe92eb22180607bd2e52f2d5b1ae9.tar.bz2
Pass SLR_NOSEARCH to IShellLink::Resolve() in ResolveShortcut().
If that flag is not passed, I've observed the function to take over 3 seconds trying to resolve a shortcut with a destination that doesnt exist. BUG=162026 TEST=ResolveShortcut() on a shortcut whose target does not exist no longer takes 3 seconds. Review URL: https://chromiumcodereview.appspot.com/11578031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174178 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/win')
-rw-r--r--base/win/shortcut.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/base/win/shortcut.cc b/base/win/shortcut.cc
index 8afd55d..912bdb5 100644
--- a/base/win/shortcut.cc
+++ b/base/win/shortcut.cc
@@ -184,7 +184,7 @@ bool ResolveShortcut(const FilePath& shortcut_path,
WCHAR temp[MAX_PATH];
if (target_path) {
// Try to find the target of a shortcut.
- result = i_shell_link->Resolve(0, SLR_NO_UI);
+ result = i_shell_link->Resolve(0, SLR_NO_UI | SLR_NOSEARCH);
if (FAILED(result))
return false;