From eb5ec161736d307b772a33ca186cebb27a2282b2 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Wed, 31 Oct 2007 01:43:11 +0000
Subject: [PATCH] 2257.   [bug]           win32: Use the full path to
 vcredist_x86.exe when                         calling it. [RT #17222]

---
 CHANGES                                  |  3 +++
 bin/win32/BINDInstall/BINDInstallDlg.cpp | 14 ++++++++++++--
 lib/isc/win32/libisc.def                 |  7 +++++++
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 5dc3cad0c1..c820bca45c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2257.	[bug]		win32: Use the full path to vcredist_x86.exe when
+			calling it. [RT #17222]
+
 2256.	[bug]		win32: Correctly register the installation location of
 			bindevt.dll. [RT #17159]
 
diff --git a/bin/win32/BINDInstall/BINDInstallDlg.cpp b/bin/win32/BINDInstall/BINDInstallDlg.cpp
index 707e14db77..850535cab0 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.23 2007/10/31 00:15:12 marka Exp $ */
+/* $Id: BINDInstallDlg.cpp,v 1.6.2.6.2.24 2007/10/31 01:43:11 marka Exp $ */
 
 /*
  * Copyright (c) 1999-2000 by Nortel Networks Corporation
@@ -386,6 +386,9 @@ void CBINDInstallDlg::OnUninstall() {
  * User pressed the install button.  Make it go.
  */
 void CBINDInstallDlg::OnInstall() {
+#if _MSC_VER >= 1400
+	char Vcredist_x86[MAX_PATH];
+#endif
 	BOOL success = FALSE;
 	int oldlen;
 
@@ -480,7 +483,14 @@ void CBINDInstallDlg::OnInstall() {
 	 * Vcredist_x86.exe /q:a /c:"msiexec /i vcredist.msi /qn /l*v %temp%\vcredist_x86.log"
 	 */
 	/*system(".\\Vcredist_x86.exe /q:a /c:\"msiexec /i vcredist.msi /qn /l*v %temp%\vcredist_x86.log\"");*/
-	system(".\\Vcredist_x86.exe");
+
+	/*
+	 * Enclose full path to Vcredist_x86.exe in quotes as
+	 * m_currentDir may contain spaces.
+	 */
+	sprintf(Vcredist_x86, "\"%s\\Vcredist_x86.exe\"",
+		(LPCTSTR) m_currentDir);
+	system(Vcredist_x86);
 #endif
 	try {
 		CreateDirs();
diff --git a/lib/isc/win32/libisc.def b/lib/isc/win32/libisc.def
index 2c686af1c5..897dd4d0df 100644
--- a/lib/isc/win32/libisc.def
+++ b/lib/isc/win32/libisc.def
@@ -124,6 +124,13 @@ isc_hash_ctxdetach
 isc_hash_ctxinit
 isc_hash_destroy
 isc_hash_init
+isc_heap_create
+isc_heap_decreased
+isc_heap_delete
+isc_heap_destroy
+isc_heap_element
+isc_heap_increased
+isc_heap_insert
 isc_hex_decodestring
 isc_hex_tobuffer
 isc_hex_totext