1
0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2024-11-26 19:39:53 +03:00

Add the warning message if KB3033929 is not installed in Windows 7 / Server 2008 R2.

This commit is contained in:
Daiyuu Nobori 2019-06-30 01:20:52 +09:00
parent 2da6e4c491
commit 9c227f3480
9 changed files with 75 additions and 0 deletions

View File

@ -5640,6 +5640,15 @@ UINT SwWelcomeDlg(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam, WIZARD *wiz
break; break;
} }
if (MsIsKB3033929RequiredAndMissing())
{
// KB3033929 is missing
if (MsgBoxEx(hWnd, MB_ICONINFORMATION | MB_OKCANCEL, _UU("SW_KB3033929_REQUIRED")) == IDCANCEL)
{
break;
}
}
if (sw->DoubleClickBlocker) if (sw->DoubleClickBlocker)
{ {
break; break;

View File

@ -1717,6 +1717,59 @@ HANDLE MsCreateUserToken()
return hNewToken; return hNewToken;
} }
// Check whether SHA-2 kernel mode signature is supported
bool MsIsSha2KernelModeSignatureSupported()
{
HINSTANCE hDll;
bool ret = false;
if (MsIsWindows8())
{
return true;
}
hDll = LoadLibrary("Wintrust.dll");
if (hDll == NULL)
{
return false;
}
if (GetProcAddress(hDll, "CryptCATAdminAcquireContext2") != NULL)
{
ret = true;
}
FreeLibrary(hDll);
return ret;
}
// Check whether KB3033929 is required
bool MsIsKB3033929RequiredAndMissing()
{
OS_INFO *info = GetOsInfo();
if (info == NULL)
{
return false;
}
if (OS_IS_WINDOWS_NT(info->OsType))
{
if (GET_KETA(info->OsType, 100) == 6)
{
if (MsIsX64())
{
if (MsIsSha2KernelModeSignatureSupported() == false)
{
return true;
}
}
}
}
return false;
}
// Check the digital signature of the file // Check the digital signature of the file
bool MsCheckFileDigitalSignatureW(HWND hWnd, wchar_t *name, bool *danger) bool MsCheckFileDigitalSignatureW(HWND hWnd, wchar_t *name, bool *danger)

View File

@ -847,6 +847,8 @@ bool MsIsInfCatalogRequired();
bool MsCheckFileDigitalSignatureW(HWND hWnd, wchar_t *name, bool *danger); bool MsCheckFileDigitalSignatureW(HWND hWnd, wchar_t *name, bool *danger);
bool MsIsKB3033929RequiredAndMissing();
bool MsIsSha2KernelModeSignatureSupported();
bool MsGetProcessExeName(char *path, UINT size, UINT id); bool MsGetProcessExeName(char *path, UINT size, UINT id);
bool MsGetWindowOwnerProcessExeName(char *path, UINT size, HWND hWnd); bool MsGetWindowOwnerProcessExeName(char *path, UINT size, HWND hWnd);

View File

@ -7163,6 +7163,8 @@ SW_WEB2_TITLE 指定文件夹
SW_UNINSTALLINFO_URL http://selinks.org/ SW_UNINSTALLINFO_URL http://selinks.org/
SW_UNINSTALLINFO_PUBLISHER SoftEther VPN Project SW_UNINSTALLINFO_PUBLISHER SoftEther VPN Project
SW_KB3033929_REQUIRED In Windows 7 and Windows Server 2008 R2, some SoftEther VPN functions require the Microsoft's Windows Update module KB3033929 installed.\r\n\r\nIf KB3033929 is not installed in your Windows, please install it from Windows Update or Microsoft website before installing SoftEther VPN.
SW_COMPONENTS_ABOUT_TAG 关于 %s SW_COMPONENTS_ABOUT_TAG 关于 %s
SW_COMPONENTS_REQUIRE_ADMIN 安装需要管理员权限 SW_COMPONENTS_REQUIRE_ADMIN 安装需要管理员权限

View File

@ -7156,6 +7156,8 @@ SW_WEB2_TITLE Specify Files
SW_UNINSTALLINFO_URL http://selinks.org/ SW_UNINSTALLINFO_URL http://selinks.org/
SW_UNINSTALLINFO_PUBLISHER SoftEther VPN Project SW_UNINSTALLINFO_PUBLISHER SoftEther VPN Project
SW_KB3033929_REQUIRED In Windows 7 and Windows Server 2008 R2, some SoftEther VPN functions require the Microsoft's Windows Update module KB3033929 installed.\r\n\r\nIf KB3033929 is not installed in your Windows, please install it from Windows Update or Microsoft website before installing SoftEther VPN.
SW_COMPONENTS_ABOUT_TAG About %s SW_COMPONENTS_ABOUT_TAG About %s
SW_COMPONENTS_REQUIRE_ADMIN Installation Requires Administrators Privileges SW_COMPONENTS_REQUIRE_ADMIN Installation Requires Administrators Privileges

