Changeset 684 for trunk/src

Timestamp:

Aug 25, 1999, 1:40:18 PM (26 years ago)

Author:

sandervl

Message:

Memory mapping changes

Location:

trunk/src/kernel32

Files:

• makefile (modified) (2 diffs)
• mmap.cpp (modified) (4 diffs)
• virtual.cpp (modified) (5 diffs)

trunk/src/kernel32/makefile

@@ -1 @@
-# $Id: makefile,v 1.30 1999-08-25 10:28:40 sandervl Exp $
+# $Id: makefile,v 1.31 1999-08-25 11:40:18 sandervl Exp $
 
 #
@@ -305 +305 @@
         $(PDWIN32_INCLUDE)\unicode.h
 
-virtual.obj:   virtual.cpp $(PDWIN32_INCLUDE)\win\virtual.h $(PDWIN32_INCLUDE)\handlemanager.h
+virtual.obj:   virtual.cpp $(PDWIN32_INCLUDE)\win\virtual.h $(PDWIN32_INCLUDE)\handlemanager.h mmap.h
 mmap.obj:      mmap.cpp mmap.h $(PDWIN32_INCLUDE)\vmutex.h
 

trunk/src/kernel32/mmap.cpp

@@ -1 @@
-/* $Id: mmap.cpp,v 1.9 1999-08-25 10:28:40 sandervl Exp $ */
+/* $Id: mmap.cpp,v 1.10 1999-08-25 11:40:18 sandervl Exp $ */
 
 /*
@@ -254 +254 @@
         goto parmfail;
 
+  if(cbFlush == 0) 
+        cbFlush = mSize;
+
   if(lpvBase < pMapping || (ULONG)lpvBase+cbFlush > (ULONG)pMapping+mSize)
         goto parmfail;
@@ -259 +262 @@
   if(mProtFlags & PAGE_READONLY)
         goto parmfail;
+
+  if(hMemFile == -1)
+        goto success; //TODO: Return an error here?
 
   nrpages = cbFlush/PAGE_SIZE;
@@ -293 +299 @@
         }
   }
+success:
 //  mapMutex.leave();
   return TRUE;

trunk/src/kernel32/virtual.cpp

@@ -1 @@
-/* $Id: virtual.cpp,v 1.4 1999-08-25 10:28:41 sandervl Exp $ */
+/* $Id: virtual.cpp,v 1.5 1999-08-25 11:40:18 sandervl Exp $ */
 
 /*
@@ -20 +20 @@
 #include <heapstring.h>
 #include <handlemanager.h>
+#include "mmap.h"
 
 /***********************************************************************
@@ -144 +145 @@
 ) 
 {
-    dprintf(("FlushViewOfFile: NOT IMPLEMENTED"));
-    return TRUE;
+ Win32MemMap *map;
+
+    if (!base)
+    {
+        SetLastError( ERROR_INVALID_PARAMETER );
+        return FALSE;
+    }
+    map = Win32MemMap::findMap((ULONG)base);
+    if(map == NULL) {
+        SetLastError( ERROR_FILE_NOT_FOUND );
+        return FALSE;
+    }
+    return map->flushView((LPVOID)base, cbFlush);
 }
 
@@ -163 +175 @@
 ) 
 {
+ Win32MemMap *map;
+
     if (!addr)
     {
@@ -168 +182 @@
         return FALSE;
     }
-    return TRUE;
+    map = Win32MemMap::findMap((ULONG)addr);
+    if(map == NULL) {
+        SetLastError( ERROR_FILE_NOT_FOUND );
+        return FALSE;
+    }
+    return map->unmapViewOfFile();
 }