1 files changed, 15 insertions, 15 deletions
diff --git a/src/ExpandVolume/ExpandVolume.rc b/src/ExpandVolume/ExpandVolume.rc
index 3183c209..ee5efc41 100644
--- a/src/ExpandVolume/ExpandVolume.rc
+++ b/src/ExpandVolume/ExpandVolume.rc
@@ -6,9 +6,9 @@
 /////////////////////////////////////////////////////////////////////////////
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
-#include "afxres.h"
+#include "winres.h"
 #include "..\\common\\resource.h"
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
@@ -37,13 +37,14 @@ BEGIN
     CONTROL         "&MB",IDC_MB,"Button",BS_AUTORADIOBUTTON,209,105,38,10
     CONTROL         "&GB",IDC_GB,"Button",BS_AUTORADIOBUTTON,248,105,38,10
     CONTROL         "&TB",IDC_TB,"Button",BS_AUTORADIOBUTTON,288,105,38,10
     CONTROL         "Fill new space with random data",IDC_INIT_NEWSPACE,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,30,127,118,10
-    DEFPUSHBUTTON   "Continue",IDOK,15,238,84,18
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,30,120,276,10
+    CONTROL         "Quick Expand",IDC_QUICKEXPAND,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP,30,132,276,10
+    DEFPUSHBUTTON   "Continue",IDC_CONTINUE,15,238,84,18
     PUSHBUTTON      "Cancel",IDCANCEL,277,238,84,18
     LTEXT           "Help Text",IDC_BOX_HELP,15,165,346,58,0,WS_EX_CLIENTEDGE
-    GROUPBOX        "Enter new volume size",IDC_STATIC,15,83,346,63
+    GROUPBOX        "Enter new volume size",IDT_NEW_SIZE_BOX_TITLE,15,83,346,63
     RTEXT           "Current size: ",IDT_CURRENT_SIZE,27,42,46,8
     CONTROL         "",IDC_EXPAND_VOLUME_OLDSIZE,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,80,42,275,8,WS_EX_TRANSPARENT
     RTEXT           "New size: ",IDT_NEW_SIZE,28,54,45,8
     LTEXT           "",IDC_EXPAND_VOLUME_NEWSIZE,80,54,275,8,0,WS_EX_TRANSPARENT
@@ -71,9 +72,9 @@ BEGIN
     CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDFRAME,1,0,373,147
     GROUPBOX        "",IDC_STATIC,282,238,88,24
     GROUPBOX        "",IDC_STATIC,6,238,88,24
     GROUPBOX        "",IDC_STATIC,1,147,373,123,BS_CENTER
-    LTEXT           "1. Select the VeraCrypt volume to be expanded\n2. Click the 'Mount' button",IDC_STATIC,15,156,293,21
+    LTEXT           "1. Select the VeraCrypt volume to be expanded\n2. Click the 'Mount' button",IDC_STEPSEXPAND,15,156,293,21
     LTEXT           "Static",IDC_INFOEXPAND,8,6,361,134,SS_NOPREFIX | SS_SUNKEN,WS_EX_STATICEDGE
 END
 
 IDD_PASSWORD_DLG DIALOGEX 0, 0, 322, 107
@@ -82,9 +83,8 @@ CAPTION "Enter VeraCrypt Volume Password"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     EDITTEXT        IDC_PASSWORD,69,8,166,14,ES_PASSWORD | ES_AUTOHSCROLL
     COMBOBOX        IDC_PKCS5_PRF_ID,69,26,86,90,CBS_DROPDOWNLIST | WS_TABSTOP
-    CONTROL         "TrueCrypt Mode",IDC_TRUECRYPT_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,159,28,76,10
     EDITTEXT        IDC_PIM,69,43,42,14,ES_RIGHT | ES_PASSWORD | ES_AUTOHSCROLL | ES_NUMBER | NOT WS_VISIBLE
     CONTROL         "Use P&IM",IDC_PIM_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,70,49,97,10
     CONTROL         "Cache passwords and keyfil&es in memory",IDC_CACHE,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,70,62,153,10
