summaryrefslogtreecommitdiff
path: root/setup_native/source/win32
diff options
context:
space:
mode:
authorMikhail Voitenko <mav@openoffice.org>2009-11-02 20:33:49 +0000
committerMikhail Voitenko <mav@openoffice.org>2009-11-02 20:33:49 +0000
commit12ae183b689e4a09cd0cfed051f93fdfa33d2d7a (patch)
tree33825862419d146a869f42f7cc159d69264d39e1 /setup_native/source/win32
parent494d38544c753ea4f976ffe36ce4775c3aa44f18 (diff)
#i106476# support 64-bit IE
Diffstat (limited to 'setup_native/source/win32')
-rw-r--r--setup_native/source/win32/customactions/regactivex/regactivex.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/setup_native/source/win32/customactions/regactivex/regactivex.cxx b/setup_native/source/win32/customactions/regactivex/regactivex.cxx
index 60128d2d8346..cae6e098fa52 100644
--- a/setup_native/source/win32/customactions/regactivex/regactivex.cxx
+++ b/setup_native/source/win32/customactions/regactivex/regactivex.cxx
@@ -121,6 +121,8 @@ void RegisterActiveXNative( const char* pActiveXPath, int nMode, BOOL InstallFor
pProgramPath[ nLen - nRemoveLen ] = 0;
( *pNativeProc )( nMode, InstallForAllUser, InstallFor64Bit, pProgramPath );
+
+ free( pProgramPath );
}
}
@@ -171,7 +173,7 @@ BOOL GetMsiProp( MSIHANDLE hMSI, const wchar_t* pPropName, wchar_t** ppValue )
BOOL GetActiveXControlPath( MSIHANDLE hMSI, char** ppActiveXPath )
{
wchar_t* pProgPath = NULL;
- if ( GetMsiProp( hMSI, L"BASISINSTALLLOCATION", &pProgPath ) && pProgPath )
+ if ( GetMsiProp( hMSI, L"INSTALLLOCATION", &pProgPath ) && pProgPath )
{
char* pCharProgPath = UnicodeToAnsiString( pProgPath );
#ifdef OWN_DEBUG_PRINT