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

Windows: Correctly open online help when selected in menu. Remove unused parameters to function AppLink.

Browse Source
This commit is contained in:
Mounir IDRASSI
2017-06-05 01:31:27 +02:00
parent bf13f88ffa
commit 0ef137c0a4
8 changed files with 50 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/Common/Dlgcode.c
View File

@@ -1268,7 +1268,7 @@ BOOL CALLBACK AboutDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam
if (lw == IDC_HOMEPAGE) if (lw == IDC_HOMEPAGE)
{ {
Applink ("main", TRUE, ""); Applink ("main");
return 1; return 1;
} }
@@ -2546,7 +2546,7 @@ void DoPostInstallTasks (HWND hwndDlg)
if (FileExists (GetConfigPath (TC_APPD_FILENAME_POST_INSTALL_TASK_TUTORIAL))) if (FileExists (GetConfigPath (TC_APPD_FILENAME_POST_INSTALL_TASK_TUTORIAL)))
{ {
if (AskYesNo ("AFTER_INSTALL_TUTORIAL", hwndDlg) == IDYES) if (AskYesNo ("AFTER_INSTALL_TUTORIAL", hwndDlg) == IDYES)
Applink ("beginnerstutorial", TRUE, ""); Applink ("beginnerstutorial");
bDone = TRUE; bDone = TRUE;
} }
@@ -2554,7 +2554,7 @@ void DoPostInstallTasks (HWND hwndDlg)
if (FileExists (GetConfigPath (TC_APPD_FILENAME_POST_INSTALL_TASK_RELEASE_NOTES))) if (FileExists (GetConfigPath (TC_APPD_FILENAME_POST_INSTALL_TASK_RELEASE_NOTES)))
{ {
if (AskYesNo ("AFTER_UPGRADE_RELEASE_NOTES", hwndDlg) == IDYES) if (AskYesNo ("AFTER_UPGRADE_RELEASE_NOTES", hwndDlg) == IDYES)
Applink ("releasenotes", TRUE, ""); Applink ("releasenotes");
bDone = TRUE; bDone = TRUE;
} }
@@ -5729,12 +5729,12 @@ BOOL CALLBACK BenchmarkDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
case IDC_HW_AES_LABEL_LINK: case IDC_HW_AES_LABEL_LINK:
Applink ("hwacceleration", TRUE, ""); Applink ("hwacceleration");
return 1; return 1;
case IDC_PARALLELIZATION_LABEL_LINK: case IDC_PARALLELIZATION_LABEL_LINK:
Applink ("parallelization", TRUE, ""); Applink ("parallelization");
return 1; return 1;
case IDCLOSE: case IDCLOSE:
@@ -10038,7 +10038,8 @@ void OpenPageHelp (HWND hwndDlg, int nPage)
if (r == ERROR_FILE_NOT_FOUND) if (r == ERROR_FILE_NOT_FOUND)
{ {
OpenOnlineHelp (); // Open local HTML help. It will fallback to online help if not found.
Applink ("help");
return; return;
} }
} }
@@ -10053,7 +10054,7 @@ void OpenPageHelp (HWND hwndDlg, int nPage)
void OpenOnlineHelp () void OpenOnlineHelp ()
{ {
Applink ("help", TRUE, ""); Applink ("onlinehelp");
} }
@@ -10395,7 +10396,7 @@ std::wstring GetWindowsEdition ()
extern wchar_t InstallationPath[TC_MAX_PATH]; extern wchar_t InstallationPath[TC_MAX_PATH];
#endif #endif
void Applink (char *dest, BOOL bSendOS, char *extraOutput) void Applink (const char *dest)
{ {
wchar_t url [MAX_URL_LENGTH] = {0}; wchar_t url [MAX_URL_LENGTH] = {0};
wchar_t page[TC_MAX_PATH] = {0}; wchar_t page[TC_MAX_PATH] = {0};
@@ -10444,6 +10445,11 @@ void Applink (char *dest, BOOL bSendOS, char *extraOutput)
{ {
StringCbCopyW (page, sizeof (page),L"Documentation.html"); StringCbCopyW (page, sizeof (page),L"Documentation.html");
} }
else if (strcmp(dest, "onlinehelp") == 0)
{
StringCbCopyW (url, sizeof (url),L"https://www.veracrypt.fr/en/Documentation.html");
buildUrl = FALSE;
}
else if (strcmp(dest, "keyfiles") == 0) else if (strcmp(dest, "keyfiles") == 0)
{ {
StringCbCopyW (page, sizeof (page),L"Keyfiles.html"); StringCbCopyW (page, sizeof (page),L"Keyfiles.html");

2
src/Common/Dlgcode.h
View File

@@ -450,7 +450,7 @@ BOOL IsServerOS ();
BOOL IsHiddenOSRunning (void); BOOL IsHiddenOSRunning (void);
BOOL EnableWow64FsRedirection (BOOL enable); BOOL EnableWow64FsRedirection (BOOL enable);
BOOL RestartComputer (BOOL bShutdown); BOOL RestartComputer (BOOL bShutdown);
void Applink (char *dest, BOOL bSendOS, char *extraOutput); void Applink (const char *dest);
wchar_t *RelativePath2Absolute (wchar_t *szFileName); wchar_t *RelativePath2Absolute (wchar_t *szFileName);
void HandleDriveNotReadyError (HWND hwnd); void HandleDriveNotReadyError (HWND hwnd);
BOOL CALLBACK CloseTCWindowsEnum( HWND hwnd, LPARAM lParam); BOOL CALLBACK CloseTCWindowsEnum( HWND hwnd, LPARAM lParam);

2
src/Common/Keyfiles.c
View File

@@ -617,7 +617,7 @@ BOOL CALLBACK KeyFilesDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa
if (lw == IDC_LINK_KEYFILES_INFO) if (lw == IDC_LINK_KEYFILES_INFO)
{ {
Applink ("keyfiles", TRUE, ""); Applink ("keyfiles");
return 1; return 1;
} }

2
src/Common/Language.c
View File

@@ -539,7 +539,7 @@ BOOL CALLBACK LanguageDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa
else else
tmpstr[0] = 0; tmpstr[0] = 0;
Applink ("localizations", TRUE, tmpstr); Applink ("localizations");
return 1; return 1;
} }

32
src/Format/Tcformat.c
View File

@@ -5231,11 +5231,11 @@ BOOL CALLBACK PageDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
return 1; return 1;
case IDC_MORE_INFO_ON_CONTAINERS: case IDC_MORE_INFO_ON_CONTAINERS:
Applink ("introcontainer", TRUE, ""); Applink ("introcontainer");
return 1; return 1;
case IDC_MORE_INFO_ON_SYS_ENCRYPTION: case IDC_MORE_INFO_ON_SYS_ENCRYPTION:
Applink ("introsysenc", TRUE, ""); Applink ("introsysenc");
return 1; return 1;
} }
} }
@@ -5257,14 +5257,14 @@ BOOL CALLBACK PageDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
return 1; return 1;
case IDC_HIDDEN_SYSENC_INFO_LINK: case IDC_HIDDEN_SYSENC_INFO_LINK:
Applink ("hiddensysenc", TRUE, ""); Applink ("hiddensysenc");
return 1; return 1;
} }
} }
if (nCurPageNo == SYSENC_HIDDEN_OS_REQ_CHECK_PAGE && lw == IDC_HIDDEN_SYSENC_INFO_LINK) if (nCurPageNo == SYSENC_HIDDEN_OS_REQ_CHECK_PAGE && lw == IDC_HIDDEN_SYSENC_INFO_LINK)
{ {
Applink ("hiddensysenc", TRUE, ""); Applink ("hiddensysenc");
return 1; return 1;
} }
@@ -5387,7 +5387,7 @@ BOOL CALLBACK PageDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
break; break;
case IDC_MORE_INFO_SYS_ENCRYPTION: case IDC_MORE_INFO_SYS_ENCRYPTION:
Applink ("sysencprogressinfo", TRUE, ""); Applink ("sysencprogressinfo");
return 1; return 1;
} }
} }
@@ -5478,7 +5478,7 @@ BOOL CALLBACK PageDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
if (lw == IDC_HIDDEN_VOL_HELP && nCurPageNo == VOLUME_TYPE_PAGE) if (lw == IDC_HIDDEN_VOL_HELP && nCurPageNo == VOLUME_TYPE_PAGE)
{ {
Applink ("hiddenvolume", TRUE, ""); Applink ("hiddenvolume");
return 1; return 1;
} }
@@ -5530,32 +5530,32 @@ BOOL CALLBACK PageDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
EAGetName (name, nIndex, 0); EAGetName (name, nIndex, 0);
if (wcscmp (name, L"AES") == 0) if (wcscmp (name, L"AES") == 0)
Applink ("aes", FALSE, ""); Applink ("aes");
else if (wcscmp (name, L"Serpent") == 0) else if (wcscmp (name, L"Serpent") == 0)
Applink ("serpent", FALSE, ""); Applink ("serpent");
else if (wcscmp (name, L"Twofish") == 0) else if (wcscmp (name, L"Twofish") == 0)
Applink ("twofish", FALSE, ""); Applink ("twofish");
else if (wcscmp (name, L"GOST89") == 0) else if (wcscmp (name, L"GOST89") == 0)
Applink ("gost89", FALSE, ""); Applink ("gost89");
else if (wcscmp (name, L"Kuznyechik") == 0) else if (wcscmp (name, L"Kuznyechik") == 0)
Applink ("kuznyechik", FALSE, ""); Applink ("kuznyechik");
else if (wcscmp (name, L"Camellia") == 0) else if (wcscmp (name, L"Camellia") == 0)
Applink ("camellia", FALSE, ""); Applink ("camellia");
else if (EAGetCipherCount (nIndex) > 1) else if (EAGetCipherCount (nIndex) > 1)
Applink ("cascades", TRUE, ""); Applink ("cascades");
return 1; return 1;
} }
if (lw == IDC_LINK_HASH_INFO && nCurPageNo == CIPHER_PAGE) if (lw == IDC_LINK_HASH_INFO && nCurPageNo == CIPHER_PAGE)
{ {
Applink ("hashalgorithms", TRUE, ""); Applink ("hashalgorithms");
return 1; return 1;
} }
if (lw == IDC_LINK_PIM_INFO && nCurPageNo == PIM_PAGE) if (lw == IDC_LINK_PIM_INFO && nCurPageNo == PIM_PAGE)
{ {
Applink ("pim", TRUE, ""); Applink ("pim");
return 1; return 1;
} }
@@ -5959,7 +5959,7 @@ BOOL CALLBACK PageDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
if (IsWindowsIsoBurnerAvailable()) if (IsWindowsIsoBurnerAvailable())
LaunchWindowsIsoBurner (hwndDlg, szRescueDiskISO); LaunchWindowsIsoBurner (hwndDlg, szRescueDiskISO);
else else
Applink ("isoburning", TRUE, ""); Applink ("isoburning");
return 1; return 1;
} }

