Changeset 37

Timestamp:

Nov 7, 2011, 2:00:04 AM (12 years ago)

Author:

roman

Message:

 

File:

• trunk/Utilities/VirtualHeapPtr/VirtualHeapPtr.h (modified) (4 diffs)

trunk/Utilities/VirtualHeapPtr/VirtualHeapPtr.h

@@ -138 +138 @@
 {
 public:
-        static SIZE_T g_nHeadSanityPageCount;
-        static SIZE_T g_nTailSanityPageCount;
-
-public:
 // CDebugAllocatorTraits
-};
-
-__declspec(selectany) SIZE_T CDebugAllocatorTraits::g_nHeadSanityPageCount = 1;
-__declspec(selectany) SIZE_T CDebugAllocatorTraits::g_nTailSanityPageCount = 1;
+        static SIZE_T GetHeadSanityPageCount() throw()
+        {
+                return 1;
+        }
+        static SIZE_T GetTailSanityPageCount() throw()
+        {
+                return 1;
+        }
+        static BOOL IsHeadPadding() throw()
+        {
+                return TRUE;
+        }
+};
 
 ////////////////////////////////////////////////////////////
@@ -178 +183 @@
                         const SIZE_T nAllocationSize = 
                                 g_GlobalVirtualAllocator.Align(sizeof (CDescriptor)) +
-                                CTraits::g_nHeadSanityPageCount * nPageSize +
+                                CTraits::GetHeadSanityPageCount() * nPageSize +
                                 nAlignedDataSize +
-                                CTraits::g_nTailSanityPageCount * nPageSize +
+                                CTraits::GetTailSanityPageCount() * nPageSize +
                                 0;
                         VOID* pvData = VirtualAlloc(NULL, nAllocationSize, MEM_COMMIT | MEM_RESERVE, PAGE_NOACCESS);
@@ -188 +193 @@
                         ATLVERIFY(VirtualProtect(pDescriptor, sizeof *pDescriptor, PAGE_READWRITE, &nCurrentProtection));
                         pDescriptor->m_nAllocationSize = nAllocationSize;
-                        pDescriptor->m_pvData = (BYTE*) pDescriptor + g_GlobalVirtualAllocator.Align(sizeof *pDescriptor) + CTraits::g_nHeadSanityPageCount * nPageSize;
+                        pDescriptor->m_pvData = (BYTE*) pDescriptor + g_GlobalVirtualAllocator.Align(sizeof *pDescriptor) + CTraits::GetHeadSanityPageCount() * nPageSize;
                         pDescriptor->m_nDataSize = nDataSize;
-                        pDescriptor->m_nPaddingDataSize = nAlignedDataSize - nDataSize;
-                        pDescriptor->m_pvPaddingData = (BYTE*) pDescriptor->m_pvData + nAlignedDataSize - pDescriptor->m_nPaddingDataSize;
+                        const SIZE_T nPaddingDataSize = nAlignedDataSize - nDataSize;
+                        if(CTraits::IsHeadPadding() && nPaddingDataSize)
+                        {
+                                pDescriptor->m_pvPaddingData = pDescriptor->m_pvData;
+                                reinterpret_cast<BYTE*&>(pDescriptor->m_pvData) += nPaddingDataSize;
+                        } else
+                                pDescriptor->m_pvPaddingData = (BYTE*) pDescriptor->m_pvData + nAlignedDataSize - nPaddingDataSize;
+                        pDescriptor->m_nPaddingDataSize = nPaddingDataSize;
                         ATLVERIFY(VirtualProtect(pDescriptor->m_pvData, pDescriptor->m_nDataSize, PAGE_READWRITE, &nCurrentProtection));
                         memset(pDescriptor->m_pvPaddingData, 0x77, pDescriptor->m_nPaddingDataSize);
@@ -200 +211 @@
                 {
                         ATLASSERT(pvData);
-                        CDescriptor* pDescriptor = (CDescriptor*) ((BYTE*) pvData - CTraits::g_nHeadSanityPageCount * g_GlobalVirtualAllocator.GetPageSize() - g_GlobalVirtualAllocator.Align(sizeof (CDescriptor)));
+                        ATLASSERT(!(g_GlobalVirtualAllocator.GetPageSize() & (g_GlobalVirtualAllocator.GetPageSize() - 1)));
+                        BYTE* pnData = (BYTE*) ((UINT_PTR) pvData & ~(g_GlobalVirtualAllocator.GetPageSize() - 1));
+                        CDescriptor* pDescriptor = (CDescriptor*) (pnData - CTraits::GetHeadSanityPageCount() * g_GlobalVirtualAllocator.GetPageSize() - g_GlobalVirtualAllocator.Align(sizeof (CDescriptor)));
                         return pDescriptor;
                 }