Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-04 12:56:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed warnings when compiled with -Wwrite-strings

Browse source 
svn path=/trunk/; revision=19135
This commit is contained in:
Thomas Bluemel 2005-11-11 18:11:17 +00:00
parent b260dcdb81
commit 3a4e051af1
50 changed files with 176 additions and 177 deletions
Download patch file Download diff file Expand all files Collapse all files

2
reactos/boot/freeldr/freeldr/arch/i386/archmach.c
View file

@ -27,7 +27,7 @@
#include "rtl.h" #include "rtl.h"
VOID VOID
MachInit(char *CmdLine) MachInit(const char *CmdLine)
{ {
ULONG PciId; ULONG PciId;

2
reactos/boot/freeldr/freeldr/arch/i386/machpc.c
View file

@ -26,7 +26,7 @@
#include "i386.h" #include "i386.h"
VOID VOID
PcMachInit(char *CmdLine) PcMachInit(const char *CmdLine)
{ {
EnableA20(); EnableA20();

2
reactos/boot/freeldr/freeldr/arch/i386/machpc.h
View file

@ -26,7 +26,7 @@
#include "mm.h" #include "mm.h"
#endif #endif
VOID PcMachInit(char *CmdLine); VOID PcMachInit(const char *CmdLine);
VOID PcConsPutChar(int Ch); VOID PcConsPutChar(int Ch);
BOOL PcConsKbHit(); BOOL PcConsKbHit();

2
reactos/boot/freeldr/freeldr/arch/i386/machxbox.c
View file

@ -24,7 +24,7 @@
#include "i386.h" #include "i386.h"
VOID VOID
XboxMachInit(char *CmdLine) XboxMachInit(const char *CmdLine)
{ {
/* Initialize our stuff */ /* Initialize our stuff */
XboxMemInit(); XboxMemInit();

2
reactos/boot/freeldr/freeldr/arch/i386/machxbox.h
View file

@ -26,7 +26,7 @@
UCHAR XboxFont8x16[256 * 16]; UCHAR XboxFont8x16[256 * 16];
VOID XboxMachInit(char *CmdLine); VOID XboxMachInit(const char *CmdLine);
VOID XboxConsPutChar(int Ch); VOID XboxConsPutChar(int Ch);
BOOL XboxConsKbHit(); BOOL XboxConsKbHit();

2
reactos/boot/freeldr/freeldr/arch/powerpc/mach.c
View file

@ -279,7 +279,7 @@ void PpcInit( of_proxy the_ofproxy ) {
BootMain("freeldr-ppc"); BootMain("freeldr-ppc");
} }
void MachInit(char *CmdLine) { void MachInit(const char *CmdLine) {
int len; int len;
printf( "Determining boot device:\n" ); printf( "Determining boot device:\n" );
len = ofw_getprop(chosen_package, "bootpath", len = ofw_getprop(chosen_package, "bootpath",

8
reactos/boot/freeldr/freeldr/bootmgr.c
View file

@ -43,8 +43,8 @@ VOID RunLoader(VOID)
CHAR SettingValue[80]; CHAR SettingValue[80];
ULONG SectionId; ULONG SectionId;
ULONG OperatingSystemCount; ULONG OperatingSystemCount;
PCHAR *OperatingSystemSectionNames; PCSTR *OperatingSystemSectionNames;
PCHAR *OperatingSystemDisplayNames; PCSTR *OperatingSystemDisplayNames;
ULONG DefaultOperatingSystem; ULONG DefaultOperatingSystem;
LONG TimeOut; LONG TimeOut;
ULONG SelectedOperatingSystem; ULONG SelectedOperatingSystem;
@ -166,10 +166,10 @@ reboot:
return; return;
} }
ULONG GetDefaultOperatingSystem(PCHAR OperatingSystemList[], ULONG OperatingSystemCount) ULONG GetDefaultOperatingSystem(PCSTR OperatingSystemList[], ULONG OperatingSystemCount)
{ {
CHAR DefaultOSText[80]; CHAR DefaultOSText[80];
PCHAR DefaultOSName; PCSTR DefaultOSName;
ULONG SectionId; ULONG SectionId;
ULONG DefaultOS = 0; ULONG DefaultOS = 0;
ULONG Idx; ULONG Idx;

2
reactos/boot/freeldr/freeldr/cmdline.c
View file

@ -106,7 +106,7 @@ CmdLineParse(char *CmdLine)
} }
} }
char * const char *
CmdLineGetDefaultOS(void) CmdLineGetDefaultOS(void)
{ {
return CmdLineInfo.DefaultOperatingSystem; return CmdLineInfo.DefaultOperatingSystem;

20
reactos/boot/freeldr/freeldr/custom.c
View file

@ -32,20 +32,20 @@
#include <machine.h> #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"; 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";
CHAR BootPartitionPrompt[] = "Enter the boot partition.\n\nEnter 0 for the active (bootable) partition."; const 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"; const 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"; const 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."; 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.";
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 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"; const 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 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) 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 CustomBootMenuCount = sizeof(CustomBootMenuList) / sizeof(CustomBootMenuList[0]);
ULONG SelectedMenuItem; ULONG SelectedMenuItem;

4
reactos/boot/freeldr/freeldr/disk/disk.c
View file

@ -39,7 +39,7 @@ VOID DiskReportError (BOOL bError)
bReportError = bError; bReportError = bError;
} }
VOID DiskError(PCHAR ErrorString, ULONG ErrorCode) VOID DiskError(PCSTR ErrorString, ULONG ErrorCode)
{ {
CHAR ErrorCodeString[200]; CHAR ErrorCodeString[200];
@ -53,7 +53,7 @@ VOID DiskError(PCHAR ErrorString, ULONG ErrorCode)
UiMessageBox(ErrorCodeString); UiMessageBox(ErrorCodeString);
} }
PCHAR DiskGetErrorCodeString(ULONG ErrorCode) PCSTR DiskGetErrorCodeString(ULONG ErrorCode)
{ {
switch (ErrorCode) switch (ErrorCode)
{ {

6
reactos/boot/freeldr/freeldr/drivemap.c
View file

@ -30,7 +30,7 @@ ULONG OldInt13HandlerAddress = 0; // Address of BIOS int 13h handler
ULONG DriveMapHandlerAddress = 0; // Linear address of our drive map handler ULONG DriveMapHandlerAddress = 0; // Linear address of our drive map handler
ULONG DriveMapHandlerSegOff = 0; // Segment:offset style 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 SettingName[80];
CHAR SettingValue[80]; CHAR SettingValue[80];
@ -117,7 +117,7 @@ VOID DriveMapMapDrivesInSection(PCHAR SectionName)
} }
} }
BOOL DriveMapIsValidDriveString(PCHAR DriveString) BOOL DriveMapIsValidDriveString(PCSTR DriveString)
{ {
ULONG Index; ULONG Index;
@ -147,7 +147,7 @@ BOOL DriveMapIsValidDriveString(PCHAR DriveString)
return TRUE; return TRUE;
} }
ULONG DriveMapGetBiosDriveNumber(PCHAR DeviceName) ULONG DriveMapGetBiosDriveNumber(PCSTR DeviceName)
{ {
ULONG BiosDriveNumber = 0; ULONG BiosDriveNumber = 0;

2
reactos/boot/freeldr/freeldr/freeldr.c
View file

@ -27,7 +27,7 @@
#include <fs.h> #include <fs.h>
#include <cmdline.h> #include <cmdline.h>
VOID BootMain(char *CmdLine) VOID BootMain(LPSTR CmdLine)
{ {
CmdLineParse(CmdLine); CmdLineParse(CmdLine);

4
reactos/boot/freeldr/freeldr/fs/ext2.c
View file

@ -87,7 +87,7 @@ BOOL Ext2OpenVolume(UCHAR DriveNumber, ULONGLONG VolumeStartSector)
* Tries to open the file 'name' and returns true or false * Tries to open the file 'name' and returns true or false
* for success and failure respectively * for success and failure respectively
*/ */
FILE* Ext2OpenFile(PCHAR FileName) FILE* Ext2OpenFile(PCSTR FileName)
{ {
EXT2_FILE_INFO TempExt2FileInfo; EXT2_FILE_INFO TempExt2FileInfo;
PEXT2_FILE_INFO FileHandle; PEXT2_FILE_INFO FileHandle;
@ -190,7 +190,7 @@ FILE* Ext2OpenFile(PCHAR FileName)
* with info describing the file, etc. returns true * with info describing the file, etc. returns true
* if the file exists or false otherwise * 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; UINT i;
ULONG NumberOfPathParts; ULONG NumberOfPathParts;

4
reactos/boot/freeldr/freeldr/fs/ext2.h
View file

@ -667,8 +667,8 @@ typedef struct
BOOL Ext2OpenVolume(UCHAR DriveNumber, ULONGLONG VolumeStartSector); BOOL Ext2OpenVolume(UCHAR DriveNumber, ULONGLONG VolumeStartSector);
FILE* Ext2OpenFile(PCHAR FileName); FILE* Ext2OpenFile(PCSTR FileName);
BOOL Ext2LookupFile(PCHAR FileName, PEXT2_FILE_INFO Ext2FileInfoPointer); BOOL Ext2LookupFile(PCSTR FileName, PEXT2_FILE_INFO Ext2FileInfoPointer);
BOOL Ext2SearchDirectoryBufferForFile(PVOID DirectoryBuffer, ULONG DirectorySize, PCHAR FileName, PEXT2_DIR_ENTRY DirectoryEntry); BOOL Ext2SearchDirectoryBufferForFile(PVOID DirectoryBuffer, ULONG DirectorySize, PCHAR FileName, PEXT2_DIR_ENTRY DirectoryEntry);
BOOL Ext2ReadFile(FILE *FileHandle, ULONGLONG BytesToRead, ULONGLONG* BytesRead, PVOID Buffer); BOOL Ext2ReadFile(FILE *FileHandle, ULONGLONG BytesToRead, ULONGLONG* BytesRead, PVOID Buffer);
ULONGLONG Ext2GetFileSize(FILE *FileHandle); ULONGLONG Ext2GetFileSize(FILE *FileHandle);

4
reactos/boot/freeldr/freeldr/fs/fat.c
View file

@ -687,7 +687,7 @@ static BOOL FatXSearchDirectoryBufferForFile(PVOID DirectoryBuffer, ULONG Direct
* with info describing the file, etc. returns true * with info describing the file, etc. returns true
* if the file exists or false otherwise * 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; UINT i;
ULONG NumberOfPathParts; ULONG NumberOfPathParts;
@ -915,7 +915,7 @@ BOOL FatGetFatEntry(ULONG Cluster, ULONG* ClusterPointer)
* Tries to open the file 'name' and returns true or false * Tries to open the file 'name' and returns true or false
* for success and failure respectively * for success and failure respectively
*/ */
FILE* FatOpenFile(PCHAR FileName) FILE* FatOpenFile(PCSTR FileName)
{ {
FAT_FILE_INFO TempFatFileInfo; FAT_FILE_INFO TempFatFileInfo;
PFAT_FILE_INFO FileHandle; PFAT_FILE_INFO FileHandle;

4
reactos/boot/freeldr/freeldr/fs/fat.h
View file

@ -156,10 +156,10 @@ BOOL FatOpenVolume(ULONG DriveNumber, ULONG VolumeStartSector, ULONG PartitionSe
ULONG FatDetermineFatType(PFAT_BOOTSECTOR FatBootSector, ULONG PartitionSectorCount); ULONG FatDetermineFatType(PFAT_BOOTSECTOR FatBootSector, ULONG PartitionSectorCount);
PVOID FatBufferDirectory(ULONG DirectoryStartCluster, ULONG* EntryCountPointer, BOOL RootDirectory); PVOID FatBufferDirectory(ULONG DirectoryStartCluster, ULONG* EntryCountPointer, BOOL RootDirectory);
BOOL FatSearchDirectoryBufferForFile(PVOID DirectoryBuffer, ULONG EntryCount, PCHAR FileName, PFAT_FILE_INFO FatFileInfoPointer); 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); void FatParseShortFileName(PCHAR Buffer, PDIRENTRY DirEntry);
BOOL FatGetFatEntry(ULONG Cluster, ULONG* ClusterPointer); BOOL FatGetFatEntry(ULONG Cluster, ULONG* ClusterPointer);
FILE* FatOpenFile(PCHAR FileName); FILE* FatOpenFile(PCSTR FileName);
ULONG FatCountClustersInChain(ULONG StartCluster); ULONG FatCountClustersInChain(ULONG StartCluster);
ULONG* FatGetClusterChainArray(ULONG StartCluster); ULONG* FatGetClusterChainArray(ULONG StartCluster);
BOOL FatReadCluster(ULONG ClusterNumber, PVOID Buffer); BOOL FatReadCluster(ULONG ClusterNumber, PVOID Buffer);

8
reactos/boot/freeldr/freeldr/fs/fs.c
View file

@ -42,7 +42,7 @@ ULONG FsType = 0; // Type of filesystem on boot device, set by FsOpenVolume()
// FUNCTIONS // FUNCTIONS
///////////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////////
VOID FileSystemError(PCHAR ErrorString) VOID FileSystemError(PCSTR ErrorString)
{ {
DbgPrint((DPRINT_FILESYSTEM, "%s\n", ErrorString)); DbgPrint((DPRINT_FILESYSTEM, "%s\n", ErrorString));
@ -123,7 +123,7 @@ BOOL FsOpenSystemVolume(char *SystemPath, char *RemainingPath, PULONG Device)
} }
PFILE FsOpenFile(PCHAR FileName) PFILE FsOpenFile(PCSTR FileName)
{ {
PFILE FileHandle = NULL; PFILE FileHandle = NULL;
@ -337,7 +337,7 @@ BOOL FsIsEndOfFile(PFILE FileHandle)
* This function parses a path in the form of dir1\dir2\file1.ext * 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) * 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; size_t i;
ULONG num; ULONG num;
@ -362,7 +362,7 @@ ULONG FsGetNumPathParts(PCHAR Path)
* and puts the first name of the path (e.g. "dir1") in buffer * and puts the first name of the path (e.g. "dir1") in buffer
* compatible with the MSDOS directory structure * compatible with the MSDOS directory structure
*/ */
VOID FsGetFirstNameFromPath(PCHAR Buffer, PCHAR Path) VOID FsGetFirstNameFromPath(PCHAR Buffer, PCSTR Path)
{ {
size_t i; size_t i;

4
reactos/boot/freeldr/freeldr/fs/iso.c
View file

@ -180,7 +180,7 @@ static PVOID IsoBufferDirectory(ULONG DirectoryStartSector, ULONG DirectoryLengt
* with info describing the file, etc. returns true * with info describing the file, etc. returns true
* if the file exists or false otherwise * 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; UINT i;
ULONG NumberOfPathParts; ULONG NumberOfPathParts;
@ -263,7 +263,7 @@ static BOOL IsoLookupFile(PCHAR FileName, PISO_FILE_INFO IsoFileInfoPointer)
* Tries to open the file 'name' and returns true or false * Tries to open the file 'name' and returns true or false
* for success and failure respectively * for success and failure respectively
*/ */
FILE* IsoOpenFile(PCHAR FileName) FILE* IsoOpenFile(PCSTR FileName)
{ {
ISO_FILE_INFO TempFileInfo; ISO_FILE_INFO TempFileInfo;
PISO_FILE_INFO FileHandle; PISO_FILE_INFO FileHandle;

2
reactos/boot/freeldr/freeldr/fs/iso.h
View file

@ -106,7 +106,7 @@ typedef struct
BOOL IsoOpenVolume(ULONG DriveNumber); BOOL IsoOpenVolume(ULONG DriveNumber);
FILE* IsoOpenFile(PCHAR FileName); FILE* IsoOpenFile(PCSTR FileName);
BOOL IsoReadFile(FILE *FileHandle, ULONG BytesToRead, ULONG* BytesRead, PVOID Buffer); BOOL IsoReadFile(FILE *FileHandle, ULONG BytesToRead, ULONG* BytesRead, PVOID Buffer);
ULONG IsoGetFileSize(FILE *FileHandle); ULONG IsoGetFileSize(FILE *FileHandle);
VOID IsoSetFilePointer(FILE *FileHandle, ULONG NewFilePointer); VOID IsoSetFilePointer(FILE *FileHandle, ULONG NewFilePointer);

6
reactos/boot/freeldr/freeldr/fs/ntfs.c
View file

@ -87,7 +87,7 @@ static PUCHAR NtfsDecodeRun(PUCHAR DataRun, LONGLONG *DataRunOffset, ULONGLONG *
} }
/* FIXME: Add support for attribute lists! */ /* 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 AttrRecord;
PNTFS_ATTR_RECORD AttrRecordEnd; PNTFS_ATTR_RECORD AttrRecordEnd;
@ -563,7 +563,7 @@ static BOOL NtfsFindMftRecord(ULONG MFTIndex, PCHAR FileName, ULONG *OutMFTIndex
return FALSE; 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; ULONG NumberOfPathParts;
CHAR PathPart[261]; CHAR PathPart[261];
@ -680,7 +680,7 @@ BOOL NtfsOpenVolume(ULONG DriveNumber, ULONG VolumeStartSector)
return TRUE; return TRUE;
} }
FILE* NtfsOpenFile(PCHAR FileName) FILE* NtfsOpenFile(PCSTR FileName)
{ {
PNTFS_FILE_HANDLE FileHandle; PNTFS_FILE_HANDLE FileHandle;
PNTFS_MFT_RECORD MftRecord; PNTFS_MFT_RECORD MftRecord;

2
reactos/boot/freeldr/freeldr/fs/ntfs.h
View file

@ -219,7 +219,7 @@ typedef struct
} PACKED NTFS_FILE_HANDLE, *PNTFS_FILE_HANDLE; } PACKED NTFS_FILE_HANDLE, *PNTFS_FILE_HANDLE;
BOOL NtfsOpenVolume(ULONG DriveNumber, ULONG VolumeStartSector); BOOL NtfsOpenVolume(ULONG DriveNumber, ULONG VolumeStartSector);
FILE* NtfsOpenFile(PCHAR FileName); FILE* NtfsOpenFile(PCSTR FileName);
BOOL NtfsReadFile(FILE *FileHandle, ULONG BytesToRead, ULONG* BytesRead, PVOID Buffer); BOOL NtfsReadFile(FILE *FileHandle, ULONG BytesToRead, ULONG* BytesRead, PVOID Buffer);
ULONG NtfsGetFileSize(FILE *FileHandle); ULONG NtfsGetFileSize(FILE *FileHandle);
VOID NtfsSetFilePointer(FILE *FileHandle, ULONG NewFilePointer); VOID NtfsSetFilePointer(FILE *FileHandle, ULONG NewFilePointer);

2
reactos/boot/freeldr/freeldr/include/bootmgr.h
View file

@ -21,7 +21,7 @@
#define __BOOTMGR_H #define __BOOTMGR_H
ULONG GetDefaultOperatingSystem(PCHAR OperatingSystemList[], ULONG OperatingSystemCount); ULONG GetDefaultOperatingSystem(PCSTR OperatingSystemList[], ULONG OperatingSystemCount);
LONG GetTimeOut(VOID); LONG GetTimeOut(VOID);
BOOL MainBootMenuKeyPressFilter(ULONG KeyPress); BOOL MainBootMenuKeyPressFilter(ULONG KeyPress);

8
reactos/boot/freeldr/freeldr/include/cmdline.h
View file

@ -23,14 +23,14 @@
typedef struct tagCMDLINEINFO typedef struct tagCMDLINEINFO
{ {
char *DefaultOperatingSystem; const char *DefaultOperatingSystem;
LONG TimeOut; LONG TimeOut;
} CMDLINEINFO, *PCMDLINEINFO; } CMDLINEINFO, *PCMDLINEINFO;
extern void CmdLineParse(char *CmdLine); void CmdLineParse(char *CmdLine);
extern char *CmdLineGetDefaultOS(void); const char *CmdLineGetDefaultOS(void);
extern LONG CmdLineGetTimeOut(void); LONG CmdLineGetTimeOut(void);
#endif /* __CMDLINE_H__ */ #endif /* __CMDLINE_H__ */

4
reactos/boot/freeldr/freeldr/include/disk.h
View file

@ -119,8 +119,8 @@ BOOL DiskGetExtendedDriveParameters(ULONG DriveNumber, PVOID Buffer, USHORT Buff
// //
/////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////
VOID DiskReportError (BOOL bError); VOID DiskReportError (BOOL bError);
VOID DiskError(PCHAR ErrorString, ULONG ErrorCode); VOID DiskError(PCSTR ErrorString, ULONG ErrorCode);
PCHAR DiskGetErrorCodeString(ULONG ErrorCode); PCSTR DiskGetErrorCodeString(ULONG ErrorCode);
BOOL DiskReadLogicalSectors(ULONG DriveNumber, ULONGLONG SectorNumber, ULONG SectorCount, PVOID Buffer); // Implemented in i386disk.c BOOL DiskReadLogicalSectors(ULONG DriveNumber, ULONGLONG SectorNumber, ULONG SectorCount, PVOID Buffer); // Implemented in i386disk.c
BOOL DiskIsDriveRemovable(ULONG DriveNumber); BOOL DiskIsDriveRemovable(ULONG DriveNumber);
VOID DiskStopFloppyMotor(VOID); // Implemented in i386disk.c VOID DiskStopFloppyMotor(VOID); // Implemented in i386disk.c

6
reactos/boot/freeldr/freeldr/include/drivemap.h
View file

@ -29,9 +29,9 @@ typedef struct
} PACKED DRIVE_MAP_LIST, *PDRIVE_MAP_LIST; } PACKED DRIVE_MAP_LIST, *PDRIVE_MAP_LIST;
VOID DriveMapMapDrivesInSection(PCHAR SectionName); VOID DriveMapMapDrivesInSection(PCSTR SectionName);
BOOL DriveMapIsValidDriveString(PCHAR DriveString); // Checks the drive string ("hd0") for validity BOOL DriveMapIsValidDriveString(PCSTR 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') 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 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 VOID DriveMapRemoveInt13Handler(VOID); // Removes a previously installed int 13h drive map handler

8
reactos/boot/freeldr/freeldr/include/fs.h
View file

@ -32,17 +32,17 @@
#define FILE VOID #define FILE VOID
#define PFILE FILE * #define PFILE FILE *
VOID FileSystemError(PCHAR ErrorString); VOID FileSystemError(PCSTR ErrorString);
BOOL FsOpenBootVolume(); BOOL FsOpenBootVolume();
BOOL FsOpenSystemVolume(PCHAR SystemPath, PCHAR RemainingPath, PULONG BootDevice); BOOL FsOpenSystemVolume(PCHAR SystemPath, PCHAR RemainingPath, PULONG BootDevice);
PFILE FsOpenFile(PCHAR FileName); PFILE FsOpenFile(PCSTR FileName);
VOID FsCloseFile(PFILE FileHandle); VOID FsCloseFile(PFILE FileHandle);
BOOL FsReadFile(PFILE FileHandle, ULONG BytesToRead, ULONG* BytesRead, PVOID Buffer); BOOL FsReadFile(PFILE FileHandle, ULONG BytesToRead, ULONG* BytesRead, PVOID Buffer);
ULONG FsGetFileSize(PFILE FileHandle); ULONG FsGetFileSize(PFILE FileHandle);
VOID FsSetFilePointer(PFILE FileHandle, ULONG NewFilePointer); VOID FsSetFilePointer(PFILE FileHandle, ULONG NewFilePointer);
ULONG FsGetFilePointer(PFILE FileHandle); ULONG FsGetFilePointer(PFILE FileHandle);
BOOL FsIsEndOfFile(PFILE FileHandle); BOOL FsIsEndOfFile(PFILE FileHandle);
ULONG FsGetNumPathParts(PCHAR Path); ULONG FsGetNumPathParts(PCSTR Path);
VOID FsGetFirstNameFromPath(PCHAR Buffer, PCHAR Path); VOID FsGetFirstNameFromPath(PCHAR Buffer, PCSTR Path);
#endif // #defined __FS_H #endif // #defined __FS_H

8
reactos/boot/freeldr/freeldr/include/inifile.h
View file

@ -22,14 +22,14 @@
BOOL IniFileInitialize(VOID); BOOL IniFileInitialize(VOID);
BOOL IniOpenSection(PCHAR SectionName, ULONG* SectionId); BOOL IniOpenSection(PCSTR SectionName, ULONG* SectionId);
ULONG IniGetNumSectionItems(ULONG SectionId); ULONG IniGetNumSectionItems(ULONG SectionId);
ULONG IniGetSectionSettingNameSize(ULONG SectionId, ULONG SettingIndex); ULONG IniGetSectionSettingNameSize(ULONG SectionId, ULONG SettingIndex);
ULONG IniGetSectionSettingValueSize(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 IniReadSettingByNumber(ULONG SectionId, ULONG SettingNumber, PCHAR SettingName, ULONG NameSize, PCHAR SettingValue, ULONG ValueSize);
BOOL IniReadSettingByName(ULONG SectionId, PCHAR SettingName, PCHAR Buffer, ULONG BufferSize); BOOL IniReadSettingByName(ULONG SectionId, PCSTR SettingName, PCHAR Buffer, ULONG BufferSize);
BOOL IniAddSection(PCHAR SectionName, ULONG* SectionId); BOOL IniAddSection(PCSTR SectionName, ULONG* SectionId);
BOOL IniAddSettingValueToSection(ULONG SectionId, PCHAR SettingName, PCHAR SettingValue); BOOL IniAddSettingValueToSection(ULONG SectionId, PCSTR SettingName, PCSTR SettingValue);
#endif // defined __PARSEINI_H #endif // defined __PARSEINI_H

4
reactos/boot/freeldr/freeldr/include/linux.h
View file

@ -127,9 +127,9 @@ typedef struct
VOID BootNewLinuxKernel(VOID); // Implemented in linux.S VOID BootNewLinuxKernel(VOID); // Implemented in linux.S
VOID BootOldLinuxKernel(ULONG KernelSize); // 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 LinuxReadBootSector(PFILE LinuxKernelFile);
BOOL LinuxReadSetupSector(PFILE LinuxKernelFile); BOOL LinuxReadSetupSector(PFILE LinuxKernelFile);
BOOL LinuxReadKernel(PFILE LinuxKernelFile); BOOL LinuxReadKernel(PFILE LinuxKernelFile);

2
reactos/boot/freeldr/freeldr/include/machine.h
View file

@ -72,7 +72,7 @@ typedef struct tagMACHVTBL
VOID (*HwDetect)(VOID); VOID (*HwDetect)(VOID);
} MACHVTBL, *PMACHVTBL; } MACHVTBL, *PMACHVTBL;
VOID MachInit(char *CmdLine); VOID MachInit(const char *CmdLine);
extern MACHVTBL MachVtbl; extern MACHVTBL MachVtbl;

6
reactos/boot/freeldr/freeldr/include/miscboot.h
View file

@ -20,8 +20,8 @@
#ifndef __BOOT_H #ifndef __BOOT_H
#define __BOOT_H #define __BOOT_H
VOID LoadAndBootBootSector(PCHAR OperatingSystemName); VOID LoadAndBootBootSector(PCSTR OperatingSystemName);
VOID LoadAndBootPartition(PCHAR OperatingSystemName); VOID LoadAndBootPartition(PCSTR OperatingSystemName);
VOID LoadAndBootDrive(PCHAR OperatingSystemName); VOID LoadAndBootDrive(PCSTR OperatingSystemName);
#endif // defined __BOOT_H #endif // defined __BOOT_H

2
reactos/boot/freeldr/freeldr/include/oslist.h
View file

@ -20,7 +20,7 @@
#ifndef __OSLIST_H #ifndef __OSLIST_H
#define __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); ULONG CountOperatingSystems(ULONG SectionId);
BOOL AllocateListMemory(PCHAR **SectionNamesPointer, PCHAR **DisplayNamesPointer, ULONG OperatingSystemCount); BOOL AllocateListMemory(PCHAR **SectionNamesPointer, PCHAR **DisplayNamesPointer, ULONG OperatingSystemCount);
BOOL RemoveQuotes(PCHAR QuotedString); BOOL RemoveQuotes(PCHAR QuotedString);

6
reactos/boot/freeldr/freeldr/include/reactos.h
View file

@ -26,7 +26,7 @@
// ReactOS Loading Functions // ReactOS Loading Functions
// //
/////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////
VOID LoadAndBootReactOS(PCHAR OperatingSystemName); VOID LoadAndBootReactOS(PCSTR OperatingSystemName);
/////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////
// //
@ -61,8 +61,8 @@ VOID FASTCALL FrLdrSetupPae(ULONG Magic);
VOID FASTCALL FrLdrSetupPageDirectory(VOID); VOID FASTCALL FrLdrSetupPageDirectory(VOID);
VOID FASTCALL FrLdrGetPaeMode(VOID); VOID FASTCALL FrLdrGetPaeMode(VOID);
BOOL STDCALL FrLdrMapKernel(FILE *KernelImage); BOOL STDCALL FrLdrMapKernel(FILE *KernelImage);
ULONG_PTR STDCALL FrLdrCreateModule(LPSTR ModuleName); ULONG_PTR STDCALL FrLdrCreateModule(LPCSTR ModuleName);
ULONG_PTR STDCALL FrLdrLoadModule(FILE *ModuleImage, LPSTR ModuleName, PULONG ModuleSize); ULONG_PTR STDCALL FrLdrLoadModule(FILE *ModuleImage, LPCSTR ModuleName, PULONG ModuleSize);
BOOL STDCALL FrLdrCloseModule(ULONG_PTR ModuleBase, ULONG dwModuleSize); BOOL STDCALL FrLdrCloseModule(ULONG_PTR ModuleBase, ULONG dwModuleSize);
VOID STDCALL FrLdrStartup(ULONG Magic); VOID STDCALL FrLdrStartup(ULONG Magic);
typedef VOID (FASTCALL *ASMCODE)(ULONG Magic, PLOADER_PARAMETER_BLOCK LoaderBlock); typedef VOID (FASTCALL *ASMCODE)(ULONG Magic, PLOADER_PARAMETER_BLOCK LoaderBlock);

1
reactos/boot/freeldr/freeldr/include/rtl.h
View file

@ -63,7 +63,6 @@ void sound(int freq);
#define min(a, b) (((a) < (b)) ? (a) : (b)) #define min(a, b) (((a) < (b)) ? (a) : (b))
#endif #endif
#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
#define UINT64_C(val) val##ULL #define UINT64_C(val) val##ULL
/////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////

26
reactos/boot/freeldr/freeldr/include/ui.h
View file

@ -47,7 +47,7 @@ extern BOOL UserInterfaceUp; // Tells us if the user interface is display
extern BOOL UiUseSpecialEffects; // Tells us if we should use fade effects 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 @@ extern CHAR UiMonthNames[12][15];
/////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////
BOOL UiInitialize(BOOLEAN ShowGui); // Initialize User-Interface BOOL UiInitialize(BOOLEAN ShowGui); // Initialize User-Interface
BOOL SetupUiInitialize(VOID); // 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 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 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 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 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 UiDrawText(ULONG X, ULONG Y, PCSTR 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 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(PCHAR StatusText); // Draws text at the very bottom line on the screen VOID UiDrawStatusText(PCSTR StatusText); // Draws text at the very bottom line on the screen
VOID UiUpdateDateTime(VOID); // Updates the date and time VOID UiUpdateDateTime(VOID); // Updates the date and time
VOID UiInfoBox(PCHAR MessageText); // Displays a info box on the screen VOID UiInfoBox(PCSTR MessageText); // Displays a info box on the screen
VOID UiMessageBox(PCHAR MessageText); // Displays a message box on the screen with an ok button VOID UiMessageBox(PCSTR 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 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 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 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' 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 UiTextToColor(PCSTR 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 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 '...' VOID UiTruncateStringEllipsis(PCHAR StringText, ULONG MaxChars); // Truncates a string to MaxChars by adding an ellipsis on the end '...'
@ -89,7 +89,7 @@ VOID UiFadeOut(VOID); // Fades the screen out
/////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////
typedef BOOL (*UiMenuKeyPressFilterCallback)(ULONG KeyPress); 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);

8
reactos/boot/freeldr/freeldr/inifile/inifile.c
View file

@ -24,7 +24,7 @@
#include <debug.h> #include <debug.h>
#include <mm.h> #include <mm.h>
BOOL IniOpenSection(PCHAR SectionName, ULONG* SectionId) BOOL IniOpenSection(PCSTR SectionName, ULONG* SectionId)
{ {
PINI_SECTION Section; PINI_SECTION Section;
@ -131,7 +131,7 @@ BOOL IniReadSettingByNumber(ULONG SectionId, ULONG SettingNumber, PCHAR SettingN
return FALSE; 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 Section = (PINI_SECTION)SectionId;
PINI_SECTION_ITEM SectionItem; PINI_SECTION_ITEM SectionItem;
@ -163,7 +163,7 @@ BOOL IniReadSettingByName(ULONG SectionId, PCHAR SettingName, PCHAR Buffer, ULON
return FALSE; return FALSE;
} }
BOOL IniAddSection(PCHAR SectionName, ULONG* SectionId) BOOL IniAddSection(PCSTR SectionName, ULONG* SectionId)
{ {
PINI_SECTION Section; PINI_SECTION Section;
@ -203,7 +203,7 @@ BOOL IniAddSection(PCHAR SectionName, ULONG* SectionId)
return TRUE; 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 Section = (PINI_SECTION)SectionId;
PINI_SECTION_ITEM SectionItem; PINI_SECTION_ITEM SectionItem;

4
reactos/boot/freeldr/freeldr/linuxboot.c
View file

@ -54,7 +54,7 @@ PVOID LinuxInitrdLoadAddress = NULL;
CHAR LinuxBootDescription[80]; CHAR LinuxBootDescription[80];
CHAR LinuxBootPath[260] = ""; CHAR LinuxBootPath[260] = "";
VOID LoadAndBootLinux(PCHAR OperatingSystemName, PCHAR Description) VOID LoadAndBootLinux(PCSTR OperatingSystemName, PCSTR Description)
{ {
PFILE LinuxKernel = NULL; PFILE LinuxKernel = NULL;
PFILE LinuxInitrdFile = NULL; PFILE LinuxInitrdFile = NULL;
@ -229,7 +229,7 @@ LinuxBootFailed:
LinuxCommandLineSize = 0; LinuxCommandLineSize = 0;
} }
BOOL LinuxParseIniSection(PCHAR OperatingSystemName) BOOL LinuxParseIniSection(PCSTR OperatingSystemName)
{ {
CHAR SettingName[260]; CHAR SettingName[260];
ULONG SectionId; ULONG SectionId;

6
reactos/boot/freeldr/freeldr/miscboot.c
View file

@ -29,7 +29,7 @@
#include <drivemap.h> #include <drivemap.h>
#include <machine.h> #include <machine.h>
VOID LoadAndBootBootSector(PCHAR OperatingSystemName) VOID LoadAndBootBootSector(PCSTR OperatingSystemName)
{ {
PFILE FilePointer; PFILE FilePointer;
CHAR SettingName[80]; CHAR SettingName[80];
@ -100,7 +100,7 @@ VOID LoadAndBootBootSector(PCHAR OperatingSystemName)
ChainLoadBiosBootSectorCode(); ChainLoadBiosBootSectorCode();
} }
VOID LoadAndBootPartition(PCHAR OperatingSystemName) VOID LoadAndBootPartition(PCSTR OperatingSystemName)
{ {
CHAR SettingName[80]; CHAR SettingName[80];
CHAR SettingValue[80]; CHAR SettingValue[80];
@ -171,7 +171,7 @@ VOID LoadAndBootPartition(PCHAR OperatingSystemName)
ChainLoadBiosBootSectorCode(); ChainLoadBiosBootSectorCode();
} }
VOID LoadAndBootDrive(PCHAR OperatingSystemName) VOID LoadAndBootDrive(PCSTR OperatingSystemName)
{ {
CHAR SettingName[80]; CHAR SettingName[80];
CHAR SettingValue[80]; CHAR SettingValue[80];

2
reactos/boot/freeldr/freeldr/options.c
View file

@ -27,7 +27,7 @@
#include <arch.h> #include <arch.h>
PCHAR OptionsMenuList[] = PCSTR OptionsMenuList[] =
{ {
"Safe Mode", "Safe Mode",
"Safe Mode with Networking", "Safe Mode with Networking",

6
reactos/boot/freeldr/freeldr/oslist.c
View file

@ -24,7 +24,7 @@
#include <mm.h> #include <mm.h>
#include <ui.h> #include <ui.h>
BOOL InitOperatingSystemList(PCHAR **SectionNamesPointer, PCHAR **DisplayNamesPointer, ULONG* OperatingSystemCountPointer) BOOL InitOperatingSystemList(PCSTR **SectionNamesPointer, PCSTR **DisplayNamesPointer, ULONG* OperatingSystemCountPointer)
{ {
ULONG Idx; ULONG Idx;
ULONG CurrentOperatingSystemIndex; ULONG CurrentOperatingSystemIndex;
@ -79,8 +79,8 @@ BOOL InitOperatingSystemList(PCHAR **SectionNamesPointer, PCHAR **DisplayNamesPo
} }
*OperatingSystemCountPointer = OperatingSystemCount; *OperatingSystemCountPointer = OperatingSystemCount;
*SectionNamesPointer = OperatingSystemSectionNames; *SectionNamesPointer = (PCSTR*)OperatingSystemSectionNames;
*DisplayNamesPointer = OperatingSystemDisplayNames; *DisplayNamesPointer = (PCSTR*)OperatingSystemDisplayNames;
return TRUE; return TRUE;
} }

8
reactos/boot/freeldr/freeldr/reactos/binhive.c
View file

@ -326,7 +326,7 @@ CmiCreateDefaultBinCell (PHBIN BinCell)
static VOID static VOID
CmiCreateDefaultRootKeyCell (PKEY_CELL RootKeyCell, PCHAR KeyName) CmiCreateDefaultRootKeyCell (PKEY_CELL RootKeyCell, PCSTR KeyName)
{ {
PCHAR BaseKeyName; PCHAR BaseKeyName;
ULONG NameSize; ULONG NameSize;
@ -357,7 +357,7 @@ CmiCreateDefaultRootKeyCell (PKEY_CELL RootKeyCell, PCHAR KeyName)
static PREGISTRY_HIVE static PREGISTRY_HIVE
CmiCreateHive (PCHAR KeyName) CmiCreateHive (PCSTR KeyName)
{ {
PREGISTRY_HIVE Hive; PREGISTRY_HIVE Hive;
PCELL_HEADER FreeCell; PCELL_HEADER FreeCell;
@ -1258,7 +1258,7 @@ CmiCalcHiveChecksum (PREGISTRY_HIVE Hive)
static BOOL static BOOL
CmiExportHive (PREGISTRY_HIVE Hive, CmiExportHive (PREGISTRY_HIVE Hive,
PCHAR KeyName) PCSTR KeyName)
{ {
PKEY_CELL KeyCell; PKEY_CELL KeyCell;
FRLDRHKEY Key; FRLDRHKEY Key;
@ -1624,7 +1624,7 @@ RegImportBinaryHive(PCHAR ChunkBase,
BOOL BOOL
RegExportBinaryHive(PCHAR KeyName, RegExportBinaryHive(PCSTR KeyName,
PCHAR ChunkBase, PCHAR ChunkBase,
ULONG* ChunkSize) ULONG* ChunkSize)
{ {

4
reactos/boot/freeldr/freeldr/reactos/loader.c
View file

@ -706,7 +706,7 @@ FrLdrMapKernel(FILE *KernelImage)
ULONG_PTR ULONG_PTR
STDCALL STDCALL
FrLdrLoadModule(FILE *ModuleImage, FrLdrLoadModule(FILE *ModuleImage,
LPSTR ModuleName, LPCSTR ModuleName,
PULONG ModuleSize) PULONG ModuleSize)
{ {
ULONG LocalModuleSize; ULONG LocalModuleSize;
@ -757,7 +757,7 @@ FrLdrLoadModule(FILE *ModuleImage,
ULONG_PTR ULONG_PTR
STDCALL STDCALL
FrLdrCreateModule(LPSTR ModuleName) FrLdrCreateModule(LPCSTR ModuleName)
{ {
PLOADER_MODULE ModuleData; PLOADER_MODULE ModuleData;
LPSTR NameBuffer; LPSTR NameBuffer;

20
reactos/boot/freeldr/freeldr/reactos/reactos.c
View file

@ -78,7 +78,7 @@ FrLdrLoadKernel(PCHAR szFileName,
FrLdrMapKernel(FilePointer); FrLdrMapKernel(FilePointer);
/* Update Processbar and return success */ /* Update Processbar and return success */
UiDrawProgressBarCenter(nPos, 100, "Loading ReactOS..."); UiDrawProgressBarCenter(nPos, 100, (PCHAR)"Loading ReactOS...");
return(TRUE); return(TRUE);
} }
@ -145,8 +145,8 @@ LoadKernelSymbols(PCHAR szKernelName, int nPos)
} }
static BOOL static BOOL
FrLdrLoadNlsFile(PCHAR szFileName, FrLdrLoadNlsFile(PCSTR szFileName,
PCHAR szModuleName) PCSTR szModuleName)
{ {
PFILE FilePointer; PFILE FilePointer;
CHAR value[256]; CHAR value[256];
@ -340,7 +340,7 @@ FrLdrLoadDriver(PCHAR szFileName,
FrLdrLoadModule(FilePointer, szFileName, NULL); FrLdrLoadModule(FilePointer, szFileName, NULL);
/* Update status and return */ /* Update status and return */
UiDrawProgressBarCenter(nPos, 100, "Loading ReactOS..."); UiDrawProgressBarCenter(nPos, 100, (PCHAR)"Loading ReactOS...");
return(TRUE); return(TRUE);
} }
@ -570,7 +570,7 @@ FrLdrLoadBootDrivers(PCHAR szSystemRoot,
} }
VOID VOID
LoadAndBootReactOS(PCHAR OperatingSystemName) LoadAndBootReactOS(PCSTR OperatingSystemName)
{ {
PFILE FilePointer; PFILE FilePointer;
CHAR name[1024]; CHAR name[1024];
@ -704,7 +704,7 @@ LoadAndBootReactOS(PCHAR OperatingSystemName)
if (AcpiPresent) LoaderBlock.Flags |= MB_FLAGS_ACPI_TABLE; if (AcpiPresent) LoaderBlock.Flags |= MB_FLAGS_ACPI_TABLE;
UiDrawStatusText("Loading..."); UiDrawStatusText("Loading...");
UiDrawProgressBarCenter(0, 100, "Loading ReactOS..."); UiDrawProgressBarCenter(0, 100, (PCHAR)"Loading ReactOS...");
/* /*
* Try to open system drive * Try to open system drive
@ -838,7 +838,7 @@ LoadAndBootReactOS(PCHAR OperatingSystemName)
*/ */
RegInitCurrentControlSet(FALSE); RegInitCurrentControlSet(FALSE);
UiDrawProgressBarCenter(15, 100, "Loading ReactOS..."); UiDrawProgressBarCenter(15, 100, (PCHAR)"Loading ReactOS...");
/* /*
* Export the hardware hive * Export the hardware hive
@ -847,7 +847,7 @@ LoadAndBootReactOS(PCHAR OperatingSystemName)
RegExportBinaryHive ("\\Registry\\Machine\\HARDWARE", (PCHAR)Base, &Size); RegExportBinaryHive ("\\Registry\\Machine\\HARDWARE", (PCHAR)Base, &Size);
FrLdrCloseModule (Base, Size); FrLdrCloseModule (Base, Size);
UiDrawProgressBarCenter(20, 100, "Loading ReactOS..."); UiDrawProgressBarCenter(20, 100, (PCHAR)"Loading ReactOS...");
/* /*
* Load NLS files * Load NLS files
@ -857,13 +857,13 @@ LoadAndBootReactOS(PCHAR OperatingSystemName)
UiMessageBox(MsgBuffer); UiMessageBox(MsgBuffer);
return; return;
} }
UiDrawProgressBarCenter(30, 100, "Loading ReactOS..."); UiDrawProgressBarCenter(30, 100, (PCHAR)"Loading ReactOS...");
/* /*
* Load kernel symbols * Load kernel symbols
*/ */
LoadKernelSymbols(szKernelName, 30); LoadKernelSymbols(szKernelName, 30);
UiDrawProgressBarCenter(40, 100, "Loading ReactOS..."); UiDrawProgressBarCenter(40, 100, (PCHAR)"Loading ReactOS...");
/* /*
* Load boot drivers * Load boot drivers

18
reactos/boot/freeldr/freeldr/reactos/registry.c
View file

@ -206,7 +206,7 @@ RegInitCurrentControlSet(BOOL LastKnownGood)
LONG LONG
RegCreateKey(FRLDRHKEY ParentKey, RegCreateKey(FRLDRHKEY ParentKey,
PCHAR KeyName, PCSTR KeyName,
PFRLDRHKEY Key) PFRLDRHKEY Key)
{ {
PLIST_ENTRY Ptr; PLIST_ENTRY Ptr;
@ -214,7 +214,7 @@ RegCreateKey(FRLDRHKEY ParentKey,
FRLDRHKEY CurrentKey; FRLDRHKEY CurrentKey;
FRLDRHKEY NewKey; FRLDRHKEY NewKey;
PCHAR p; PCHAR p;
PCHAR name; PCSTR name;
int subkeyLength; int subkeyLength;
int stringLength; int stringLength;
@ -331,7 +331,7 @@ RegCreateKey(FRLDRHKEY ParentKey,
LONG LONG
RegDeleteKey(FRLDRHKEY Key, RegDeleteKey(FRLDRHKEY Key,
PCHAR Name) PCSTR Name)
{ {
@ -384,14 +384,14 @@ RegEnumKey(FRLDRHKEY Key,
LONG LONG
RegOpenKey(FRLDRHKEY ParentKey, RegOpenKey(FRLDRHKEY ParentKey,
PCHAR KeyName, PCSTR KeyName,
PFRLDRHKEY Key) PFRLDRHKEY Key)
{ {
PLIST_ENTRY Ptr; PLIST_ENTRY Ptr;
FRLDRHKEY SearchKey = NULL; FRLDRHKEY SearchKey = NULL;
FRLDRHKEY CurrentKey; FRLDRHKEY CurrentKey;
PCHAR p; PCHAR p;
PCHAR name; PCSTR name;
int subkeyLength; int subkeyLength;
int stringLength; int stringLength;
@ -484,9 +484,9 @@ RegOpenKey(FRLDRHKEY ParentKey,
LONG LONG
RegSetValue(FRLDRHKEY Key, RegSetValue(FRLDRHKEY Key,
PCHAR ValueName, PCSTR ValueName,
ULONG Type, ULONG Type,
PCHAR Data, PCSTR Data,
ULONG DataSize) ULONG DataSize)
{ {
PLIST_ENTRY Ptr; PLIST_ENTRY Ptr;
@ -585,7 +585,7 @@ RegSetValue(FRLDRHKEY Key,
LONG LONG
RegQueryValue(FRLDRHKEY Key, RegQueryValue(FRLDRHKEY Key,
PCHAR ValueName, PCSTR ValueName,
ULONG* Type, ULONG* Type,
PUCHAR Data, PUCHAR Data,
ULONG* DataSize) ULONG* DataSize)
@ -672,7 +672,7 @@ RegQueryValue(FRLDRHKEY Key,
LONG LONG
RegDeleteValue(FRLDRHKEY Key, RegDeleteValue(FRLDRHKEY Key,
PCHAR ValueName) PCSTR ValueName)
{ {
PLIST_ENTRY Ptr; PLIST_ENTRY Ptr;
PVALUE Value = NULL; PVALUE Value = NULL;

16
reactos/boot/freeldr/freeldr/reactos/registry.h
View file

@ -72,12 +72,12 @@ RegInitCurrentControlSet(BOOL LastKnownGood);
LONG LONG
RegCreateKey(FRLDRHKEY ParentKey, RegCreateKey(FRLDRHKEY ParentKey,
PCHAR KeyName, PCSTR KeyName,
PFRLDRHKEY Key); PFRLDRHKEY Key);
LONG LONG
RegDeleteKey(FRLDRHKEY Key, RegDeleteKey(FRLDRHKEY Key,
PCHAR Name); PCSTR Name);
LONG LONG
RegEnumKey(FRLDRHKEY Key, RegEnumKey(FRLDRHKEY Key,
@ -87,27 +87,27 @@ RegEnumKey(FRLDRHKEY Key,
LONG LONG
RegOpenKey(FRLDRHKEY ParentKey, RegOpenKey(FRLDRHKEY ParentKey,
PCHAR KeyName, PCSTR KeyName,
PFRLDRHKEY Key); PFRLDRHKEY Key);
LONG LONG
RegSetValue(FRLDRHKEY Key, RegSetValue(FRLDRHKEY Key,
PCHAR ValueName, PCSTR ValueName,
ULONG Type, ULONG Type,
PCHAR Data, PCSTR Data,
ULONG DataSize); ULONG DataSize);
LONG LONG
RegQueryValue(FRLDRHKEY Key, RegQueryValue(FRLDRHKEY Key,
PCHAR ValueName, PCSTR ValueName,
ULONG* Type, ULONG* Type,
PUCHAR Data, PUCHAR Data,
ULONG* DataSize); ULONG* DataSize);
LONG LONG
RegDeleteValue(FRLDRHKEY Key, RegDeleteValue(FRLDRHKEY Key,
PCHAR ValueName); PCSTR ValueName);
LONG LONG
RegEnumValue(FRLDRHKEY Key, RegEnumValue(FRLDRHKEY Key,
@ -130,7 +130,7 @@ RegImportBinaryHive (PCHAR ChunkBase,
ULONG ChunkSize); ULONG ChunkSize);
BOOL BOOL
RegExportBinaryHive (PCHAR KeyName, RegExportBinaryHive (PCSTR KeyName,
PCHAR ChunkBase, PCHAR ChunkBase,
ULONG* ChunkSize); ULONG* ChunkSize);

10
reactos/boot/freeldr/freeldr/ui/gui.c
View file

@ -46,7 +46,7 @@ VOID GuiDrawText(ULONG X, ULONG Y, PUCHAR Text, UCHAR Attr)
{ {
} }
VOID GuiDrawStatusText(PUCHAR StatusText) VOID GuiDrawStatusText(PCSTR StatusText)
{ {
} }
@ -62,11 +62,11 @@ VOID GuiRestoreScreen(PUCHAR Buffer)
{ {
} }
VOID GuiMessageBox(PUCHAR MessageText) VOID GuiMessageBox(PCSTR MessageText)
{ {
} }
VOID GuiMessageBoxCritical(PUCHAR MessageText) VOID GuiMessageBoxCritical(PCSTR MessageText)
{ {
} }
@ -74,12 +74,12 @@ VOID GuiDrawProgressBar(ULONG Position, ULONG Range)
{ {
} }
UCHAR GuiTextToColor(PUCHAR ColorText) UCHAR GuiTextToColor(PCSTR ColorText)
{ {
return 0; return 0;
} }
UCHAR GuiTextToFillStyle(PUCHAR FillStyleText) UCHAR GuiTextToFillStyle(PCSTR FillStyleText)
{ {
return 0; return 0;
} }

12
reactos/boot/freeldr/freeldr/ui/gui.h
View file

@ -33,23 +33,23 @@ VOID GuiFillArea(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, UCHAR FillCha
VOID GuiDrawShadow(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom); // Draws a shadow on the bottom and right sides of the area specified VOID GuiDrawShadow(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom); // Draws a shadow on the bottom and right sides of the area specified
VOID GuiDrawBox(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 GuiDrawBox(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 GuiDrawText(ULONG X, ULONG Y, PUCHAR Text, UCHAR Attr); // Draws text at coordinates specified VOID GuiDrawText(ULONG X, ULONG Y, PUCHAR Text, UCHAR Attr); // Draws text at coordinates specified
VOID GuiDrawStatusText(PUCHAR StatusText); // Draws text at the very bottom line on the screen VOID GuiDrawStatusText(PCSTR StatusText); // Draws text at the very bottom line on the screen
VOID GuiUpdateDateTime(VOID); // Updates the date and time VOID GuiUpdateDateTime(VOID); // Updates the date and time
VOID GuiSaveScreen(PUCHAR Buffer); // Saves the screen so that it can be restored later VOID GuiSaveScreen(PUCHAR Buffer); // Saves the screen so that it can be restored later
VOID GuiRestoreScreen(PUCHAR Buffer); // Restores the screen from a previous save VOID GuiRestoreScreen(PUCHAR Buffer); // Restores the screen from a previous save
VOID GuiMessageBox(PUCHAR MessageText); // Displays a message box on the screen with an ok button VOID GuiMessageBox(PCSTR MessageText); // Displays a message box on the screen with an ok button
VOID GuiMessageBoxCritical(PUCHAR MessageText); // Displays a message box on the screen with an ok button using no system resources VOID GuiMessageBoxCritical(PCSTR MessageText); // Displays a message box on the screen with an ok button using no system resources
VOID GuiDrawProgressBar(ULONG Position, ULONG Range); // Draws the progress bar showing nPos percent filled VOID GuiDrawProgressBar(ULONG Position, ULONG Range); // Draws the progress bar showing nPos percent filled
UCHAR GuiTextToColor(PUCHAR ColorText); // Converts the text color into it's equivalent color value UCHAR GuiTextToColor(PCSTR ColorText); // Converts the text color into it's equivalent color value
UCHAR GuiTextToFillStyle(PUCHAR FillStyleText); // Converts the text fill into it's equivalent fill value UCHAR GuiTextToFillStyle(PCSTR FillStyleText); // Converts the text fill into it's equivalent fill value
/////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////
// //
// Menu Functions // Menu Functions
// //
/////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////
BOOL GuiDisplayMenu(PUCHAR MenuItemList[], ULONG MenuItemCount, ULONG DefaultMenuItem, LONG MenuTimeOut, ULONG* SelectedMenuItem); BOOL GuiDisplayMenu(PCSTR MenuItemList[], ULONG MenuItemCount, ULONG DefaultMenuItem, LONG MenuTimeOut, ULONG* SelectedMenuItem);

16
reactos/boot/freeldr/freeldr/ui/tui.c
View file

@ -304,7 +304,7 @@ VOID TuiDrawBox(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, UCHAR VertStyl
* DrawText() * DrawText()
* This function assumes coordinates are zero-based * This function assumes coordinates are zero-based
*/ */
VOID TuiDrawText(ULONG X, ULONG Y, PCHAR Text, UCHAR Attr) VOID TuiDrawText(ULONG X, ULONG Y, PCSTR Text, UCHAR Attr)
{ {
PUCHAR ScreenMemory = (PUCHAR)TextVideoBuffer; PUCHAR ScreenMemory = (PUCHAR)TextVideoBuffer;
ULONG i, j; ULONG i, j;
@ -317,7 +317,7 @@ VOID TuiDrawText(ULONG X, ULONG Y, PCHAR Text, UCHAR Attr)
} }
} }
VOID TuiDrawCenteredText(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, PCHAR TextString, UCHAR Attr) VOID TuiDrawCenteredText(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, PCSTR TextString, UCHAR Attr)
{ {
ULONG TextLength; ULONG TextLength;
ULONG BoxWidth; ULONG BoxWidth;
@ -378,7 +378,7 @@ VOID TuiDrawCenteredText(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, PCHAR
} }
} }
VOID TuiDrawStatusText(PCHAR StatusText) VOID TuiDrawStatusText(PCSTR StatusText)
{ {
ULONG i; ULONG i;
@ -504,7 +504,7 @@ VOID TuiRestoreScreen(PUCHAR Buffer)
} }
} }
VOID TuiMessageBox(PCHAR MessageText) VOID TuiMessageBox(PCSTR MessageText)
{ {
PVOID ScreenBuffer; PVOID ScreenBuffer;
@ -520,7 +520,7 @@ VOID TuiMessageBox(PCHAR MessageText)
MmFreeMemory(ScreenBuffer); MmFreeMemory(ScreenBuffer);
} }
VOID TuiMessageBoxCritical(PCHAR MessageText) VOID TuiMessageBoxCritical(PCSTR MessageText)
{ {
int width = 8; int width = 8;
unsigned int height = 1; unsigned int height = 1;
@ -662,7 +662,7 @@ VOID TuiDrawProgressBar(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, ULONG
VideoCopyOffScreenBufferToVRAM(); VideoCopyOffScreenBufferToVRAM();
} }
UCHAR TuiTextToColor(PCHAR ColorText) UCHAR TuiTextToColor(PCSTR ColorText)
{ {
if (stricmp(ColorText, "Black") == 0) if (stricmp(ColorText, "Black") == 0)
return COLOR_BLACK; return COLOR_BLACK;
@ -700,7 +700,7 @@ UCHAR TuiTextToColor(PCHAR ColorText)
return COLOR_BLACK; return COLOR_BLACK;
} }
UCHAR TuiTextToFillStyle(PCHAR FillStyleText) UCHAR TuiTextToFillStyle(PCSTR FillStyleText)
{ {
if (stricmp(FillStyleText, "Light") == 0) if (stricmp(FillStyleText, "Light") == 0)
{ {
@ -772,7 +772,7 @@ VOID TuiFadeOut(VOID)
} }
BOOL TuiEditBox(PCHAR MessageText, PCHAR EditTextBuffer, ULONG Length) BOOL TuiEditBox(PCSTR MessageText, PCHAR EditTextBuffer, ULONG Length)
{ {
int width = 8; int width = 8;
unsigned int height = 1; unsigned int height = 1;

20
reactos/boot/freeldr/freeldr/ui/tui.h
View file

@ -35,20 +35,20 @@ VOID TuiDrawBackdrop(VOID); // Fills the entire screen with a backdrop
VOID TuiFillArea(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, CHAR FillChar, UCHAR Attr /* Color Attributes */); // Fills the area specified with FillChar and Attr VOID TuiFillArea(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, CHAR FillChar, UCHAR Attr /* Color Attributes */); // Fills the area specified with FillChar and Attr
VOID TuiDrawShadow(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom); // Draws a shadow on the bottom and right sides of the area specified VOID TuiDrawShadow(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom); // Draws a shadow on the bottom and right sides of the area specified
VOID TuiDrawBox(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 TuiDrawBox(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 TuiDrawText(ULONG X, ULONG Y, PCHAR Text, UCHAR Attr); // Draws text at coordinates specified VOID TuiDrawText(ULONG X, ULONG Y, PCSTR Text, UCHAR Attr); // Draws text at coordinates specified
VOID TuiDrawCenteredText(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, PCHAR TextString, UCHAR Attr); // Draws centered text at the coordinates specified and clips the edges VOID TuiDrawCenteredText(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, PCSTR TextString, UCHAR Attr); // Draws centered text at the coordinates specified and clips the edges
VOID TuiDrawStatusText(PCHAR StatusText); // Draws text at the very bottom line on the screen VOID TuiDrawStatusText(PCSTR StatusText); // Draws text at the very bottom line on the screen
VOID TuiUpdateDateTime(VOID); // Updates the date and time VOID TuiUpdateDateTime(VOID); // Updates the date and time
VOID TuiSaveScreen(PUCHAR Buffer); // Saves the screen so that it can be restored later VOID TuiSaveScreen(PUCHAR Buffer); // Saves the screen so that it can be restored later
VOID TuiRestoreScreen(PUCHAR Buffer); // Restores the screen from a previous save VOID TuiRestoreScreen(PUCHAR Buffer); // Restores the screen from a previous save
VOID TuiMessageBox(PCHAR MessageText); // Displays a message box on the screen with an ok button VOID TuiMessageBox(PCSTR MessageText); // Displays a message box on the screen with an ok button
VOID TuiMessageBoxCritical(PCHAR MessageText); // Displays a message box on the screen with an ok button using no system resources VOID TuiMessageBoxCritical(PCSTR MessageText); // Displays a message box on the screen with an ok button using no system resources
VOID TuiDrawProgressBarCenter(ULONG Position, ULONG Range, PCHAR ProgressText); // Draws the progress bar showing nPos percent filled VOID TuiDrawProgressBarCenter(ULONG Position, ULONG Range, PCHAR ProgressText); // Draws the progress bar showing nPos percent filled
VOID TuiDrawProgressBar(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, ULONG Position, ULONG Range, PCHAR ProgressText); // Draws the progress bar showing nPos percent filled VOID TuiDrawProgressBar(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, ULONG Position, ULONG Range, PCHAR ProgressText); // Draws the progress bar showing nPos percent filled
BOOL TuiEditBox(PCHAR MessageText, PCHAR EditTextBuffer, ULONG Length); BOOL TuiEditBox(PCSTR MessageText, PCHAR EditTextBuffer, ULONG Length);
UCHAR TuiTextToColor(PCHAR ColorText); // Converts the text color into it's equivalent color value UCHAR TuiTextToColor(PCSTR ColorText); // Converts the text color into it's equivalent color value
UCHAR TuiTextToFillStyle(PCHAR FillStyleText); // Converts the text fill into it's equivalent fill value UCHAR TuiTextToFillStyle(PCSTR FillStyleText); // Converts the text fill into it's equivalent fill value
VOID TuiFadeInBackdrop(VOID); // Draws the backdrop and fades the screen in VOID TuiFadeInBackdrop(VOID); // Draws the backdrop and fades the screen in
VOID TuiFadeOut(VOID); // Fades the screen out VOID TuiFadeOut(VOID); // Fades the screen out
@ -61,7 +61,7 @@ VOID TuiFadeOut(VOID); // Fades the screen out
typedef struct typedef struct
{ {
PCHAR *MenuItemList; PCSTR *MenuItemList;
ULONG MenuItemCount; ULONG MenuItemCount;
LONG MenuTimeRemaining; LONG MenuTimeRemaining;
ULONG SelectedMenuItem; ULONG SelectedMenuItem;
@ -78,7 +78,7 @@ VOID TuiDrawMenu(PTUI_MENU_INFO MenuInfo);
VOID TuiDrawMenuBox(PTUI_MENU_INFO MenuInfo); VOID TuiDrawMenuBox(PTUI_MENU_INFO MenuInfo);
VOID TuiDrawMenuItem(PTUI_MENU_INFO MenuInfo, ULONG MenuItemNumber); VOID TuiDrawMenuItem(PTUI_MENU_INFO MenuInfo, ULONG MenuItemNumber);
ULONG TuiProcessMenuKeyboardEvent(PTUI_MENU_INFO MenuInfo, UiMenuKeyPressFilterCallback KeyPressFilter); ULONG TuiProcessMenuKeyboardEvent(PTUI_MENU_INFO MenuInfo, UiMenuKeyPressFilterCallback KeyPressFilter);
BOOL TuiDisplayMenu(PCHAR MenuItemList[], ULONG MenuItemCount, ULONG DefaultMenuItem, LONG MenuTimeOut, ULONG* SelectedMenuItem, BOOL CanEscape, UiMenuKeyPressFilterCallback KeyPressFilter); BOOL TuiDisplayMenu(PCSTR MenuItemList[], ULONG MenuItemCount, ULONG DefaultMenuItem, LONG MenuTimeOut, ULONG* SelectedMenuItem, BOOL CanEscape, UiMenuKeyPressFilterCallback KeyPressFilter);
/* /*

2
reactos/boot/freeldr/freeldr/ui/tuimenu.c
View file

@ -28,7 +28,7 @@
#include <video.h> #include <video.h>
BOOL TuiDisplayMenu(PCHAR MenuItemList[], ULONG MenuItemCount, ULONG DefaultMenuItem, LONG MenuTimeOut, ULONG* SelectedMenuItem, BOOL CanEscape, UiMenuKeyPressFilterCallback KeyPressFilter) BOOL TuiDisplayMenu(PCSTR MenuItemList[], ULONG MenuItemCount, ULONG DefaultMenuItem, LONG MenuTimeOut, ULONG* SelectedMenuItem, BOOL CanEscape, UiMenuKeyPressFilterCallback KeyPressFilter)
{ {
TUI_MENU_INFO MenuInformation; TUI_MENU_INFO MenuInformation;
ULONG LastClockSecond; ULONG LastClockSecond;

26
reactos/boot/freeldr/freeldr/ui/ui.c
View file

@ -57,7 +57,7 @@ VIDEODISPLAYMODE UiDisplayMode = VideoTextMode; // Tells us if we are in text
BOOL UiUseSpecialEffects = FALSE; // Tells us if we should use fade effects BOOL UiUseSpecialEffects = FALSE; // Tells us if we should use fade effects
CHAR UiMonthNames[12][15] = { "January ", "February ", "March ", "April ", "May ", "June ", "July ", "August ", "September ", "October ", "November ", "December " }; const CHAR UiMonthNames[12][15] = { "January ", "February ", "March ", "April ", "May ", "June ", "July ", "August ", "September ", "October ", "November ", "December " };
BOOL UiInitialize(BOOLEAN ShowGui) BOOL UiInitialize(BOOLEAN ShowGui)
@ -235,7 +235,7 @@ BOOL SetupUiInitialize(VOID)
return TRUE; return TRUE;
} }
VOID UiUnInitialize(PCHAR BootText) VOID UiUnInitialize(PCSTR BootText)
{ {
UiDrawBackdrop(); UiDrawBackdrop();
UiDrawStatusText("Booting..."); UiDrawStatusText("Booting...");
@ -306,7 +306,7 @@ VOID UiDrawBox(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, UCHAR VertStyle
} }
} }
VOID UiDrawText(ULONG X, ULONG Y, PCHAR Text, UCHAR Attr) VOID UiDrawText(ULONG X, ULONG Y, PCSTR Text, UCHAR Attr)
{ {
if (VideoTextMode == UiDisplayMode) if (VideoTextMode == UiDisplayMode)
{ {
@ -319,7 +319,7 @@ VOID UiDrawText(ULONG X, ULONG Y, PCHAR Text, UCHAR Attr)
} }
} }
VOID UiDrawCenteredText(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, PCHAR TextString, UCHAR Attr) VOID UiDrawCenteredText(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, PCSTR TextString, UCHAR Attr)
{ {
if (VideoTextMode == UiDisplayMode) if (VideoTextMode == UiDisplayMode)
{ {
@ -332,7 +332,7 @@ VOID UiDrawCenteredText(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, PCHAR
} }
} }
VOID UiDrawStatusText(PCHAR StatusText) VOID UiDrawStatusText(PCSTR StatusText)
{ {
if (!UserInterfaceUp) return; if (!UserInterfaceUp) return;
@ -360,7 +360,7 @@ VOID UiUpdateDateTime(VOID)
} }
} }
VOID UiInfoBox(PCHAR MessageText) VOID UiInfoBox(PCSTR MessageText)
{ {
ULONG TextLength; ULONG TextLength;
ULONG BoxWidth; ULONG BoxWidth;
@ -421,7 +421,7 @@ VOID UiInfoBox(PCHAR MessageText)
UiDrawCenteredText(Left, Top, Right, Bottom, MessageText, ATTR(UiTextColor, UiMenuBgColor)); UiDrawCenteredText(Left, Top, Right, Bottom, MessageText, ATTR(UiTextColor, UiMenuBgColor));
} }
VOID UiMessageBox(PCHAR MessageText) VOID UiMessageBox(PCSTR MessageText)
{ {
// We have not yet displayed the user interface // We have not yet displayed the user interface
// We are probably still reading the .ini file // We are probably still reading the .ini file
@ -446,7 +446,7 @@ VOID UiMessageBox(PCHAR MessageText)
} }
} }
VOID UiMessageBoxCritical(PCHAR MessageText) VOID UiMessageBoxCritical(PCSTR MessageText)
{ {
// We have not yet displayed the user interface // We have not yet displayed the user interface
// We are probably still reading the .ini file // We are probably still reading the .ini file
@ -471,7 +471,7 @@ VOID UiMessageBoxCritical(PCHAR MessageText)
} }
} }
UCHAR UiTextToColor(PCHAR ColorText) UCHAR UiTextToColor(PCSTR ColorText)
{ {
if (VideoTextMode == UiDisplayMode) if (VideoTextMode == UiDisplayMode)
{ {
@ -485,7 +485,7 @@ UCHAR UiTextToColor(PCHAR ColorText)
} }
} }
UCHAR UiTextToFillStyle(PCHAR FillStyleText) UCHAR UiTextToFillStyle(PCSTR FillStyleText)
{ {
if (VideoTextMode == UiDisplayMode) if (VideoTextMode == UiDisplayMode)
{ {
@ -527,7 +527,7 @@ VOID UiDrawProgressBar(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, ULONG P
} }
} }
VOID UiShowMessageBoxesInSection(PCHAR SectionName) VOID UiShowMessageBoxesInSection(PCSTR SectionName)
{ {
ULONG Idx; ULONG Idx;
CHAR SettingName[80]; CHAR SettingName[80];
@ -605,7 +605,7 @@ VOID UiTruncateStringEllipsis(PCHAR StringText, ULONG MaxChars)
} }
} }
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)
{ {
if (VideoTextMode == UiDisplayMode) if (VideoTextMode == UiDisplayMode)
{ {
@ -645,7 +645,7 @@ VOID UiFadeOut(VOID)
} }
} }
BOOL UiEditBox(PCHAR MessageText, PCHAR EditTextBuffer, ULONG Length) BOOL UiEditBox(PCSTR MessageText, PCHAR EditTextBuffer, ULONG Length)
{ {
if (VideoTextMode == UiDisplayMode) if (VideoTextMode == UiDisplayMode)
{ {