Changeset 690 for trunk/src/kernel32/hmmmap.cpp

Timestamp:

Aug 25, 1999, 4:27:07 PM (26 years ago)

Author:

sandervl

Message:

handle manager changes for DuplicateHandle + memory mapped file changes/bugfixes

File:

• trunk/src/kernel32/hmmmap.cpp (modified) (5 diffs)

trunk/src/kernel32/hmmmap.cpp

@@ -1 @@
-/* $Id: hmmmap.cpp,v 1.4 1999-08-25 10:28:40 sandervl Exp $ */
+/* $Id: hmmmap.cpp,v 1.5 1999-08-25 14:27:06 sandervl Exp $ */
 
 /*
@@ -57 +57 @@
 
   if((hFile == -1 && size_low == 0) || size_high ||
-     protect & (PAGE_READONLY|PAGE_READWRITE|PAGE_WRITECOPY|SEC_COMMIT|SEC_IMAGE|SEC_RESERVE|SEC_NOCACHE) ||
+     protect & ~(PAGE_READONLY|PAGE_READWRITE|PAGE_WRITECOPY|SEC_COMMIT|SEC_IMAGE|SEC_RESERVE|SEC_NOCACHE) ||
      (protect & (PAGE_READONLY|PAGE_READWRITE|PAGE_WRITECOPY)) == 0 ||
      (hFile == -1 && (protect & SEC_COMMIT)) ||
@@ -64 +64 @@
 
         dprintf(("CreateFileMappingA: invalid parameter (combination)!"));
-        SetLastError(ERROR_INVALID_PARAMETER);
-        return 0;       
+        return ERROR_INVALID_PARAMETER;
   }
 
@@ -79 +78 @@
   }
   map->AddRef();
-  pHMHandleData->dwUserData = (ULONG)this;
+  pHMHandleData->dwUserData = (ULONG)map;
   pHMHandleData->dwInternalType = HMTYPE_MEMMAP;
   return NO_ERROR;
@@ -118 +117 @@
   }
   map->AddRef();
-  pHMHandleData->dwUserData = (ULONG)this;
+  pHMHandleData->dwUserData = (ULONG)map;
   pHMHandleData->dwInternalType = HMTYPE_MEMMAP;
   return NO_ERROR;