Index: src/libchcore/Tests/TOverlappedReaderWriterTests.cpp
===================================================================
diff -u -N -r3ccbdb8d3eac3427e6d3354854476e57fdc7ceb9 -r6e4ac7776b68464371cd8522a2a8d79fbcab3b28
--- src/libchcore/Tests/TOverlappedReaderWriterTests.cpp	(.../TOverlappedReaderWriterTests.cpp)	(revision 3ccbdb8d3eac3427e6d3354854476e57fdc7ceb9)
+++ src/libchcore/Tests/TOverlappedReaderWriterTests.cpp	(.../TOverlappedReaderWriterTests.cpp)	(revision 6e4ac7776b68464371cd8522a2a8d79fbcab3b28)
@@ -29,7 +29,7 @@
 	TOverlappedReaderWriter tReaderWriter(spLogData, spBuffers, 0, 4096);
 
 	EXPECT_EQ(nullptr, tReaderWriter.GetEmptyBuffer());
-	EXPECT_EQ(nullptr, tReaderWriter.GetFinishedReadBuffer());
+	EXPECT_EQ(nullptr, tReaderWriter.GetWriteBuffer());
 	EXPECT_EQ(nullptr, tReaderWriter.GetFinishedWriteBuffer());
 
 	EXPECT_NE(nullptr, tReaderWriter.GetEventReadPossibleHandle());
@@ -55,7 +55,7 @@
 	TOverlappedReaderWriter tReaderWriter(spLogData, spBuffers, 0, 4096);
 
 	EXPECT_NE(nullptr, tReaderWriter.GetEmptyBuffer());
-	EXPECT_EQ(nullptr, tReaderWriter.GetFinishedReadBuffer());
+	EXPECT_EQ(nullptr, tReaderWriter.GetWriteBuffer());
 	EXPECT_EQ(nullptr, tReaderWriter.GetFinishedWriteBuffer());
 
 	EXPECT_NE(nullptr, tReaderWriter.GetEventReadPossibleHandle());
@@ -266,7 +266,7 @@
 	tReaderWriter.AddFinishedReadBuffer(pBuffer);
 	EXPECT_SIGNALED(tReaderWriter.GetEventWritePossibleHandle());
 
-	tReaderWriter.GetFinishedReadBuffer();
+	tReaderWriter.GetWriteBuffer();
 	EXPECT_TIMEOUT(tReaderWriter.GetEventWritePossibleHandle());
 }
 
@@ -279,13 +279,13 @@
 	TOverlappedDataBuffer* pBuffers[3] = { tReaderWriter.GetEmptyBuffer(), tReaderWriter.GetEmptyBuffer(), tReaderWriter.GetEmptyBuffer() };
 
 	tReaderWriter.AddFinishedReadBuffer(pBuffers[1]);
-	EXPECT_EQ(nullptr, tReaderWriter.GetFinishedReadBuffer());
+	EXPECT_EQ(nullptr, tReaderWriter.GetWriteBuffer());
 
 	tReaderWriter.AddFinishedReadBuffer(pBuffers[2]);
-	EXPECT_EQ(nullptr, tReaderWriter.GetFinishedReadBuffer());
+	EXPECT_EQ(nullptr, tReaderWriter.GetWriteBuffer());
 
 	tReaderWriter.AddFinishedReadBuffer(pBuffers[0]);
-	EXPECT_NE(nullptr, tReaderWriter.GetFinishedReadBuffer());
+	EXPECT_NE(nullptr, tReaderWriter.GetWriteBuffer());
 }
 
 TEST(TOverlappedReaderWriterTests, AddFullBuffer_HandlingSrcEof)
@@ -319,14 +319,14 @@
 	tReaderWriter.AddFinishedReadBuffer(pBuffers[1]);
 	tReaderWriter.AddFinishedReadBuffer(pBuffers[2]);
 
-	tReaderWriter.GetFinishedReadBuffer();
+	tReaderWriter.GetWriteBuffer();
 //	EXPECT_FALSE(tReaderWriter.IsDataWritingFinished());
 
-	tReaderWriter.GetFinishedReadBuffer();
+	tReaderWriter.GetWriteBuffer();
 //	EXPECT_FALSE(tReaderWriter.IsDataWritingFinished());
 
 	// getting the last buffer (marked as eof) causes setting the data-writing-finished flag
-	tReaderWriter.GetFinishedReadBuffer();
+	tReaderWriter.GetWriteBuffer();
 //	EXPECT_TRUE(tReaderWriter.IsDataWritingFinished());
 }
 
@@ -445,19 +445,13 @@
 	tReaderWriter.AddFinishedWriteBuffer(pBuffers[0]);
 
 	TOverlappedDataBuffer* pBuffer = tReaderWriter.GetFinishedWriteBuffer();
-	EXPECT_TIMEOUT(tReaderWriter.GetEventWriteFinishedHandle());
-	tReaderWriter.MarkFinishedBufferAsComplete(pBuffer);
 	EXPECT_SIGNALED(tReaderWriter.GetEventWriteFinishedHandle());
 
 	pBuffer = tReaderWriter.GetFinishedWriteBuffer();
-	EXPECT_TIMEOUT(tReaderWriter.GetEventWriteFinishedHandle());
-	tReaderWriter.MarkFinishedBufferAsComplete(pBuffer);
 	EXPECT_SIGNALED(tReaderWriter.GetEventWriteFinishedHandle());
 
 	pBuffer = tReaderWriter.GetFinishedWriteBuffer();
 	EXPECT_TIMEOUT(tReaderWriter.GetEventWriteFinishedHandle());
-	tReaderWriter.MarkFinishedBufferAsComplete(pBuffer);
-	EXPECT_TIMEOUT(tReaderWriter.GetEventWriteFinishedHandle());
 }
 
 TEST(TOverlappedReaderWriterTests, GetFinishedBuffer_WrongOrder)