diff options
author | Andras Timar <atimar@suse.com> | 2013-01-29 13:06:42 +0100 |
---|---|---|
committer | Andras Timar <atimar@suse.com> | 2013-01-30 15:25:00 +0100 |
commit | bc20ba9cd6502b59853d1ca6e2818936290a720a (patch) | |
tree | 9560b0f5ff3085becaed9d96b2ee28b1ffbdf2be /setup_native | |
parent | d61d1face977022ea8c6d93aad49a2c97a0abd17 (diff) |
convert SetAdminInstallProperty CustomAction to type 51
It does not make sense to call a dll function to set a single property to 1.
Change-Id: I4e3cb35d2d3b644805d1d7573c9bf1dc45befbd4
Diffstat (limited to 'setup_native')
3 files changed, 0 insertions, 62 deletions
diff --git a/setup_native/source/win32/customactions/shellextensions/exports.dxp b/setup_native/source/win32/customactions/shellextensions/exports.dxp index aa86c2e0be57..b9fbe18890e3 100644 --- a/setup_native/source/win32/customactions/shellextensions/exports.dxp +++ b/setup_native/source/win32/customactions/shellextensions/exports.dxp @@ -6,7 +6,6 @@ ExecutePostUninstallScript CompleteInstallPath MigrateInstallPath CheckInstallDirectory -SetAdminInstallProperty CreateLayerLinks RemoveLayerLinks DotNetCheck diff --git a/setup_native/source/win32/customactions/shellextensions/makefile.mk b/setup_native/source/win32/customactions/shellextensions/makefile.mk index 53096143cd38..93eaaa87cd87 100644 --- a/setup_native/source/win32/customactions/shellextensions/makefile.mk +++ b/setup_native/source/win32/customactions/shellextensions/makefile.mk @@ -44,7 +44,6 @@ SLOFILES = \ $(SLO)$/migrateinstallpath.obj \ $(SLO)$/completeinstallpath.obj \ $(SLO)$/checkdirectory.obj \ - $(SLO)$/setadmininstall.obj \ $(SLO)$/layerlinks.obj \ $(SLO)$/dotnetcheck.obj \ $(SLO)$/copyeditiondata.obj \ diff --git a/setup_native/source/win32/customactions/shellextensions/setadmininstall.cxx b/setup_native/source/win32/customactions/shellextensions/setadmininstall.cxx deleted file mode 100644 index bc010c630942..000000000000 --- a/setup_native/source/win32/customactions/shellextensions/setadmininstall.cxx +++ /dev/null @@ -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: */ |