From 6554b42e999c8ff2cf20361a7dd7ec500723ec71 Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Fri, 13 Nov 2020 21:21:33 -0500 Subject: Clean up 32-bit ass-u-mptions for x64 and arm64. --- src/dutil/buffutil.cpp | 4 ++-- src/dutil/fileutil.cpp | 18 +++++++++--------- src/dutil/inc/buffutil.h | 2 +- src/dutil/inc/fileutil.h | 14 +++++++------- src/dutil/inc/strutil.h | 18 +++++++++--------- src/dutil/inc/xmlutil.h | 2 +- src/dutil/xmlutil.cpp | 4 ++-- 7 files changed, 31 insertions(+), 31 deletions(-) (limited to 'src') diff --git a/src/dutil/buffutil.cpp b/src/dutil/buffutil.cpp index 0cc67dcb..e78db24f 100644 --- a/src/dutil/buffutil.cpp +++ b/src/dutil/buffutil.cpp @@ -257,7 +257,7 @@ LExit: extern "C" HRESULT BuffWriteNumber( __deref_out_bcount(*piBuffer) BYTE** ppbBuffer, __inout SIZE_T* piBuffer, - __in DWORD dw + __in DWORD_PTR dw ) { Assert(ppbBuffer); @@ -270,7 +270,7 @@ extern "C" HRESULT BuffWriteNumber( ExitOnFailure(hr, "Failed to ensure buffer size."); // copy data to buffer - *(DWORD*)(*ppbBuffer + *piBuffer) = dw; + *(DWORD_PTR*)(*ppbBuffer + *piBuffer) = dw; *piBuffer += sizeof(DWORD); LExit: diff --git a/src/dutil/fileutil.cpp b/src/dutil/fileutil.cpp index 8666da65..6191ec06 100644 --- a/src/dutil/fileutil.cpp +++ b/src/dutil/fileutil.cpp @@ -789,7 +789,7 @@ LExit: ********************************************************************/ extern "C" HRESULT DAPI FileRead( __deref_out_bcount_full(*pcbDest) LPBYTE* ppbDest, - __out DWORD* pcbDest, + __out SIZE_T* pcbDest, __in LPCWSTR wzSrcPath ) { @@ -803,7 +803,7 @@ extern "C" HRESULT DAPI FileRead( ********************************************************************/ extern "C" HRESULT DAPI FileReadEx( __deref_out_bcount_full(*pcbDest) LPBYTE* ppbDest, - __out DWORD* pcbDest, + __out SIZE_T* pcbDest, __in_z LPCWSTR wzSrcPath, __in DWORD dwShareMode ) @@ -818,7 +818,7 @@ extern "C" HRESULT DAPI FileReadEx( ********************************************************************/ extern "C" HRESULT DAPI FileReadUntil( __deref_out_bcount_full(*pcbDest) LPBYTE* ppbDest, - __out_range(<=, cbMaxRead) DWORD* pcbDest, + __out_range(<=, cbMaxRead) SIZE_T* pcbDest, __in LPCWSTR wzSrcPath, __in DWORD cbMaxRead ) @@ -834,7 +834,7 @@ extern "C" HRESULT DAPI FileReadUntil( ********************************************************************/ extern "C" HRESULT DAPI FileReadPartial( __deref_out_bcount_full(*pcbDest) LPBYTE* ppbDest, - __out_range(<=, cbMaxRead) DWORD* pcbDest, + __out_range(<=, cbMaxRead) SIZE_T* pcbDest, __in LPCWSTR wzSrcPath, __in BOOL fSeek, __in DWORD cbStartPosition, @@ -851,7 +851,7 @@ extern "C" HRESULT DAPI FileReadPartial( ********************************************************************/ extern "C" HRESULT DAPI FileReadPartialEx( __deref_out_bcount_full(*pcbDest) LPBYTE* ppbDest, - __out_range(<=, cbMaxRead) DWORD* pcbDest, + __out_range(<=, cbMaxRead) SIZE_T* pcbDest, __in_z LPCWSTR wzSrcPath, __in BOOL fSeek, __in DWORD cbStartPosition, @@ -990,7 +990,7 @@ extern "C" HRESULT DAPI FileWrite( __in_z LPCWSTR pwzFileName, __in DWORD dwFlagsAndAttributes, __in_bcount_opt(cbData) LPCBYTE pbData, - __in DWORD cbData, + __in SIZE_T cbData, __out_opt HANDLE* pHandle ) { @@ -1024,7 +1024,7 @@ LExit: extern "C" HRESULT DAPI FileWriteHandle( __in HANDLE hFile, __in_bcount_opt(cbData) LPCBYTE pbData, - __in DWORD cbData + __in SIZE_T cbData ) { HRESULT hr = S_OK; @@ -1034,7 +1034,7 @@ extern "C" HRESULT DAPI FileWriteHandle( // Write out all of the data. do { - if (!::WriteFile(hFile, pbData + cbTotal, cbData - cbTotal, &cbDataWritten, NULL)) + if (!::WriteFile(hFile, pbData + cbTotal, (DWORD)(cbData - cbTotal), &cbDataWritten, NULL)) { ExitOnLastError(hr, "Failed to write data to file handle."); } @@ -1700,7 +1700,7 @@ extern "C" HRESULT DAPI FileToString( { HRESULT hr = S_OK; BYTE *pbFullFileBuffer = NULL; - DWORD cbFullFileBuffer = 0; + SIZE_T cbFullFileBuffer = 0; BOOL fNullCharFound = FALSE; LPWSTR sczFileText = NULL; diff --git a/src/dutil/inc/buffutil.h b/src/dutil/inc/buffutil.h index e61cdb58..f6d36e94 100644 --- a/src/dutil/inc/buffutil.h +++ b/src/dutil/inc/buffutil.h @@ -51,7 +51,7 @@ HRESULT BuffReadStream( HRESULT BuffWriteNumber( __deref_out_bcount(*piBuffer) BYTE** ppbBuffer, __inout SIZE_T* piBuffer, - __in DWORD dw + __in DWORD_PTR dw ); HRESULT BuffWriteNumber64( __deref_out_bcount(*piBuffer) BYTE** ppbBuffer, diff --git a/src/dutil/inc/fileutil.h b/src/dutil/inc/fileutil.h index ddae340f..d2b2f4fe 100644 --- a/src/dutil/inc/fileutil.h +++ b/src/dutil/inc/fileutil.h @@ -96,24 +96,24 @@ HRESULT DAPI FileRemoveFromPendingRename( ); HRESULT DAPI FileRead( __deref_out_bcount_full(*pcbDest) LPBYTE* ppbDest, - __out DWORD* pcbDest, + __out SIZE_T* pcbDest, __in_z LPCWSTR wzSrcPath ); HRESULT DAPI FileReadEx( __deref_out_bcount_full(*pcbDest) LPBYTE* ppbDest, - __out DWORD* pcbDest, + __out SIZE_T* pcbDest, __in_z LPCWSTR wzSrcPath, __in DWORD dwShareMode ); HRESULT DAPI FileReadUntil( __deref_out_bcount_full(*pcbDest) LPBYTE* ppbDest, - __out_range(<=, cbMaxRead) DWORD* pcbDest, + __out_range(<=, cbMaxRead) SIZE_T* pcbDest, __in_z LPCWSTR wzSrcPath, __in DWORD cbMaxRead ); HRESULT DAPI FileReadPartial( __deref_out_bcount_full(*pcbDest) LPBYTE* ppbDest, - __out_range(<=, cbMaxRead) DWORD* pcbDest, + __out_range(<=, cbMaxRead) SIZE_T* pcbDest, __in_z LPCWSTR wzSrcPath, __in BOOL fSeek, __in DWORD cbStartPosition, @@ -122,7 +122,7 @@ HRESULT DAPI FileReadPartial( ); HRESULT DAPI FileReadPartialEx( __deref_out_bcount_full(*pcbDest) LPBYTE* ppbDest, - __out_range(<=, cbMaxRead) DWORD* pcbDest, + __out_range(<=, cbMaxRead) SIZE_T* pcbDest, __in_z LPCWSTR wzSrcPath, __in BOOL fSeek, __in DWORD cbStartPosition, @@ -134,13 +134,13 @@ HRESULT DAPI FileWrite( __in_z LPCWSTR pwzFileName, __in DWORD dwFlagsAndAttributes, __in_bcount_opt(cbData) LPCBYTE pbData, - __in DWORD cbData, + __in SIZE_T cbData, __out_opt HANDLE* pHandle ); HRESULT DAPI FileWriteHandle( __in HANDLE hFile, __in_bcount_opt(cbData) LPCBYTE pbData, - __in DWORD cbData + __in SIZE_T cbData ); HRESULT DAPI FileCopyUsingHandles( __in HANDLE hSource, 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( HRESULT DAPI StrAllocString( __deref_out_ecount_z(cchSource+1) LPWSTR* ppwz, __in_z LPCWSTR wzSource, - __in DWORD_PTR cchSource + __in SIZE_T cchSource ); HRESULT DAPI StrAllocStringSecure( __deref_out_ecount_z(cchSource + 1) LPWSTR* ppwz, __in_z LPCWSTR wzSource, - __in DWORD_PTR cchSource + __in SIZE_T cchSource ); HRESULT DAPI StrAnsiAllocString( __deref_out_ecount_z(cchSource+1) LPSTR* ppsz, __in_z LPCWSTR wzSource, - __in DWORD_PTR cchSource, + __in SIZE_T cchSource, __in UINT uiCodepage ); HRESULT DAPI StrAllocStringAnsi( __deref_out_ecount_z(cchSource+1) LPWSTR* ppwz, __in_z LPCSTR szSource, - __in DWORD_PTR cchSource, + __in SIZE_T cchSource, __in UINT uiCodepage ); HRESULT DAPI StrAnsiAllocStringAnsi( __deref_out_ecount_z(cchSource+1) LPSTR* ppsz, __in_z LPCSTR szSource, - __in DWORD_PTR cchSource + __in SIZE_T cchSource ); HRESULT DAPI StrAllocPrefix( __deref_out_z LPWSTR* ppwz, @@ -78,17 +78,17 @@ HRESULT DAPI StrAllocPrefix( HRESULT DAPI StrAllocConcat( __deref_out_z LPWSTR* ppwz, __in_z LPCWSTR wzSource, - __in DWORD_PTR cchSource + __in SIZE_T cchSource ); HRESULT DAPI StrAllocConcatSecure( __deref_out_z LPWSTR* ppwz, __in_z LPCWSTR wzSource, - __in DWORD_PTR cchSource + __in SIZE_T cchSource ); HRESULT DAPI StrAnsiAllocConcat( __deref_out_z LPSTR* ppz, __in_z LPCSTR pzSource, - __in DWORD_PTR cchSource + __in SIZE_T cchSource ); HRESULT __cdecl StrAllocFormatted( __deref_out_z LPWSTR* ppwz, @@ -289,7 +289,7 @@ HRESULT DAPI StrArrayAllocString( __deref_inout_ecount_opt(*pcStrArray) LPWSTR **prgsczStrArray, __inout LPUINT pcStrArray, __in_z LPCWSTR wzSource, - __in DWORD_PTR cchSource + __in SIZE_T cchSource ); HRESULT DAPI StrArrayFree( diff --git a/src/dutil/inc/xmlutil.h b/src/dutil/inc/xmlutil.h index 3dc119bd..ba92ada9 100644 --- a/src/dutil/inc/xmlutil.h +++ b/src/dutil/inc/xmlutil.h @@ -53,7 +53,7 @@ HRESULT DAPI XmlLoadDocumentFromFile( ); HRESULT DAPI XmlLoadDocumentFromBuffer( __in_bcount(cbSource) const BYTE* pbSource, - __in DWORD cbSource, + __in SIZE_T cbSource, __out IXMLDOMDocument** ppixdDocument ); HRESULT DAPI XmlLoadDocumentFromFileEx( diff --git a/src/dutil/xmlutil.cpp b/src/dutil/xmlutil.cpp index e07c205d..f97ca962 100644 --- a/src/dutil/xmlutil.cpp +++ b/src/dutil/xmlutil.cpp @@ -416,7 +416,7 @@ LExit: *********************************************************************/ extern "C" HRESULT DAPI XmlLoadDocumentFromBuffer( __in_bcount(cbSource) const BYTE* pbSource, - __in DWORD cbSource, + __in SIZE_T cbSource, __out IXMLDOMDocument** ppixdDocument ) { @@ -447,7 +447,7 @@ extern "C" HRESULT DAPI XmlLoadDocumentFromBuffer( sa.fFeatures = FADF_STATIC | FADF_FIXEDSIZE; sa.cbElements = 1; sa.pvData = (PVOID)pbSource; - sa.rgsabound[0].cElements = cbSource; + sa.rgsabound[0].cElements = (ULONG)cbSource; vtXmlSource.vt = VT_ARRAY | VT_UI1; vtXmlSource.parray = &sa; -- cgit v1.2.3-55-g6feb