summaryrefslogtreecommitdiff
path: root/setup_native
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2014-08-02 20:34:31 +0200
committerMichael Stahl <mstahl@redhat.com>2014-08-02 22:23:50 +0200
commit677670e46783084891db7405866a3bd1a652cfac (patch)
treecac1d9bdcbf2d5b6426c16e848fdc53c10dfcdb2 /setup_native
parent4bab1f2dea44e54b72096eba0f5bc7a0a71c5589 (diff)
setup_native, scp2: remove "regpatchactivex" MSI custom-action and lib
This was effectively omitted from the installation set since commit 26c142ca5f2b405b02ab5701dfaeab7bf281a727, and is apparently related to the obsolete StarOffice patch mechanism. Change-Id: I9a4c113e19e5b2b751e3da64b4dde53320132a35
Diffstat (limited to 'setup_native')
-rw-r--r--setup_native/Library_regpatchactivex.mk39
-rw-r--r--setup_native/Module_setup_native.mk1
-rw-r--r--setup_native/source/win32/customactions/regpatchactivex/regpatchactivex.cxx115
-rw-r--r--setup_native/source/win32/customactions/regpatchactivex/regpatchactivex.def3
4 files changed, 0 insertions, 158 deletions
diff --git a/setup_native/Library_regpatchactivex.mk b/setup_native/Library_regpatchactivex.mk
deleted file mode 100644
index 30bf07d8b843..000000000000
--- a/setup_native/Library_regpatchactivex.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Library_Library,regpatchactivex))
-
-$(eval $(call gb_Library_add_defs,regpatchactivex,\
- -U_DLL \
-))
-
-$(eval $(call gb_Library_add_cxxflags,regpatchactivex,\
- $(if $(MSVC_USE_DEBUG_RUNTIME),/MTd,/MT) \
-))
-
-$(eval $(call gb_Library_add_ldflags,regpatchactivex,\
- /DEF:$(SRCDIR)/setup_native/source/win32/customactions/regpatchactivex/regpatchactivex.def \
- /NODEFAULTLIB \
-))
-
-$(eval $(call gb_Library_add_exception_objects,regpatchactivex,\
- setup_native/source/win32/customactions/regpatchactivex/regpatchactivex \
-))
-
-$(eval $(call gb_Library_use_system_win32_libs,regpatchactivex,\
- libcmt \
- libcpmt \
- msi \
- kernel32 \
- user32 \
- advapi32 \
- shell32 \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/setup_native/Module_setup_native.mk b/setup_native/Module_setup_native.mk
index 19226c2274a3..d0f935e26240 100644
--- a/setup_native/Module_setup_native.mk
+++ b/setup_native/Module_setup_native.mk
@@ -33,7 +33,6 @@ $(eval $(call gb_Module_add_targets,setup_native,\
Library_qslnkmsi \
Library_reg4allmsdoc \
$(if $(DISABLE_ACTIVEX),,Library_regactivex) \
- Library_regpatchactivex \
Library_sdqsmsi \
Library_sellangmsi \
Library_shlxtmsi \
diff --git a/setup_native/source/win32/customactions/regpatchactivex/regpatchactivex.cxx b/setup_native/source/win32/customactions/regpatchactivex/regpatchactivex.cxx
deleted file mode 100644
index b8087af82deb..000000000000
--- a/setup_native/source/win32/customactions/regpatchactivex/regpatchactivex.cxx
+++ /dev/null
@@ -1,115 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#define UNICODE
-
-#ifdef _MSC_VER
-#pragma warning(push,1) // disable warnings within system headers
-#endif
-#include <windows.h>
-#include <msiquery.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
-#include <string.h>
-#include <malloc.h>
-#include <stdio.h>
-
-
-BOOL UnicodeEquals( wchar_t* pStr1, wchar_t* pStr2 )
-{
- if ( pStr1 == NULL && pStr2 == NULL )
- return TRUE;
- else if ( pStr1 == NULL || pStr2 == NULL )
- return FALSE;
-
- while( *pStr1 == *pStr2 && *pStr1 && *pStr2 )
- pStr1++, pStr2++;
-
- return ( *pStr1 == 0 && *pStr2 == 0 );
-}
-
-
-BOOL GetMsiProp( MSIHANDLE hMSI, const wchar_t* pPropName, wchar_t** ppValue )
-{
- DWORD sz = 0;
- if ( MsiGetProperty( hMSI, pPropName, L"", &sz ) == ERROR_MORE_DATA )
- {
- sz++;
- DWORD nbytes = sz * sizeof( wchar_t );
- wchar_t* buff = reinterpret_cast<wchar_t*>( malloc( nbytes ) );
- ZeroMemory( buff, nbytes );
- MsiGetProperty( hMSI, pPropName, buff, &sz );
- *ppValue = buff;
-
- return TRUE;
- }
-
- return FALSE;
-}
-
-
-BOOL MakeInstallForAllUsers( MSIHANDLE hMSI )
-{
- BOOL bResult = FALSE;
- wchar_t* pVal = NULL;
- if ( GetMsiProp( hMSI, L"ALLUSERS", &pVal ) && pVal )
- {
- bResult = UnicodeEquals( pVal , L"1" );
- free( pVal );
- }
-
- return bResult;
-}
-
-
-extern "C" UINT __stdcall PatchActiveXControl( MSIHANDLE hMSI )
-{
- // MessageBox(NULL, L"PatchActiveXControl", L"Information", MB_OK | MB_ICONINFORMATION);
-
- INSTALLSTATE current_state;
- INSTALLSTATE future_state;
-
- if ( ERROR_SUCCESS == MsiGetFeatureState( hMSI, L"gm_o_Activexcontrol", &current_state, &future_state ) )
- {
- BOOL bInstallForAllUsers = MakeInstallForAllUsers( hMSI );
-
- if ( future_state == INSTALLSTATE_LOCAL
- || ( current_state == INSTALLSTATE_LOCAL && future_state == INSTALLSTATE_UNKNOWN ) )
- {
- HKEY hkey = NULL;
- char* aSubKey = "Software\\Classes\\MIME\\DataBase\\Content Type\\application/vnd.sun.xml.base";
- if ( ERROR_SUCCESS == RegCreateKeyA(bInstallForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey, &hkey) )
- {
- RegDeleteValueA( hkey, "CLSID" );
- RegCloseKey( hkey ), hkey = NULL;
- }
- }
- }
- else
- {
- // assert( FALSE );
- }
-
- return ERROR_SUCCESS;
-}
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/setup_native/source/win32/customactions/regpatchactivex/regpatchactivex.def b/setup_native/source/win32/customactions/regpatchactivex/regpatchactivex.def
deleted file mode 100644
index e5c021d8870a..000000000000
--- a/setup_native/source/win32/customactions/regpatchactivex/regpatchactivex.def
+++ /dev/null
@@ -1,3 +0,0 @@
-LIBRARY "regpatchactivex.dll"
-EXPORTS
- PatchActiveXControl \ No newline at end of file