Changeset 21302 for trunk/src/kernel32/oslibmem.cpp

Timestamp:

Jun 18, 2009, 11:53:26 AM (16 years ago)

Author:

ydario

Message:

Kernel32 updates.

File:

• trunk/src/kernel32/oslibmem.cpp (modified) (10 diffs)

trunk/src/kernel32/oslibmem.cpp

@@ -32 +32 @@
 #include <winconst.h>
 #include <win\winioctl.h>
-#include <misc.h>
+#include <dbglog.h>
+#include <vmutex.h>
 #include "initterm.h"
 #include "oslibdos.h"
@@ -38 +39 @@
 #include "dosqss.h"
 #include "win32k.h"
+#include "exceptstackdump.h"
 
 #define DBG_LOCALLOG    DBG_oslibmem
 #include "dbglocal.h"
 
+#include <_ras.h>
+
+#ifdef RAS
+RAS_TRACK_HANDLE rthVirtual = 0;
+
+void rasInitVirtual (void)
+{
+    RasRegisterObjectTracking (&rthVirtual, "Virtual* memory allocation",
+                               0, RAS_TRACK_FLAG_MEMORY | RAS_TRACK_FLAG_LOG_OBJECTS_AT_EXIT,
+                               NULL, NULL);
+}
+#endif
+
+typedef struct _VirtAllocRec {
+  ULONG baseaddr;
+  ULONG size;
+  ULONG attr;
+
+  struct _VirtAllocRec *next;
+} VirtAllocRec;
+
+static VirtAllocRec         *allocrecords  = NULL;
+static CRITICAL_SECTION_OS2  alloccritsect = {0};
+
+//******************************************************************************
+//******************************************************************************
+void AddAllocRec(ULONG baseaddr, ULONG size, ULONG attr)
+{
+    VirtAllocRec *rec, *tmp;
+
+    rec = (VirtAllocRec *)malloc(sizeof(VirtAllocRec));
+    if(!rec) {
+        DebugInt3();
+        return;
+    }
+    rec->baseaddr = baseaddr;
+    rec->size     = size;
+    rec->attr     = attr;
+
+    DosEnterCriticalSection(&alloccritsect);
+    if(!allocrecords || allocrecords->baseaddr > baseaddr) {
+        rec->next     = allocrecords;
+        allocrecords  = rec;
+    }
+    else {
+        tmp = allocrecords;
+        while(tmp->next) {
+            if(tmp->next->baseaddr > baseaddr) {      
+                break;
+            }
+            tmp = tmp->next;
+        }
+
+        rec->next = tmp->next;
+        tmp->next = rec;
+    }
+    DosLeaveCriticalSection(&alloccritsect);
+}
+//******************************************************************************
+//******************************************************************************
+void FreeAllocRec(ULONG baseaddr)
+{
+    VirtAllocRec *rec = NULL, *tmp;
+
+    if(!allocrecords) {
+        DebugInt3();
+        return;
+    }
+
+    DosEnterCriticalSection(&alloccritsect);
+    if(allocrecords->baseaddr == baseaddr) {
+        rec          = allocrecords;
+        allocrecords = allocrecords->next;
+    }
+    else {
+        tmp = allocrecords;
+        while(tmp->next) {
+            if(tmp->next->baseaddr == baseaddr) {      
+                break;
+            }
+            tmp = tmp->next;
+        }
+        if(tmp->next) {
+             rec = tmp->next;
+             tmp->next = tmp->next->next;
+        }
+        else dprintf(("ERROR: FreeAllocRec: allocation not found!! (%x)", baseaddr));
+    }
+    DosLeaveCriticalSection(&alloccritsect);
+    if(rec) free(rec);
+}
+//******************************************************************************
+//******************************************************************************
+BOOL FindAllocRec(ULONG addr, ULONG *lpBase, ULONG *lpSize, ULONG *lpAttr)
+{
+    VirtAllocRec *rec = NULL;
+
+    DosEnterCriticalSection(&alloccritsect);
+    rec = allocrecords;
+    while(rec) {
+        if(rec->baseaddr <= addr && rec->baseaddr + rec->size > addr) {
+            *lpBase = rec->baseaddr;
+            *lpSize = rec->size;
+            *lpAttr = rec->attr;
+            break; //found it
+        }
+        if(rec->baseaddr > addr) {
+            //sorted list, so no need to search any further
+            rec = NULL;
+            break;
+        }
+        rec = rec->next;
+    }
+    DosLeaveCriticalSection(&alloccritsect);
+    return (rec != NULL);
+}
 //******************************************************************************
 //TODO: Check if this works for code aliases...
@@ -83 +201 @@
         pAlias += size;
     }
+    AddAllocRec((ULONG)*ppbAlias, cb, fl);
     return 0;
 }
@@ -99 +218 @@
         fMemFlags = 0;
     }
+    
     /*
      * Let's try use the extended DosAllocMem API of Win32k.sys.
@@ -105 +225 @@
     {
         rc = DosAllocMemEx(lplpMemAddr, cbSize, flFlags | fMemFlags | OBJ_ALIGN64K);
+#ifdef RAS
+        if (rc == NO_ERROR)
+        {
+            RasAddObject (rthVirtual, (ULONG)*lplpMemAddr, NULL, cbSize);
+        }
+#endif
         if (rc != ERROR_NOT_SUPPORTED)  /* This call was stubbed until recently. */
             return rc;
@@ -132 +258 @@
             return rc;
         }
+        
+        PVOID baseAddr = (PVOID)addr64kb; // sunlover20040613: save returned address for a possible Free on failure
+        
         dprintf(("Allocate aligned memory %x -> %x", addr64kb, (addr64kb + 0xFFFF) & ~0xFFFF));
 
@@ -144 +273 @@
             if(rc) {
                 dprintf(("!ERROR!: DosSetMem failed with rc %d", rc));
+                DosFreeMem (baseAddr); // sunlover20040613: Free allocated memory
                 return rc;
             }
@@ -149 +279 @@
     }
 
-    if(!rc)
+    if(!rc) {
         *lplpMemAddr = pvMemAddr;
-
+        AddAllocRec((ULONG)pvMemAddr, cbSize, flFlags);
+        RasAddObject (rthVirtual, (ULONG)*lplpMemAddr, NULL, cbSize);
+    }
     return rc;
 }
@@ -157 +289 @@
 //Locate the base page of a memory allocation (the page with the PAG_BASE attribute)
 //******************************************************************************
-PVOID OSLibDosFindMemBase(LPVOID lpMemAddr)
-{
-    ULONG  ulAttr, ulSize, ulAddr;
+PVOID OSLibDosFindMemBase(LPVOID lpMemAddr, DWORD *lpAttr)
+{
+    ULONG  ulAttr, ulSize, ulAddr, ulBase;
     APIRET rc;
+    VirtAllocRec *allocrec;
+
+    *lpAttr = 0;
     
+    if(FindAllocRec((ULONG)lpMemAddr, &ulBase, &ulSize, lpAttr) == TRUE) {
+        return (PVOID)ulBase;
+    }
+    
+    ulSize = PAGE_SIZE;
     rc = DosQueryMem(lpMemAddr, &ulSize, &ulAttr);
     if(rc != NO_ERROR) {
@@ -226 +366 @@
         dprintf(("!ERROR!: OSLibDosFreeMem: Unable to find base of %x", lpMemAddr));
         DebugInt3();
-    }
-    else {
-        lpMemAddr = (PVOID)ulAddr;
-    }
-    return DosFreeMem(lpMemAddr);
+        return ERROR_INVALID_PARAMETER;
+    }
+    FreeAllocRec((ULONG)lpMemAddr);
+    
+    RasRemoveObject (rthVirtual, (ULONG)lpMemAddr);
+
+    return DosFreeMem((PVOID)ulAddr);
 }
 //******************************************************************************