diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2019-02-04 20:06:58 -0600 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2019-02-04 20:11:32 -0600 |
commit | c239e0cc3a28a50c42c63b086ee62e17cf699104 (patch) | |
tree | 5ba3e85a9bb1aef22a9162629b248a8e27e2c43f /src/ca/cputilexec.h | |
parent | cbc09b6cd6d0d0b8bf095a88d4d8333616637f71 (diff) | |
download | wix-c239e0cc3a28a50c42c63b086ee62e17cf699104.tar.gz wix-c239e0cc3a28a50c42c63b086ee62e17cf699104.tar.bz2 wix-c239e0cc3a28a50c42c63b086ee62e17cf699104.zip |
Integrate into latest v4.
Diffstat (limited to 'src/ca/cputilexec.h')
-rw-r--r-- | src/ca/cputilexec.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/ca/cputilexec.h b/src/ca/cputilexec.h index 51b47583..b900883d 100644 --- a/src/ca/cputilexec.h +++ b/src/ca/cputilexec.h | |||
@@ -28,8 +28,8 @@ struct CPI_ROLLBACK_DATA | |||
28 | 28 | ||
29 | // function prototypes | 29 | // function prototypes |
30 | 30 | ||
31 | void CpiInitialize(); | 31 | void CpiExecInitialize(); |
32 | void CpiFinalize(); | 32 | void CpiExecFinalize(); |
33 | HRESULT CpiActionStartMessage( | 33 | HRESULT CpiActionStartMessage( |
34 | LPWSTR* ppwzActionData, | 34 | LPWSTR* ppwzActionData, |
35 | BOOL fSuppress | 35 | BOOL fSuppress |
@@ -38,15 +38,15 @@ HRESULT CpiActionDataMessage( | |||
38 | DWORD cArgs, | 38 | DWORD cArgs, |
39 | ... | 39 | ... |
40 | ); | 40 | ); |
41 | HRESULT CpiGetAdminCatalog( | 41 | HRESULT CpiExecGetAdminCatalog( |
42 | ICOMAdminCatalog** ppiCatalog | 42 | ICOMAdminCatalog** ppiCatalog |
43 | ); | 43 | ); |
44 | HRESULT CpiLogCatalogErrorInfo(); | 44 | HRESULT CpiLogCatalogErrorInfo(); |
45 | HRESULT CpiGetCatalogCollection( | 45 | HRESULT CpiExecGetCatalogCollection( |
46 | LPCWSTR pwzName, | 46 | LPCWSTR pwzName, |
47 | ICatalogCollection** ppiColl | 47 | ICatalogCollection** ppiColl |
48 | ); | 48 | ); |
49 | HRESULT CpiGetCatalogCollection( | 49 | HRESULT CpiExecGetCatalogCollection( |
50 | ICatalogCollection* piColl, | 50 | ICatalogCollection* piColl, |
51 | ICatalogObject* piObj, | 51 | ICatalogObject* piObj, |
52 | LPCWSTR pwzName, | 52 | LPCWSTR pwzName, |
@@ -105,7 +105,7 @@ HRESULT CpiFindUserCollectionObject( | |||
105 | PSID pSid, | 105 | PSID pSid, |
106 | ICatalogObject** ppiObj | 106 | ICatalogObject** ppiObj |
107 | ); | 107 | ); |
108 | HRESULT CpiGetPartitionsCollection( | 108 | HRESULT CpiExecGetPartitionsCollection( |
109 | ICatalogCollection** ppiPartColl | 109 | ICatalogCollection** ppiPartColl |
110 | ); | 110 | ); |
111 | HRESULT CpiGetPartitionRolesCollection( | 111 | HRESULT CpiGetPartitionRolesCollection( |
@@ -120,7 +120,7 @@ HRESULT CpiGetUsersInPartitionRoleCollection( | |||
120 | HRESULT CpiGetPartitionUsersCollection( | 120 | HRESULT CpiGetPartitionUsersCollection( |
121 | ICatalogCollection** ppiUserColl | 121 | ICatalogCollection** ppiUserColl |
122 | ); | 122 | ); |
123 | HRESULT CpiGetApplicationsCollection( | 123 | HRESULT CpiExecGetApplicationsCollection( |
124 | LPCWSTR pwzPartID, | 124 | LPCWSTR pwzPartID, |
125 | ICatalogCollection** ppiAppColl | 125 | ICatalogCollection** ppiAppColl |
126 | ); | 126 | ); |