2
src/Mount/Favorites.cpp
View File

@@ -382,7 +382,7 @@ namespace VeraCrypt
return 1; return 1;
case IDC_FAVORITES_HELP_LINK: case IDC_FAVORITES_HELP_LINK:
Applink (SystemFavoritesMode ? "sysfavorites" : "favorites", TRUE, ""); Applink (SystemFavoritesMode ? "sysfavorites" : "favorites");
return 1; return 1;
case IDC_SHOW_PIM: case IDC_SHOW_PIM:
HandleShowPasswordFieldAction (hwndDlg, IDC_SHOW_PIM, IDC_PIM, 0); HandleShowPasswordFieldAction (hwndDlg, IDC_SHOW_PIM, IDC_PIM, 0);

26
src/Mount/Mount.c
View File

@@ -3491,7 +3491,7 @@ BOOL CALLBACK MountOptionsDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
if (lw == IDC_LINK_HIDVOL_PROTECTION_INFO) if (lw == IDC_LINK_HIDVOL_PROTECTION_INFO)
{ {
Applink ("hiddenvolprotection", TRUE, ""); Applink ("hiddenvolprotection");
} }
if (lw == IDCANCEL) if (lw == IDCANCEL)
@@ -7271,7 +7271,7 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
} }
else if (sel == IDM_HOMEPAGE_SYSTRAY) else if (sel == IDM_HOMEPAGE_SYSTRAY)
{ {
Applink ("home", TRUE, ""); Applink ("home");
} }
else if (sel == IDCANCEL) else if (sel == IDCANCEL)
{ {
@@ -7898,7 +7898,7 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
if (lw == IDM_DONATE) if (lw == IDM_DONATE)
{ {
Applink ("donate", TRUE, ""); Applink ("donate");
return 1; return 1;
} }
@@ -7910,17 +7910,17 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
if (lw == IDM_WEBSITE) if (lw == IDM_WEBSITE)
{ {
Applink ("website", TRUE, ""); Applink ("website");
return 1; return 1;
} }
else if (lw == IDM_HOMEPAGE) else if (lw == IDM_HOMEPAGE)
{ {
Applink ("homepage", TRUE, ""); Applink ("homepage");
return 1; return 1;
} }
else if (lw == IDM_ONLINE_TUTORIAL) else if (lw == IDM_ONLINE_TUTORIAL)
{ {
Applink ("tutorial", TRUE, ""); Applink ("tutorial");
return 1; return 1;
} }
else if (lw == IDM_ONLINE_HELP) else if (lw == IDM_ONLINE_HELP)
@@ -7930,27 +7930,27 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
} }
else if (lw == IDM_FAQ) else if (lw == IDM_FAQ)
{ {
Applink ("faq", TRUE, ""); Applink ("faq");
return 1; return 1;
} }
else if (lw == IDM_TC_DOWNLOADS) else if (lw == IDM_TC_DOWNLOADS)
{ {
Applink ("downloads", TRUE, ""); Applink ("downloads");
return 1; return 1;
} }
else if (lw == IDM_NEWS) else if (lw == IDM_NEWS)
{ {
Applink ("news", TRUE, ""); Applink ("news");
return 1; return 1;
} }
else if (lw == IDM_VERSION_HISTORY) else if (lw == IDM_VERSION_HISTORY)
{ {
Applink ("history", TRUE, ""); Applink ("history");
return 1; return 1;
} }
else if (lw == IDM_CONTACT) else if (lw == IDM_CONTACT)
{ {
Applink ("contact", FALSE, ""); Applink ("contact");
return 1; return 1;
} }
@@ -10652,11 +10652,11 @@ static BOOL CALLBACK PerformanceSettingsDlgProc (HWND hwndDlg, UINT msg, WPARAM
return 1; return 1;
case IDC_MORE_INFO_ON_HW_ACCELERATION: case IDC_MORE_INFO_ON_HW_ACCELERATION:
Applink ("hwacceleration", TRUE, ""); Applink ("hwacceleration");
return 1; return 1;
case IDC_MORE_INFO_ON_THREAD_BASED_PARALLELIZATION: case IDC_MORE_INFO_ON_THREAD_BASED_PARALLELIZATION:
Applink ("parallelization", TRUE, ""); Applink ("parallelization");
return 1; return 1;
} }

