[ion] 25927: - Properly load drivers using new method describred previously (read from disk into temporary allocated buffer, then map into allocated memory, then free disk buffer). - FreeLDR doesn't relocate nor map imports for drivers yet..still needs testing/fixes.

Author: ion
Date: Wed Feb 28 20:48:44 2007
New Revision: 25927

URL: http://svn.reactos.org/svn/reactos?rev=25927&view=rev
Log:
- Properly load drivers using new method describred previously (read from disk into temporary allocated buffer, then map into allocated memory, then free disk buffer).
- FreeLDR doesn't relocate nor map imports for drivers yet..still needs testing/fixes.

Modified:
    trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c
    trunk/reactos/ntoskrnl/mm/sysldr.c

Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/i...
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c (original)
+++ trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c Wed Feb 28 20:48:44 2007
@@ -678,26 +678,17 @@
     /* Set the file pointer to zero */
     FsSetFilePointer(Image, 0);

-    if (ImageType != 2)
-    {
-        /* Allocate a temporary buffer for the read */
-        ReadBuffer = MmAllocateMemory(ImageSize);
-
-        /* Load the file image */
-        FsReadFile(Image, ImageSize, NULL, ReadBuffer);
-
-        /* Map it into virtual memory */
-        ImageSize = FrLdrReMapImage(ReadBuffer, LoadBase);
-
-        /* Free the temporary buffer */
-        MmFreeMemory(ReadBuffer);
-    }
-    else
-    {
-        /* Load the file image */
-        FsReadFile(Image, ImageSize, NULL, LoadBase);
-        ImageSize = RtlImageNtHeader(LoadBase)->OptionalHeader.SizeOfImage;
-    }
+    /* Allocate a temporary buffer for the read */
+    ReadBuffer = MmAllocateMemory(ImageSize);
+
+    /* Load the file image */
+    FsReadFile(Image, ImageSize, NULL, ReadBuffer);
+
+    /* Map it into virtual memory */
+    ImageSize = FrLdrReMapImage(ReadBuffer, LoadBase);
+
+    /* Free the temporary buffer */
+    MmFreeMemory(ReadBuffer);

/* Calculate Difference between Real Base and Compiled Base*/
     if (ImageType != 2) LdrRelocateImageWithBias(LoadBase,

Modified: trunk/reactos/ntoskrnl/mm/sysldr.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/sysldr.c?rev=25...
==============================================================================
--- trunk/reactos/ntoskrnl/mm/sysldr.c (original)
+++ trunk/reactos/ntoskrnl/mm/sysldr.c Wed Feb 28 20:48:44 2007
@@ -1063,10 +1063,6 @@
     PIMAGE_DATA_DIRECTORY DataDirectory;
     PVOID DllBase, NewImageAddress;
     NTSTATUS Status;
-#if 1 // Disable for FreeLDR 2.5
-    ULONG DriverSize = 0, Size;
-    PIMAGE_SECTION_HEADER Section;
-#endif

/* Loop driver list */
     for (NextEntry = LoaderBlock->LoadOrderListHead.Flink;
@@ -1093,26 +1089,6 @@
         /* Skip non-drivers */
         if (!NtHeader) continue;

-#if 1 // Disable for FreeLDR 2.5
-        /*  Get header pointers  */
-        Section = IMAGE_FIRST_SECTION(NtHeader);
-
-        /*  Determine the size of the module  */
-        for (i = 0; i < NtHeader->FileHeader.NumberOfSections; i++)
-        {
-            /* Skip this section if we're not supposed to load it */
-            if (!(Section[i].Characteristics & IMAGE_SCN_TYPE_NOLOAD))
-            {
-                /* Add the size of this section into the total size */
-                Size = Section[i].VirtualAddress + Section[i].Misc.VirtualSize;
-                DriverSize = max(DriverSize, Size);
-            }
-        }
-
-        /* Round up the driver size to section alignment */
-        DriverSize = ROUND_UP(DriverSize, NtHeader->OptionalHeader.SectionAlignment);
-#endif
-
         /* Get the file header and make sure we can relocate */
         FileHeader = &NtHeader->FileHeader;
         if (FileHeader->Characteristics & IMAGE_FILE_RELOCS_STRIPPED) continue;
@@ -1134,7 +1110,7 @@
                 LdrEntry->SizeOfImage)
             {
                 /* They're not, skip */
-                 continue;
+                continue;
             }

/* We have relocations */
@@ -1145,7 +1121,7 @@
         DllBase = LdrEntry->DllBase;

/*  Allocate a virtual section for the module  */
-        NewImageAddress = MmAllocateSection(DriverSize, NULL);
+        NewImageAddress = MmAllocateSection(LdrEntry->SizeOfImage, NULL);
         if (!NewImageAddress)
         {
             /* Shouldn't happen */
@@ -1157,34 +1133,8 @@
         DPRINT("[Mm0]: Copying from: %p to: %p\n", DllBase, NewImageAddress);
         ASSERT(ExpInitializationPhase == 0);

-#if 0 // Enable for FreeLDR 2.5
         /* Now copy the entire driver over */
         RtlCopyMemory(NewImageAddress, DllBase, LdrEntry->SizeOfImage);
-#else
-        /* Copy headers over */
-        RtlCopyMemory(NewImageAddress,
-                      DllBase,
-                      NtHeader->OptionalHeader.SizeOfHeaders);
-
-        /*  Copy image sections into virtual section  */
-        for (i = 0; i < NtHeader->FileHeader.NumberOfSections; i++)
-        {
-            /* Get the size of this section and check if it's valid and on-disk */
-            Size = Section[i].VirtualAddress + Section[i].Misc.VirtualSize;
-            if ((Size <= DriverSize) && (Section[i].SizeOfRawData))
-            {
-                /* Copy the data from the disk to the image */
-                RtlCopyMemory((PVOID)((ULONG_PTR)NewImageAddress +
-                                      Section[i].VirtualAddress),
-                              (PVOID)((ULONG_PTR)DllBase +
-                                      Section[i].PointerToRawData),
-                              Section[i].Misc.VirtualSize >
-                              Section[i].SizeOfRawData ?
-                              Section[i].SizeOfRawData :
-                              Section[i].Misc.VirtualSize);
-            }
-        }
-#endif

/* Sanity check */
         ASSERT(*(PULONG)NewImageAddress == *(PULONG)DllBase);
@@ -1224,7 +1174,7 @@
         LdrEntry->Flags |= 0x01000000;
         LdrEntry->EntryPoint = (PVOID)((ULONG_PTR)NewImageAddress +
                                 NtHeader->OptionalHeader.AddressOfEntryPoint);
-        LdrEntry->SizeOfImage = DriverSize;
+        LdrEntry->SizeOfImage = LdrEntry->SizeOfImage;
     }
 }