Commit 2cc262c0 authored by Mark Andrews's avatar Mark Andrews
Browse files

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

                        calling it. [RT #17222]
parent 76a37888
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 2256. [bug] win32: Correctly register the installation location of
bindevt.dll. [RT #17159] bindevt.dll. [RT #17159]
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * 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 * Copyright (c) 1999-2000 by Nortel Networks Corporation
...@@ -387,6 +387,9 @@ void CBINDInstallDlg::OnUninstall() { ...@@ -387,6 +387,9 @@ void CBINDInstallDlg::OnUninstall() {
* User pressed the install button. Make it go. * User pressed the install button. Make it go.
*/ */
void CBINDInstallDlg::OnInstall() { void CBINDInstallDlg::OnInstall() {
#if _MSC_VER >= 1400
char Vcredist_x86[MAX_PATH];
#endif
BOOL success = FALSE; BOOL success = FALSE;
int oldlen; int oldlen;
...@@ -481,7 +484,14 @@ void CBINDInstallDlg::OnInstall() { ...@@ -481,7 +484,14 @@ void CBINDInstallDlg::OnInstall() {
* Vcredist_x86.exe /q:a /c:"msiexec /i vcredist.msi /qn /l*v %temp%\vcredist_x86.log" * 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 /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 #endif
try { try {
CreateDirs(); CreateDirs();
......
...@@ -126,6 +126,13 @@ isc_hash_ctxdetach ...@@ -126,6 +126,13 @@ isc_hash_ctxdetach
isc_hash_ctxinit isc_hash_ctxinit
isc_hash_destroy isc_hash_destroy
isc_hash_init 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_decodestring
isc_hex_tobuffer isc_hex_tobuffer
isc_hex_totext isc_hex_totext
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment