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

                        calling it. [RT #17222]

diff --git a/CHANGES b/CHANGES
index 1a9635d98164d68000af4a97df49a386b5825d1a..29e579ae067ccaf740a09d7e3c0d3f1ee10401bc 100644 (file)
--- 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 23483bf3736ca51b92e8c1497289d987437b9b01..88d5b722577b8ffb5a5bbce22106fee7298da164 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.36 2007/10/31 00:05:36 marka Exp $ */
+/* $Id: BINDInstallDlg.cpp,v 1.37 2007/10/31 01:34:19 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 29b1dfb34f02885f59438d012a78477c5fe07d7e..9b642cf49c35f4f9cb51463eee486f03e8c952ef 100644 (file)
--- a/lib/isc/win32/libisc.def
+++ b/lib/isc/win32/libisc.def
@@ -126,6 +126,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