[ros-diffs] [gvg] 15287: Merge 14725:15285 from trunk

Merge 14725:15285 from trunk
Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/arch.S
Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/hardware.c
Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c
Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c
Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/hwcpu.c
Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c
Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c
Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/i386rtl.c
Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c
Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c
Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/portio.c
Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xboxdisk.c
Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c
Modified: branches/xen/reactos/boot/freeldr/freeldr/bootmgr.c
Modified: branches/xen/reactos/boot/freeldr/freeldr/cache/blocklist.c
Modified: branches/xen/reactos/boot/freeldr/freeldr/cmdline.c
Modified: branches/xen/reactos/boot/freeldr/freeldr/custom.c
Modified: branches/xen/reactos/boot/freeldr/freeldr/disk/disk.c
Modified: branches/xen/reactos/boot/freeldr/freeldr/disk/partition.c
Modified: branches/xen/reactos/boot/freeldr/freeldr/drivemap.c
Modified: branches/xen/reactos/boot/freeldr/freeldr/freeldr.c
Modified: branches/xen/reactos/boot/freeldr/freeldr/fs/ext2.c
Modified: branches/xen/reactos/boot/freeldr/freeldr/fs/ext2.h
Modified: branches/xen/reactos/boot/freeldr/freeldr/fs/fat.c
Modified: branches/xen/reactos/boot/freeldr/freeldr/fs/fat.h
Modified: branches/xen/reactos/boot/freeldr/freeldr/fs/fs.c
Modified: branches/xen/reactos/boot/freeldr/freeldr/fs/iso.c
Modified: branches/xen/reactos/boot/freeldr/freeldr/fs/iso.h
Modified: branches/xen/reactos/boot/freeldr/freeldr/fs/ntfs.c
Modified: branches/xen/reactos/boot/freeldr/freeldr/fs/ntfs.h
Modified: branches/xen/reactos/boot/freeldr/freeldr/include/bootmgr.h
Modified: branches/xen/reactos/boot/freeldr/freeldr/include/disk.h
Modified: branches/xen/reactos/boot/freeldr/freeldr/include/drivemap.h
Modified: branches/xen/reactos/boot/freeldr/freeldr/include/freeldr.h
Modified: branches/xen/reactos/boot/freeldr/freeldr/include/fs.h
Modified: branches/xen/reactos/boot/freeldr/freeldr/include/inifile.h
Modified: branches/xen/reactos/boot/freeldr/freeldr/include/linux.h
Modified: branches/xen/reactos/boot/freeldr/freeldr/include/machine.h
Modified: branches/xen/reactos/boot/freeldr/freeldr/include/miscboot.h
Modified: branches/xen/reactos/boot/freeldr/freeldr/include/multiboot.h
Modified: branches/xen/reactos/boot/freeldr/freeldr/include/oslist.h
Modified: branches/xen/reactos/boot/freeldr/freeldr/include/reactos.h
Modified: branches/xen/reactos/boot/freeldr/freeldr/include/rtl.h
Modified: branches/xen/reactos/boot/freeldr/freeldr/include/ui.h
Modified: branches/xen/reactos/boot/freeldr/freeldr/include/version.h
Modified: branches/xen/reactos/boot/freeldr/freeldr/inifile/ini.h
Modified: branches/xen/reactos/boot/freeldr/freeldr/inifile/ini_init.c
Modified: branches/xen/reactos/boot/freeldr/freeldr/inifile/inifile.c
Modified: branches/xen/reactos/boot/freeldr/freeldr/inifile/parse.c
Modified: branches/xen/reactos/boot/freeldr/freeldr/linuxboot.c
Modified: branches/xen/reactos/boot/freeldr/freeldr/math/i386.h
Modified: branches/xen/reactos/boot/freeldr/freeldr/math/powerpc.h
Modified: branches/xen/reactos/boot/freeldr/freeldr/miscboot.c
Modified: branches/xen/reactos/boot/freeldr/freeldr/mm/meminit.c
Modified: branches/xen/reactos/boot/freeldr/freeldr/multiboot.c
Modified: branches/xen/reactos/boot/freeldr/freeldr/options.c
Modified: branches/xen/reactos/boot/freeldr/freeldr/oslist.c
Modified: branches/xen/reactos/boot/freeldr/freeldr/reactos/arcname.c
Modified: branches/xen/reactos/boot/freeldr/freeldr/reactos/binhive.c
Modified: branches/xen/reactos/boot/freeldr/freeldr/reactos/reactos.c
Modified: branches/xen/reactos/boot/freeldr/freeldr/reactos/registry.c
Modified: branches/xen/reactos/boot/freeldr/freeldr/reactos/registry.h
Modified: branches/xen/reactos/boot/freeldr/freeldr/reactos/setupldr.c
Modified: branches/xen/reactos/boot/freeldr/freeldr/rtl/memset.c
Modified: branches/xen/reactos/boot/freeldr/freeldr/rtl/print.c
Modified: branches/xen/reactos/boot/freeldr/freeldr/ui/gui.c
Modified: branches/xen/reactos/boot/freeldr/freeldr/ui/tui.c
Modified: branches/xen/reactos/boot/freeldr/freeldr/ui/tui.h
Modified: branches/xen/reactos/boot/freeldr/freeldr/ui/tuimenu.c
Modified: branches/xen/reactos/boot/freeldr/freeldr/ui/ui.c
Modified: branches/xen/reactos/boot/freeldr/freeldr/version.c
Modified: branches/xen/reactos/boot/freeldr/freeldr/video/bank.c
Modified: branches/xen/reactos/boot/freeldr/freeldr/video/fade.c
Modified: branches/xen/reactos/boot/freeldr/freeldr/video/palette.c
Modified: branches/xen/reactos/boot/freeldr/freeldr/video/pixel.c
Modified: branches/xen/reactos/boot/freeldr/freeldr/video/video.c
Property changes on: branches/xen/reactos/boot/freeldr/freeldr
___________________________________________________________________
Name: lastmerge
   - 14725
   + 15285
  _____  

Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/arch.S
--- branches/xen/reactos/boot/freeldr/freeldr/arch/i386/arch.S
2005-05-14 19:16:44 UTC (rev 15286)
+++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/arch.S
2005-05-14 19:45:27 UTC (rev 15287)
@@ -487,7 +487,6 @@

 EXTERN(i386BootPartition)
 	.long	0
 
