Index: src/libchcore/TOverlappedDataBuffer.h
===================================================================
diff -u -N -rb75259a9158d8b46d747e20ab4960dd002adb4b1 -refe016ef1d0cb0cf1ba379dbe3693e35f6a2361e
--- src/libchcore/TOverlappedDataBuffer.h	(.../TOverlappedDataBuffer.h)	(revision b75259a9158d8b46d747e20ab4960dd002adb4b1)
+++ src/libchcore/TOverlappedDataBuffer.h	(.../TOverlappedDataBuffer.h)	(revision efe016ef1d0cb0cf1ba379dbe3693e35f6a2361e)
@@ -47,40 +47,48 @@
 	TOverlappedDataBuffer& operator=(TOverlappedDataBuffer&& rSrc) = delete;
 
 	// interface methods
+	// buffer size management
 	void ReinitializeBuffer(size_t stNewBufferSize);
 	LPVOID GetBufferPtr();
 
 	size_t GetBufferSize() const { return m_stBufferSize; }
 
+	// members
 	DWORD GetRequestedDataSize() const { return m_dwRequestedDataSize; }
-	void SetRequestedDataSize(DWORD val) { m_dwRequestedDataSize = val; }
+	void SetRequestedDataSize(DWORD dwRequestedSize) { m_dwRequestedDataSize = dwRequestedSize; }
 
+	DWORD GetRealDataSize() const { return m_dwRealDataSize; }
+	void SetRealDataSize(DWORD dwRealDataSize) { m_dwRealDataSize = dwRealDataSize; }
+
 	void SetLastPart(bool bLastPart) { m_bLastPart = bLastPart; }
 	bool IsLastPart() const { return m_bLastPart; }
 
-	void RequeueAsEmpty();
-	void RequeueAsFull();
-	void RequeueAsFinished();
+	unsigned long long GetBufferOrder() const { return m_ullBufferOrder; }
+	void SetBufferOrder(unsigned long long ullOrder) { m_ullBufferOrder = ullOrder; }
 
+	DWORD GetErrorCode() const { return m_dwErrorCode; }
+	void SetErrorCode(DWORD dwErrorCode) { m_dwErrorCode = dwErrorCode; }
+
 	// OVERLAPPED interface
 	ULONG_PTR GetStatusCode() const { return Internal; }
 	void SetStatusCode(ULONG_PTR ulStatusCode) { Internal = ulStatusCode; }
 
-	DWORD GetErrorCode() const { return m_dwErrorCode; }
-	void SetErrorCode(DWORD dwErrorCode) { m_dwErrorCode = dwErrorCode; }
-
 	void SetBytesTransferred(ULONG_PTR ulBytes) { InternalHigh = ulBytes; }
 	ULONG_PTR GetBytesTransferred() const { return InternalHigh; }
 
-	DWORD GetRealDataSize() const { return m_dwRealDataSize; }
-	void SetRealDataSize(DWORD dwRealDataSize) { m_dwRealDataSize = dwRealDataSize; }
-
 	unsigned long long GetFilePosition() const { return (unsigned long long)OffsetHigh << 32 | Offset; }
 	void SetFilePosition(unsigned long long ullPosition) { OffsetHigh = (DWORD) (ullPosition >> 32); Offset = (DWORD) ullPosition; }
 
-	unsigned long long GetBufferOrder() const { return m_ullBufferOrder; }
-	void SetBufferOrder(unsigned long long ullOrder) { m_ullBufferOrder = ullOrder; }
+	// queue management
+	void RequeueAsEmpty();
+	void RequeueAsFull();
+	void RequeueAsFinished();
 
+	// composite initialization
+	void InitForRead(unsigned long long ullPosition, DWORD dwRequestedSize);
+	void InitForWrite();
+	void Reset();
+
 private:
 	void ReleaseBuffer();