mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Don't append "%1" in the Run registry key.

Browse source 
It's only necessary for the protocol launch path.
This commit is contained in:
CharlieHess 2017-01-26 14:15:59 -08:00 • committed by Kevin Sawicki
parent d2ffd87668
commit 25bc02f332
1 changed files with 19 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

29
atom/browser/browser_win.cc
View file

@ -43,7 +43,9 @@ BOOL CALLBACK WindowsEnumerationHandler(HWND hwnd, LPARAM param) {
return TRUE; return TRUE;
} }
bool ReadAppCommandLine(mate::Arguments* args, base::string16* exe) { bool ReadAppCommandLine(mate::Arguments* args,
base::string16* exe,
bool includeOriginalArg) {
// Executable Path // Executable Path
if (!args->GetNext(exe)) { if (!args->GetNext(exe)) {
base::FilePath path; base::FilePath path;
@ -56,12 +58,19 @@ bool ReadAppCommandLine(mate::Arguments* args, base::string16* exe) {
// Read in optional args arg // Read in optional args arg
std::vector<base::string16> launch_args; std::vector<base::string16> launch_args;
if (args->GetNext(&launch_args) && !launch_args.empty()) if (args->GetNext(&launch_args) && !launch_args.empty()) {
*exe = base::StringPrintf(L"\"%s\" %s \"%%1\"", base::string16 formatString = includeOriginalArg ?
L"\"%s\" %s \"%%1\"" :
L"\"%s\" %s";
*exe = base::StringPrintf(formatString.c_str(),
exe->c_str(), exe->c_str(),
base::JoinString(launch_args, L" ").c_str()); base::JoinString(launch_args, L" ").c_str());
else } else {
*exe = base::StringPrintf(L"\"%s\" \"%%1\"", exe->c_str()); base::string16 formatString = includeOriginalArg ?
L"\"%s\" \"%%1\"" :
L"\"%s\"";
*exe = base::StringPrintf(formatString.c_str(), exe->c_str());
}
return true; return true;
} }
@ -155,7 +164,7 @@ bool Browser::RemoveAsDefaultProtocolClient(const std::string& protocol,
return true; return true;
base::string16 exe; base::string16 exe;
if (!ReadAppCommandLine(args, &exe)) if (!ReadAppCommandLine(args, &exe, true))
return false; return false;
if (keyVal == exe) { if (keyVal == exe) {
@ -189,7 +198,7 @@ bool Browser::SetAsDefaultProtocolClient(const std::string& protocol,
return false; return false;
base::string16 exe; base::string16 exe;
if (!ReadAppCommandLine(args, &exe)) if (!ReadAppCommandLine(args, &exe, true))
return false; return false;
// Main Registry Key // Main Registry Key
@ -219,7 +228,7 @@ bool Browser::IsDefaultProtocolClient(const std::string& protocol,
return false; return false;
base::string16 exe; base::string16 exe;
if (!ReadAppCommandLine(args, &exe)) if (!ReadAppCommandLine(args, &exe, true))
return false; return false;
// Main Registry Key // Main Registry Key
@ -259,7 +268,7 @@ void Browser::SetLoginItemSettings(LoginItemSettings settings,
if (settings.open_at_login) { if (settings.open_at_login) {
base::string16 exe; base::string16 exe;
if (!ReadAppCommandLine(args, &exe)) return; if (!ReadAppCommandLine(args, &exe, false)) return;
key.WriteValue(GetAppUserModelID(), exe.c_str()); key.WriteValue(GetAppUserModelID(), exe.c_str());
} else { } else {
@ -276,7 +285,7 @@ Browser::LoginItemSettings Browser::GetLoginItemSettings(
if (!FAILED(key.ReadValue(GetAppUserModelID(), &keyVal))) { if (!FAILED(key.ReadValue(GetAppUserModelID(), &keyVal))) {
base::string16 exe; base::string16 exe;
if (ReadAppCommandLine(args, &exe)) { if (ReadAppCommandLine(args, &exe, false)) {
settings.open_at_login = keyVal == exe; settings.open_at_login = keyVal == exe;
} }
} }