CWS-TOOLING: integrate CWS native209_DEV300

7 files changed, 575 insertions, 2 deletions

diff --git a/setup_native/source/win32/customactions/languagepacks/checkrunningofficelanguagepack.cxx b/setup_native/source/win32/customactions/languagepacks/checkrunningofficelanguagepack.cxx
new file mode 100755
index 000000000000..1608a7895689
--- /dev/null
+++ b/setup_native/source/win32/customactions/languagepacks/checkrunningofficelanguagepack.cxx
@@ -0,0 +1,221 @@
+/*************************************************************************
+ *
+ * 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: checkrunningofficelanguagepack.cxx,v $
+ * $Revision: 1.1.4.2 $
+ *
+ * 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_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>
+
+#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>
+
+#define WININIT_FILENAME    "wininit.ini"
+#define RENAME_SECTION      "rename"
+
+#ifdef DEBUG
+inline void OutputDebugStringFormat( LPCTSTR pFormat, ... )
+{
+    _TCHAR  buffer[1024];
+    va_list args;
+
+    va_start( args, pFormat );
+    _vsntprintf( buffer, elementsof(buffer), pFormat, args );
+    OutputDebugString( buffer );
+}
+#else
+static inline void OutputDebugStringFormat( LPCTSTR, ... )
+{
+}
+#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 inline bool IsSetMsiProperty(MSIHANDLE handle, const std::_tstring& sProperty)
+{
+    std::_tstring value = GetMsiProperty(handle, sProperty);
+    return (value.length() > 0);
+}
+
+static inline void UnsetMsiProperty(MSIHANDLE handle, const std::_tstring& sProperty)
+{
+    MsiSetProperty(handle, sProperty.c_str(), NULL);
+}
+
+static inline void SetMsiProperty(MSIHANDLE handle, const std::_tstring& sProperty)
+{
+    MsiSetProperty(handle, sProperty.c_str(), TEXT("1"));
+}
+
+static BOOL MoveFileEx9x( LPCSTR lpExistingFileNameA, LPCSTR lpNewFileNameA, DWORD dwFlags )
+{
+    BOOL    fSuccess = FALSE;   // assume failure
+
+    // Windows 9x has a special mechanism to move files after reboot
+
+    if ( dwFlags & MOVEFILE_DELAY_UNTIL_REBOOT )
+    {
+        CHAR    szExistingFileNameA[MAX_PATH];
+        CHAR    szNewFileNameA[MAX_PATH] = "NUL";
+
+        // Path names in WININIT.INI must be in short path name form
+
+        if (
+            GetShortPathNameA( lpExistingFileNameA, szExistingFileNameA, MAX_PATH ) &&
+            (!lpNewFileNameA || GetShortPathNameA( lpNewFileNameA, szNewFileNameA, MAX_PATH ))
+            )
+        {
+            CHAR    szBuffer[32767];    // The buffer size must not exceed 32K
+            DWORD   dwBufLen = GetPrivateProfileSectionA( RENAME_SECTION, szBuffer, elementsof(szBuffer), WININIT_FILENAME );
+
+            CHAR    szRename[MAX_PATH]; // This is enough for at most to times 67 chracters
+            strcpy( szRename, szNewFileNameA );
+            strcat( szRename, "=" );
+            strcat( szRename, szExistingFileNameA );
+            size_t  lnRename = strlen(szRename);
+
+            if ( dwBufLen + lnRename + 2 <= elementsof(szBuffer) )
+            {
+                CopyMemory( &szBuffer[dwBufLen], szRename, lnRename );
+                szBuffer[dwBufLen + lnRename ] = 0;
+                szBuffer[dwBufLen + lnRename + 1 ] = 0;
+
+                fSuccess = WritePrivateProfileSectionA( RENAME_SECTION, szBuffer, WININIT_FILENAME );
+            }
+            else
+                SetLastError( ERROR_BUFFER_OVERFLOW );
+        }
+    }
+    else
+    {
+
+        fSuccess = MoveFileA( lpExistingFileNameA, lpNewFileNameA );
+
+        if ( !fSuccess && GetLastError() != ERROR_ACCESS_DENIED &&
+            0 != (dwFlags & (MOVEFILE_COPY_ALLOWED | MOVEFILE_REPLACE_EXISTING)) )
+        {
+            BOOL    bFailIfExist = 0 == (dwFlags & MOVEFILE_REPLACE_EXISTING);
+
+            fSuccess = CopyFileA( lpExistingFileNameA, lpNewFileNameA, bFailIfExist );
+
+            if ( fSuccess )
+                fSuccess = DeleteFileA( lpExistingFileNameA );
+        }
+
+    }
+
+    return fSuccess;
+}
+
+static BOOL MoveFileExImpl( LPCSTR lpExistingFileNameA, LPCSTR lpNewFileNameA, DWORD dwFlags )
+{
+    if ( 0 > ((LONG)GetVersion())) // High order bit indicates Win 9x
+        return MoveFileEx9x( lpExistingFileNameA, lpNewFileNameA, dwFlags );
+    else
+        return MoveFileExA( lpExistingFileNameA, lpNewFileNameA, dwFlags );
+}
+
+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");
+
+    WIN32_FIND_DATA aFindFileData;
+    HANDLE  hFind = FindFirstFile( sPattern.c_str(), &aFindFileData );
+
+    if ( IsValidHandle(hFind) )
+    {
+        BOOL    fSuccess = false;
+        bool    fRenameSucceeded;
+
+        do
+        {
+            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 );
+        }
+
+        FindClose( hFind );
+    }
+
+    return ERROR_SUCCESS;
+}
+
+
+
diff --git a/setup_native/source/win32/customactions/languagepacks/exports.dxp b/setup_native/source/win32/customactions/languagepacks/exports.dxp
index cdccc92dd256..d01befd5d0d9 100644
--- a/setup_native/source/win32/customactions/languagepacks/exports.dxp
+++ b/setup_native/source/win32/customactions/languagepacks/exports.dxp
@@ -1,3 +1,4 @@
 SetProductInstallationPath
 RegisterLanguagePack
 GetUserInstallMode    
+IsOfficeRunning
diff --git a/setup_native/source/win32/customactions/languagepacks/makefile.mk b/setup_native/source/win32/customactions/languagepacks/makefile.mk
index d6a1940399cd..be16ab5cfd8a 100644
--- a/setup_native/source/win32/customactions/languagepacks/makefile.mk
+++ b/setup_native/source/win32/customactions/languagepacks/makefile.mk
@@ -56,7 +56,8 @@ CDEFS+=-Dnot_used_define_to_disable_pch
 UWINAPILIB=
 
 SLOFILES =	$(SLO)$/lngpckinsthelper.obj \
-            $(SLO)$/respintest.obj
+            $(SLO)$/respintest.obj \
+            $(SLO)$/checkrunningofficelanguagepack.obj
 
 STDSHL+=	\
     $(ADVAPI32LIB)\
diff --git a/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx b/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx
new file mode 100644
index 000000000000..4541aca7e9ef
--- /dev/null
+++ b/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx
@@ -0,0 +1,115 @@
+/*************************************************************************
+ *
+ * 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: checkpatches.cxx,v $
+ * $Revision: 1.1.2.2 $
+ *
+ * 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 <systools/win32/uwinapi.h>
+
+//----------------------------------------------------------
+#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 void SetMsiProperty( MSIHANDLE handle, const std::_tstring& sProperty )
+{
+    MsiSetProperty( handle, sProperty.c_str(), TEXT("1") );
+}
+
+extern "C" UINT __stdcall CheckPatchList( MSIHANDLE handle )
+{
+    std::_tstring sPatchList = GetMsiProperty( handle, TEXT("PATCH") );
+    std::_tstring sRequiredPatch = GetMsiProperty( handle, TEXT("PREREQUIREDPATCH") );
+
+    OutputDebugStringFormat( "CheckPatchList called with PATCH=%s and PRQ= %s\n", sPatchList.c_str(), sRequiredPatch.c_str() );
+
+    if ( ( sPatchList.length() != 0 ) && ( sRequiredPatch.length() != 0 ) )
+    {
+        if ( _tcsstr( sPatchList.c_str(), sRequiredPatch.c_str() ) )
+        {
+            SetMsiProperty( handle, TEXT("IGNOREPREREQUIREDPATCH") );
+            OutputDebugStringFormat( "Set Property IgnorePrerequiredPatch!\n" );
+        }
+    }
+    return ERROR_SUCCESS;
+}
diff --git a/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx b/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx
new file mode 100755
index 000000000000..8370775114d0
--- /dev/null
+++ b/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx
@@ -0,0 +1,231 @@
+/*************************************************************************
+ *
+ * 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: checkrunningoffice.cxx,v $
+ * $Revision: 1.1.4.2 $
+ *
+ * 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_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>
+
+#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>
+
+#define WININIT_FILENAME    "wininit.ini"
+#define RENAME_SECTION      "rename"
+
+#ifdef DEBUG
+inline void OutputDebugStringFormat( LPCTSTR pFormat, ... )
+{
+    _TCHAR  buffer[1024];
+    va_list args;
+
+    va_start( args, pFormat );
+    _vsntprintf( buffer, elementsof(buffer), pFormat, args );
+    OutputDebugString( buffer );
+}
+#else
+static inline void OutputDebugStringFormat( LPCTSTR, ... )
+{
+}
+#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 inline bool IsSetMsiProperty(MSIHANDLE handle, const std::_tstring& sProperty)
+{
+    std::_tstring value = GetMsiProperty(handle, sProperty);
+    return (value.length() > 0);
+}
+
+static inline void UnsetMsiProperty(MSIHANDLE handle, const std::_tstring& sProperty)
+{
+    MsiSetProperty(handle, sProperty.c_str(), NULL);
+}
+
+static inline void SetMsiProperty(MSIHANDLE handle, const std::_tstring& sProperty)
+{
+    MsiSetProperty(handle, sProperty.c_str(), TEXT("1"));
+}
+
+static BOOL MoveFileEx9x( LPCSTR lpExistingFileNameA, LPCSTR lpNewFileNameA, DWORD dwFlags )
+{
+    BOOL    fSuccess = FALSE;   // assume failure
+
+    // Windows 9x has a special mechanism to move files after reboot
+
+    if ( dwFlags & MOVEFILE_DELAY_UNTIL_REBOOT )
+    {
+        CHAR    szExistingFileNameA[MAX_PATH];
+        CHAR    szNewFileNameA[MAX_PATH] = "NUL";
+
+        // Path names in WININIT.INI must be in short path name form
+
+        if (
+            GetShortPathNameA( lpExistingFileNameA, szExistingFileNameA, MAX_PATH ) &&
+            (!lpNewFileNameA || GetShortPathNameA( lpNewFileNameA, szNewFileNameA, MAX_PATH ))
+            )
+        {
+            CHAR    szBuffer[32767];    // The buffer size must not exceed 32K
+            DWORD   dwBufLen = GetPrivateProfileSectionA( RENAME_SECTION, szBuffer, elementsof(szBuffer), WININIT_FILENAME );
+
+            CHAR    szRename[MAX_PATH]; // This is enough for at most to times 67 chracters
+            strcpy( szRename, szNewFileNameA );
+            strcat( szRename, "=" );
+            strcat( szRename, szExistingFileNameA );
+            size_t  lnRename = strlen(szRename);
+
+            if ( dwBufLen + lnRename + 2 <= elementsof(szBuffer) )
+            {
+                CopyMemory( &szBuffer[dwBufLen], szRename, lnRename );
+                szBuffer[dwBufLen + lnRename ] = 0;
+                szBuffer[dwBufLen + lnRename + 1 ] = 0;
+
+                fSuccess = WritePrivateProfileSectionA( RENAME_SECTION, szBuffer, WININIT_FILENAME );
+            }
+            else
+                SetLastError( ERROR_BUFFER_OVERFLOW );
+        }
+    }
+    else
+    {
+
+        fSuccess = MoveFileA( lpExistingFileNameA, lpNewFileNameA );
+
+        if ( !fSuccess && GetLastError() != ERROR_ACCESS_DENIED &&
+            0 != (dwFlags & (MOVEFILE_COPY_ALLOWED | MOVEFILE_REPLACE_EXISTING)) )
+        {
+            BOOL    bFailIfExist = 0 == (dwFlags & MOVEFILE_REPLACE_EXISTING);
+
+            fSuccess = CopyFileA( lpExistingFileNameA, lpNewFileNameA, bFailIfExist );
+
+            if ( fSuccess )
+                fSuccess = DeleteFileA( lpExistingFileNameA );
+        }
+
+    }
+
+    return fSuccess;
+}
+
+static BOOL MoveFileExImpl( LPCSTR lpExistingFileNameA, LPCSTR lpNewFileNameA, DWORD dwFlags )
+{
+    if ( 0 > ((LONG)GetVersion())) // High order bit indicates Win 9x
+        return MoveFileEx9x( lpExistingFileNameA, lpNewFileNameA, dwFlags );
+    else
+        return MoveFileExA( lpExistingFileNameA, lpNewFileNameA, dwFlags );
+}
+
+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");
+
+    // std::_tstring    mystr;
+    // mystr = "IsOfficeRunning start. Checking file in dir: " + sResourceDir;
+    // MessageBox( NULL, mystr.c_str(), "IsOfficeRunning", MB_OK );
+
+
+    WIN32_FIND_DATA aFindFileData;
+    HANDLE  hFind = FindFirstFile( sPattern.c_str(), &aFindFileData );
+
+    if ( IsValidHandle(hFind) )
+    {
+        BOOL    fSuccess = false;
+        bool    fRenameSucceeded;
+
+        do
+        {
+            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 );
+        }
+
+        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 193d4198ef28..5ddc4b2d7921 100644
--- a/setup_native/source/win32/customactions/shellextensions/exports.dxp
+++ b/setup_native/source/win32/customactions/shellextensions/exports.dxp
@@ -16,3 +16,5 @@ RemoveLayerLinks
 DotNetCheck
 ShowProperties
 copyEditionData
+IsOfficeRunning
+CheckPatchList
diff --git a/setup_native/source/win32/customactions/shellextensions/makefile.mk b/setup_native/source/win32/customactions/shellextensions/makefile.mk
index 594ff890e880..f8a9e6b0ae5a 100644
--- a/setup_native/source/win32/customactions/shellextensions/makefile.mk
+++ b/setup_native/source/win32/customactions/shellextensions/makefile.mk
@@ -66,7 +66,9 @@ SLOFILES = \
     $(SLO)$/layerlinks.obj \
     $(SLO)$/dotnetcheck.obj \
     $(SLO)$/registerextensions.obj \
-    $(SLO)$/copyeditiondata.obj
+    $(SLO)$/copyeditiondata.obj \
+    $(SLO)$/checkrunningoffice.obj \
+    $(SLO)$/checkpatches.obj
 
 STDSHL += \
     $(ADVAPI32LIB)\