Public/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2025-11-11 11:08:02 -06:00
Code Activity

Windows: retry UAC prompt operation in case of failure. This avoids cancel the whole operation if the user is not in front of the machine during UAC prompt (this happens ofter during in-place encryption of big NTFS partitions).

Browse Source
This commit is contained in:
Mounir IDRASSI
2015-01-31 23:49:01 +01:00
parent b16cfa959d
commit 96b39a5973
4 changed files with 36 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/Common/BaseCom.cpp
View File

@@ -43,12 +43,27 @@ BOOL ComGetInstanceBase (HWND hWnd, REFCLSID clsid, REFIID iid, void **tcServer)
BOOL r;
if (IsUacSupported ())
r = CreateElevatedComObject (hWnd, clsid, iid, tcServer) == S_OK;
{
while (true)
{
r = CreateElevatedComObject (hWnd, clsid, iid, tcServer) == S_OK;
if (r)
break;
else
{
if (IDRETRY == ErrorRetryCancel ("UAC_INIT_ERROR", hWnd))
continue;
else
break;
}
}
}
else
{
r = CoCreateInstance (clsid, NULL, CLSCTX_LOCAL_SERVER, iid, tcServer) == S_OK;
if (!r)
Error ("UAC_INIT_ERROR", hWnd);
if (!r)
Error ("UAC_INIT_ERROR", hWnd);
}
return r;
}

5
src/Common/Dlgcode.c
View File

@@ -8089,6 +8089,11 @@ int Error (char *stringId, HWND hwnd)
return MessageBoxW (hwnd, GetString (stringId), lpszTitle, MB_ICONERROR);
}
int ErrorRetryCancel (char *stringId, HWND hwnd)
{
if (Silent) return 0;
return MessageBoxW (hwnd, GetString (stringId), lpszTitle, MB_ICONERROR | MB_RETRYCANCEL);
}
int ErrorTopMost (char *stringId, HWND hwnd)
{

1
src/Common/Dlgcode.h
View File

@@ -385,6 +385,7 @@ int Warning (char *stringId, HWND hwnd);
int WarningTopMost (char *stringId, HWND hwnd);
int WarningDirect (const wchar_t *warnMsg, HWND hwnd);
int Error (char *stringId, HWND hwnd);
int ErrorRetryCancel (char *stringId, HWND hwnd);
int ErrorDirect (const wchar_t *errMsg, HWND hwnd);
int ErrorTopMost (char *stringId, HWND hwnd);
int AskYesNo (char *stringId, HWND hwnd);

18
src/Format/Tcformat.c
View File

@@ -266,14 +266,18 @@ static BOOL ElevateWholeWizardProcess (string arguments)
GetModuleFileName (NULL, modPath, sizeof (modPath));
if ((int)ShellExecute (MainDlg, "runas", modPath, (string("/q UAC ") + arguments).c_str(), NULL, SW_SHOWNORMAL) > 32)
{
exit (0);
}
else
while (true)
{
Error ("UAC_INIT_ERROR", MainDlg);
return FALSE;
if ((int)ShellExecute (MainDlg, "runas", modPath, (string("/q UAC ") + arguments).c_str(), NULL, SW_SHOWNORMAL) > 32)
{
exit (0);
}
else
{
if (IDRETRY == ErrorRetryCancel ("UAC_INIT_ERROR", MainDlg))
continue;
return FALSE;
}
}
}