summaryrefslogtreecommitdiff
path: root/setup_native/source
diff options
context:
space:
mode:
authorMikhail Voitenko <mav@openoffice.org>2009-11-02 21:21:20 +0000
committerMikhail Voitenko <mav@openoffice.org>2009-11-02 21:21:20 +0000
commit844da51130df54eae3d1c56fc4305fda785acec0 (patch)
tree51073b31ddd703d31e006b9bbd619b74dcc6209b /setup_native/source
parent12ae183b689e4a09cd0cfed051f93fdfa33d2d7a (diff)
#i106476# support 64-bit IE
Diffstat (limited to 'setup_native/source')
-rw-r--r--setup_native/source/win32/customactions/regactivex/regactivex.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/setup_native/source/win32/customactions/regactivex/regactivex.cxx b/setup_native/source/win32/customactions/regactivex/regactivex.cxx
index cae6e098fa52..8c64fe784e6e 100644
--- a/setup_native/source/win32/customactions/regactivex/regactivex.cxx
+++ b/setup_native/source/win32/customactions/regactivex/regactivex.cxx
@@ -173,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"INSTALLLOCATION", &pProgPath ) && pProgPath )
+ if ( GetMsiProp( hMSI, L"OFFICEINSTALLLOCATION", &pProgPath ) && pProgPath )
{
char* pCharProgPath = UnicodeToAnsiString( pProgPath );
#ifdef OWN_DEBUG_PRINT
@@ -330,7 +330,7 @@ BOOL MakeInstallFor64Bit( MSIHANDLE hMSI )
wchar_t* pVal = NULL;
if ( GetMsiProp( hMSI, L"VersionNT64", &pVal ) && pVal )
{
- bResult = UnicodeEquals( pVal , L"1" );
+ bResult = TRUE;
free( pVal );
}