diff options
Diffstat (limited to '')
-rw-r--r-- | src/dutil/fileutil.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
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: | |||
789 | ********************************************************************/ | 789 | ********************************************************************/ |
790 | extern "C" HRESULT DAPI FileRead( | 790 | extern "C" HRESULT DAPI FileRead( |
791 | __deref_out_bcount_full(*pcbDest) LPBYTE* ppbDest, | 791 | __deref_out_bcount_full(*pcbDest) LPBYTE* ppbDest, |
792 | __out DWORD* pcbDest, | 792 | __out SIZE_T* pcbDest, |
793 | __in LPCWSTR wzSrcPath | 793 | __in LPCWSTR wzSrcPath |
794 | ) | 794 | ) |
795 | { | 795 | { |
@@ -803,7 +803,7 @@ extern "C" HRESULT DAPI FileRead( | |||
803 | ********************************************************************/ | 803 | ********************************************************************/ |
804 | extern "C" HRESULT DAPI FileReadEx( | 804 | extern "C" HRESULT DAPI FileReadEx( |
805 | __deref_out_bcount_full(*pcbDest) LPBYTE* ppbDest, | 805 | __deref_out_bcount_full(*pcbDest) LPBYTE* ppbDest, |
806 | __out DWORD* pcbDest, | 806 | __out SIZE_T* pcbDest, |
807 | __in_z LPCWSTR wzSrcPath, | 807 | __in_z LPCWSTR wzSrcPath, |
808 | __in DWORD dwShareMode | 808 | __in DWORD dwShareMode |
809 | ) | 809 | ) |
@@ -818,7 +818,7 @@ extern "C" HRESULT DAPI FileReadEx( | |||
818 | ********************************************************************/ | 818 | ********************************************************************/ |
819 | extern "C" HRESULT DAPI FileReadUntil( | 819 | extern "C" HRESULT DAPI FileReadUntil( |
820 | __deref_out_bcount_full(*pcbDest) LPBYTE* ppbDest, | 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, | 822 | __in LPCWSTR wzSrcPath, |
823 | __in DWORD cbMaxRead | 823 | __in DWORD cbMaxRead |
824 | ) | 824 | ) |
@@ -834,7 +834,7 @@ extern "C" HRESULT DAPI FileReadUntil( | |||
834 | ********************************************************************/ | 834 | ********************************************************************/ |
835 | extern "C" HRESULT DAPI FileReadPartial( | 835 | extern "C" HRESULT DAPI FileReadPartial( |
836 | __deref_out_bcount_full(*pcbDest) LPBYTE* ppbDest, | 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, | 838 | __in LPCWSTR wzSrcPath, |
839 | __in BOOL fSeek, | 839 | __in BOOL fSeek, |
840 | __in DWORD cbStartPosition, | 840 | __in DWORD cbStartPosition, |
@@ -851,7 +851,7 @@ extern "C" HRESULT DAPI FileReadPartial( | |||
851 | ********************************************************************/ | 851 | ********************************************************************/ |
852 | extern "C" HRESULT DAPI FileReadPartialEx( | 852 | extern "C" HRESULT DAPI FileReadPartialEx( |
853 | __deref_out_bcount_full(*pcbDest) LPBYTE* ppbDest, | 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, | 855 | __in_z LPCWSTR wzSrcPath, |
856 | __in BOOL fSeek, | 856 | __in BOOL fSeek, |
857 | __in DWORD cbStartPosition, | 857 | __in DWORD cbStartPosition, |
@@ -990,7 +990,7 @@ extern "C" HRESULT DAPI FileWrite( | |||
990 | __in_z LPCWSTR pwzFileName, | 990 | __in_z LPCWSTR pwzFileName, |
991 | __in DWORD dwFlagsAndAttributes, | 991 | __in DWORD dwFlagsAndAttributes, |
992 | __in_bcount_opt(cbData) LPCBYTE pbData, | 992 | __in_bcount_opt(cbData) LPCBYTE pbData, |
993 | __in DWORD cbData, | 993 | __in SIZE_T cbData, |
994 | __out_opt HANDLE* pHandle | 994 | __out_opt HANDLE* pHandle |
995 | ) | 995 | ) |
996 | { | 996 | { |
@@ -1024,7 +1024,7 @@ LExit: | |||
1024 | extern "C" HRESULT DAPI FileWriteHandle( | 1024 | extern "C" HRESULT DAPI FileWriteHandle( |
1025 | __in HANDLE hFile, | 1025 | __in HANDLE hFile, |
1026 | __in_bcount_opt(cbData) LPCBYTE pbData, | 1026 | __in_bcount_opt(cbData) LPCBYTE pbData, |
1027 | __in DWORD cbData | 1027 | __in SIZE_T cbData |
1028 | ) | 1028 | ) |
1029 | { | 1029 | { |
1030 | HRESULT hr = S_OK; | 1030 | HRESULT hr = S_OK; |
@@ -1034,7 +1034,7 @@ extern "C" HRESULT DAPI FileWriteHandle( | |||
1034 | // Write out all of the data. | 1034 | // Write out all of the data. |
1035 | do | 1035 | do |
1036 | { | 1036 | { |
1037 | if (!::WriteFile(hFile, pbData + cbTotal, cbData - cbTotal, &cbDataWritten, NULL)) | 1037 | if (!::WriteFile(hFile, pbData + cbTotal, (DWORD)(cbData - cbTotal), &cbDataWritten, NULL)) |
1038 | { | 1038 | { |
1039 | ExitOnLastError(hr, "Failed to write data to file handle."); | 1039 | ExitOnLastError(hr, "Failed to write data to file handle."); |
1040 | } | 1040 | } |
@@ -1700,7 +1700,7 @@ extern "C" HRESULT DAPI FileToString( | |||
1700 | { | 1700 | { |
1701 | HRESULT hr = S_OK; | 1701 | HRESULT hr = S_OK; |
1702 | BYTE *pbFullFileBuffer = NULL; | 1702 | BYTE *pbFullFileBuffer = NULL; |
1703 | DWORD cbFullFileBuffer = 0; | 1703 | SIZE_T cbFullFileBuffer = 0; |
1704 | BOOL fNullCharFound = FALSE; | 1704 | BOOL fNullCharFound = FALSE; |
1705 | LPWSTR sczFileText = NULL; | 1705 | LPWSTR sczFileText = NULL; |
1706 | 1706 | ||