Changeset 627

Timestamp:

Jan 4, 2021, 9:57:55 AM (5 years ago)

Author:

Paul Smedley

Message:

Add GetBaseAddressNoFree for ksize, rename GetBaseAddress to GetBaseAddressAndFree

File:

• GPL/branches/uniaud32-next/lib32/memory.c (modified) (5 diffs)

GPL/branches/uniaud32-next/lib32/memory.c

@@ -106 +106 @@
 //******************************************************************************
 //******************************************************************************
-ULONG GetBaseAddress(ULONG addr, ULONG *pSize)
+ULONG GetBaseAddressAndFree(ULONG addr, ULONG *pSize)
 {
     BaseAddr NEAR *pCur, NEAR *pTemp;
@@ -131 +131 @@
 
             _kfree(pTemp);
+            break;
+        }
+        pCur = pCur->next;
+    }
+    DevSti();
+    return addr;
+}
+//******************************************************************************
+//******************************************************************************
+ULONG GetBaseAddressNoFree(ULONG addr, ULONG *pSize)
+{
+    BaseAddr NEAR *pCur, NEAR *pTemp;
+
+    if(pBaseAddrHead == NULL) return addr;
+
+    DevCli();
+    pCur = pBaseAddrHead;
+
+    if(pCur->retaddr == addr)
+    {
+        addr = pCur->base;
+        if(pSize) *pSize = pCur->size;
+        pBaseAddrHead = pCur->next;
+//        _kfree(pCur);
+    }
+    else
+    while(pCur->next) {
+        if(pCur->next->retaddr == addr) {
+            pTemp = pCur->next;
+            addr = pTemp->base;
+            if(pSize) *pSize = pTemp->size;
+            pCur->next = pTemp->next;
+//            _kfree(pTemp);
             break;
         }
@@ -374 +407 @@
 
     //check if it really is the base of the allocation (see above)
-    addr = GetBaseAddress(addr, (ULONG NEAR *)__Stack32ToFlat(&size));
+    addr = GetBaseAddressAndFree(addr, (ULONG NEAR *)__Stack32ToFlat(&size));
 
     if(VMFree((LINEAR)addr)) {
@@ -418 +451 @@
     ULONG  size = 0;
 
-    GetBaseAddress((ULONG)ptr, (ULONG NEAR *)__Stack32ToFlat(&size));
+    GetBaseAddressAndFree((ULONG)ptr, (ULONG NEAR *)__Stack32ToFlat(&size));
 
     if(VMFree((LINEAR)ptr)) {
@@ -662 +695 @@
                 return 0;
 
-        GetBaseAddress((ULONG)block, (ULONG NEAR *)__Stack32ToFlat(&size));
+        GetBaseAddressNoFree((ULONG)block, (ULONG NEAR *)__Stack32ToFlat(&size));
 
         return size;