[fireball] 35502: - Fix definition of BOOT_DRIVER_LIST_ENTRY (Information provided by Alex Ionescu).

Author: fireball
Date: Thu Aug 21 05:58:53 2008
New Revision: 35502

URL: http://svn.reactos.org/svn/reactos?rev=35502&view=rev
Log:
- Fix definition of BOOT_DRIVER_LIST_ENTRY (Information provided by Alex Ionescu).

Modified:
    trunk/reactos/boot/freeldr/freeldr/windows/winldr.c
    trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c
    trunk/reactos/include/reactos/arc/arc.h

Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/window...
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] Thu Aug 21 05:58:53 2008
@@ -332,16 +332,16 @@

while (NextBd != &LoaderBlock->BootDriverListHead)
    {
-		BootDriver = CONTAINING_RECORD(NextBd, BOOT_DRIVER_LIST_ENTRY, ListEntry);
+		BootDriver = CONTAINING_RECORD(NextBd, BOOT_DRIVER_LIST_ENTRY, Link);

DbgPrint((DPRINT_WINDOWS, "BootDriver %wZ DTE %08X RegPath: %wZ\n", &BootDriver->FilePath,
-			BootDriver->DataTableEntry, &BootDriver->RegistryPath));
+			BootDriver->LdrEntry, &BootDriver->RegistryPath));

// Paths are relative (FIXME: Are they always relative?)

// Load it
    	Status = WinLdrLoadDeviceDriver(LoaderBlock, BootPath, &BootDriver->FilePath,
-			0, &BootDriver->DataTableEntry);
+			0, &BootDriver->LdrEntry);

// If loading failed - cry loudly
    	//FIXME: Maybe remove it from the list and try to continue?
@@ -353,9 +353,9 @@

// Convert the RegistryPath and DTE addresses to VA since we are not going to use it anymore
    	BootDriver->RegistryPath.Buffer = PaToVa(BootDriver->RegistryPath.Buffer);
-		BootDriver->DataTableEntry = PaToVa(BootDriver->DataTableEntry);
-
-		NextBd = BootDriver->ListEntry.Flink;
+		BootDriver->LdrEntry = PaToVa(BootDriver->LdrEntry);
+
+		NextBd = BootDriver->Link.Flink;
    }

return TRUE;
@@ -620,12 +620,12 @@

while (NextBd != &LoaderBlock->BootDriverListHead)
    {
-		BootDriver = CONTAINING_RECORD(NextBd, BOOT_DRIVER_LIST_ENTRY, ListEntry);
+		BootDriver = CONTAINING_RECORD(NextBd, BOOT_DRIVER_LIST_ENTRY, Link);

DbgPrint((DPRINT_WINDOWS, "BootDriver %wZ DTE %08X RegPath: %wZ\n", &BootDriver->FilePath,
-			BootDriver->DataTableEntry, &BootDriver->RegistryPath));
-
-		NextBd = BootDriver->ListEntry.Flink;
+			BootDriver->LdrEntry, &BootDriver->RegistryPath));
+
+		NextBd = BootDriver->Link.Flink;
    }
 }

Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/window...
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c [iso-8859-1] Thu Aug 21 05:58:53 2008
@@ -685,7 +685,7 @@
    	return FALSE;

// DTE will be filled during actual load of the driver
-	BootDriverEntry->DataTableEntry = NULL;
+	BootDriverEntry->LdrEntry = NULL;

// Check - if we have a valid ImagePath, if not - we need to build it
    // like "System32\Drivers\blah.sys"
@@ -768,7 +768,7 @@
    	return FALSE;

// Insert entry at top of the list
-	InsertTailList(BootDriverListHead, &BootDriverEntry->ListEntry);
+	InsertTailList(BootDriverListHead, &BootDriverEntry->Link);

return TRUE;
 }

Modified: trunk/reactos/include/reactos/arc/arc.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/arc/arc.h?r...
==============================================================================
--- trunk/reactos/include/reactos/arc/arc.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/arc/arc.h [iso-8859-1] Thu Aug 21 05:58:53 2008
@@ -118,10 +118,10 @@

typedef struct _BOOT_DRIVER_LIST_ENTRY
 {
-    LIST_ENTRY ListEntry;
+    LIST_ENTRY Link;
     UNICODE_STRING FilePath;
     UNICODE_STRING RegistryPath;
-    struct _LDR_DATA_TABLE_ENTRY *DataTableEntry;
+    struct _LDR_DATA_TABLE_ENTRY *LdrEntry;
 } BOOT_DRIVER_LIST_ENTRY, *PBOOT_DRIVER_LIST_ENTRY;

typedef struct _ARC_DISK_SIGNATURE