From a7a8d57bcaaaf4e5982d2e51cd3086d34f45f780 Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Mon, 8 Jun 2015 01:14:57 +0200 Subject: Windows: rename PIN to PIM to avoid confusion. Better error messages. --- src/ExpandVolume/ExpandVolume.rc | 6 +++--- src/ExpandVolume/WinMain.cpp | 12 ++++++------ src/ExpandVolume/resource.h | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) (limited to 'src/ExpandVolume') diff --git a/src/ExpandVolume/ExpandVolume.rc b/src/ExpandVolume/ExpandVolume.rc index 7bae8494..7f4d71ae 100644 --- a/src/ExpandVolume/ExpandVolume.rc +++ b/src/ExpandVolume/ExpandVolume.rc @@ -131,9 +131,9 @@ BEGIN COMBOBOX IDC_PKCS5_PRF_ID,69,26,86,90,CBS_DROPDOWNLIST | WS_TABSTOP RTEXT "PKCS-5 PRF:",IDT_PKCS5_PRF,0,27,65,13 CONTROL "TrueCrypt Mode",IDC_TRUECRYPT_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,159,28,76,10 - RTEXT "Volume PIN:",IDT_PIN,0,46,65,13 - EDITTEXT IDC_PIN,69,43,42,14,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER - LTEXT "(Empty or 0 for default iterations)",IDC_PIN_HELP,115,46,189,8 + RTEXT "Volume PIM:",IDT_PIM,0,46,65,13 + EDITTEXT IDC_PIM,69,43,42,14,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER + LTEXT "(Empty or 0 for default iterations)",IDC_PIM_HELP,115,46,189,8 END IDD_EXPAND_PROGRESS_DLG DIALOGEX 0, 0, 376, 271 diff --git a/src/ExpandVolume/WinMain.cpp b/src/ExpandVolume/WinMain.cpp index 0dc135b1..81d782c1 100644 --- a/src/ExpandVolume/WinMain.cpp +++ b/src/ExpandVolume/WinMain.cpp @@ -445,9 +445,9 @@ BOOL CALLBACK ExtcvPasswordDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARA SendMessage (GetDlgItem (hwndDlg, IDC_PASSWORD), EM_LIMITTEXT, MAX_PASSWORD, 0); SendMessage (GetDlgItem (hwndDlg, IDC_CACHE), BM_SETCHECK, bCacheInDriver ? BST_CHECKED:BST_UNCHECKED, 0); - SendMessage (GetDlgItem (hwndDlg, IDC_PIN), EM_LIMITTEXT, MAX_PIN, 0); + SendMessage (GetDlgItem (hwndDlg, IDC_PIM), EM_LIMITTEXT, MAX_PIM, 0); - SetPin (hwndDlg, IDC_PIN, *pin); + SetPin (hwndDlg, IDC_PIM, *pin); SetCheckBox (hwndDlg, IDC_KEYFILES_ENABLE, KeyFilesEnable); @@ -547,7 +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); - SetPin (hwndDlg, IDC_PIN, *pin); + SetPin (hwndDlg, IDC_PIM, *pin); bPrebootPasswordDlgMode = TRUE; } @@ -659,9 +659,9 @@ BOOL CALLBACK ExtcvPasswordDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARA *pkcs5 = (int) SendMessage (GetDlgItem (hwndDlg, IDC_PKCS5_PRF_ID), CB_GETITEMDATA, SendMessage (GetDlgItem (hwndDlg, IDC_PKCS5_PRF_ID), CB_GETCURSEL, 0, 0), 0); *truecryptMode = GetCheckBox (hwndDlg, IDC_TRUECRYPT_MODE); - GetWindowText (GetDlgItem (hwndDlg, IDC_PIN), tmp, MAX_PIN + 1); + GetWindowText (GetDlgItem (hwndDlg, IDC_PIM), tmp, MAX_PIM + 1); if (strlen(tmp)) - *pin = (int) strtol(tmp, NULL, 10); /* IDC_PIN is configured to accept only numbers */ + *pin = (int) strtol(tmp, NULL, 10); /* IDC_PIM is configured to accept only numbers */ else *pin = 0; @@ -678,7 +678,7 @@ BOOL CALLBACK ExtcvPasswordDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARA && (*pin != 0) ) { - Error ("PIN_NOT_SUPPORTED_FOR_TRUECRYPT_MODE", hwndDlg); + Error ("PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE", hwndDlg); return 1; } } diff --git a/src/ExpandVolume/resource.h b/src/ExpandVolume/resource.h index bf96b1ca..d42e745e 100644 --- a/src/ExpandVolume/resource.h +++ b/src/ExpandVolume/resource.h @@ -66,9 +66,9 @@ #define IDC_BOX_STATUS 1114 #define IDC_TRUECRYPT_MODE 1140 #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 IDT_OLD_PIM 1142 +#define IDC_OLD_PIM 1143 +#define IDC_OLD_PIM_HELP 1144 #define IDM_HELP 40001 #define IDM_ABOUT 40002 #define IDM_UNMOUNT_VOLUME 40003 -- cgit v1.2.3