VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src/Setup
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2017-06-05 01:38:22 +0200
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2017-06-05 01:41:48 +0200
commiteb72fe7aa9aa4be3de58c8dd04b15a42c7634448 (patch)
treef518986e982290c43e3a3bc7f5c5662b10f1766a /src/Setup
parent0ef137c0a4005eca6de49e754cab136e052a6496 (diff)
downloadVeraCrypt-eb72fe7aa9aa4be3de58c8dd04b15a42c7634448.tar.gz
VeraCrypt-eb72fe7aa9aa4be3de58c8dd04b15a42c7634448.zip
Windows: move language XML files to new "Languages" folder in the installation directory.
Diffstat (limited to 'src/Setup')
-rw-r--r--src/Setup/Setup.c39
-rw-r--r--src/Setup/Setup.h76
2 files changed, 13 insertions, 102 deletions
diff --git a/src/Setup/Setup.c b/src/Setup/Setup.c
index b08ded64..367aaf90 100644
--- a/src/Setup/Setup.c
+++ b/src/Setup/Setup.c
@@ -1015,14 +1015,15 @@ err:
return FALSE;
}
}
-
- // remove PDF from previous version if any
+
if (bUninstall == FALSE)
{
WIN32_FIND_DATA f;
HANDLE h;
SetCurrentDirectory (szDestDir);
+
+ // remove PDF from previous version if any
h = FindFirstFile (L"VeraCrypt User Guide*.pdf", &f);
if (h != INVALID_HANDLE_VALUE)
@@ -1036,38 +1037,20 @@ err:
FindClose (h);
}
- SetCurrentDirectory (SetupFilesDir);
- }
-
- // Language pack
- if (bUninstall == FALSE)
- {
- WIN32_FIND_DATA f;
- HANDLE h;
-
- SetCurrentDirectory (SetupFilesDir);
- h = FindFirstFile (L"Language.*.xml", &f);
+ // remove language XML files from previous version if any
+ h = FindFirstFile (L"Language*.xml", &f);
if (h != INVALID_HANDLE_VALUE)
{
- wchar_t d[MAX_PATH*2];
- StringCbPrintfW (d, sizeof(d), L"%s%s", szDestDir, f.cFileName);
- CopyMessage (hwndDlg, d);
- TCCopyFile (f.cFileName, d);
- FindClose (h);
- }
+ do
+ {
+ StatDeleteFile (f.cFileName, TRUE);
+ }
+ while (FindNextFile(h, &f) != 0);
- SetCurrentDirectory (SetupFilesDir);
- SetCurrentDirectory (L"Setup files");
- h = FindFirstFile (L"VeraCrypt User Guide.*.chm", &f);
- if (h != INVALID_HANDLE_VALUE)
- {
- wchar_t d[MAX_PATH*2];
- StringCbPrintfW (d, sizeof(d), L"%s%s", szDestDir, f.cFileName);
- CopyMessage (hwndDlg, d);
- TCCopyFile (f.cFileName, d);
FindClose (h);
}
+
SetCurrentDirectory (SetupFilesDir);
}
diff --git a/src/Setup/Setup.h b/src/Setup/Setup.h
index 1fc2e1b3..574d48c1 100644
--- a/src/Setup/Setup.h
+++ b/src/Setup/Setup.h
@@ -37,43 +37,7 @@ static wchar_t *szFiles[]=
L"Averacrypt-x64.sys",
L"Dveracrypt.sys",
L"AVeraCrypt Setup.exe",
- L"ALanguage.ar.xml",
- L"ALanguage.be.xml",
- L"ALanguage.bg.xml",
- L"ALanguage.ca.xml",
- L"ALanguage.cs.xml",
- L"ALanguage.da.xml",
- L"ALanguage.de.xml",
- L"ALanguage.el.xml",
- L"ALanguage.es.xml",
- L"ALanguage.et.xml",
- L"ALanguage.eu.xml",
- L"ALanguage.fa.xml",
- L"ALanguage.fi.xml",
- L"ALanguage.fr.xml",
- L"ALanguage.hu.xml",
- L"ALanguage.id.xml",
- L"ALanguage.it.xml",
- L"ALanguage.ja.xml",
- L"ALanguage.ka.xml",
- L"ALanguage.ko.xml",
- L"ALanguage.lv.xml",
- L"ALanguage.my.xml",
- L"ALanguage.nl.xml",
- L"ALanguage.nn.xml",
- L"ALanguage.pl.xml",
- L"ALanguage.pt-br.xml",
- L"ALanguage.ru.xml",
- L"ALanguage.sk.xml",
- L"ALanguage.sl.xml",
- L"ALanguage.sv.xml",
- L"ALanguage.tr.xml",
- L"ALanguage.uk.xml",
- L"ALanguage.uz.xml",
- L"ALanguage.vi.xml",
- L"ALanguage.zh-cn.xml",
- L"ALanguage.zh-hk.xml",
- L"ALanguage.zh-tw.xml",
+ L"XLanguages.zip",
L"Xdocs.zip",
};
@@ -91,43 +55,7 @@ static wchar_t *szCompressedFiles[]=
L"VeraCrypt Format-x64.exe",
L"veracrypt.sys",
L"veracrypt-x64.sys",
- L"Language.ar.xml",
- L"Language.be.xml",
- L"Language.bg.xml",
- L"Language.ca.xml",
- L"Language.cs.xml",
- L"Language.da.xml",
- L"Language.de.xml",
- L"Language.el.xml",
- L"Language.es.xml",
- L"Language.et.xml",
- L"Language.eu.xml",
- L"Language.fa.xml",
- L"Language.fi.xml",
- L"Language.fr.xml",
- L"Language.hu.xml",
- L"Language.id.xml",
- L"Language.it.xml",
- L"Language.ja.xml",
- L"Language.ka.xml",
- L"Language.ko.xml",
- L"Language.lv.xml",
- L"Language.my.xml",
- L"Language.nl.xml",
- L"Language.nn.xml",
- L"Language.pl.xml",
- L"Language.pt-br.xml",
- L"Language.ru.xml",
- L"Language.sk.xml",
- L"Language.sl.xml",
- L"Language.sv.xml",
- L"Language.tr.xml",
- L"Language.uk.xml",
- L"Language.uz.xml",
- L"Language.vi.xml",
- L"Language.zh-cn.xml",
- L"Language.zh-hk.xml",
- L"Language.zh-tw.xml",
+ L"Languages.zip",
L"docs.zip"
};