ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6694 from spycrab/updater_uac 

Updater: Implement UAC support
This commit is contained in:
Pierre Bourdon 2018-04-25 23:01:23 +02:00 committed by GitHub
parent c51c044142 6e4c5d780d
commit e0f677c745
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Source/Core/Updater/Main.cpp
View File

@ -3,6 +3,7 @@
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <windows.h> #include <windows.h>
#include <ShlObj.h>
#include <OptionParser.h> #include <OptionParser.h>
#include <algorithm> #include <algorithm>
@ -674,11 +675,18 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, PWSTR pCmdLine
return 1; return 1;
Options opts = std::move(*maybe_opts); Options opts = std::move(*maybe_opts);
bool need_admin = false;
if (opts.log_file) if (opts.log_file)
{ {
log_fp = _wfopen(UTF8ToUTF16(*opts.log_file).c_str(), L"w"); log_fp = _wfopen(UTF8ToUTF16(*opts.log_file).c_str(), L"w");
if (!log_fp) if (!log_fp)
{
log_fp = stderr; log_fp = stderr;
// Failing to create the logfile for writing is a good indicator that we need administrator
// priviliges
need_admin = true;
}
else else
atexit(FlushLog); atexit(FlushLog);
} }
@ -702,8 +710,25 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, PWSTR pCmdLine
fprintf(log_fp, "Completed! Proceeding with update.\n"); fprintf(log_fp, "Completed! Proceeding with update.\n");
} }
std::thread thread(UI::MessageLoop); if (need_admin)
thread.detach(); {
if (IsUserAnAdmin())
{
FatalError("Failed to write to directory despite administrator priviliges.");
return 1;
}
wchar_t path[MAX_PATH];
if (GetModuleFileName(hInstance, path, sizeof(path)) == 0)
{
FatalError("Failed to get updater filename.");
return 1;
}
// Relaunch the updater as administrator
ShellExecuteW(nullptr, L"runas", path, pCmdLine, NULL, SW_SHOW);
return 0;
}
UI::SetDescription("Fetching and parsing manifests..."); UI::SetDescription("Fetching and parsing manifests...");
@ -754,8 +779,10 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, PWSTR pCmdLine
if (opts.binary_to_restart) if (opts.binary_to_restart)
{ {
ShellExecuteW(nullptr, L"open", UTF8ToUTF16(*opts.binary_to_restart).c_str(), L"", nullptr, // Hack: Launching the updater over the explorer ensures that admin priviliges are dropped. Why?
SW_SHOW); // Ask Microsoft.
ShellExecuteW(nullptr, nullptr, L"explorer.exe", UTF8ToUTF16(*opts.binary_to_restart).c_str(),
nullptr, SW_SHOW);
} }
UI::Stop(); UI::Stop();