summaryrefslogtreecommitdiffstats
path: root/xmrstak/misc
diff options
context:
space:
mode:
authorfireice-uk <fireice-uk@users.noreply.github.com>2017-12-21 20:49:01 +0000
committerfireice-uk <fireice-uk@users.noreply.github.com>2017-12-21 20:49:01 +0000
commitc4391ac6f3239d81093449948d16b2233cacdb3f (patch)
treec8c238476f10ad1d3c0a018038c89ef11c71e89b /xmrstak/misc
parenta71b1aea05351ee6ef5c9ce951fdd98bc0535904 (diff)
downloadxmr-stak-c4391ac6f3239d81093449948d16b2233cacdb3f.zip
xmr-stak-c4391ac6f3239d81093449948d16b2233cacdb3f.tar.gz
Stop UAC popup for elevated ctx
Diffstat (limited to 'xmrstak/misc')
-rw-r--r--xmrstak/misc/uac.hpp19
1 files changed, 13 insertions, 6 deletions
diff --git a/xmrstak/misc/uac.hpp b/xmrstak/misc/uac.hpp
index fdf3be9..55c5f1a 100644
--- a/xmrstak/misc/uac.hpp
+++ b/xmrstak/misc/uac.hpp
@@ -1,4 +1,9 @@
#pragma once
+
+#ifdef _WIN32
+#include "xmrstak/misc/console.hpp"
+
+#include <string>
#include <windows.h>
BOOL IsElevated()
@@ -17,18 +22,18 @@ BOOL IsElevated()
return fRet;
}
-BOOL SelfElevate(const char* my_path)
+BOOL SelfElevate(const char* my_path, const std::string& params)
{
if (IsElevated())
return FALSE;
SHELLEXECUTEINFO shExecInfo = { 0 };
shExecInfo.cbSize = sizeof(SHELLEXECUTEINFO);
- shExecInfo.fMask = NULL;
+ shExecInfo.fMask = SEE_MASK_NOCLOSEPROCESS;
shExecInfo.hwnd = NULL;
shExecInfo.lpVerb = "runas";
shExecInfo.lpFile = my_path;
- shExecInfo.lpParameters = NULL;
+ shExecInfo.lpParameters = params.c_str();
shExecInfo.lpDirectory = NULL;
shExecInfo.nShow = SW_SHOW;
shExecInfo.hInstApp = NULL;
@@ -36,9 +41,11 @@ BOOL SelfElevate(const char* my_path)
if (!ShellExecuteEx(&shExecInfo))
return FALSE;
- // Hide our window and loiter in the background to make scripting easier
- // ShowWindow(GetConsoleWindow(), SW_HIDE);
- // WaitForSingleObject(shExecInfo.hProcess, INFINITE);
+ // Loiter in the background to make scripting easier
+ printer::inst()->print_msg(L0, "This window has been opened because xmr-stak needed to run as administrator. It can be safely closed now.");
+ WaitForSingleObject(shExecInfo.hProcess, INFINITE);
+ std::exit(0);
return TRUE;
}
+#endif
OpenPOWER on IntegriCloud