[FREELDR]

Correct the type of few variables.

svn path=/trunk/; revision=57898

diff --git a/reactos/boot/freeldr/freeldr/arch/i386/hwdisk.c b/reactos/boot/freeldr/freeldr/arch/i386/hwdisk.c
index 4ae1939..60164c9 100644 (file)
--- a/reactos/boot/freeldr/freeldr/arch/i386/hwdisk.c
+++ b/reactos/boot/freeldr/freeldr/arch/i386/hwdisk.c
@@ -37,7 +37,7 @@ typedef struct tagDISKCONTEXT
 
 extern ULONG reactos_disk_count;
 extern ARC_DISK_SIGNATURE reactos_arc_disk_info[];
 
 extern ULONG reactos_disk_count;
 extern ARC_DISK_SIGNATURE reactos_arc_disk_info[];

-extern char reactos_arc_strings[32][256];
+extern CHAR reactos_arc_strings[32][256];

 
 static CHAR Hex[] = "0123456789abcdef";
 UCHAR PcBiosDiskCount = 0;
 
 static CHAR Hex[] = "0123456789abcdef";
 UCHAR PcBiosDiskCount = 0;

diff --git a/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c b/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c
index 0332439..188f646 100644 (file)
--- a/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c
+++ b/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c
@@ -28,7 +28,7 @@ static CHAR Hex[] = "0123456789ABCDEF";
 
 extern ULONG reactos_disk_count;
 extern ARC_DISK_SIGNATURE reactos_arc_disk_info[];
 
 extern ULONG reactos_disk_count;
 extern ARC_DISK_SIGNATURE reactos_arc_disk_info[];

-extern char reactos_arc_strings[32][256];
+extern CHAR reactos_arc_strings[32][256];

 
 static PCM_PARTIAL_RESOURCE_LIST
 GetHarddiskConfigurationData(UCHAR DriveNumber, ULONG* pSize)
 
 static PCM_PARTIAL_RESOURCE_LIST
 GetHarddiskConfigurationData(UCHAR DriveNumber, ULONG* pSize)

diff --git a/reactos/boot/freeldr/freeldr/bootmgr.c b/reactos/boot/freeldr/freeldr/bootmgr.c
index 2295e50..81d28e4 100644 (file)
--- a/reactos/boot/freeldr/freeldr/bootmgr.c
+++ b/reactos/boot/freeldr/freeldr/bootmgr.c
@@ -20,9 +20,9 @@
 #include <freeldr.h>
 
 ARC_DISK_SIGNATURE reactos_arc_disk_info[32]; // ARC Disk Information
 #include <freeldr.h>
 
 ARC_DISK_SIGNATURE reactos_arc_disk_info[32]; // ARC Disk Information

-unsigned long reactos_disk_count = 0;
-char reactos_arc_hardware_data[HW_MAX_ARC_HEAP_SIZE] = {0};
-char reactos_arc_strings[32][256];
+ULONG reactos_disk_count = 0;
+CHAR reactos_arc_hardware_data[HW_MAX_ARC_HEAP_SIZE] = {0};
+CHAR reactos_arc_strings[32][256];

 
 ULONG   GetDefaultOperatingSystem(OperatingSystemItem* OperatingSystemList, ULONG       OperatingSystemCount)
 {
 
 ULONG   GetDefaultOperatingSystem(OperatingSystemItem* OperatingSystemList, ULONG       OperatingSystemCount)
 {

diff --git a/reactos/boot/freeldr/freeldr/windows/setupldr.c b/reactos/boot/freeldr/freeldr/windows/setupldr.c
index ebd1177..3d838c9 100644 (file)
--- a/reactos/boot/freeldr/freeldr/windows/setupldr.c
+++ b/reactos/boot/freeldr/freeldr/windows/setupldr.c
@@ -236,5 +236,5 @@ VOID LoadReactOSSetup(VOID)
                              LoaderBlock,
                              BootOptions,
                              BootPath,
                              LoaderBlock,
                              BootOptions,
                              BootPath,

-                             1);
+                             TRUE);

 }
 }