mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

convert SetAdminInstallProperty CustomAction to type 51

Browse Source 
It does not make sense to call a dll function to set a single property to 1.

Change-Id: I4e3cb35d2d3b644805d1d7573c9bf1dc45befbd4
This commit is contained in:
Andras Timar
2013-01-29 13:06:42 +01:00
parent d61d1face9
commit bc20ba9cd6
6 changed files with 2 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
instsetoo_native/inc_openoffice/windows/msi_templates/AdminExe.idt
View File

@@ -11,3 +11,4 @@ InstallFinalize 400
InstallInitialize 250 InstallInitialize 250
InstallValidate 200 InstallValidate 200
ScheduleReboot ISSCHEDULEREBOOT 375 ScheduleReboot ISSCHEDULEREBOOT 375
SetAdminInstallProperty 248

1
instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
View File

@@ -12,3 +12,4 @@ SetLanguageSelected 51 LANG_SELECTED 1
ResetLanguageSelected 51 LANG_SELECTED 0 ResetLanguageSelected 51 LANG_SELECTED 0
SetApplicationSelected 51 APP_SELECTED 1 SetApplicationSelected 51 APP_SELECTED 1
ResetApplicationSelected 51 APP_SELECTED 0 ResetApplicationSelected 51 APP_SELECTED 0
SetAdminInstallProperty 51 ADMININSTALL 1

9
scp2/source/ooo/windowscustomaction_ooo.scp
View File

@@ -176,15 +176,6 @@ WindowsCustomAction gid_Customaction_Shellextensionsdll7
Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\" And Not PATCH", "InstallValidate"); Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\" And Not PATCH", "InstallValidate");
End End
WindowsCustomAction gid_Customaction_Set_Admininstall
Name = "SetAdminInstallProperty";
Typ = "65";
Source = "shlxtmsi.dll";
Target = "SetAdminInstallProperty";
Inbinarytable = 1;
Assignment1 = ("AdminExecuteSequence", "", "InstallInitialize");
End
WindowsCustomAction gid_Customaction_Check_Install_Directory WindowsCustomAction gid_Customaction_Check_Install_Directory
Name = "CheckInstallDirectory"; Name = "CheckInstallDirectory";
Typ = "65"; Typ = "65";

1
setup_native/source/win32/customactions/shellextensions/exports.dxp
View File

@@ -6,7 +6,6 @@ ExecutePostUninstallScript
CompleteInstallPath CompleteInstallPath
MigrateInstallPath MigrateInstallPath
CheckInstallDirectory CheckInstallDirectory
SetAdminInstallProperty
CreateLayerLinks CreateLayerLinks
RemoveLayerLinks RemoveLayerLinks
DotNetCheck DotNetCheck

1
setup_native/source/win32/customactions/shellextensions/makefile.mk
View File

@@ -44,7 +44,6 @@ SLOFILES = \
$(SLO)$/migrateinstallpath.obj \ $(SLO)$/migrateinstallpath.obj \
$(SLO)$/completeinstallpath.obj \ $(SLO)$/completeinstallpath.obj \
$(SLO)$/checkdirectory.obj \ $(SLO)$/checkdirectory.obj \
$(SLO)$/setadmininstall.obj \
$(SLO)$/layerlinks.obj \ $(SLO)$/layerlinks.obj \
$(SLO)$/dotnetcheck.obj \ $(SLO)$/dotnetcheck.obj \
$(SLO)$/copyeditiondata.obj \ $(SLO)$/copyeditiondata.obj \

60
setup_native/source/win32/customactions/shellextensions/setadmininstall.cxx
View File

@@ -1,60 +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 _WIN32_WINNT 0x0401
#ifdef _MSC_VER
#pragma warning(push, 1) /* disable warnings within system headers */
#endif
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <msiquery.h>
#ifdef _MSC_VER
#pragma warning(pop)
#endif
#include <malloc.h>
#include <assert.h>
#ifdef UNICODE
#define _UNICODE
#define _tstring wstring
#else
#define _tstring string
#endif
#include <tchar.h>
#include <string>
#include <queue>
#include <stdio.h>
#include <systools/win32/uwinapi.h>
#include <../tools/seterror.hxx>
static void SetMsiProperty(MSIHANDLE handle, const std::_tstring& sProperty)
{
MsiSetProperty(handle, sProperty.c_str(), TEXT("1"));
}
extern "C" UINT __stdcall SetAdminInstallProperty(MSIHANDLE handle)
{
SetMsiProperty(handle, TEXT("ADMININSTALL"));
return ERROR_SUCCESS;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */