Clean up 32-bit ass-u-mptions for x64 and arm64.
Bob Arnson committed
Nov 13, 2020 at 21:21 UTC
6554b42e999c8ff2cf20361a7dd7ec500723ec71
7 files changed
+31
-31
src/dutil/buffutil.cpp
+2
-2
@@ -257,7 +257,7 @@ LExit:
257
extern "C" HRESULT BuffWriteNumber(
258
__deref_out_bcount(*piBuffer) BYTE** ppbBuffer,
259
__inout SIZE_T* piBuffer,
260
- __in DWORD dw
260
+ __in DWORD_PTR dw
261
)
262
{
263
Assert(ppbBuffer);
@@ -270,7 +270,7 @@ extern "C" HRESULT BuffWriteNumber(
270
ExitOnFailure(hr, "Failed to ensure buffer size.");
271
272
// copy data to buffer
273
- *(DWORD*)(*ppbBuffer + *piBuffer) = dw;
273
+ *(DWORD_PTR*)(*ppbBuffer + *piBuffer) = dw;
274
*piBuffer += sizeof(DWORD);
275
276
LExit:
src/dutil/fileutil.cpp
+9
-9
@@ -789,7 +789,7 @@ LExit:
789
********************************************************************/
790
extern "C" HRESULT DAPI FileRead(
791
__deref_out_bcount_full(*pcbDest) LPBYTE* ppbDest,
792
- __out DWORD* pcbDest,
792
+ __out SIZE_T* pcbDest,
793
__in LPCWSTR wzSrcPath
794
)
795
{
@@ -803,7 +803,7 @@ extern "C" HRESULT DAPI FileRead(
803
********************************************************************/
804
extern "C" HRESULT DAPI FileReadEx(
805
__deref_out_bcount_full(*pcbDest) LPBYTE* ppbDest,
806
- __out DWORD* pcbDest,
806
+ __out SIZE_T* pcbDest,
807
__in_z LPCWSTR wzSrcPath,
808
__in DWORD dwShareMode
809
)
@@ -818,7 +818,7 @@ extern "C" HRESULT DAPI FileReadEx(
818
********************************************************************/
819
extern "C" HRESULT DAPI FileReadUntil(
820
__deref_out_bcount_full(*pcbDest) LPBYTE* ppbDest,
821
- __out_range(<=, cbMaxRead) DWORD* pcbDest,
821
+ __out_range(<=, cbMaxRead) SIZE_T* pcbDest,
822
__in LPCWSTR wzSrcPath,
823
__in DWORD cbMaxRead
824
)
@@ -834,7 +834,7 @@ extern "C" HRESULT DAPI FileReadUntil(
834
********************************************************************/
835
extern "C" HRESULT DAPI FileReadPartial(
836
__deref_out_bcount_full(*pcbDest) LPBYTE* ppbDest,
837
- __out_range(<=, cbMaxRead) DWORD* pcbDest,
837
+ __out_range(<=, cbMaxRead) SIZE_T* pcbDest,
838
__in LPCWSTR wzSrcPath,
839
__in BOOL fSeek,
840
__in DWORD cbStartPosition,
@@ -851,7 +851,7 @@ extern "C" HRESULT DAPI FileReadPartial(
851
********************************************************************/
852
extern "C" HRESULT DAPI FileReadPartialEx(
853
__deref_out_bcount_full(*pcbDest) LPBYTE* ppbDest,
854
- __out_range(<=, cbMaxRead) DWORD* pcbDest,
854
+ __out_range(<=, cbMaxRead) SIZE_T* pcbDest,
855
__in_z LPCWSTR wzSrcPath,
856
__in BOOL fSeek,
857
__in DWORD cbStartPosition,
@@ -990,7 +990,7 @@ extern "C" HRESULT DAPI FileWrite(
990
__in_z LPCWSTR pwzFileName,
991
__in DWORD dwFlagsAndAttributes,
992
__in_bcount_opt(cbData) LPCBYTE pbData,
993
- __in DWORD cbData,
993
+ __in SIZE_T cbData,
994
__out_opt HANDLE* pHandle
995
)
996
{
@@ -1024,7 +1024,7 @@ LExit:
1024
extern "C" HRESULT DAPI FileWriteHandle(
1025
__in HANDLE hFile,
1026
__in_bcount_opt(cbData) LPCBYTE pbData,
1027
- __in DWORD cbData
1027
+ __in SIZE_T cbData
1028
)
1029
{
1030
HRESULT hr = S_OK;
@@ -1034,7 +1034,7 @@ extern "C" HRESULT DAPI FileWriteHandle(
1034
// Write out all of the data.
1035
do
1036
{
1037
- if (!::WriteFile(hFile, pbData + cbTotal, cbData - cbTotal, &cbDataWritten, NULL))
1037
+ if (!::WriteFile(hFile, pbData + cbTotal, (DWORD)(cbData - cbTotal), &cbDataWritten, NULL))
1038
{
1039
ExitOnLastError(hr, "Failed to write data to file handle.");
1040
}
@@ -1700,7 +1700,7 @@ extern "C" HRESULT DAPI FileToString(
1700
{
1701
HRESULT hr = S_OK;
1702
BYTE *pbFullFileBuffer = NULL;
1703
- DWORD cbFullFileBuffer = 0;
1703
+ SIZE_T cbFullFileBuffer = 0;
1704
BOOL fNullCharFound = FALSE;
1705
LPWSTR sczFileText = NULL;
1706
src/dutil/inc/buffutil.h
+1
-1
@@ -51,7 +51,7 @@ HRESULT BuffReadStream(
51
HRESULT BuffWriteNumber(
52
__deref_out_bcount(*piBuffer) BYTE** ppbBuffer,
53
__inout SIZE_T* piBuffer,
54
- __in DWORD dw
54
+ __in DWORD_PTR dw
55
);
56
HRESULT BuffWriteNumber64(
57
__deref_out_bcount(*piBuffer) BYTE** ppbBuffer,
src/dutil/inc/fileutil.h
+7
-7
@@ -96,24 +96,24 @@ HRESULT DAPI FileRemoveFromPendingRename(
96
);
97
HRESULT DAPI FileRead(
98
__deref_out_bcount_full(*pcbDest) LPBYTE* ppbDest,
99
- __out DWORD* pcbDest,
99
+ __out SIZE_T* pcbDest,
100
__in_z LPCWSTR wzSrcPath
101
);
102
HRESULT DAPI FileReadEx(
103
__deref_out_bcount_full(*pcbDest) LPBYTE* ppbDest,
104
- __out DWORD* pcbDest,
104
+ __out SIZE_T* pcbDest,
105
__in_z LPCWSTR wzSrcPath,
106
__in DWORD dwShareMode
107
);
108
HRESULT DAPI FileReadUntil(
109
__deref_out_bcount_full(*pcbDest) LPBYTE* ppbDest,
110
- __out_range(<=, cbMaxRead) DWORD* pcbDest,
110
+ __out_range(<=, cbMaxRead) SIZE_T* pcbDest,
111
__in_z LPCWSTR wzSrcPath,
112
__in DWORD cbMaxRead
113
);
114
HRESULT DAPI FileReadPartial(
115
__deref_out_bcount_full(*pcbDest) LPBYTE* ppbDest,
116
- __out_range(<=, cbMaxRead) DWORD* pcbDest,
116
+ __out_range(<=, cbMaxRead) SIZE_T* pcbDest,
117
__in_z LPCWSTR wzSrcPath,
118
__in BOOL fSeek,
119
__in DWORD cbStartPosition,
@@ -122,7 +122,7 @@ HRESULT DAPI FileReadPartial(
122
);
123
HRESULT DAPI FileReadPartialEx(
124
__deref_out_bcount_full(*pcbDest) LPBYTE* ppbDest,
125
- __out_range(<=, cbMaxRead) DWORD* pcbDest,
125
+ __out_range(<=, cbMaxRead) SIZE_T* pcbDest,
126
__in_z LPCWSTR wzSrcPath,
127
__in BOOL fSeek,
128
__in DWORD cbStartPosition,
@@ -134,13 +134,13 @@ HRESULT DAPI FileWrite(
134
__in_z LPCWSTR pwzFileName,
135
__in DWORD dwFlagsAndAttributes,
136
__in_bcount_opt(cbData) LPCBYTE pbData,
137
- __in DWORD cbData,
137
+ __in SIZE_T cbData,
138
__out_opt HANDLE* pHandle
139
);
140
HRESULT DAPI FileWriteHandle(
141
__in HANDLE hFile,
142
__in_bcount_opt(cbData) LPCBYTE pbData,
143
- __in DWORD cbData
143
+ __in SIZE_T cbData
144
);
145
HRESULT DAPI FileCopyUsingHandles(
146
__in HANDLE hSource,
src/dutil/inc/strutil.h
+9
-9
@@ -46,29 +46,29 @@ HRESULT DAPI StrAnsiTrimWhitespace(
46
HRESULT DAPI StrAllocString(
47
__deref_out_ecount_z(cchSource+1) LPWSTR* ppwz,
48
__in_z LPCWSTR wzSource,
49
- __in DWORD_PTR cchSource
49
+ __in SIZE_T cchSource
50
);
51
HRESULT DAPI StrAllocStringSecure(
52
__deref_out_ecount_z(cchSource + 1) LPWSTR* ppwz,
53
__in_z LPCWSTR wzSource,
54
- __in DWORD_PTR cchSource
54
+ __in SIZE_T cchSource
55
);
56
HRESULT DAPI StrAnsiAllocString(
57
__deref_out_ecount_z(cchSource+1) LPSTR* ppsz,
58
__in_z LPCWSTR wzSource,
59
- __in DWORD_PTR cchSource,
59
+ __in SIZE_T cchSource,
60
__in UINT uiCodepage
61
);
62
HRESULT DAPI StrAllocStringAnsi(
63
__deref_out_ecount_z(cchSource+1) LPWSTR* ppwz,
64
__in_z LPCSTR szSource,
65
- __in DWORD_PTR cchSource,
65
+ __in SIZE_T cchSource,
66
__in UINT uiCodepage
67
);
68
HRESULT DAPI StrAnsiAllocStringAnsi(
69
__deref_out_ecount_z(cchSource+1) LPSTR* ppsz,
70
__in_z LPCSTR szSource,
71
- __in DWORD_PTR cchSource
71
+ __in SIZE_T cchSource
72
);
73
HRESULT DAPI StrAllocPrefix(
74
__deref_out_z LPWSTR* ppwz,
@@ -78,17 +78,17 @@ HRESULT DAPI StrAllocPrefix(
78
HRESULT DAPI StrAllocConcat(
79
__deref_out_z LPWSTR* ppwz,
80
__in_z LPCWSTR wzSource,
81
- __in DWORD_PTR cchSource
81
+ __in SIZE_T cchSource
82
);
83
HRESULT DAPI StrAllocConcatSecure(
84
__deref_out_z LPWSTR* ppwz,
85
__in_z LPCWSTR wzSource,
86
- __in DWORD_PTR cchSource
86
+ __in SIZE_T cchSource
87
);
88
HRESULT DAPI StrAnsiAllocConcat(
89
__deref_out_z LPSTR* ppz,
90
__in_z LPCSTR pzSource,
91
- __in DWORD_PTR cchSource
91
+ __in SIZE_T cchSource
92
);
93
HRESULT __cdecl StrAllocFormatted(
94
__deref_out_z LPWSTR* ppwz,
@@ -289,7 +289,7 @@ HRESULT DAPI StrArrayAllocString(
289
__deref_inout_ecount_opt(*pcStrArray) LPWSTR **prgsczStrArray,
290
__inout LPUINT pcStrArray,
291
__in_z LPCWSTR wzSource,
292
- __in DWORD_PTR cchSource
292
+ __in SIZE_T cchSource
293
);
294
295
HRESULT DAPI StrArrayFree(
src/dutil/inc/xmlutil.h
+1
-1
@@ -53,7 +53,7 @@ HRESULT DAPI XmlLoadDocumentFromFile(
53
);
54
HRESULT DAPI XmlLoadDocumentFromBuffer(
55
__in_bcount(cbSource) const BYTE* pbSource,
56
- __in DWORD cbSource,
56
+ __in SIZE_T cbSource,
57
__out IXMLDOMDocument** ppixdDocument
58
);
59
HRESULT DAPI XmlLoadDocumentFromFileEx(
src/dutil/xmlutil.cpp
+2
-2
@@ -416,7 +416,7 @@ LExit:
416
*********************************************************************/
417
extern "C" HRESULT DAPI XmlLoadDocumentFromBuffer(
418
__in_bcount(cbSource) const BYTE* pbSource,
419
- __in DWORD cbSource,
419
+ __in SIZE_T cbSource,
420
__out IXMLDOMDocument** ppixdDocument
421
)
422
{
@@ -447,7 +447,7 @@ extern "C" HRESULT DAPI XmlLoadDocumentFromBuffer(
447
sa.fFeatures = FADF_STATIC | FADF_FIXEDSIZE;
448
sa.cbElements = 1;
449
sa.pvData = (PVOID)pbSource;
450
- sa.rgsabound[0].cElements = cbSource;
450
+ sa.rgsabound[0].cElements = (ULONG)cbSource;
451
vtXmlSource.vt = VT_ARRAY | VT_UI1;
452
vtXmlSource.parray = &sa;
453