From 2894bade88b537be3f934fb14811c39f5f381381 Mon Sep 17 00:00:00 2001
From: Mounir IDRASSI <mounir.idrassi@idrix.fr>
Date: Sun, 4 Jan 2015 15:55:09 +0100
Subject: Windows: better display of volume information and benchmark results.

---
 src/Common/Dlgcode.c |  2 ++
 src/Mount/Mount.c    | 15 +++++++++++----
 src/Mount/Mount.rc   |  8 ++++----
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/Common/Dlgcode.c b/src/Common/Dlgcode.c
index 9b1abb56..a6354fd2 100644
--- a/src/Common/Dlgcode.c
+++ b/src/Common/Dlgcode.c
@@ -4350,6 +4350,8 @@ static void DisplayBenchmarkResults (HWND hwndDlg)
 
 		SendMessageW (hList, LVM_SETITEMW, 0, (LPARAM)&LvItem); 
 	}
+
+	SendMessageW(hList, LVM_SETCOLUMNWIDTH, 0, MAKELPARAM(LVSCW_AUTOSIZE_USEHEADER, 0));
 }
 
 // specific implementation for support of benchmark operation in wait dialog mechanism
diff --git a/src/Mount/Mount.c b/src/Mount/Mount.c
index e7350cf8..f9692c13 100644
--- a/src/Mount/Mount.c
+++ b/src/Mount/Mount.c
@@ -1334,7 +1334,14 @@ void LoadDriveLetters (HWND hwndDlg, HWND hTree, int drive)
 				default:
 					ws = L"?";
 				}
-				ListSubItemSetW (hTree, listItem.iItem, 4, ws);
+				
+				if (driver.truecryptMode[i])
+				{
+					StringCbPrintfW (szTmpW, sizeof(szTmpW), L"TrueCrypt-%s", ws);
+					ListSubItemSetW (hTree, listItem.iItem, 4, szTmpW);
+				}
+				else
+					ListSubItemSetW (hTree, listItem.iItem, 4, ws);
 
 				if (driver.volumeType[i] == PROP_VOL_TYPE_OUTER_VOL_WRITE_PREVENTED)	// Normal/outer volume (hidden volume protected AND write denied)
 				{				
@@ -3509,7 +3516,7 @@ void BuildTree (HWND hwndDlg, HWND hTree)
 	SendMessage (hTree,LVM_INSERTCOLUMNW,0,(LPARAM)&lvCol);
 
 	lvCol.pszText = GetString ("VOLUME");  
-	lvCol.cx = CompensateXDPI (253);           
+	lvCol.cx = CompensateXDPI (200);           
 	lvCol.fmt = LVCFMT_LEFT;
 	SendMessage (hTree,LVM_INSERTCOLUMNW,1,(LPARAM)&lvCol);
 	LastDriveListVolumeColumnWidth = ListView_GetColumnWidth (hTree, 1);
@@ -3520,12 +3527,12 @@ void BuildTree (HWND hwndDlg, HWND hTree)
 	SendMessage (hTree,LVM_INSERTCOLUMNW,2,(LPARAM)&lvCol);
 
 	lvCol.pszText = GetString ("ENCRYPTION_ALGORITHM_LV");  
-	lvCol.cx = CompensateXDPI (121);
+	lvCol.cx = CompensateXDPI (123);
 	lvCol.fmt = LVCFMT_LEFT;
 	SendMessage (hTree,LVM_INSERTCOLUMNW,3,(LPARAM)&lvCol);
 
 	lvCol.pszText = GetString ("TYPE");  
-	lvCol.cx = CompensateXDPI (52);
+	lvCol.cx = CompensateXDPI (100);
 	lvCol.fmt = LVCFMT_LEFT;
 	SendMessage (hTree,LVM_INSERTCOLUMNW,4,(LPARAM)&lvCol);
 
diff --git a/src/Mount/Mount.rc b/src/Mount/Mount.rc
index 7f38e882..8e1964d2 100644
--- a/src/Mount/Mount.rc
+++ b/src/Mount/Mount.rc
@@ -94,13 +94,13 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,197,105,130,11
 END
 
-IDD_VOLUME_PROPERTIES DIALOGEX 60, 30, 284, 186
+IDD_VOLUME_PROPERTIES DIALOGEX 60, 30, 284, 224
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "VeraCrypt Volume Properties"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,114,166,55,14
-    CONTROL         "",IDC_VOLUME_PROPERTIES_LIST,"SysListView32",LVS_REPORT | LVS_ALIGNLEFT | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,6,269,154
+    DEFPUSHBUTTON   "OK",IDOK,114,203,55,14
+    CONTROL         "",IDC_VOLUME_PROPERTIES_LIST,"SysListView32",LVS_REPORT | LVS_ALIGNLEFT | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,6,269,192
 END
 
 IDD_PASSWORDCHANGE_DLG DIALOGEX 0, 0, 330, 207
@@ -353,7 +353,7 @@ BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 277
         TOPMARGIN, 7
-        BOTTOMMARGIN, 179
+        BOTTOMMARGIN, 217
     END
 
     IDD_PASSWORDCHANGE_DLG, DIALOG
-- 
cgit v1.2.3