VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src/Common
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2018-08-15 23:08:37 (GMT)
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2018-08-15 23:12:46 (GMT)
commit558746c4826ca5f5a574233b484a74ca19706ccc (patch)
tree1025c004fcafd45d587b4e577ccf287dccc8719b /src/Common
parentc2b69b248c004e097ffc1aa4c0dde0ddd0ba54f7 (diff)
downloadVeraCrypt-558746c4826ca5f5a574233b484a74ca19706ccc.zip
VeraCrypt-558746c4826ca5f5a574233b484a74ca19706ccc.tar.gz
Windows: Fix regression that caused the system encryption wizard to crash when displaying password field.
Diffstat (limited to 'src/Common')
-rw-r--r--src/Common/Dlgcode.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/Common/Dlgcode.c b/src/Common/Dlgcode.c
index 88713ac..3fd6e76 100644
--- a/src/Common/Dlgcode.c
+++ b/src/Common/Dlgcode.c
@@ -1310,10 +1310,15 @@ static LRESULT CALLBACK NormalPwdFieldProc (HWND hwnd, UINT message, WPARAM wPar
void ToNormalPwdField (HWND hwndDlg, UINT ctrlId)
{
HWND hwndCtrl = GetDlgItem (hwndDlg, ctrlId);
+ WNDPROC originalwp = (WNDPROC) GetWindowLongPtrW (hwndCtrl, GWLP_USERDATA);
SendMessage (hwndCtrl, EM_LIMITTEXT, MAX_PASSWORD, 0);
- SetWindowLongPtrW (hwndCtrl, GWLP_USERDATA, (LONG_PTR) GetWindowLongPtrW (hwndCtrl, GWLP_WNDPROC));
- SetWindowLongPtrW (hwndCtrl, GWLP_WNDPROC, (LONG_PTR) NormalPwdFieldProc);
+ // only change WNDPROC if not changed already
+ if (!originalwp)
+ {
+ SetWindowLongPtrW (hwndCtrl, GWLP_USERDATA, (LONG_PTR) GetWindowLongPtrW (hwndCtrl, GWLP_WNDPROC));
+ SetWindowLongPtrW (hwndCtrl, GWLP_WNDPROC, (LONG_PTR) NormalPwdFieldProc);
+ }
}