summaryrefslogtreecommitdiff
path: root/setup_native/source/win32/customactions
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-08-10 15:52:22 +0200
committerStephan Bergmann <sbergman@redhat.com>2012-08-10 16:03:28 +0200
commit6dcb3d4ef46312729bb6f16c473b433474863f68 (patch)
tree58f2f577d9883e32b886bbe4086f83d0bb16fc81 /setup_native/source/win32/customactions
parentf2f3703740f65b76e891ecc3591d7e60d5b7caef (diff)
Related fdo#51252: No more prereg, no more unopkg sync
Now that 5c47e5f63a79a9e72ec4a100786b1bbf65137ed4 "fdo#51252 Disable copying share/prereg/bundled to avoid startup crashes" removed the use of share/prereg, there is no longer need to generate it in the first place (by calling "unopkg sync" at build or installation time), and so no need for the "unopkg sync" sub- command, either. This also allows to simplify some of the jvmfwk code that was only there so that "unopkg sync" (which can require a JVM) can work in "hostile" environments (during build and installation). Change-Id: I52657384f4561bf27948ba4f0f88f4498e90987f
Diffstat (limited to 'setup_native/source/win32/customactions')
-rw-r--r--setup_native/source/win32/customactions/languagepacks/exports.dxp1
-rw-r--r--setup_native/source/win32/customactions/languagepacks/makefile.mk1
-rw-r--r--setup_native/source/win32/customactions/patch/exports.dxp2
-rw-r--r--setup_native/source/win32/customactions/patch/makefile.mk1
-rw-r--r--setup_native/source/win32/customactions/shellextensions/exports.dxp2
-rw-r--r--setup_native/source/win32/customactions/shellextensions/makefile.mk1
-rw-r--r--setup_native/source/win32/customactions/shellextensions/registerextensions.cxx227
7 files changed, 0 insertions, 235 deletions
diff --git a/setup_native/source/win32/customactions/languagepacks/exports.dxp b/setup_native/source/win32/customactions/languagepacks/exports.dxp
index eb3e3c34829a..8309a1be9bdc 100644
--- a/setup_native/source/win32/customactions/languagepacks/exports.dxp
+++ b/setup_native/source/win32/customactions/languagepacks/exports.dxp
@@ -1,5 +1,4 @@
SetProductInstallationPath
RegisterLanguagePack
GetUserInstallMode
-RegisterExtensions
diff --git a/setup_native/source/win32/customactions/languagepacks/makefile.mk b/setup_native/source/win32/customactions/languagepacks/makefile.mk
index 921ca9baa9c7..dfd9a374a66c 100644
--- a/setup_native/source/win32/customactions/languagepacks/makefile.mk
+++ b/setup_native/source/win32/customactions/languagepacks/makefile.mk
@@ -64,7 +64,6 @@ STDSHL+= \
SHL1OBJS = $(SLOFILES) \
- $(SLO)$/registerextensions.obj \
$(SLO)$/seterror.obj
SHL1TARGET = $(TARGET)
diff --git a/setup_native/source/win32/customactions/patch/exports.dxp b/setup_native/source/win32/customactions/patch/exports.dxp
index 360156e6c25b..bb660772a68b 100644
--- a/setup_native/source/win32/customactions/patch/exports.dxp
+++ b/setup_native/source/win32/customactions/patch/exports.dxp
@@ -6,5 +6,3 @@ ShutDownQuickstarter
SetFeatureState
SetNewFeatureState
ShowOnlineUpdateDialog
-RegisterExtensions
-RemoveExtensions
diff --git a/setup_native/source/win32/customactions/patch/makefile.mk b/setup_native/source/win32/customactions/patch/makefile.mk
index 6b05b3df89b9..f1c9b2440b24 100644
--- a/setup_native/source/win32/customactions/patch/makefile.mk
+++ b/setup_native/source/win32/customactions/patch/makefile.mk
@@ -64,7 +64,6 @@ SHL1OBJS = $(SLOFILES) \
$(SLO)$/shutdown_quickstart.obj \
$(SLO)$/quickstarter.obj \
$(SLO)$/upgrade.obj \
- $(SLO)$/registerextensions.obj \
$(SLO)$/seterror.obj
SHL1TARGET = $(TARGET)
diff --git a/setup_native/source/win32/customactions/shellextensions/exports.dxp b/setup_native/source/win32/customactions/shellextensions/exports.dxp
index 474df7651882..aa86c2e0be57 100644
--- a/setup_native/source/win32/customactions/shellextensions/exports.dxp
+++ b/setup_native/source/win32/customactions/shellextensions/exports.dxp
@@ -5,8 +5,6 @@ RebuildShellIconCache
ExecutePostUninstallScript
CompleteInstallPath
MigrateInstallPath
-RegisterExtensions
-RemoveExtensions
CheckInstallDirectory
SetAdminInstallProperty
CreateLayerLinks
diff --git a/setup_native/source/win32/customactions/shellextensions/makefile.mk b/setup_native/source/win32/customactions/shellextensions/makefile.mk
index c7e619e517e3..ac50c2e141a2 100644
--- a/setup_native/source/win32/customactions/shellextensions/makefile.mk
+++ b/setup_native/source/win32/customactions/shellextensions/makefile.mk
@@ -55,7 +55,6 @@ SLOFILES = \
$(SLO)$/setadmininstall.obj \
$(SLO)$/layerlinks.obj \
$(SLO)$/dotnetcheck.obj \
- $(SLO)$/registerextensions.obj \
$(SLO)$/copyeditiondata.obj \
$(SLO)$/vistaspecial.obj \
$(SLO)$/checkpatches.obj \
diff --git a/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx b/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx
deleted file mode 100644
index b1c1810e43e5..000000000000
--- a/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx
+++ /dev/null
@@ -1,227 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#undef UNICODE
-#undef _UNICODE
-
-#define _WIN32_WINDOWS 0x0410
-
-#ifdef _MSC_VER
-#pragma warning(push, 1) /* disable warnings within system headers */
-#define WIN32_LEAN_AND_MEAN
-#endif
-#include <windows.h>
-#include <msiquery.h>
-#include <shellapi.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
-#include <malloc.h>
-#include <assert.h>
-#include <string.h>
-
-#ifdef UNICODE
-#define _UNICODE
-#define _tstring wstring
-#else
-#define _tstring string
-#endif
-#include <tchar.h>
-#include <string>
-
-static std::_tstring GetMsiProperty( MSIHANDLE handle, const std::_tstring& sProperty )
-{
- std::_tstring result;
- TCHAR szDummy[1] = TEXT("");
- DWORD nChars = 0;
-
- if ( MsiGetProperty( handle, sProperty.c_str(), szDummy, &nChars ) == ERROR_MORE_DATA )
- {
- DWORD nBytes = ++nChars * sizeof(TCHAR);
- LPTSTR buffer = reinterpret_cast<LPTSTR>(_alloca(nBytes));
- ZeroMemory( buffer, nBytes );
- MsiGetProperty(handle, sProperty.c_str(), buffer, &nChars);
- result = buffer;
- }
-
- return result;
-}
-
-/* creates a child process which is specified in lpCommand.
-
- out_exitCode is the exit code of the child process
-**/
-static BOOL ExecuteCommand( LPCTSTR lpCommand, DWORD * out_exitCode)
-{
- BOOL fSuccess = FALSE;
- STARTUPINFO si;
- PROCESS_INFORMATION pi;
-
- ZeroMemory( &si, sizeof(si) );
- si.cb = sizeof(si);
-
- fSuccess = CreateProcess(
- NULL,
- (LPTSTR)lpCommand,
- NULL,
- NULL,
- FALSE,
- 0,
- NULL,
- NULL,
- &si,
- &pi
- );
-
- if ( fSuccess )
- {
- WaitForSingleObject( pi.hProcess, INFINITE );
-
- if (!GetExitCodeProcess( pi.hProcess, out_exitCode))
- fSuccess = FALSE;
-
- CloseHandle( pi.hProcess );
- CloseHandle( pi.hThread );
- }
-
- return fSuccess;
-}
-
-static BOOL RemoveCompleteDirectory( std::_tstring sPath )
-{
- bool bDirectoryRemoved = true;
-
- std::_tstring sPattern = sPath + TEXT("\\") + TEXT("*.*");
- WIN32_FIND_DATA aFindData;
-
- // Finding all content in sPath
-
- HANDLE hFindContent = FindFirstFile( sPattern.c_str(), &aFindData );
-
- if ( hFindContent != INVALID_HANDLE_VALUE )
- {
- bool fNextFile = false;
-
- do
- {
- std::_tstring sFileName = aFindData.cFileName;
- std::_tstring sCurrentDir = TEXT(".");
- std::_tstring sParentDir = TEXT("..");
-
- if (( strcmp(sFileName.c_str(),sCurrentDir.c_str()) != 0 ) &&
- ( strcmp(sFileName.c_str(),sParentDir.c_str()) != 0 ))
- {
- std::_tstring sCompleteFileName = sPath + TEXT("\\") + sFileName;
-
- if ( aFindData.dwFileAttributes == FILE_ATTRIBUTE_DIRECTORY )
- {
- RemoveCompleteDirectory(sCompleteFileName);
- }
- else
- {
- DeleteFile( sCompleteFileName.c_str() );
- }
- }
-
- fNextFile = FindNextFile( hFindContent, &aFindData );
-
- } while ( fNextFile );
-
- FindClose( hFindContent );
-
- // empty directory can be removed now
- // RemoveDirectory is only successful, if the last handle to the directory is closed
- // -> first removing content -> closing handle -> remove empty directory
-
- if ( ! ( RemoveDirectory(sPath.c_str()) ) )
- {
- bDirectoryRemoved = false;
- }
- }
-
- return bDirectoryRemoved;
-}
-
-extern "C" UINT __stdcall RegisterExtensions(MSIHANDLE handle)
-{
- std::_tstring sInstDir = GetMsiProperty( handle, TEXT("CustomActionData") );
- std::_tstring sUnoPkgFile = sInstDir + TEXT("program\\unopkg.exe");
- std::_tstring mystr;
-
- WIN32_FIND_DATA aFindFileData;
- bool registrationError = false;
-
- // Find unopkg.exe
- HANDLE hFindUnopkg = FindFirstFile( sUnoPkgFile.c_str(), &aFindFileData );
-
- if ( hFindUnopkg != INVALID_HANDLE_VALUE )
- {
- // unopkg.exe exists in program directory
- std::_tstring sCommand = sUnoPkgFile + " sync";
-
- DWORD exitCode = 0;
- bool fSuccess = ExecuteCommand( sCommand.c_str(), & exitCode);
- if ( ! fSuccess )
- {
- mystr = "ERROR: An error occured during registration of extensions!";
- MessageBox(NULL, mystr.c_str(), "ERROR", MB_OK);
- registrationError = true;
- }
-
- FindClose( hFindUnopkg );
- }
-
- if ( registrationError )
- {
- return 1;
- }
- else
- {
- return ERROR_SUCCESS;
- }
-}
-
-
-extern "C" UINT __stdcall RemoveExtensions(MSIHANDLE handle)
-{
- std::_tstring sInstDir = GetMsiProperty( handle, TEXT("CustomActionData") );
-
- // Removing complete directory "share\prereg\bundled"
- RemoveCompleteDirectory( sInstDir + TEXT("share\\prereg\\bundled") );
-
- // At this point we need to take care about removing upper directories,
- // because we are after InstallFinalize. We remove only empty directories.
- RemoveDirectory( (sInstDir + TEXT("share\\prereg")).c_str() );
- RemoveDirectory( (sInstDir + TEXT("share")).c_str() );
- RemoveDirectory( sInstDir.c_str() );
-
- return ERROR_SUCCESS;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */