diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2021-04-28 16:43:23 -0500 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2021-04-29 14:05:34 -0500 |
commit | 7099dd38ab902e7fb92706314fa8710a34f165a5 (patch) | |
tree | 1f9fb9ee0ed792f683408406f20239428a16d8c3 /src/engine | |
parent | e78138558fe17d8a91929c87b2a6d0c9a482d78a (diff) | |
download | wix-7099dd38ab902e7fb92706314fa8710a34f165a5.tar.gz wix-7099dd38ab902e7fb92706314fa8710a34f165a5.tar.bz2 wix-7099dd38ab902e7fb92706314fa8710a34f165a5.zip |
size_t-ify BootstrapperEngine.h and BundleExtensionEngine.h
Diffstat (limited to 'src/engine')
-rw-r--r-- | src/engine/burnextension.cpp | 2 | ||||
-rw-r--r-- | src/engine/externalengine.cpp | 14 | ||||
-rw-r--r-- | src/engine/externalengine.h | 8 | ||||
-rw-r--r-- | src/engine/userexperience.cpp | 2 |
4 files changed, 13 insertions, 13 deletions
diff --git a/src/engine/burnextension.cpp b/src/engine/burnextension.cpp index 7568f75e..475df1c5 100644 --- a/src/engine/burnextension.cpp +++ b/src/engine/burnextension.cpp | |||
@@ -134,7 +134,7 @@ EXTERN_C HRESULT BurnExtensionLoad( | |||
134 | args.cbSize = sizeof(BUNDLE_EXTENSION_CREATE_ARGS); | 134 | args.cbSize = sizeof(BUNDLE_EXTENSION_CREATE_ARGS); |
135 | args.pfnBundleExtensionEngineProc = EngineForExtensionProc; | 135 | args.pfnBundleExtensionEngineProc = EngineForExtensionProc; |
136 | args.pvBundleExtensionEngineProcContext = pEngineContext; | 136 | args.pvBundleExtensionEngineProcContext = pEngineContext; |
137 | args.qwEngineAPIVersion = MAKEQWORDVERSION(2020, 8, 31, 0); | 137 | args.qwEngineAPIVersion = MAKEQWORDVERSION(2021, 4, 27, 0); |
138 | args.wzBootstrapperWorkingFolder = pEngineContext->pEngineState->userExperience.sczTempDirectory; | 138 | args.wzBootstrapperWorkingFolder = pEngineContext->pEngineState->userExperience.sczTempDirectory; |
139 | args.wzBundleExtensionDataPath = sczBundleExtensionDataPath; | 139 | args.wzBundleExtensionDataPath = sczBundleExtensionDataPath; |
140 | args.wzExtensionId = pExtension->sczId; | 140 | args.wzExtensionId = pExtension->sczId; |
diff --git a/src/engine/externalengine.cpp b/src/engine/externalengine.cpp index 63177722..51a0e229 100644 --- a/src/engine/externalengine.cpp +++ b/src/engine/externalengine.cpp | |||
@@ -6,7 +6,7 @@ | |||
6 | static HRESULT CopyStringToExternal( | 6 | static HRESULT CopyStringToExternal( |
7 | __in_z LPWSTR wzValue, | 7 | __in_z LPWSTR wzValue, |
8 | __in_z_opt LPWSTR wzBuffer, | 8 | __in_z_opt LPWSTR wzBuffer, |
9 | __inout DWORD* pcchBuffer | 9 | __inout SIZE_T* pcchBuffer |
10 | ); | 10 | ); |
11 | 11 | ||
12 | // function definitions | 12 | // function definitions |
@@ -44,7 +44,7 @@ HRESULT ExternalEngineGetVariableString( | |||
44 | __in BURN_ENGINE_STATE* pEngineState, | 44 | __in BURN_ENGINE_STATE* pEngineState, |
45 | __in_z LPCWSTR wzVariable, | 45 | __in_z LPCWSTR wzVariable, |
46 | __out_ecount_opt(*pcchValue) LPWSTR wzValue, | 46 | __out_ecount_opt(*pcchValue) LPWSTR wzValue, |
47 | __inout DWORD* pcchValue | 47 | __inout SIZE_T* pcchValue |
48 | ) | 48 | ) |
49 | { | 49 | { |
50 | HRESULT hr = S_OK; | 50 | HRESULT hr = S_OK; |
@@ -72,7 +72,7 @@ HRESULT ExternalEngineGetVariableVersion( | |||
72 | __in BURN_ENGINE_STATE* pEngineState, | 72 | __in BURN_ENGINE_STATE* pEngineState, |
73 | __in_z LPCWSTR wzVariable, | 73 | __in_z LPCWSTR wzVariable, |
74 | __out_ecount_opt(*pcchValue) LPWSTR wzValue, | 74 | __out_ecount_opt(*pcchValue) LPWSTR wzValue, |
75 | __inout DWORD* pcchValue | 75 | __inout SIZE_T* pcchValue |
76 | ) | 76 | ) |
77 | { | 77 | { |
78 | HRESULT hr = S_OK; | 78 | HRESULT hr = S_OK; |
@@ -100,7 +100,7 @@ HRESULT ExternalEngineFormatString( | |||
100 | __in BURN_ENGINE_STATE* pEngineState, | 100 | __in BURN_ENGINE_STATE* pEngineState, |
101 | __in_z LPCWSTR wzIn, | 101 | __in_z LPCWSTR wzIn, |
102 | __out_ecount_opt(*pcchOut) LPWSTR wzOut, | 102 | __out_ecount_opt(*pcchOut) LPWSTR wzOut, |
103 | __inout DWORD* pcchOut | 103 | __inout SIZE_T* pcchOut |
104 | ) | 104 | ) |
105 | { | 105 | { |
106 | HRESULT hr = S_OK; | 106 | HRESULT hr = S_OK; |
@@ -127,7 +127,7 @@ HRESULT ExternalEngineFormatString( | |||
127 | HRESULT ExternalEngineEscapeString( | 127 | HRESULT ExternalEngineEscapeString( |
128 | __in_z LPCWSTR wzIn, | 128 | __in_z LPCWSTR wzIn, |
129 | __out_ecount_opt(*pcchOut) LPWSTR wzOut, | 129 | __out_ecount_opt(*pcchOut) LPWSTR wzOut, |
130 | __inout DWORD* pcchOut | 130 | __inout SIZE_T* pcchOut |
131 | ) | 131 | ) |
132 | { | 132 | { |
133 | HRESULT hr = S_OK; | 133 | HRESULT hr = S_OK; |
@@ -771,7 +771,7 @@ LExit: | |||
771 | static HRESULT CopyStringToExternal( | 771 | static HRESULT CopyStringToExternal( |
772 | __in_z LPWSTR wzValue, | 772 | __in_z LPWSTR wzValue, |
773 | __in_z_opt LPWSTR wzBuffer, | 773 | __in_z_opt LPWSTR wzBuffer, |
774 | __inout DWORD* pcchBuffer | 774 | __inout SIZE_T* pcchBuffer |
775 | ) | 775 | ) |
776 | { | 776 | { |
777 | HRESULT hr = S_OK; | 777 | HRESULT hr = S_OK; |
@@ -788,7 +788,7 @@ static HRESULT CopyStringToExternal( | |||
788 | 788 | ||
789 | if (fTooSmall) | 789 | if (fTooSmall) |
790 | { | 790 | { |
791 | hr = ::StringCchLengthW(wzValue, STRSAFE_MAX_CCH, reinterpret_cast<size_t*>(pcchBuffer)); | 791 | hr = ::StringCchLengthW(wzValue, STRSAFE_MAX_LENGTH, reinterpret_cast<size_t*>(pcchBuffer)); |
792 | if (SUCCEEDED(hr)) | 792 | if (SUCCEEDED(hr)) |
793 | { | 793 | { |
794 | hr = E_MOREDATA; | 794 | hr = E_MOREDATA; |
diff --git a/src/engine/externalengine.h b/src/engine/externalengine.h index a007e5b2..2903615d 100644 --- a/src/engine/externalengine.h +++ b/src/engine/externalengine.h | |||
@@ -26,27 +26,27 @@ HRESULT ExternalEngineGetVariableString( | |||
26 | __in BURN_ENGINE_STATE* pEngineState, | 26 | __in BURN_ENGINE_STATE* pEngineState, |
27 | __in_z LPCWSTR wzVariable, | 27 | __in_z LPCWSTR wzVariable, |
28 | __out_ecount_opt(*pcchValue) LPWSTR wzValue, | 28 | __out_ecount_opt(*pcchValue) LPWSTR wzValue, |
29 | __inout DWORD* pcchValue | 29 | __inout SIZE_T* pcchValue |
30 | ); | 30 | ); |
31 | 31 | ||
32 | HRESULT ExternalEngineGetVariableVersion( | 32 | HRESULT ExternalEngineGetVariableVersion( |
33 | __in BURN_ENGINE_STATE* pEngineState, | 33 | __in BURN_ENGINE_STATE* pEngineState, |
34 | __in_z LPCWSTR wzVariable, | 34 | __in_z LPCWSTR wzVariable, |
35 | __out_ecount_opt(*pcchValue) LPWSTR wzValue, | 35 | __out_ecount_opt(*pcchValue) LPWSTR wzValue, |
36 | __inout DWORD* pcchValue | 36 | __inout SIZE_T* pcchValue |
37 | ); | 37 | ); |
38 | 38 | ||
39 | HRESULT ExternalEngineFormatString( | 39 | HRESULT ExternalEngineFormatString( |
40 | __in BURN_ENGINE_STATE* pEngineState, | 40 | __in BURN_ENGINE_STATE* pEngineState, |
41 | __in_z LPCWSTR wzIn, | 41 | __in_z LPCWSTR wzIn, |
42 | __out_ecount_opt(*pcchOut) LPWSTR wzOut, | 42 | __out_ecount_opt(*pcchOut) LPWSTR wzOut, |
43 | __inout DWORD* pcchOut | 43 | __inout SIZE_T* pcchOut |
44 | ); | 44 | ); |
45 | 45 | ||
46 | HRESULT ExternalEngineEscapeString( | 46 | HRESULT ExternalEngineEscapeString( |
47 | __in_z LPCWSTR wzIn, | 47 | __in_z LPCWSTR wzIn, |
48 | __out_ecount_opt(*pcchOut) LPWSTR wzOut, | 48 | __out_ecount_opt(*pcchOut) LPWSTR wzOut, |
49 | __inout DWORD* pcchOut | 49 | __inout SIZE_T* pcchOut |
50 | ); | 50 | ); |
51 | 51 | ||
52 | HRESULT ExternalEngineEvaluateCondition( | 52 | HRESULT ExternalEngineEvaluateCondition( |
diff --git a/src/engine/userexperience.cpp b/src/engine/userexperience.cpp index 7e68d664..ab631951 100644 --- a/src/engine/userexperience.cpp +++ b/src/engine/userexperience.cpp | |||
@@ -111,7 +111,7 @@ extern "C" HRESULT UserExperienceLoad( | |||
111 | args.pCommand = pCommand; | 111 | args.pCommand = pCommand; |
112 | args.pfnBootstrapperEngineProc = EngineForApplicationProc; | 112 | args.pfnBootstrapperEngineProc = EngineForApplicationProc; |
113 | args.pvBootstrapperEngineProcContext = pEngineContext; | 113 | args.pvBootstrapperEngineProcContext = pEngineContext; |
114 | args.qwEngineAPIVersion = MAKEQWORDVERSION(2021, 4, 14, 0); | 114 | args.qwEngineAPIVersion = MAKEQWORDVERSION(2021, 4, 27, 0); |
115 | 115 | ||
116 | results.cbSize = sizeof(BOOTSTRAPPER_CREATE_RESULTS); | 116 | results.cbSize = sizeof(BOOTSTRAPPER_CREATE_RESULTS); |
117 | 117 | ||