From cf5729d4e184831d8d1a9bb3a83db9b645f96c24 Mon Sep 17 00:00:00 2001
From: kavsrf <kavsrf@gmail.com>
Date: Sun, 26 Feb 2017 10:48:24 +0300
Subject: Beta2 patch 1

Edit DcsProp and PlatformInfo from System->Settings
EFI loader updated
---
 src/Mount/Mount.c | 57 +++++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 45 insertions(+), 12 deletions(-)

(limited to 'src/Mount/Mount.c')

diff --git a/src/Mount/Mount.c b/src/Mount/Mount.c
index 6c1aeedf..32f57a4e 100644
--- a/src/Mount/Mount.c
+++ b/src/Mount/Mount.c
@@ -10899,6 +10899,7 @@ void SecurityTokenPreferencesDialog (HWND hwndDlg)
 	DialogBoxParamW (hInst, MAKEINTRESOURCEW (IDD_TOKEN_PREFERENCES), hwndDlg, (DLGPROC) SecurityTokenPreferencesDlgProc, 0);
 }
 
+INT_PTR TextEditDialogBox (int type, HWND parent, const WCHAR* Title, std::string& text);
 
 static BOOL CALLBACK BootLoaderPreferencesDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
 {
@@ -10916,21 +10917,9 @@ static BOOL CALLBACK BootLoaderPreferencesDlgProc (HWND hwndDlg, UINT msg, WPARA
 				return 1;
 			}
 
-			byte platforminfo[10*1024];
-			platforminfo[0] = 0;
-			DWORD cbread;
-			try
-			{
-				BootEncObj->ReadEfiConfig(L"\\EFI\\VeraCrypt\\PlatformInfo", platforminfo, 10*1024 - 1,  &cbread);
-				platforminfo[cbread - 1] = 0;
-			}
-			catch (Exception &e)	{	}
-			SetDlgItemTextA (hwndDlg, IDC_PLATFORMINFO, (char*)platforminfo);
-
 			try
 			{
 				LocalizeDialog (hwndDlg, "IDD_SYSENC_SETTINGS");
-
 				uint32 driverConfig = ReadDriverConfigurationFlags();
 				byte userConfig;
 				string customUserMessage;
@@ -10983,6 +10972,50 @@ static BOOL CALLBACK BootLoaderPreferencesDlgProc (HWND hwndDlg, UINT msg, WPARA
 		case IDCANCEL:
 			EndDialog (hwndDlg, lw);
 			return 1;
+		case IDB_SHOW_PLATFORMINFO:
+			{
+				try
+				{
+					std::string platforminfo;
+					DWORD sz;
+					std::wstring path;
+					GetVolumeESP(path);
+					path += L"\\EFI\\VeraCrypt\\PlatformInfo";
+					File fPlatformInfo(path);
+					fPlatformInfo.GetFileSize(sz);
+					platforminfo.resize(sz + 1);
+					platforminfo[sz] = 0;
+					fPlatformInfo.Read((byte*)&platforminfo[0], sz);
+					TextEditDialogBox(0, hwndDlg, L"PlatformInfo", platforminfo);
+				}
+				catch (Exception &e)	{ e.Show(hwndDlg); }
+			}
+			return 0;
+
+		case IDB_EDIT_DCSPROP:
+			{
+				try
+				{
+					std::string dcsprop;
+					DWORD sz;
+					std::wstring path;
+					GetVolumeESP(path);
+					path += L"\\EFI\\VeraCrypt\\DcsProp";
+					File f1(path);
+					f1.GetFileSize(sz);
+					dcsprop.resize(sz + 1);
+					dcsprop[sz] = 0;
+					f1.Read((byte*)&dcsprop[0], sz);
+					f1.Close();
+					if(TextEditDialogBox(0, hwndDlg, L"DcsProp", dcsprop) == IDOK) {
+						File f2(path,false,true);
+						f2.Write((byte*)&dcsprop[0], dcsprop.length());
+						f2.Close();
+					}
+				}
+				catch (Exception &e)	{	e.Show(hwndDlg); }
+			}
+			return 0;
 
 		case IDOK:
 			{
-- 
cgit v1.2.3