Changeset 2001 for trunk/src

Timestamp:

Dec 6, 1999, 10:31:43 PM (26 years ago)

Author:

sandervl

Message:

Memory map fixes

Location:

trunk/src/kernel32

Files:

• mmap.cpp (modified) (3 diffs)
• virtual.cpp (modified) (3 diffs)
• windllbase.cpp (modified) (2 diffs)

trunk/src/kernel32/mmap.cpp

@@ -1 @@
-/* $Id: mmap.cpp,v 1.23 1999-11-22 20:35:50 sandervl Exp $ */
+/* $Id: mmap.cpp,v 1.24 1999-12-06 21:31:43 sandervl Exp $ */
 
 /*
@@ -512 +512 @@
         mfAccess   = MEMMAP_ACCESS_READ;
         break;
+  case FILE_MAP_ALL_ACCESS:
   case FILE_MAP_WRITE:
   case FILE_MAP_COPY:
         accessAttr = (PAG_READ|PAG_WRITE);
-        mfAccess   = MEMMAP_ACCESS_WRITE;
+        mfAccess   = MEMMAP_ACCESS_READ | MEMMAP_ACCESS_WRITE;
         break;
   }
@@ -569 +570 @@
   dprintf(("Win32MemMapView dtor: deleting view %x %x", mOffset, mSize));
 
-  if(mfAccess != MEMMAP_ACCESS_READ)
+  if(mfAccess & MEMMAP_ACCESS_WRITE)
         mParentMap->flushView(mOffset, mSize);
 

trunk/src/kernel32/virtual.cpp

@@ -1 @@
-/* $Id: virtual.cpp,v 1.24 1999-11-30 14:15:55 sandervl Exp $ */
+/* $Id: virtual.cpp,v 1.25 1999-12-06 21:31:43 sandervl Exp $ */
 
 /*
@@ -311 +311 @@
   {
    Win32MemMap *map;
-   ULONG offset, nrpages;
+   ULONG offset, nrpages, accessflags = 0;
 
         nrpages = cbSize >> PAGE_SHIFT;
@@ -317 +317 @@
                 nrpages++;
 
-        map = Win32MemMapView::findMapByView((ULONG)lpvAddress, &offset, fdwProtect);
+        if(flag & PAG_READ) {
+                accessflags |= MEMMAP_ACCESS_READ;
+        }
+        if(flag & PAG_WRITE) {
+                accessflags |= MEMMAP_ACCESS_WRITE;
+        }
+        if(flag & PAG_EXECUTE) {
+                accessflags |= MEMMAP_ACCESS_EXECUTE;
+        }
+        map = Win32MemMapView::findMapByView((ULONG)lpvAddress, &offset, accessflags);
         if(map) {
                 //TODO: We don't allow protection flag changes for mmaped files now

trunk/src/kernel32/windllbase.cpp

@@ -1 @@
-/* $Id: windllbase.cpp,v 1.5 1999-11-22 20:35:52 sandervl Exp $ */
+/* $Id: windllbase.cpp,v 1.6 1999-12-06 21:31:43 sandervl Exp $ */
 
 /*
@@ -287 +287 @@
         ODIN_PROFILE_SetOdinIniString(DLLRENAMEOS2_SECTION, "OLE32OS2", "OLE32");
   }
+  if(ODIN_PROFILE_GetOdinIniString(DLLRENAMEWIN_SECTION, "OLEAUT32", "", renameddll, 
+                                   sizeof(renameddll)-1) <= 1) 
+  {
+        ODIN_PROFILE_SetOdinIniString(DLLRENAMEWIN_SECTION, "OLEAUT32", "OLAUTOS2");
+        ODIN_PROFILE_SetOdinIniString(DLLRENAMEOS2_SECTION, "OLAUTOS2", "OLEAUT32");
+  }
   if(ODIN_PROFILE_GetOdinIniString(DLLRENAMEWIN_SECTION, "NETAPI32", "", renameddll, 
                                    sizeof(renameddll)-1) <= 1)