Support compile with Win64
This commit is contained in:
@@ -40,9 +40,9 @@ ULONG CBuffer::RemoveCompletedBuffer(ULONG ulLength)
|
||||
LeaveCriticalSection(&m_cs);
|
||||
return 0;
|
||||
}
|
||||
if (ulLength > ((ULONG)m_Ptr - (ULONG)m_Base)) //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ij<EFBFBD><C4B3><EFBFBD> <20><><EFBFBD><EFBFBD>Ч<EFBFBD><D0A7><EFBFBD><EFBFBD><EFBFBD>ݳ<EFBFBD><DDB3>Ȼ<EFBFBD><C8BB><EFBFBD>
|
||||
if (ulLength > (m_Ptr - m_Base)) //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ij<EFBFBD><C4B3><EFBFBD> <20><><EFBFBD><EFBFBD>Ч<EFBFBD><D0A7><EFBFBD><EFBFBD><EFBFBD>ݳ<EFBFBD><DDB3>Ȼ<EFBFBD><C8BB><EFBFBD>
|
||||
{
|
||||
ulLength = (ULONG)m_Ptr - (ULONG)m_Base;
|
||||
ulLength = m_Ptr - m_Base;
|
||||
}
|
||||
|
||||
if (ulLength)
|
||||
@@ -52,7 +52,7 @@ ULONG CBuffer::RemoveCompletedBuffer(ULONG ulLength)
|
||||
m_Ptr -= ulLength;
|
||||
}
|
||||
|
||||
DeAllocateBuffer((ULONG)m_Ptr - (ULONG)m_Base);
|
||||
DeAllocateBuffer(m_Ptr - m_Base);
|
||||
LeaveCriticalSection(&m_cs);
|
||||
|
||||
return ulLength;
|
||||
@@ -68,9 +68,9 @@ ULONG CBuffer::ReadBuffer(PBYTE Buffer, ULONG ulLength)
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (ulLength > ((ULONG)m_Ptr - (ULONG)m_Base))
|
||||
if (ulLength > (m_Ptr - m_Base))
|
||||
{
|
||||
ulLength = (ULONG)m_Ptr - (ULONG)m_Base;
|
||||
ulLength = m_Ptr - m_Base;
|
||||
}
|
||||
|
||||
if (ulLength)
|
||||
@@ -81,7 +81,7 @@ ULONG CBuffer::ReadBuffer(PBYTE Buffer, ULONG ulLength)
|
||||
m_Ptr -= ulLength;
|
||||
}
|
||||
|
||||
DeAllocateBuffer((ULONG)m_Ptr - (ULONG)m_Base);
|
||||
DeAllocateBuffer(m_Ptr - m_Base);
|
||||
|
||||
LeaveCriticalSection(&m_cs);
|
||||
return ulLength;
|
||||
@@ -90,7 +90,7 @@ ULONG CBuffer::ReadBuffer(PBYTE Buffer, ULONG ulLength)
|
||||
// ˽<><CBBD>: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
ULONG CBuffer::DeAllocateBuffer(ULONG ulLength)
|
||||
{
|
||||
if (ulLength < ((ULONG)m_Ptr - (ULONG)m_Base))
|
||||
if (ulLength < (m_Ptr - m_Base))
|
||||
return 0;
|
||||
|
||||
ULONG ulNewMaxLength = (ULONG)ceil(ulLength / F_PAGE_ALIGNMENT) * U_PAGE_ALIGNMENT;
|
||||
@@ -101,7 +101,7 @@ ULONG CBuffer::DeAllocateBuffer(ULONG ulLength)
|
||||
}
|
||||
PBYTE NewBase = (PBYTE) VirtualAlloc(NULL,ulNewMaxLength,MEM_COMMIT,PAGE_READWRITE);
|
||||
|
||||
ULONG ulv1 = (ULONG)m_Ptr - (ULONG)m_Base; //<2F><>ԭ<EFBFBD><D4AD><EFBFBD>ڴ<EFBFBD><DAB4><EFBFBD><EFBFBD><EFBFBD>Ч<EFBFBD><D0A7><EFBFBD><EFBFBD>
|
||||
ULONG ulv1 = m_Ptr - m_Base; //<2F><>ԭ<EFBFBD><D4AD><EFBFBD>ڴ<EFBFBD><DAB4><EFBFBD><EFBFBD><EFBFBD>Ч<EFBFBD><D0A7><EFBFBD><EFBFBD>
|
||||
CopyMemory(NewBase,m_Base,ulv1);
|
||||
|
||||
VirtualFree(m_Base,0,MEM_RELEASE);
|
||||
@@ -120,7 +120,7 @@ BOOL CBuffer::WriteBuffer(PBYTE Buffer, ULONG ulLength)
|
||||
{
|
||||
EnterCriticalSection(&m_cs);
|
||||
|
||||
if (ReAllocateBuffer(ulLength + ((ULONG)m_Ptr - (ULONG)m_Base)) == -1)//10 +1 1024
|
||||
if (ReAllocateBuffer(ulLength + (m_Ptr - m_Base)) == -1)//10 +1 1024
|
||||
{
|
||||
LeaveCriticalSection(&m_cs);
|
||||
return false;
|
||||
@@ -147,7 +147,7 @@ ULONG CBuffer::ReAllocateBuffer(ULONG ulLength)
|
||||
}
|
||||
|
||||
|
||||
ULONG ulv1 = (ULONG)m_Ptr - (ULONG)m_Base; //ԭ<>ȵ<EFBFBD><C8B5><EFBFBD>Ч<EFBFBD><D0A7><EFBFBD>ݳ<EFBFBD><DDB3><EFBFBD>
|
||||
ULONG ulv1 = m_Ptr - m_Base; //ԭ<>ȵ<EFBFBD><C8B5><EFBFBD>Ч<EFBFBD><D0A7><EFBFBD>ݳ<EFBFBD><DDB3><EFBFBD>
|
||||
|
||||
CopyMemory(NewBase,m_Base,ulv1);
|
||||
|
||||
@@ -180,7 +180,7 @@ ULONG CBuffer::GetBufferLength() //
|
||||
LeaveCriticalSection(&m_cs);
|
||||
return 0;
|
||||
}
|
||||
ULONG len = (ULONG)m_Ptr - (ULONG)m_Base;
|
||||
ULONG len = m_Ptr - m_Base;
|
||||
LeaveCriticalSection(&m_cs);
|
||||
|
||||
return len;
|
||||
@@ -190,7 +190,7 @@ ULONG CBuffer::GetBufferLength() //
|
||||
LPBYTE CBuffer::GetBuffer(ULONG ulPos)
|
||||
{
|
||||
EnterCriticalSection(&m_cs);
|
||||
if (m_Base==NULL || ulPos >= ((ULONG)m_Ptr - (ULONG)m_Base))
|
||||
if (m_Base==NULL || ulPos >= (m_Ptr - m_Base))
|
||||
{
|
||||
LeaveCriticalSection(&m_cs);
|
||||
return NULL;
|
||||
@@ -205,7 +205,7 @@ LPBYTE CBuffer::GetBuffer(ULONG ulPos)
|
||||
Buffer CBuffer::GetMyBuffer(ULONG ulPos)
|
||||
{
|
||||
EnterCriticalSection(&m_cs);
|
||||
ULONG len = (ULONG)m_Ptr - (ULONG)m_Base;
|
||||
ULONG len = m_Ptr - m_Base;
|
||||
if (m_Base == NULL || ulPos >= len)
|
||||
{
|
||||
LeaveCriticalSection(&m_cs);
|
||||
@@ -220,7 +220,7 @@ Buffer CBuffer::GetMyBuffer(ULONG ulPos)
|
||||
// <20>˺<EFBFBD><CBBA><EFBFBD><EFBFBD>Ƕ<EFBFBD><C7B6>̰߳<DFB3>ȫ<EFBFBD><C8AB>. <20><>ȡ<EFBFBD><C8A1><EFBFBD><EFBFBD>ָ<EFBFBD><D6B8>λ<EFBFBD>ô<EFBFBD><C3B4><EFBFBD><EFBFBD><EFBFBD>ֵ.
|
||||
BYTE CBuffer::GetBYTE(ULONG ulPos) {
|
||||
EnterCriticalSection(&m_cs);
|
||||
if (m_Base == NULL || ulPos >= ((ULONG)m_Ptr - (ULONG)m_Base))
|
||||
if (m_Base == NULL || ulPos >= (m_Ptr - m_Base))
|
||||
{
|
||||
LeaveCriticalSection(&m_cs);
|
||||
return NULL;
|
||||
@@ -234,7 +234,7 @@ BYTE CBuffer::GetBYTE(ULONG ulPos) {
|
||||
// <20>˺<EFBFBD><CBBA><EFBFBD><EFBFBD>Ƕ<EFBFBD><C7B6>̰߳<DFB3>ȫ<EFBFBD><C8AB>. <20><><EFBFBD><EFBFBD><EFBFBD>濽<EFBFBD><E6BFBD><EFBFBD><EFBFBD>Ŀ<EFBFBD><C4BF><EFBFBD>ڴ<EFBFBD><DAB4><EFBFBD>.
|
||||
BOOL CBuffer::CopyBuffer(PVOID pDst, ULONG nLen, ULONG ulPos) {
|
||||
EnterCriticalSection(&m_cs);
|
||||
ULONG len = (ULONG)m_Ptr - (ULONG)m_Base;
|
||||
ULONG len = m_Ptr - m_Base;
|
||||
if (m_Base == NULL || len - ulPos < nLen)
|
||||
{
|
||||
LeaveCriticalSection(&m_cs);
|
||||
|
||||
Reference in New Issue
Block a user