Index: src/libchcore/Tests/TOverlappedDataBufferQueueTests.cpp
===================================================================
diff -u -N -refe016ef1d0cb0cf1ba379dbe3693e35f6a2361e -re4005a958c9412d890eeff1e8087c8298aa7bcf7
--- src/libchcore/Tests/TOverlappedDataBufferQueueTests.cpp	(.../TOverlappedDataBufferQueueTests.cpp)	(revision efe016ef1d0cb0cf1ba379dbe3693e35f6a2361e)
+++ src/libchcore/Tests/TOverlappedDataBufferQueueTests.cpp	(.../TOverlappedDataBufferQueueTests.cpp)	(revision e4005a958c9412d890eeff1e8087c8298aa7bcf7)
@@ -6,6 +6,19 @@
 
 using namespace chcore;
 
+#define EXPECT_TIMEOUT(handle)\
+	{\
+		DWORD dwResult = WaitForSingleObject(handle, 0); \
+		EXPECT_EQ(WAIT_TIMEOUT, dwResult); \
+	}
+
+#define EXPECT_SIGNALED(handle)\
+	{\
+		DWORD dwResult = WaitForSingleObject(handle, 0); \
+		EXPECT_EQ(WAIT_OBJECT_0 + 0, dwResult); \
+	}
+
+
 TEST(TOverlappedDataBufferQueueTests, DefaultConstructor_SanityTest)
 {
 	TOverlappedDataBufferQueue queue;
@@ -50,6 +63,7 @@
 	EXPECT_EQ(WAIT_TIMEOUT, dwResult);
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////////////
 TEST(TOverlappedDataBufferQueueTests, GetEmptyBuffer)
 {
 	TOverlappedDataBufferQueue queue(3, 32768);
@@ -94,19 +108,79 @@
 	EXPECT_EQ(WAIT_OBJECT_0 + 0, dwResult);
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////////////
 TEST(TOverlappedDataBufferQueueTests, GetFullBuffer_AddFullBuffer)
 {
 	TOverlappedDataBufferQueue queue(3, 32768);
+	TOverlappedDataBuffer* pBuffer = queue.GetEmptyBuffer();
 
-	TOverlappedDataBuffer* pBuffers[3] = { queue.GetEmptyBuffer(), queue.GetEmptyBuffer(), queue.GetEmptyBuffer() };
-
-	TOverlappedDataBuffer* pBuffer = pBuffers[0];
-
-	pBuffer->InitForRead(0, 1230);
+	pBuffer->InitForRead(0, 1280);
 	pBuffer->SetBytesTransferred(1230);
 	pBuffer->SetStatusCode(0);
 
 	queue.AddFullBuffer(pBuffer);
 	DWORD dwResult = WaitForSingleObject(queue.GetEventWritePossibleHandle(), 0);
 	EXPECT_EQ(WAIT_OBJECT_0 + 0, dwResult);
+
+	pBuffer = queue.GetFullBuffer();
+
+	dwResult = WaitForSingleObject(queue.GetEventWritePossibleHandle(), 0);
+	EXPECT_EQ(WAIT_TIMEOUT, dwResult);
 }
+
+TEST(TOverlappedDataBufferQueueTests, GetFullBuffer_AddFullBuffer_OutOfOrder)
+{
+	TOverlappedDataBufferQueue queue(3, 32768);
+	TOverlappedDataBuffer* pBuffers[3] = { queue.GetEmptyBuffer(), queue.GetEmptyBuffer(), queue.GetEmptyBuffer() };
+
+	pBuffers[0]->InitForRead(0, 1000);
+	pBuffers[0]->SetBytesTransferred(1000);
+	pBuffers[0]->SetStatusCode(0);
+
+	pBuffers[1]->InitForRead(0, 1200);
+	pBuffers[1]->SetBytesTransferred(1200);
+	pBuffers[1]->SetStatusCode(0);
+
+	pBuffers[2]->InitForRead(0, 1400);
+	pBuffers[2]->SetBytesTransferred(800);
+	pBuffers[2]->SetStatusCode(0);
+	pBuffers[2]->SetLastPart(true);
+
+	EXPECT_TIMEOUT(queue.GetEventWritePossibleHandle());
+
+	queue.AddFullBuffer(pBuffers[1]);
+	EXPECT_TIMEOUT(queue.GetEventWritePossibleHandle());
+
+	queue.AddFullBuffer(pBuffers[2]);
+	EXPECT_TIMEOUT(queue.GetEventWritePossibleHandle());
+
+	queue.AddFullBuffer(pBuffers[0]);
+	EXPECT_SIGNALED(queue.GetEventWritePossibleHandle());
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+TEST(TOverlappedDataBufferQueueTests, GetFinishedBuffer_AddFinishedBuffer_OutOfOrder)
+{
+	TOverlappedDataBufferQueue queue(3, 32768);
+	TOverlappedDataBuffer* pBuffers[3] = { queue.GetEmptyBuffer(), queue.GetEmptyBuffer(), queue.GetEmptyBuffer() };
+
+	pBuffers[0]->InitForRead(0, 1000);
+	pBuffers[0]->SetBytesTransferred(1000);
+	pBuffers[0]->SetStatusCode(0);
+
+	pBuffers[1]->InitForRead(0, 1200);
+	pBuffers[1]->SetBytesTransferred(1200);
+	pBuffers[1]->SetStatusCode(0);
+
+	pBuffers[2]->InitForRead(0, 1400);
+	pBuffers[2]->SetBytesTransferred(800);
+	pBuffers[2]->SetStatusCode(0);
+	pBuffers[2]->SetLastPart(true);
+
+	queue.AddFinishedBuffer(pBuffers[1]);
+	EXPECT_TIMEOUT(queue.GetEventWriteFinishedHandle());
+	queue.AddFinishedBuffer(pBuffers[2]);
+	EXPECT_TIMEOUT(queue.GetEventWriteFinishedHandle());
+	queue.AddFinishedBuffer(pBuffers[0]);
+	EXPECT_SIGNALED(queue.GetEventWriteFinishedHandle());
+}