2257. [bug] win32: Use the full path to vcredist_x86.exe when

                        calling it. [RT #17222]

diff --git a/CHANGES b/CHANGES
index 4dee35d36a2233dbc685875d5b46329954b87d9f..4f939b3ae39929feda4e37c51e8d7f44e4447f4e 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,7 @@
 
+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 00ae22990d158a0e84eefadbcc455e5998fd02cd..1a4eb9922aeeece0c0c28ee855d68722eceebf87 100644 (file)
--- 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.15.18.16 2007/10/31 00:15:17 marka Exp $ */
+/* $Id: BINDInstallDlg.cpp,v 1.15.18.17 2007/10/31 01:43:36 marka Exp $ */
 
 /*
  * Copyright (c) 1999-2000 by Nortel Networks Corporation
@@ -387,6 +387,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;
 
@@ -481,7 +484,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 ce8b5a6b2ba06001f97ea44c2fc42b5ee73856da..9e5739a63facdecd35889a7c45b6401683fa55f0 100644 (file)
--- 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