diff options
| author | Internet Software Consortium, Inc <@isc.org> | 2007-11-15 21:13:31 -0700 |
|---|---|---|
| committer | LaMont Jones <lamont@debian.org> | 2007-11-15 21:13:31 -0700 |
| commit | 14844197c23f37b19e272cb34cb6f0f862598d36 (patch) | |
| tree | d12bb00afd217ab6cfcc1aa9d2754ef8a693f69b /bin/win32/BINDInstall | |
| parent | 10df5197b0b46b9f8e34b3855e9373c00c63b5a9 (diff) | |
| download | bind9-14844197c23f37b19e272cb34cb6f0f862598d36.tar.gz | |
9.5.0a7
Diffstat (limited to 'bin/win32/BINDInstall')
| -rw-r--r-- | bin/win32/BINDInstall/BINDInstallDlg.cpp | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/bin/win32/BINDInstall/BINDInstallDlg.cpp b/bin/win32/BINDInstall/BINDInstallDlg.cpp index 01124aa3..88d5b722 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.35 2007/06/27 01:11:16 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(); @@ -917,10 +927,9 @@ void CBINDInstallDlg::UnregisterService(BOOL uninstall) { void CBINDInstallDlg::RegisterMessages() { HKEY hKey; DWORD dwData; - char pszMsgDLL[MAX_PATH], buf[MAX_PATH]; + char pszMsgDLL[MAX_PATH]; - GetSystemDirectory(buf, MAX_PATH); - sprintf(pszMsgDLL, "%s\\%s", buf, "bindevt.dll"); + sprintf(pszMsgDLL, "%s\\%s", (LPCTSTR)m_binDir, "bindevt.dll"); SetCurrent(IDS_REGISTER_MESSAGES); /* Create a new key for named */ |