Changeset 52534 in vbox

Timestamp:

Aug 31, 2014 2:42:40 PM (10 years ago)

Author:

vboxsync

Message:

Another load configuration kludge, this time for ntdll/xp.

File:

• trunk/src/VBox/Runtime/common/ldr/ldrPE.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/common/ldr/ldrPE.cpp

@@ -3449 +3449 @@
         if (u.Cfg64.Size != Dir.Size)
         {
-            /* Kludge, seen ati shipping 32-bit DLLs and EXEs with Dir.Size=0x40
+            /* Kludge #1, seen ati shipping 32-bit DLLs and EXEs with Dir.Size=0x40
                and Cfg64.Size=0x5c or 0x48.  Windows seems to deal with it, so
                lets do so as well. */
@@ -3465 +3465 @@
                 rtldrPEConvert32BitLoadConfigTo64Bit(&u.Cfg64);
             }
+
+            /* Kludge #2, ntdll.dll from XP seen with Dir.Size=0x40 and Cfg64.Size=0x00. */
+            if (Dir.Size == 0x40 && u.Cfg64.Size == 0x00 && !pModPe->f64Bit)
+            {
+                u.Cfg64.Size = 0x40;
+                rtldrPEConvert32BitLoadConfigTo64Bit(&u.Cfg64);
+            }
+
             if (u.Cfg64.Size != Dir.Size)
             {