diff options
Diffstat (limited to 'src/Cedar/SM.c')
| -rw-r--r-- | src/Cedar/SM.c | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/src/Cedar/SM.c b/src/Cedar/SM.c index dc954042..a45213b4 100644 --- a/src/Cedar/SM.c +++ b/src/Cedar/SM.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2015 Daiyuu Nobori.
-// Copyright (c) 2012-2015 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2015 SoftEther Corporation.
+// Copyright (c) 2012-2016 Daiyuu Nobori.
+// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) 2012-2016 SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -16557,6 +16557,11 @@ void SmSaveKeyPairDlgInit(HWND hWnd, SM_SAVE_KEY_PAIR *s) Check(hWnd, R_X509_AND_KEY, true);
}
+ if (MsIsWine())
+ {
+ Disable(hWnd, R_SECURE);
+ }
+
SmSaveKeyPairDlgUpdate(hWnd, s);
}
@@ -19350,8 +19355,13 @@ ENTER_PASSWORD: Enable(hWnd, IDOK);
Enable(hWnd, B_ABOUT);
Enable(hWnd, IDCANCEL);
- Enable(hWnd, B_SECURE_MANAGER);
- Enable(hWnd, B_SELECT_SECURE);
+
+ if (MsIsWine() == false)
+ {
+ Enable(hWnd, B_SECURE_MANAGER);
+ Enable(hWnd, B_SELECT_SECURE);
+ }
+
Enable(hWnd, B_CERT_TOOL);
}
@@ -20150,6 +20160,12 @@ void SmMainDlgInit(HWND hWnd) DlgFont(hWnd, IDOK, 10, true);
+ if (MsIsWine())
+ {
+ Disable(hWnd, B_SECURE_MANAGER);
+ Disable(hWnd, B_SELECT_SECURE);
+ }
+
Focus(hWnd, L_SETTING);
SmMainDlgUpdate(hWnd);
@@ -20479,6 +20495,8 @@ void SmMainDlg() // Server Manager main process
void MainSM()
{
+// MsgBoxEx(NULL, 0, L"MsIsWine: %u\n", MsIsWine());
+
if (sm->TempSetting == NULL)
{
// Open the main window
|