summaryrefslogtreecommitdiff
path: root/setup_native
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2008-07-11 09:49:42 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2008-07-11 09:49:42 +0000
commit6faa125017e3e0be47a1e6d74f0ccdc8ee4a0b24 (patch)
treeba137bce50b78f3f2185a76b5531de1c39674249 /setup_native
parente3dba1c134f4db0a2c4f97f600273dcf08c9007b (diff)
INTEGRATION: CWS native170 (1.21.46); FILE MERGED
2008/07/08 10:40:47 is 1.21.46.1: #i91442#
Diffstat (limited to 'setup_native')
-rwxr-xr-xsetup_native/source/win32/customactions/patch/swappatchfiles.cxx24
1 files changed, 17 insertions, 7 deletions
diff --git a/setup_native/source/win32/customactions/patch/swappatchfiles.cxx b/setup_native/source/win32/customactions/patch/swappatchfiles.cxx
index a40d2bf6d701..2bb372be3d89 100755
--- a/setup_native/source/win32/customactions/patch/swappatchfiles.cxx
+++ b/setup_native/source/win32/customactions/patch/swappatchfiles.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: swappatchfiles.cxx,v $
- * $Revision: 1.21 $
+ * $Revision: 1.22 $
*
* This file is part of OpenOffice.org.
*
@@ -546,8 +546,9 @@ static std::queue< std::_tstring > getProfileKeys( const std::_tstring& aFileNam
extern "C" UINT __stdcall InstallPatchedFiles( MSIHANDLE handle )
{
- std::_tstring sInstDir = GetMsiProperty( handle, TEXT("BASISINSTALLLOCATION") );
- std::_tstring sProgramDir = sInstDir + TEXT("program\\");
+ std::_tstring sInstDir = GetMsiProperty( handle, TEXT("INSTALLLOCATION") );
+ std::_tstring sBasisInstDir = GetMsiProperty( handle, TEXT("BASISINSTALLLOCATION") );
+ std::_tstring sProgramDir = sBasisInstDir + TEXT("program\\");
std::_tstring sPatchFile = sProgramDir + TEXT("patchlist.txt");
std::queue< std::_tstring > aSectionNames;
@@ -557,7 +558,7 @@ extern "C" UINT __stdcall InstallPatchedFiles( MSIHANDLE handle )
// std::_tstring mystr;
// mystr = "Patchfile: " + sPatchFile;
- // MessageBox( NULL, mystr.c_str(), "Titel", MB_OK );
+ // MessageBox( NULL, mystr.c_str(), "Patchfile", MB_OK );
aSectionNames = getProfileSections( sPatchFile );
while ( !aSectionNames.empty() )
@@ -607,12 +608,17 @@ extern "C" UINT __stdcall UninstallPatchedFiles( MSIHANDLE handle )
HKEY hKey;
std::_tstring sInstDir;
+ std::_tstring sBasisInstDir;
std::_tstring sProductKey = GetMsiProperty( handle, TEXT("FINDPRODUCT") );
if ( ERROR_SUCCESS == RegOpenKey( HKEY_CURRENT_USER, sProductKey.c_str(), &hKey ) )
{
- if ( ERROR_SUCCESS == RegQueryValueEx( hKey, TEXT("OFFICEINSTALLLOCATION"), NULL, NULL, (LPBYTE)szValue, &nValueSize ) )
+ if ( ERROR_SUCCESS == RegQueryValueEx( hKey, TEXT("BASISINSTALLLOCATION"), NULL, NULL, (LPBYTE)szValue, &nValueSize ) )
+ {
+ sBasisInstDir = szValue;
+ }
+ if ( ERROR_SUCCESS == RegQueryValueEx( hKey, TEXT("INSTALLLOCATION"), NULL, NULL, (LPBYTE)szValue, &nValueSize ) )
{
sInstDir = szValue;
}
@@ -620,7 +626,11 @@ extern "C" UINT __stdcall UninstallPatchedFiles( MSIHANDLE handle )
}
else if ( ERROR_SUCCESS == RegOpenKey( HKEY_LOCAL_MACHINE, sProductKey.c_str(), &hKey ) )
{
- if ( ERROR_SUCCESS == RegQueryValueEx( hKey, TEXT("OFFICEINSTALLLOCATION"), NULL, NULL, (LPBYTE)szValue, &nValueSize ) )
+ if ( ERROR_SUCCESS == RegQueryValueEx( hKey, TEXT("BASISINSTALLLOCATION"), NULL, NULL, (LPBYTE)szValue, &nValueSize ) )
+ {
+ sBasisInstDir = szValue;
+ }
+ if ( ERROR_SUCCESS == RegQueryValueEx( hKey, TEXT("INSTALLLOCATION"), NULL, NULL, (LPBYTE)szValue, &nValueSize ) )
{
sInstDir = szValue;
}
@@ -629,7 +639,7 @@ extern "C" UINT __stdcall UninstallPatchedFiles( MSIHANDLE handle )
else
return ERROR_SUCCESS;
- std::_tstring sProgramDir = sInstDir + TEXT("program\\");
+ std::_tstring sProgramDir = sBasisInstDir + TEXT("program\\");
std::_tstring sPatchFile = sProgramDir + TEXT("patchlist.txt");
std::queue< std::_tstring > aSectionNames;