From 70215e3682345243301d410fc0072f294006403c Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Wed, 27 May 2015 00:12:46 +0200 Subject: Windows: GUI modifications around PIN field --- src/ExpandVolume/WinMain.cpp | 18 ++---------------- src/ExpandVolume/resource.h | 14 +++++--------- 2 files changed, 7 insertions(+), 25 deletions(-) (limited to 'src/ExpandVolume') diff --git a/src/ExpandVolume/WinMain.cpp b/src/ExpandVolume/WinMain.cpp index f8b3234c..0dc135b1 100644 --- a/src/ExpandVolume/WinMain.cpp +++ b/src/ExpandVolume/WinMain.cpp @@ -447,14 +447,7 @@ BOOL CALLBACK ExtcvPasswordDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARA SendMessage (GetDlgItem (hwndDlg, IDC_CACHE), BM_SETCHECK, bCacheInDriver ? BST_CHECKED:BST_UNCHECKED, 0); SendMessage (GetDlgItem (hwndDlg, IDC_PIN), EM_LIMITTEXT, MAX_PIN, 0); - if (*pin >= 0) - { - /* display the given PIN */ - char szTmp[MAX_PIN + 1]; - StringCbPrintfA(szTmp, sizeof(szTmp), "%d", *pin); - - SetDlgItemText (hwndDlg, IDC_PIN, szTmp); - } + SetPin (hwndDlg, IDC_PIN, *pin); SetCheckBox (hwndDlg, IDC_KEYFILES_ENABLE, KeyFilesEnable); @@ -554,14 +547,7 @@ BOOL CALLBACK ExtcvPasswordDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARA EnableWindow (GetDlgItem (hwndDlg, IDC_KEYFILES_ENABLE), FALSE); EnableWindow (GetDlgItem (hwndDlg, IDC_KEY_FILES), FALSE); - if (*pin >= 0) - { - /* display the given PIN */ - char szTmp[MAX_PIN + 1]; - StringCbPrintfA(szTmp, sizeof(szTmp), "%d", *pin); - - SetDlgItemText (hwndDlg, IDC_PIN, szTmp); - } + SetPin (hwndDlg, IDC_PIN, *pin); bPrebootPasswordDlgMode = TRUE; } diff --git a/src/ExpandVolume/resource.h b/src/ExpandVolume/resource.h index 29a451db..bf96b1ca 100644 --- a/src/ExpandVolume/resource.h +++ b/src/ExpandVolume/resource.h @@ -63,16 +63,12 @@ #define IDC_SIZEDLG_TITLE 1111 #define IDC_INIT_NEWSPACE 1112 #define IDC_INFOEXPAND 1113 -#define IDC_EDIT1 1114 #define IDC_BOX_STATUS 1114 #define IDC_TRUECRYPT_MODE 1140 -#define IDC_PREF_TEMP_CACHE_ON_MULTIPLE_MOUNT 1141 -#define IDT_PIN 1142 -#define IDC_PIN 1143 -#define IDC_PIN_HELP 1144 -#define IDT_OLD_PIN 1145 -#define IDC_OLD_PIN 1146 -#define IDC_OLD_PIN_HELP 1147 +#define IDC_PREF_TEMP_CACHE_ON_MULTIPLE_MOUNT 1141 +#define IDT_OLD_PIN 1142 +#define IDC_OLD_PIN 1143 +#define IDC_OLD_PIN_HELP 1144 #define IDM_HELP 40001 #define IDM_ABOUT 40002 #define IDM_UNMOUNT_VOLUME 40003 @@ -144,7 +140,7 @@ #define _APS_NO_MFC 1 #define _APS_NEXT_RESOURCE_VALUE 120 #define _APS_NEXT_COMMAND_VALUE 40064 -#define _APS_NEXT_CONTROL_VALUE 1148 +#define _APS_NEXT_CONTROL_VALUE 1145 #define _APS_NEXT_SYMED_VALUE 101 #endif #endif -- cgit v1.2.3