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

Windows: Modify custom window class names to less generic value in order to avoid collision with existing class names.

Browse Source
This commit is contained in:
Mounir IDRASSI
2015-04-28 23:37:56 +02:00
parent eac440ae9e
commit a1f1e34789
6 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Common/Common.rc
View File

@@ -29,7 +29,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
IDD_ABOUT_DLG DIALOGEX 31, 51, 292, 199 IDD_ABOUT_DLG DIALOGEX 31, 51, 292, 199
STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "About VeraCrypt" CAPTION "About VeraCrypt"
CLASS "SplashDlg" CLASS "VeraCryptSplashDlg"
FONT 8, "MS Shell Dlg", 0, 0, 0x0 FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN BEGIN
EDITTEXT IDC_ABOUT_CREDITS,7,111,277,45,ES_MULTILINE | WS_VSCROLL | NOT WS_TABSTOP EDITTEXT IDC_ABOUT_CREDITS,7,111,277,45,ES_MULTILINE | WS_VSCROLL | NOT WS_TABSTOP
@@ -48,7 +48,7 @@ END
IDD_COMMANDHELP_DLG DIALOGEX 0, 0, 249, 213 IDD_COMMANDHELP_DLG DIALOGEX 0, 0, 249, 213
STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Command Line Help" CAPTION "Command Line Help"
CLASS "CustomDlg" CLASS "VeraCryptCustomDlg"
FONT 8, "MS Shell Dlg", 0, 0, 0x0 FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN BEGIN
DEFPUSHBUTTON "OK",IDOK,93,191,59,14 DEFPUSHBUTTON "OK",IDOK,93,191,59,14
@@ -174,7 +174,7 @@ BEGIN
GROUPBOX "Plaintext (hexadecimal)",IDT_TEST_PLAINTEXT,1,140,323,33 GROUPBOX "Plaintext (hexadecimal)",IDT_TEST_PLAINTEXT,1,140,323,33
GROUPBOX "Ciphertext (hexadecimal)",IDT_TEST_CIPHERTEXT,1,174,323,33 GROUPBOX "Ciphertext (hexadecimal)",IDT_TEST_CIPHERTEXT,1,174,323,33
RTEXT "",IDC_TESTS_MESSAGE,50,213,178,10 RTEXT "",IDC_TESTS_MESSAGE,50,213,178,10
CONTROL "",IDC_REDTICK,"REDTICK",0x0,234,214,10,8 CONTROL "",IDC_REDTICK,"VCREDTICK",0x0,234,214,10,8
RTEXT "Key size:",IDT_KEY,8,57,56,8 RTEXT "Key size:",IDT_KEY,8,57,56,8
RTEXT "Plaintext size:",IDT_PLAINTEXT,190,153,63,8 RTEXT "Plaintext size:",IDT_PLAINTEXT,190,153,63,8
LTEXT "bits",IDT_KEY_UNIT,114,57,45,8 LTEXT "bits",IDT_KEY_UNIT,114,57,45,8

10
src/Common/Dlgcode.c
View File

