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

Timestamp:

Jul 13, 2002, 6:30:40 PM (23 years ago)

Author:

sandervl

Message:

Disabled 64kb alignment in VirtualAlloc for now

File:

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

trunk/src/kernel32/oslibmem.cpp

@@ -1 @@
-/* $Id: oslibmem.cpp,v 1.1 2002-07-13 15:58:21 sandervl Exp $ */
+/* $Id: oslibmem.cpp,v 1.2 2002-07-13 16:30:40 sandervl Exp $ */
 /*
  * Wrappers for OS/2 Dos* API
  *
- * Copyright 1998-2000 Sander van Leeuwen (sandervl@xs4all.nl)
+ * Copyright 1998-2002 Sander van Leeuwen (sandervl@xs4all.nl)
  * Copyright 2000 knut st. osmundsen (knut.stange.osmundsen@mynd.no)
  *
@@ -47 +47 @@
 DWORD OSLibDosAliasMem(LPVOID pb, ULONG cb, LPVOID *ppbAlias, ULONG fl)
 {
- DWORD rc;
- DWORD attr;
- DWORD size = cb;
-
-  cb = (cb-1) & ~0xfff;
-  cb+= PAGE_SIZE;
-
-  rc = DosQueryMem(pb, &size, &attr);
-  if(rc) {
+    DWORD rc;
+    DWORD attr;
+    DWORD size = cb;
+
+    cb = (cb-1) & ~0xfff;
+    cb+= PAGE_SIZE;
+
+    rc = DosQueryMem(pb, &size, &attr);
+    if(rc) {
         dprintf(("OSLibDosAliasMem: DosQueryMem %x %x return %d", pb, size, rc));
         return rc;
-  }
-  size = (size-1) & ~0xfff;
-  size+= PAGE_SIZE;
-  if(size != cb) {
+    }
+    size = (size-1) & ~0xfff;
+    size+= PAGE_SIZE;
+    if(size != cb) {
         dprintf(("ERROR: OSLibDosAliasMem: size != cb (%x!=%x)!!!!!!!!", size, cb));
         //ignore this and continue return 5;
         attr = fl; //just use original protection flags (NOT CORRECT)
-  }
-  attr &= (PAG_READ|PAG_WRITE|PAG_EXECUTE|PAG_GUARD|PAG_DEFAULT);
-  if(attr != fl) {
+    }
+    attr &= (PAG_READ|PAG_WRITE|PAG_EXECUTE|PAG_GUARD|PAG_DEFAULT);
+    if(attr != fl) {
         rc = DosSetMem(pb, size, fl);
         if(rc) {
@@ -75 +75 @@
                 //return rc;
         }
-  }
-  rc = DosAliasMem(pb, cb, ppbAlias, 2);
-  if(rc) {
+    }
+    rc = DosAliasMem(pb, cb, ppbAlias, 2);
+    if(rc) {
         dprintf(("OSLibDosAliasMem: DosAliasMem %x %x returned %d", pb, cb, rc));
         return rc;
-  }
-  if(attr != fl) {
+    }
+    if(attr != fl) {
         rc = DosSetMem(pb, size, attr);
         if(rc) {
-                dprintf(("OSLibDosAliasMem: DosSetMem (2) %x %x return %d", pb, size, rc));
-                return rc;
-        }
-  }
-  return 0;
-}
-//******************************************************************************
-//NT returns addresses aligned at 64k, so we do too.
-//******************************************************************************
-// tries to retrieve an aligned block recursivly
-APIRET OdinAlignMemR(LPVOID *lpMemAddr, DWORD size, DWORD offset, DWORD flags)
-{
-  LPVOID memaddr;
-  APIRET rc, rc2;
-
-  DosEnterCritSec();
-  DosFreeMem(*lpMemAddr);
-  rc2 = DosAllocMem(&memaddr, 64 * 1024 - offset, PAG_READ | flAllocMem);
-  rc  = DosAllocMem(lpMemAddr, size, flags | flAllocMem);
-  DosExitCritSec();
-
-  dprintf2(("OdinAlignMem: DosAllocMem returned %d, %d  and pointers %x, %x for size %x and offset %x", rc, rc2, *lpMemAddr, memaddr, size, offset ));
-
-  if(rc2) {
-    // giving up - return as received
-    return rc;
-  }
-
-  if(rc) {
-    // seems to be out of memory
-    DosFreeMem(memaddr);
-    return rc;
-  }
-
-  if((DWORD) *lpMemAddr & 0xFFFF)
-    rc = OdinAlignMemR(lpMemAddr, size, (DWORD) *lpMemAddr & 0xFFFF, flags);
-
-  DosFreeMem(memaddr);
-  return rc;
+            dprintf(("OSLibDosAliasMem: DosSetMem (2) %x %x return %d", pb, size, rc));
+            return rc;
+        }
+    }
+    return 0;
 }
 //******************************************************************************
@@ -148 +114 @@
     rc = DosAllocMem(&pvMemAddr, cbSize, flFlags | flAllocMem);
     if(rc) {
-        return rc;
-    }
-
+        dprintf(("DosAllocMem failed with rc %d", rc));
+        return rc;
+    }
+    //TODO!!!!!!!!!!!!
+#if 0
     // already 64k aligned ?
-//    if((DWORD) pvMemAddr & 0xFFFF)
-//        rc = OdinAlignMemR(&pvMemAddr, cbSize, (DWORD) pvMemAddr & 0xFFFF, flFlags);
-
+    if((DWORD) pvMemAddr & 0xFFFF) 
+    {
+        DWORD addr64kb;
+
+        //Allocate 64kb more so we can round the address to a 64kb aligned value
+        rc = DosAllocMem((PPVOID)&addr64kb, cbSize + 64*1024,  PAG_READ | flAllocMem);
+        if(rc) {
+            dprintf(("DosAllocMem failed with rc %d", rc));
+            return rc;
+        }
+        if(addr64kb & 0xFFFF) {
+            addr64kb = (addr64kb + 0xFFFF) & 0xFFFF;
+        }
+        pvMemAddr = (PVOID)addr64kb;
+
+        //and set the correct page flags for the request range
+        rc = DosSetMem(pvMemAddr, cbSize, flFlags | flAllocMem);
+    }
+#endif
     if(!rc)
         *lplpMemAddr = pvMemAddr;
@@ -164 +148 @@
 DWORD OSLibDosFreeMem(LPVOID lpMemAddr)
 {
-  return DosFreeMem(lpMemAddr);
+    return DosFreeMem(lpMemAddr);
 }
 //******************************************************************************
@@ -173 +157 @@
 DWORD OSLibDosAllocSharedMem(LPVOID *lplpMemAddr, DWORD size, DWORD flags, LPSTR name)
 {
- APIRET rc;
- char  *sharedmemname = NULL, *tmp;
-
-  if(name) {
-        sharedmemname = (char *)malloc(strlen(name) + 16);
-        strcpy(sharedmemname, "\\SHAREMEM\\");
-        strcat(sharedmemname, name);
-  }
-  else  flags |= OBJ_GETTABLE;
-
-  //SvL: Colons are unacceptable in shared memory names (for whatever reason)
-  tmp = sharedmemname;
-  while(*tmp != 0) {
+    APIRET rc;
+    char  *sharedmemname = NULL, *tmp;
+
+    if(name) {
+         sharedmemname = (char *)malloc(strlen(name) + 16);
+         strcpy(sharedmemname, "\\SHAREMEM\\");
+         strcat(sharedmemname, name);
+    }
+    else flags |= OBJ_GETTABLE;
+
+    //SvL: Colons are unacceptable in shared memory names (for whatever reason)
+    tmp = sharedmemname;
+    while(*tmp != 0) {
         if(*tmp == ':') {
             *tmp = '_';
         }
         tmp++;
-  }
-
-  rc = DosAllocSharedMem(lplpMemAddr, sharedmemname, size, flags);
-  if(name) {
+    }
+
+    rc = DosAllocSharedMem(lplpMemAddr, sharedmemname, size, flags);
+    if(name) {
         free(sharedmemname);
-  }
-  return rc;
+    }
+    return rc;
 }
 //******************************************************************************
@@ -203 +187 @@
 DWORD OSLibDosGetNamedSharedMem(LPVOID *lplpMemAddr, LPSTR name)
 {
- APIRET rc;
- char  *sharedmemname = NULL, *tmp;
-
-  if(name) {
+    APIRET rc;
+    char  *sharedmemname = NULL, *tmp;
+
+    if(name) {
         sharedmemname = (char *)malloc(strlen(name) + 16);
         strcpy(sharedmemname, "\\SHAREMEM\\");
@@ -223 +207 @@
                 free(sharedmemname);
         }
-  }
-  else  rc = DosGetSharedMem((LPVOID)*(DWORD *)lplpMemAddr, PAG_READ|PAG_WRITE);
-
-  return rc;
+    }
+    else  rc = DosGetSharedMem((LPVOID)*(DWORD *)lplpMemAddr, PAG_READ|PAG_WRITE);
+
+    return rc;
 }
 //******************************************************************************
@@ -232 +216 @@
 DWORD OSLibDosQueryMem(LPVOID lpMemAddr, DWORD *lpRangeSize, DWORD *lpAttr)
 {
-  return DosQueryMem(lpMemAddr, lpRangeSize, lpAttr);
+    return DosQueryMem(lpMemAddr, lpRangeSize, lpAttr);
 }
 //******************************************************************************
@@ -238 +222 @@
 DWORD OSLibDosSetMem(LPVOID lpMemAddr, DWORD size, DWORD flags)
 {
- APIRET rc;
-
-  rc = DosSetMem(lpMemAddr, size, flags);
-  switch(rc) {
-        case ERROR_INVALID_ADDRESS:
-                return OSLIB_ERROR_INVALID_ADDRESS;
-        case ERROR_ACCESS_DENIED:
-                return OSLIB_ERROR_ACCESS_DENIED;
-        default:
-                return rc;
-  }
-}
-//******************************************************************************
-//******************************************************************************
+    APIRET rc;
+
+    rc = DosSetMem(lpMemAddr, size, flags);
+    switch(rc) {
+    case ERROR_INVALID_ADDRESS:
+        return OSLIB_ERROR_INVALID_ADDRESS;
+    case ERROR_ACCESS_DENIED:
+        return OSLIB_ERROR_ACCESS_DENIED;
+    default:
+        return rc;
+    }
+}
+//******************************************************************************
+//******************************************************************************