Fix up a cast and remove an unnecessary void * in win32 file streams.

Author: stgates

Release/include/cpprest/filestream.h

@@ -217,9 +217,10 @@ namespace details {
             return pplx::create_task(result_tce);
         }
 
-            // Use a separated function for working around Dev10's ICE
-            pplx::task<void> _close_read_impl()
+        pplx::task<void> _close_read()
         {
+            return m_readOps.enqueue_operation([this]
+            {
                 streambuf_state_manager<_CharType>::_close_read();
 
                 if (this->can_write())
@@ -234,11 +235,7 @@ namespace details {
 
                     return _close_file(fileInfo);
                 }
-        }
-
-        pplx::task<void> _close_read()
-        {
-            return m_readOps.enqueue_operation([this] { return _close_read_impl(); });
+            });
         }
 
         pplx::task<void> _close_write()

Release/include/cpprest/producerconsumerstream.h

@@ -391,7 +391,7 @@ namespace Concurrency { namespace streams {
                 if ( m_blocks.empty() || m_blocks.back()->wr_chars_left() < count )
                 {
                     msl::safeint3::SafeInt<size_t> alloc = m_alloc_size.Max(count);
-                    m_blocks.push_back(std::make_shared<_block>((size_t)alloc));
+                    m_blocks.push_back(std::make_shared<_block>(alloc));
                 }
 
                 // The block at the back is always the write head

Release/src/streams/fileio_win32.cpp

@@ -84,12 +84,12 @@ using namespace streams::details;
 /// </remarks>
 struct EXTENDED_OVERLAPPED : OVERLAPPED
 {
-    EXTENDED_OVERLAPPED(LPOVERLAPPED_COMPLETION_ROUTINE func) : data(nullptr), func(func)
+    EXTENDED_OVERLAPPED(LPOVERLAPPED_COMPLETION_ROUTINE func, streams::details::_filestream_callback *cb) : callback(cb), func(func)
     {
         ZeroMemory(this, sizeof(OVERLAPPED));
     }
 
-    void *data;
+    streams::details::_filestream_callback *callback;
     LPOVERLAPPED_COMPLETION_ROUTINE func;
 };
 
@@ -99,7 +99,7 @@ void CALLBACK IoCompletionCallback(
     DWORD dwNumberOfBytesTransfered,
     LPOVERLAPPED pOverlapped)
 {
-    EXTENDED_OVERLAPPED *pExtOverlapped = (EXTENDED_OVERLAPPED *) pOverlapped;
+    EXTENDED_OVERLAPPED *pExtOverlapped = static_cast<EXTENDED_OVERLAPPED *>(pOverlapped);
 
     ////If dwErrorCode is 0xc0000011, it means STATUS_END_OF_FILE.
     ////Map this error code to system error code:ERROR_HANDLE_EOF
@@ -331,14 +331,13 @@ VOID CALLBACK _WriteFileCompletionRoutine(DWORD dwErrorCode, DWORD dwNumberOfByt
 {
     EXTENDED_OVERLAPPED* pOverlapped = static_cast<EXTENDED_OVERLAPPED *>(lpOverlapped);
 
-    auto callback = static_cast<streams::details::_filestream_callback *>(pOverlapped->data);
     if (dwErrorCode != ERROR_SUCCESS && dwErrorCode != ERROR_HANDLE_EOF)
     {
-        callback->on_error(std::make_exception_ptr(utility::details::create_system_error(dwErrorCode)));
+        pOverlapped->callback->on_error(std::make_exception_ptr(utility::details::create_system_error(dwErrorCode)));
     }
     else
     {
-        callback->on_completed(static_cast<size_t>(dwNumberOfBytesTransfered));
+        pOverlapped->callback->on_completed(static_cast<size_t>(dwNumberOfBytesTransfered));
     }
 }
 
@@ -353,15 +352,13 @@ VOID CALLBACK _ReadFileCompletionRoutine(DWORD dwErrorCode, DWORD dwNumberOfByte
 {
     EXTENDED_OVERLAPPED* pOverlapped = static_cast<EXTENDED_OVERLAPPED *>(lpOverlapped);
 
-    auto callback = reinterpret_cast<streams::details::_filestream_callback *>(pOverlapped->data);
-
     if (dwErrorCode != ERROR_SUCCESS && dwErrorCode != ERROR_HANDLE_EOF)
     {
-        callback->on_error(std::make_exception_ptr(utility::details::create_system_error(dwErrorCode)));
+        pOverlapped->callback->on_error(std::make_exception_ptr(utility::details::create_system_error(dwErrorCode)));
     }
     else
     {
-        callback->on_completed(static_cast<size_t>(dwNumberOfBytesTransfered));
+        pOverlapped->callback->on_completed(static_cast<size_t>(dwNumberOfBytesTransfered));
     }
 }
 
@@ -375,7 +372,7 @@ VOID CALLBACK _ReadFileCompletionRoutine(DWORD dwErrorCode, DWORD dwNumberOfByte
 /// <returns>0 if the write request is still outstanding, -1 if the request failed, otherwise the size of the data written</returns>
 size_t _write_file_async(_In_ streams::details::_file_info_impl *fInfo, _In_ streams::details::_filestream_callback *callback, const void *ptr, size_t count, size_t position)
 {
-    auto pOverlapped = new EXTENDED_OVERLAPPED(_WriteFileCompletionRoutine<streams::details::_file_info_impl>);
+    auto pOverlapped = new EXTENDED_OVERLAPPED(_WriteFileCompletionRoutine<streams::details::_file_info_impl>, callback);
 
     if (position == static_cast<size_t>(-1))
     {
@@ -392,8 +389,6 @@ size_t _write_file_async(_In_ streams::details::_file_info_impl *fInfo, _In_ str
 #endif
     }
 
-    pOverlapped->data = callback;
-
 #if _WIN32_WINNT >= _WIN32_WINNT_VISTA
     StartThreadpoolIo(static_cast<PTP_IO>(fInfo->m_io_context));
 
@@ -463,14 +458,13 @@ size_t _write_file_async(_In_ streams::details::_file_info_impl *fInfo, _In_ str
 /// <returns>0 if the read request is still outstanding, -1 if the request failed, otherwise the size of the data read into the buffer</returns>
 size_t _read_file_async(_In_ streams::details::_file_info_impl *fInfo, _In_ streams::details::_filestream_callback *callback, _Out_writes_ (count) void *ptr, _In_ size_t count, size_t offset)
 {
-    auto pOverlapped = new EXTENDED_OVERLAPPED(_ReadFileCompletionRoutine<streams::details::_file_info_impl>);
+    auto pOverlapped = new EXTENDED_OVERLAPPED(_ReadFileCompletionRoutine<streams::details::_file_info_impl>, callback);
     pOverlapped->Offset = static_cast<DWORD>(offset);
 #ifdef _WIN64
     pOverlapped->OffsetHigh = static_cast<DWORD>(offset >> 32);
 #else
     pOverlapped->OffsetHigh = 0;
 #endif
-    pOverlapped->data = callback;
 
 #if _WIN32_WINNT >= _WIN32_WINNT_VISTA
     StartThreadpoolIo((PTP_IO)fInfo->m_io_context);