Kaydet (Commit) 677670e4 authored tarafından Michael Stahl's avatar Michael Stahl

setup_native, scp2: remove "regpatchactivex" MSI custom-action and lib

This was effectively omitted from the installation set since commit
26c142ca, and is apparently related to
the obsolete StarOffice patch mechanism.

Change-Id: I9a4c113e19e5b2b751e3da64b4dde53320132a35
üst 4bab1f2d
...@@ -649,7 +649,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_SHLXTHDL, \ ...@@ -649,7 +649,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_SHLXTHDL, \
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
fop \ fop \
jfregca \ jfregca \
regpatchactivex \
thidxmsi \ thidxmsi \
)) ))
endif endif
......
...@@ -31,6 +31,5 @@ Module gid_Module_Optional_Activexcontrol ...@@ -31,6 +31,5 @@ Module gid_Module_Optional_Activexcontrol
ParentID = gid_Module_Optional; ParentID = gid_Module_Optional;
Files = (auto_activexbinarytable_ALL, Files = (auto_activexbinarytable_ALL,
auto_activex_ALL, auto_activex_ALL,
auto_activexwin64_ALL, auto_activexwin64_ALL);
gid_File_Lib_Regpatchactivex_Msi);
End End
...@@ -142,15 +142,6 @@ WindowsCustomAction gid_Customaction_Check_Install_Directory ...@@ -142,15 +142,6 @@ WindowsCustomAction gid_Customaction_Check_Install_Directory
Assignment3 = ("ControlEvent", "CustomSetup", "Next", "DoAction", "CheckInstallDirectory", "Not Installed", "2"); Assignment3 = ("ControlEvent", "CustomSetup", "Next", "DoAction", "CheckInstallDirectory", "Not Installed", "2");
End End
WindowsCustomAction gid_Customaction_Patch_Regpatchactivex_Patchactivexcontrol
Name = "PatchActiveXControl";
Typ = "65";
Source = "regpatchactivex.dll";
Target = "PatchActiveXControl";
Inbinarytable = 1;
Assignment1 = ("InstallExecuteSequence", "\&FEATURETEMPLATE=3", "end");
End
WindowsCustomAction gid_Customaction_CheckPatchList WindowsCustomAction gid_Customaction_CheckPatchList
Name = "CheckPatchList"; Name = "CheckPatchList";
Typ = "65"; Typ = "65";
......
# -*- 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:
...@@ -33,7 +33,6 @@ $(eval $(call gb_Module_add_targets,setup_native,\ ...@@ -33,7 +33,6 @@ $(eval $(call gb_Module_add_targets,setup_native,\
Library_qslnkmsi \ Library_qslnkmsi \
Library_reg4allmsdoc \ Library_reg4allmsdoc \
$(if $(DISABLE_ACTIVEX),,Library_regactivex) \ $(if $(DISABLE_ACTIVEX),,Library_regactivex) \
Library_regpatchactivex \
Library_sdqsmsi \ Library_sdqsmsi \
Library_sellangmsi \ Library_sellangmsi \
Library_shlxtmsi \ Library_shlxtmsi \
......
/* -*- 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: */
LIBRARY "regpatchactivex.dll"
EXPORTS
PatchActiveXControl
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment