diff options
author | Bob Arnson <bob@firegiant.com> | 2020-11-13 21:21:33 -0500 |
---|---|---|
committer | Bob Arnson <bob@firegiant.com> | 2020-12-26 22:08:07 -0500 |
commit | 6554b42e999c8ff2cf20361a7dd7ec500723ec71 (patch) | |
tree | 00a34f1466164bd2ddac16b08283727d4c6554e7 /src/dutil/inc/strutil.h | |
parent | d5925b2bd8e71933cb88a0d17298088260b5b7db (diff) | |
download | wix-6554b42e999c8ff2cf20361a7dd7ec500723ec71.tar.gz wix-6554b42e999c8ff2cf20361a7dd7ec500723ec71.tar.bz2 wix-6554b42e999c8ff2cf20361a7dd7ec500723ec71.zip |
Clean up 32-bit ass-u-mptions for x64 and arm64.
Diffstat (limited to 'src/dutil/inc/strutil.h')
-rw-r--r-- | src/dutil/inc/strutil.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/dutil/inc/strutil.h b/src/dutil/inc/strutil.h index c73615aa..454506d2 100644 --- a/src/dutil/inc/strutil.h +++ b/src/dutil/inc/strutil.h | |||
@@ -46,29 +46,29 @@ HRESULT DAPI StrAnsiTrimWhitespace( | |||
46 | HRESULT DAPI StrAllocString( | 46 | HRESULT DAPI StrAllocString( |
47 | __deref_out_ecount_z(cchSource+1) LPWSTR* ppwz, | 47 | __deref_out_ecount_z(cchSource+1) LPWSTR* ppwz, |
48 | __in_z LPCWSTR wzSource, | 48 | __in_z LPCWSTR wzSource, |
49 | __in DWORD_PTR cchSource | 49 | __in SIZE_T cchSource |
50 | ); | 50 | ); |
51 | HRESULT DAPI StrAllocStringSecure( | 51 | HRESULT DAPI StrAllocStringSecure( |
52 | __deref_out_ecount_z(cchSource + 1) LPWSTR* ppwz, | 52 | __deref_out_ecount_z(cchSource + 1) LPWSTR* ppwz, |
53 | __in_z LPCWSTR wzSource, | 53 | __in_z LPCWSTR wzSource, |
54 | __in DWORD_PTR cchSource | 54 | __in SIZE_T cchSource |
55 | ); | 55 | ); |
56 | HRESULT DAPI StrAnsiAllocString( | 56 | HRESULT DAPI StrAnsiAllocString( |
57 | __deref_out_ecount_z(cchSource+1) LPSTR* ppsz, | 57 | __deref_out_ecount_z(cchSource+1) LPSTR* ppsz, |
58 | __in_z LPCWSTR wzSource, | 58 | __in_z LPCWSTR wzSource, |
59 | __in DWORD_PTR cchSource, | 59 | __in SIZE_T cchSource, |
60 | __in UINT uiCodepage | 60 | __in UINT uiCodepage |
61 | ); | 61 | ); |
62 | HRESULT DAPI StrAllocStringAnsi( | 62 | HRESULT DAPI StrAllocStringAnsi( |
63 | __deref_out_ecount_z(cchSource+1) LPWSTR* ppwz, | 63 | __deref_out_ecount_z(cchSource+1) LPWSTR* ppwz, |
64 | __in_z LPCSTR szSource, | 64 | __in_z LPCSTR szSource, |
65 | __in DWORD_PTR cchSource, | 65 | __in SIZE_T cchSource, |
66 | __in UINT uiCodepage | 66 | __in UINT uiCodepage |
67 | ); | 67 | ); |
68 | HRESULT DAPI StrAnsiAllocStringAnsi( | 68 | HRESULT DAPI StrAnsiAllocStringAnsi( |
69 | __deref_out_ecount_z(cchSource+1) LPSTR* ppsz, | 69 | __deref_out_ecount_z(cchSource+1) LPSTR* ppsz, |
70 | __in_z LPCSTR szSource, | 70 | __in_z LPCSTR szSource, |
71 | __in DWORD_PTR cchSource | 71 | __in SIZE_T cchSource |
72 | ); | 72 | ); |
73 | HRESULT DAPI StrAllocPrefix( | 73 | HRESULT DAPI StrAllocPrefix( |
74 | __deref_out_z LPWSTR* ppwz, | 74 | __deref_out_z LPWSTR* ppwz, |
@@ -78,17 +78,17 @@ HRESULT DAPI StrAllocPrefix( | |||
78 | HRESULT DAPI StrAllocConcat( | 78 | HRESULT DAPI StrAllocConcat( |
79 | __deref_out_z LPWSTR* ppwz, | 79 | __deref_out_z LPWSTR* ppwz, |
80 | __in_z LPCWSTR wzSource, | 80 | __in_z LPCWSTR wzSource, |
81 | __in DWORD_PTR cchSource | 81 | __in SIZE_T cchSource |
82 | ); | 82 | ); |
83 | HRESULT DAPI StrAllocConcatSecure( | 83 | HRESULT DAPI StrAllocConcatSecure( |
84 | __deref_out_z LPWSTR* ppwz, | 84 | __deref_out_z LPWSTR* ppwz, |
85 | __in_z LPCWSTR wzSource, | 85 | __in_z LPCWSTR wzSource, |
86 | __in DWORD_PTR cchSource | 86 | __in SIZE_T cchSource |
87 | ); | 87 | ); |
88 | HRESULT DAPI StrAnsiAllocConcat( | 88 | HRESULT DAPI StrAnsiAllocConcat( |
89 | __deref_out_z LPSTR* ppz, | 89 | __deref_out_z LPSTR* ppz, |
90 | __in_z LPCSTR pzSource, | 90 | __in_z LPCSTR pzSource, |
91 | __in DWORD_PTR cchSource | 91 | __in SIZE_T cchSource |
92 | ); | 92 | ); |
93 | HRESULT __cdecl StrAllocFormatted( | 93 | HRESULT __cdecl StrAllocFormatted( |
94 | __deref_out_z LPWSTR* ppwz, | 94 | __deref_out_z LPWSTR* ppwz, |
@@ -289,7 +289,7 @@ HRESULT DAPI StrArrayAllocString( | |||
289 | __deref_inout_ecount_opt(*pcStrArray) LPWSTR **prgsczStrArray, | 289 | __deref_inout_ecount_opt(*pcStrArray) LPWSTR **prgsczStrArray, |
290 | __inout LPUINT pcStrArray, | 290 | __inout LPUINT pcStrArray, |
291 | __in_z LPCWSTR wzSource, | 291 | __in_z LPCWSTR wzSource, |
292 | __in DWORD_PTR cchSource | 292 | __in SIZE_T cchSource |
293 | ); | 293 | ); |
294 | 294 | ||
295 | HRESULT DAPI StrArrayFree( | 295 | HRESULT DAPI StrArrayFree( |