CWS-TOOLING: integrate CWS dv07

2009-02-12 13:22:37 +0100 dv  r267650 : #i94560# Removed string, which needed translation
2009-01-27 16:09:50 +0100 dv  r267004 : #i94560# Allow building without redistributable
2009-01-27 10:56:38 +0100 is  r266965 : #i98509# InstallOrder for extension module
2009-01-26 08:08:16 +0100 dv  r266899 : #i94560# Work around Windows Vista installation problems
2009-01-19 14:28:56 +0100 dv  r266498 : CWS-TOOLING: rebase CWS dv07 to trunk@266428 (milestone: DEV300:m39)
2009-01-19 09:56:07 +0100 dv  r266477 : #i94560# Added custom action to work around 'major upgrade' problem on Windows Vista
2009-01-19 09:54:30 +0100 dv  r266476 : #i94560# Added custom action to work around 'major upgrade' problem on Windows Vista
2009-01-19 09:13:06 +0100 dv  r266474 : #i94347# Changed LaunchCondition from AdminUser to Privileged
2008-12-18 08:42:04 +0100 dv  r265662 : #i97201# remove old release notes when notified about updates
2008-12-15 14:50:33 +0100 dv  r265501 : #i96844# Use fputs instead of fprintf

5 files changed, 291 insertions, 30 deletions

diff --git a/setup_native/source/ulfconv/ulfconv.cxx b/setup_native/source/ulfconv/ulfconv.cxx
index 0d9db888ef72..6ca6834461f9 100644
--- a/setup_native/source/ulfconv/ulfconv.cxx
+++ b/setup_native/source/ulfconv/ulfconv.cxx
@@ -348,7 +348,7 @@ int main( int argc, char * const argv[] )
 
 
         } else {
-            fprintf(ostream, buffer);
+            fputs(buffer, ostream);
         }
     }
 }
