Changeset 1880 for trunk/src/win32k/pe2lx/pe2lx.cpp

Timestamp:

Nov 29, 1999, 10:28:00 PM (26 years ago)

Author:

bird

Message:

Patch from Vit Timchishin applied to both addEntry and addForwarderEntry.
Patches: An entry bundle can't skip more than 255 entries.

File:

• trunk/src/win32k/pe2lx/pe2lx.cpp (modified) (4 diffs)

trunk/src/win32k/pe2lx/pe2lx.cpp

@@ -1 @@
-/* $Id: pe2lx.cpp,v 1.12 1999-11-29 00:33:38 bird Exp $
+/* $Id: pe2lx.cpp,v 1.13 1999-11-29 21:28:00 bird Exp $
  *
  * Pe2Lx class implementation. Ring 0 and Ring 3
@@ -3315 +3315 @@
  *            Find object and offObject corresponding to the entrypoint RVA.
  *            IF no enough memory THEN (try) allocate more.
- *            IF last ordinal + 1 != new ordinal THEN
+ *            LOOP WHILE last ordinal + 1 != new ordinal
  *            BEGIN
  *                Add unused entry which skips to the new ordinal - 1.
  *                Update offCurEntryBundle
  *                Set offLastEntryBundle to offLastEntryBundle.
+ *                IF no enough memory THEN (try) allocate more.
  *            END
  *            IF offCurEntryBundle == offLastEntryBundle OR last bundle type != 32-bit entry
@@ -3439 +3440 @@
 
     /* Add unused entry to skip ordinals? */
-    if (ulOrdinal > ulLastOrdinal + 1)
+    while (ulOrdinal > ulLastOrdinal + 1)
     {
         /* Add unused entry which skips to the new ordinal - 1.*/
         pBundle = (struct b32_bundle *)((ULONG)pEntryBundles + offCurEntryBundle);
-        pBundle->b32_cnt = (UCHAR)(ulOrdinal - ulLastOrdinal - 1);
+        pBundle->b32_cnt = (ulOrdinal - ulLastOrdinal - 1) < 0x100 ?
+            (UCHAR)(ulOrdinal - ulLastOrdinal - 1) : (UCHAR)0xff;
         pBundle->b32_type = EMPTY;
+        ulLastOrdinal += pBundle->b32_cnt;
 
         /* Update offCurEntryBundle and offLastEntryBundle */
         offLastEntryBundle = offCurEntryBundle += 2UL;
+
+        /* IF no enough memory THEN (try) allocate more. */
+        AllocateMoreMemory(offCurEntryBundle + 4 + 2 + 5  > cbEBAllocated /* max memory uasage! Should detect more exact memory usage! */,
+                           pEntryBundles, struct b32_bundle *, cbEBAllocated , 512, 256)
     }
 
@@ -3636 +3643 @@
 
     /* Add unused entry to skip ordinals? */
-    if (ulOrdinal > ulLastOrdinal + 1)
+    while (ulOrdinal > ulLastOrdinal + 1)
     {
         /* Add unused entry which skips to the new ordinal - 1.*/
         pBundle = (struct b32_bundle *)((ULONG)pEntryBundles + offCurEntryBundle);
-        pBundle->b32_cnt = (UCHAR)(ulOrdinal - ulLastOrdinal - 1);
+        pBundle->b32_cnt = (ulOrdinal - ulLastOrdinal - 1) < 0x100 ?
+            (UCHAR)(ulOrdinal - ulLastOrdinal - 1) : (UCHAR)0xff;
         pBundle->b32_type = EMPTY;
+        ulLastOrdinal += pBundle->b32_cnt;
 
         /* Update offCurEntryBundle and offLastEntryBundle */
         offLastEntryBundle = offCurEntryBundle += 2UL;
+
+        /* IF no enough memory THEN (try) allocate more. */
+        AllocateMoreMemory(offCurEntryBundle + 4 + 2 + 7  > cbEBAllocated /* max memory uasage! Should detect more exact memory usage! */,
+                           pEntryBundles, struct b32_bundle *, cbEBAllocated , 512, 256)
     }