Index: src/libchcore/TOverlappedDataBuffer.cpp
===================================================================
diff -u -N -radf2d680643ef85665b042e03fed274ab8f11180 -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3
--- src/libchcore/TOverlappedDataBuffer.cpp	(.../TOverlappedDataBuffer.cpp)	(revision adf2d680643ef85665b042e03fed274ab8f11180)
+++ src/libchcore/TOverlappedDataBuffer.cpp	(.../TOverlappedDataBuffer.cpp)	(revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3)
@@ -32,136 +32,135 @@
 
 #define STATUS_END_OF_FILE 0xc0000011
 
-BEGIN_CHCORE_NAMESPACE
-
-///////////////////////////////////////////////////////////////////////////////////
-// class TOverlappedDataBuffer
-VOID CALLBACK OverlappedReadCompleted(DWORD dwErrorCode, DWORD dwNumberOfBytesTransfered, LPOVERLAPPED lpOverlapped)
+namespace chcore
 {
-	TOverlappedDataBuffer* pBuffer = (TOverlappedDataBuffer*) lpOverlapped;
+	///////////////////////////////////////////////////////////////////////////////////
+	// class TOverlappedDataBuffer
+	VOID CALLBACK OverlappedReadCompleted(DWORD dwErrorCode, DWORD dwNumberOfBytesTransfered, LPOVERLAPPED lpOverlapped)
+	{
+		TOverlappedDataBuffer* pBuffer = (TOverlappedDataBuffer*)lpOverlapped;
 
-	// determine if this is the last packet
-	bool bEof = (dwErrorCode == ERROR_HANDLE_EOF ||
-		pBuffer->GetStatusCode() == STATUS_END_OF_FILE ||
-		(dwErrorCode == ERROR_SUCCESS && pBuffer->GetBytesTransferred() != pBuffer->GetRequestedDataSize()));
+		// determine if this is the last packet
+		bool bEof = (dwErrorCode == ERROR_HANDLE_EOF ||
+			pBuffer->GetStatusCode() == STATUS_END_OF_FILE ||
+			(dwErrorCode == ERROR_SUCCESS && pBuffer->GetBytesTransferred() != pBuffer->GetRequestedDataSize()));
 
-	// reset status code and error code if they pointed out to EOF
-	if (pBuffer->GetStatusCode() == STATUS_END_OF_FILE)
-		pBuffer->SetStatusCode(0);
+		// reset status code and error code if they pointed out to EOF
+		if (pBuffer->GetStatusCode() == STATUS_END_OF_FILE)
+			pBuffer->SetStatusCode(0);
 
-	pBuffer->SetErrorCode(dwErrorCode == ERROR_HANDLE_EOF ? ERROR_SUCCESS : dwErrorCode);
+		pBuffer->SetErrorCode(dwErrorCode == ERROR_HANDLE_EOF ? ERROR_SUCCESS : dwErrorCode);
 
-	pBuffer->SetRealDataSize(dwNumberOfBytesTransfered);
-	pBuffer->SetLastPart(bEof);
+		pBuffer->SetRealDataSize(dwNumberOfBytesTransfered);
+		pBuffer->SetLastPart(bEof);
 
-	pBuffer->RequeueAsFull();
-}
+		pBuffer->RequeueAsFull();
+	}
 
-VOID CALLBACK OverlappedWriteCompleted(DWORD dwErrorCode, DWORD /*dwNumberOfBytesTransfered*/, LPOVERLAPPED lpOverlapped)
-{
-	TOverlappedDataBuffer* pBuffer = (TOverlappedDataBuffer*) lpOverlapped;
+	VOID CALLBACK OverlappedWriteCompleted(DWORD dwErrorCode, DWORD /*dwNumberOfBytesTransfered*/, LPOVERLAPPED lpOverlapped)
+	{
+		TOverlappedDataBuffer* pBuffer = (TOverlappedDataBuffer*)lpOverlapped;
 
-	pBuffer->SetErrorCode(dwErrorCode);
-	pBuffer->RequeueAsFinished();
-}
+		pBuffer->SetErrorCode(dwErrorCode);
+		pBuffer->RequeueAsFinished();
+	}
 
-TOverlappedDataBuffer::TOverlappedDataBuffer(size_t stBufferSize, IOverlappedDataBufferQueue* pQueue) :
-	m_pBuffer(NULL),
-	m_stBufferSize(0),
-	m_bLastPart(false),
-	m_pQueue(pQueue),
-	m_dwRequestedDataSize(0),
-	m_dwRealDataSize(0)
-{
-	if (!m_pQueue)
-		THROW_CORE_EXCEPTION(eErr_InvalidPointer);
+	TOverlappedDataBuffer::TOverlappedDataBuffer(size_t stBufferSize, IOverlappedDataBufferQueue* pQueue) :
+		m_pBuffer(NULL),
+		m_stBufferSize(0),
+		m_bLastPart(false),
+		m_pQueue(pQueue),
+		m_dwRequestedDataSize(0),
+		m_dwRealDataSize(0)
+	{
+		if (!m_pQueue)
+			THROW_CORE_EXCEPTION(eErr_InvalidPointer);
 
-	// initialize OVERLAPPED members
-	Internal = 0;
-	InternalHigh = 0;
-	Offset = 0;
-	OffsetHigh = 0;
-	hEvent = NULL;
+		// initialize OVERLAPPED members
+		Internal = 0;
+		InternalHigh = 0;
+		Offset = 0;
+		OffsetHigh = 0;
+		hEvent = NULL;
 
-	// create buffer
-	ReinitializeBuffer(stBufferSize);
-}
+		// create buffer
+		ReinitializeBuffer(stBufferSize);
+	}
 
-TOverlappedDataBuffer::~TOverlappedDataBuffer()
-{
-	ReleaseBuffer();
-}
-
-void TOverlappedDataBuffer::ReinitializeBuffer(size_t stNewBufferSize)
-{
-	if (stNewBufferSize != m_stBufferSize)
+	TOverlappedDataBuffer::~TOverlappedDataBuffer()
 	{
 		ReleaseBuffer();
+	}
 
-		m_pBuffer = VirtualAlloc(NULL, stNewBufferSize, MEM_COMMIT, PAGE_READWRITE);
-		if (!m_pBuffer)
-			THROW_CORE_EXCEPTION(eErr_CannotAllocateMemory);
-		m_stBufferSize = stNewBufferSize;
+	void TOverlappedDataBuffer::ReinitializeBuffer(size_t stNewBufferSize)
+	{
+		if (stNewBufferSize != m_stBufferSize)
+		{
+			ReleaseBuffer();
+
+			m_pBuffer = VirtualAlloc(NULL, stNewBufferSize, MEM_COMMIT, PAGE_READWRITE);
+			if (!m_pBuffer)
+				THROW_CORE_EXCEPTION(eErr_CannotAllocateMemory);
+			m_stBufferSize = stNewBufferSize;
+		}
 	}
-}
 
-void TOverlappedDataBuffer::ReleaseBuffer()
-{
-	if (m_pBuffer)
+	void TOverlappedDataBuffer::ReleaseBuffer()
 	{
-		VirtualFree(m_pBuffer, 0, MEM_RELEASE);
-		m_stBufferSize = 0;
-		m_pBuffer = nullptr;
+		if (m_pBuffer)
+		{
+			VirtualFree(m_pBuffer, 0, MEM_RELEASE);
+			m_stBufferSize = 0;
+			m_pBuffer = nullptr;
+		}
 	}
-}
 
-LPVOID TOverlappedDataBuffer::GetBufferPtr()
-{
-	return m_pBuffer;
-}
+	LPVOID TOverlappedDataBuffer::GetBufferPtr()
+	{
+		return m_pBuffer;
+	}
 
-void TOverlappedDataBuffer::RequeueAsEmpty()
-{
-	m_pQueue->AddEmptyBuffer(this);
-}
+	void TOverlappedDataBuffer::RequeueAsEmpty()
+	{
+		m_pQueue->AddEmptyBuffer(this);
+	}
 
-void TOverlappedDataBuffer::RequeueAsFull()
-{
-	m_pQueue->AddFullBuffer(this);
-}
+	void TOverlappedDataBuffer::RequeueAsFull()
+	{
+		m_pQueue->AddFullBuffer(this);
+	}
 
-void TOverlappedDataBuffer::RequeueAsFinished()
-{
-	m_pQueue->AddFinishedBuffer(this);
-}
+	void TOverlappedDataBuffer::RequeueAsFinished()
+	{
+		m_pQueue->AddFinishedBuffer(this);
+	}
 
-void TOverlappedDataBuffer::InitForRead(unsigned long long ullPosition, DWORD dwRequestedSize)
-{
-	SetRequestedDataSize(dwRequestedSize);
-	SetFilePosition(ullPosition);
-	SetRealDataSize(0);
-	SetLastPart(false);
-	SetErrorCode(ERROR_SUCCESS);
-	SetStatusCode(0);
-	SetBytesTransferred(0);
-}
+	void TOverlappedDataBuffer::InitForRead(unsigned long long ullPosition, DWORD dwRequestedSize)
+	{
+		SetRequestedDataSize(dwRequestedSize);
+		SetFilePosition(ullPosition);
+		SetRealDataSize(0);
+		SetLastPart(false);
+		SetErrorCode(ERROR_SUCCESS);
+		SetStatusCode(0);
+		SetBytesTransferred(0);
+	}
 
-void TOverlappedDataBuffer::InitForWrite()
-{
-	SetErrorCode(ERROR_SUCCESS);
-	SetStatusCode(0);
-	SetBytesTransferred(0);
-}
+	void TOverlappedDataBuffer::InitForWrite()
+	{
+		SetErrorCode(ERROR_SUCCESS);
+		SetStatusCode(0);
+		SetBytesTransferred(0);
+	}
 
-void TOverlappedDataBuffer::Reset()
-{
-	SetRequestedDataSize(0);
-	SetFilePosition(0);
-	SetRealDataSize(0);
-	SetLastPart(false);
-	SetErrorCode(ERROR_SUCCESS);
-	SetStatusCode(0);
-	SetBytesTransferred(0);
+	void TOverlappedDataBuffer::Reset()
+	{
+		SetRequestedDataSize(0);
+		SetFilePosition(0);
+		SetRealDataSize(0);
+		SetLastPart(false);
+		SetErrorCode(ERROR_SUCCESS);
+		SetStatusCode(0);
+		SetBytesTransferred(0);
+	}
 }
-
-END_CHCORE_NAMESPACE