Changeset 1687 for trunk/src

Timestamp:

Nov 10, 1999, 3:16:01 PM (26 years ago)

Author:

sandervl

Message:

VirtualAlloc fixes & changes

Location:

trunk/src/kernel32

Files:

• mmap.cpp (modified) (4 diffs)
• mmap.h (modified) (2 diffs)
• oslibdos.cpp (modified) (2 diffs)
• virtual.cpp (modified) (3 diffs)
• wprocess.cpp (modified) (2 diffs)

trunk/src/kernel32/mmap.cpp

@@ -1 @@
-/* $Id: mmap.cpp,v 1.21 1999-11-08 20:53:24 sandervl Exp $ */
+/* $Id: mmap.cpp,v 1.22 1999-11-10 14:16:01 sandervl Exp $ */
 
 /*
@@ -145 +145 @@
 //(all pages are readonly until the app tries to write to it)
 //******************************************************************************
-BOOL Win32MemMap::commitPage(ULONG offset, BOOL fWriteAccess)
+BOOL Win32MemMap::commitPage(ULONG offset, BOOL fWriteAccess, int nrpages)
 {
  MEMORY_BASIC_INFORMATION memInfo;
@@ -158 +158 @@
   dprintf(("Win32MemMap::commitPage %x (faultaddr %x)", pageAddr, lpPageFaultAddr));
   if(hMemFile != -1) {
-        if(VirtualQuery((LPSTR)pageAddr, &memInfo, NRPAGES_TOCOMMIT*PAGE_SIZE) == 0) {
-                dprintf(("Win32MemMap::commitPage: VirtualQuery (%x,%x) failed for %x", pageAddr, NRPAGES_TOCOMMIT*PAGE_SIZE));
+        if(VirtualQuery((LPSTR)pageAddr, &memInfo, nrpages*PAGE_SIZE) == 0) {
+                dprintf(("Win32MemMap::commitPage: VirtualQuery (%x,%x) failed for %x", pageAddr, nrpages*PAGE_SIZE));
                 goto fail;
         }
@@ -207 +207 @@
   }
   else {
-        if(VirtualQuery((LPSTR)pageAddr, &memInfo, NRPAGES_TOCOMMIT*PAGE_SIZE) == 0) {
-                dprintf(("Win32MemMap::commitPage: VirtualQuery (%x,%x) failed for %x", pageAddr, NRPAGES_TOCOMMIT*PAGE_SIZE));
+        if(VirtualQuery((LPSTR)pageAddr, &memInfo, nrpages*PAGE_SIZE) == 0) {
+                dprintf(("Win32MemMap::commitPage: VirtualQuery (%x,%x) failed for %x", pageAddr, nrpages*PAGE_SIZE));
                 goto fail;
         }

trunk/src/kernel32/mmap.h

@@ -1 @@
-/* $Id: mmap.h,v 1.10 1999-10-24 22:51:22 sandervl Exp $ */
+/* $Id: mmap.h,v 1.11 1999-11-10 14:16:01 sandervl Exp $ */
 
 /*
@@ -51 +51 @@
    void   Release()                      { if(--referenced == 0) delete this; };
 
-   BOOL   commitPage(ULONG offset, BOOL fWriteAccess);
+   BOOL   commitPage(ULONG offset, BOOL fWriteAccess, int nrpages = NRPAGES_TOCOMMIT);
 
 static Win32MemMap *findMap(LPSTR lpszName);

trunk/src/kernel32/oslibdos.cpp

@@ -1 @@
-/* $Id: oslibdos.cpp,v 1.6 1999-11-08 13:43:12 sandervl Exp $ */
+/* $Id: oslibdos.cpp,v 1.7 1999-11-10 14:16:01 sandervl Exp $ */
 
 /*
@@ -32 +32 @@
 }
 //******************************************************************************
+//NT returns addresses aligned at 64k, so we do too.
 //******************************************************************************
 DWORD OSLibDosAllocMem(LPVOID *lplpMemAddr, DWORD size, DWORD flags)
 {
-  return DosAllocMem(lplpMemAddr, size, flags | flAllocMem);
+ LPVOID memaddr;
+ DWORD  offset;
+ APIRET rc;
+
+  rc = DosAllocMem(&memaddr, size, PAG_READ | flAllocMem);
+  if(rc) {
+        return rc;
+  }
+  DosEnterCritSec();
+  DosFreeMem(memaddr);
+  offset = (DWORD)memaddr & 0xFFFF;
+  if(offset) {
+        DosAllocMem(&memaddr, 64*1024 - offset, PAG_READ | flAllocMem);
+  }
+  rc = DosAllocMem(lplpMemAddr, size, flags | flAllocMem);
+  DosExitCritSec();
+  if((DWORD)*lplpMemAddr & 0xFFFF) {//still not at 64k boundary?
+        DosFreeMem(*lplpMemAddr);
+        rc = OSLibDosAllocMem(lplpMemAddr, size, flags);
+  }
+  if(offset) {
+        DosFreeMem(memaddr);
+  }
+
+  return rc;
 }
 //******************************************************************************

trunk/src/kernel32/virtual.cpp

@@ -1 @@
-/* $Id: virtual.cpp,v 1.21 1999-10-24 22:51:22 sandervl Exp $ */
+/* $Id: virtual.cpp,v 1.22 1999-11-10 14:16:01 sandervl Exp $ */
 
 /*
@@ -31 +31 @@
 ODINDEBUGCHANNEL(KERNEL32-VIRTUAL)
 
+#define PAGE_SHIFT 12
 
 /***********************************************************************
@@ -305 +306 @@
     dprintf(("VirtualAlloc: Unknown protection flags, default to read/write"));
     flag |= PAG_READ | PAG_WRITE;
+  }
+
+  if(lpvAddress) 
+  {
+   Win32MemMap *map;
+   ULONG offset, nrpages;
+
+        nrpages = cbSize >> PAGE_SHIFT;
+        if(cbSize & 0xFFF)
+                nrpages++;
+
+        map = Win32MemMapView::findMapByView((ULONG)lpvAddress, &offset, fdwProtect);
+        if(map) {
+                //TODO: We don't allow protection flag changes for mmaped files now
+                map->commitPage(offset, FALSE, nrpages);
+                return lpvAddress;
+        }
   }
 

trunk/src/kernel32/wprocess.cpp

@@ -1 @@
-/* $Id: wprocess.cpp,v 1.46 1999-11-09 19:22:33 sandervl Exp $ */
+/* $Id: wprocess.cpp,v 1.47 1999-11-10 14:16:01 sandervl Exp $ */
 
 /*
@@ -699 +699 @@
   }
   proc = O32_GetProcAddress(hModule, lpszProc);
-  dprintf(("KERNEL32:  GetProcAddress %s from %X returned %X\n", lpszProc, hModule, proc));
+  if(HIWORD(lpszProc)) 
+        dprintf(("KERNEL32:  GetProcAddress %s from %X returned %X\n", lpszProc, hModule, proc));
+  else  dprintf(("KERNEL32:  GetProcAddress %x from %X returned %X\n", lpszProc, hModule, proc));
   return(proc);
 }