@@ -186,8 +186,8 @@ HMODULE hRichEditDll = NULL;
#define WINDOWS_DIALOG_CLASS "#32770" #define WINDOWS_DIALOG_CLASS "#32770"
/* Custom class names */ /* Custom class names */
#define TC_DLG_CLASS "CustomDlg" #define TC_DLG_CLASS "VeraCryptCustomDlg"
#define TC_SPLASH_CLASS "SplashDlg" #define TC_SPLASH_CLASS "VeraCryptSplashDlg"
/* Benchmarks */ /* Benchmarks */
@@ -1532,7 +1532,7 @@ RegisterRedTick (HINSTANCE hInstance)
wc.hIcon = LoadIcon (NULL, IDI_APPLICATION); wc.hIcon = LoadIcon (NULL, IDI_APPLICATION);
wc.hCursor = NULL; wc.hCursor = NULL;
wc.hbrBackground = (HBRUSH) GetStockObject (LTGRAY_BRUSH); wc.hbrBackground = (HBRUSH) GetStockObject (LTGRAY_BRUSH);
wc.lpszClassName = "REDTICK"; wc.lpszClassName = "VCREDTICK";
wc.lpfnWndProc = &RedTick; wc.lpfnWndProc = &RedTick;
rc = (ULONG) RegisterClass (&wc); rc = (ULONG) RegisterClass (&wc);
@@ -1543,7 +1543,7 @@ RegisterRedTick (HINSTANCE hInstance)
BOOL BOOL
UnregisterRedTick (HINSTANCE hInstance) UnregisterRedTick (HINSTANCE hInstance)
{ {
return UnregisterClass ("REDTICK", hInstance); return UnregisterClass ("VCREDTICK", hInstance);
} }
LRESULT CALLBACK LRESULT CALLBACK
@@ -2502,7 +2502,7 @@ void InitApp (HINSTANCE hInstance, char *lpszCommandLine)
} }
} }
} }
/* Get the attributes for the standard dialog class */ /* Get the attributes for the standard dialog class */
if ((GetClassInfo (hInst, WINDOWS_DIALOG_CLASS, &wc)) == 0) if ((GetClassInfo (hInst, WINDOWS_DIALOG_CLASS, &wc)) == 0)
{ {

2
src/ExpandVolume/ExpandVolume.rc
View File

@@ -95,7 +95,7 @@ IDD_MOUNT_DLG DIALOGEX 0, 0, 376, 271
STYLE DS_SETFONT | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "VeraCrypt Expander" CAPTION "VeraCrypt Expander"
MENU IDR_MENU MENU IDR_MENU
CLASS "CustomDlg" CLASS "VeraCryptCustomDlg"
FONT 8, "MS Shell Dlg", 0, 0, 0x0 FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN BEGIN
COMBOBOX IDC_VOLUME,56,192,212,74,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_VOLUME,56,192,212,74,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP

2
src/Format/Format.rc
View File

@@ -82,7 +82,7 @@ IDR_FORMAT_TLB TYPELIB "Format.tlb"
IDD_VOL_CREATION_WIZARD_DLG DIALOGEX 0, 0, 400, 209 IDD_VOL_CREATION_WIZARD_DLG DIALOGEX 0, 0, 400, 209
STYLE DS_SETFONT | DS_SETFOREGROUND | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_SETFOREGROUND | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "VeraCrypt Volume Creation Wizard" CAPTION "VeraCrypt Volume Creation Wizard"
CLASS "CustomDlg" CLASS "VeraCryptCustomDlg"
FONT 8, "MS Shell Dlg", 0, 0, 0x0 FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN BEGIN
PUSHBUTTON "&Help",IDHELP,176,189,50,14 PUSHBUTTON "&Help",IDHELP,176,189,50,14

6
src/Mount/Mount.rc
View File

@@ -108,7 +108,7 @@ END
IDD_PASSWORDCHANGE_DLG DIALOGEX 0, 0, 330, 207 IDD_PASSWORDCHANGE_DLG DIALOGEX 0, 0, 330, 207
STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Change Password or Keyfiles" CAPTION "Change Password or Keyfiles"
CLASS "CustomDlg" CLASS "VeraCryptCustomDlg"
FONT 8, "MS Shell Dlg", 0, 0, 0x0 FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN BEGIN
EDITTEXT IDC_OLD_PASSWORD,89,14,162,13,ES_PASSWORD | ES_AUTOHSCROLL EDITTEXT IDC_OLD_PASSWORD,89,14,162,13,ES_PASSWORD | ES_AUTOHSCROLL
@@ -140,7 +140,7 @@ IDD_MOUNT_DLG DIALOGEX 0, 0, 375, 271
STYLE DS_SETFONT | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "VeraCrypt" CAPTION "VeraCrypt"
MENU IDR_MENU MENU IDR_MENU
CLASS "CustomDlg" CLASS "VeraCryptCustomDlg"
FONT 8, "MS Shell Dlg", 0, 0, 0x0 FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN BEGIN
CONTROL "",IDC_DRIVELIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,8,5,360,135 CONTROL "",IDC_DRIVELIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,8,5,360,135
@@ -221,7 +221,7 @@ END
IDD_HOTKEYS_DLG DIALOGEX 0, 0, 389, 257 IDD_HOTKEYS_DLG DIALOGEX 0, 0, 389, 257
STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "VeraCrypt - System-Wide Hot Keys" CAPTION "VeraCrypt - System-Wide Hot Keys"
CLASS "CustomDlg" CLASS "VeraCryptCustomDlg"
FONT 8, "MS Shell Dlg", 0, 0, 0x0 FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN BEGIN
CONTROL "",IDC_HOTKEY_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,7,375,115 CONTROL "",IDC_HOTKEY_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,7,375,115

4
src/Setup/Setup.rc
View File

@@ -82,7 +82,7 @@ IDR_COMREG REGISTRY "ComSetup.rgs"
IDD_UNINSTALL DIALOGEX 0, 0, 349, 234 IDD_UNINSTALL DIALOGEX 0, 0, 349, 234
STYLE DS_SETFONT | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Uninstall VeraCrypt" CAPTION "Uninstall VeraCrypt"
CLASS "CustomDlg" CLASS "VeraCryptCustomDlg"
FONT 8, "MS Shell Dlg", 0, 0, 0x0 FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN BEGIN
LTEXT "Click Uninstall to remove VeraCrypt from this system.",IDT_UNINSTALL_DIR,8,8,334,8 LTEXT "Click Uninstall to remove VeraCrypt from this system.",IDT_UNINSTALL_DIR,8,8,334,8
@@ -128,7 +128,7 @@ END
IDD_INSTL_DLG DIALOGEX 0, 0, 374, 231 IDD_INSTL_DLG DIALOGEX 0, 0, 374, 231
STYLE DS_SETFONT | DS_SETFOREGROUND | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_SETFOREGROUND | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "VeraCrypt Setup Wizard" CAPTION "VeraCrypt Setup Wizard"
CLASS "CustomDlg" CLASS "VeraCryptCustomDlg"
FONT 8, "MS Shell Dlg", 0, 0, 0x0 FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN BEGIN
PUSHBUTTON "&Help",IDHELP,150,211,50,14 PUSHBUTTON "&Help",IDHELP,150,211,50,14