@@ -119,16 +119,16 @@ BEGIN
     GROUPBOX        "",IDC_STATIC,15,84,346,49
     RTEXT           "Volume: ",IDT_VOL_NAME,31,16,42,8
     GROUPBOX        "",IDC_STATIC,15,7,346,72
     CONTROL         "",IDC_EXPAND_VOLUME_NAME,"Static",SS_SIMPLE | WS_GROUP,80,16,275,8,WS_EX_TRANSPARENT
-    DEFPUSHBUTTON   "Continue",IDOK,15,247,84,18
+    DEFPUSHBUTTON   "Continue",IDC_CONTINUE,15,247,84,18
     PUSHBUTTON      "Cancel",IDCANCEL,277,247,84,18
     EDITTEXT        IDC_BOX_STATUS,15,176,346,66,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | ES_WANTRETURN | WS_VSCROLL
     CONTROL         "",IDC_EXPAND_VOLUME_INITSPACE,"Static",SS_SIMPLE | WS_GROUP,80,64,275,8,WS_EX_TRANSPARENT
     RTEXT           "Fill new space: ",IDT_INIT_SPACE,20,64,53,8
     RTEXT           "File system: ",IDT_FILE_SYS,31,28,42,8
     CONTROL         "",IDC_EXPAND_FILE_SYSTEM,"Static",SS_SIMPLE | WS_GROUP,80,28,275,8,WS_EX_TRANSPARENT
-    RTEXT           "Random Pool: ",IDT_RANDOM_POOL2,20,144,53,8
+    RTEXT           "Random Pool: ",IDT_RANDOM_POOL,20,144,53,8
     CONTROL         "",IDC_RANDOM_BYTES,"Static",SS_SIMPLE | WS_GROUP,80,144,149,8,WS_EX_TRANSPARENT
     CONTROL         "Display pool content",IDC_DISPLAY_POOL_CONTENTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,236,142,125,12
     GROUPBOX        "Randomness Collected From Mouse Movements",IDT_ENTROPY_BAR,20,156,214,18
     CONTROL         "",IDC_ENTROPY_BAR,"msctls_progress32",WS_BORDER,31,165,193,6
@@ -140,9 +140,9 @@ END
 // DESIGNINFO
 //
 
 #ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO 
+GUIDELINES DESIGNINFO
 BEGIN
     IDD_SIZE_DIALOG, DIALOG
     BEGIN
         LEFTMARGIN, 15
@@ -191,10 +191,10 @@ IDR_MOUNT_RSRC_HEADER   HEADER                  "resource.h"
 // Version
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,20,2,0
- PRODUCTVERSION 1,20,2,0
+ FILEVERSION 1,26,17,2
+ PRODUCTVERSION 1,26,17,2
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
 #else
@@ -209,13 +209,13 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "CompanyName", "IDRIX"
             VALUE "FileDescription", "VeraCrypt Expander"
-            VALUE "FileVersion", "1.20-BETA2"
+            VALUE "FileVersion", "1.26.17"
             VALUE "LegalTrademarks", "VeraCrypt"
             VALUE "OriginalFilename", "VeraCryptExpander.exe"
             VALUE "ProductName", "VeraCrypt"
-            VALUE "ProductVersion", "1.20-BETA2"
+            VALUE "ProductVersion", "1.26.17"
         END
     END
     BLOCK "VarFileInfo"
     BEGIN
@@ -263,9 +263,9 @@ IDB_LOGO_288DPI         BITMAP                  "Logo_288dpi.bmp"
 //
 // Menu
 //
 
-IDR_MENU MENUEX 
+IDR_MENU MENUEX
 BEGIN
     MENUITEM "About",                       IDM_ABOUT,MFT_STRING,MFS_ENABLED
     MENUITEM "Homepage",                    IDM_HOMEPAGE,MFT_STRING | MFT_RIGHTJUSTIFY,MFS_ENABLED
 END
@@ -275,9 +275,9 @@ END
 //
 // String Table
 //
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_UACSTRING           "VeraCrypt Expander"
 END