Changeset 11301

Timestamp:

Aug 25, 1999, 2:30:48 PM (26 years ago)

Author:

sandervl

Message:

Memory mapping changes

Location:

tags/trunk/src/kernel32

Files:

• kernel32.def (modified) (2 diffs)
• kernel32exp.def (modified) (2 diffs)
• makefile (modified) (2 diffs)
• virtual.cpp (modified) (5 diffs)

tags/trunk/src/kernel32/kernel32.def ¶

@@ -1 @@
-; $Id: kernel32.def,v 1.28 1999-08-23 13:54:43 sandervl Exp $
+; $Id: kernel32.def,v 1.29 1999-08-25 12:30:47 sandervl Exp $
 
 ;Created by BLAST for IBM's compiler
@@ -1004 +1004 @@
     HEAP_strdupW               = _HEAP_strdupW@12                 @1248
 
-    VIRTUAL_MapFileA           = _VIRTUAL_MapFileA@4              @1249
-    VIRTUAL_MapFileW           = _VIRTUAL_MapFileW@4              @1250
+    VIRTUAL_MapFileA           = _VIRTUAL_MapFileA@8              @1249
+    VIRTUAL_MapFileW           = _VIRTUAL_MapFileW@8              @1250

tags/trunk/src/kernel32/kernel32exp.def ¶

@@ -1 @@
-; $Id: kernel32exp.def,v 1.14 1999-08-22 22:11:22 sandervl Exp $
+; $Id: kernel32exp.def,v 1.15 1999-08-25 12:30:47 sandervl Exp $
 
 ;Created by BLAST for IBM's compiler
@@ -849 +849 @@
    _CreateWin32Exe@4                       @1236
 
-_VIRTUAL_MapFileA@4              @1249
-_VIRTUAL_MapFileW@4              @1250
+_VIRTUAL_MapFileA@8              @1249
+_VIRTUAL_MapFileW@8              @1250
 
 ; HEAP Management (heap.cpp, heapstring.cpp)

tags/trunk/src/kernel32/makefile ¶

@@ -1 @@
-# $Id: makefile,v 1.31 1999-08-25 11:40:18 sandervl Exp $
+# $Id: makefile,v 1.32 1999-08-25 12:30:48 sandervl Exp $
 
 #
@@ -309 +309 @@
 
 pefile.OBJ:    pefile.cpp $(PDWIN32_INCLUDE)\pefile.h
-winimage.OBJ:  winimage.cpp $(PDWIN32_INCLUDE)\winimage.h $(PDWIN32_INCLUDE)\windll.h $(PDWIN32_INCLUDE)\pefile.h $(PDWIN32_INCLUDE)\winres.h initterm.h
+winimage.OBJ:  winimage.cpp $(PDWIN32_INCLUDE)\winimage.h $(PDWIN32_INCLUDE)\windll.h $(PDWIN32_INCLUDE)\pefile.h $(PDWIN32_INCLUDE)\winres.h initterm.h $(PDWIN32_INCLUDE)\win\virtual.h
 winimgres.OBJ: winimgres.cpp $(PDWIN32_INCLUDE)\winimage.h $(PDWIN32_INCLUDE)\windll.h $(PDWIN32_INCLUDE)\pefile.h $(PDWIN32_INCLUDE)\winexe.h $(PDWIN32_INCLUDE)\winres.h
 windll.OBJ:    windll.cpp $(PDWIN32_INCLUDE)\winimage.h $(PDWIN32_INCLUDE)\windll.h

tags/trunk/src/kernel32/virtual.cpp ¶

@@ -1 @@
-/* $Id: virtual.cpp,v 1.5 1999-08-25 11:40:18 sandervl Exp $ */
+/* $Id: virtual.cpp,v 1.6 1999-08-25 12:30:48 sandervl Exp $ */
 
 /*
@@ -197 +197 @@
  *  [RETURN] ptr                -       pointer to mapped file
  */
-LPVOID WINAPI VIRTUAL_MapFileW( LPCWSTR name )
-{
-    HANDLE hFile, hMapping;
-    LPVOID ptr = NULL;
+HANDLE WINAPI VIRTUAL_MapFileW( LPCWSTR name , LPVOID *lpMapping)
+{
+    HANDLE hFile, hMapping = 0;
 
     hFile = CreateFileW( name, GENERIC_READ, FILE_SHARE_READ, NULL, 
@@ -210 +209 @@
         if (hMapping)
         {
-            ptr = MapViewOfFile( hMapping, FILE_MAP_READ, 0, 0, 0 );
-            CloseHandle( hMapping );
+            *lpMapping = MapViewOfFile( hMapping, FILE_MAP_READ, 0, 0, 0 );
         }
     }
-    return ptr;
+    return hMapping;
 }
 
@@ -224 +222 @@
  *  [RETURN] ptr                -       pointer to mapped file
  */
-LPVOID WINAPI VIRTUAL_MapFileA( LPCSTR name )
-{
-    HANDLE hFile, hMapping;
-    LPVOID ptr = NULL;
+HANDLE WINAPI VIRTUAL_MapFileA( LPCSTR name , LPVOID *lpMapping)
+{
+    HANDLE hFile, hMapping = 0;
 
     hFile = CreateFileA(name, GENERIC_READ, FILE_SHARE_READ, NULL, 
@@ -237 +234 @@
         if (hMapping)
         {
-            ptr = MapViewOfFile( hMapping, FILE_MAP_READ, 0, 0, 0 );
-            CloseHandle( hMapping );
+            *lpMapping = MapViewOfFile( hMapping, FILE_MAP_READ, 0, 0, 0 );
         }
     }
-    return ptr;
-}
+    return hMapping;
+}