Changeset 3228 for trunk/src

Timestamp:

Mar 24, 2000, 8:25:34 PM (25 years ago)

Author:

sandervl

Message:

bugfix in pe loader (512 mb check)

Location:

trunk/src/kernel32

Files:

• hmopen32.cpp (modified) (3 diffs)
• winimagepeldr.cpp (modified) (2 diffs)
• winimgres.cpp (modified) (2 diffs)

trunk/src/kernel32/hmopen32.cpp

@@ -1 @@
-/* $Id: hmopen32.cpp,v 1.18 2000-03-02 19:17:21 sandervl Exp $ */
+/* $Id: hmopen32.cpp,v 1.19 2000-03-24 19:25:32 sandervl Exp $ */
 
 /*
@@ -170 +170 @@
 
 #if 1
+  //SvL: Open32 doesn't like this flag
+  if(pHMHandleData->dwShare & FILE_SHARE_DELETE) {
+        pHMHandleData->dwShare &= ~FILE_SHARE_DELETE;
+  }
+
   hFile = O32_CreateFile(lpFileName,
                          pHMHandleData->dwAccess,
@@ -859 +864 @@
   if(dwTimeout) {
         endtime = O32_GetCurrentTime();
-        dprintf(("KERNEL32: HandleManager::WaitForSingleObject delta = %x (rc=%x)", endtime - starttime, rc));
-  }
-  else dprintf(("KERNEL32: HandleManager::WaitForSingleObject rc=%x", rc));
+        dprintf(("KERNEL32: HandleManager::WaitForSingleObject %x delta = %x (rc=%x)", pHMHandleData->hHMHandle, endtime - starttime, rc));
+  }
+  else dprintf(("KERNEL32: HandleManager::WaitForSingleObject %x rc=%x", pHMHandleData->hHMHandle, rc));
   return rc;
 }

trunk/src/kernel32/winimagepeldr.cpp

@@ -1 @@
-/* $Id: winimagepeldr.cpp,v 1.36 2000-03-23 19:23:48 sandervl Exp $ */
+/* $Id: winimagepeldr.cpp,v 1.37 2000-03-24 19:25:32 sandervl Exp $ */
 
 /*
@@ -802 +802 @@
   }
 
-  if(oh.ImageBase < 512*1024*124) {
+  if(oh.ImageBase < 512*1024*1024) {
         allocFlags = 0;
   }

trunk/src/kernel32/winimgres.cpp

@@ -1 @@
-/* $Id: winimgres.cpp,v 1.32 2000-02-23 00:57:40 sandervl Exp $ */
+/* $Id: winimgres.cpp,v 1.33 2000-03-24 19:25:34 sandervl Exp $ */
 
 /*
@@ -271 +271 @@
     }
     if(HIWORD(id)) {
-            dprintf(("FindResource %s: resource %s (type %d, lang %d)", szModule, id, type, lang));
-    }
-    else    dprintf(("FindResource %s: resource %d (type %d, lang %d)", szModule, id, type, lang));
+            dprintf(("FindResource %s: resource %s (type %d, lang %x)", szModule, id, type, lang));
+    }
+    else    dprintf(("FindResource %s: resource %d (type %d, lang %x)", szModule, id, type, lang));
     //ulRVAResourceSection contains the relative virtual address (relative to the start of the image)
     //for the resource section (images loaded by the pe.exe and pe2lx/win32k)