mirror of
https://github.com/SoftEtherVPN/SoftEtherVPN.git
synced 2025-07-07 00:04:57 +03:00
v4.15-9538-beta
This commit is contained in:
@ -138,7 +138,7 @@
|
||||
#define CEDAR_VER 415
|
||||
|
||||
// Build Number
|
||||
#define CEDAR_BUILD 9537
|
||||
#define CEDAR_BUILD 9538
|
||||
|
||||
// Beta number
|
||||
//#define BETA_NUMBER 3
|
||||
@ -153,16 +153,16 @@
|
||||
|
||||
// Specify the location to build
|
||||
#ifndef BUILD_PLACE
|
||||
#define BUILD_PLACE "pc26"
|
||||
#define BUILD_PLACE "pc25"
|
||||
#endif // BUILD_PLACE
|
||||
|
||||
// Specifies the build date
|
||||
#define BUILD_DATE_Y 2015
|
||||
#define BUILD_DATE_M 3
|
||||
#define BUILD_DATE_D 26
|
||||
#define BUILD_DATE_HO 16
|
||||
#define BUILD_DATE_MI 48
|
||||
#define BUILD_DATE_SE 15
|
||||
#define BUILD_DATE_D 27
|
||||
#define BUILD_DATE_HO 19
|
||||
#define BUILD_DATE_MI 32
|
||||
#define BUILD_DATE_SE 50
|
||||
|
||||
// Tolerable time difference
|
||||
#define ALLOW_TIMESTAMP_DIFF (UINT64)(3 * 24 * 60 * 60 * 1000)
|
||||
|
@ -1004,6 +1004,12 @@ void ShowWizard(HWND hWndParent, WIZARD *w, UINT start_id)
|
||||
w->IsAreoStyle = false;
|
||||
}
|
||||
|
||||
if (MsIsWindows10())
|
||||
{
|
||||
// Windows 10 Icon Bug: Disable Aero Style!
|
||||
w->IsAreoStyle = false;
|
||||
}
|
||||
|
||||
if (w->IsAreoStyle)
|
||||
{
|
||||
// Aero Wizard
|
||||
@ -2960,12 +2966,14 @@ void AdjustWindowAndControlSize(HWND hWnd, bool *need_resize, double *factor_x,
|
||||
*need_resize = false;
|
||||
*factor_x = 1.0;
|
||||
*factor_y = 1.0;
|
||||
//Debug("// There is no need to adjust\n");
|
||||
return;
|
||||
}
|
||||
|
||||
// Calculate the adjustment amount
|
||||
*factor_x = (double)dlgfont_x / (double)WINUI_DEFAULT_DIALOG_UNIT_X;
|
||||
*factor_y = (double)dlgfont_y / (double)WINUI_DEFAULT_DIALOG_UNIT_Y;
|
||||
//Debug("Factors: %f %f\n", *factor_x, *factor_y);
|
||||
|
||||
if (MsIsVista())
|
||||
{
|
||||
@ -10042,6 +10050,15 @@ UINT DlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam, bool white_color
|
||||
switch (msg)
|
||||
{
|
||||
case WM_INITDIALOG:
|
||||
if (true)
|
||||
{
|
||||
RECT rect1;
|
||||
|
||||
SetRect(&rect1, 0, 0, 100, 100);
|
||||
MapDialogRect(hWnd, &rect1);
|
||||
Debug("%u %u %u %u\n", rect1.left, rect1.right, rect1.top, rect1.bottom);
|
||||
}
|
||||
|
||||
param = (void *)lParam;
|
||||
SetParam(hWnd, param);
|
||||
|
||||
|
@ -120,7 +120,7 @@
|
||||
#define WINUI_PASSWORD_NULL_USERNAME "NULL"
|
||||
|
||||
#define WINUI_DEFAULT_DIALOG_UNIT_X 7
|
||||
#define WINUI_DEFAULT_DIALOG_UNIT_Y 12
|
||||
#define WINUI_DEFAULT_DIALOG_UNIT_Y 14
|
||||
|
||||
// Make available the types for Windows even if windows.h is not included
|
||||
#ifndef _WINDEF_
|
||||
|
Reference in New Issue
Block a user