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/Format/Format.rc | 12 ++++++------ src/Format/Tcformat.c | 36 ++++++++++++++++++------------------ 2 files changed, 24 insertions(+), 24 deletions(-) (limited to 'src/Format') diff --git a/src/Format/Format.rc b/src/Format/Format.rc index aab29605..26d35961 100644 --- a/src/Format/Format.rc +++ b/src/Format/Format.rc @@ -116,15 +116,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN EDITTEXT IDC_PASSWORD,53,3,163,14,ES_PASSWORD | ES_AUTOHSCROLL EDITTEXT IDC_VERIFY,53,19,163,14,ES_PASSWORD | ES_AUTOHSCROLL - EDITTEXT IDC_PIN,53,35,42,14,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER + EDITTEXT IDC_PIM,53,35,42,14,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER CONTROL "&Display password",IDC_SHOW_PASSWORD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,53,65,95,11,WS_EX_TRANSPARENT CONTROL "U&se keyfiles",IDC_KEYFILES_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,53,55,95,10 PUSHBUTTON "&Keyfiles...",IDC_KEY_FILES,152,56,64,14,WS_DISABLED RTEXT "Password:",IDT_PASSWORD,1,6,50,8 RTEXT "&Confirm:",IDT_CONFIRM,1,23,50,8 LTEXT "",IDC_BOX_HELP,0,79,225,89 - RTEXT "Volume PIN:",IDT_PIN,1,38,50,8 - LTEXT "(Empty or 0 for default iterations)",IDC_PIN_HELP,97,38,126,8 + RTEXT "Volume PIM:",IDT_PIM,1,38,50,8 + LTEXT "(Empty or 0 for default iterations)",IDC_PIM_HELP,97,38,126,8 END IDD_SIZE_PAGE_DLG DIALOGEX 0, 0, 226, 172 @@ -227,15 +227,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN EDITTEXT IDC_PASSWORD_DIRECT,50,2,149,14,ES_PASSWORD | ES_AUTOHSCROLL COMBOBOX IDC_PKCS5_PRF_ID,50,17,91,90,CBS_DROPDOWNLIST | WS_TABSTOP - EDITTEXT IDC_PIN,50,32,42,14,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER + EDITTEXT IDC_PIM,50,32,42,14,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER CONTROL "&Display password",IDC_SHOW_PASSWORD_SINGLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,46,84,11,WS_EX_TRANSPARENT CONTROL "U&se keyfiles",IDC_KEYFILES_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,57,82,11 PUSHBUTTON "&Keyfiles...",IDC_KEY_FILES,142,54,64,14 LTEXT "",IDC_BOX_HELP,0,74,225,94 RTEXT "Password:",IDT_PASSWORD,0,6,48,8 RTEXT "PKCS-5 PRF:",IDT_PKCS5_PRF,0,19,48,8 - RTEXT "Volume PIN:",IDT_PIN,0,34,48,8 - LTEXT "(Empty or 0 for default iterations)",IDC_PIN_HELP,96,34,127,8 + RTEXT "Volume PIM:",IDT_PIM,0,34,48,8 + LTEXT "(Empty or 0 for default iterations)",IDC_PIM_HELP,96,34,127,8 END IDD_VOLUME_TYPE_PAGE_DLG DIALOGEX 0, 0, 226, 172 diff --git a/src/Format/Tcformat.c b/src/Format/Tcformat.c index a59ec4a4..f088c498 100644 --- a/src/Format/Tcformat.c +++ b/src/Format/Tcformat.c @@ -4068,12 +4068,12 @@ BOOL CALLBACK PageDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa SetFocus (GetDlgItem (hwndDlg, IDC_PASSWORD_DIRECT)); - SendMessage (GetDlgItem (hwndDlg, IDC_PIN), EM_LIMITTEXT, MAX_PIN, 0); + SendMessage (GetDlgItem (hwndDlg, IDC_PIM), EM_LIMITTEXT, MAX_PIM, 0); if (volumePin > 0) { - char szTmp[MAX_PIN + 1]; + char szTmp[MAX_PIM + 1]; StringCbPrintfA(szTmp, sizeof(szTmp), "%d", volumePin); - SetWindowText (GetDlgItem (hwndDlg, IDC_PIN), szTmp); + SetWindowText (GetDlgItem (hwndDlg, IDC_PIM), szTmp); } SetCheckBox (hwndDlg, IDC_KEYFILES_ENABLE, KeyFilesEnable); @@ -4150,15 +4150,15 @@ BOOL CALLBACK PageDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa SetFocus (GetDlgItem (hwndDlg, IDC_PASSWORD)); - SendMessage (GetDlgItem (hwndDlg, IDC_PIN), EM_LIMITTEXT, SysEncInEffect()? MAX_BOOT_PIN: MAX_PIN, 0); + SendMessage (GetDlgItem (hwndDlg, IDC_PIM), EM_LIMITTEXT, SysEncInEffect()? MAX_BOOT_PIM: MAX_PIM, 0); if (volumePin > 0) { - char szTmp[MAX_PIN + 1]; + char szTmp[MAX_PIM + 1]; StringCbPrintfA(szTmp, sizeof(szTmp), "%d", volumePin); - SetWindowText (GetDlgItem (hwndDlg, IDC_PIN), szTmp); + SetWindowText (GetDlgItem (hwndDlg, IDC_PIM), szTmp); PinValueChangedWarning = TRUE; - SetDlgItemTextW (hwndDlg, IDC_PIN_HELP, GetString (SysEncInEffect ()? "PIN_SYSENC_CHANGE_WARNING" : "PIN_CHANGE_WARNING")); + SetDlgItemTextW (hwndDlg, IDC_PIM_HELP, GetString (SysEncInEffect ()? "PIM_SYSENC_CHANGE_WARNING" : "PIM_CHANGE_WARNING")); } SetCheckBox (hwndDlg, IDC_KEYFILES_ENABLE, KeyFilesEnable && !SysEncInEffect()); @@ -4920,7 +4920,7 @@ BOOL CALLBACK PageDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa case WM_CTLCOLORSTATIC: { - if (PinValueChangedWarning && ((HWND)lParam == GetDlgItem(hwndDlg, IDC_PIN_HELP)) ) + if (PinValueChangedWarning && ((HWND)lParam == GetDlgItem(hwndDlg, IDC_PIM_HELP)) ) { // we're about to draw the static // set the text colour in (HDC)lParam @@ -5312,17 +5312,17 @@ BOOL CALLBACK PageDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa KeyFilesEnable && FirstKeyFile!=NULL && !SysEncInEffect()); volumePassword.Length = (unsigned __int32) strlen ((char *) volumePassword.Text); - if (lw == IDC_PIN) + if (lw == IDC_PIM) { - if(GetPin (hwndDlg, IDC_PIN) != 0) + if(GetPin (hwndDlg, IDC_PIM) != 0) { PinValueChangedWarning = TRUE; - SetDlgItemTextW (hwndDlg, IDC_PIN_HELP, GetString (SysEncInEffect ()? "PIN_SYSENC_CHANGE_WARNING" : "PIN_CHANGE_WARNING")); + SetDlgItemTextW (hwndDlg, IDC_PIM_HELP, GetString (SysEncInEffect ()? "PIM_SYSENC_CHANGE_WARNING" : "PIM_CHANGE_WARNING")); } else { PinValueChangedWarning = FALSE; - SetDlgItemTextW (hwndDlg, IDC_PIN_HELP, (wchar_t *) GetDictionaryValueByInt (IDC_PIN_HELP)); + SetDlgItemTextW (hwndDlg, IDC_PIM_HELP, (wchar_t *) GetDictionaryValueByInt (IDC_PIM_HELP)); } } @@ -6993,7 +6993,7 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa volumePassword.Length = (unsigned __int32) strlen ((char *) volumePassword.Text); - volumePin = GetPin (hCurPage, IDC_PIN); + volumePin = GetPin (hCurPage, IDC_PIM); if (volumePassword.Length > 0) { @@ -7003,10 +7003,10 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa Error ("UNSUPPORTED_CHARS_IN_PWD", hwndDlg); return 1; } - else if (SysEncInEffect() && (volumePin > MAX_BOOT_PIN_VALUE)) + else if (SysEncInEffect() && (volumePin > MAX_BOOT_PIM_VALUE)) { - SetFocus (GetDlgItem(hCurPage, IDC_PIN)); - Error ("PIN_SYSENC_TOO_BIG", hwndDlg); + SetFocus (GetDlgItem(hCurPage, IDC_PIM)); + Error ("PIM_SYSENC_TOO_BIG", hwndDlg); return 1; } // Check password length (check also done for outer volume which is not the case in TrueCrypt). @@ -7073,7 +7073,7 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa hash_algo = (int) SendMessage (GetDlgItem (hCurPage, IDC_PKCS5_PRF_ID), CB_GETITEMDATA, SendMessage (GetDlgItem (hCurPage, IDC_PKCS5_PRF_ID), CB_GETCURSEL, 0, 0), 0); - volumePin = GetPin (hCurPage, IDC_PIN); + volumePin = GetPin (hCurPage, IDC_PIM); // Store the password in case we need to restore it after keyfile is applied to it GetWindowText (GetDlgItem (hCurPage, IDC_PASSWORD_DIRECT), szRawPassword, sizeof (szRawPassword)); @@ -8158,7 +8158,7 @@ ovf_end: volumePassword.Length = (unsigned __int32) strlen ((char *) volumePassword.Text); - volumePin = GetPin (hCurPage, IDC_PIN); + volumePin = GetPin (hCurPage, IDC_PIM); nNewPageNo = SIZE_PAGE + 1; // Skip the hidden volume host password page -- cgit v1.2.3