10
src/Setup/Wizard.c
View File

@@ -682,11 +682,7 @@ BOOL CALLBACK PageDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
{ {
case IDC_DONATE: case IDC_DONATE:
{ {
char tmpstr [200]; Applink ("donate");
StringCbPrintfA (tmpstr, sizeof(tmpstr), "&ref=%d", DonColorSchemeId);
Applink ("donate", FALSE, tmpstr);
} }
return 1; return 1;
} }
@@ -1160,7 +1156,7 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
if (bPromptReleaseNotes if (bPromptReleaseNotes
&& AskYesNo ("AFTER_UPGRADE_RELEASE_NOTES", hwndDlg) == IDYES) && AskYesNo ("AFTER_UPGRADE_RELEASE_NOTES", hwndDlg) == IDYES)
{ {
Applink ("releasenotes", TRUE, ""); Applink ("releasenotes");
} }
bPromptReleaseNotes = FALSE; bPromptReleaseNotes = FALSE;
@@ -1168,7 +1164,7 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
if (bPromptTutorial if (bPromptTutorial
&& AskYesNo ("AFTER_INSTALL_TUTORIAL", hwndDlg) == IDYES) && AskYesNo ("AFTER_INSTALL_TUTORIAL", hwndDlg) == IDYES)
{ {
Applink ("beginnerstutorial", TRUE, ""); Applink ("beginnerstutorial");
} }
bPromptTutorial = FALSE; bPromptTutorial = FALSE;