1926. [bug] BINDinstall was being installed in the wrong place.

                        [RT #15483]

diff --git a/CHANGES b/CHANGES
index 798de5adaca9bf2510b0d7e303000d44764938e9..6ad034018002c5f01737478f06307458822cb1d5 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+1926.  [bug]           BINDinstall was being installed in the wrong place.
+                       [RT #15483]
+
 1925.  [port]          All outer level AC_TRY_RUNs need cross compiling
                        defaults. [RT #15469]
 

diff --git a/bin/win32/BINDInstall/BINDInstallDlg.cpp b/bin/win32/BINDInstall/BINDInstallDlg.cpp
index fbc14bd67df559461371d35c55966f43591f8a08..032022a59ec275b934833e22467fe99473d43b3e 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.6.2.12 2004/05/18 01:26:41 marka Exp $ */
+/* $Id: BINDInstallDlg.cpp,v 1.6.2.13 2005/10/11 23:05:50 marka Exp $ */
 
 /*
  * Copyright (c) 1999-2000 by Nortel Networks Corporation
@@ -426,16 +426,17 @@ void CBINDInstallDlg::OnInstall()
 
                
                SetCurrent(IDS_ADD_REMOVE);
-               if(RegCreateKey(HKEY_LOCAL_MACHINE, BIND_UNINSTALL_SUBKEY, &hKey) == ERROR_SUCCESS)
+               if(RegCreateKey(HKEY_LOCAL_MACHINE, BIND_UNINSTALL_SUBKEY,
+                               &hKey) == ERROR_SUCCESS)
                {
-                       char winDir[MAX_PATH];
                        CString buf(BIND_DISPLAY_NAME);
-                       GetWindowsDirectory(winDir, MAX_PATH);
 
-                       RegSetValueEx(hKey, "DisplayName", 0, REG_SZ, (LPBYTE)(LPCTSTR)buf, buf.GetLength());
+                       RegSetValueEx(hKey, "DisplayName", 0, REG_SZ,
+                                     (LPBYTE)(LPCTSTR)buf, buf.GetLength());
 
-                       buf.Format("%s\\BINDInstall.exe", winDir);
-                       RegSetValueEx(hKey, "UninstallString", 0, REG_SZ, (LPBYTE)(LPCTSTR)buf, buf.GetLength());
+                       buf.Format("%s\\BINDInstall.exe", m_binDir);
+                       RegSetValueEx(hKey, "UninstallString", 0, REG_SZ,
+                                     (LPBYTE)(LPCTSTR)buf, buf.GetLength());
                        RegCloseKey(hKey);
                }