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/externalengine.cpp | |
| 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/externalengine.cpp')
| -rw-r--r-- | src/engine/externalengine.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
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; |
