Changeset 21916 for trunk/src/kernel32/mmapview.cpp

Timestamp:

Dec 18, 2011, 10:28:22 PM (14 years ago)

Author:

dmik

Message:

Merge branch gcc-kmk to trunk.

Location:

trunk

Files:

• . (modified) (2 props)
• src/kernel32/mmapview.cpp (modified) (16 diffs)

trunk

@@ -1 @@
-bin
-Makefile.inc
+env.cmd
+LocalConfig.kmk

@@ -1 @@
-bin
-Makefile.inc
+env.cmd
+LocalConfig.kmk

trunk/src/kernel32/mmapview.cpp

@@ -28 +28 @@
 #include <stdlib.h>
 #include <string.h>
-#include <win\virtual.h>
+#include <win/virtual.h>
 #include <odincrt.h>
 #include <handlemanager.h>
@@ -34 +34 @@
 #include "oslibdos.h"
 #include "oslibmem.h"
-#include <winimagepeldr.h>
-#include <custombuild.h> 
+#include "winimagepeldr.h"
+#include <custombuild.h>
 
 #define DBG_LOCALLOG    DBG_mmapview
@@ -51 +51 @@
 //
 //******************************************************************************
-Win32MemMapView::Win32MemMapView(Win32MemMap *map, ULONG offset, ULONG size, 
+Win32MemMapView::Win32MemMapView(Win32MemMap *map, ULONG offset, ULONG size,
                                  ULONG fdwAccess, Win32MemMap *owner)
 {
@@ -87 +87 @@
     {
         //shared memory map, so map it into our address space
-        if(OSLibDosGetNamedSharedMem((LPVOID *)&viewaddr, map->getMemName()) != OSLIB_NOERROR) 
+        if(OSLibDosGetNamedSharedMem((LPVOID *)&viewaddr, map->getMemName()) != OSLIB_NOERROR)
         {
             dprintf(("new OSLibDosGetNamedSharedMem FAILED"));
@@ -104 +104 @@
     }
     else {
-        if(mfAccess & MEMMAP_ACCESS_COPYONWRITE) 
+        if(mfAccess & MEMMAP_ACCESS_COPYONWRITE)
         {
             //A copy on write view is a private copy of the memory map
@@ -118 +118 @@
         }
         }
-        else 
+        else
         if(OSLibDosAliasMem(viewaddr, size, &pMapView, accessAttr) != OSLIB_NOERROR) {
             dprintf(("new OSLibDosAliasMem FAILED"));
@@ -126 +126 @@
         }
     }
-    //Allocate bitmap for all pages of a COW view to track which pages are 
+    //Allocate bitmap for all pages of a COW view to track which pages are
     //shared and which are private (copy on write -> private page)
-    if(fdwAccess == FILE_MAP_COPY) 
+    if(fdwAccess == FILE_MAP_COPY)
     {
         DWORD nrPages = mSize >> PAGE_SHIFT;
@@ -242 +242 @@
     viewpagestart = mOffset >> PAGE_SHIFT;
     nrviewpages = mSize >> PAGE_SHIFT;
-    if(mSize & 0xFFF) 
+    if(mSize & 0xFFF)
         nrviewpages++;
 
@@ -248 +248 @@
         return; //outside this view
     }
-    if(startpage + nrpages > viewpagestart + nrviewpages) {  
+    if(startpage + nrpages > viewpagestart + nrviewpages) {
         nrpages -= ((startpage + nrpages) - (viewpagestart + nrviewpages));
     }
@@ -286 +286 @@
     }
 
-    if( ( (mfAccess & MEMMAP_ACCESS_COPYONWRITE) && (flags != PAGEVIEW_GUARD)  ) || 
-        ( (flags == PAGEVIEW_GUARD) && !(mfAccess & MEMMAP_ACCESS_COPYONWRITE) ) ) 
+    if( ( (mfAccess & MEMMAP_ACCESS_COPYONWRITE) && (flags != PAGEVIEW_GUARD)  ) ||
+        ( (flags == PAGEVIEW_GUARD) && !(mfAccess & MEMMAP_ACCESS_COPYONWRITE) ) )
     {
         //PAGEVIEW_GUARD only applies to COW views
         //PAGEVIEW_VIEW/READONLY does not apply to COW views
-        return TRUE; 
+        return TRUE;
     }
     if(mOffset + mSize <= offset || mOffset >= offset + size) {
@@ -320 +320 @@
     }
 
-    if(flags == PAGEVIEW_GUARD || (mfAccess & MEMMAP_ACCESS_COPYONWRITE)) 
+    if(flags == PAGEVIEW_GUARD || (mfAccess & MEMMAP_ACCESS_COPYONWRITE))
     {
         DWORD startpage = (offset - mOffset) >> PAGE_SHIFT;
@@ -330 +330 @@
         //of the COW pages, then only the shared pages must be changed.
         //So check each page if it is still shared.
-        for(int i=startpage;i<startpage+nrPages;i++) 
+        for(int i=startpage;i<startpage+nrPages;i++)
     {
-            if(!isCOWPage(i)) 
+            if(!isCOWPage(i))
             {//page is still shared, so set the guard flag
                 rc = OSLibDosSetMem((char *)pMapView+(offset - mOffset), PAGE_SIZE, accessAttr);
@@ -354 +354 @@
 //******************************************************************************
 //******************************************************************************
-int Win32MemMapView::findViews(Win32MemMap *map, int nrViews, 
+int Win32MemMapView::findViews(Win32MemMap *map, int nrViews,
                                Win32MemMapView *viewarray[])
 {
@@ -362 +362 @@
   Win32MemMapView *view = mapviews, *nextview;
 
-  if(view != NULL) 
+  if(view != NULL)
   {
-      while(view && i < nrViews) 
+      while(view && i < nrViews)
       {
           if(view->getParentMap() == map)
@@ -384 +384 @@
   Win32MemMapView *view = mapviews, *nextview;
 
-  if(view != NULL) 
+  if(view != NULL)
   {
-      while(view) 
+      while(view)
       {
           nextview = view->next;
@@ -404 +404 @@
 // Win32MemMap::findMapByView
 //
-// Find the map of the view that contains the specified starting address 
+// Find the map of the view that contains the specified starting address
 // and has the specified access type
 //

@@ -1 @@
-bin
-Makefile.inc
+env.cmd
+LocalConfig.kmk