diff options
| author | dnobori <da.git@softether.co.jp> | 2015-03-26 12:01:02 +0300 |
|---|---|---|
| committer | dnobori <da.git@softether.co.jp> | 2015-03-26 12:01:02 +0300 |
| commit | 1f645c981601767d6170c11b4241401fca3815b5 (patch) | |
| tree | c5c9e53bc6b362bb382cba65852bef3737032bb1 /src/Cedar | |
| parent | 64fd19e6f849247e3daee765ad278c6bf072afcb (diff) | |
v4.15-9537-beta
Diffstat (limited to 'src/Cedar')
| -rw-r--r-- | src/Cedar/Cedar.h | 16 | ||||
| -rw-r--r-- | src/Cedar/SW.c | 18 |
2 files changed, 26 insertions, 8 deletions
diff --git a/src/Cedar/Cedar.h b/src/Cedar/Cedar.h index 2966f16f..db8f30a9 100644 --- a/src/Cedar/Cedar.h +++ b/src/Cedar/Cedar.h @@ -135,10 +135,10 @@ // Version number
-#define CEDAR_VER 414
+#define CEDAR_VER 415
// Build Number
-#define CEDAR_BUILD 9529
+#define CEDAR_BUILD 9537
// Beta number
//#define BETA_NUMBER 3
@@ -153,16 +153,16 @@ // Specify the location to build
#ifndef BUILD_PLACE
-#define BUILD_PLACE "pc30"
+#define BUILD_PLACE "pc26"
#endif // BUILD_PLACE
// Specifies the build date
#define BUILD_DATE_Y 2015
-#define BUILD_DATE_M 2
-#define BUILD_DATE_D 2
-#define BUILD_DATE_HO 17
-#define BUILD_DATE_MI 33
-#define BUILD_DATE_SE 33
+#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
// Tolerable time difference
#define ALLOW_TIMESTAMP_DIFF (UINT64)(3 * 24 * 60 * 60 * 1000)
diff --git a/src/Cedar/SW.c b/src/Cedar/SW.c index 260a5342..ac93c872 100644 --- a/src/Cedar/SW.c +++ b/src/Cedar/SW.c @@ -4569,6 +4569,24 @@ UINT SwReady(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam, WIZARD *wizard, break;
case WM_WIZ_NEXT:
+ if (IsUseAlternativeHostname())
+ {
+ wchar_t src_dll1[MAX_PATH];
+ wchar_t src_dll2[MAX_PATH];
+ wchar_t *exe_dir = MsGetExeFileDirW();
+
+ CombinePathW(src_dll1, sizeof(src_dll1), exe_dir, VG_DLL_X86);
+ CombinePathW(src_dll2, sizeof(src_dll2), exe_dir, VG_DLL_X64);
+
+ if (IsFileExistsW(src_dll1) || IsFileExistsW(src_dll2))
+ {
+ if (MsgBoxEx(hWnd, MB_ICONQUESTION | MB_YESNO | MB_DEFBUTTON2,
+ _UU("SW_VG_CONFIRM_MSG")) == IDNO)
+ {
+ break;
+ }
+ }
+ }
return D_SW_PERFORM;
case WM_WIZ_BACK:
|