Avoid a name conflict with RefreshPolicy API
To avoid a name conflict between our RefreshPolicy function and
RefreshPolicy Win32 API [1], this CL renames our one to a bit more
descriptive name "CallIERefreshElevationPolicy", because the purpose of
that function is just to call IERefreshElevationPolicy API [2].
[1]: https://msdn.microsoft.com/en-us/library/aa374398.aspx
[2]: https://msdn.microsoft.com/en-us/library/bb544929.aspx
BUG=
TEST=
REF_BUG=31902088
REF_CL=137113047
REF_TIME=2016-10-24T20:27:26-07:00
REF_TIME_RAW=1477366046 -0700
Yohei Yukawa
7 years ago
29 | 29 |
|
30 | 30 |
MAJOR=2
|
31 | 31 |
MINOR=19
|
32 | |
BUILD=2652
|
|
32 |
BUILD=2653
|
33 | 33 |
REVISION=102
|
34 | 34 |
# This version represents the version of Mozc IME engine (converter, predictor,
|
35 | 35 |
# etc.). This version info is included both in the Mozc server and in the Mozc
|
258 | 258 |
return TRUE;
|
259 | 259 |
}
|
260 | 260 |
|
261 | |
UINT __stdcall RefreshPolicy(MSIHANDLE msi_handle) {
|
|
261 |
UINT __stdcall CallIERefreshElevationPolicy(MSIHANDLE msi_handle) {
|
262 | 262 |
DEBUG_BREAK_FOR_DEBUGGER();
|
263 | 263 |
HRESULT result = CallSystemDllFunction(kIEFrameDll,
|
264 | 264 |
"IERefreshElevationPolicy");
|
0 | 0 |
EXPORTS
|
1 | |
RefreshPolicy
|
|
1 |
CallIERefreshElevationPolicy
|
2 | 2 |
InstallIME
|
3 | 3 |
InstallIMERollback
|
4 | 4 |
UninstallIME
|
35 | 35 |
#include <msi.h>
|
36 | 36 |
|
37 | 37 |
// Makes ieuser.exe update the cache of the elevation policies.
|
38 | |
UINT __stdcall RefreshPolicy(MSIHANDLE msi_handle);
|
|
38 |
UINT __stdcall CallIERefreshElevationPolicy(MSIHANDLE msi_handle);
|
39 | 39 |
|
40 | 40 |
// Install Mozc as an IME.
|
41 | 41 |
UINT __stdcall InstallIME(MSIHANDLE msi_handle);
|
772 | 772 |
<CustomAction Id='UnregisterTIPRollback32' BinaryKey='CustomActions32'
|
773 | 773 |
DllEntry='UnregisterTIPRollback' Execute='rollback' Impersonate='no'
|
774 | 774 |
Return='ignore' />
|
775 | |
<CustomAction Id='RefreshPolicy' BinaryKey='CustomActions32'
|
776 | |
DllEntry='RefreshPolicy' Execute='commit' Impersonate='no' />
|
|
775 |
<CustomAction Id='CallIERefreshElevationPolicy' BinaryKey='CustomActions32'
|
|
776 |
DllEntry='CallIERefreshElevationPolicy' Execute='commit' Impersonate='no' />
|
777 | 777 |
<CustomAction Id='OpenUninstallSurveyPage' BinaryKey='CustomActions32'
|
778 | 778 |
DllEntry='OpenUninstallSurveyPage' Impersonate='yes' Return='ignore' />
|
779 | 779 |
<CustomAction Id='ShutdownServer' BinaryKey='CustomActions32'
|
|
855 | 855 |
(REMOVE="ALL") AND (NOT UPGRADINGPRODUCTCODE) AND (UILevel >= 3)
|
856 | 856 |
</Custom>
|
857 | 857 |
<SelfRegModules />
|
858 | |
<Custom Action='RefreshPolicy' After='SelfRegModules'>
|
|
858 |
<Custom Action='CallIERefreshElevationPolicy' After='SelfRegModules'>
|
859 | 859 |
(NOT (REMOVE="ALL")) AND (VersionNT >= 600)
|
860 | 860 |
</Custom>
|
861 | 861 |
<!--
|
861 | 861 |
<CustomAction Id='UnregisterTIPRollback64' BinaryKey='CustomActions64'
|
862 | 862 |
DllEntry='UnregisterTIPRollback' Execute='rollback' Impersonate='no'
|
863 | 863 |
Return='ignore' />
|
864 | |
<CustomAction Id='RefreshPolicy' BinaryKey='CustomActions32'
|
865 | |
DllEntry='RefreshPolicy' Execute='commit' Impersonate='no' />
|
|
864 |
<CustomAction Id='CallIERefreshElevationPolicy' BinaryKey='CustomActions32'
|
|
865 |
DllEntry='CallIERefreshElevationPolicy' Execute='commit' Impersonate='no' />
|
866 | 866 |
<CustomAction Id='OpenUninstallSurveyPage' BinaryKey='CustomActions32'
|
867 | 867 |
DllEntry='OpenUninstallSurveyPage' Impersonate='yes' Return='ignore' />
|
868 | 868 |
<CustomAction Id='ShutdownServer' BinaryKey='CustomActions32'
|
|
952 | 952 |
(REMOVE="ALL") AND (NOT UPGRADINGPRODUCTCODE) AND (UILevel >= 3)
|
953 | 953 |
</Custom>
|
954 | 954 |
<SelfRegModules />
|
955 | |
<Custom Action='RefreshPolicy' After='SelfRegModules'>
|
|
955 |
<Custom Action='CallIERefreshElevationPolicy' After='SelfRegModules'>
|
956 | 956 |
(NOT (REMOVE="ALL")) AND (VersionNT >= 600)
|
957 | 957 |
</Custom>
|
958 | 958 |
<!--
|