-.bss
 mb_info:
 	.fill	MB_INFO_SIZE, 1, 0
 
  _____  

Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/hardware.c
--- branches/xen/reactos/boot/freeldr/freeldr/arch/i386/hardware.c
2005-05-14 19:16:44 UTC (rev 15286)
+++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/hardware.c
2005-05-14 19:45:27 UTC (rev 15287)
@@ -101,9 +101,9 @@

 typedef struct _CM_PNP_BIOS_DEVICE_NODE
 {
   USHORT Size;
-  UCHAR  Node;
+  CHAR  Node;
   ULONG ProductId;
-  UCHAR  DeviceType[3];
+  CHAR  DeviceType[3];
   USHORT DeviceAttributes;
 } __attribute__((packed)) CM_PNP_BIOS_DEVICE_NODE,
*PCM_PNP_BIOS_DEVICE_NODE;
 
@@ -197,44 +197,44 @@
   WRITE_PORT_UCHAR((PUCHAR)0x43, 0x34);  /* binary, mode 2, LSB/MSB, ch
0 */
   WRITE_PORT_UCHAR((PUCHAR)0x40, LATCH & 0xff); /* LSB */
   WRITE_PORT_UCHAR((PUCHAR)0x40, LATCH >> 8); /* MSB */
-  
+
   /* Stage 1:  Coarse calibration                                   */
-  
+
   WaitFor8254Wraparound();
-  
+
   delay_count = 1;
-  
+
   do {
     delay_count <<= 1;                  /* Next delay count to try */
 
     WaitFor8254Wraparound();
-  
+
     __StallExecutionProcessor(delay_count);      /* Do the delay */
-  
+
     CurCount = Read8254Timer();
   } while (CurCount > LATCH / 2);
-  
+
   delay_count >>= 1;              /* Get bottom value for delay     */
-  
+
   /* Stage 2:  Fine calibration                                     */
-  
+
   calib_bit = delay_count;        /* Which bit are we going to test */
-  
+
   for(i=0;i<PRECISION;i++) {
     calib_bit >>= 1;             /* Next bit to calibrate          */
     if(!calib_bit) break;        /* If we have done all bits, stop */
-  
+
     delay_count |= calib_bit;        /* Set the bit in delay_count */
-  
+
     WaitFor8254Wraparound();
-  
+
     __StallExecutionProcessor(delay_count);      /* Do the delay */
-  
+
     CurCount = Read8254Timer();
     if (CurCount <= LATCH / 2)   /* If a tick has passed, turn the */
       delay_count &= ~calib_bit; /* calibrated bit back off        */
   }
-  
+
   /* We're finished:  Do the finishing touches                      */
   delay_count /= (MILLISEC / 2);   /* Calculate delay_count for 1ms */
 }
