diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2017-09-27 10:02:59 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2017-09-28 05:32:50 +0200 |
| commit | 0fa21336428b286d69684cfbb7b845f123657041 (patch) | |
| tree | 8d1e84ad1973d72d5bbf900d9f39b39996c1f876 /setup_native/source/win32/customactions/regactivex | |
| parent | 8d2a287da3abb0576512406227d0a3acd602123e (diff) | |
setup_native: use more Unicode in MSI custom actions
Change-Id: Id47ea566c9cf508116216625fe00013e8326b165
Reviewed-on: https://gerrit.libreoffice.org/42839
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'setup_native/source/win32/customactions/regactivex')
| -rw-r--r-- | setup_native/source/win32/customactions/regactivex/regactivex.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/setup_native/source/win32/customactions/regactivex/regactivex.cxx b/setup_native/source/win32/customactions/regactivex/regactivex.cxx index 00739ac4f9c6..947fbfbd9e9a 100644 --- a/setup_native/source/win32/customactions/regactivex/regactivex.cxx +++ b/setup_native/source/win32/customactions/regactivex/regactivex.cxx @@ -147,7 +147,7 @@ BOOL GetDelta( MSIHANDLE hMSI, int& nOldInstallMode, int& nInstallMode, int& nDe nDeinstallMode = 0; INSTALLSTATE current_state; - INSTALLSTATE future_state; + INSTALLSTATE future_state; if ( ERROR_SUCCESS == MsiGetFeatureStateW( hMSI, L"gm_p_Wrt_Bin", ¤t_state, &future_state ) ) { @@ -158,7 +158,7 @@ BOOL GetDelta( MSIHANDLE hMSI, int& nOldInstallMode, int& nInstallMode, int& nDe if ( future_state == INSTALLSTATE_LOCAL || ( current_state == INSTALLSTATE_LOCAL && future_state == INSTALLSTATE_UNKNOWN ) ) nInstallMode |= WRITER_COMPONENT; - else if ( current_state == INSTALLSTATE_LOCAL && future_state == INSTALLSTATE_ABSENT ) + else if ( current_state == INSTALLSTATE_LOCAL && future_state == INSTALLSTATE_ABSENT ) nDeinstallMode |= WRITER_COMPONENT; } else @@ -175,7 +175,7 @@ BOOL GetDelta( MSIHANDLE hMSI, int& nOldInstallMode, int& nInstallMode, int& nDe if ( future_state == INSTALLSTATE_LOCAL || ( current_state == INSTALLSTATE_LOCAL && future_state == INSTALLSTATE_UNKNOWN ) ) nInstallMode |= CALC_COMPONENT; - else if ( current_state == INSTALLSTATE_LOCAL && future_state == INSTALLSTATE_ABSENT ) + else if ( current_state == INSTALLSTATE_LOCAL && future_state == INSTALLSTATE_ABSENT ) nDeinstallMode |= CALC_COMPONENT; } else @@ -192,7 +192,7 @@ BOOL GetDelta( MSIHANDLE hMSI, int& nOldInstallMode, int& nInstallMode, int& nDe if ( future_state == INSTALLSTATE_LOCAL || ( current_state == INSTALLSTATE_LOCAL && future_state == INSTALLSTATE_UNKNOWN ) ) nInstallMode |= DRAW_COMPONENT; - else if ( current_state == INSTALLSTATE_LOCAL && future_state == INSTALLSTATE_ABSENT ) + else if ( current_state == INSTALLSTATE_LOCAL && future_state == INSTALLSTATE_ABSENT ) nDeinstallMode |= DRAW_COMPONENT; } else @@ -209,7 +209,7 @@ BOOL GetDelta( MSIHANDLE hMSI, int& nOldInstallMode, int& nInstallMode, int& nDe if ( future_state == INSTALLSTATE_LOCAL || ( current_state == INSTALLSTATE_LOCAL && future_state == INSTALLSTATE_UNKNOWN ) ) nInstallMode |= IMPRESS_COMPONENT; - else if ( current_state == INSTALLSTATE_LOCAL && future_state == INSTALLSTATE_ABSENT ) + else if ( current_state == INSTALLSTATE_LOCAL && future_state == INSTALLSTATE_ABSENT ) nDeinstallMode |= IMPRESS_COMPONENT; } else @@ -226,7 +226,7 @@ BOOL GetDelta( MSIHANDLE hMSI, int& nOldInstallMode, int& nInstallMode, int& nDe if ( future_state == INSTALLSTATE_LOCAL || ( current_state == INSTALLSTATE_LOCAL && future_state == INSTALLSTATE_UNKNOWN ) ) nInstallMode |= MATH_COMPONENT; - else if ( current_state == INSTALLSTATE_LOCAL && future_state == INSTALLSTATE_ABSENT ) + else if ( current_state == INSTALLSTATE_LOCAL && future_state == INSTALLSTATE_ABSENT ) nDeinstallMode |= MATH_COMPONENT; } else |