Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/archmach.c
Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c
Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.h
Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c
Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.h
Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c
Modified: trunk/reactos/boot/freeldr/freeldr/bootmgr.c
Modified: trunk/reactos/boot/freeldr/freeldr/cmdline.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/freeldr.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/cmdline.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/machine.h
Modified: trunk/reactos/boot/freeldr/freeldr/include/miscboot.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/rtl.h
Modified: trunk/reactos/boot/freeldr/freeldr/include/ui.h
Modified: trunk/reactos/boot/freeldr/freeldr/inifile/inifile.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/binhive.c
Modified: trunk/reactos/boot/freeldr/freeldr/reactos/loader.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/gui.c
Modified: trunk/reactos/boot/freeldr/freeldr/ui/gui.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
--- trunk/reactos/boot/freeldr/freeldr/arch/i386/archmach.c 2005-11-11 18:09:46 UTC (rev 19134)
+++ trunk/reactos/boot/freeldr/freeldr/arch/i386/archmach.c 2005-11-11 18:11:17 UTC (rev 19135)
@@ -27,7 +27,7 @@
#include "rtl.h"
VOID
-MachInit(char *CmdLine)
+MachInit(const char *CmdLine)
{
ULONG PciId;
--- trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c 2005-11-11 18:09:46 UTC (rev 19134)
+++ trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c 2005-11-11 18:11:17 UTC (rev 19135)
@@ -26,7 +26,7 @@
#include "i386.h"
VOID
-PcMachInit(char *CmdLine)
+PcMachInit(const char *CmdLine)
{
EnableA20();
--- trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.h 2005-11-11 18:09:46 UTC (rev 19134)
+++ trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.h 2005-11-11 18:11:17 UTC (rev 19135)
@@ -26,7 +26,7 @@
#include "mm.h"
#endif
-VOID PcMachInit(char *CmdLine);
+VOID PcMachInit(const char *CmdLine);
VOID PcConsPutChar(int Ch);
BOOL PcConsKbHit();
--- trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c 2005-11-11 18:09:46 UTC (rev 19134)
+++ trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c 2005-11-11 18:11:17 UTC (rev 19135)
@@ -24,7 +24,7 @@
#include "i386.h"
VOID
-XboxMachInit(char *CmdLine)
+XboxMachInit(const char *CmdLine)
{
/* Initialize our stuff */
XboxMemInit();
--- trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.h 2005-11-11 18:09:46 UTC (rev 19134)
+++ trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.h 2005-11-11 18:11:17 UTC (rev 19135)
@@ -26,7 +26,7 @@
UCHAR XboxFont8x16[256 * 16];
-VOID XboxMachInit(char *CmdLine);
+VOID XboxMachInit(const char *CmdLine);
VOID XboxConsPutChar(int Ch);
BOOL XboxConsKbHit();
--- trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c 2005-11-11 18:09:46 UTC (rev 19134)
+++ trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c 2005-11-11 18:11:17 UTC (rev 19135)
@@ -279,7 +279,7 @@
BootMain("freeldr-ppc");
}
-void MachInit(char *CmdLine) {
+void MachInit(const char *CmdLine) {
int len;
printf( "Determining boot device:\n" );
len = ofw_getprop(chosen_package, "bootpath",
--- trunk/reactos/boot/freeldr/freeldr/bootmgr.c 2005-11-11 18:09:46 UTC (rev 19134)
+++ trunk/reactos/boot/freeldr/freeldr/bootmgr.c 2005-11-11 18:11:17 UTC (rev 19135)
@@ -43,8 +43,8 @@
CHAR SettingValue[80];
ULONG SectionId;
ULONG OperatingSystemCount;
- PCHAR *OperatingSystemSectionNames;
- PCHAR *OperatingSystemDisplayNames;
+ PCSTR *OperatingSystemSectionNames;
+ PCSTR *OperatingSystemDisplayNames;
ULONG DefaultOperatingSystem;
LONG TimeOut;
ULONG SelectedOperatingSystem;
@@ -166,10 +166,10 @@
return;
}
-ULONG GetDefaultOperatingSystem(PCHAR OperatingSystemList[], ULONG OperatingSystemCount)
+ULONG GetDefaultOperatingSystem(PCSTR OperatingSystemList[], ULONG OperatingSystemCount)
{
CHAR DefaultOSText[80];
- PCHAR DefaultOSName;
+ PCSTR DefaultOSName;
ULONG SectionId;
ULONG DefaultOS = 0;
ULONG Idx;
--- trunk/reactos/boot/freeldr/freeldr/cmdline.c 2005-11-11 18:09:46 UTC (rev 19134)
+++ trunk/reactos/boot/freeldr/freeldr/cmdline.c 2005-11-11 18:11:17 UTC (rev 19135)
@@ -106,7 +106,7 @@
}
}
-char *
+const char *
CmdLineGetDefaultOS(void)
{
return CmdLineInfo.DefaultOperatingSystem;
--- trunk/reactos/boot/freeldr/freeldr/custom.c 2005-11-11 18:09:46 UTC (rev 19134)
+++ trunk/reactos/boot/freeldr/freeldr/custom.c 2005-11-11 18:11:17 UTC (rev 19135)
@@ -32,20 +32,20 @@
#include <machine.h>
-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";
+const 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";
+const CHAR BootPartitionPrompt[] = "Enter the boot partition.\n\nEnter 0 for the active (bootable) partition.";
+const CHAR BootSectorFilePrompt[] = "Enter the boot sector file path.\n\nExamples:\n\\BOOTSECT.DOS\n/boot/bootsect.dos";
+const CHAR LinuxKernelPrompt[] = "Enter the Linux kernel image path.\n\nExamples:\n/vmlinuz\n/boot/vmlinuz-2.4.18";
+const 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.";
+const CHAR LinuxCommandLinePrompt[] = "Enter the Linux kernel command line.\n\nExamples:\nroot=/dev/hda1\nroot=/dev/fd0 read-only\nroot=/dev/sdb1 init=/sbin/init";
+const CHAR ReactOSSystemPathPrompt[] = "Enter the path to your ReactOS system directory.\n\nExamples:\n\\REACTOS\n\\ROS";
+const 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";
-CHAR CustomBootPrompt[] = "Press ENTER to boot your custom boot setup.";
+const CHAR CustomBootPrompt[] = "Press ENTER to boot your custom boot setup.";
VOID OptionMenuCustomBoot(VOID)
{
- PCHAR CustomBootMenuList[] = { "Disk", "Partition", "Boot Sector File", "ReactOS", "Linux" };
+ PCSTR CustomBootMenuList[] = { "Disk", "Partition", "Boot Sector File", "ReactOS", "Linux" };
ULONG CustomBootMenuCount = sizeof(CustomBootMenuList) / sizeof(CustomBootMenuList[0]);
ULONG SelectedMenuItem;
--- trunk/reactos/boot/freeldr/freeldr/disk/disk.c 2005-11-11 18:09:46 UTC (rev 19134)
+++ trunk/reactos/boot/freeldr/freeldr/disk/disk.c 2005-11-11 18:11:17 UTC (rev 19135)
@@ -39,7 +39,7 @@
bReportError = bError;
}
-VOID DiskError(PCHAR ErrorString, ULONG ErrorCode)
+VOID DiskError(PCSTR ErrorString, ULONG ErrorCode)
{
CHAR ErrorCodeString[200];
@@ -53,7 +53,7 @@
UiMessageBox(ErrorCodeString);
}
-PCHAR DiskGetErrorCodeString(ULONG ErrorCode)
+PCSTR DiskGetErrorCodeString(ULONG ErrorCode)
{
switch (ErrorCode)
{
--- trunk/reactos/boot/freeldr/freeldr/drivemap.c 2005-11-11 18:09:46 UTC (rev 19134)
+++ trunk/reactos/boot/freeldr/freeldr/drivemap.c 2005-11-11 18:11:17 UTC (rev 19135)
@@ -30,7 +30,7 @@
ULONG DriveMapHandlerAddress = 0; // Linear address of our drive map handler
ULONG DriveMapHandlerSegOff = 0; // Segment:offset style address of our drive map handler
-VOID DriveMapMapDrivesInSection(PCHAR SectionName)
+VOID DriveMapMapDrivesInSection(PCSTR SectionName)
{
CHAR SettingName[80];
CHAR SettingValue[80];
@@ -117,7 +117,7 @@
}
}
-BOOL DriveMapIsValidDriveString(PCHAR DriveString)
+BOOL DriveMapIsValidDriveString(PCSTR DriveString)
{
ULONG Index;
@@ -147,7 +147,7 @@
return TRUE;
}
-ULONG DriveMapGetBiosDriveNumber(PCHAR DeviceName)
+ULONG DriveMapGetBiosDriveNumber(PCSTR DeviceName)
{
ULONG BiosDriveNumber = 0;
--- trunk/reactos/boot/freeldr/freeldr/freeldr.c 2005-11-11 18:09:46 UTC (rev 19134)
+++ trunk/reactos/boot/freeldr/freeldr/freeldr.c 2005-11-11 18:11:17 UTC (rev 19135)
@@ -27,7 +27,7 @@
#include <fs.h>
#include <cmdline.h>
-VOID BootMain(char *CmdLine)
+VOID BootMain(LPSTR CmdLine)
{
CmdLineParse(CmdLine);
--- trunk/reactos/boot/freeldr/freeldr/fs/ext2.c 2005-11-11 18:09:46 UTC (rev 19134)
+++ trunk/reactos/boot/freeldr/freeldr/fs/ext2.c 2005-11-11 18:11:17 UTC (rev 19135)
@@ -87,7 +87,7 @@
* Tries to open the file 'name' and returns true or false
* for success and failure respectively
*/
-FILE* Ext2OpenFile(PCHAR FileName)
+FILE* Ext2OpenFile(PCSTR FileName)
{
EXT2_FILE_INFO TempExt2FileInfo;
PEXT2_FILE_INFO FileHandle;
@@ -190,7 +190,7 @@
* with info describing the file, etc. returns true
* if the file exists or false otherwise
*/
-BOOL Ext2LookupFile(PCHAR FileName, PEXT2_FILE_INFO Ext2FileInfoPointer)
+BOOL Ext2LookupFile(PCSTR FileName, PEXT2_FILE_INFO Ext2FileInfoPointer)
{
UINT i;
ULONG NumberOfPathParts;
--- trunk/reactos/boot/freeldr/freeldr/fs/ext2.h 2005-11-11 18:09:46 UTC (rev 19134)
+++ trunk/reactos/boot/freeldr/freeldr/fs/ext2.h 2005-11-11 18:11:17 UTC (rev 19135)
@@ -667,8 +667,8 @@
BOOL Ext2OpenVolume(UCHAR DriveNumber, ULONGLONG VolumeStartSector);
-FILE* Ext2OpenFile(PCHAR FileName);
-BOOL Ext2LookupFile(PCHAR FileName, PEXT2_FILE_INFO Ext2FileInfoPointer);
+FILE* Ext2OpenFile(PCSTR FileName);
+BOOL Ext2LookupFile(PCSTR 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);
--- trunk/reactos/boot/freeldr/freeldr/fs/fat.c 2005-11-11 18:09:46 UTC (rev 19134)
+++ trunk/reactos/boot/freeldr/freeldr/fs/fat.c 2005-11-11 18:11:17 UTC (rev 19135)
@@ -687,7 +687,7 @@
* with info describing the file, etc. returns true
* if the file exists or false otherwise
*/
-BOOL FatLookupFile(PCHAR FileName, PFAT_FILE_INFO FatFileInfoPointer)
+BOOL FatLookupFile(PCSTR FileName, PFAT_FILE_INFO FatFileInfoPointer)
{
UINT i;
ULONG NumberOfPathParts;
@@ -915,7 +915,7 @@
* Tries to open the file 'name' and returns true or false
* for success and failure respectively
*/
-FILE* FatOpenFile(PCHAR FileName)
+FILE* FatOpenFile(PCSTR FileName)
{
FAT_FILE_INFO TempFatFileInfo;
PFAT_FILE_INFO FileHandle;
--- trunk/reactos/boot/freeldr/freeldr/fs/fat.h 2005-11-11 18:09:46 UTC (rev 19134)
+++ trunk/reactos/boot/freeldr/freeldr/fs/fat.h 2005-11-11 18:11:17 UTC (rev 19135)
@@ -156,10 +156,10 @@
ULONG FatDetermineFatType(PFAT_BOOTSECTOR FatBootSector, ULONG PartitionSectorCount);
PVOID FatBufferDirectory(ULONG DirectoryStartCluster, ULONG* EntryCountPointer, BOOL RootDirectory);
BOOL FatSearchDirectoryBufferForFile(PVOID DirectoryBuffer, ULONG EntryCount, PCHAR FileName, PFAT_FILE_INFO FatFileInfoPointer);
-BOOL FatLookupFile(PCHAR FileName, PFAT_FILE_INFO FatFileInfoPointer);
+BOOL FatLookupFile(PCSTR FileName, PFAT_FILE_INFO FatFileInfoPointer);
void FatParseShortFileName(PCHAR Buffer, PDIRENTRY DirEntry);
BOOL FatGetFatEntry(ULONG Cluster, ULONG* ClusterPointer);
-FILE* FatOpenFile(PCHAR FileName);
+FILE* FatOpenFile(PCSTR FileName);
ULONG FatCountClustersInChain(ULONG StartCluster);
ULONG* FatGetClusterChainArray(ULONG StartCluster);
BOOL FatReadCluster(ULONG ClusterNumber, PVOID Buffer);
--- trunk/reactos/boot/freeldr/freeldr/fs/fs.c 2005-11-11 18:09:46 UTC (rev 19134)
+++ trunk/reactos/boot/freeldr/freeldr/fs/fs.c 2005-11-11 18:11:17 UTC (rev 19135)
@@ -42,7 +42,7 @@
// FUNCTIONS
/////////////////////////////////////////////////////////////////////////////////////////////
-VOID FileSystemError(PCHAR ErrorString)
+VOID FileSystemError(PCSTR ErrorString)
{
DbgPrint((DPRINT_FILESYSTEM, "%s\n", ErrorString));
@@ -123,7 +123,7 @@
}
-PFILE FsOpenFile(PCHAR FileName)
+PFILE FsOpenFile(PCSTR 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(PCHAR Path)
+ULONG FsGetNumPathParts(PCSTR Path)
{
size_t 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(PCHAR Buffer, PCHAR Path)
+VOID FsGetFirstNameFromPath(PCHAR Buffer, PCSTR Path)
{
size_t i;
--- trunk/reactos/boot/freeldr/freeldr/fs/iso.c 2005-11-11 18:09:46 UTC (rev 19134)
+++ trunk/reactos/boot/freeldr/freeldr/fs/iso.c 2005-11-11 18:11:17 UTC (rev 19135)
@@ -180,7 +180,7 @@
* with info describing the file, etc. returns true
* if the file exists or false otherwise
*/
-static BOOL IsoLookupFile(PCHAR FileName, PISO_FILE_INFO IsoFileInfoPointer)
+static BOOL IsoLookupFile(PCSTR FileName, PISO_FILE_INFO IsoFileInfoPointer)
{
UINT i;
ULONG NumberOfPathParts;
@@ -263,7 +263,7 @@
* Tries to open the file 'name' and returns true or false
* for success and failure respectively
*/
-FILE* IsoOpenFile(PCHAR FileName)
+FILE* IsoOpenFile(PCSTR FileName)
{
ISO_FILE_INFO TempFileInfo;
PISO_FILE_INFO FileHandle;
--- trunk/reactos/boot/freeldr/freeldr/fs/iso.h 2005-11-11 18:09:46 UTC (rev 19134)
+++ trunk/reactos/boot/freeldr/freeldr/fs/iso.h 2005-11-11 18:11:17 UTC (rev 19135)
@@ -106,7 +106,7 @@
BOOL IsoOpenVolume(ULONG DriveNumber);
-FILE* IsoOpenFile(PCHAR FileName);
+FILE* IsoOpenFile(PCSTR FileName);
BOOL IsoReadFile(FILE *FileHandle, ULONG BytesToRead, ULONG* BytesRead, PVOID Buffer);
ULONG IsoGetFileSize(FILE *FileHandle);
VOID IsoSetFilePointer(FILE *FileHandle, ULONG NewFilePointer);
--- trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c 2005-11-11 18:09:46 UTC (rev 19134)
+++ trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c 2005-11-11 18:11:17 UTC (rev 19135)
@@ -87,7 +87,7 @@
}
/* FIXME: Add support for attribute lists! */
-static BOOL NtfsFindAttribute(PNTFS_ATTR_CONTEXT Context, PNTFS_MFT_RECORD MftRecord, ULONG Type, PWCHAR Name)
+static BOOL NtfsFindAttribute(PNTFS_ATTR_CONTEXT Context, PNTFS_MFT_RECORD MftRecord, ULONG Type, const WCHAR *Name)
{
PNTFS_ATTR_RECORD AttrRecord;
PNTFS_ATTR_RECORD AttrRecordEnd;
@@ -563,7 +563,7 @@
return FALSE;
}
-static BOOL NtfsLookupFile(PCHAR FileName, PNTFS_MFT_RECORD MftRecord, PNTFS_ATTR_CONTEXT DataContext)
+static BOOL NtfsLookupFile(PCSTR FileName, PNTFS_MFT_RECORD MftRecord, PNTFS_ATTR_CONTEXT DataContext)
{
ULONG NumberOfPathParts;
CHAR PathPart[261];
@@ -680,7 +680,7 @@
return TRUE;
}
-FILE* NtfsOpenFile(PCHAR FileName)
+FILE* NtfsOpenFile(PCSTR FileName)
{
PNTFS_FILE_HANDLE FileHandle;
PNTFS_MFT_RECORD MftRecord;
--- trunk/reactos/boot/freeldr/freeldr/fs/ntfs.h 2005-11-11 18:09:46 UTC (rev 19134)
+++ trunk/reactos/boot/freeldr/freeldr/fs/ntfs.h 2005-11-11 18:11:17 UTC (rev 19135)
@@ -219,7 +219,7 @@
} PACKED NTFS_FILE_HANDLE, *PNTFS_FILE_HANDLE;
BOOL NtfsOpenVolume(ULONG DriveNumber, ULONG VolumeStartSector);
-FILE* NtfsOpenFile(PCHAR FileName);
+FILE* NtfsOpenFile(PCSTR FileName);
BOOL NtfsReadFile(FILE *FileHandle, ULONG BytesToRead, ULONG* BytesRead, PVOID Buffer);
ULONG NtfsGetFileSize(FILE *FileHandle);
VOID NtfsSetFilePointer(FILE *FileHandle, ULONG NewFilePointer);
--- trunk/reactos/boot/freeldr/freeldr/include/bootmgr.h 2005-11-11 18:09:46 UTC (rev 19134)
+++ trunk/reactos/boot/freeldr/freeldr/include/bootmgr.h 2005-11-11 18:11:17 UTC (rev 19135)
@@ -21,7 +21,7 @@
#define __BOOTMGR_H
-ULONG GetDefaultOperatingSystem(PCHAR OperatingSystemList[], ULONG OperatingSystemCount);
+ULONG GetDefaultOperatingSystem(PCSTR OperatingSystemList[], ULONG OperatingSystemCount);
LONG GetTimeOut(VOID);
BOOL MainBootMenuKeyPressFilter(ULONG KeyPress);
--- trunk/reactos/boot/freeldr/freeldr/include/cmdline.h 2005-11-11 18:09:46 UTC (rev 19134)
+++ trunk/reactos/boot/freeldr/freeldr/include/cmdline.h 2005-11-11 18:11:17 UTC (rev 19135)
@@ -23,14 +23,14 @@
typedef struct tagCMDLINEINFO
{
- char *DefaultOperatingSystem;
+ const char *DefaultOperatingSystem;
LONG TimeOut;
} CMDLINEINFO, *PCMDLINEINFO;
-extern void CmdLineParse(char *CmdLine);
+void CmdLineParse(char *CmdLine);
-extern char *CmdLineGetDefaultOS(void);
-extern LONG CmdLineGetTimeOut(void);
+const char *CmdLineGetDefaultOS(void);
+LONG CmdLineGetTimeOut(void);
#endif /* __CMDLINE_H__ */
--- trunk/reactos/boot/freeldr/freeldr/include/disk.h 2005-11-11 18:09:46 UTC (rev 19134)
+++ trunk/reactos/boot/freeldr/freeldr/include/disk.h 2005-11-11 18:11:17 UTC (rev 19135)
@@ -119,8 +119,8 @@
//
///////////////////////////////////////////////////////////////////////////////////////
VOID DiskReportError (BOOL bError);
-VOID DiskError(PCHAR ErrorString, ULONG ErrorCode);
-PCHAR DiskGetErrorCodeString(ULONG ErrorCode);
+VOID DiskError(PCSTR ErrorString, ULONG ErrorCode);
+PCSTR DiskGetErrorCodeString(ULONG ErrorCode);
BOOL DiskReadLogicalSectors(ULONG DriveNumber, ULONGLONG SectorNumber, ULONG SectorCount, PVOID Buffer); // Implemented in i386disk.c
BOOL DiskIsDriveRemovable(ULONG DriveNumber);
VOID DiskStopFloppyMotor(VOID); // Implemented in i386disk.c
--- trunk/reactos/boot/freeldr/freeldr/include/drivemap.h 2005-11-11 18:09:46 UTC (rev 19134)
+++ trunk/reactos/boot/freeldr/freeldr/include/drivemap.h 2005-11-11 18:11:17 UTC (rev 19135)
@@ -29,9 +29,9 @@
} PACKED DRIVE_MAP_LIST, *PDRIVE_MAP_LIST;
-VOID DriveMapMapDrivesInSection(PCHAR SectionName);
-BOOL DriveMapIsValidDriveString(PCHAR DriveString); // Checks the drive string ("hd0") for validity
-ULONG DriveMapGetBiosDriveNumber(PCHAR DeviceName); // Returns a BIOS drive number for any given device name (e.g. 0x80 for 'hd0')
+VOID DriveMapMapDrivesInSection(PCSTR SectionName);
+BOOL DriveMapIsValidDriveString(PCSTR DriveString); // Checks the drive string ("hd0") for validity
+ULONG DriveMapGetBiosDriveNumber(PCSTR DeviceName); // Returns a BIOS drive number for any given device name (e.g. 0x80 for 'hd0')
VOID DriveMapInstallInt13Handler(PDRIVE_MAP_LIST DriveMap); // Installs the int 13h handler for the drive mapper
VOID DriveMapRemoveInt13Handler(VOID); // Removes a previously installed int 13h drive map handler
--- trunk/reactos/boot/freeldr/freeldr/include/fs.h 2005-11-11 18:09:46 UTC (rev 19134)
+++ trunk/reactos/boot/freeldr/freeldr/include/fs.h 2005-11-11 18:11:17 UTC (rev 19135)
@@ -32,17 +32,17 @@
#define FILE VOID
#define PFILE FILE *
-VOID FileSystemError(PCHAR ErrorString);
+VOID FileSystemError(PCSTR ErrorString);
BOOL FsOpenBootVolume();
BOOL FsOpenSystemVolume(PCHAR SystemPath, PCHAR RemainingPath, PULONG BootDevice);
-PFILE FsOpenFile(PCHAR FileName);
+PFILE FsOpenFile(PCSTR FileName);
VOID FsCloseFile(PFILE FileHandle);
BOOL FsReadFile(PFILE FileHandle, ULONG BytesToRead, ULONG* BytesRead, PVOID Buffer);
ULONG FsGetFileSize(PFILE FileHandle);
VOID FsSetFilePointer(PFILE FileHandle, ULONG NewFilePointer);
ULONG FsGetFilePointer(PFILE FileHandle);
BOOL FsIsEndOfFile(PFILE FileHandle);
-ULONG FsGetNumPathParts(PCHAR Path);
-VOID FsGetFirstNameFromPath(PCHAR Buffer, PCHAR Path);
+ULONG FsGetNumPathParts(PCSTR Path);
+VOID FsGetFirstNameFromPath(PCHAR Buffer, PCSTR Path);
#endif // #defined __FS_H
--- trunk/reactos/boot/freeldr/freeldr/include/inifile.h 2005-11-11 18:09:46 UTC (rev 19134)
+++ trunk/reactos/boot/freeldr/freeldr/include/inifile.h 2005-11-11 18:11:17 UTC (rev 19135)
@@ -22,14 +22,14 @@
BOOL IniFileInitialize(VOID);
-BOOL IniOpenSection(PCHAR SectionName, ULONG* SectionId);
+BOOL IniOpenSection(PCSTR SectionName, ULONG* SectionId);
ULONG IniGetNumSectionItems(ULONG SectionId);
ULONG IniGetSectionSettingNameSize(ULONG SectionId, ULONG SettingIndex);
ULONG IniGetSectionSettingValueSize(ULONG SectionId, ULONG SettingIndex);
BOOL IniReadSettingByNumber(ULONG SectionId, ULONG SettingNumber, PCHAR SettingName, ULONG NameSize, PCHAR SettingValue, ULONG ValueSize);
-BOOL IniReadSettingByName(ULONG SectionId, PCHAR SettingName, PCHAR Buffer, ULONG BufferSize);
-BOOL IniAddSection(PCHAR SectionName, ULONG* SectionId);
-BOOL IniAddSettingValueToSection(ULONG SectionId, PCHAR SettingName, PCHAR SettingValue);
+BOOL IniReadSettingByName(ULONG SectionId, PCSTR SettingName, PCHAR Buffer, ULONG BufferSize);
+BOOL IniAddSection(PCSTR SectionName, ULONG* SectionId);
+BOOL IniAddSettingValueToSection(ULONG SectionId, PCSTR SettingName, PCSTR SettingValue);
#endif // defined __PARSEINI_H
--- trunk/reactos/boot/freeldr/freeldr/include/linux.h 2005-11-11 18:09:46 UTC (rev 19134)
+++ trunk/reactos/boot/freeldr/freeldr/include/linux.h 2005-11-11 18:11:17 UTC (rev 19135)
@@ -127,9 +127,9 @@
VOID BootNewLinuxKernel(VOID); // Implemented in linux.S
VOID BootOldLinuxKernel(ULONG KernelSize); // Implemented in linux.S
-VOID LoadAndBootLinux(PCHAR OperatingSystemName, PCHAR Description);
+VOID LoadAndBootLinux(PCSTR OperatingSystemName, PCSTR Description);
-BOOL LinuxParseIniSection(PCHAR OperatingSystemName);
+BOOL LinuxParseIniSection(PCSTR OperatingSystemName);
BOOL LinuxReadBootSector(PFILE LinuxKernelFile);
BOOL LinuxReadSetupSector(PFILE LinuxKernelFile);
BOOL LinuxReadKernel(PFILE LinuxKernelFile);
--- trunk/reactos/boot/freeldr/freeldr/include/machine.h 2005-11-11 18:09:46 UTC (rev 19134)
+++ trunk/reactos/boot/freeldr/freeldr/include/machine.h 2005-11-11 18:11:17 UTC (rev 19135)
@@ -72,7 +72,7 @@
VOID (*HwDetect)(VOID);
} MACHVTBL, *PMACHVTBL;
-VOID MachInit(char *CmdLine);
+VOID MachInit(const char *CmdLine);
extern MACHVTBL MachVtbl;
--- trunk/reactos/boot/freeldr/freeldr/include/miscboot.h 2005-11-11 18:09:46 UTC (rev 19134)
+++ trunk/reactos/boot/freeldr/freeldr/include/miscboot.h 2005-11-11 18:11:17 UTC (rev 19135)
@@ -20,8 +20,8 @@
#ifndef __BOOT_H
#define __BOOT_H
-VOID LoadAndBootBootSector(PCHAR OperatingSystemName);
-VOID LoadAndBootPartition(PCHAR OperatingSystemName);
-VOID LoadAndBootDrive(PCHAR OperatingSystemName);
+VOID LoadAndBootBootSector(PCSTR OperatingSystemName);
+VOID LoadAndBootPartition(PCSTR OperatingSystemName);
+VOID LoadAndBootDrive(PCSTR OperatingSystemName);
#endif // defined __BOOT_H
--- trunk/reactos/boot/freeldr/freeldr/include/oslist.h 2005-11-11 18:09:46 UTC (rev 19134)
+++ trunk/reactos/boot/freeldr/freeldr/include/oslist.h 2005-11-11 18:11:17 UTC (rev 19135)
@@ -20,7 +20,7 @@
#ifndef __OSLIST_H
#define __OSLIST_H
-BOOL InitOperatingSystemList(PCHAR **SectionNamesPointer, PCHAR **DisplayNamesPointer, ULONG* OperatingSystemCountPointer);
+BOOL InitOperatingSystemList(PCSTR **SectionNamesPointer, PCSTR **DisplayNamesPointer, ULONG* OperatingSystemCountPointer);
ULONG CountOperatingSystems(ULONG SectionId);
BOOL AllocateListMemory(PCHAR **SectionNamesPointer, PCHAR **DisplayNamesPointer, ULONG OperatingSystemCount);
BOOL RemoveQuotes(PCHAR QuotedString);
--- trunk/reactos/boot/freeldr/freeldr/include/reactos.h 2005-11-11 18:09:46 UTC (rev 19134)
+++ trunk/reactos/boot/freeldr/freeldr/include/reactos.h 2005-11-11 18:11:17 UTC (rev 19135)
@@ -26,7 +26,7 @@
// ReactOS Loading Functions
//
///////////////////////////////////////////////////////////////////////////////////////
-VOID LoadAndBootReactOS(PCHAR OperatingSystemName);
+VOID LoadAndBootReactOS(PCSTR OperatingSystemName);
///////////////////////////////////////////////////////////////////////////////////////
//
@@ -61,8 +61,8 @@
VOID FASTCALL FrLdrSetupPageDirectory(VOID);
VOID FASTCALL FrLdrGetPaeMode(VOID);
BOOL STDCALL FrLdrMapKernel(FILE *KernelImage);
-ULONG_PTR STDCALL FrLdrCreateModule(LPSTR ModuleName);
-ULONG_PTR STDCALL FrLdrLoadModule(FILE *ModuleImage, LPSTR ModuleName, PULONG ModuleSize);
+ULONG_PTR STDCALL FrLdrCreateModule(LPCSTR ModuleName);
+ULONG_PTR STDCALL FrLdrLoadModule(FILE *ModuleImage, LPCSTR ModuleName, PULONG ModuleSize);
BOOL STDCALL FrLdrCloseModule(ULONG_PTR ModuleBase, ULONG dwModuleSize);
VOID STDCALL FrLdrStartup(ULONG Magic);
typedef VOID (FASTCALL *ASMCODE)(ULONG Magic, PLOADER_PARAMETER_BLOCK LoaderBlock);
--- trunk/reactos/boot/freeldr/freeldr/include/rtl.h 2005-11-11 18:09:46 UTC (rev 19134)
+++ trunk/reactos/boot/freeldr/freeldr/include/rtl.h 2005-11-11 18:11:17 UTC (rev 19135)
@@ -63,7 +63,6 @@
#define min(a, b) (((a) < (b)) ? (a) : (b))
#endif
-#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
#define UINT64_C(val) val##ULL
///////////////////////////////////////////////////////////////////////////////////////
--- trunk/reactos/boot/freeldr/freeldr/include/ui.h 2005-11-11 18:09:46 UTC (rev 19134)
+++ trunk/reactos/boot/freeldr/freeldr/include/ui.h 2005-11-11 18:11:17 UTC (rev 19135)
@@ -47,7 +47,7 @@
extern BOOL UiUseSpecialEffects; // Tells us if we should use fade effects
-extern CHAR UiMonthNames[12][15];
+extern const CHAR UiMonthNames[12][15];
///////////////////////////////////////////////////////////////////////////////////////
//
@@ -56,26 +56,26 @@
///////////////////////////////////////////////////////////////////////////////////////
BOOL UiInitialize(BOOLEAN ShowGui); // Initialize User-Interface
BOOL SetupUiInitialize(VOID); // Initialize User-Interface
-VOID UiUnInitialize(PCHAR BootText); // Un-initialize User-Interface
+VOID UiUnInitialize(PCSTR BootText); // Un-initialize User-Interface
VOID UiDrawBackdrop(VOID); // Fills the entire screen with a backdrop
VOID UiFillArea(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, CHAR FillChar, UCHAR Attr /* Color Attributes */); // Fills the area specified with FillChar and Attr
VOID UiDrawShadow(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom); // Draws a shadow on the bottom and right sides of the area specified
VOID UiDrawBox(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, UCHAR VertStyle, UCHAR HorzStyle, BOOL Fill, BOOL Shadow, UCHAR Attr); // Draws a box around the area specified
-VOID UiDrawText(ULONG X, ULONG Y, PCHAR Text, UCHAR Attr); // Draws text at coordinates specified
-VOID UiDrawCenteredText(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, PCHAR TextString, UCHAR Attr); // Draws centered text at the coordinates specified and clips the edges
-VOID UiDrawStatusText(PCHAR StatusText); // Draws text at the very bottom line on the screen
+VOID UiDrawText(ULONG X, ULONG Y, PCSTR Text, UCHAR Attr); // Draws text at coordinates specified
+VOID UiDrawCenteredText(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, PCSTR TextString, UCHAR Attr); // Draws centered text at the coordinates specified and clips the edges
+VOID UiDrawStatusText(PCSTR StatusText); // Draws text at the very bottom line on the screen
VOID UiUpdateDateTime(VOID); // Updates the date and time
-VOID UiInfoBox(PCHAR MessageText); // Displays a info box on the screen
-VOID UiMessageBox(PCHAR MessageText); // Displays a message box on the screen with an ok button
-VOID UiMessageBoxCritical(PCHAR MessageText); // Displays a message box on the screen with an ok button using no system resources
+VOID UiInfoBox(PCSTR MessageText); // Displays a info box on the screen
+VOID UiMessageBox(PCSTR MessageText); // Displays a message box on the screen with an ok button
+VOID UiMessageBoxCritical(PCSTR MessageText); // Displays a message box on the screen with an ok button using no system resources
VOID UiDrawProgressBarCenter(ULONG Position, ULONG Range, PCHAR ProgressText); // Draws the progress bar showing nPos percent filled
VOID UiDrawProgressBar(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, ULONG Position, ULONG Range, PCHAR ProgressText); // Draws the progress bar showing nPos percent filled
-VOID UiShowMessageBoxesInSection(PCHAR SectionName); // Displays all the message boxes in a given section
+VOID UiShowMessageBoxesInSection(PCSTR SectionName); // Displays all the message boxes in a given section
VOID UiEscapeString(PCHAR String); // Processes a string and changes all occurances of "\n" to '\n'
-BOOL UiEditBox(PCHAR MessageText, PCHAR EditTextBuffer, ULONG Length);
+BOOL UiEditBox(PCSTR MessageText, PCHAR EditTextBuffer, ULONG Length);
-UCHAR UiTextToColor(PCHAR ColorText); // Converts the text color into it's equivalent color value
-UCHAR UiTextToFillStyle(PCHAR FillStyleText); // Converts the text fill into it's equivalent fill value
+UCHAR UiTextToColor(PCSTR ColorText); // Converts the text color into it's equivalent color value
+UCHAR UiTextToFillStyle(PCSTR FillStyleText); // Converts the text fill into it's equivalent fill value
VOID UiTruncateStringEllipsis(PCHAR StringText, ULONG MaxChars); // Truncates a string to MaxChars by adding an ellipsis on the end '...'
@@ -89,7 +89,7 @@
///////////////////////////////////////////////////////////////////////////////////////
typedef BOOL (*UiMenuKeyPressFilterCallback)(ULONG KeyPress);
-BOOL UiDisplayMenu(PCHAR MenuItemList[], ULONG MenuItemCount, ULONG DefaultMenuItem, LONG MenuTimeOut, ULONG* SelectedMenuItem, BOOL CanEscape, UiMenuKeyPressFilterCallback KeyPressFilter);
+BOOL UiDisplayMenu(PCSTR MenuItemList[], ULONG MenuItemCount, ULONG DefaultMenuItem, LONG MenuTimeOut, ULONG* SelectedMenuItem, BOOL CanEscape, UiMenuKeyPressFilterCallback KeyPressFilter);
--- trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c 2005-11-11 18:09:46 UTC (rev 19134)
+++ trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c 2005-11-11 18:11:17 UTC (rev 19135)
@@ -24,7 +24,7 @@
#include <debug.h>
#include <mm.h>
-BOOL IniOpenSection(PCHAR SectionName, ULONG* SectionId)
+BOOL IniOpenSection(PCSTR SectionName, ULONG* SectionId)
{
PINI_SECTION Section;
@@ -131,7 +131,7 @@
return FALSE;
}
-BOOL IniReadSettingByName(ULONG SectionId, PCHAR SettingName, PCHAR Buffer, ULONG BufferSize)
+BOOL IniReadSettingByName(ULONG SectionId, PCSTR SettingName, PCHAR Buffer, ULONG BufferSize)
{
PINI_SECTION Section = (PINI_SECTION)SectionId;
PINI_SECTION_ITEM SectionItem;
@@ -163,7 +163,7 @@
return FALSE;
}
-BOOL IniAddSection(PCHAR SectionName, ULONG* SectionId)
+BOOL IniAddSection(PCSTR SectionName, ULONG* SectionId)
{
PINI_SECTION Section;
@@ -203,7 +203,7 @@
return TRUE;
}
-BOOL IniAddSettingValueToSection(ULONG SectionId, PCHAR SettingName, PCHAR SettingValue)
+BOOL IniAddSettingValueToSection(ULONG SectionId, PCSTR SettingName, PCSTR SettingValue)
{
PINI_SECTION Section = (PINI_SECTION)SectionId;
PINI_SECTION_ITEM SectionItem;
--- trunk/reactos/boot/freeldr/freeldr/linuxboot.c 2005-11-11 18:09:46 UTC (rev 19134)
+++ trunk/reactos/boot/freeldr/freeldr/linuxboot.c 2005-11-11 18:11:17 UTC (rev 19135)
@@ -54,7 +54,7 @@
CHAR LinuxBootDescription[80];
CHAR LinuxBootPath[260] = "";
-VOID LoadAndBootLinux(PCHAR OperatingSystemName, PCHAR Description)
+VOID LoadAndBootLinux(PCSTR OperatingSystemName, PCSTR Description)
{
PFILE LinuxKernel = NULL;
PFILE LinuxInitrdFile = NULL;
@@ -229,7 +229,7 @@
LinuxCommandLineSize = 0;
}
-BOOL LinuxParseIniSection(PCHAR OperatingSystemName)
+BOOL LinuxParseIniSection(PCSTR OperatingSystemName)
{
CHAR SettingName[260];
ULONG SectionId;
--- trunk/reactos/boot/freeldr/freeldr/miscboot.c 2005-11-11 18:09:46 UTC (rev 19134)
+++ trunk/reactos/boot/freeldr/freeldr/miscboot.c 2005-11-11 18:11:17 UTC (rev 19135)
@@ -29,7 +29,7 @@
#include <drivemap.h>
#include <machine.h>
-VOID LoadAndBootBootSector(PCHAR OperatingSystemName)
+VOID LoadAndBootBootSector(PCSTR OperatingSystemName)
{
PFILE FilePointer;
CHAR SettingName[80];
@@ -100,7 +100,7 @@
ChainLoadBiosBootSectorCode();
}
-VOID LoadAndBootPartition(PCHAR OperatingSystemName)
+VOID LoadAndBootPartition(PCSTR OperatingSystemName)
{
CHAR SettingName[80];
CHAR SettingValue[80];
@@ -171,7 +171,7 @@
ChainLoadBiosBootSectorCode();
}
-VOID LoadAndBootDrive(PCHAR OperatingSystemName)
+VOID LoadAndBootDrive(PCSTR OperatingSystemName)
{
CHAR SettingName[80];
CHAR SettingValue[80];
--- trunk/reactos/boot/freeldr/freeldr/options.c 2005-11-11 18:09:46 UTC (rev 19134)
+++ trunk/reactos/boot/freeldr/freeldr/options.c 2005-11-11 18:11:17 UTC (rev 19135)
@@ -27,7 +27,7 @@
#include <arch.h>
-PCHAR OptionsMenuList[] =
+PCSTR OptionsMenuList[] =
{
"Safe Mode",
"Safe Mode with Networking",
--- trunk/reactos/boot/freeldr/freeldr/oslist.c 2005-11-11 18:09:46 UTC (rev 19134)
+++ trunk/reactos/boot/freeldr/freeldr/oslist.c 2005-11-11 18:11:17 UTC (rev 19135)
@@ -24,7 +24,7 @@
#include <mm.h>
#include <ui.h>
-BOOL InitOperatingSystemList(PCHAR **SectionNamesPointer, PCHAR **DisplayNamesPointer, ULONG* OperatingSystemCountPointer)
+BOOL InitOperatingSystemList(PCSTR **SectionNamesPointer, PCSTR **DisplayNamesPointer, ULONG* OperatingSystemCountPointer)
{
ULONG Idx;
ULONG CurrentOperatingSystemIndex;
@@ -79,8 +79,8 @@
}
*OperatingSystemCountPointer = OperatingSystemCount;
- *SectionNamesPointer = OperatingSystemSectionNames;
- *DisplayNamesPointer = OperatingSystemDisplayNames;
+ *SectionNamesPointer = (PCSTR*)OperatingSystemSectionNames;
+ *DisplayNamesPointer = (PCSTR*)OperatingSystemDisplayNames;
return TRUE;
}
--- trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c 2005-11-11 18:09:46 UTC (rev 19134)
+++ trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c 2005-11-11 18:11:17 UTC (rev 19135)
@@ -326,7 +326,7 @@
static VOID
-CmiCreateDefaultRootKeyCell (PKEY_CELL RootKeyCell, PCHAR KeyName)
+CmiCreateDefaultRootKeyCell (PKEY_CELL RootKeyCell, PCSTR KeyName)
{
PCHAR BaseKeyName;
ULONG NameSize;
@@ -357,7 +357,7 @@
static PREGISTRY_HIVE
-CmiCreateHive (PCHAR KeyName)
+CmiCreateHive (PCSTR KeyName)
{
PREGISTRY_HIVE Hive;
PCELL_HEADER FreeCell;
@@ -1258,7 +1258,7 @@
static BOOL
CmiExportHive (PREGISTRY_HIVE Hive,
- PCHAR KeyName)
+ PCSTR KeyName)
{
PKEY_CELL KeyCell;
FRLDRHKEY Key;
@@ -1624,7 +1624,7 @@
BOOL
-RegExportBinaryHive(PCHAR KeyName,
+RegExportBinaryHive(PCSTR KeyName,
PCHAR ChunkBase,
ULONG* ChunkSize)
{
--- trunk/reactos/boot/freeldr/freeldr/reactos/loader.c 2005-11-11 18:09:46 UTC (rev 19134)
+++ trunk/reactos/boot/freeldr/freeldr/reactos/loader.c 2005-11-11 18:11:17 UTC (rev 19135)
@@ -706,7 +706,7 @@
ULONG_PTR
STDCALL
FrLdrLoadModule(FILE *ModuleImage,
- LPSTR ModuleName,
+ LPCSTR ModuleName,
PULONG ModuleSize)
{
ULONG LocalModuleSize;
@@ -757,7 +757,7 @@
ULONG_PTR
STDCALL
-FrLdrCreateModule(LPSTR ModuleName)
+FrLdrCreateModule(LPCSTR ModuleName)
{
PLOADER_MODULE ModuleData;
LPSTR NameBuffer;
--- trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c 2005-11-11 18:09:46 UTC (rev 19134)
+++ trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c 2005-11-11 18:11:17 UTC (rev 19135)
@@ -78,7 +78,7 @@
FrLdrMapKernel(FilePointer);
/* Update Processbar and return success */
- UiDrawProgressBarCenter(nPos, 100, "Loading ReactOS...");
+ UiDrawProgressBarCenter(nPos, 100, (PCHAR)"Loading ReactOS...");
return(TRUE);
}
@@ -145,8 +145,8 @@
}
static BOOL
-FrLdrLoadNlsFile(PCHAR szFileName,
- PCHAR szModuleName)
+FrLdrLoadNlsFile(PCSTR szFileName,
+ PCSTR szModuleName)
{
PFILE FilePointer;
CHAR value[256];
@@ -340,7 +340,7 @@
FrLdrLoadModule(FilePointer, szFileName, NULL);
/* Update status and return */
- UiDrawProgressBarCenter(nPos, 100, "Loading ReactOS...");
+ UiDrawProgressBarCenter(nPos, 100, (PCHAR)"Loading ReactOS...");
return(TRUE);
}
@@ -570,7 +570,7 @@
}
VOID
-LoadAndBootReactOS(PCHAR OperatingSystemName)
+LoadAndBootReactOS(PCSTR OperatingSystemName)
{
PFILE FilePointer;
CHAR name[1024];
@@ -704,7 +704,7 @@
if (AcpiPresent) LoaderBlock.Flags |= MB_FLAGS_ACPI_TABLE;
UiDrawStatusText("Loading...");
- UiDrawProgressBarCenter(0, 100, "Loading ReactOS...");
+ UiDrawProgressBarCenter(0, 100, (PCHAR)"Loading ReactOS...");
/*
* Try to open system drive
@@ -838,7 +838,7 @@
*/
RegInitCurrentControlSet(FALSE);
- UiDrawProgressBarCenter(15, 100, "Loading ReactOS...");
+ UiDrawProgressBarCenter(15, 100, (PCHAR)"Loading ReactOS...");
/*
* Export the hardware hive
@@ -847,7 +847,7 @@
RegExportBinaryHive ("\\Registry\\Machine\\HARDWARE", (PCHAR)Base, &Size);
FrLdrCloseModule (Base, Size);
- UiDrawProgressBarCenter(20, 100, "Loading ReactOS...");
+ UiDrawProgressBarCenter(20, 100, (PCHAR)"Loading ReactOS...");
/*
* Load NLS files
@@ -857,13 +857,13 @@
UiMessageBox(MsgBuffer);
return;
}
- UiDrawProgressBarCenter(30, 100, "Loading ReactOS...");
+ UiDrawProgressBarCenter(30, 100, (PCHAR)"Loading ReactOS...");
/*
* Load kernel symbols
*/
LoadKernelSymbols(szKernelName, 30);
- UiDrawProgressBarCenter(40, 100, "Loading ReactOS...");
+ UiDrawProgressBarCenter(40, 100, (PCHAR)"Loading ReactOS...");
/*
* Load boot drivers
--- trunk/reactos/boot/freeldr/freeldr/reactos/registry.c 2005-11-11 18:09:46 UTC (rev 19134)
+++ trunk/reactos/boot/freeldr/freeldr/reactos/registry.c 2005-11-11 18:11:17 UTC (rev 19135)
@@ -206,7 +206,7 @@
LONG
RegCreateKey(FRLDRHKEY ParentKey,
- PCHAR KeyName,
+ PCSTR KeyName,
PFRLDRHKEY Key)
{
PLIST_ENTRY Ptr;
@@ -214,7 +214,7 @@
FRLDRHKEY CurrentKey;
FRLDRHKEY NewKey;
PCHAR p;
- PCHAR name;
+ PCSTR name;
int subkeyLength;
int stringLength;
@@ -331,7 +331,7 @@
LONG
RegDeleteKey(FRLDRHKEY Key,
- PCHAR Name)
+ PCSTR Name)
{
@@ -384,14 +384,14 @@
LONG
RegOpenKey(FRLDRHKEY ParentKey,
- PCHAR KeyName,
+ PCSTR KeyName,
[truncated at 1000 lines; 439 more skipped]