View File

@ -7158,6 +7158,8 @@ SW_WEB2_TITLE ファイルの指定
SW_UNINSTALLINFO_URL http://selinks.org/ SW_UNINSTALLINFO_URL http://selinks.org/
SW_UNINSTALLINFO_PUBLISHER SoftEther VPN Project SW_UNINSTALLINFO_PUBLISHER SoftEther VPN Project
SW_KB3033929_REQUIRED Windows 7 および Windows Server 2008 R2 では、SoftEther VPN の一部の機能を利用するためには、Microsoft 社の Windows Update プログラム KB3033929 がインストールされている必要があります。\r\n\r\nKB3033929 がインストールされていない場合は、SoftEther VPN をインストールする前に、Windows Update または Microsoft 社の Web サイトから KB3033929 をインストールをしてください。
SW_COMPONENTS_ABOUT_TAG 「%s」とは SW_COMPONENTS_ABOUT_TAG 「%s」とは
SW_COMPONENTS_REQUIRE_ADMIN インストールには管理者権限が必要です SW_COMPONENTS_REQUIRE_ADMIN インストールには管理者権限が必要です

View File

@ -7134,6 +7134,8 @@ SW_WEB2_TITLE 파일 지정
SW_UNINSTALLINFO_URL http://selinks.org/ SW_UNINSTALLINFO_URL http://selinks.org/
SW_UNINSTALLINFO_PUBLISHER SoftEther VPN Project SW_UNINSTALLINFO_PUBLISHER SoftEther VPN Project
SW_KB3033929_REQUIRED In Windows 7 and Windows Server 2008 R2, some SoftEther VPN functions require the Microsoft's Windows Update module KB3033929 installed.\r\n\r\nIf KB3033929 is not installed in your Windows, please install it from Windows Update or Microsoft website before installing SoftEther VPN.
SW_COMPONENTS_ABOUT_TAG '%s'는 SW_COMPONENTS_ABOUT_TAG '%s'는
SW_COMPONENTS_REQUIRE_ADMIN 설치하려면 관리자 권한이 있어야합니다 SW_COMPONENTS_REQUIRE_ADMIN 설치하려면 관리자 권한이 있어야합니다

View File

@ -7127,6 +7127,8 @@ SW_WEB2_TITLE Specify Files
SW_UNINSTALLINFO_URL http://selinks.org/ SW_UNINSTALLINFO_URL http://selinks.org/
SW_UNINSTALLINFO_PUBLISHER SoftEther VPN Project SW_UNINSTALLINFO_PUBLISHER SoftEther VPN Project
SW_KB3033929_REQUIRED In Windows 7 and Windows Server 2008 R2, some SoftEther VPN functions require the Microsoft's Windows Update module KB3033929 installed.\r\n\r\nIf KB3033929 is not installed in your Windows, please install it from Windows Update or Microsoft website before installing SoftEther VPN.
SW_COMPONENTS_ABOUT_TAG About %s SW_COMPONENTS_ABOUT_TAG About %s
SW_COMPONENTS_REQUIRE_ADMIN Installation Requires Administrators Privileges SW_COMPONENTS_REQUIRE_ADMIN Installation Requires Administrators Privileges

View File

@ -7165,6 +7165,7 @@ SW_WEB2_TITLE 指定資料夾
SW_UNINSTALLINFO_URL http://selinks.org/ SW_UNINSTALLINFO_URL http://selinks.org/
SW_UNINSTALLINFO_PUBLISHER SoftEther VPN Project SW_UNINSTALLINFO_PUBLISHER SoftEther VPN Project
SW_KB3033929_REQUIRED In Windows 7 and Windows Server 2008 R2, some SoftEther VPN functions require the Microsoft's Windows Update module KB3033929 installed.\r\n\r\nIf KB3033929 is not installed in your Windows, please install it from Windows Update or Microsoft website before installing SoftEther VPN.
SW_COMPONENTS_ABOUT_TAG 關於 %s SW_COMPONENTS_ABOUT_TAG 關於 %s
SW_COMPONENTS_REQUIRE_ADMIN 安裝需要管理員許可權 SW_COMPONENTS_REQUIRE_ADMIN 安裝需要管理員許可權