From d14c765b6e20158af34520e1092c552a6d28bbb3 Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Wed, 30 Jan 2013 13:25:16 +0100 Subject: remove CopyExtensionData CustomAction It copied *.oxt from [SourceDir]\extension to TARGETDIR\share\extension\install. One might think that *.oxt files there get installed automagically at first start, but no, it does not happen. This feature looks useless. Change-Id: I5ce583f3b46f5e4e962449790bdce70f99aa135b --- .../shellextensions/copyextensiondata.cxx | 116 --------------------- .../customactions/shellextensions/exports.dxp | 1 - .../customactions/shellextensions/makefile.mk | 3 +- 3 files changed, 1 insertion(+), 119 deletions(-) delete mode 100644 setup_native/source/win32/customactions/shellextensions/copyextensiondata.cxx (limited to 'setup_native/source/win32/customactions') diff --git a/setup_native/source/win32/customactions/shellextensions/copyextensiondata.cxx b/setup_native/source/win32/customactions/shellextensions/copyextensiondata.cxx deleted file mode 100644 index 1a52dad88d04..000000000000 --- a/setup_native/source/win32/customactions/shellextensions/copyextensiondata.cxx +++ /dev/null @@ -1,116 +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 . - */ - - -#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 -#include -#include -#ifdef _MSC_VER -#pragma warning(pop) -#endif - -#include -#include -#include - -#ifdef UNICODE -#define _UNICODE -#define _tstring wstring -#else -#define _tstring string -#endif -#include -#include - - -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(_alloca(nBytes)); - ZeroMemory( buffer, nBytes ); - MsiGetProperty(handle, sProperty.c_str(), buffer, &nChars); - result = buffer; - } - - return result; -} - -extern "C" UINT __stdcall copyExtensionData(MSIHANDLE handle) { - - std::_tstring sSourceDir = GetMsiProperty( handle, TEXT("SourceDir") ); - std::_tstring sExtensionDir = sSourceDir + TEXT("extension\\"); - std::_tstring sPattern = sExtensionDir + TEXT("*.oxt"); - - // Finding all oxt files in sExtensionDir - - WIN32_FIND_DATA aFindFileData; - - HANDLE hFindOxt = FindFirstFile( sPattern.c_str(), &aFindFileData ); - - if ( hFindOxt != INVALID_HANDLE_VALUE ) - { - bool fNextFile = false; - bool bFailIfExist = true; - - std::_tstring sDestDir = GetMsiProperty( handle, TEXT("INSTALLLOCATION") ); - std::_tstring sShareInstallDir = sDestDir + TEXT("share\\extension\\install\\"); - - // creating directories - std::_tstring sShareDir = sDestDir + TEXT("share"); - std::_tstring sExtDir = sShareDir + TEXT("\\extension"); - std::_tstring sExtInstDir = sExtDir + TEXT("\\install"); - CreateDirectory(sShareDir.c_str(), NULL); - CreateDirectory(sExtDir.c_str(), NULL); - CreateDirectory(sExtInstDir.c_str(), NULL); - - do - { - std::_tstring sOxtFile = aFindFileData.cFileName; - - std::_tstring sSourceFile = sExtensionDir + sOxtFile; - std::_tstring sDestFile = sShareInstallDir + sOxtFile; - - CopyFile( sSourceFile.c_str(), sDestFile.c_str(), bFailIfExist ); - - fNextFile = FindNextFile( hFindOxt, &aFindFileData ); - - } while ( fNextFile ); - - FindClose( hFindOxt ); - } - - return ERROR_SUCCESS; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/setup_native/source/win32/customactions/shellextensions/exports.dxp b/setup_native/source/win32/customactions/shellextensions/exports.dxp index 8ec35618fc4b..364473fa0453 100644 --- a/setup_native/source/win32/customactions/shellextensions/exports.dxp +++ b/setup_native/source/win32/customactions/shellextensions/exports.dxp @@ -13,4 +13,3 @@ copyEditionData RenamePrgFolder RemovePrgFolder CheckPatchList -copyExtensionData diff --git a/setup_native/source/win32/customactions/shellextensions/makefile.mk b/setup_native/source/win32/customactions/shellextensions/makefile.mk index 3fc78d38f8a5..73e0289c13cb 100644 --- a/setup_native/source/win32/customactions/shellextensions/makefile.mk +++ b/setup_native/source/win32/customactions/shellextensions/makefile.mk @@ -47,8 +47,7 @@ SLOFILES = \ $(SLO)$/dotnetcheck.obj \ $(SLO)$/copyeditiondata.obj \ $(SLO)$/vistaspecial.obj \ - $(SLO)$/checkpatches.obj \ - $(SLO)$/copyextensiondata.obj + $(SLO)$/checkpatches.obj STDSHL += \ $(ADVAPI32LIB)\ -- cgit v1.2.3