summaryrefslogtreecommitdiff
path: root/setup_native
diff options
context:
space:
mode:
Diffstat (limited to 'setup_native')
-rw-r--r--setup_native/source/packinfo/packinfo_extensions.txt45
-rw-r--r--setup_native/source/ulfconv/ulfconv.cxx3
-rw-r--r--setup_native/source/win32/customactions/languagepacks/lngpckinsthelper.cxx3
-rw-r--r--setup_native/source/win32/customactions/languagepacks/makefile.mk5
-rwxr-xr-xsetup_native/source/win32/customactions/patch/makefile.mk1
-rw-r--r--setup_native/source/win32/customactions/patch/swappatchfiles.cxx57
-rw-r--r--setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.cxx1
-rw-r--r--setup_native/source/win32/customactions/reg4msdoc/registry.hxx4
-rw-r--r--setup_native/source/win32/customactions/reg4msdoc/registryexception.cxx26
-rw-r--r--setup_native/source/win32/customactions/reg4msdoc/registryw9x.cxx14
-rw-r--r--setup_native/source/win32/customactions/reg4msdoc/registryw9x.hxx1
-rw-r--r--setup_native/source/win32/customactions/reg4msdoc/registrywnt.cxx14
-rw-r--r--setup_native/source/win32/customactions/reg4msdoc/windowsregistry.cxx24
-rw-r--r--setup_native/source/win32/customactions/reg64/makefile.mk27
-rw-r--r--setup_native/source/win32/customactions/reg64/reg64.cxx8
-rw-r--r--setup_native/source/win32/customactions/regpatchactivex/makefile.mk4
-rw-r--r--setup_native/source/win32/customactions/shellextensions/layerlinks.cxx24
-rw-r--r--setup_native/source/win32/customactions/shellextensions/registerextensions.cxx10
-rw-r--r--setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx11
-rw-r--r--setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx6
-rw-r--r--setup_native/source/win32/customactions/tools/makefile.mk2
-rw-r--r--setup_native/source/win32/stwrapper/makefile.mk3
-rw-r--r--setup_native/source/win32/stwrapper/stwrapper.cxx1
23 files changed, 56 insertions, 238 deletions
diff --git a/setup_native/source/packinfo/packinfo_extensions.txt b/setup_native/source/packinfo/packinfo_extensions.txt
index 38c2f9c3214a..7d76ef7f95f6 100644
--- a/setup_native/source/packinfo/packinfo_extensions.txt
+++ b/setup_native/source/packinfo/packinfo_extensions.txt
@@ -301,3 +301,48 @@ description = "oooblogger extension for %PRODUCTNAME %PRODUCTVERSION"
destpath = "/opt"
packageversion = "%PACKAGEVERSION"
End
+
+Start
+module = "gid_Module_Optional_Extensions_Script_Provider_For_Beanshell"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-beanshell-script-provider"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
+packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-beanshell-script-provider"
+requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
+linuxpatchrequires = ""
+copyright = "1999-2008 by OpenOffice.org"
+solariscopyright = "solariscopyrightfile"
+vendor = "OpenOffice.org"
+description = "Script provider for BeanShell extension for %PRODUCTNAME %PRODUCTVERSION"
+destpath = "/opt"
+packageversion = "%PACKAGEVERSION"
+End
+
+Start
+module = "gid_Module_Optional_Extensions_Script_Provider_For_Javascript"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-javascript-script-provider"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
+packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-javascript-script-provider"
+requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
+linuxpatchrequires = ""
+copyright = "1999-2008 by OpenOffice.org"
+solariscopyright = "solariscopyrightfile"
+vendor = "OpenOffice.org"
+description = "Script provider for JavaScript extension for %PRODUCTNAME %PRODUCTVERSION"
+destpath = "/opt"
+packageversion = "%PACKAGEVERSION"
+End
+
+Start
+module = "gid_Module_Optional_Extensions_Script_Provider_For_Python"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-python-script-provider"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
+packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-python-script-provider"
+requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
+linuxpatchrequires = ""
+copyright = "1999-2008 by OpenOffice.org"
+solariscopyright = "solariscopyrightfile"
+vendor = "OpenOffice.org"
+description = "Script provider for Python extension for %PRODUCTNAME %PRODUCTVERSION"
+destpath = "/opt"
+packageversion = "%PACKAGEVERSION"
+End
diff --git a/setup_native/source/ulfconv/ulfconv.cxx b/setup_native/source/ulfconv/ulfconv.cxx
index bdcc98595f5c..1643b330d776 100644
--- a/setup_native/source/ulfconv/ulfconv.cxx
+++ b/setup_native/source/ulfconv/ulfconv.cxx
@@ -34,6 +34,7 @@
#include <unistd.h>
#include <ctype.h>
#include <sal/alloca.h>
+#include <sal/macros.h>
#include <rtl/ustring.hxx>
@@ -189,7 +190,7 @@ void read_encoding_table(char * file, EncodingMap& aEncodingMap)
*cp = '\0';
// find the correct mapping for codepage
- const unsigned int members = sizeof( _ms_encoding_list ) / sizeof( _pair );
+ const unsigned int members = SAL_N_ELEMENTS( _ms_encoding_list );
const _pair *encoding = _pair_search( codepage, _ms_encoding_list, members );
if ( encoding != NULL ) {
diff --git a/setup_native/source/win32/customactions/languagepacks/lngpckinsthelper.cxx b/setup_native/source/win32/customactions/languagepacks/lngpckinsthelper.cxx
index f6f6a4c0c3b9..bcf874699a77 100644
--- a/setup_native/source/win32/customactions/languagepacks/lngpckinsthelper.cxx
+++ b/setup_native/source/win32/customactions/languagepacks/lngpckinsthelper.cxx
@@ -153,9 +153,8 @@ extern "C" UINT __stdcall SetProductInstallationPath(MSIHANDLE handle)
MsiSetProperty(handle, TEXT("INSTALLLOCATION"), path.c_str());
}
}
- catch(std::runtime_error& ex)
+ catch(std::runtime_error&)
{
- ex = ex; // no warnings
}
return ERROR_SUCCESS;
}
diff --git a/setup_native/source/win32/customactions/languagepacks/makefile.mk b/setup_native/source/win32/customactions/languagepacks/makefile.mk
index 8da47ab1cc4f..cf703e033c8e 100644
--- a/setup_native/source/win32/customactions/languagepacks/makefile.mk
+++ b/setup_native/source/win32/customactions/languagepacks/makefile.mk
@@ -74,7 +74,6 @@ STDSHL+= \
-lmsvcrt
.ENDIF
-#SHL1LIBS = $(SLB)$/$(TARGET).lib
SHL1OBJS = $(SLOFILES) \
$(SLO)$/registerextensions.obj \
@@ -94,7 +93,3 @@ DEF1EXPORTFILE=exports.dxp
# --- Targets --------------------------------------------------------------
.INCLUDE : target.mk
-
-# -------------------------------------------------------------------------
-
-
diff --git a/setup_native/source/win32/customactions/patch/makefile.mk b/setup_native/source/win32/customactions/patch/makefile.mk
index 57705389248f..3abd9988b486 100755
--- a/setup_native/source/win32/customactions/patch/makefile.mk
+++ b/setup_native/source/win32/customactions/patch/makefile.mk
@@ -69,7 +69,6 @@ STDSHL+= \
-lmsvcrt
.ENDIF
-#SHL1LIBS = $(SLB)$/$(TARGET).lib
SHL1OBJS = $(SLOFILES) \
$(SLO)$/respintest.obj \
diff --git a/setup_native/source/win32/customactions/patch/swappatchfiles.cxx b/setup_native/source/win32/customactions/patch/swappatchfiles.cxx
index 2ef10553e239..db7fbeb3e5fc 100644
--- a/setup_native/source/win32/customactions/patch/swappatchfiles.cxx
+++ b/setup_native/source/win32/customactions/patch/swappatchfiles.cxx
@@ -285,18 +285,6 @@ static bool SwapFiles( const std::_tstring& sFileName1, const std::_tstring& sFi
if (hdl == INVALID_HANDLE_VALUE)
{
fSuccess = MoveFileExImpl( sFileName2.c_str(), sFileName1.c_str(), MOVEFILE_REPLACE_EXISTING );
-
- // if ( fSuccess )
- // {
- // mystr = "Success";
- // MessageBox( NULL, mystr.c_str(), "Titel", MB_OK );
- // }
- // else
- // {
- // char buff[256];
- // wsprintf(buff, "Failure %d", GetLastError());
- // MessageBox( NULL, buff, "Titel", MB_OK );
- // }
}
else
{
@@ -554,17 +542,11 @@ extern "C" UINT __stdcall InstallPatchedFiles( MSIHANDLE handle )
OutputDebugStringA( "Starting Custom Action" );
- // std::_tstring mystr;
- // mystr = "Patchfile: " + sPatchFile;
- // MessageBox( NULL, mystr.c_str(), "Patchfile", MB_OK );
-
aSectionNames = getProfileSections( sPatchFile );
while ( !aSectionNames.empty() )
{
std::_tstring sSectionName = aSectionNames.front();
if ( std::_tstring(TEXT("_root")) == sSectionName ) { sSectionName = TEXT(""); }
- // mystr = "Section: " + sSectionName;
- // MessageBox( NULL, mystr.c_str(), "Titel", MB_OK );
aKeyNames = getProfileKeys( sPatchFile, sSectionName );
while ( !aKeyNames.empty() )
@@ -584,9 +566,6 @@ extern "C" UINT __stdcall InstallPatchedFiles( MSIHANDLE handle )
sFileName1 = sInstDir + sSectionName + sFileName1;
sFileName2 = sFileName1 + sExtension;
- // mystr = "Convert: " + sFileName1 + " to " + sFileName2;
- // MessageBox( NULL, mystr.c_str(), "Titel", MB_OK );
-
SwapFiles( sFileName1, sFileName2 );
}
@@ -634,17 +613,11 @@ extern "C" UINT __stdcall UninstallPatchedFiles( MSIHANDLE handle )
std::queue< std::_tstring > aSectionNames;
std::queue< std::_tstring > aKeyNames;
- // std::_tstring mystr;
- // mystr = "Patchfile: " + sPatchFile;
- // MessageBox( NULL, mystr.c_str(), "Titel", MB_OK );
-
aSectionNames = getProfileSections( sPatchFile );
while ( !aSectionNames.empty() )
{
std::_tstring sSectionName = aSectionNames.front();
if ( std::_tstring(TEXT("_root")) == sSectionName ) { sSectionName = TEXT(""); }
- // mystr = "Section: " + sSectionName;
- // MessageBox( NULL, mystr.c_str(), "Titel", MB_OK );
aKeyNames = getProfileKeys( sPatchFile, sSectionName );
while( !aKeyNames.empty() )
@@ -664,9 +637,6 @@ extern "C" UINT __stdcall UninstallPatchedFiles( MSIHANDLE handle )
sFileName1 = sInstDir + sSectionName + sFileName1;
sFileName2 = sFileName1 + sExtension;
- // mystr = "Convert: " + sFileName1 + " to " + sFileName2;
- // MessageBox( NULL, mystr.c_str(), "Titel", MB_OK );
-
SwapFiles( sFileName2, sFileName1 );
}
@@ -726,7 +696,6 @@ extern "C" UINT __stdcall SetFeatureState( MSIHANDLE handle )
// 1. Reading Product Code from setup.ini of installed Office
std::_tstring sInstallPath = GetMsiProperty(handle, TEXT("INSTALLLOCATION"));
- // MessageBox(NULL, sInstallPath.c_str(), "INSTALLLOCATION", MB_OK);
std::_tstring sSetupiniPath = sInstallPath + TEXT("program\\setup.ini");
TCHAR szProductCode[32767];
@@ -743,7 +712,6 @@ extern "C" UINT __stdcall SetFeatureState( MSIHANDLE handle )
if ( !_tcsicmp( szProductCode, TEXT("NOTFOUND") ) )
{
// No setup.ini or no "ProductCode" in setup.ini. This is an invalid directory.
- // MessageBox(NULL, "NOTFOUND set", "DEBUG", MB_OK);
return ERROR_SUCCESS;
}
@@ -752,7 +720,6 @@ extern "C" UINT __stdcall SetFeatureState( MSIHANDLE handle )
std::_tstring productCode = TEXT(szProductCode);
productCode = ConvertGuid(std::_tstring(productCode.c_str() + 1, productCode.length() - 2));
mystr = TEXT("Changed product code: ") + productCode;
- // MessageBox(NULL, mystr.c_str(), "ProductCode", MB_OK);
// 3. Setting path in the Windows registry to find installed features
@@ -764,14 +731,12 @@ extern "C" UINT __stdcall SetFeatureState( MSIHANDLE handle )
registryRoot = HKEY_LOCAL_MACHINE;
registryKey = TEXT("Software\\Classes\\Installer\\Features\\") + productCode;
mystr = registryKey;
- // MessageBox( NULL, mystr.c_str(), "ALLUSERS", MB_OK );
}
else
{
registryRoot = HKEY_CURRENT_USER;
registryKey = TEXT("Software\\Microsoft\\Installer\\Features\\") + productCode;
mystr = registryKey;
- // MessageBox( NULL, mystr.c_str(), "ALLUSERS", MB_OK );
}
// 4. Collecting all installed features from Windows registry
@@ -780,7 +745,6 @@ extern "C" UINT __stdcall SetFeatureState( MSIHANDLE handle )
if (RegOpenKey(registryRoot, registryKey.c_str(), &hKey) == ERROR_SUCCESS)
{
int counter = 0;
- // DWORD counter = 0;
LONG lEnumResult;
do
@@ -798,11 +762,6 @@ extern "C" UINT __stdcall SetFeatureState( MSIHANDLE handle )
std::_tstring sValueName = szValueName;
std::_tstring sValueData = szValueData;
- // mystr = sValueName;
- // MessageBox( NULL, mystr.c_str(), "ValueName", MB_OK );
- // mystr = sValueData;
- // MessageBox( NULL, mystr.c_str(), "ValueData", MB_OK );
-
// Does this feature exist in this patch?
if ( IsSetMsiProperty(handle, sValueName) )
{
@@ -810,14 +769,10 @@ extern "C" UINT __stdcall SetFeatureState( MSIHANDLE handle )
if ( 6 == szValueData[0] )
{
MsiSetFeatureState(handle,sValueName.c_str(),INSTALLSTATE_ABSENT); // do not install this feature
- // mystr = TEXT("Do NOT install: ") + sValueName;
- // MessageBox( NULL, mystr.c_str(), "ValueName", MB_OK );
}
else
{
MsiSetFeatureState(handle,sValueName.c_str(),INSTALLSTATE_LOCAL); // do install this feature
- // mystr = TEXT("Do install: ") + sValueName;
- // MessageBox( NULL, mystr.c_str(), "ValueName", MB_OK );
}
}
}
@@ -842,14 +797,10 @@ extern "C" UINT __stdcall SetNewFeatureState( MSIHANDLE handle )
if (IsSetMsiProperty(handle, TEXT("SELECT_OU_FEATURE")))
{
MsiSetFeatureState(handle,sValueName.c_str(),INSTALLSTATE_LOCAL); // do install this feature
- // mystr = TEXT("OnlineUpdate wird installiert!");
- // MessageBox(NULL, mystr.c_str(), "INSTALLSTATE_LOCAL", MB_OK);
}
else
{
MsiSetFeatureState(handle,sValueName.c_str(),INSTALLSTATE_ABSENT); // do not install this feature
- // mystr = TEXT("OnlineUpdate wird NICHT installiert!");
- // MessageBox(NULL, mystr.c_str(), "INSTALLSTATE_ABSENT", MB_OK);
}
return ERROR_SUCCESS;
@@ -869,10 +820,6 @@ extern "C" UINT __stdcall ShowOnlineUpdateDialog( MSIHANDLE handle )
HANDLE hdl = FindFirstFile(sSearchFile.c_str(), &data);
if (hdl != INVALID_HANDLE_VALUE) // the file exists
{
- // std::_tstring mystr;
- // mystr = "Found file: " + sSearchFile;
- // MessageBox( NULL, mystr.c_str(), "Found file", MB_OK );
-
// And finally setting property SHOW_ONLINEUPDATE_DIALOG
// to hide this dialog
UnsetMsiProperty(handle, TEXT("SHOW_ONLINEUPDATE_DIALOG"));
@@ -886,10 +833,6 @@ extern "C" UINT __stdcall ShowOnlineUpdateDialog( MSIHANDLE handle )
}
else
{
- // std::_tstring mystr;
- // mystr = "Did not find file: " + sSearchFile;
- // MessageBox( NULL, mystr.c_str(), "File not found", MB_OK );
-
// If the file does not exist, the Online Update dialog
// has to be shown.
SetMsiProperty(handle, TEXT("SHOW_ONLINEUPDATE_DIALOG"));
diff --git a/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.cxx b/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.cxx
index 189b7e3074ae..f07c35a4d988 100644
--- a/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.cxx
+++ b/setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.cxx
@@ -1,7 +1,6 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
//Implementierung der Klasse RegistrationContextInformation.
-#include <assert.h>
#include "registrationcontextinformation.hxx"
#include "msihelper.hxx"
diff --git a/setup_native/source/win32/customactions/reg4msdoc/registry.hxx b/setup_native/source/win32/customactions/reg4msdoc/registry.hxx
index fe0014b6a191..d993060ae560 100644
--- a/setup_native/source/win32/customactions/reg4msdoc/registry.hxx
+++ b/setup_native/source/win32/customactions/reg4msdoc/registry.hxx
@@ -57,10 +57,6 @@ typedef std::auto_ptr<RegistryKeyImpl> RegistryKey;
typedef std::vector<std::wstring> StringList;
typedef std::auto_ptr<StringList> StringListPtr;
-//---------------------------------------
-//
-//---------------------------------------
-
class RegistryKeyImpl
{
public:
diff --git a/setup_native/source/win32/customactions/reg4msdoc/registryexception.cxx b/setup_native/source/win32/customactions/reg4msdoc/registryexception.cxx
index cebbe67c6798..e7e66825ed4b 100644
--- a/setup_native/source/win32/customactions/reg4msdoc/registryexception.cxx
+++ b/setup_native/source/win32/customactions/reg4msdoc/registryexception.cxx
@@ -23,16 +23,12 @@ RegistryException::RegistryException(long ErrorCode) :
{
}
-/**
-*/
RegistryException::~RegistryException() throw()
{
if (m_ErrorMsg)
LocalFree(m_ErrorMsg);
}
-/**
-*/
const char* RegistryException::what() const throw()
{
FormatMessage(
@@ -49,8 +45,6 @@ const char* RegistryException::what() const throw()
return reinterpret_cast<char*>(m_ErrorMsg);
}
-/**
-*/
long RegistryException::GetErrorCode() const
{
return m_ErrorCode;
@@ -66,46 +60,26 @@ RegistryIOException::RegistryIOException(long ErrorCode) :
{
};
-//#######################################
-//
-//#######################################
-
RegistryNoWriteAccessException::RegistryNoWriteAccessException(long ErrorCode) :
RegistryException(ErrorCode)
{
};
-//#######################################
-//
-//#######################################
-
RegistryAccessDeniedException::RegistryAccessDeniedException(long ErrorCode) :
RegistryException(ErrorCode)
{
};
-//#######################################
-//
-//#######################################
-
RegistryValueNotFoundException::RegistryValueNotFoundException(long ErrorCode) :
RegistryException(ErrorCode)
{
};
-//#######################################
-//
-//#######################################
-
RegistryKeyNotFoundException::RegistryKeyNotFoundException(long ErrorCode) :
RegistryException(ErrorCode)
{
};
-//#######################################
-//
-//#######################################
-
RegistryInvalidOperationException::RegistryInvalidOperationException(long ErrorCode) :
RegistryException(ErrorCode)
{
diff --git a/setup_native/source/win32/customactions/reg4msdoc/registryw9x.cxx b/setup_native/source/win32/customactions/reg4msdoc/registryw9x.cxx
index 47cc8ce70ec5..30e1cf07c5b5 100644
--- a/setup_native/source/win32/customactions/reg4msdoc/registryw9x.cxx
+++ b/setup_native/source/win32/customactions/reg4msdoc/registryw9x.cxx
@@ -26,10 +26,6 @@
*
************************************************************************/
-//---------------------------------------
-//
-//---------------------------------------
-
#include "registryw9x.hxx"
#include <windows.h>
@@ -44,10 +40,6 @@
#pragma warning(disable : 4786 4350)
#endif
-//---------------------------------------
-//
-//---------------------------------------
-
const size_t MAX_TMP_BUFF_SIZE = 1024 * sizeof(wchar_t);
@@ -138,9 +130,6 @@ size_t RegistryKeyImplWin9x::GetSubKeyCount() const
return nSubKeys;
}
-//-----------------------------------------------------
-/**
-*/
StringListPtr RegistryKeyImplWin9x::GetSubKeyNames() const
{
assert(IsOpen());
@@ -176,9 +165,6 @@ StringListPtr RegistryKeyImplWin9x::GetSubKeyNames() const
return (StringListPtr) key_names;
}
-//-----------------------------------------------------
-/**
-*/
StringListPtr RegistryKeyImplWin9x::GetSubValueNames() const
{
assert(IsOpen());
diff --git a/setup_native/source/win32/customactions/reg4msdoc/registryw9x.hxx b/setup_native/source/win32/customactions/reg4msdoc/registryw9x.hxx
index 46c25cb898cf..8921d15330f4 100644
--- a/setup_native/source/win32/customactions/reg4msdoc/registryw9x.hxx
+++ b/setup_native/source/win32/customactions/reg4msdoc/registryw9x.hxx
@@ -30,7 +30,6 @@
#define _REGISTRYW9X_HXX_
#include "registry.hxx"
-#include "registry.hxx"
//---------------------------------------
// constants
diff --git a/setup_native/source/win32/customactions/reg4msdoc/registrywnt.cxx b/setup_native/source/win32/customactions/reg4msdoc/registrywnt.cxx
index 4f60d0cae32a..8776e0edd0e0 100644
--- a/setup_native/source/win32/customactions/reg4msdoc/registrywnt.cxx
+++ b/setup_native/source/win32/customactions/reg4msdoc/registrywnt.cxx
@@ -26,10 +26,6 @@
*
************************************************************************/
-//---------------------------------------
-//
-//---------------------------------------
-
#ifdef _MSC_VER
#pragma warning(push, 1) /* disable warnings within system headers */
#endif
@@ -49,10 +45,6 @@
#pragma warning(disable : 4786 4350)
#endif
-//---------------------------------------
-//
-//---------------------------------------
-
const size_t MAX_TMP_BUFF_SIZE = 1024 * sizeof(wchar_t);
@@ -143,9 +135,6 @@ size_t RegistryKeyImplWinNT::GetSubKeyCount() const
return nSubKeys;
}
-//-----------------------------------------------------
-/**
-*/
StringListPtr RegistryKeyImplWinNT::GetSubKeyNames() const
{
assert(IsOpen());
@@ -185,9 +174,6 @@ StringListPtr RegistryKeyImplWinNT::GetSubKeyNames() const
#endif
}
-//-----------------------------------------------------
-/**
-*/
StringListPtr RegistryKeyImplWinNT::GetSubValueNames() const
{
assert(IsOpen());
diff --git a/setup_native/source/win32/customactions/reg4msdoc/windowsregistry.cxx b/setup_native/source/win32/customactions/reg4msdoc/windowsregistry.cxx
index 1e97f779bc39..e06f1e51bd51 100644
--- a/setup_native/source/win32/customactions/reg4msdoc/windowsregistry.cxx
+++ b/setup_native/source/win32/customactions/reg4msdoc/windowsregistry.cxx
@@ -11,10 +11,6 @@
#pragma warning(disable : 4350)
#endif
-//------------------------------
-//
-//------------------------------
-
WindowsRegistry::WindowsRegistry()
{
OSVERSIONINFOA osverinfo;
@@ -25,46 +21,26 @@ WindowsRegistry::WindowsRegistry()
m_IsWinNT = (osverinfo.dwPlatformId == VER_PLATFORM_WIN32_NT);
}
-//------------------------------
-//
-//------------------------------
-
RegistryKey WindowsRegistry::GetClassesRootKey(bool Writeable) const
{
return GetRegistryKey(HKEY_CLASSES_ROOT, Writeable);
}
-//------------------------------
-//
-//------------------------------
-
RegistryKey WindowsRegistry::GetCurrentUserKey(bool Writeable) const
{
return GetRegistryKey(HKEY_CURRENT_USER, Writeable);
}
-//------------------------------
-//
-//------------------------------
-
RegistryKey WindowsRegistry::GetLocalMachineKey(bool Writeable) const
{
return GetRegistryKey(HKEY_LOCAL_MACHINE, Writeable);
}
-//------------------------------
-//
-//------------------------------
-
RegistryKey WindowsRegistry::GetUserKey(bool Writeable) const
{
return GetRegistryKey(HKEY_USERS, Writeable);
}
-//------------------------------
-//
-//------------------------------
-
RegistryKey WindowsRegistry::GetRegistryKey(HKEY RootKey, bool Writeable) const
{
RegistryKey regkey;
diff --git a/setup_native/source/win32/customactions/reg64/makefile.mk b/setup_native/source/win32/customactions/reg64/makefile.mk
index 04117c10365d..5e807cfbebb8 100644
--- a/setup_native/source/win32/customactions/reg64/makefile.mk
+++ b/setup_native/source/win32/customactions/reg64/makefile.mk
@@ -63,8 +63,6 @@ STDSHL += \
$(MSILIB)\
$(SHLWAPILIB)\
-# msvcprt.lib
-
SHL1TARGET = $(TARGET)
SHL1IMPLIB = i$(TARGET)
@@ -76,33 +74,8 @@ DEF1EXPORTFILE=exports.dxp
.ENDIF
-
-# --- mapimailer --------------------------------------------------------
-
-#TARGETTYPE=CUI
-
-#OBJFILES= $(OBJ)$/reg64.obj
-
-#APP1TARGET=reg64
-#APP1OBJS=$(OBJFILES)
-#APP1STDLIBS=$(KERNEL32LIB)\
-# $(ADVAPI32LIB)\
-# $(MSILIB)\
-# $(SHELL32LIB)\
-# msvcprt.lib\
-# $(OLE32LIB)\
-# $(COMCTL32LIB)\
-# $(UUIDLIB)
-
-
-#APP1DEF=$(MISC)$/$(APP1TARGET).def
-
# --- Targets --------------------------------------------------------------
.INCLUDE : target.mk
INCLUDE!:=$(subst,/stl, $(INCLUDE))
.EXPORT : INCLUDE
-
-# -------------------------------------------------------------------------
-
-
diff --git a/setup_native/source/win32/customactions/reg64/reg64.cxx b/setup_native/source/win32/customactions/reg64/reg64.cxx
index fe22ed86b829..c4bf4f5aefe4 100644
--- a/setup_native/source/win32/customactions/reg64/reg64.cxx
+++ b/setup_native/source/win32/customactions/reg64/reg64.cxx
@@ -207,7 +207,6 @@ bool IsInstallForAllUsers( MSIHANDLE hMSI )
wchar_t* GetBasisInstallLocation( MSIHANDLE hMSI )
{
OutputDebugStringFormat(L"GetBasisInstallLocation - START\n" );
- bool bResult = FALSE;
wchar_t* pVal = NULL;
GetMsiProp( hMSI, L"INSTALLLOCATION", &pVal);
@@ -254,13 +253,6 @@ bool DeleteRegistryKey(HKEY RootKey, const wchar_t* KeyName)
return (ERROR_SUCCESS == rc);
}
-
-
-
-//---------------------------------------
-//
-//---------------------------------------
-
bool SetRegistryKey(HKEY RootKey, const wchar_t* KeyName, const wchar_t* ValueName, const wchar_t* Value)
{
HKEY hSubKey;
diff --git a/setup_native/source/win32/customactions/regpatchactivex/makefile.mk b/setup_native/source/win32/customactions/regpatchactivex/makefile.mk
index d79593abcc69..4c6668db268c 100644
--- a/setup_native/source/win32/customactions/regpatchactivex/makefile.mk
+++ b/setup_native/source/win32/customactions/regpatchactivex/makefile.mk
@@ -34,19 +34,16 @@ USE_DEFFILE=TRUE
# --- Settings -----------------------------------------------------
-# NO_DEFAULT_STL=TRUE
ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
STDSHL=
-# SOLARINC!:=$(SOLARINC:s/stl//)
# --- Files --------------------------------------------------------
INCPRE+=.\Include
.DIRCACHE=NO
-# CFLAGS+=-E
SLOFILES = $(SLO)$/regpatchactivex.obj
@@ -72,7 +69,6 @@ SHL1STDLIBS+= libcmt.lib
SHL1LIBS = $(SLB)$/$(TARGET).lib
-#SHL1TARGET = $(TARGET)$(DLLPOSTFIX)
SHL1TARGET = $(TARGET)
SHL1IMPLIB = i$(TARGET)
diff --git a/setup_native/source/win32/customactions/shellextensions/layerlinks.cxx b/setup_native/source/win32/customactions/shellextensions/layerlinks.cxx
index 11c9757ff921..56885d408b77 100644
--- a/setup_native/source/win32/customactions/shellextensions/layerlinks.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/layerlinks.cxx
@@ -117,11 +117,6 @@ extern "C" UINT __stdcall CreateLayerLinks(MSIHANDLE handle)
stripFinalBackslash(&sBasisInstallPath);
stripFinalBackslash(&sUreInstallPath);
- // string myText1 = TEXT("Creating Basis-Link: ") + sBasisLinkPath;
- // string myText2 = TEXT("Creating Ure-Link: ") + sUreLinkPath;
- // MessageBox(NULL, myText1.c_str(), "DEBUG", MB_OK);
- // MessageBox(NULL, myText2.c_str(), "DEBUG", MB_OK);
-
// creating basis-link in brand layer
HANDLE h1file = CreateFile(
@@ -151,7 +146,6 @@ extern "C" UINT __stdcall CreateLayerLinks(MSIHANDLE handle)
LPSTR lpPathUTF8 = new CHAR[nCharsRequired];
WideCharToMultiByte( CP_UTF8, 0, lpPathW, -1, lpPathUTF8, nCharsRequired, NULL, NULL );
- // WriteFile( h1file, sBasisInstallPath.c_str(), sBasisInstallPath.size() ,&dummy, 0 );
WriteFile( h1file, lpPathUTF8, strlen(lpPathUTF8) ,&dummy, 0 );
delete lpPathUTF8;
@@ -193,7 +187,6 @@ extern "C" UINT __stdcall CreateLayerLinks(MSIHANDLE handle)
LPSTR lpPathUTF8 = new CHAR[nCharsRequired];
WideCharToMultiByte( CP_UTF8, 0, lpPathW, -1, lpPathUTF8, nCharsRequired, NULL, NULL );
- // WriteFile( h2file, sUreInstallPath.c_str(), sUreInstallPath.size() ,&dummy, 0 );
WriteFile( h2file, lpPathUTF8, strlen(lpPathUTF8) ,&dummy, 0 );
delete lpPathUTF8;
@@ -221,12 +214,7 @@ extern "C" UINT __stdcall RemoveLayerLinks(MSIHANDLE handle)
string sUreLinkPath = sBasisInstallPath + TEXT("ure-link");
string sUreDirName = sUreInstallPath + TEXT("bin");
- // string myText2 = TEXT("Deleting Ure-Link: ") + sUreLinkPath;
- // MessageBox(NULL, myText2.c_str(), "DEBUG", MB_OK);
-
// Deleting link to basis layer
- // string myText1 = TEXT("Deleting Basis-Link: ") + sBasisLinkPath;
- // MessageBox(NULL, myText1.c_str(), "DEBUG", MB_OK);
DeleteFile(sBasisLinkPath.c_str());
// Check, if URE is still installed
@@ -236,22 +224,10 @@ extern "C" UINT __stdcall RemoveLayerLinks(MSIHANDLE handle)
if ( hFindContent == INVALID_HANDLE_VALUE ) { ureDirExists = false; }
FindClose( hFindContent );
- // if ( ureDirExists )
- // {
- // string myText3 = TEXT("URE directory still exists: ") + sUreDirName;
- // MessageBox(NULL, myText3.c_str(), "DEBUG", MB_OK);
- // string myText4 = TEXT("URE link NOT removed: ") + sUreLinkPath;
- // MessageBox(NULL, myText4.c_str(), "DEBUG", MB_OK);
- // }
-
// Deleting link to URE layer, if URE dir no longer exists
if ( ! ureDirExists )
{
- // string myText5 = TEXT("URE directory does not exist: ") + sUreDirName;
- // MessageBox(NULL, myText5.c_str(), "DEBUG", MB_OK);
DeleteFile(sUreLinkPath.c_str());
- // string myText6 = TEXT("URE link removed: ") + sUreLinkPath;
- // MessageBox(NULL, myText6.c_str(), "DEBUG", MB_OK);
}
return ERROR_SUCCESS;
diff --git a/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx b/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx
index 9075436e0412..aecd1057a067 100644
--- a/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx
@@ -268,7 +268,7 @@ static BOOL RemoveCompleteDirectory( std::_tstring sPath )
}
else
{
- mystr = "An error occured during removing content of " + sCompleteFileName;
+ mystr = "An error occurred during removing content of " + sCompleteFileName;
// MessageBox(NULL, mystr.c_str(), "Error removing directory", MB_OK);
}
}
@@ -282,7 +282,7 @@ static BOOL RemoveCompleteDirectory( std::_tstring sPath )
}
else
{
- mystr = "An error occured during removal of file " + sCompleteFileName;
+ mystr = "An error occurred during removal of file " + sCompleteFileName;
// MessageBox(NULL, mystr.c_str(), "Error removing file", MB_OK);
}
}
@@ -307,7 +307,7 @@ static BOOL RemoveCompleteDirectory( std::_tstring sPath )
}
else
{
- mystr = "An error occured during removal of empty directory " + sPath;
+ mystr = "An error occurred during removal of empty directory " + sPath;
// MessageBox(NULL, mystr.c_str(), "Error removing directory", MB_OK);
bDirectoryRemoved = false;
}
@@ -355,7 +355,7 @@ extern "C" UINT __stdcall RegisterExtensions(MSIHANDLE handle)
// }
// else
// {
-// mystr = "An error occured during execution!";
+// mystr = "An error occurred during execution!";
// MessageBox(NULL, mystr.c_str(), "Command", MB_OK);
// }
@@ -420,7 +420,7 @@ extern "C" UINT __stdcall RemoveExtensions(MSIHANDLE handle)
// }
// else
// {
-// mystr = "An error occured during execution!";
+// mystr = "An error occurred during execution!";
// MessageBox(NULL, mystr.c_str(), "Main methode", MB_OK);
// }
diff --git a/setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx b/setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx
index 9c5e6d4eb416..6b8a85eb163f 100644
--- a/setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx
@@ -76,9 +76,6 @@ extern "C" UINT __stdcall InstallStartmenuFolderIcon( MSIHANDLE handle )
{
std::_tstring sOfficeMenuFolder = GetMsiProperty( handle, TEXT("OfficeMenuFolder") );
std::_tstring sDesktopFile = sOfficeMenuFolder + TEXT("Desktop.ini");
-
- // MessageBox(NULL, sDesktopFile.c_str(), TEXT("OfficeMenuFolder"), MB_OK | MB_ICONINFORMATION);
-
std::_tstring sIconFile = GetMsiProperty( handle, TEXT("INSTALLLOCATION") ) + TEXT("program\\soffice.exe");
OSVERSIONINFO osverinfo;
@@ -114,14 +111,6 @@ extern "C" UINT __stdcall InstallStartmenuFolderIcon( MSIHANDLE handle )
TEXT("0"),
sDesktopFile.c_str() );
- /*
- WritePrivateProfileString(
- TEXT(".ShellClassInfo"),
- TEXT("InfoTip"),
- TEXT("StarOffice Productivity Suite"),
- sDesktopFile.c_str() );
- */
-
SetFileAttributes( sDesktopFile.c_str(), FILE_ATTRIBUTE_HIDDEN );
SetFileAttributes( sOfficeMenuFolder.c_str(), FILE_ATTRIBUTE_SYSTEM );
diff --git a/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx b/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx
index badd20ae241e..aede073d68d7 100644
--- a/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx
@@ -132,7 +132,7 @@ static BOOL RemoveCompleteDirectory( std::_tstring sPath )
}
else
{
- mystr = "An error occured during removing content of " + sCompleteFileName;
+ mystr = "An error occurred during removing content of " + sCompleteFileName;
// MessageBox(NULL, mystr.c_str(), "Error removing directory", MB_OK);
}
}
@@ -146,7 +146,7 @@ static BOOL RemoveCompleteDirectory( std::_tstring sPath )
}
else
{
- mystr = "An error occured during removal of file " + sCompleteFileName;
+ mystr = "An error occurred during removal of file " + sCompleteFileName;
// MessageBox(NULL, mystr.c_str(), "Error removing file", MB_OK);
}
}
@@ -171,7 +171,7 @@ static BOOL RemoveCompleteDirectory( std::_tstring sPath )
}
else
{
- mystr = "An error occured during removal of empty directory " + sPath;
+ mystr = "An error occurred during removal of empty directory " + sPath;
// MessageBox(NULL, mystr.c_str(), "Error removing directory", MB_OK);
bDirectoryRemoved = false;
}
diff --git a/setup_native/source/win32/customactions/tools/makefile.mk b/setup_native/source/win32/customactions/tools/makefile.mk
index 4e8d791eff15..9be7d7093da3 100644
--- a/setup_native/source/win32/customactions/tools/makefile.mk
+++ b/setup_native/source/win32/customactions/tools/makefile.mk
@@ -62,8 +62,6 @@ STDSHL+= \
STDSHL+=$(LIBSTLPORTST)
.ENDIF
-#SHL1LIBS = $(SLB)$/$(TARGET).lib
-
SHL1TARGET = $(TARGET)
SHL1IMPLIB = i$(TARGET)
diff --git a/setup_native/source/win32/stwrapper/makefile.mk b/setup_native/source/win32/stwrapper/makefile.mk
index ca035b4a9ad0..f81d86dc2f19 100644
--- a/setup_native/source/win32/stwrapper/makefile.mk
+++ b/setup_native/source/win32/stwrapper/makefile.mk
@@ -6,7 +6,6 @@ LIBTARGET=NO
ENABLE_EXCEPTIONS=TRUE
TARGETTYPE=GUI
USE_DEFFILE=TRUE
-#DYNAMIC_CRT:=
NO_DEFAULT_STL=TRUE
# --- Settings -----------------------------------------------------
@@ -46,5 +45,3 @@ DLLPRE =
.INCLUDE : target.mk
$(OBJ)$/stwrapper.obj: $(INCCOM)$/_version.h
-
-#$(RCFILES) : resource.rc
diff --git a/setup_native/source/win32/stwrapper/stwrapper.cxx b/setup_native/source/win32/stwrapper/stwrapper.cxx
index b4e22cf7afca..2376c94bf952 100644
--- a/setup_native/source/win32/stwrapper/stwrapper.cxx
+++ b/setup_native/source/win32/stwrapper/stwrapper.cxx
@@ -390,7 +390,6 @@ int WINAPI _tWinMain( HINSTANCE /*hInstance*/, HINSTANCE, LPTSTR, int )
if ( dwSTClientExitCode == ERR_NO_RECORDS_FOUND )
{
- // output=`${STCLIENT} -a [-i "${INSTANCE_URN}"] -p "${PRODUCT_NAME}" -e "${PRODUCT_VERSION}" -t "${TARGET_URN}" -S "${PRODUCT_SOURCE}" -P "${PARENT_PRODUCT_NAME}" -m "Sun Microsystems, Inc." -A ${uname} -z global`
lpCommandLine = new TCHAR[MAXCMDLINELEN];
_tcscpy( lpCommandLine, TEXT( "\"" ));