VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src/Common
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2015-09-09 01:16:27 +0200
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2015-09-10 01:44:09 +0200
commitc55e08b31e8100a593b4f81784489a820de807a1 (patch)
tree0fa78904e6ce22cf6fa94f74bd7357a31c371522 /src/Common
parent09db742c3e7e2d10bbef4619aff395d154386ee0 (diff)
downloadVeraCrypt-c55e08b31e8100a593b4f81784489a820de807a1.tar.gz
VeraCrypt-c55e08b31e8100a593b4f81784489a820de807a1.zip
Windows: When no language selected by user, explicitly use English as default one unless VeraCrypt is in portable mode.
Diffstat (limited to 'src/Common')
-rw-r--r--src/Common/Dlgcode.c17
-rw-r--r--src/Common/Language.c4
2 files changed, 17 insertions, 4 deletions
diff --git a/src/Common/Dlgcode.c b/src/Common/Dlgcode.c
index dc727ee9..e858c3b4 100644
--- a/src/Common/Dlgcode.c
+++ b/src/Common/Dlgcode.c
@@ -2421,8 +2421,21 @@ void InitApp (HINSTANCE hInstance, char *lpszCommandLine)
SetPreferredLangId (ConfigReadString ("Language", "", langId, sizeof (langId)));
if (langId[0] == 0)
- DialogBoxParamW (hInst, MAKEINTRESOURCEW (IDD_LANGUAGE), NULL,
- (DLGPROC) LanguageDlgProc, (LPARAM) 1);
+ {
+ if (IsNonInstallMode ())
+ {
+ // only support automatic use of a language file in portable mode
+ // this is achieved by placing a unique language XML file in the same
+ // place as portable VeraCrypt binaries.
+ DialogBoxParamW (hInst, MAKEINTRESOURCEW (IDD_LANGUAGE), NULL,
+ (DLGPROC) LanguageDlgProc, (LPARAM) 1);
+ }
+ else
+ {
+ // when installed, force using English as default language
+ SetPreferredLangId ("en");
+ }
+ }
LoadLanguageFile ();
diff --git a/src/Common/Language.c b/src/Common/Language.c
index fb20a6fb..e6abd38d 100644
--- a/src/Common/Language.c
+++ b/src/Common/Language.c
@@ -35,10 +35,10 @@
BOOL LocalizationActive;
int LocalizationSerialNo;
-wchar_t UnknownString[1024];
+wchar_t UnknownString[1024] = {0};
static char *LanguageFileBuffer = NULL;
static HANDLE LanguageFileFindHandle = INVALID_HANDLE_VALUE;
-static char PreferredLangId[6];
+static char PreferredLangId[6] = {0};
static char *LanguageResource = NULL;
static DWORD LanguageResourceSize = 0;
static char *HeaderResource[2] = {NULL, NULL};