diff options
Diffstat (limited to 'setup_native/source/win32/customactions')
-rw-r--r-- | setup_native/source/win32/customactions/tools/checkversion.cxx | 40 | ||||
-rw-r--r-- | setup_native/source/win32/customactions/tools/seterror.hxx | 10 |
2 files changed, 0 insertions, 50 deletions
diff --git a/setup_native/source/win32/customactions/tools/checkversion.cxx b/setup_native/source/win32/customactions/tools/checkversion.cxx index dc42bfa63288..714894636bb2 100644 --- a/setup_native/source/win32/customactions/tools/checkversion.cxx +++ b/setup_native/source/win32/customactions/tools/checkversion.cxx @@ -86,14 +86,6 @@ extern "C" UINT __stdcall CheckVersions( MSIHANDLE hMSI ) free( pVal ); } pVal = NULL; - if ( GetMsiProp( hMSI, L"SAMEPRODUCTS", &pVal ) && pVal ) - { - OutputDebugStringFormat( TEXT("DEBUG: SAMEPRODUCTS found [%s]"), pVal ); - if ( *pVal != 0 ) - SetMsiErrorCode( MSI_ERROR_SAME_VERSION_FOUND ); - free( pVal ); - } - pVal = NULL; if ( GetMsiProp( hMSI, L"OLDPRODUCTS", &pVal ) && pVal ) { OutputDebugStringFormat( TEXT("DEBUG: OLDPRODUCTS found [%s]"), pVal ); @@ -102,38 +94,6 @@ extern "C" UINT __stdcall CheckVersions( MSIHANDLE hMSI ) free( pVal ); } pVal = NULL; - if ( GetMsiProp( hMSI, L"BETAPRODUCTS", &pVal ) && pVal ) - { - OutputDebugStringFormat( TEXT("DEBUG: BETAPRODUCTS found [%s]"), pVal ); - if ( *pVal != 0 ) - SetMsiErrorCode( MSI_ERROR_OLD_VERSION_FOUND ); - free( pVal ); - } - - pVal = NULL; - if ( GetMsiProp( hMSI, L"NEWPRODUCTSPATCH", &pVal ) && pVal ) - { - OutputDebugStringFormat( TEXT("DEBUG: NEWPRODUCTSPATCH found [%s]"), pVal ); - if ( *pVal != 0 ) - SetMsiErrorCode( MSI_ERROR_NEW_PATCH_FOUND ); - free( pVal ); - } - pVal = NULL; - if ( GetMsiProp( hMSI, L"SAMEPRODUCTSPATCH", &pVal ) && pVal ) - { - OutputDebugStringFormat( TEXT("DEBUG: SAMEPRODUCTSPATCH found [%s]"), pVal ); - if ( *pVal != 0 ) - SetMsiErrorCode( MSI_ERROR_SAME_PATCH_FOUND ); - free( pVal ); - } - pVal = NULL; - if ( GetMsiProp( hMSI, L"OLDPRODUCTSPATCH", &pVal ) && pVal ) - { - OutputDebugStringFormat( TEXT("DEBUG: OLDPRODUCTSPATCH found [%s]"), pVal ); - if ( *pVal != 0 ) - SetMsiErrorCode( MSI_ERROR_OLD_PATCH_FOUND ); - free( pVal ); - } return ERROR_SUCCESS; } diff --git a/setup_native/source/win32/customactions/tools/seterror.hxx b/setup_native/source/win32/customactions/tools/seterror.hxx index 9adf3df8a653..f87aa5f2062b 100644 --- a/setup_native/source/win32/customactions/tools/seterror.hxx +++ b/setup_native/source/win32/customactions/tools/seterror.hxx @@ -23,18 +23,8 @@ //---------------------------------------------------------- // list of own error codes -#define MSI_ERROR_INVALIDDIRECTORY 9001 -#define MSI_ERROR_ISWRONGPRODUCT 9002 -#define MSI_ERROR_PATCHISOLDER 9003 - #define MSI_ERROR_NEW_VERSION_FOUND 9010 -#define MSI_ERROR_SAME_VERSION_FOUND 9011 #define MSI_ERROR_OLD_VERSION_FOUND 9012 -#define MSI_ERROR_NEW_PATCH_FOUND 9013 -#define MSI_ERROR_SAME_PATCH_FOUND 9014 -#define MSI_ERROR_OLD_PATCH_FOUND 9015 - -#define MSI_ERROR_OFFICE_IS_RUNNING 9020 #define MSI_ERROR_DIRECTORY_NOT_EMPTY 9030 |