Changeset 1811 for trunk/src/kernel32/oslibdos.cpp

Timestamp:

Nov 22, 1999, 9:35:52 PM (26 years ago)

Author:

sandervl

Message:

Rewrite of PE loader code, EB's fixes + VirtualProtect bugfix

File:

• trunk/src/kernel32/oslibdos.cpp (modified) (2 diffs)

trunk/src/kernel32/oslibdos.cpp

@@ -1 @@
-/* $Id: oslibdos.cpp,v 1.8 1999-11-12 11:38:40 sandervl Exp $ */
+/* $Id: oslibdos.cpp,v 1.9 1999-11-22 20:35:50 sandervl Exp $ */
 
 /*
@@ -26 +26 @@
 
 //******************************************************************************
+//TODO: Assumes entire memory range has the same protection flags!
+//TODO: Check if this works for code aliases...
 //******************************************************************************
 DWORD OSLibDosAliasMem(LPVOID pb, ULONG cb, LPVOID *ppbAlias, ULONG fl)
 {
-  return DosAliasMem(pb, cb, ppbAlias, fl);
+ DWORD rc;
+ DWORD attr;
+ DWORD size = cb;
+
+  cb = (cb-1) & ~0xfff;
+  cb+= PAGE_SIZE;
+
+  rc = DosQueryMem(pb, &size, &attr);
+  if(rc) {
+        dprintf(("OSLibDosAliasMem: DosQueryMem %x %x return %d", pb, size, rc));
+        return rc;
+  }
+  size = (size-1) & ~0xfff;
+  size+= PAGE_SIZE;
+  if(size != cb) {
+        dprintf(("ERROR: OSLibDosAliasMem: size != cb (%x!=%x)!!!!!!!!", size, cb));
+        return 5;
+  }
+  attr &= (PAG_READ|PAG_WRITE|PAG_EXECUTE|PAG_GUARD|PAG_DEFAULT);
+  if(attr != fl) {
+        rc = DosSetMem(pb, size, fl);
+        if(rc) {
+                dprintf(("OSLibDosAliasMem: DosSetMem %x %x return %d", pb, size, rc));
+                attr = fl;
+                //just continue for now
+                //return rc;
+        }
+  }
+  rc = DosAliasMem(pb, cb, ppbAlias, 2);
+  if(rc) {
+        dprintf(("OSLibDosAliasMem: DosAliasMem %x %x return %d", pb, cb, rc));
+        return rc;
+  }
+  if(attr != fl) {
+        rc = DosSetMem(pb, size, attr);
+        if(rc) {
+                dprintf(("OSLibDosAliasMem: DosSetMem (2) %x %x return %d", pb, size, rc));
+                return rc;
+        }
+  }
+  return 0;
 }
 //******************************************************************************