Public/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2025-11-11 02:58:02 -06:00
Code Activity

Correctly handle dialogs from previous versions that used 'TRUE' instead of 'VERA' as a value for GWLP_USERDATA.

Browse Source
This commit is contained in:
Mounir IDRASSI
2014-08-25 20:02:45 +02:00
parent f158df394e
commit 03cf7cc566
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Common/Dlgcode.c
View File

@@ -8414,7 +8414,8 @@ void HandleDriveNotReadyError ()
BOOL CALLBACK CloseTCWindowsEnum (HWND hwnd, LPARAM lParam) BOOL CALLBACK CloseTCWindowsEnum (HWND hwnd, LPARAM lParam)
{ {
if (GetWindowLongPtr (hwnd, GWLP_USERDATA) == (LONG_PTR) 'VERA') LONG_PTR userDataVal = GetWindowLongPtr (hwnd, GWLP_USERDATA);
if ((userDataVal == (LONG_PTR) 'VERA') || (userDataVal == (LONG_PTR) 'TRUE')) // Prior to 1.0e, 'TRUE' was used for VeraCrypt dialogs
{ {
char name[1024] = { 0 }; char name[1024] = { 0 };
GetWindowText (hwnd, name, sizeof (name) - 1); GetWindowText (hwnd, name, sizeof (name) - 1);
@@ -8439,7 +8440,8 @@ BOOL CALLBACK FindTCWindowEnum (HWND hwnd, LPARAM lParam)
if (*(HWND *)lParam == hwnd) if (*(HWND *)lParam == hwnd)
return TRUE; return TRUE;
if (GetWindowLongPtr (hwnd, GWLP_USERDATA) == (LONG_PTR) 'VERA') LONG_PTR userDataVal = GetWindowLongPtr (hwnd, GWLP_USERDATA);
if ((userDataVal == (LONG_PTR) 'VERA') || (userDataVal == (LONG_PTR) 'TRUE')) // Prior to 1.0e, 'TRUE' was used for VeraCrypt dialogs
{ {
char name[32] = { 0 }; char name[32] = { 0 };
GetWindowText (hwnd, name, sizeof (name) - 1); GetWindowText (hwnd, name, sizeof (name) - 1);

3
src/Format/Tcformat.c
View File

@@ -377,7 +377,8 @@ static void localcleanup (void)
static BOOL CALLBACK BroadcastSysEncCfgUpdateCallb (HWND hwnd, LPARAM lParam) static BOOL CALLBACK BroadcastSysEncCfgUpdateCallb (HWND hwnd, LPARAM lParam)
{ {
if (GetWindowLongPtr (hwnd, GWLP_USERDATA) == (LONG_PTR) 'VERA') LONG_PTR userDataVal = GetWindowLongPtr (hwnd, GWLP_USERDATA);
if ((userDataVal == (LONG_PTR) 'VERA') || (userDataVal == (LONG_PTR) 'TRUE')) // Prior to 1.0e, 'TRUE' was used for VeraCrypt dialogs
{ {
char name[1024] = { 0 }; char name[1024] = { 0 };
GetWindowText (hwnd, name, sizeof (name) - 1); GetWindowText (hwnd, name, sizeof (name) - 1);