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

Timestamp:

Aug 24, 1999, 2:23:54 PM (26 years ago)

Author:

sandervl

Message:

VirtualQuery implemented + preliminary memory mapped code

File:

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

trunk/src/kernel32/virtual.cpp

@@ -1 @@
-/* $Id: virtual.cpp,v 1.1 1999-08-21 16:30:31 sandervl Exp $ */
+/* $Id: virtual.cpp,v 1.2 1999-08-24 12:23:25 sandervl Exp $ */
 
 /*
  * Win32 virtual memory functions
  *
- * Copyright 1998 Sander van Leeuwen (sandervl@xs4all.nl) (OS/2 Port)
- *
- * NOTE: Quick 'n dirty implementation (read entire file in memory)
- *       Not tested, nor complete (write mapping & protection)
- *
- * Based on Wine code (memory\virtual.c):
+ * Copyright 1999 Sander van Leeuwen (sandervl@xs4all.nl)
+ *
+ * Parts (VIRTUAL_MapFileA/W) based on Wine code (memory\virtual.c):
  *
  * Copyright 1997 Alexandre Julliard
@@ -22 +19 @@
 #include <win\virtual.h>
 #include <heapstring.h>
-
+#include "mmap.h"
 
 /***********************************************************************
@@ -43 +40 @@
  HANDLE dupHandle;
 
-     if(DuplicateHandle(GetCurrentProcess(), hFile, GetCurrentProcess(),
+   if((hFile == -1 && size_low == 0) || size_high ||
+       protect & (PAGE_READONLY|PAGE_READWRITE|PAGE_WRITECOPY|SEC_COMMIT|SEC_IMAGE|SEC_RESERVE|SEC_NOCACHE) ||
+       ((protect & SEC_COMMIT) && (protect & SEC_RESERVE))) 
+   {
+
+        dprintf(("CreateFileMappingA: invalid parameter (combination)!"));
+        SetLastError(ERROR_INVALID_PARAMETER);
+        return 0;       
+   }
+   if(DuplicateHandle(GetCurrentProcess(), hFile, GetCurrentProcess(),
                         &dupHandle, 0, FALSE, DUPLICATE_SAME_ACCESS) == FALSE) 
-     {
-                dprintf(("CreateFileMappingA: DuplicateHandle failed!"));
-                return 0;
-     }
-     return     dupHandle;
+   {
+        dprintf(("CreateFileMappingA: DuplicateHandle failed!"));
+        return 0;
+   }
+   return dupHandle;
 }
 
@@ -239 +245 @@
     LPVOID ptr = NULL;
 
-    hFile = CreateFileA( name, GENERIC_READ, FILE_SHARE_READ, NULL, 
-                           OPEN_EXISTING, FILE_FLAG_RANDOM_ACCESS, 0);
+    hFile = CreateFileA(name, GENERIC_READ, FILE_SHARE_READ, NULL, 
+                        OPEN_EXISTING, FILE_FLAG_RANDOM_ACCESS, 0);
     if (hFile != INVALID_HANDLE_VALUE)
     {