Changeset 664 for trunk/src/kernel32/mmap.cpp

Timestamp:

Aug 24, 1999, 8:48:10 PM (26 years ago)

Author:

sandervl

Message:

Memory mapped file changes

File:

• trunk/src/kernel32/mmap.cpp (modified) (8 diffs)

trunk/src/kernel32/mmap.cpp

@@ -1 @@
-/* $Id: mmap.cpp,v 1.7 1999-08-24 12:23:54 sandervl Exp $ */
+/* $Id: mmap.cpp,v 1.8 1999-08-24 18:46:40 sandervl Exp $ */
 
 /*
@@ -36 +36 @@
 //******************************************************************************
 Win32MemMap::Win32MemMap(HFILE hfile, ULONG size, ULONG fdwProtect, LPSTR lpszName)
-               : fMapped(FALSE), pMapping(NULL), mMapAccess(0)
+               : fMapped(FALSE), pMapping(NULL), mMapAccess(0), referenced(0)
 {
   globalmapMutex.enter();
@@ -56 +56 @@
 //******************************************************************************
 //******************************************************************************
-HANDLE Win32MemMap::Init()
+BOOL Win32MemMap::Init(HANDLE hMemMap)
 {
   mapMutex.enter();
@@ -68 +68 @@
         }
   }
-  if(HMHandleAllocate(&hMemMap, (ULONG)this) != 0)
-  {
-        dprintf(("Win32MemMap::Init HMHandleAllocate failed!!"));
-        DebugInt3();
-        goto fail;
-  }
-  mapMutex.leave();
-  return hMemMap;
+  this->hMemMap = hMemMap;
+  mapMutex.leave();
+  return TRUE;
 fail:
   mapMutex.leave();
-  return 0;
+  return FALSE;
 }
 //******************************************************************************
@@ -84 +79 @@
 Win32MemMap::~Win32MemMap()
 {
-  unmapFileView();
+  unmapViewOfFile();
   if(lpszMapName) {
         free(lpszMapName);
@@ -120 +115 @@
 //******************************************************************************
 //******************************************************************************
-BOOL Win32MemMap::unmapFileView()
+BOOL Win32MemMap::unmapViewOfFile()
 {
   if(fMapped == FALSE)
@@ -137 +132 @@
 //******************************************************************************
 //******************************************************************************
-LPVOID Win32MemMap::mapFileView(ULONG size, ULONG offset, ULONG fdwAccess)
+LPVOID Win32MemMap::mapViewOfFile(ULONG size, ULONG offset, ULONG fdwAccess)
 {
   mapMutex.enter();
   ULONG memFlags = (mProtFlags & (PAGE_READONLY | PAGE_READWRITE | PAGE_WRITECOPY));
   ULONG fAlloc   = 0;
-
-  if(fdwAccess & FILE_MAP_WRITE && mProtFlags & (PAGE_READONLY|PAGE_WRITECOPY)) 
-        goto parmfail;
-  if(fdwAccess & FILE_MAP_READ && mProtFlags & PAGE_WRITECOPY) 
-        goto parmfail;
-  if(fdwAccess & FILE_MAP_ALL_ACCESS && mProtFlags & (PAGE_READONLY|PAGE_WRITECOPY)) 
-        goto parmfail;
-  if(fdwAccess & FILE_MAP_COPY && mProtFlags & PAGE_WRITECOPY) 
+  LPVOID mapview;
+
+  if(fdwAccess & (FILE_MAP_WRITE|FILE_MAP_ALL_ACCESS) && !(mProtFlags & PAGE_READWRITE)) 
+        goto parmfail;
+  if(fdwAccess & FILE_MAP_READ && !(mProtFlags & (PAGE_READWRITE|PAGE_READONLY))) 
+        goto parmfail;
+  if(fdwAccess & FILE_MAP_COPY && !(mProtFlags & PAGE_WRITECOPY)) 
         goto parmfail;
   
@@ -157 +151 @@
         fAlloc |= MEM_RESERVE;
 
-  pMapping = VirtualAlloc(0, mSize, fAlloc, memFlags);
-  if(pMapping == NULL) {
-        dprintf(("Win32MemMap::mapFileView: VirtualAlloc %x %x %x failed!", mSize, fAlloc, memFlags));
-        goto fail;
-  }
-  mapMutex.leave();
-  return pMapping;
+  if(fMapped == FALSE) {//if not mapped, reserve/commit entire view
+        pMapping = VirtualAlloc(0, mSize, fAlloc, mProtFlags);
+        if(pMapping == NULL) {
+                dprintf(("Win32MemMap::mapFileView: VirtualAlloc %x %x %x failed!", mSize, fAlloc, memFlags));
+                goto fail;
+        }
+        fMapped = TRUE;
+  }
+  mapview = (LPVOID)((ULONG)pMapping + offset);
+  mapMutex.leave();
+  return mapview;
 
 parmfail: