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

Timestamp:

Dec 21, 2011, 8:16:15 PM (14 years ago)

Author:

dmik

Message:

Fix hang when loading KERNEL32.DLL from high-mem enabled application.

DosDevConfig() is not high-mem safe.

File:

• trunk/src/kernel32/oslibdos.cpp (modified) (1 diff)

trunk/src/kernel32/oslibdos.cpp

@@ -3435 +3435 @@
                          ULONG item)
 {
-  return (DWORD)DosDevConfig(pdevinfo, item);
+  // DosDevConfig() is not high-mem safe, use a low-mem stack variable
+  // (according to CPREF, "All returned device information is BYTE-sized,
+  // so [the argument] should be the address of a BYTE variable"
+  BYTE devinfo;
+  DWORD rc = (DWORD)DosDevConfig(&devinfo, item);
+  *((PBYTE)pdevinfo) = devinfo;
+  return rc;
 }
 //******************************************************************************