diff --git a/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx b/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx
index 8370775114d0..63f5e8cc521f 100755
--- a/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx
@@ -180,50 +180,83 @@ static BOOL MoveFileExImpl( LPCSTR lpExistingFileNameA, LPCSTR lpNewFileNameA, D
 
 extern "C" UINT __stdcall IsOfficeRunning( MSIHANDLE handle )
 {
-    std::_tstring   sInstDir = GetMsiProperty( handle, TEXT("BASISINSTALLLOCATION") );
-    std::_tstring   sResourceDir = sInstDir + TEXT("program\\resource\\");
-    std::_tstring   sPattern = sResourceDir + TEXT("vcl*.res");
+    OSVERSIONINFO   osverinfo;
+    osverinfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+    GetVersionEx( &osverinfo );
 
-    // std::_tstring    mystr;
-    // mystr = "IsOfficeRunning start. Checking file in dir: " + sResourceDir;
-    // MessageBox( NULL, mystr.c_str(), "IsOfficeRunning", MB_OK );
+    // renaming the vcl resource doesn't work reliable with OS >= Windows Vista
+    if (osverinfo.dwMajorVersion < 6 )
+    {
+        std::_tstring sInstDir = GetMsiProperty( handle, TEXT("BASISINSTALLLOCATION") );
+        // Property empty -> no office installed
+        if ( sInstDir.length() == 0 )
+            return ERROR_SUCCESS;
 
+        std::_tstring sResourceDir = sInstDir + TEXT("program\\resource\\");
+        std::_tstring sPattern = sResourceDir + TEXT("vcl*.res");
 
-    WIN32_FIND_DATA aFindFileData;
-    HANDLE  hFind = FindFirstFile( sPattern.c_str(), &aFindFileData );
+//        std::_tstring mystr;
+//        mystr = "IsOfficeRunning start. Checking file in dir: " + sResourceDir;
+//        MessageBox( NULL, mystr.c_str(), "IsOfficeRunning", MB_OK );
 
-    if ( IsValidHandle(hFind) )
-    {
-        BOOL    fSuccess = false;
-        bool    fRenameSucceeded;
+        WIN32_FIND_DATA aFindFileData;
+        HANDLE  hFind = FindFirstFile( sPattern.c_str(), &aFindFileData );
 
-        do
+        if ( IsValidHandle(hFind) )
         {
-            std::_tstring   sResourceFile = sResourceDir + aFindFileData.cFileName;
-            std::_tstring   sIntermediate = sResourceFile + TEXT(".tmp");
+            BOOL    fSuccess = false;
+            bool    fRenameSucceeded;
 
-            fRenameSucceeded = MoveFileExImpl( sResourceFile.c_str(), sIntermediate.c_str(), MOVEFILE_REPLACE_EXISTING );
-            if ( fRenameSucceeded )
+            do
             {
-                MoveFileExImpl( sIntermediate.c_str(), sResourceFile.c_str(), 0 );
-                fSuccess = FindNextFile( hFind, &aFindFileData );
+                std::_tstring   sResourceFile = sResourceDir + aFindFileData.cFileName;
+                std::_tstring   sIntermediate = sResourceFile + TEXT(".tmp");
+
+                fRenameSucceeded = MoveFileExImpl( sResourceFile.c_str(), sIntermediate.c_str(), MOVEFILE_REPLACE_EXISTING );
+                if ( fRenameSucceeded )
+                {
+                    MoveFileExImpl( sIntermediate.c_str(), sResourceFile.c_str(), 0 );
+                    fSuccess = FindNextFile( hFind, &aFindFileData );
+                }
+            } while ( fSuccess && fRenameSucceeded );
+
+            if ( !fRenameSucceeded )
+            {
+                MsiSetProperty(handle, TEXT("OFFICERUNS"), TEXT("1"));
+                SetMsiErrorCode( MSI_ERROR_OFFICE_IS_RUNNING );
+
+//                mystr = "Office is running";
+//                MessageBox( NULL, mystr.c_str(), "IsOfficeRunning", MB_OK );
             }
-        } while ( fSuccess && fRenameSucceeded );
 
-        if ( !fRenameSucceeded )
+            FindClose( hFind );
+        }
+//        mystr = "IsOfficeRunning end";
+//        MessageBox( NULL, mystr.c_str(), "IsOfficeRunning", MB_OK );
+    }
+    else
+    {
+        std::_tstring sOfficeInstallPath = GetMsiProperty(handle, TEXT("OFFICEINSTALLLOCATION"));
+        // Property empty -> no office installed
+        if ( sOfficeInstallPath.length() == 0 )
+            return ERROR_SUCCESS;
+
+        std::_tstring sRenameSrc = sOfficeInstallPath + TEXT("program");
+        std::_tstring sRenameDst = sOfficeInstallPath + TEXT("program_1");
+
+        bool bSuccess = MoveFile( sRenameSrc.c_str(), sRenameDst.c_str() );
+
+        if ( bSuccess )
         {
-            MsiSetProperty(handle, TEXT("OFFICERUNS"), TEXT("1"));
+            MoveFile( sRenameDst.c_str(), sRenameSrc.c_str() );
+        }
+        else
+        {
+            MsiSetProperty( handle, TEXT("OFFICERUNS"), TEXT("1") );
             SetMsiErrorCode( MSI_ERROR_OFFICE_IS_RUNNING );
-            // mystr = "Office is running";
-            // MessageBox( NULL, mystr.c_str(), "IsOfficeRunning", MB_OK );
         }
-
-        FindClose( hFind );
     }
 
-    // mystr = "IsOfficeRunning end";
-    // MessageBox( NULL, mystr.c_str(), "IsOfficeRunning", MB_OK );
-
     return ERROR_SUCCESS;
 }
 
diff --git a/setup_native/source/win32/customactions/shellextensions/exports.dxp b/setup_native/source/win32/customactions/shellextensions/exports.dxp
index 4ac7ff940aef..cafa011057c9 100644
--- a/setup_native/source/win32/customactions/shellextensions/exports.dxp
+++ b/setup_native/source/win32/customactions/shellextensions/exports.dxp
@@ -16,6 +16,8 @@ RemoveLayerLinks
 DotNetCheck
 ShowProperties
 copyEditionData
+RenamePrgFolder
+RemovePrgFolder
 IsOfficeRunning
 CheckPatchList
 copyExtensionData
diff --git a/setup_native/source/win32/customactions/shellextensions/makefile.mk b/setup_native/source/win32/customactions/shellextensions/makefile.mk
index 0f280177a0d6..14546c834807 100644
--- a/setup_native/source/win32/customactions/shellextensions/makefile.mk
+++ b/setup_native/source/win32/customactions/shellextensions/makefile.mk
@@ -69,6 +69,7 @@ SLOFILES = \
     $(SLO)$/dotnetcheck.obj \
     $(SLO)$/registerextensions.obj \
     $(SLO)$/copyeditiondata.obj \
+    $(SLO)$/vistaspecial.obj \
     $(SLO)$/checkrunningoffice.obj \
     $(SLO)$/checkpatches.obj \
     $(SLO)$/copyextensiondata.obj
diff --git a/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx b/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx
new file mode 100644
index 000000000000..016103812bec
--- /dev/null
+++ b/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx
@@ -0,0 +1,225 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: checkdirectory.cxx,v $
+ * $Revision: 1.7 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#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 <strsafe.h>
+
+#include <systools/win32/uwinapi.h>
+#include <../tools/seterror.hxx>
+
+//----------------------------------------------------------
+#ifdef DEBUG
+inline void OutputDebugStringFormat( LPCSTR pFormat, ... )
+{
+    CHAR    buffer[1024];
+    va_list args;
+
+    va_start( args, pFormat );
+    StringCchVPrintfA( buffer, sizeof(buffer), pFormat, args );
+    OutputDebugStringA( buffer );
+}
+#else
+static inline void OutputDebugStringFormat( LPCSTR, ... )
+{
+}
+#endif
+
+
+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<LPTSTR>(_alloca(nBytes));
+        ZeroMemory( buffer, nBytes );
+        MsiGetProperty(handle, sProperty.c_str(), buffer, &nChars);
+        result = buffer;
+    }
+
+    return result;
+}
+
+static BOOL RemoveCompleteDirectory( std::_tstring sPath )
+{
+    bool bDirectoryRemoved = true;
+
+    std::_tstring mystr;
+    std::_tstring sPattern = sPath + TEXT("\\") + TEXT("*.*");
+    WIN32_FIND_DATA aFindData;
+
+    // Finding all content in sPath
+
+    HANDLE hFindContent = FindFirstFile( sPattern.c_str(), &aFindData );
+
+    if ( hFindContent != INVALID_HANDLE_VALUE )
+    {
+        bool fNextFile = false;
+        std::_tstring sCurrentDir = TEXT(".");
+        std::_tstring sParentDir = TEXT("..");
+
+        do
+        {
+            std::_tstring sFileName = aFindData.cFileName;
+
+            mystr = "Current short file: " + sFileName;
+            // MessageBox(NULL, mystr.c_str(), "Current Content", MB_OK);
+
+            if (( strcmp(sFileName.c_str(),sCurrentDir.c_str()) != 0 ) &&
+                ( strcmp(sFileName.c_str(),sParentDir.c_str()) != 0 ))
+            {
+                std::_tstring sCompleteFileName = sPath + TEXT("\\") + sFileName;
+
+                if ( aFindData.dwFileAttributes == FILE_ATTRIBUTE_DIRECTORY )
+                {
+                    bool fSuccess = RemoveCompleteDirectory(sCompleteFileName);
+                    if ( fSuccess )
+                    {
+                        mystr = "Successfully removed content of dir " + sCompleteFileName;
+                        // MessageBox(NULL, mystr.c_str(), "Removed Directory", MB_OK);
+                    }
+                    else
+                    {
+                        mystr = "An error occured during removing content of " + sCompleteFileName;
+                        // MessageBox(NULL, mystr.c_str(), "Error removing directory", MB_OK);
+                    }
+                }
+                else
+                {
+                    bool fSuccess = DeleteFile( sCompleteFileName.c_str() );
+                    if ( fSuccess )
+                    {
+                        mystr = "Successfully removed file " + sCompleteFileName;
+                        // MessageBox(NULL, mystr.c_str(), "Removed File", MB_OK);
+                    }
+                    else
+                    {
+                        mystr = "An error occured during removal of file " + sCompleteFileName;
+                        // MessageBox(NULL, mystr.c_str(), "Error removing file", MB_OK);
+                    }
+                }
+            }
+
+            fNextFile = FindNextFile( hFindContent, &aFindData );
+
+        } while ( fNextFile );
+
+        FindClose( hFindContent );
+
+        // empty directory can be removed now
+        // RemoveDirectory is only successful, if the last handle to the directory is closed
+        // -> first removing content -> closing handle -> remove empty directory
+
+        bool fRemoveDirSuccess = RemoveDirectory(sPath.c_str());
+
+        if ( fRemoveDirSuccess )
+        {
+            mystr = "Successfully removed dir " + sPath;
+            // MessageBox(NULL, mystr.c_str(), "Removed Directory", MB_OK);
+        }
+        else
+        {
+            mystr = "An error occured during removal of empty directory " + sPath;
+            // MessageBox(NULL, mystr.c_str(), "Error removing directory", MB_OK);
+            bDirectoryRemoved = false;
+        }
+    }
+
+    return bDirectoryRemoved;
+}
+
+
+
+extern "C" UINT __stdcall RenamePrgFolder( MSIHANDLE handle )
+{
+    std::_tstring sOfficeInstallPath = GetMsiProperty(handle, TEXT("OFFICEINSTALLLOCATION"));
+
+    std::_tstring sRenameSrc = sOfficeInstallPath + TEXT("program");
+    std::_tstring sRenameDst = sOfficeInstallPath + TEXT("program_1");
+
+//    MessageBox(NULL, sRenameSrc.c_str(), "OFFICEINSTALLLOCATION", MB_OK);
+
+    bool bSuccess = MoveFile( sRenameSrc.c_str(), sRenameDst.c_str() );
+
+#if 0
+    if ( !bSuccess )
+        MessageBox(NULL, "Renaming folder failed", "RenamePrgFolder", MB_OK);
+    else
+        MessageBox(NULL, "Renaming folder successful", "RenamePrgFolder", MB_OK);
+#endif
+
+    return ERROR_SUCCESS;
+}
+
+extern "C" UINT __stdcall RemovePrgFolder( MSIHANDLE handle )
+{
+    std::_tstring sOfficeInstallPath = GetMsiProperty(handle, TEXT("OFFICEINSTALLLOCATION"));
+    std::_tstring sRemoveDir = sOfficeInstallPath + TEXT("program_1");
+
+//    MessageBox(NULL, sRemoveDir.c_str(), "REMOVING OLD DIR", MB_OK);
+
+    bool bSuccess = RemoveCompleteDirectory( sRemoveDir );
+
+#if 0
+    if ( bSuccess )
+        MessageBox(NULL, "Removing folder successful", "RemovePrgFolder", MB_OK);
+    else
+        MessageBox(NULL, "Removing folder failed", "RemovePrgFolder", MB_OK);
+#endif
+
+    return ERROR_SUCCESS;
+}