nihilist/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt synced 2024-11-10 21:23:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Windows Setup: When clicking uninstall link, launch Windows Add/Remove program instead of uninstall directly in order to avoid being flagged as legacy application by the Windows Program Compatibility Assistant (see number 5 in Microsoft UI Design Standard https://msdn.microsoft.com/en-us/library/ms954377.aspx)

Browse Source
This commit is contained in:
Mounir IDRASSI 2015-03-17 15:39:50 +01:00
parent ae5867f8b1
commit f397f70fbe
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/Setup/Setup.c
View File

@ -415,7 +415,7 @@ BOOL SetPrivilege(LPTSTR szPrivilegeName, BOOL bEnable)
} }
HRESULT CreateLink (char *lpszPathObj, char *lpszArguments, HRESULT CreateLink (char *lpszPathObj, char *lpszArguments,
char *lpszPathLink) char *lpszPathLink, const char* iconFile, int iconIndex)
{ {
HRESULT hres; HRESULT hres;
IShellLink *psl; IShellLink *psl;
@ -431,6 +431,10 @@ HRESULT CreateLink (char *lpszPathObj, char *lpszArguments,
description. */ description. */
psl->SetPath (lpszPathObj); psl->SetPath (lpszPathObj);
psl->SetArguments (lpszArguments); psl->SetArguments (lpszArguments);
if (iconFile)
{
psl->SetIconLocation (iconFile, iconIndex);
}
// Application ID // Application ID
if (strstr (lpszPathObj, TC_APP_NAME ".exe")) if (strstr (lpszPathObj, TC_APP_NAME ".exe"))
@ -1573,14 +1577,14 @@ BOOL DoShortcutsInstall (HWND hwndDlg, char *szDestDir, BOOL bProgGroup, BOOL bD
StringCbPrintfA (szTmp2, sizeof(szTmp2), "%s%s", szLinkDir, "\\VeraCrypt.lnk"); StringCbPrintfA (szTmp2, sizeof(szTmp2), "%s%s", szLinkDir, "\\VeraCrypt.lnk");
IconMessage (hwndDlg, szTmp2); IconMessage (hwndDlg, szTmp2);
if (CreateLink (szTmp, "", szTmp2) != S_OK) if (CreateLink (szTmp, "", szTmp2, NULL, -1) != S_OK)
goto error; goto error;
StringCbPrintfA (szTmp, sizeof(szTmp), "%s%s", szDir, "VeraCryptExpander.exe"); StringCbPrintfA (szTmp, sizeof(szTmp), "%s%s", szDir, "VeraCryptExpander.exe");
StringCbPrintfA (szTmp2, sizeof(szTmp2), "%s%s", szLinkDir, "\\VeraCryptExpander.lnk"); StringCbPrintfA (szTmp2, sizeof(szTmp2), "%s%s", szLinkDir, "\\VeraCryptExpander.lnk");
IconMessage (hwndDlg, szTmp2); IconMessage (hwndDlg, szTmp2);
if (CreateLink (szTmp, "", szTmp2) != S_OK) if (CreateLink (szTmp, "", szTmp2, NULL, -1) != S_OK)
goto error; goto error;
StringCbPrintfA (szTmp2, sizeof(szTmp2), "%s%s", szLinkDir, "\\VeraCrypt Website.url"); StringCbPrintfA (szTmp2, sizeof(szTmp2), "%s%s", szLinkDir, "\\VeraCrypt Website.url");
@ -1598,10 +1602,15 @@ BOOL DoShortcutsInstall (HWND hwndDlg, char *szDestDir, BOOL bProgGroup, BOOL bD
StringCbPrintfA (szTmp, sizeof(szTmp), "%s%s", szDir, "VeraCrypt Setup.exe"); StringCbPrintfA (szTmp, sizeof(szTmp), "%s%s", szDir, "VeraCrypt Setup.exe");
StringCbPrintfA (szTmp2, sizeof(szTmp2), "%s%s", szLinkDir, "\\Uninstall VeraCrypt.lnk"); StringCbPrintfA (szTmp2, sizeof(szTmp2), "%s%s", szLinkDir, "\\Uninstall VeraCrypt.lnk");
StringCbCopyA (szTmp3, sizeof(szTmp3), "/u"); if (GetSystemDirectoryA (szTmp3, sizeof(szTmp3)))
{
StringCbCatA (szTmp3, sizeof(szTmp3), "\\control.exe");
}
else
StringCbCopyA(szTmp3, sizeof(szTmp3), "C:\\Windows\\System32\\control.exe");
IconMessage (hwndDlg, szTmp2); IconMessage (hwndDlg, szTmp2);
if (CreateLink (szTmp, szTmp3, szTmp2) != S_OK) if (CreateLink (szTmp3, "appwiz.cpl", szTmp2, szTmp, 0) != S_OK)
goto error; goto error;
StringCbPrintfA (szTmp2, sizeof(szTmp2), "%s%s", szLinkDir, "\\VeraCrypt User's Guide.lnk"); StringCbPrintfA (szTmp2, sizeof(szTmp2), "%s%s", szLinkDir, "\\VeraCrypt User's Guide.lnk");
@ -1630,7 +1639,7 @@ BOOL DoShortcutsInstall (HWND hwndDlg, char *szDestDir, BOOL bProgGroup, BOOL bD
IconMessage (hwndDlg, szTmp2); IconMessage (hwndDlg, szTmp2);
if (CreateLink (szTmp, "", szTmp2) != S_OK) if (CreateLink (szTmp, "", szTmp2, NULL, -1) != S_OK)
goto error; goto error;
} }