From 328a9836e31f2a12d74576fff8d8abb45ca98941 Mon Sep 17 00:00:00 2001
From: "Internet Software Consortium, Inc" <@isc.org>
Date: Fri, 7 Sep 2007 14:15:27 -0600
Subject: 9.3.0beta3

---
 bin/win32/BINDInstall/BINDInstall.cpp    | 5 +++--
 bin/win32/BINDInstall/BINDInstallDlg.cpp | 8 +++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'bin/win32/BINDInstall')

diff --git a/bin/win32/BINDInstall/BINDInstall.cpp b/bin/win32/BINDInstall/BINDInstall.cpp
index eb591ca3..d8b8a78f 100644
--- a/bin/win32/BINDInstall/BINDInstall.cpp
+++ b/bin/win32/BINDInstall/BINDInstall.cpp
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: BINDInstall.cpp,v 1.3.206.1 2004/03/06 10:22:53 marka Exp $ */
+/* $Id: BINDInstall.cpp,v 1.3.206.2 2004/04/19 06:39:54 marka Exp $ */
 
 /*
  * Copyright (c) 1999-2000 by Nortel Networks Corporation
@@ -78,11 +78,12 @@ BOOL CBINDInstallApp::InitInstance()
 	// If you are not using these features and wish to reduce the size
 	//  of your final executable, you should remove from the following
 	//  the specific initialization routines you do not need.
-
+#if _MSC_VER < 1300
 #ifdef _AFXDLL
 	Enable3dControls();			// Call this when using MFC in a shared DLL
 #else
 	Enable3dControlsStatic();	// Call this when linking to MFC statically
+#endif
 #endif
 
 	CBINDInstallDlg dlg;
diff --git a/bin/win32/BINDInstall/BINDInstallDlg.cpp b/bin/win32/BINDInstall/BINDInstallDlg.cpp
index a46bccad..124b22d4 100644
--- a/bin/win32/BINDInstall/BINDInstallDlg.cpp
+++ b/bin/win32/BINDInstall/BINDInstallDlg.cpp
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: BINDInstallDlg.cpp,v 1.6.2.6.2.6 2004/03/11 05:58:40 marka Exp $ */
+/* $Id: BINDInstallDlg.cpp,v 1.6.2.6.2.7 2004/04/19 06:39:55 marka Exp $ */
 
 /*
  * Copyright (c) 1999-2000 by Nortel Networks Corporation
@@ -113,8 +113,10 @@ const FileData installFiles[] =
 	{"msvcrt.dll", FileData::WinSystem, FileData::Critical, TRUE},
 #  endif
 #endif
+#if _MSC_VER > 1200
 	{"mfc70.dll", FileData::WinSystem, FileData::Critical, TRUE},
 	{"msvcr70.dll", FileData::WinSystem, FileData::Critical, TRUE},
+#endif
 	{"bindevt.dll", FileData::WinSystem, FileData::Normal, FALSE},
 	{"libbind9.dll", FileData::WinSystem, FileData::Critical, FALSE},
 	{"libisc.dll", FileData::WinSystem, FileData::Critical, FALSE},
@@ -435,7 +437,7 @@ void CBINDInstallDlg::OnInstall() {
 		m_accountExists = TRUE;
 	}
 
-	ProgramGroup();
+	ProgramGroup(FALSE);
 
 	try {
 		CreateDirs();
@@ -473,7 +475,7 @@ void CBINDInstallDlg::OnInstall() {
 			RegCloseKey(hKey);
 		}
 	
-		ProgramGroup();
+		ProgramGroup(FALSE);
 		
 		if (m_startOnInstall)
 			StartBINDService();
-- 
cgit v1.2.3