Changeset 2007 for trunk/src

Timestamp:

Dec 7, 1999, 1:28:41 PM (26 years ago)

Author:

sandervl

Message:

memory map + string resource fixes

Location:

trunk/src/kernel32

Files:

• mmap.cpp (modified) (2 diffs)
• winres.cpp (modified) (3 diffs)
• wprocess.cpp (modified) (2 diffs)

trunk/src/kernel32/mmap.cpp

@@ -1 @@
-/* $Id: mmap.cpp,v 1.24 1999-12-06 21:31:43 sandervl Exp $ */
+/* $Id: mmap.cpp,v 1.25 1999-12-07 12:28:41 sandervl Exp $ */
 
 /*
@@ -327 +327 @@
                 goto fail;
         }
+        if(hMemFile == -1 && !image) {//commit memory
+                VirtualAlloc(pMapping, mSize, MEM_COMMIT, PAGE_READWRITE);
+        }
   }
   mapview = new Win32MemMapView(this, offset, (size == 0) ? mSize : size, fdwAccess);

trunk/src/kernel32/winres.cpp

@@ -1 @@
-/* $Id: winres.cpp,v 1.22 1999-11-30 14:15:55 sandervl Exp $ */
+/* $Id: winres.cpp,v 1.23 1999-12-07 12:28:41 sandervl Exp $ */
 
 /*
@@ -71 +71 @@
   this->type     = type;
   this->ressize  = size;
-  winresdata     = (char *)malloc(size);
+  winresdata     = (char *)malloc(size+sizeof(WCHAR)); //+2 for 0 terminator (string res)
   if(winresdata == NULL) {
     DebugInt3();
@@ -79 +79 @@
 
   if(type == NTRT_STRING) {
-    memcpy(winresdata, resdata, size-sizeof(WCHAR));
-    ((USHORT *)winresdata)[size/sizeof(WCHAR)-1] = 0;
+        memcpy(winresdata, resdata, size);
+        ((USHORT *)winresdata)[size/sizeof(WCHAR)] = 0;
   }
   else  memcpy(winresdata, resdata, size);

trunk/src/kernel32/wprocess.cpp

@@ -1 @@
-/* $Id: wprocess.cpp,v 1.55 1999-12-05 10:02:31 sandervl Exp $ */
+/* $Id: wprocess.cpp,v 1.56 1999-12-07 12:28:41 sandervl Exp $ */
 
 /*
@@ -606 +606 @@
   }
 
-  eprintf(("KERNEL32:  GetModuleHandle %s returned %X\n", lpszModule, hMod));
+  dprintf(("KERNEL32:  GetModuleHandle %s returned %X\n", lpszModule, hMod));
   return(hMod);
 }