Changeset 678 for trunk/src/kernel32/virtual.cpp

Timestamp:

Aug 25, 1999, 12:28:41 PM (26 years ago)

Author:

sandervl

Message:

Put back handlemanager changes + memory mapped file changes

File:

• trunk/src/kernel32/virtual.cpp (modified) (14 diffs)

trunk/src/kernel32/virtual.cpp

@@ -1 @@
-/* $Id: virtual.cpp,v 1.3 1999-08-25 08:55:19 phaller Exp $ */
+/* $Id: virtual.cpp,v 1.4 1999-08-25 10:28:41 sandervl Exp $ */
 
 /*
@@ -19 +19 @@
 #include <win\virtual.h>
 #include <heapstring.h>
-#include "mmap.h"
 #include <handlemanager.h>
 
@@ -39 +38 @@
                 LPCSTR name      /* [in] Name of file-mapping object */ )
 {
-  return HMCreateFileMapping(hFile, sa, protect, size_high, size_low, name);
+   return HMCreateFileMapping(hFile, sa, protect, size_high, size_low, name);
 }
 
@@ -47 +46 @@
  * See CreateFileMapping32A
  */
-HANDLE WINAPI CreateFileMappingW( HFILE hFile, LPSECURITY_ATTRIBUTES attr,
-                                      DWORD protect, DWORD size_high,
+HANDLE WINAPI CreateFileMappingW( HFILE hFile, LPSECURITY_ATTRIBUTES attr, 
+                                      DWORD protect, DWORD size_high,  
                                       DWORD size_low, LPCWSTR name )
 {
@@ -72 +71 @@
                 LPCSTR name )   /* [in] Name of file-mapping object */
 {
-  return (HMOpenFileMapping(access, inherit, name));
+    dprintf(("OpenFileMappingA: %x %d %s", access, inherit, name));
+    return HMOpenFileMapping(access, inherit, name);
 }
 
@@ -103 +103 @@
               DWORD offset_low,  /* [in] Low-order 32 bits of file offset */
               DWORD count        /* [in] Number of bytes to map */
-)
-{
-  return HMMapViewOfFile( mapping, access, offset_high,
-                          offset_low, count);
+) 
+{
+    return MapViewOfFileEx( mapping, access, offset_high,
+                            offset_low, count, NULL );
 }
 
@@ -125 +125 @@
               DWORD count,       /* [in] Number of bytes to map */
               LPVOID addr        /* [in] Suggested starting address for mapped view */
-)
-{
-  return HMMapViewOfFileEx( handle, access, offset_high,
-                            offset_low, count, addr);
+) 
+{
+  return HMMapViewOfFileEx(handle, access, offset_high, offset_low, count, addr);
 }
 
@@ -143 +142 @@
               LPCVOID base, /* [in] Start address of byte range to flush */
               DWORD cbFlush /* [in] Number of bytes in range */
-)
-{
-  return HMFlushViewOfFile( (LPVOID)base, cbFlush);
+) 
+{
+    dprintf(("FlushViewOfFile: NOT IMPLEMENTED"));
+    return TRUE;
 }
 
@@ -161 +161 @@
  */
 BOOL WINAPI UnmapViewOfFile(LPVOID addr /* [in] Address where mapped view begins */
-)
-{
-  return HMUnmapViewOfFile( addr );
-}
-
+) 
+{
+    if (!addr)
+    {
+        SetLastError( ERROR_INVALID_PARAMETER );
+        return FALSE;
+    }
+    return TRUE;
+}
 
 /***********************************************************************
@@ -171 +175 @@
  *
  * Helper function to map a file to memory:
- *  name                        -       file name
+ *  name                        -       file name 
  *  [RETURN] ptr                -       pointer to mapped file
  */
@@ -179 +183 @@
     LPVOID ptr = NULL;
 
-    hFile = CreateFileW( name, GENERIC_READ, FILE_SHARE_READ, NULL,
+    hFile = CreateFileW( name, GENERIC_READ, FILE_SHARE_READ, NULL, 
                            OPEN_EXISTING, FILE_FLAG_RANDOM_ACCESS, 0);
     if (hFile != INVALID_HANDLE_VALUE)
@@ -198 +202 @@
  *
  * Helper function to map a file to memory:
- *  name                        -       file name
+ *  name                        -       file name 
  *  [RETURN] ptr                -       pointer to mapped file
  */
@@ -206 +210 @@
     LPVOID ptr = NULL;
 
-    hFile = CreateFileA(name, GENERIC_READ, FILE_SHARE_READ, NULL,
+    hFile = CreateFileA(name, GENERIC_READ, FILE_SHARE_READ, NULL, 
                         OPEN_EXISTING, FILE_FLAG_RANDOM_ACCESS, 0);
     if (hFile != INVALID_HANDLE_VALUE)
@@ -220 +224 @@
     return ptr;
 }
-