summaryrefslogtreecommitdiff
path: root/setup_native/source/win32/customactions
diff options
context:
space:
mode:
authorAndras Timar <atimar@suse.com>2013-01-29 13:20:07 +0100
committerAndras Timar <atimar@suse.com>2013-01-30 15:25:05 +0100
commitcf4ca992349492019938b68ae33ec9fec7cd5e16 (patch)
treea8463c2c9bc1d5aca03ea1784de360e319267926 /setup_native/source/win32/customactions
parentd14c765b6e20158af34520e1092c552a6d28bbb3 (diff)
remove DotNetCheck CustomAction
We do not need to call a dll function for a simple version check. Change-Id: If82b06a61f10dbfe3eb92b6fe495e6d800c57aff
Diffstat (limited to 'setup_native/source/win32/customactions')
-rw-r--r--setup_native/source/win32/customactions/shellextensions/dotnetcheck.cxx175
-rw-r--r--setup_native/source/win32/customactions/shellextensions/exports.dxp2
-rw-r--r--setup_native/source/win32/customactions/shellextensions/makefile.mk1
3 files changed, 0 insertions, 178 deletions
diff --git a/setup_native/source/win32/customactions/shellextensions/dotnetcheck.cxx b/setup_native/source/win32/customactions/shellextensions/dotnetcheck.cxx
deleted file mode 100644
index 864b886f3be6..000000000000
--- a/setup_native/source/win32/customactions/shellextensions/dotnetcheck.cxx
+++ /dev/null
@@ -1,175 +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 */
-#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>
-
-#include <tchar.h>
-#include <string>
-#include <systools/win32/uwinapi.h>
-
-#include <../tools/seterror.hxx>
-
-using namespace std;
-
-namespace
-{
- string GetMsiProperty(MSIHANDLE handle, const string& sProperty)
- {
- string 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<LPTSTR>(_alloca(nBytes));
- ZeroMemory( buffer, nBytes );
- MsiGetProperty(handle, sProperty.c_str(), buffer, &nChars);
- result = buffer;
- }
- return result;
- }
-
- inline void SetMsiProperty(MSIHANDLE handle, const string& sProperty, const string& sValue)
- {
- MsiSetProperty(handle, sProperty.c_str(), sValue.c_str());
- }
-
- void stripFinalBackslash(std::string * path) {
- std::string::size_type i = path->size();
- if (i > 1) {
- --i;
- if ((*path)[i] == '\\') {
- path->erase(i);
- }
- }
- }
-
-// Copied more or less verbatim from
-// desktop/source/deployment/inc/dp_version.hxx:1.5 and
-// desktop/source/deployment/misc/dp_version.cxx:1.5:
-
-enum Order { ORDER_LESS, ORDER_EQUAL, ORDER_GREATER };
-
-string getElement(string const & version, string::size_type * index) {
- while (*index < version.size() && version[*index] == '0') {
- ++*index;
- }
- string::size_type i = *index;
- *index = version.find('.', i);
- if (*index == string::npos) {
- *index = version.size();
- return string(version, i);
- } else {
- ++*index;
- return string(version, i, *index - 1 - i);
- }
-}
-
-Order compareVersions(string const & version1, string const & version2) {
- for (string::size_type i1 = 0, i2 = 0;
- i1 < version1.size() || i2 < version2.size();)
- {
- string e1(getElement(version1, &i1));
- string e2(getElement(version2, &i2));
-
- // string myText1 = TEXT("e1: ") + e1;
- // string myText2 = TEXT("e2: ") + e2;
- // MessageBox(NULL, myText1.c_str(), "DEBUG", MB_OK);
- // MessageBox(NULL, myText2.c_str(), "DEBUG", MB_OK);
-
- if (e1.size() < e2.size()) {
- return ORDER_LESS;
- } else if (e1.size() > e2.size()) {
- return ORDER_GREATER;
- } else if (e1 < e2) {
- return ORDER_LESS;
- } else if (e1 > e2) {
- return ORDER_GREATER;
- }
- }
- return ORDER_EQUAL;
-}
-
-} // namespace
-
-extern "C" UINT __stdcall DotNetCheck(MSIHANDLE handle) {
- string present(GetMsiProperty(handle, TEXT("MsiNetAssemblySupport")));
- string required(GetMsiProperty(handle, TEXT("REQUIRED_DOTNET_VERSION")));
-
- // string myText1 = TEXT("MsiNetAssemblySupport: ") + present;
- // string myText2 = TEXT("REQUIRED_DOTNET_VERSION: ") + required;
- // MessageBox(NULL, myText1.c_str(), "DEBUG", MB_OK);
- // MessageBox(NULL, myText2.c_str(), "DEBUG", MB_OK);
-
- SetMsiProperty(
- handle, TEXT("DOTNET_SUFFICIENT"),
- (present.empty() || compareVersions(present, required) == ORDER_LESS ?
- TEXT("0") : TEXT("1")));
-
- // string result(GetMsiProperty(handle, TEXT("DOTNET_SUFFICIENT")));
- // string myText3 = TEXT("DOTNET_SUFFICIENT: ") + result;
- // MessageBox(NULL, myText3.c_str(), "DEBUG", MB_OK);
-
-
- return ERROR_SUCCESS;
-}
-
-extern "C" UINT __stdcall ShowProperties(MSIHANDLE handle)
-{
- string property = GetMsiProperty(handle, TEXT("INSTALLLOCATION"));
- string myText = TEXT("INSTALLLOCATION: ") + property;
- MessageBox(NULL, myText.c_str(), "INSTALLLOCATION", MB_OK);
-
- property = GetMsiProperty(handle, TEXT("Installed"));
- myText = TEXT("Installed: ") + property;
- MessageBox(NULL, myText.c_str(), "Installed", MB_OK);
-
- property = GetMsiProperty(handle, TEXT("PATCH"));
- myText = TEXT("PATCH: ") + property;
- MessageBox(NULL, myText.c_str(), "PATCH", MB_OK);
-
- property = GetMsiProperty(handle, TEXT("REMOVE"));
- myText = TEXT("REMOVE: ") + property;
- MessageBox(NULL, myText.c_str(), "REMOVE", MB_OK);
-
- property = GetMsiProperty(handle, TEXT("ALLUSERS"));
- myText = TEXT("ALLUSERS: ") + property;
- MessageBox(NULL, myText.c_str(), "ALLUSERS", MB_OK);
-
- 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 364473fa0453..9b2644638fb8 100644
--- a/setup_native/source/win32/customactions/shellextensions/exports.dxp
+++ b/setup_native/source/win32/customactions/shellextensions/exports.dxp
@@ -7,8 +7,6 @@ MigrateInstallPath
CheckInstallDirectory
CreateLayerLinks
RemoveLayerLinks
-DotNetCheck
-ShowProperties
copyEditionData
RenamePrgFolder
RemovePrgFolder
diff --git a/setup_native/source/win32/customactions/shellextensions/makefile.mk b/setup_native/source/win32/customactions/shellextensions/makefile.mk
index 73e0289c13cb..880ebc7ef6d0 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)$/completeinstallpath.obj \
$(SLO)$/checkdirectory.obj \
$(SLO)$/layerlinks.obj \
- $(SLO)$/dotnetcheck.obj \
$(SLO)$/copyeditiondata.obj \
$(SLO)$/vistaspecial.obj \
$(SLO)$/checkpatches.obj