@@ -258,7 +258,7 @@
   Error = RegSetValue(ComponentKey,
 		      "Component Information",
 		      REG_BINARY,
-		      (PUCHAR)&CompInfo,
+		      (PCHAR)&CompInfo,
 		      sizeof(CM_COMPONENT_INFORMATION));
   if (Error != ERROR_SUCCESS)
     {
@@ -287,7 +287,7 @@
   LONG Error;
 
   InstData = (PCM_PNP_BIOS_INSTALLATION_CHECK)PnpBiosSupported();
-  if (InstData == NULL || strncmp(InstData->Signature, "$PnP", 4))
+  if (InstData == NULL || strncmp((CHAR*)InstData->Signature, "$PnP",
4))
     {
       DbgPrint((DPRINT_HWDETECT, "PnP-BIOS not supported\n"));
       return;
@@ -335,7 +335,7 @@
   Error = RegSetValue(BusKey,
 		      "Identifier",
 		      REG_SZ,
-		      (PUCHAR)"PNP BIOS",
+		      "PNP BIOS",
 		      9);
   if (Error != ERROR_SUCCESS)
     {
@@ -413,7 +413,7 @@
   Error = RegSetValue(BusKey,
 		      "Configuration Data",
 		      REG_FULL_RESOURCE_DESCRIPTOR,
-		      (PUCHAR) FullResourceDescriptor,
+		      (PCHAR) FullResourceDescriptor,
 		      Size);
   MmFreeMemory(FullResourceDescriptor);
   if (Error != ERROR_SUCCESS)
@@ -495,7 +495,7 @@
   Error = RegSetValue(DiskKey,
 		      "Configuration Data",
 		      REG_FULL_RESOURCE_DESCRIPTOR,
-		      (PUCHAR) FullResourceDescriptor,
+		      (PCHAR) FullResourceDescriptor,
 		      Size);
   MmFreeMemory(FullResourceDescriptor);
   if (Error != ERROR_SUCCESS)
@@ -516,7 +516,7 @@
   ULONG i;
   ULONG Checksum;
   ULONG Signature;
-  char Identifier[20];
+  CHAR Identifier[20];
   LONG Error;
 
   /* Read the MBR */
@@ -568,7 +568,7 @@
   Error = RegSetValue(DiskKey,
 		      "Identifier",
 		      REG_SZ,
-		      (PUCHAR) Identifier,
+		      Identifier,
 		      20);
   if (Error != ERROR_SUCCESS)
     {
@@ -673,7 +673,7 @@
   Error = RegSetValue(SystemKey,
 		      "Configuration Data",
 		      REG_FULL_RESOURCE_DESCRIPTOR,
-		      (PUCHAR) FullResourceDescriptor,
+		      (PCHAR) FullResourceDescriptor,
 		      Size);
   MmFreeMemory(FullResourceDescriptor);
   if (Error != ERROR_SUCCESS)
@@ -829,7 +829,7 @@
     Error = RegSetValue(PeripheralKey,
 			"Configuration Data",
 			REG_FULL_RESOURCE_DESCRIPTOR,
-			(PUCHAR) FullResourceDescriptor,
+			(PCHAR) FullResourceDescriptor,
 			Size);
     MmFreeMemory(FullResourceDescriptor);
     if (Error != ERROR_SUCCESS)
@@ -845,7 +845,7 @@
     Error = RegSetValue(PeripheralKey,
 			"Identifier",
 			REG_SZ,
-			(PUCHAR)Identifier,
+			(PCHAR)Identifier,
 			strlen(Identifier) + 1);
     if (Error != ERROR_SUCCESS)
     {
@@ -939,7 +939,7 @@
   Error = RegSetValue(ControllerKey,
 		      "Configuration Data",
 		      REG_FULL_RESOURCE_DESCRIPTOR,
-		      (PUCHAR) FullResourceDescriptor,
+		      (PCHAR) FullResourceDescriptor,
 		      Size);
   MmFreeMemory(FullResourceDescriptor);
   if (Error != ERROR_SUCCESS)
@@ -1280,7 +1280,7 @@
       Error = RegSetValue(PeripheralKey,
 			  "Configuration Data",
 			  REG_FULL_RESOURCE_DESCRIPTOR,
-			  (PUCHAR)&FullResourceDescriptor,
+			  (PCHAR)&FullResourceDescriptor,
 			  sizeof(CM_FULL_RESOURCE_DESCRIPTOR) -
 			  sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR));
       if (Error != ERROR_SUCCESS)
@@ -1294,7 +1294,7 @@
       Error = RegSetValue(PeripheralKey,
 			  "Identifier",
 			  REG_SZ,
-			  (PUCHAR)Identifier,
+			  Identifier,
 			  strlen(Identifier) + 1);
       if (Error != ERROR_SUCCESS)
 	{
@@ -1409,7 +1409,7 @@
       Error = RegSetValue(ControllerKey,
 			  "Configuration Data",
 			  REG_FULL_RESOURCE_DESCRIPTOR,
-			  (PUCHAR) FullResourceDescriptor,
+			  (PCHAR) FullResourceDescriptor,
 			  Size);
       MmFreeMemory(FullResourceDescriptor);
       if (Error != ERROR_SUCCESS)
@@ -1426,7 +1426,7 @@
       Error = RegSetValue(ControllerKey,
 			  "Identifier",
 			  REG_SZ,
-			  (PUCHAR)Buffer,
+			  Buffer,
 			  strlen(Buffer) + 1);
       if (Error != ERROR_SUCCESS)
 	{
@@ -1542,7 +1542,7 @@
       Error = RegSetValue(ControllerKey,
 			  "Configuration Data",
 			  REG_FULL_RESOURCE_DESCRIPTOR,
-			  (PUCHAR) FullResourceDescriptor,
+			  (PCHAR) FullResourceDescriptor,
 			  Size);
       MmFreeMemory(FullResourceDescriptor);
       if (Error != ERROR_SUCCESS)
@@ -1559,7 +1559,7 @@
       Error = RegSetValue(ControllerKey,
 			  "Identifier",
 			  REG_SZ,
-			  (PUCHAR)Buffer,
+			  Buffer,
 			  strlen(Buffer) + 1);
       if (Error != ERROR_SUCCESS)
 	{
@@ -1702,7 +1702,7 @@
     Error = RegSetValue(PeripheralKey,
 			"Configuration Data",
 			REG_FULL_RESOURCE_DESCRIPTOR,
-			(PUCHAR)FullResourceDescriptor,
+			(PCHAR)FullResourceDescriptor,
 			Size);
     MmFreeMemory(FullResourceDescriptor);
     if (Error != ERROR_SUCCESS)
@@ -1718,7 +1718,7 @@
     Error = RegSetValue(ControllerKey,
 			"Identifier",
 			REG_SZ,
-			(PUCHAR)Buffer,
+			Buffer,
 			strlen(Buffer) + 1);
     if (Error != ERROR_SUCCESS)
     {
@@ -1804,7 +1804,7 @@
   Error = RegSetValue(ControllerKey,
 		      "Configuration Data",
 		      REG_FULL_RESOURCE_DESCRIPTOR,
-		      (PUCHAR)FullResourceDescriptor,
+		      (PCHAR)FullResourceDescriptor,
 		      Size);
   MmFreeMemory(FullResourceDescriptor);
   if (Error != ERROR_SUCCESS)
@@ -1972,7 +1972,7 @@
       Error = RegSetValue(ControllerKey,
 			  "Configuration Data",
 			  REG_FULL_RESOURCE_DESCRIPTOR,
-			  (PUCHAR)&FullResourceDescriptor,
+			  (PCHAR)&FullResourceDescriptor,
 			  sizeof(CM_FULL_RESOURCE_DESCRIPTOR));
       if (Error != ERROR_SUCCESS)
 	{
@@ -2014,7 +2014,7 @@
 	  Error = RegSetValue(PeripheralKey,
 			      "Configuration Data",
 			      REG_FULL_RESOURCE_DESCRIPTOR,
-			      (PUCHAR)&FullResourceDescriptor,
+			      (PCHAR)&FullResourceDescriptor,
 			      sizeof(CM_FULL_RESOURCE_DESCRIPTOR) -
 			      sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR));
 	  if (Error != ERROR_SUCCESS)
@@ -2029,7 +2029,7 @@
 	  Error = RegSetValue(PeripheralKey,
 			      "Identifier",
 			      REG_SZ,
-			      (PUCHAR)"MICROSOFT PS2 MOUSE",
+			      "MICROSOFT PS2 MOUSE",
 			      20);
 	  if (Error != ERROR_SUCCESS)
 	    {
@@ -2098,7 +2098,7 @@
   Error = RegSetValue(ControllerKey,
 		      "Identifier",
 		      REG_SZ,
-		      (PUCHAR)Buffer,
+		      Buffer,
 		      strlen(Buffer) + 1);
   if (Error != ERROR_SUCCESS)
     {
@@ -2146,7 +2146,7 @@
   Error = RegSetValue(BusKey,
 		      "Identifier",
 		      REG_SZ,
-		      (PUCHAR)"ISA",
+		      "ISA",
 		      4);
   if (Error != ERROR_SUCCESS)
     {
@@ -2175,7 +2175,7 @@
   Error = RegSetValue(BusKey,
 		      "Configuration Data",
 		      REG_FULL_RESOURCE_DESCRIPTOR,
-		      (PUCHAR) FullResourceDescriptor,
+		      (PCHAR) FullResourceDescriptor,
 		      Size);
   MmFreeMemory(FullResourceDescriptor);
   if (Error != ERROR_SUCCESS)
  _____  

Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c
--- branches/xen/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c
2005-05-14 19:16:44 UTC (rev 15286)
+++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c
2005-05-14 19:45:27 UTC (rev 15287)
@@ -92,7 +92,7 @@

       Error = RegSetValue(BiosKey,
 			  "Identifier",
 			  REG_SZ,
-			  (PUCHAR)"ACPI BIOS",
+			  "ACPI BIOS",
 			  10);
       if (Error != ERROR_SUCCESS)
 	{
  _____  

Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c
--- branches/xen/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c
2005-05-14 19:16:44 UTC (rev 15286)
+++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c
2005-05-14 19:45:27 UTC (rev 15287)
@@ -95,7 +95,7 @@

       Error = RegSetValue(BiosKey,
 			  "Identifier",
 			  REG_SZ,
-			  (PUCHAR)"APM",
+			  "APM",
 			  4);
       if (Error != ERROR_SUCCESS)
 	{
  _____  

Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/hwcpu.c
--- branches/xen/reactos/boot/freeldr/freeldr/arch/i386/hwcpu.c
2005-05-14 19:16:44 UTC (rev 15286)
+++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/hwcpu.c
2005-05-14 19:45:27 UTC (rev 15287)
@@ -111,8 +111,8 @@

 DetectCPU(FRLDRHKEY CpuKey,
 	  FRLDRHKEY FpuKey)
 {
-  char VendorIdentifier[13];
-  char Identifier[64];
+  CHAR VendorIdentifier[13];
+  CHAR Identifier[64];
   ULONG FeatureSet;
   FRLDRHKEY CpuInstKey;
   FRLDRHKEY FpuInstKey;
@@ -195,7 +195,7 @@
   Error = RegSetValue(CpuInstKey,
 		      "FeatureSet",
 		      REG_DWORD,
-		      (PUCHAR)&FeatureSet,
+		      (PCHAR)&FeatureSet,
 		      sizeof(ULONG));
   if (Error != ERROR_SUCCESS)
     {
@@ -208,7 +208,7 @@
   Error = RegSetValue(CpuInstKey,
 		      "Identifier",
 		      REG_SZ,
-		      (PUCHAR)Identifier,
+		      Identifier,
 		      strlen(Identifier) + 1);
   if (Error != ERROR_SUCCESS)
     {
@@ -218,7 +218,7 @@
   Error = RegSetValue(FpuInstKey,
 		      "Identifier",
 		      REG_SZ,
-		      (PUCHAR)Identifier,
+		      Identifier,
 		      strlen(Identifier) + 1);
   if (Error != ERROR_SUCCESS)
     {
@@ -231,7 +231,7 @@
   Error = RegSetValue(CpuInstKey,
 		      "VendorIdentifier",
 		      REG_SZ,
-		      (PUCHAR)VendorIdentifier,
+		      VendorIdentifier,
 		      strlen(VendorIdentifier) + 1);
   if (Error != ERROR_SUCCESS)
     {
@@ -250,7 +250,7 @@
       Error = RegSetValue(CpuInstKey,
 			  "~MHz",
 			  REG_DWORD,
-			  (PUCHAR)&CpuSpeed,
+			  (PCHAR)&CpuSpeed,
 			  sizeof(ULONG));
       if (Error != ERROR_SUCCESS)
 	{
@@ -339,7 +339,7 @@
   Error = RegSetValue(CpuInstKey,
 		      "FeatureSet",
 		      REG_DWORD,
-		      (PUCHAR)&FeatureSet,
+		      (PCHAR)&FeatureSet,
 		      sizeof(ULONG));
   if (Error != ERROR_SUCCESS)
     {
@@ -352,7 +352,7 @@
   Error = RegSetValue(CpuInstKey,
 		      "Identifier",
 		      REG_SZ,
-		      (PUCHAR)Identifier,
+		      Identifier,
 		      strlen(Identifier) + 1);
   if (Error != ERROR_SUCCESS)
     {
@@ -362,7 +362,7 @@
   Error = RegSetValue(FpuInstKey,
 		      "Identifier",
 		      REG_SZ,
-		      (PUCHAR)Identifier,
+		      Identifier,
 		      strlen(Identifier) + 1);
   if (Error != ERROR_SUCCESS)
     {
@@ -375,7 +375,7 @@
   Error = RegSetValue(CpuInstKey,
 		      "VendorIdentifier",
 		      REG_SZ,
-		      (PUCHAR)VendorIdentifier,
+		      VendorIdentifier,
 		      strlen(VendorIdentifier) + 1);
   if (Error != ERROR_SUCCESS)
     {
@@ -394,7 +394,7 @@
       Error = RegSetValue(CpuInstKey,
 			  "~MHz",
 			  REG_DWORD,
-			  (PUCHAR)&CpuSpeed,
+			  (PCHAR)&CpuSpeed,
 			  sizeof(ULONG));
       if (Error != ERROR_SUCCESS)
 	{
@@ -464,7 +464,7 @@
   if (ConfigTable->Signature != MP_CT_SIGNATURE)
     return NULL;
 
-  DbgPrint((DPRINT_HWDETECT, 
+  DbgPrint((DPRINT_HWDETECT,
 	    "MP Configuration Table at: %x\n",
 	    (ULONG)ConfigTable));
 
@@ -538,7 +538,7 @@
 		CpuEntry = (PMP_PROCESSOR_ENTRY)Ptr;
 
 		DbgPrint((DPRINT_HWDETECT, "Processor Entry\n"));
-		DbgPrint((DPRINT_HWDETECT, 
+		DbgPrint((DPRINT_HWDETECT,
 			  "APIC Id %u  APIC Version %u  Flags %x
Signature %x  Feature %x\n",
 			  CpuEntry->LocalApicId,
 			  CpuEntry->LocalApicVersion,
  _____  

Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c
--- branches/xen/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c
2005-05-14 19:16:44 UTC (rev 15286)
+++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c
2005-05-14 19:45:27 UTC (rev 15287)
@@ -178,7 +178,7 @@

       Error = RegSetValue(TableKey,
 			  "Identifier",
 			  REG_SZ,
-			  (PUCHAR)"PCI Real-mode IRQ Routing Table",
+			  "PCI Real-mode IRQ Routing Table",
 			  32);
       if (Error != ERROR_SUCCESS)
 	{
@@ -216,7 +216,7 @@
       Error = RegSetValue(TableKey,
 			  "Configuration Data",
 			  REG_FULL_RESOURCE_DESCRIPTOR,
-			  (PUCHAR) FullResourceDescriptor,
+			  (PCHAR) FullResourceDescriptor,
 			  Size);
       MmFreeMemory(FullResourceDescriptor);
       if (Error != ERROR_SUCCESS)
@@ -272,7 +272,7 @@
       Error = RegSetValue(BiosKey,
 			  "Identifier",
 			  REG_SZ,
-			  (PUCHAR)"PCI BIOS",
+			  "PCI BIOS",
 			  9);
       if (Error != ERROR_SUCCESS)
 	{
@@ -301,7 +301,7 @@
       Error = RegSetValue(BiosKey,
 			  "Configuration Data",
 			  REG_FULL_RESOURCE_DESCRIPTOR,
-			  (PUCHAR) FullResourceDescriptor,
+			  (PCHAR) FullResourceDescriptor,
 			  Size);
       MmFreeMemory(FullResourceDescriptor);
       if (Error != ERROR_SUCCESS)
  _____  

Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c
--- branches/xen/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c
2005-05-14 19:16:44 UTC (rev 15286)
+++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c
2005-05-14 19:45:27 UTC (rev 15287)
@@ -168,7 +168,7 @@

 	return TRUE;
 }
 
-BOOL i386DiskGetBootVolume(PULONG DriveNumber, PULONGLONG StartSector,
PULONGLONG SectorCount, int *FsType) 
+BOOL i386DiskGetBootVolume(PULONG DriveNumber, PULONGLONG StartSector,
PULONGLONG SectorCount, int *FsType)
 {
 	PARTITION_TABLE_ENTRY	PartitionTableEntry;
 	UCHAR			VolumeType;
  _____  

Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/i386rtl.c
--- branches/xen/reactos/boot/freeldr/freeldr/arch/i386/i386rtl.c
2005-05-14 19:16:44 UTC (rev 15286)
+++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/i386rtl.c
2005-05-14 19:45:27 UTC (rev 15287)
@@ -47,12 +47,12 @@

 	// interrupt from the AT real-time clock chip which is available
on INT 70;
 	// because newer BIOSes may have much more precise timers
available, it is
 	// not possible to use this function accurately for very short
delays unless
-	// the precise behavior of the BIOS is known (or found through
testing) 
+	// the precise behavior of the BIOS is known (or found through
testing)
 
 	while (msec)
 	{
 		msec_this = msec;
-		
+
 		if (msec_this > 4000)
 		{
 			msec_this = 4000;
  _____  

Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c
--- branches/xen/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c
2005-05-14 19:16:44 UTC (rev 15286)
+++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c
2005-05-14 19:45:27 UTC (rev 15287)
@@ -88,7 +88,7 @@

 // A search must then be made to find them, FFFFh will also terminate
this
 // second list. In some cases, only a "stub" VBE may be present,
supporting
 // only AX=4F00h; this case may be assumed if the list of supported
video modes
-// is empty (consisting of a single word of FFFFh) 
+// is empty (consisting of a single word of FFFFh)
 
 VOID BiosSetVideoFont8x16(VOID)
 {
  _____  

Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c
--- branches/xen/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c
2005-05-14 19:16:44 UTC (rev 15286)
+++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c
2005-05-14 19:45:27 UTC (rev 15287)
@@ -136,7 +136,7 @@

    * CH = feature connector bits
    * CL = switch settings
    * AH destroyed (at least by Tseng ET4000 BIOS v8.00n)
-   * 
+   *
    * Installation check;EGA
    */
   Regs.b.ah = 0x12;
@@ -161,7 +161,7 @@
    * This function is commonly used to check for the presence of a VGA.
    *
    * Installation check;VGA
-   * 
+   *
    * Values for display combination code:
    * 00h    no display
    * 01h    monochrome adapter w/ monochrome display
@@ -309,15 +309,15 @@
    * CL = bottom scan line containing cursor (bits 0-4)
    * Return:
    * Nothing
-   * 
+   *
    * Specify the starting and ending scan lines to be occupied
    * by the hardware cursor in text modes.
    *
    * AMI 386 BIOS and AST Premier 386 BIOS will lock up the
    * system if AL is not equal to the current video mode.
-   * 
+   *
    * Bitfields for cursor start and options:
-   * 
+   *
    * Bit(s)    Description
    * 7         should be zero
    * 6,5       cursor blink
@@ -460,7 +460,7 @@
    *
    * Note: While VBE 1.1 and higher will zero out all unused bytes
    * of the buffer, v1.0 did not, so applications that want to be
-   * backward compatible should clear the buffer before calling 
+   * backward compatible should clear the buffer before calling
    */
   Regs.w.ax = 0x4F01;
   Regs.w.cx = Mode;
@@ -563,7 +563,7 @@
    * 121h   1600x1200x32K
    * 122h   1600x1200x64K
    * 81FFh   special full-memory access mode
-   * 
+   *
    * Notes: The special mode 81FFh preserves the contents of the video
memory and gives
    * access to all of the memory; VESA recommends that the special mode
be a packed-pixel
    * mode. For VBE 2.0+, it is required that the VBE implement the
mode, but not place it
  _____  

Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/portio.c
--- branches/xen/reactos/boot/freeldr/freeldr/arch/i386/portio.c
2005-05-14 19:16:44 UTC (rev 15286)
+++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/portio.c
2005-05-14 19:45:27 UTC (rev 15287)
@@ -58,8 +58,8 @@

                         PUCHAR Buffer,
                         ULONG Count)
 {
-   __asm__ __volatile__ ("cld ; rep ; insb\n\t" 
-			 : "=D" (Buffer), "=c" (Count) 
+   __asm__ __volatile__ ("cld ; rep ; insb\n\t"
+			 : "=D" (Buffer), "=c" (Count)
 			 : "d" (Port),"0" (Buffer),"1" (Count));
 }
 
@@ -71,7 +71,7 @@
                          ULONG Count)
 {
    __asm__ __volatile__ ("cld ; rep ; insw"
-			 : "=D" (Buffer), "=c" (Count) 
+			 : "=D" (Buffer), "=c" (Count)
 			 : "d" (Port),"0" (Buffer),"1" (Count));
 }
 
@@ -83,17 +83,17 @@
                         ULONG Count)
 {
    __asm__ __volatile__ ("cld ; rep ; insl"
-			 : "=D" (Buffer), "=c" (Count) 
+			 : "=D" (Buffer), "=c" (Count)
 			 : "d" (Port),"0" (Buffer),"1" (Count));
 }
 
 #undef READ_PORT_UCHAR
-UCHAR 
+UCHAR
 STDCALL
 READ_PORT_UCHAR (PUCHAR Port)
 {
    UCHAR Value;
-   
+
    __asm__("inb %w1, %0\n\t"
 	   : "=a" (Value)
 	   : "d" (Port));
@@ -107,7 +107,7 @@
 READ_PORT_USHORT (USHORT* Port)
 {
    USHORT Value;
-   
+
    __asm__("inw %w1, %0\n\t"
 	   : "=a" (Value)
 	   : "d" (Port));
@@ -121,7 +121,7 @@
 READ_PORT_ULONG (ULONG* Port)
 {
    ULONG Value;
-   
+
    __asm__("inl %w1, %0\n\t"
 	   : "=a" (Value)
 	   : "d" (Port));
@@ -130,14 +130,14 @@
 }
 
 #undef WRITE_PORT_BUFFER_UCHAR
-VOID 
+VOID
 STDCALL
 WRITE_PORT_BUFFER_UCHAR (PUCHAR Port,
                          PUCHAR Buffer,
                          ULONG Count)
 {
-   __asm__ __volatile__ ("cld ; rep ; outsb" 
-			 : "=S" (Buffer), "=c" (Count) 
+   __asm__ __volatile__ ("cld ; rep ; outsb"
+			 : "=S" (Buffer), "=c" (Count)
 			 : "d" (Port),"0" (Buffer),"1" (Count));
 }
 
@@ -149,7 +149,7 @@
                           ULONG Count)
 {
    __asm__ __volatile__ ("cld ; rep ; outsw"
-			 : "=S" (Buffer), "=c" (Count) 
+			 : "=S" (Buffer), "=c" (Count)
 			 : "d" (Port),"0" (Buffer),"1" (Count));
 }
 
@@ -160,8 +160,8 @@
                          ULONG* Buffer,
                          ULONG Count)
 {
-   __asm__ __volatile__ ("cld ; rep ; outsl" 
-			 : "=S" (Buffer), "=c" (Count) 
+   __asm__ __volatile__ ("cld ; rep ; outsl"
+			 : "=S" (Buffer), "=c" (Count)
 			 : "d" (Port),"0" (Buffer),"1" (Count));
 }
 
@@ -172,7 +172,7 @@
                   UCHAR Value)
 {
    __asm__("outb %0, %w1\n\t"
-	   : 
+	   :
 	   : "a" (Value),
 	     "d" (Port));
    SLOW_DOWN_IO;
@@ -185,7 +185,7 @@
                    USHORT Value)
 {
    __asm__("outw %0, %w1\n\t"
-	   : 
+	   :
 	   : "a" (Value),
 	     "d" (Port));
    SLOW_DOWN_IO;
@@ -198,7 +198,7 @@
                   ULONG Value)
 {
    __asm__("outl %0, %w1\n\t"
-	   : 
+	   :
 	   : "a" (Value),
 	     "d" (Port));
    SLOW_DOWN_IO;
  _____  

Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xboxdisk.c
--- branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xboxdisk.c
2005-05-14 19:16:44 UTC (rev 15286)
+++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xboxdisk.c
2005-05-14 19:45:27 UTC (rev 15287)
@@ -149,7 +149,7 @@

 #define IDEWriteDMAStatus(Address, Data) \
   (WRITE_PORT_UCHAR((PUCHAR)((Address) + 2), (Data)))
 #define IDEWritePRDTable(Address, Data) \
-  (WRITE_PORT_ULONG((PULONG)((Address) + 4), (Data)))  
+  (WRITE_PORT_ULONG((PULONG)((Address) + 4), (Data)))
 
 /*
  *  Data block read and write commands
  _____  

Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c
--- branches/xen/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c
2005-05-14 19:16:44 UTC (rev 15286)
+++ branches/xen/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c
2005-05-14 19:45:27 UTC (rev 15287)
@@ -31,11 +31,11 @@

 BOOLEAN AcpiPresent = FALSE;
 char BootPath[0x100];
 
-void le_swap( const void *start_addr_v, 
-              const void *end_addr_v, 
+void le_swap( const void *start_addr_v,
+              const void *end_addr_v,
               const void *target_addr_v ) {
-    long *start_addr = (long *)ROUND_DOWN((long)start_addr_v,8), 
-        *end_addr = (long *)ROUND_UP((long)end_addr_v,8), 
+    long *start_addr = (long *)ROUND_DOWN((long)start_addr_v,8),
+        *end_addr = (long *)ROUND_UP((long)end_addr_v,8),
         *target_addr = (long *)ROUND_DOWN((long)target_addr_v,8);
     long tmp;
     while( start_addr <= end_addr ) {
@@ -107,7 +107,7 @@
 
 void PpcPutChar( int ch ) {
     char buf[3];
-    if( ch == 0x0a ) { buf[0] = 0x0d; buf[1] = 0x0a; } 
+    if( ch == 0x0a ) { buf[0] = 0x0d; buf[1] = 0x0a; }
     else { buf[0] = ch; buf[1] = 0; }
     buf[2] = 0;
     ofw_print_string( buf );
@@ -167,12 +167,12 @@
     return FALSE;
 }
 
-VOID PpcVideoSetPaletteColor( UCHAR Color, 
+VOID PpcVideoSetPaletteColor( UCHAR Color,
                               UCHAR Red, UCHAR Green, UCHAR Blue ) {
     printf( "SetPaletteColor(%x,%x,%x,%x)\n", Color, Red, Green, Blue
);
 }
 
-VOID PpcVideoGetPaletteColor( UCHAR Color, 
+VOID PpcVideoGetPaletteColor( UCHAR Color,
                               UCHAR *Red, UCHAR *Green, UCHAR *Blue ) {
     printf( "GetPaletteColor(%x)\n", Color);
 }
@@ -198,7 +198,7 @@
     BiosMemoryMap[0].BaseAddress = 0;
     BiosMemoryMap[0].Length = 32 * 1024 * 1024; /* Assume 32 meg for
now */
 
-    printf( "Returning memory map (%dk total)\n", 
+    printf( "Returning memory map (%dk total)\n",
             (int)BiosMemoryMap[0].Length / 1024 );
 
     return 1;
@@ -226,7 +226,7 @@
     return 0;
 }
 
-VOID PpcRTCGetCurrentDateTime( PULONG Hear, PULONG Month, PULONG Day, 
+VOID PpcRTCGetCurrentDateTime( PULONG Hear, PULONG Month, PULONG Day,
                                PULONG Hour, PULONG Minute, PULONG
Second ) {
     printf("RTCGeturrentDateTime\n");
 }
@@ -256,7 +256,7 @@
     MachVtbl.VideoSetTextCursorPosition =
PpcVideoSetTextCursorPosition;
     MachVtbl.VideoHideShowTextCursor = PpcVideoHideShowTextCursor;
     MachVtbl.VideoPutChar = PpcVideoPutChar;
-    MachVtbl.VideoCopyOffScreenBufferToVRAM = 
+    MachVtbl.VideoCopyOffScreenBufferToVRAM =
         PpcVideoCopyOffScreenBufferToVRAM;
     MachVtbl.VideoIsPaletteFixed = PpcVideoIsPaletteFixed;
     MachVtbl.VideoSetPaletteColor = PpcVideoSetPaletteColor;
@@ -276,13 +276,13 @@
     MachVtbl.HwDetect = PpcHwDetect;
 
     printf( "FreeLDR version [%s]\n", GetFreeLoaderVersionString() );
-    BootMain("freeldr-ppc");    
+    BootMain("freeldr-ppc");
 }
 
 void MachInit(char *CmdLine) {
     int len;
     printf( "Determining boot device:\n" );
-    len = ofw_getprop(chosen_package, "bootpath", 
+    len = ofw_getprop(chosen_package, "bootpath",
                       BootPath, sizeof(BootPath));
     printf( "Got %d bytes of path\n", len );
     BootPath[len] = 0;
  _____  

Modified: branches/xen/reactos/boot/freeldr/freeldr/bootmgr.c
--- branches/xen/reactos/boot/freeldr/freeldr/bootmgr.c	2005-05-14
19:16:44 UTC (rev 15286)
+++ branches/xen/reactos/boot/freeldr/freeldr/bootmgr.c	2005-05-14
19:45:27 UTC (rev 15287)
@@ -39,12 +39,12 @@

 
 VOID RunLoader(VOID)
 {
-	UCHAR	SettingName[80];
-	UCHAR	SettingValue[80];
+	CHAR	SettingName[80];
+	CHAR	SettingValue[80];
 	ULONG		SectionId;
 	ULONG		OperatingSystemCount;
-	PUCHAR	*OperatingSystemSectionNames;
-	PUCHAR	*OperatingSystemDisplayNames;
+	PCHAR	*OperatingSystemSectionNames;
+	PCHAR	*OperatingSystemDisplayNames;
 	ULONG		DefaultOperatingSystem;
 	LONG		TimeOut;
 	ULONG		SelectedOperatingSystem;
@@ -166,10 +166,10 @@
 	return;
 }
 
-ULONG	 GetDefaultOperatingSystem(PUCHAR OperatingSystemList[], ULONG
OperatingSystemCount)
+ULONG	 GetDefaultOperatingSystem(PCHAR OperatingSystemList[], ULONG
OperatingSystemCount)
 {
-	UCHAR	DefaultOSText[80];
-	char*	DefaultOSName;
+	CHAR	DefaultOSText[80];
+	PCHAR	DefaultOSName;
 	ULONG	SectionId;
 	ULONG	DefaultOS = 0;
 	ULONG	Idx;
@@ -205,7 +205,7 @@
 
 LONG GetTimeOut(VOID)
 {
-	UCHAR	TimeOutText[20];
+	CHAR	TimeOutText[20];
 	LONG		TimeOut;
 	ULONG		SectionId;
 
  _____  

Modified: branches/xen/reactos/boot/freeldr/freeldr/cache/blocklist.c
--- branches/xen/reactos/boot/freeldr/freeldr/cache/blocklist.c
2005-05-14 19:16:44 UTC (rev 15286)
+++ branches/xen/reactos/boot/freeldr/freeldr/cache/blocklist.c
2005-05-14 19:45:27 UTC (rev 15287)
@@ -89,7 +89,7 @@

 			CacheBlock =
(PCACHE_BLOCK)RtlListGetNext((PLIST_ITEM)CacheBlock);
 		}
 	}
-	
+
 	return NULL;
 }
 
  _____  

Modified: branches/xen/reactos/boot/freeldr/freeldr/cmdline.c
--- branches/xen/reactos/boot/freeldr/freeldr/cmdline.c	2005-05-14
19:16:44 UTC (rev 15286)
+++ branches/xen/reactos/boot/freeldr/freeldr/cmdline.c	2005-05-14
19:45:27 UTC (rev 15287)
@@ -18,7 +18,7 @@

  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <freeldr.h>	
+#include <freeldr.h>
 #include <cmdline.h>
 #include <rtl.h>
 
  _____  

Modified: branches/xen/reactos/boot/freeldr/freeldr/custom.c
--- branches/xen/reactos/boot/freeldr/freeldr/custom.c	2005-05-14
19:16:44 UTC (rev 15286)
+++ branches/xen/reactos/boot/freeldr/freeldr/custom.c	2005-05-14
19:45:27 UTC (rev 15287)
@@ -16,7 +16,7 @@

  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-	
+
 #include <freeldr.h>
 #include <rtl.h>
 #include <ui.h>
@@ -32,20 +32,20 @@
 #include <machine.h>
 
 
-UCHAR	BootDrivePrompt[] = "Enter the boot drive.\n\nExamples:\nfd0 -
first floppy drive\nhd0 - first hard drive\nhd1 - second hard drive\ncd0
- first CD-ROM drive.\n\nBIOS drive numbers may also be used:\n0 - first
floppy drive\n0x80 - first hard drive\n0x81 - second hard drive";
-UCHAR	BootPartitionPrompt[] = "Enter the boot partition.\n\nEnter 0
for the active (bootable) partition.";
-UCHAR	BootSectorFilePrompt[] = "Enter the boot sector file
path.\n\nExamples:\n\\BOOTSECT.DOS\n/boot/bootsect.dos";
-UCHAR	LinuxKernelPrompt[] = "Enter the Linux kernel image
path.\n\nExamples:\n/vmlinuz\n/boot/vmlinuz-2.4.18";
-UCHAR	LinuxInitrdPrompt[] = "Enter the initrd image
path.\n\nExamples:\n/initrd.gz\n/boot/root.img.gz\n\nLeave blank for no
initial ram disk.";
-UCHAR	LinuxCommandLinePrompt[] = "Enter the Linux kernel command
line.\n\nExamples:\nroot=/dev/hda1\nroot=/dev/fd0
read-only\nroot=/dev/sdb1 init=/sbin/init";
-UCHAR	ReactOSSystemPathPrompt[] = "Enter the path to your ReactOS
system directory.\n\nExamples:\n\\REACTOS\n\\ROS";
-UCHAR	ReactOSOptionsPrompt[] = "Enter the options you want passed to
the kernel.\n\nExamples:\n/DEBUG /DEBUGPORT=COM1
/BAUDRATE=115200\n/FASTDETECT /SOS /NOGUIBOOT\n/BASEVIDEO
/MAXMEM=64\n/KERNEL=NTKRNLMP.EXE /HAL=HALMPS.DLL";
+CHAR	BootDrivePrompt[] = "Enter the boot drive.\n\nExamples:\nfd0 -
first floppy drive\nhd0 - first hard drive\nhd1 - second hard drive\ncd0
- first CD-ROM drive.\n\nBIOS drive numbers may also be used:\n0 - first
floppy drive\n0x80 - first hard drive\n0x81 - second hard drive";
+CHAR	BootPartitionPrompt[] = "Enter the boot partition.\n\nEnter 0
for the active (bootable) partition.";
+CHAR	BootSectorFilePrompt[] = "Enter the boot sector file
path.\n\nExamples:\n\\BOOTSECT.DOS\n/boot/bootsect.dos";
+CHAR	LinuxKernelPrompt[] = "Enter the Linux kernel image
path.\n\nExamples:\n/vmlinuz\n/boot/vmlinuz-2.4.18";
+CHAR	LinuxInitrdPrompt[] = "Enter the initrd image
path.\n\nExamples:\n/initrd.gz\n/boot/root.img.gz\n\nLeave blank for no
initial ram disk.";
+CHAR	LinuxCommandLinePrompt[] = "Enter the Linux kernel command
line.\n\nExamples:\nroot=/dev/hda1\nroot=/dev/fd0
read-only\nroot=/dev/sdb1 init=/sbin/init";
+CHAR	ReactOSSystemPathPrompt[] = "Enter the path to your ReactOS
system directory.\n\nExamples:\n\\REACTOS\n\\ROS";
+CHAR	ReactOSOptionsPrompt[] = "Enter the options you want passed to
the kernel.\n\nExamples:\n/DEBUG /DEBUGPORT=COM1
/BAUDRATE=115200\n/FASTDETECT /SOS /NOGUIBOOT\n/BASEVIDEO
/MAXMEM=64\n/KERNEL=NTKRNLMP.EXE /HAL=HALMPS.DLL";
 
-UCHAR	CustomBootPrompt[] = "Press ENTER to boot your custom boot
setup.";
+CHAR	CustomBootPrompt[] = "Press ENTER to boot your custom boot
setup.";
 
 VOID OptionMenuCustomBoot(VOID)
 {
-	PUCHAR	CustomBootMenuList[] = { "Disk", "Partition", "Boot
Sector File", "ReactOS", "Linux" };
+	PCHAR	CustomBootMenuList[] = { "Disk", "Partition", "Boot
Sector File", "ReactOS", "Linux" };
 	ULONG		CustomBootMenuCount = sizeof(CustomBootMenuList)
/ sizeof(CustomBootMenuList[0]);
 	ULONG		SelectedMenuItem;
 
@@ -77,8 +77,8 @@
 
 VOID OptionMenuCustomBootDisk(VOID)
 {
-	UCHAR	SectionName[100];
-	UCHAR	BootDriveString[20];
+	CHAR	SectionName[100];
+	CHAR	BootDriveString[20];
 	ULONG	SectionId;
 	ULONG	Year, Month, Day, Hour, Minute, Second;
 
@@ -119,9 +119,9 @@
 
 VOID OptionMenuCustomBootPartition(VOID)
 {
-	UCHAR	SectionName[100];
-	UCHAR	BootDriveString[20];
-	UCHAR	BootPartitionString[20];
+	CHAR	SectionName[100];
+	CHAR	BootDriveString[20];
+	CHAR	BootPartitionString[20];
 	ULONG	SectionId;
 	ULONG	Year, Month, Day, Hour, Minute, Second;
 
@@ -174,10 +174,10 @@
 
 VOID OptionMenuCustomBootBootSectorFile(VOID)
 {
-	UCHAR	SectionName[100];
-	UCHAR	BootDriveString[20];
-	UCHAR	BootPartitionString[20];
-	UCHAR	BootSectorFileString[200];
+	CHAR	SectionName[100];
+	CHAR	BootDriveString[20];
+	CHAR	BootPartitionString[20];
+	CHAR	BootSectorFileString[200];
 	ULONG	SectionId;
 	ULONG	Year, Month, Day, Hour, Minute, Second;
[truncated at 1000 lines; 4009 more skipped]