Changeset 4796 for trunk/src/kernel32/mmap.h

Timestamp:

Dec 13, 2000, 12:57:16 AM (25 years ago)

Author:

sandervl

Message:

GetVolumeInformation bugfix + invalid VirtualFree calls corrected + free named shared memory

File:

• trunk/src/kernel32/mmap.h (modified) (6 diffs)

trunk/src/kernel32/mmap.h

@@ -1 @@
-/* $Id: mmap.h,v 1.17 2000-10-18 17:09:33 sandervl Exp $ */
+/* $Id: mmap.h,v 1.18 2000-12-12 23:57:16 sandervl Exp $ */
 
 /*
@@ -17 +17 @@
 
 #ifndef PAGE_SIZE
-#define PAGE_SIZE       4096
+#define PAGE_SIZE       4096
 #endif
 #ifndef PAGE_SHIFT
-#define PAGE_SHIFT      12
+#define PAGE_SHIFT  12
 #endif
 
 //commit 4 pages at once when the app accesses it
-#define NRPAGES_TOCOMMIT        16
+#define NRPAGES_TOCOMMIT    16
 
-#define MEMMAP_ACCESS_READ      1
-#define MEMMAP_ACCESS_WRITE     2
-#define MEMMAP_ACCESS_EXECUTE   4
+#define MEMMAP_ACCESS_READ  1
+#define MEMMAP_ACCESS_WRITE 2
+#define MEMMAP_ACCESS_EXECUTE   4
 
 class Win32MemMapView;
@@ -73 +73 @@
 
 #ifdef __DEBUG_ALLOC__
-        void *operator new(size_t size, const char *filename, size_t lineno)
-        {
-                return _umalloc(sharedHeap, size);
-        }
-        void operator delete(void *location, const char *filename, size_t lineno)
-        {
-                free(location);
-        }
+    void *operator new(size_t size, const char *filename, size_t lineno)
+    {
+        return _umalloc(sharedHeap, size);
+    }
+    void operator delete(void *location, const char *filename, size_t lineno)
+    {
+        free(location);
+    }
 #else
-        void *operator new(size_t size)
-        {
-                return _umalloc(sharedHeap, size);
-        }
-        void operator delete(void *location)
-        {
-                free(location);
-        }
+    void *operator new(size_t size)
+    {
+        return _umalloc(sharedHeap, size);
+    }
+    void operator delete(void *location)
+    {
+        free(location);
+    }
 #endif
 
@@ -112 +112 @@
 private:
    static Win32MemMap *memmaps;
-          Win32MemMap *next;
+      Win32MemMap *next;
 };
 //******************************************************************************
@@ -138 +138 @@
 
 #ifdef __DEBUG_ALLOC__
-        void *operator new(size_t size, const char *filename, size_t lineno)
-        {
-                return _umalloc(sharedHeap, size);
-        }
-        void operator delete(void *location, const char *filename, size_t lineno)
-        {
-                free(location);
-        }
+    void *operator new(size_t size, const char *filename, size_t lineno)
+    {
+        return _umalloc(sharedHeap, size);
+    }
+    void operator delete(void *location, const char *filename, size_t lineno)
+    {
+        free(location);
+    }
 #else
-        void *operator new(size_t size)
-        {
-                return _umalloc(sharedHeap, size);
-        }
-        void operator delete(void *location)
-        {
-                free(location);
-        }
+    void *operator new(size_t size)
+    {
+        return _umalloc(sharedHeap, size);
+    }
+    void operator delete(void *location)
+    {
+        free(location);
+    }
 #endif
 
@@ -161 +161 @@
    ULONG  mProcessId;
    ULONG  mfAccess, mOffset;
-   void  *pMapView;
+   void  *pMapView, *pShareViewAddr;
 
    Win32MemMap *mParentMap;