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

Timestamp:

Aug 6, 2001, 6:01:11 PM (24 years ago)

Author:

sandervl

Message:

CreateProcess & memory map fixes

File:

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

trunk/src/kernel32/mmap.cpp

@@ -1 @@
-/* $Id: mmap.cpp,v 1.51 2001-05-28 11:26:06 phaller Exp $ */
+/* $Id: mmap.cpp,v 1.52 2001-08-06 16:01:11 sandervl Exp $ */
 
 /*
@@ -66 +66 @@
     mSize      = size;
     mProtFlags = fdwProtect;
-    mProcessId  = GetCurrentProcess();
+    mProcessId  = GetCurrentProcessId();
 
     if(lpszName) {
@@ -89 +89 @@
     mSize      = size;
     mProtFlags = PAGE_READWRITE;
-    mProcessId = GetCurrentProcess();
+    mProcessId = GetCurrentProcessId();
 
     pMapping   = (LPVOID)baseAddress;
@@ -104 +104 @@
     {
 #if 0
-        if(DuplicateHandle(mProcessId, hMemFile, GetCurrentProcess(),
+        if(DuplicateHandle(GetCurrentProcess(), hMemFile, GetCurrentProcess(),
                            &hMemFile, 0, FALSE, DUPLICATE_SAME_ACCESS) == FALSE)
 #else
@@ -114 +114 @@
         else    dwOdinOptions = DUPLICATE_ACCESS_READWRITE | DUPLICATE_SHARE_DENYNONE;
 
-        if(HMDuplicateHandleOdin(mProcessId, hMemFile, GetCurrentProcess(),
+        if(HMDuplicateHandleOdin(GetCurrentProcess(), hMemFile, GetCurrentProcess(),
                            &hMemFile, 0, FALSE, DUPLICATE_SAME_ACCESS, dwOdinOptions) == FALSE)
 #endif
@@ -194 +194 @@
 void Win32MemMap::Release()
 {
-#ifdef DEBUG
     dprintf(("Win32MemMap::Release %s (%d)", lpszMapName, referenced-1));
-#endif
     --referenced;
     if(nrMappings == 0 && referenced == 0) {
@@ -337 +335 @@
 LPVOID Win32MemMap::mapViewOfFile(ULONG size, ULONG offset, ULONG fdwAccess)
 {
- DWORD processId = GetCurrentProcess();
+ DWORD processId = GetCurrentProcessId();
 
     mapMutex.enter();
@@ -551 +549 @@
 {
  Win32MemMap *map = memmaps, *nextmap;
- DWORD processId = GetCurrentProcess();
+ DWORD processId = GetCurrentProcessId();
 
   //delete all maps created by this process
@@ -587 +585 @@
     mSize    = size;
     mOffset  = offset;
-    mProcessId = GetCurrentProcess();
+    mProcessId = GetCurrentProcessId();
     pShareViewAddr = NULL;