From d1c1aa369ca0f7247b663e22bc4bef06d1531f7e Mon Sep 17 00:00:00 2001
From: Mounir IDRASSI <mounir.idrassi@idrix.fr>
Date: Sun, 3 May 2015 15:43:11 +0200
Subject: [PATCH] Windows: Make the Format wizard work again when launched from
 VeraCrypt menu.

---
 src/Format/Tcformat.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/Format/Tcformat.c b/src/Format/Tcformat.c
index 1c0edd82..eabd312f 100644
--- a/src/Format/Tcformat.c
+++ b/src/Format/Tcformat.c
@@ -7830,6 +7830,7 @@ void ExtractCommandLine (HWND hwndDlg, char *lpszCommandLine)
 			{
 				OptionHistory,
 				OptionNoIsoCheck,
+				OptionQuit,
 				OptionTokenLib,
 				CommandResumeSysEncLogOn,
 				CommandResumeSysEnc,
@@ -7847,7 +7848,7 @@ void ExtractCommandLine (HWND hwndDlg, char *lpszCommandLine)
 				{ OptionHistory,				"/history",			"/h", FALSE },
 				{ OptionNoIsoCheck,				"/noisocheck",		"/n", FALSE },
 				{ OptionTokenLib,				"/tokenlib",		NULL, FALSE },
-
+				{ OptionQuit,					"/quit",			"/q", FALSE },
 				{ CommandResumeSysEncLogOn,		"/acsysenc",		"/a", TRUE },
 				{ CommandResumeSysEnc,			"/csysenc",			"/c", TRUE },
 				{ CommandDecryptSysEnc,			"/dsysenc",			"/d", TRUE },
@@ -8029,6 +8030,14 @@ void ExtractCommandLine (HWND hwndDlg, char *lpszCommandLine)
 
 				break;
 
+			case OptionQuit:
+				{
+					// Used to indicate non-install elevation
+					char szTmp[32];
+					GetArgumentValue (lpszCommandLineArgs, &i, nNoCommandLineArgs, szTmp, sizeof (szTmp));
+				}
+				break;
+
 			default:
 				DialogBoxParamW (hInst, MAKEINTRESOURCEW (IDD_COMMANDHELP_DLG), hwndDlg, (DLGPROC)
 						CommandHelpDlgProc, (LPARAM) &as);