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

Timestamp:

Oct 27, 1999, 8:11:40 PM (26 years ago)

Author:

sandervl

Message:

WinExec rewrite + mmap bugfixes

File:

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

trunk/src/kernel32/mmap.cpp

@@ -1 @@
-/* $Id: mmap.cpp,v 1.19 1999-10-24 22:51:21 sandervl Exp $ */
+/* $Id: mmap.cpp,v 1.20 1999-10-27 18:11:39 sandervl Exp $ */
 
 /*
@@ -32 +32 @@
 //Global DLL Data
 #pragma data_seg(_GLOBALDATA)
-Win32MemMapView *Win32MemMapView::mapviews = NULL;
 Win32MemMap     *Win32MemMap::memmaps = NULL;
 VMutex           globalmapMutex(VMUTEX_SHARED);
-VMutex           globalviewMutex(VMUTEX_SHARED);
 #pragma data_seg()
+VMutex           globalviewMutex;
+Win32MemMapView *Win32MemMapView::mapviews = NULL;
 
 //******************************************************************************
@@ -95 +95 @@
   Win32MemMapView::deleteViews(this); //delete all views of our memory mapped file
 
+  dprintf(("Win32MemMap dtor: deleting view %x %x", pMapping, mSize));
+
   mapMutex.enter();
   if(lpszMapName) {
@@ -404 +406 @@
   }
   globalmapMutex.leave();
-  dprintf(("Win32MemMap::findMap: couldn't find map %s", lpszName));
+  if(!map) dprintf(("Win32MemMap::findMap: couldn't find map %s", lpszName));
   return map;
 }
@@ -517 +519 @@
         return;
 
+  dprintf(("Win32MemMapView dtor: deleting view %x %x", mOffset, mSize));
+
   if(mfAccess != MEMMAP_ACCESS_READ)
         mParentMap->flushView(mOffset, mSize);
@@ -545 +549 @@
 void Win32MemMapView::deleteViews(Win32MemMap *map)
 {
-  DWORD processId = GetCurrentProcess();
-
   globalviewMutex.enter();
   Win32MemMapView *view = mapviews, *nextview;
@@ -553 +555 @@
         while(view) {
                 nextview = view->next;
-                if(view->getParentMap() == map && view->getProcessId() == processId)
+                if(view->getParentMap() == map)
                 {
                         globalviewMutex.leave();
@@ -578 +580 @@
         while(view && (ULONG)view->getViewAddr() <= address) {
                 if((ULONG)view->getViewAddr() <= address &&
-                   (ULONG)view->getViewAddr() + view->getSize() >= address &&
+                   (ULONG)view->getViewAddr() + view->getSize() > address &&
                    view->getAccessFlags() >= accessType)
                 {
@@ -590 +592 @@
   }
 success:
+  if(view)
+        dprintf(("findMapByView %x %x -> %x off %x", address, accessType, view->getViewAddr(), *offset));
+
   globalviewMutex.leave();
   if(pView) *pView = view;