diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2015-04-28 23:37:56 +0200 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2015-05-03 15:47:22 +0200 |
| commit | a1f1e34789d3693f821ec20cf147e2634f981249 (patch) | |
| tree | b1278013a471a82856fba2488d7487bbc5eb82af /src/Common | |
| parent | eac440ae9e9d313712bef01fcd7e70ff255e0eea (diff) | |
| download | VeraCrypt-a1f1e34789d3693f821ec20cf147e2634f981249.tar.gz VeraCrypt-a1f1e34789d3693f821ec20cf147e2634f981249.zip | |
Windows: Modify custom window class names to less generic value in order to avoid collision with existing class names.
Diffstat (limited to 'src/Common')
| -rw-r--r-- | src/Common/Common.rc | 6 | ||||
| -rw-r--r-- | src/Common/Dlgcode.c | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/Common/Common.rc b/src/Common/Common.rc index 64827c98..40b09bfc 100644 --- a/src/Common/Common.rc +++ b/src/Common/Common.rc @@ -29,7 +29,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US 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
CAPTION "About VeraCrypt"
-CLASS "SplashDlg"
+CLASS "VeraCryptSplashDlg"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
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
STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Command Line Help"
-CLASS "CustomDlg"
+CLASS "VeraCryptCustomDlg"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
DEFPUSHBUTTON "OK",IDOK,93,191,59,14
@@ -174,7 +174,7 @@ BEGIN GROUPBOX "Plaintext (hexadecimal)",IDT_TEST_PLAINTEXT,1,140,323,33
GROUPBOX "Ciphertext (hexadecimal)",IDT_TEST_CIPHERTEXT,1,174,323,33
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 "Plaintext size:",IDT_PLAINTEXT,190,153,63,8
LTEXT "bits",IDT_KEY_UNIT,114,57,45,8
diff --git a/src/Common/Dlgcode.c b/src/Common/Dlgcode.c index b96891c3..30b76e82 100644 --- a/src/Common/Dlgcode.c +++ b/src/Common/Dlgcode.c @@ -186,8 +186,8 @@ HMODULE hRichEditDll = NULL; #define WINDOWS_DIALOG_CLASS "#32770"
/* Custom class names */
-#define TC_DLG_CLASS "CustomDlg"
-#define TC_SPLASH_CLASS "SplashDlg"
+#define TC_DLG_CLASS "VeraCryptCustomDlg"
+#define TC_SPLASH_CLASS "VeraCryptSplashDlg"
/* Benchmarks */
@@ -1532,7 +1532,7 @@ RegisterRedTick (HINSTANCE hInstance) wc.hIcon = LoadIcon (NULL, IDI_APPLICATION);
wc.hCursor = NULL;
wc.hbrBackground = (HBRUSH) GetStockObject (LTGRAY_BRUSH);
- wc.lpszClassName = "REDTICK";
+ wc.lpszClassName = "VCREDTICK";
wc.lpfnWndProc = &RedTick;
rc = (ULONG) RegisterClass (&wc);
@@ -1543,7 +1543,7 @@ RegisterRedTick (HINSTANCE hInstance) BOOL
UnregisterRedTick (HINSTANCE hInstance)
{
- return UnregisterClass ("REDTICK", hInstance);
+ return UnregisterClass ("VCREDTICK", hInstance);
}
LRESULT CALLBACK
@@ -2502,7 +2502,7 @@ void InitApp (HINSTANCE hInstance, char *lpszCommandLine) }
}
}
-
+
/* Get the attributes for the standard dialog class */
if ((GetClassInfo (hInst, WINDOWS_DIALOG_CLASS, &wc)) == 0)
{
|