Index: src/libchcore/OverlappedCallbacks.cpp
===================================================================
diff -u -N -rbef894e38e5c1486824787cf8c47a87a0828b228 -rb941384e121190b6107f1c99b3233667e3daf4ce
--- src/libchcore/OverlappedCallbacks.cpp	(.../OverlappedCallbacks.cpp)	(revision bef894e38e5c1486824787cf8c47a87a0828b228)
+++ src/libchcore/OverlappedCallbacks.cpp	(.../OverlappedCallbacks.cpp)	(revision b941384e121190b6107f1c99b3233667e3daf4ce)
@@ -28,7 +28,7 @@
 	VOID CALLBACK OverlappedReadCompleted(DWORD dwErrorCode, DWORD dwNumberOfBytesTransfered, LPOVERLAPPED lpOverlapped)
 	{
 		TOverlappedDataBuffer* pBuffer = (TOverlappedDataBuffer*)lpOverlapped;
-		TOverlappedReaderWriter* pQueue = (TOverlappedReaderWriter*)pBuffer->GetParam();
+		TOverlappedReader* pQueue = (TOverlappedReader*)pBuffer->GetParam();
 
 		// determine if this is the last packet
 		bool bEof = (dwErrorCode == ERROR_HANDLE_EOF ||
@@ -50,20 +50,20 @@
 		if (pBuffer->HasError())
 			pQueue->AddFailedReadBuffer(pBuffer);
 		else
-			pQueue->AddFinishedReadBuffer(pBuffer);
+			pQueue->AddFullBuffer(pBuffer);
 	}
 
 	VOID CALLBACK OverlappedWriteCompleted(DWORD dwErrorCode, DWORD dwNumberOfBytesTransfered, LPOVERLAPPED lpOverlapped)
 	{
 		TOverlappedDataBuffer* pBuffer = (TOverlappedDataBuffer*)lpOverlapped;
-		TOverlappedReaderWriter* pQueue = (TOverlappedReaderWriter*)pBuffer->GetParam();
+		TOverlappedWriter* pQueue = (TOverlappedWriter*)pBuffer->GetParam();
 
 		pBuffer->SetErrorCode(dwErrorCode);
 		pBuffer->SetBytesTransferred(dwNumberOfBytesTransfered);
 
 		if (pBuffer->HasError())
 			pQueue->AddFailedWriteBuffer(pBuffer);
 		else
-			pQueue->AddFinishedWriteBuffer(pBuffer);
+			pQueue->AddFinishedBuffer(pBuffer);
 	}
 }