Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-25 01:39:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix some typos and make PFILE a ULONG

Browse source 
svn path=/trunk/; revision=42538
This commit is contained in:
Hervé Poussineau 2009-08-08 21:11:40 +00:00
parent 28bf1f3b71
commit c2b74e4921
9 changed files with 30 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -21,12 +21,12 @@
#include <debug.h>
BOOLEAN Ext2OpenVolume(UCHAR DriveNumber, ULONGLONG VolumeStartSector, ULONGLONG PartitionSectorCount);
FILE* Ext2OpenFile(PCSTR FileName);
PEXT2_FILE_INFO Ext2OpenFile(PCSTR FileName);
BOOLEAN Ext2LookupFile(PCSTR FileName, PEXT2_FILE_INFO Ext2FileInfoPointer);
BOOLEAN Ext2SearchDirectoryBufferForFile(PVOID DirectoryBuffer, ULONG DirectorySize, PCHAR FileName, PEXT2_DIR_ENTRY DirectoryEntry);
BOOLEAN Ext2ReadVolumeSectors(UCHAR DriveNumber, ULONGLONG SectorNumber, ULONGLONG SectorCount, PVOID Buffer);
BOOLEAN Ext2ReadFileBig(FILE *FileHandle, ULONGLONG BytesToRead, ULONGLONG* BytesRead, PVOID Buffer);
BOOLEAN Ext2ReadFileBig(PEXT2_FILE_INFO Ext2FileInfo, ULONGLONG BytesToRead, ULONGLONG* BytesRead, PVOID Buffer);
BOOLEAN Ext2ReadSuperBlock(VOID);
BOOLEAN Ext2ReadGroupDescriptors(VOID);
BOOLEAN Ext2ReadDirectory(ULONG Inode, PVOID* DirectoryBuffer, PEXT2_INODE InodePointer);
@ -102,7 +102,7 @@ BOOLEAN Ext2OpenVolume(UCHAR DriveNumber, ULONGLONG VolumeStartSector, ULONGLONG
* Tries to open the file 'name' and returns true or false
* for success and failure respectively
*/
FILE* Ext2OpenFile(PCSTR FileName)
PEXT2_FILE_INFO Ext2OpenFile(PCSTR FileName)
{
EXT2_FILE_INFO TempExt2FileInfo;
PEXT2_FILE_INFO FileHandle;
@ -194,7 +194,7 @@ FILE* Ext2OpenFile(PCSTR FileName)
RtlCopyMemory(FileHandle, &TempExt2FileInfo, sizeof(EXT2_FILE_INFO));
return (FILE*)FileHandle;
return FileHandle;
}
}
@ -360,9 +360,8 @@ BOOLEAN Ext2SearchDirectoryBufferForFile(PVOID DirectoryBuffer, ULONG DirectoryS
* Reads BytesToRead from open file and
* returns the number of bytes read in BytesRead
*/
BOOLEAN Ext2ReadFileBig(FILE *FileHandle, ULONGLONG BytesToRead, ULONGLONG* BytesRead, PVOID Buffer)
BOOLEAN Ext2ReadFileBig(PEXT2_FILE_INFO Ext2FileInfo, ULONGLONG BytesToRead, ULONGLONG* BytesRead, PVOID Buffer)
{
PEXT2_FILE_INFO Ext2FileInfo = (PEXT2_FILE_INFO)FileHandle;
ULONG BlockNumber;
ULONG BlockNumberIndex;
ULONG OffsetInBlock;
@ -1223,7 +1222,7 @@ LONG Ext2Open(CHAR* Path, OPENMODE OpenMode, ULONG* FileId)
LONG Ext2Read(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count)
{
PFAT_FILE_INFO FileHandle = FsGetDeviceSpecific(FileId);
PEXT2_FILE_INFO FileHandle = FsGetDeviceSpecific(FileId);
ULONGLONG BytesReadBig;
BOOLEAN ret;

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

@ -33,7 +33,7 @@ ULONG* FatGetClusterChainArray(ULONG StartCluster);
BOOLEAN FatReadCluster(ULONG ClusterNumber, PVOID Buffer);
BOOLEAN FatReadClusterChain(ULONG StartClusterNumber, ULONG NumberOfClusters, PVOID Buffer);
BOOLEAN FatReadPartialCluster(ULONG ClusterNumber, ULONG StartingOffset, ULONG Length, PVOID Buffer);
BOOLEAN FatReadFile(FILE *FileHandle, ULONG BytesToRead, ULONG* BytesRead, PVOID Buffer);
BOOLEAN FatReadFile(PFAT_FILE_INFO FatFileInfo, ULONG BytesToRead, ULONG* BytesRead, PVOID Buffer);
BOOLEAN FatReadVolumeSectors(ULONG DriveNumber, ULONG SectorNumber, ULONG SectorCount, PVOID Buffer);
BOOLEAN gCacheEnabled = FALSE;
@ -1224,9 +1224,8 @@ BOOLEAN FatReadPartialCluster(ULONG ClusterNumber, ULONG StartingOffset, ULONG L
* Reads BytesToRead from open file and
* returns the number of bytes read in BytesRead
*/
BOOLEAN FatReadFile(FILE *FileHandle, ULONG BytesToRead, ULONG* BytesRead, PVOID Buffer)
BOOLEAN FatReadFile(PFAT_FILE_INFO FatFileInfo, ULONG BytesToRead, ULONG* BytesRead, PVOID Buffer)
{
PFAT_FILE_INFO FatFileInfo = (PFAT_FILE_INFO)FileHandle;
ULONG ClusterNumber;
ULONG OffsetInCluster;
ULONG LengthInCluster;

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

@ -62,7 +62,7 @@ PFILE FsOpenFile(PCSTR FileName)
if (ret == ESUCCESS)
return (PFILE)FileId;
else
return NULL;
return (PFILE)0;
}
VOID FsCloseFile(PFILE FileHandle)

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

@ -34,8 +34,7 @@ typedef struct tagDEVVTBL
#define FS_EXT2 3
#define FS_ISO9660 5
#define FILE VOID
#define PFILE FILE *
#define PFILE ULONG
VOID FsRegisterDevice(CHAR* Prefix, const DEVVTBL* FuncTable);
VOID FsSetDeviceSpecific(ULONG FileId, VOID* Specific);

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

@ -98,9 +98,9 @@ extern reactos_mem_data_t reactos_mem_data;
VOID FASTCALL FrLdrSetupPae(ULONG Magic);
VOID FASTCALL FrLdrSetupPageDirectory(VOID);
VOID FASTCALL FrLdrGetPaeMode(VOID);
BOOLEAN NTAPI FrLdrMapKernel(FILE *KernelImage);
BOOLEAN NTAPI FrLdrMapKernel(PFILE KernelImage);
ULONG_PTR NTAPI FrLdrCreateModule(LPCSTR ModuleName);
ULONG_PTR NTAPI FrLdrLoadModule(FILE *ModuleImage, LPCSTR ModuleName, PULONG ModuleSize);
ULONG_PTR NTAPI FrLdrLoadModule(PFILE ModuleImage, LPCSTR ModuleName, PULONG ModuleSize);
BOOLEAN NTAPI FrLdrCloseModule(ULONG_PTR ModuleBase, ULONG dwModuleSize);
VOID NTAPI FrLdrStartup(ULONG Magic);
typedef VOID (FASTCALL *ROS_KERNEL_ENTRY_POINT)(ULONG Magic, PROS_LOADER_PARAMETER_BLOCK LoaderBlock);
@ -108,7 +108,7 @@ typedef VOID (FASTCALL *ROS_KERNEL_ENTRY_POINT)(ULONG Magic, PROS_LOADER_PARAMET
PVOID
NTAPI
FrLdrMapImage(
IN FILE *Image,
IN PFILE Image,
IN PCHAR ShortName,
IN ULONG ImageType
);
@ -116,7 +116,7 @@ FrLdrMapImage(
PVOID
NTAPI
FrLdrReadAndMapImage(
IN FILE *Image,
IN PFILE Image,
IN PCHAR ShortName,
IN ULONG ImageType
);

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

@ -43,8 +43,8 @@ CHAR LinuxBootPath[260] = "";
VOID LoadAndBootLinux(PCSTR OperatingSystemName, PCSTR Description)
{
PFILE LinuxKernel = NULL;
PFILE LinuxInitrdFile = NULL;
PFILE LinuxKernel = 0;
PFILE LinuxInitrdFile = 0;
CHAR TempString[260];
UiDrawBackdrop();
@ -81,7 +81,7 @@ VOID LoadAndBootLinux(PCSTR OperatingSystemName, PCSTR Description)
// Open the kernel
LinuxKernel = FsOpenFile(LinuxKernelName);
if (LinuxKernel == NULL)
if (!LinuxKernel)
{
sprintf(TempString, "Linux kernel \'%s\' not found.", LinuxKernelName);
UiMessageBox(TempString);
@ -92,7 +92,7 @@ VOID LoadAndBootLinux(PCSTR OperatingSystemName, PCSTR Description)
if (LinuxHasInitrd)
{
LinuxInitrdFile = FsOpenFile(LinuxInitrdName);
if (LinuxInitrdFile == NULL)
if (!LinuxInitrdFile)
{
sprintf(TempString, "Linux initrd image \'%s\' not found.", LinuxInitrdName);
UiMessageBox(TempString);
@ -178,11 +178,11 @@ VOID LoadAndBootLinux(PCSTR OperatingSystemName, PCSTR Description)
LinuxBootFailed:
if (LinuxKernel != NULL)
if (LinuxKernel)
{
FsCloseFile(LinuxKernel);
}
if (LinuxInitrdFile != NULL)
if (LinuxInitrdFile)
{
FsCloseFile(LinuxInitrdFile);
}

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

@ -58,7 +58,7 @@ VOID LoadAndBootBootSector(PCSTR OperatingSystemName)
}
FilePointer = FsOpenFile(FileName);
if (FilePointer == NULL)
if (!FilePointer)
{
strcat(FileName, " not found.");
UiMessageBox(FileName);

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

@ -65,7 +65,7 @@ LdrPEGetOrLoadModule(IN PCHAR ModuleName,
ULONG_PTR
NTAPI
FrLdrLoadModule(FILE *ModuleImage,
FrLdrLoadModule(PFILE ModuleImage,
LPCSTR ModuleName,
PULONG ModuleSize)
{
@ -435,7 +435,7 @@ LdrPEFixupImports(IN PVOID DllBase,
PVOID
NTAPI
FrLdrReadAndMapImage(IN FILE *Image,
FrLdrReadAndMapImage(IN PFILE Image,
IN PCHAR Name,
IN ULONG ImageType)
{
@ -674,7 +674,7 @@ FrLdrReMapImage(IN PVOID Base,
PVOID
NTAPI
FrLdrMapImage(IN FILE *Image,
FrLdrMapImage(IN PFILE Image,
IN PCHAR Name,
IN ULONG ImageType)
{

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

@ -67,7 +67,7 @@ FrLdrLoadDriver(PCHAR szFileName,
FilePointer = FsOpenFile(szFileName);
/* Try under the system root in the main dir and drivers */
if (FilePointer == NULL)
if (!FilePointer)
{
strcpy(value, SystemRoot);
if(value[strlen(value)-1] != '\\')
@ -76,7 +76,7 @@ FrLdrLoadDriver(PCHAR szFileName,
FilePointer = FsOpenFile(value);
}
if (FilePointer == NULL)
if (!FilePointer)
{
strcpy(value, SystemRoot);
if(value[strlen(value)-1] != '\\')
@ -86,7 +86,7 @@ FrLdrLoadDriver(PCHAR szFileName,
FilePointer = FsOpenFile(value);
}
if (FilePointer == NULL)
if (!FilePointer)
{
strcpy(value, SystemRoot);
if(value[strlen(value)-1] != '\\')
@ -97,7 +97,7 @@ FrLdrLoadDriver(PCHAR szFileName,
}
/* Make sure we did */
if (FilePointer == NULL) {
if (!FilePointer) {
/* Fail if file wasn't opened */
strcpy(value, szFileName);
@ -201,7 +201,7 @@ FrLdrLoadNlsFile(PCSTR szFileName,
FilePointer = FsOpenFile(szFileName);
/* Make sure we did */
if (FilePointer == NULL) {
if (!FilePointer) {
/* Fail if file wasn't opened */
strcpy(value, szFileName);
@ -847,7 +847,7 @@ LoadAndBootReactOS(PCSTR OperatingSystemName)
DPRINTM(DPRINT_REACTOS, "SystemHive: '%s'", szFileName);
FilePointer = FsOpenFile(szFileName);
if (FilePointer == NULL)
if (!FilePointer)
{
UiMessageBox("Could not find the System hive!");
return;