[weiden] 14919: fixed some warnings with gcc4 (mostly assignment differs in signedness warnings)
fixed some warnings with gcc4 (mostly assignment differs in signedness warnings) Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwcpu.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c Modified: trunk/reactos/boot/freeldr/freeldr/bootmgr.c Modified: trunk/reactos/boot/freeldr/freeldr/custom.c Modified: trunk/reactos/boot/freeldr/freeldr/disk/disk.c Modified: trunk/reactos/boot/freeldr/freeldr/drivemap.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/ext2.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/ext2.h Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.h Modified: trunk/reactos/boot/freeldr/freeldr/fs/fs.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/iso.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/iso.h Modified: trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/ntfs.h Modified: trunk/reactos/boot/freeldr/freeldr/include/bootmgr.h Modified: trunk/reactos/boot/freeldr/freeldr/include/disk.h Modified: trunk/reactos/boot/freeldr/freeldr/include/drivemap.h Modified: trunk/reactos/boot/freeldr/freeldr/include/fs.h Modified: trunk/reactos/boot/freeldr/freeldr/include/inifile.h Modified: trunk/reactos/boot/freeldr/freeldr/include/linux.h Modified: trunk/reactos/boot/freeldr/freeldr/include/miscboot.h Modified: trunk/reactos/boot/freeldr/freeldr/include/multiboot.h Modified: trunk/reactos/boot/freeldr/freeldr/include/oslist.h Modified: trunk/reactos/boot/freeldr/freeldr/include/reactos.h Modified: trunk/reactos/boot/freeldr/freeldr/include/ui.h Modified: trunk/reactos/boot/freeldr/freeldr/include/version.h Modified: trunk/reactos/boot/freeldr/freeldr/inifile/ini.h Modified: trunk/reactos/boot/freeldr/freeldr/inifile/ini_init.c Modified: trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c Modified: trunk/reactos/boot/freeldr/freeldr/inifile/parse.c Modified: trunk/reactos/boot/freeldr/freeldr/linuxboot.c Modified: trunk/reactos/boot/freeldr/freeldr/miscboot.c Modified: trunk/reactos/boot/freeldr/freeldr/options.c Modified: trunk/reactos/boot/freeldr/freeldr/oslist.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/arcname.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/registry.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/registry.h Modified: trunk/reactos/boot/freeldr/freeldr/ui/tui.c Modified: trunk/reactos/boot/freeldr/freeldr/ui/tui.h Modified: trunk/reactos/boot/freeldr/freeldr/ui/tuimenu.c Modified: trunk/reactos/boot/freeldr/freeldr/ui/ui.c Modified: trunk/reactos/boot/freeldr/freeldr/version.c Modified: trunk/reactos/drivers/bus/serenum/pdo.c Modified: trunk/reactos/hal/halx86/include/mps.h Modified: trunk/reactos/include/ntos/rtltypes.h Modified: trunk/reactos/lib/adns/src/event.c Modified: trunk/reactos/lib/adns/src/general.c Modified: trunk/reactos/lib/adns/src/parse.c Modified: trunk/reactos/lib/adns/src/query.c Modified: trunk/reactos/lib/adns/src/reply.c Modified: trunk/reactos/lib/adns/src/transmit.c Modified: trunk/reactos/lib/adns/src/types.c Modified: trunk/reactos/lib/cards/cards.c Modified: trunk/reactos/lib/kernel32/misc/toolhelp.c Modified: trunk/reactos/lib/rosky/libskygi/libskygi.c Modified: trunk/reactos/lib/user32/windows/defwnd.c Modified: trunk/reactos/lib/user32/windows/dialog.c Modified: trunk/reactos/ntoskrnl/ex/list.c Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c Modified: trunk/reactos/ntoskrnl/ex/work.c Modified: trunk/reactos/ntoskrnl/include/internal/i386/ps.h Modified: trunk/reactos/ntoskrnl/io/irp.c Modified: trunk/reactos/ntoskrnl/ke/bug.c Modified: trunk/reactos/ntoskrnl/ke/gmutex.c Modified: trunk/reactos/ntoskrnl/mm/elf.inc.h Modified: trunk/reactos/ntoskrnl/mm/i386/page.c Modified: trunk/reactos/ntoskrnl/ob/object.c Modified: trunk/reactos/ntoskrnl/ps/query.c Modified: trunk/reactos/ntoskrnl/rtl/capture.c Modified: trunk/reactos/ntoskrnl/se/sd.c Modified: trunk/reactos/subsys/system/cmd/dir.c Modified: trunk/reactos/subsys/system/dhcp/adapter.c Modified: trunk/reactos/subsys/system/dhcp/dhclient.c Modified: trunk/reactos/subsys/system/dhcp/include/rosdhcp.h Modified: trunk/reactos/subsys/win32k/misc/ssec.c Modified: trunk/reactos/subsys/win32k/objects/brush.c Modified: trunk/reactos/tools/create_nls/create_nls.c Modified: trunk/reactos/tools/mkhive/binhive.c Modified: trunk/reactos/tools/mkhive/infcache.c Modified: trunk/reactos/tools/mkhive/infcache.h Modified: trunk/reactos/tools/mkhive/reginf.c Modified: trunk/reactos/tools/mkhive/registry.c Modified: trunk/reactos/tools/mkhive/registry.h Modified: trunk/reactos/tools/widl/write_msft.c Modified: trunk/reactos/tools/winebuild/res16.c Modified: trunk/reactos/tools/winebuild/res32.c Modified: trunk/reactos/tools/wrc/dumpres.c Modified: trunk/reactos/tools/wrc/genres.c Modified: trunk/reactos/tools/wrc/readres.c _____
Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c 2005-05-01 18:23:08 UTC (rev 14918) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c 2005-05-01 19:30:06 UTC (rev 14919) @@ -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;
@@ -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: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c 2005-05-01 18:23:08 UTC (rev 14918) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c 2005-05-01 19:30:06 UTC (rev 14919) @@ -92,7 +92,7 @@
Error = RegSetValue(BiosKey, "Identifier", REG_SZ, - (PUCHAR)"ACPI BIOS", + "ACPI BIOS", 10); if (Error != ERROR_SUCCESS) { _____
Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c 2005-05-01 18:23:08 UTC (rev 14918) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c 2005-05-01 19:30:06 UTC (rev 14919) @@ -95,7 +95,7 @@
Error = RegSetValue(BiosKey, "Identifier", REG_SZ, - (PUCHAR)"APM", + "APM", 4); if (Error != ERROR_SUCCESS) { _____
Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwcpu.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwcpu.c 2005-05-01 18:23:08 UTC (rev 14918) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwcpu.c 2005-05-01 19:30:06 UTC (rev 14919) @@ -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) { _____
Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c 2005-05-01 18:23:08 UTC (rev 14918) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c 2005-05-01 19:30:06 UTC (rev 14919) @@ -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: trunk/reactos/boot/freeldr/freeldr/bootmgr.c --- trunk/reactos/boot/freeldr/freeldr/bootmgr.c 2005-05-01 18:23:08 UTC (rev 14918) +++ trunk/reactos/boot/freeldr/freeldr/bootmgr.c 2005-05-01 19:30:06 UTC (rev 14919) @@ -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: trunk/reactos/boot/freeldr/freeldr/custom.c --- trunk/reactos/boot/freeldr/freeldr/custom.c 2005-05-01 18:23:08 UTC (rev 14918) +++ trunk/reactos/boot/freeldr/freeldr/custom.c 2005-05-01 19:30:06 UTC (rev 14919) @@ -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;
@@ -242,12 +242,12 @@
VOID OptionMenuCustomBootReactOS(VOID) { - UCHAR SectionName[100]; - UCHAR BootDriveString[20]; - UCHAR BootPartitionString[20]; - UCHAR ReactOSSystemPath[200]; - UCHAR ReactOSARCPath[200]; - UCHAR ReactOSOptions[200]; + CHAR SectionName[100]; + CHAR BootDriveString[20]; + CHAR BootPartitionString[20]; + CHAR ReactOSSystemPath[200]; + CHAR ReactOSARCPath[200]; + CHAR ReactOSOptions[200]; ULONG SectionId; ULONG Year, Month, Day, Hour, Minute, Second;
@@ -315,12 +315,12 @@
VOID OptionMenuCustomBootLinux(VOID) { - UCHAR SectionName[100]; - UCHAR BootDriveString[20]; - UCHAR BootPartitionString[20]; - UCHAR LinuxKernelString[200]; - UCHAR LinuxInitrdString[200]; - UCHAR LinuxCommandLineString[200]; + CHAR SectionName[100]; + CHAR BootDriveString[20]; + CHAR BootPartitionString[20]; + CHAR LinuxKernelString[200]; + CHAR LinuxInitrdString[200]; + CHAR LinuxCommandLineString[200]; ULONG SectionId; ULONG Year, Month, Day, Hour, Minute, Second;
_____
Modified: trunk/reactos/boot/freeldr/freeldr/disk/disk.c --- trunk/reactos/boot/freeldr/freeldr/disk/disk.c 2005-05-01 18:23:08 UTC (rev 14918) +++ trunk/reactos/boot/freeldr/freeldr/disk/disk.c 2005-05-01 19:30:06 UTC (rev 14919) @@ -39,9 +39,9 @@
bReportError = bError; }
-VOID DiskError(PUCHAR ErrorString, ULONG ErrorCode) +VOID DiskError(PCHAR ErrorString, ULONG ErrorCode) { - UCHAR ErrorCodeString[200]; + CHAR ErrorCodeString[200];
if (bReportError == FALSE) return; @@ -53,7 +53,7 @@ UiMessageBox(ErrorCodeString); }
-PUCHAR DiskGetErrorCodeString(ULONG ErrorCode) +PCHAR DiskGetErrorCodeString(ULONG ErrorCode) { switch (ErrorCode) { _____
Modified: trunk/reactos/boot/freeldr/freeldr/drivemap.c --- trunk/reactos/boot/freeldr/freeldr/drivemap.c 2005-05-01 18:23:08 UTC (rev 14918) +++ trunk/reactos/boot/freeldr/freeldr/drivemap.c 2005-05-01 19:30:06 UTC (rev 14919) @@ -30,13 +30,13 @@
ULONG DriveMapHandlerAddress = 0; // Linear address of our drive map handler ULONG DriveMapHandlerSegOff = 0; // Segment:offset style address of our drive map handler
-VOID DriveMapMapDrivesInSection(PUCHAR SectionName) +VOID DriveMapMapDrivesInSection(PCHAR SectionName) { - UCHAR SettingName[80]; - UCHAR SettingValue[80]; - UCHAR ErrorText[260]; - UCHAR Drive1[80]; - UCHAR Drive2[80]; + CHAR SettingName[80]; + CHAR SettingValue[80]; + CHAR ErrorText[260]; + CHAR Drive1[80]; + CHAR Drive2[80]; ULONG SectionId; ULONG SectionItemCount; ULONG Index; @@ -117,7 +117,7 @@ } }
-BOOL DriveMapIsValidDriveString(PUCHAR DriveString) +BOOL DriveMapIsValidDriveString(PCHAR DriveString) { ULONG Index; @@ -147,7 +147,7 @@ return TRUE; }
-ULONG DriveMapGetBiosDriveNumber(PUCHAR DeviceName) +ULONG DriveMapGetBiosDriveNumber(PCHAR DeviceName) { ULONG BiosDriveNumber = 0;
_____
Modified: trunk/reactos/boot/freeldr/freeldr/fs/ext2.c --- trunk/reactos/boot/freeldr/freeldr/fs/ext2.c 2005-05-01 18:23:08 UTC (rev 14918) +++ trunk/reactos/boot/freeldr/freeldr/fs/ext2.c 2005-05-01 19:30:06 UTC (rev 14919) @@ -87,12 +87,12 @@
* Tries to open the file 'name' and returns true or false * for success and failure respectively */ -FILE* Ext2OpenFile(PUCHAR FileName) +FILE* Ext2OpenFile(PCHAR FileName) { EXT2_FILE_INFO TempExt2FileInfo; PEXT2_FILE_INFO FileHandle; - UCHAR SymLinkPath[EXT3_NAME_LEN]; - UCHAR FullPath[EXT3_NAME_LEN * 2]; + CHAR SymLinkPath[EXT3_NAME_LEN]; + CHAR FullPath[EXT3_NAME_LEN * 2]; ULONG Index;
DbgPrint((DPRINT_FILESYSTEM, "Ext2OpenFile() FileName = %s\n", FileName)); @@ -190,11 +190,11 @@ * with info describing the file, etc. returns true * if the file exists or false otherwise */ -BOOL Ext2LookupFile(PUCHAR FileName, PEXT2_FILE_INFO Ext2FileInfoPointer) +BOOL Ext2LookupFile(PCHAR FileName, PEXT2_FILE_INFO Ext2FileInfoPointer) { int i; ULONG NumberOfPathParts; - UCHAR PathPart[261]; + CHAR PathPart[261]; PVOID DirectoryBuffer; ULONG DirectoryInode = EXT3_ROOT_INO; EXT2_INODE InodeData; @@ -289,7 +289,7 @@ return TRUE; }
-BOOL Ext2SearchDirectoryBufferForFile(PVOID DirectoryBuffer, ULONG DirectorySize, PUCHAR FileName, PEXT2_DIR_ENTRY DirectoryEntry) +BOOL Ext2SearchDirectoryBufferForFile(PVOID DirectoryBuffer, ULONG DirectorySize, PCHAR FileName, PEXT2_DIR_ENTRY DirectoryEntry) { ULONG CurrentOffset; PEXT2_DIR_ENTRY CurrentDirectoryEntry; @@ -839,7 +839,7 @@
BOOL Ext2ReadBlock(ULONG BlockNumber, PVOID Buffer) { - UCHAR ErrorString[80]; + CHAR ErrorString[80];
DbgPrint((DPRINT_FILESYSTEM, "Ext2ReadBlock() BlockNumber = %d Buffer = 0x%x\n", BlockNumber, Buffer));
@@ -913,7 +913,7 @@ ULONG InodeGroupNumber; ULONG InodeBlockNumber; ULONG InodeOffsetInBlock; - UCHAR ErrorString[80]; + CHAR ErrorString[80]; EXT2_GROUP_DESC GroupDescriptor;
DbgPrint((DPRINT_FILESYSTEM, "Ext2ReadInode() Inode = %d\n", Inode)); _____
Modified: trunk/reactos/boot/freeldr/freeldr/fs/ext2.h --- trunk/reactos/boot/freeldr/freeldr/fs/ext2.h 2005-05-01 18:23:08 UTC (rev 14918) +++ trunk/reactos/boot/freeldr/freeldr/fs/ext2.h 2005-05-01 19:30:06 UTC (rev 14919) @@ -558,7 +558,7 @@
ULONG inode; /* Inode number */ USHORT rec_len; /* Directory entry length */ USHORT name_len; /* Name length */ - char name[EXT3_NAME_LEN]; /* File name */ + CHAR name[EXT3_NAME_LEN]; /* File name */ };
/* @@ -572,7 +572,7 @@ USHORT rec_len; /* Directory entry length */ UCHAR name_len; /* Name length */ UCHAR file_type; - char name[EXT3_NAME_LEN]; /* File name */ + CHAR name[EXT3_NAME_LEN]; /* File name */ };
/* @@ -667,9 +667,9 @@
BOOL Ext2OpenVolume(UCHAR DriveNumber, ULONGLONG VolumeStartSector); -FILE* Ext2OpenFile(PUCHAR FileName); -BOOL Ext2LookupFile(PUCHAR FileName, PEXT2_FILE_INFO Ext2FileInfoPointer); -BOOL Ext2SearchDirectoryBufferForFile(PVOID DirectoryBuffer, ULONG DirectorySize, PUCHAR FileName, PEXT2_DIR_ENTRY DirectoryEntry); +FILE* Ext2OpenFile(PCHAR FileName); +BOOL Ext2LookupFile(PCHAR FileName, PEXT2_FILE_INFO Ext2FileInfoPointer); +BOOL Ext2SearchDirectoryBufferForFile(PVOID DirectoryBuffer, ULONG DirectorySize, PCHAR FileName, PEXT2_DIR_ENTRY DirectoryEntry); BOOL Ext2ReadFile(FILE *FileHandle, ULONGLONG BytesToRead, ULONGLONG* BytesRead, PVOID Buffer); ULONGLONG Ext2GetFileSize(FILE *FileHandle); VOID Ext2SetFilePointer(FILE *FileHandle, ULONGLONG NewFilePointer); _____
Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c --- trunk/reactos/boot/freeldr/freeldr/fs/fat.c 2005-05-01 18:23:08 UTC (rev 14918) +++ trunk/reactos/boot/freeldr/freeldr/fs/fat.c 2005-05-01 19:30:06 UTC (rev 14919) @@ -405,22 +405,22 @@
return DirectoryBuffer; }
-BOOL FatSearchDirectoryBufferForFile(PVOID DirectoryBuffer, ULONG DirectorySize, PUCHAR FileName, PFAT_FILE_INFO FatFileInfoPointer) +BOOL FatSearchDirectoryBufferForFile(PVOID DirectoryBuffer, ULONG DirectorySize, PCHAR FileName, PFAT_FILE_INFO FatFileInfoPointer) { ULONG EntryCount; ULONG CurrentEntry; PDIRENTRY DirEntry; PLFN_DIRENTRY LfnDirEntry; - UCHAR LfnNameBuffer[265]; - UCHAR ShortNameBuffer[20]; + CHAR LfnNameBuffer[265]; + CHAR ShortNameBuffer[20]; ULONG StartCluster;
EntryCount = DirectorySize / sizeof(DIRENTRY);
DbgPrint((DPRINT_FILESYSTEM, "FatSearchDirectoryBufferForFile() DirectoryBuffer = 0x%x EntryCount = %d FileName = %s\n", DirectoryBuffer, EntryCount, FileName));
- memset(ShortNameBuffer, 0, 13 * sizeof(UCHAR)); - memset(LfnNameBuffer, 0, 261 * sizeof(UCHAR)); + memset(ShortNameBuffer, 0, 13 * sizeof(CHAR)); + memset(LfnNameBuffer, 0, 261 * sizeof(CHAR));
DirEntry = (PDIRENTRY) DirectoryBuffer; for (CurrentEntry=0; CurrentEntry<EntryCount; CurrentEntry++, DirEntry++) @@ -436,7 +436,7 @@ // entries after this one are unused. If this is the // last entry then we didn't find the file in this directory. // - if (DirEntry->FileName[0] == 0x00) + if (DirEntry->FileName[0] == '\0') { return FALSE; } @@ -444,10 +444,10 @@ // // Check if this is a deleted entry or not // - if (DirEntry->FileName[0] == 0xE5) + if (DirEntry->FileName[0] == '\xE5') { - memset(ShortNameBuffer, 0, 13 * sizeof(UCHAR)); - memset(LfnNameBuffer, 0, 261 * sizeof(UCHAR)); + memset(ShortNameBuffer, 0, 13 * sizeof(CHAR)); + memset(LfnNameBuffer, 0, 261 * sizeof(CHAR)); continue; }
@@ -616,7 +616,7 @@ return FALSE; }
-BOOL FatXSearchDirectoryBufferForFile(PVOID DirectoryBuffer, ULONG DirectorySize, PUCHAR FileName, PFAT_FILE_INFO FatFileInfoPointer) +BOOL FatXSearchDirectoryBufferForFile(PVOID DirectoryBuffer, ULONG DirectorySize, PCHAR FileName, PFAT_FILE_INFO FatFileInfoPointer) { ULONG EntryCount; ULONG CurrentEntry; @@ -687,11 +687,11 @@ * with info describing the file, etc. returns true * if the file exists or false otherwise */ -BOOL FatLookupFile(PUCHAR FileName, PFAT_FILE_INFO FatFileInfoPointer) +BOOL FatLookupFile(PCHAR FileName, PFAT_FILE_INFO FatFileInfoPointer) { int i; ULONG NumberOfPathParts; - UCHAR PathPart[261]; + CHAR PathPart[261]; PVOID DirectoryBuffer; ULONG DirectoryStartCluster = 0; ULONG DirectorySize; @@ -777,7 +777,7 @@ * is in the form of "FILE EXT" and puts it in Buffer * in the form of "file.ext" */ -void FatParseShortFileName(PUCHAR Buffer, PDIRENTRY DirEntry) +void FatParseShortFileName(PCHAR Buffer, PDIRENTRY DirEntry) { ULONG Idx;
@@ -915,7 +915,7 @@ * Tries to open the file 'name' and returns true or false * for success and failure respectively */ -FILE* FatOpenFile(PUCHAR FileName) +FILE* FatOpenFile(PCHAR FileName) { FAT_FILE_INFO TempFatFileInfo; PFAT_FILE_INFO FileHandle; _____
Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.h --- trunk/reactos/boot/freeldr/freeldr/fs/fat.h 2005-05-01 18:23:08 UTC (rev 14918) +++ trunk/reactos/boot/freeldr/freeldr/fs/fat.h 2005-05-01 19:30:06 UTC (rev 14919) @@ -23,7 +23,7 @@
typedef struct _FAT_BOOTSECTOR { UCHAR JumpBoot[3]; // Jump instruction to boot code - UCHAR OemName[8]; // "MSWIN4.1" for MS formatted volumes + CHAR OemName[8]; // "MSWIN4.1" for MS formatted volumes USHORT BytesPerSector; // Bytes per sector UCHAR SectorsPerCluster; // Number of sectors in a cluster USHORT ReservedSectors; // Reserved sectors, usually 1 (the bootsector) @@ -40,8 +40,8 @@ UCHAR Reserved1; // Reserved (used by Windows NT). Code that formats FAT volumes should always set this byte to 0. UCHAR BootSignature; // Extended boot signature (0x29). This is a signature byte that indicates that the following three fields in the boot sector are present. ULONG VolumeSerialNumber; // Volume serial number - UCHAR VolumeLabel[11]; // Volume label. This field matches the 11-byte volume label recorded in the root directory - UCHAR FileSystemType[8]; // One of the strings "FAT12 ", "FAT16 ", or "FAT " + CHAR VolumeLabel[11]; // Volume label. This field matches the 11-byte volume label recorded in the root directory + CHAR FileSystemType[8]; // One of the strings "FAT12 ", "FAT16 ", or "FAT "
UCHAR BootCodeAndData[448]; // The remainder of the boot sector
@@ -52,7 +52,7 @@ typedef struct _FAT32_BOOTSECTOR { UCHAR JumpBoot[3]; // Jump instruction to boot code - UCHAR OemName[8]; // "MSWIN4.1" for MS formatted volumes + CHAR OemName[8]; // "MSWIN4.1" for MS formatted volumes USHORT BytesPerSector; // Bytes per sector UCHAR SectorsPerCluster; // Number of sectors in a cluster USHORT ReservedSectors; // Reserved sectors, usually 1 (the bootsector) @@ -76,8 +76,8 @@ UCHAR Reserved1; // Reserved (used by Windows NT). Code that formats FAT volumes should always set this byte to 0. UCHAR BootSignature; // Extended boot signature (0x29). This is a signature byte that indicates that the following three fields in the boot sector are present. ULONG VolumeSerialNumber; // Volume serial number - UCHAR VolumeLabel[11]; // Volume label. This field matches the 11-byte volume label recorded in the root directory - UCHAR FileSystemType[8]; // Always set to the string "FAT32 " + CHAR VolumeLabel[11]; // Volume label. This field matches the 11-byte volume label recorded in the root directory + CHAR FileSystemType[8]; // Always set to the string "FAT32 "
UCHAR BootCodeAndData[420]; // The remainder of the boot sector
@@ -87,7 +87,7 @@
typedef struct _FATX_BOOTSECTOR { - UCHAR FileSystemType[4]; /* String "FATX" */ + CHAR FileSystemType[4]; /* String "FATX" */ ULONG VolumeSerialNumber; /* Volume serial number */ ULONG SectorsPerCluster; /* Number of sectors in a cluster */ USHORT NumberOfFats; /* Number of FAT tables */ @@ -101,7 +101,7 @@ */ typedef struct //_DIRENTRY { - UCHAR FileName[11]; /* Filename + extension */ + CHAR FileName[11]; /* Filename + extension */ UCHAR Attr; /* File attributes */ UCHAR ReservedNT; /* Reserved for use by Windows NT */ UCHAR TimeInTenths; /* Millisecond stamp at file creation */ @@ -131,7 +131,7 @@ { UCHAR FileNameSize; /* Size of filename (max 42) */ UCHAR Attr; /* File attributes */ - UCHAR FileName[42]; /* Filename in ASCII, padded with 0xff (not zero-terminated) */ + CHAR FileName[42]; /* Filename in ASCII, padded with 0xff (not zero-terminated) */ ULONG StartCluster; /* Starting cluster number */ ULONG Size; /* File size */ USHORT Time; /* Time last modified */ @@ -155,11 +155,11 @@ BOOL FatOpenVolume(ULONG DriveNumber, ULONG VolumeStartSector, ULONG PartitionSectorCount); ULONG FatDetermineFatType(PFAT_BOOTSECTOR FatBootSector, ULONG PartitionSectorCount); PVOID FatBufferDirectory(ULONG DirectoryStartCluster, ULONG* EntryCountPointer, BOOL RootDirectory); -BOOL FatSearchDirectoryBufferForFile(PVOID DirectoryBuffer, ULONG EntryCount, PUCHAR FileName, PFAT_FILE_INFO FatFileInfoPointer); -BOOL FatLookupFile(PUCHAR FileName, PFAT_FILE_INFO FatFileInfoPointer); -void FatParseShortFileName(PUCHAR Buffer, PDIRENTRY DirEntry); +BOOL FatSearchDirectoryBufferForFile(PVOID DirectoryBuffer, ULONG EntryCount, PCHAR FileName, PFAT_FILE_INFO FatFileInfoPointer); +BOOL FatLookupFile(PCHAR FileName, PFAT_FILE_INFO FatFileInfoPointer); +void FatParseShortFileName(PCHAR Buffer, PDIRENTRY DirEntry); BOOL FatGetFatEntry(ULONG Cluster, ULONG* ClusterPointer); -FILE* FatOpenFile(PUCHAR FileName); +FILE* FatOpenFile(PCHAR FileName); ULONG FatCountClustersInChain(ULONG StartCluster); ULONG* FatGetClusterChainArray(ULONG StartCluster); BOOL FatReadCluster(ULONG ClusterNumber, PVOID Buffer); _____
Modified: trunk/reactos/boot/freeldr/freeldr/fs/fs.c --- trunk/reactos/boot/freeldr/freeldr/fs/fs.c 2005-05-01 18:23:08 UTC (rev 14918) +++ trunk/reactos/boot/freeldr/freeldr/fs/fs.c 2005-05-01 19:30:06 UTC (rev 14919) @@ -42,7 +42,7 @@
// FUNCTIONS
//////////////////////////////////////////////////////////////////////// /////////////////////
-VOID FileSystemError(PUCHAR ErrorString) +VOID FileSystemError(PCHAR ErrorString) { DbgPrint((DPRINT_FILESYSTEM, "%s\n", ErrorString));
@@ -59,7 +59,7 @@ */ static BOOL FsOpenVolume(ULONG DriveNumber, ULONGLONG StartSector, ULONGLONG SectorCount, int Type) { - UCHAR ErrorText[80]; + CHAR ErrorText[80];
FsType = Type;
@@ -123,7 +123,7 @@ }
-PFILE FsOpenFile(PUCHAR FileName) +PFILE FsOpenFile(PCHAR FileName) { PFILE FileHandle = NULL;
@@ -337,7 +337,7 @@ * This function parses a path in the form of dir1\dir2\file1.ext * and returns the number of parts it has (i.e. 3 - dir1,dir2,file1.ext) */ -ULONG FsGetNumPathParts(PUCHAR Path) +ULONG FsGetNumPathParts(PCHAR Path) { ULONG i; ULONG num; @@ -362,7 +362,7 @@ * and puts the first name of the path (e.g. "dir1") in buffer * compatible with the MSDOS directory structure */ -VOID FsGetFirstNameFromPath(PUCHAR Buffer, PUCHAR Path) +VOID FsGetFirstNameFromPath(PCHAR Buffer, PCHAR Path) { ULONG i;
_____
Modified: trunk/reactos/boot/freeldr/freeldr/fs/iso.c --- trunk/reactos/boot/freeldr/freeldr/fs/iso.c 2005-05-01 18:23:08 UTC (rev 14918) +++ trunk/reactos/boot/freeldr/freeldr/fs/iso.c 2005-05-01 19:30:06 UTC (rev 14919) @@ -65,12 +65,12 @@
}
-static BOOL IsoSearchDirectoryBufferForFile(PVOID DirectoryBuffer, ULONG DirectoryLength, PUCHAR FileName, PISO_FILE_INFO IsoFileInfoPointer) +static BOOL IsoSearchDirectoryBufferForFile(PVOID DirectoryBuffer, ULONG DirectoryLength, PCHAR FileName, PISO_FILE_INFO IsoFileInfoPointer) { PDIR_RECORD Record; ULONG Offset; ULONG i; - UCHAR Name[32]; + CHAR Name[32];
DbgPrint((DPRINT_FILESYSTEM, "IsoSearchDirectoryBufferForFile() DirectoryBuffer = 0x%x DirectoryLength = %d FileName = %s\n", DirectoryBuffer, DirectoryLength, FileName));
@@ -180,11 +180,11 @@ * with info describing the file, etc. returns true * if the file exists or false otherwise */ -static BOOL IsoLookupFile(PUCHAR FileName, PISO_FILE_INFO IsoFileInfoPointer) +static BOOL IsoLookupFile(PCHAR FileName, PISO_FILE_INFO IsoFileInfoPointer) { int i; ULONG NumberOfPathParts; [truncated at 1000 lines; 2895 more skipped]
-
weiden＠svn.reactos.com