images/cmder
2
0
Fork 0
mirror of https://github.com/cmderdev/cmder.git synced 2024-11-15 00:09:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Currently only deal with the Program Files folder. Other Known Folders do not seem to be substituted.

Browse Source
This commit is contained in:
Joel Low 2014-08-24 19:10:42 +08:00
parent 7a31e6e08f
commit af80ed22fd
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
launcher/src/CmderLauncher.cpp
View File

@ -97,7 +97,9 @@ std::wstring GetAppId(std::wstring exePath)
// Try every single \ in the path to match it against a KNOWNFOLDERID // Try every single \ in the path to match it against a KNOWNFOLDERID
std::wstring::size_type nextBackslash = exePath.find_first_of('\\'); std::wstring::size_type nextBackslash = exePath.find_first_of('\\');
while (nextBackslash != std::wstring::npos) for ( ;
nextBackslash != std::wstring::npos;
nextBackslash = exePath.find_first_of('\\', nextBackslash + 1))
{ {
// Try to match the current string against a KNOWNFOLDERID // Try to match the current string against a KNOWNFOLDERID
std::wstring subPath = exePath.substr(0, nextBackslash + 1); std::wstring subPath = exePath.substr(0, nextBackslash + 1);
@ -112,7 +114,8 @@ std::wstring GetAppId(std::wstring exePath)
// We need to specially treat Program Files. We are a 32-bit app, so // We need to specially treat Program Files. We are a 32-bit app, so
// if we get Program Files on a 64-bit computer, say we are the 32-bit // if we get Program Files on a 64-bit computer, say we are the 32-bit
// Program Files folder. // Program Files folder. We currently know that Explorer replaces the
// path for programs in Program Files, but not for other Known Folders.
if (IsEqualGUID(id, FOLDERID_ProgramFiles)) if (IsEqualGUID(id, FOLDERID_ProgramFiles))
{ {
BOOL is64Bit = false; BOOL is64Bit = false;
@ -121,6 +124,11 @@ std::wstring GetAppId(std::wstring exePath)
id = FOLDERID_ProgramFilesX86; id = FOLDERID_ProgramFilesX86;
} }
} }
else if (!IsEqualCLSID(id, FOLDERID_ProgramFilesX86) &&
!IsEqualCLSID(id, FOLDERID_ProgramFilesX64))
{
continue;
}
if (StringFromGUID2(id, string, sizeof(string) / sizeof(string[0]))) if (StringFromGUID2(id, string, sizeof(string) / sizeof(string[0])))
{ {
@ -129,9 +137,6 @@ std::wstring GetAppId(std::wstring exePath)
return exePath; return exePath;
} }
} }
// Get the next backslash
nextBackslash = exePath.find_first_of('\\', nextBackslash + 1);
} }
return exePath; return exePath;