Index: src/libchcore/TOverlappedDataBuffer.cpp
===================================================================
diff -u -N -r3c343f2e7aa0d489706136e78f2f56cdd5d417a9 -rb75259a9158d8b46d747e20ab4960dd002adb4b1
--- src/libchcore/TOverlappedDataBuffer.cpp	(.../TOverlappedDataBuffer.cpp)	(revision 3c343f2e7aa0d489706136e78f2f56cdd5d417a9)
+++ src/libchcore/TOverlappedDataBuffer.cpp	(.../TOverlappedDataBuffer.cpp)	(revision b75259a9158d8b46d747e20ab4960dd002adb4b1)
@@ -35,9 +35,10 @@
 
 ///////////////////////////////////////////////////////////////////////////////////
 // class TOverlappedDataBuffer
-VOID CALLBACK OverlappedReadCompleted(DWORD dwErrorCode, DWORD /*dwNumberOfBytesTransfered*/, LPOVERLAPPED lpOverlapped)
+VOID CALLBACK OverlappedReadCompleted(DWORD dwErrorCode, DWORD dwNumberOfBytesTransfered, LPOVERLAPPED lpOverlapped)
 {
 	TOverlappedDataBuffer* pBuffer = (TOverlappedDataBuffer*) lpOverlapped;
+	ATLTRACE(_T("OverlappedReadCompleted - read %I64u bytes\n"), pBuffer->GetBytesTransferred());
 
 	bool bEof = (dwErrorCode == ERROR_HANDLE_EOF ||
 		pBuffer->GetStatusCode() == STATUS_END_OF_FILE ||
@@ -50,14 +51,16 @@
 	if (dwErrorCode != ERROR_SUCCESS)
 		ATLTRACE(_T("OverlappedReadCompleted error: %lu, status code: %I64u\n"), dwErrorCode, pBuffer->GetStatusCode());
 
+	pBuffer->SetRealDataSize(dwNumberOfBytesTransfered);
 	pBuffer->SetLastPart(bEof);
 	pBuffer->RequeueAsFull();
 }
 
 VOID CALLBACK OverlappedWriteCompleted(DWORD dwErrorCode, DWORD /*dwNumberOfBytesTransfered*/, LPOVERLAPPED lpOverlapped)
 {
 	TOverlappedDataBuffer* pBuffer = (TOverlappedDataBuffer*) lpOverlapped;
-	if (dwErrorCode != ERROR_SUCCESS)
+	ATLTRACE(_T("OverlappedWriteCompleted - written %I64u bytes\n"), pBuffer->GetBytesTransferred());
+	if(dwErrorCode != ERROR_SUCCESS)
 		ATLTRACE(_T("OverlappedWriteCompleted error: %lu, status code: %I64u\n"), dwErrorCode, pBuffer->GetStatusCode());
 
 	pBuffer->RequeueAsFinished();
@@ -68,7 +71,8 @@
 	m_stBufferSize(0),
 	m_bLastPart(false),
 	m_pQueue(pQueue),
-	m_dwRequestedDataSize(0)
+	m_dwRequestedDataSize(0),
+	m_dwRealDataSize(0)
 {
 	if (!m_pQueue)
 		THROW_CORE_EXCEPTION(eErr_InvalidPointer);