1
0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2025-07-15 20:25:00 +03:00

Merge pull request #1 from SoftEtherVPN/master

update to latest version
This commit is contained in:
Holoreimu
2017-12-02 01:30:07 +08:00
committed by GitHub
1449 changed files with 43231 additions and 7395 deletions

View File

@ -1,17 +1,17 @@
// SoftEther VPN Source Code
// SoftEther VPN Source Code - Developer Edition Master Branch
// Cedar Communication Module
//
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
// Copyright (c) 2012-2014 Daiyuu Nobori.
// Copyright (c) 2012-2014 SoftEther VPN Project, University of Tsukuba, Japan.
// Copyright (c) 2012-2014 SoftEther Corporation.
// Copyright (c) Daiyuu Nobori.
// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
// http://www.softether.org/
//
// Author: Daiyuu Nobori
// Author: Daiyuu Nobori, Ph.D.
// Comments: Tetsuo Sugiyama, Ph.D.
//
// This program is free software; you can redistribute it and/or
@ -464,7 +464,11 @@ WINUI_UPDATE *InitUpdateUi(wchar_t *title, char *name, char *family_name, UINT64
// Validate arguments
if (title == NULL || name == NULL || current_build == 0 || current_ver == 0)
{
return NULL;
return NULL;
}
if (MsIsWine())
{
return false;
}
if (IsEmptyStr(family_name))
{
@ -3160,9 +3164,57 @@ void InitDialogInternational(HWND hWnd, void *pparam)
if (hControl != NULL)
{
bool set_font = true;
HFONT hFont = GetDialogDefaultFontEx(param && ((DIALOG_PARAM *)param)->meiryo);
SetFont(hControl, 0, hFont);
if (MsIsWine())
{
char classname[MAX_PATH];
char parent_classname[MAX_PATH];
HWND hParent = GetParent(hControl);
Zero(classname, sizeof(classname));
Zero(parent_classname, sizeof(parent_classname));
GetClassNameA(hControl, classname, sizeof(classname));
if (hParent != NULL)
{
GetClassNameA(hParent, parent_classname, sizeof(parent_classname));
}
if (StrCmpi(classname, "edit") == 0)
{
set_font = false;
}
if (StrCmpi(classname, "combobox") == 0)
{
set_font = false;
}
if (StrCmpi(classname, "syslistview32") == 0)
{
set_font = false;
}
if (StrCmpi(classname, "sysheader32") == 0)
{
set_font = false;
}
if (StrCmpi(parent_classname, "SysIPAddress32") == 0 ||
StrCmpi(classname, "SysIPAddress32") == 0)
{
set_font = true;
hFont = GetFont("Tahoma", 8, false, false, false, false);
}
}
if (set_font)
{
SetFont(hControl, 0, hFont);
}
if (MsIsVista())
{
@ -3744,6 +3796,11 @@ void AboutDlgInit(HWND hWnd, WINUI_ABOUT *a)
SetFont(hWnd, S_INFO3, GetFont("Arial", 7, false, false, false, false));
if (MsIsWine())
{
Disable(hWnd, B_LANGUAGE);
}
//DlgFont(hWnd, S_INFO4, 8, false);
SetShow(hWnd, B_UPDATE_CONFIG, (a->Update != NULL));
@ -11441,7 +11498,3 @@ void FreeWinUi()
}
#endif // WIN32
// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
// Department of Computer Science has dozens of overly-enthusiastic geeks.
// Join us: http://www.tsukuba.ac.jp/english/admission/