[Libreoffice-commits] core.git: scp2/source setup_native/Library_shlxtmsi.mk setup_native/source
Andras Timar
atimar at suse.com
Sat Mar 2 11:09:48 PST 2013
scp2/source/ooo/windowscustomaction_ooo.scp | 9
setup_native/Library_shlxtmsi.mk | 1
setup_native/source/win32/customactions/shellextensions/iconcache.cxx | 104 ----------
setup_native/source/win32/customactions/shellextensions/shlxtmsi.def | 3
4 files changed, 1 insertion(+), 116 deletions(-)
New commits:
commit c3429a0da677fa0bf111ce5b9d00ee4440930f7b
Author: Andras Timar <atimar at suse.com>
Date: Sat Mar 2 16:20:52 2013 +0100
remove RebuildShellIconCache CustomAction (it was Win 9x/NT/2K only)
Change-Id: Id856c2279520d9183c8b10967f5b56903d21963f
diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp
index 4d5116c..4242fcd 100644
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -158,15 +158,6 @@ WindowsCustomAction gid_Customaction_Shellextensionsdll5
Assignment2 = ("InstallUISequence", "Not REMOVE=\"ALL\" And Not PATCH", "FindRelatedProducts");
End
-WindowsCustomAction gid_Customaction_Shellextensionsdll6
- Name = "Shellextensionsdll6";
- Typ = "65";
- Source = "shlxtmsi.dll";
- Target = "RebuildShellIconCache";
- Inbinarytable = 1;
- Assignment1 = ("InstallExecuteSequence", "Not PATCH", "end");
-End
-
WindowsCustomAction gid_Customaction_Check_Install_Directory
Name = "CheckInstallDirectory";
Typ = "65";
diff --git a/setup_native/Library_shlxtmsi.mk b/setup_native/Library_shlxtmsi.mk
index a603702..28fcdce 100644
--- a/setup_native/Library_shlxtmsi.mk
+++ b/setup_native/Library_shlxtmsi.mk
@@ -27,7 +27,6 @@ $(eval $(call gb_Library_add_ldflags,shlxtmsi,\
$(eval $(call gb_Library_add_exception_objects,shlxtmsi,\
setup_native/source/win32/customactions/shellextensions/startmenuicon \
setup_native/source/win32/customactions/shellextensions/upgrade \
- setup_native/source/win32/customactions/shellextensions/iconcache \
setup_native/source/win32/customactions/shellextensions/migrateinstallpath \
setup_native/source/win32/customactions/shellextensions/completeinstallpath \
setup_native/source/win32/customactions/shellextensions/checkdirectory \
diff --git a/setup_native/source/win32/customactions/shellextensions/iconcache.cxx b/setup_native/source/win32/customactions/shellextensions/iconcache.cxx
deleted file mode 100644
index e037074..0000000
--- a/setup_native/source/win32/customactions/shellextensions/iconcache.cxx
+++ /dev/null
@@ -1,104 +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 .
- */
-
-#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 <stdlib.h>
-
-extern "C" UINT __stdcall RebuildShellIconCache(MSIHANDLE)
-{
- // Rebuild icon cache on windows OS prior XP
-
- OSVERSIONINFO osverinfo;
-
- osverinfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
-
- if (
- GetVersionEx( &osverinfo ) &&
- VER_PLATFORM_WIN32_NT == osverinfo.dwPlatformId &&
- (
- 5 < osverinfo.dwMajorVersion ||
- 5 == osverinfo.dwMajorVersion && 0 < osverinfo.dwMinorVersion
- )
- )
- {
- return ERROR_SUCCESS;
- }
-
- HKEY hKey;
- DWORD dwDispostion;
- LONG lError = RegCreateKeyEx( HKEY_CURRENT_USER, TEXT("Control Panel\\Desktop\\WindowMetrics"), 0, NULL, REG_OPTION_VOLATILE, KEY_SET_VALUE | KEY_QUERY_VALUE, NULL, &hKey, &dwDispostion );
-
- if ( ERROR_SUCCESS == lError )
- {
- TCHAR szValue[256];
- TCHAR szTempValue[256];
- DWORD cbValue = sizeof(szValue);
- DWORD dwType;
- int iSize = 0;
-
- lError = RegQueryValueEx( hKey, TEXT("Shell Icon Size"), 0, &dwType, (LPBYTE)szValue, &cbValue );
-
- if ( ERROR_SUCCESS == lError )
- iSize = atoi( szValue );
-
- if ( !iSize )
- {
- iSize = GetSystemMetrics( SM_CXICON );
- _itoa_s( iSize, szValue, 256, 10 );
- cbValue = strlen( szValue ) + 1;
- dwType = REG_SZ;
- }
-
- _itoa_s( iSize + 1, szTempValue, 256, 10 );
- lError = RegSetValueEx( hKey, TEXT("Shell Icon Size"), 0, dwType, (LPBYTE)szTempValue, strlen( szTempValue ) + 1 );
-
- LRESULT lResult = SendMessageTimeout(
- HWND_BROADCAST,
- WM_SETTINGCHANGE,
- SPI_SETNONCLIENTMETRICS,
- (LPARAM)TEXT("WindowMetrics"),
- SMTO_NORMAL|SMTO_ABORTIFHUNG,
- 0, NULL);
-
- lError = RegSetValueEx( hKey, TEXT("Shell Icon Size"), 0, dwType, (LPBYTE)szValue, cbValue );
-
- lResult = SendMessageTimeout(
- HWND_BROADCAST,
- WM_SETTINGCHANGE,
- SPI_SETNONCLIENTMETRICS,
- (LPARAM)TEXT("WindowMetrics"),
- SMTO_NORMAL|SMTO_ABORTIFHUNG,
- 0, NULL);
-
- lError = RegCloseKey( hKey );
- }
-
- return ERROR_SUCCESS;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/setup_native/source/win32/customactions/shellextensions/shlxtmsi.def b/setup_native/source/win32/customactions/shellextensions/shlxtmsi.def
index 328590e..6058eb0 100644
--- a/setup_native/source/win32/customactions/shellextensions/shlxtmsi.def
+++ b/setup_native/source/win32/customactions/shellextensions/shlxtmsi.def
@@ -3,7 +3,6 @@ EXPORTS
CheckInstallDirectory
CheckPatchList
CompleteInstallPath
- RebuildShellIconCache
CreateLayerLinks
RemoveLayerLinks
MigrateInstallPath
@@ -11,4 +10,4 @@ EXPORTS
DeinstallStartmenuFolderIcon
SetProductInstallMode
RenamePrgFolder
- RemovePrgFolder
\ No newline at end of file
+ RemovePrgFolder
More information about the Libreoffice-commits
mailing list