Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-29 01:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

[FREELDR]

Browse source 
- Some whitespace fixes in fs.h and code simplifications in fs.c
- Make FsOpenFile working correctly on non-ARC and ARC file names.
- Use FsOpenFile for opening ramdisks instead of ArcOpen (the file "handle" returned by FsOpenFile is just the FileId for ARC functions). Therefore we can open ramdisks files using Windows OSLOADER syntax, i.e. /RDPATH=the_image_file instead of being forced to append for example: net(0) (as in: /RDPATH=net(0)\the_image_file ): see http://lokniketan.org/index.php?title=PXE_booting_to_BARTPE#Work_with_files_in_the_TFTPBOOT_directory for an example of what I mean.

Part 1/2
CORE-9023

svn path=/trunk/; revision=65981
This commit is contained in:
Hermès Bélusca-Maïto 2015-01-04 23:41:14 +00:00
parent 5ef2270ad9
commit 614b562bb0
3 changed files with 171 additions and 163 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
reactos/boot/freeldr/freeldr/disk/ramdisk.c
View file

@ -120,9 +120,9 @@ VOID
NTAPI
RamDiskLoadVirtualFile(IN PCHAR FileName)
{
ULONG RamFile;
PFILE RamFile;
ULONG TotalRead, ChunkSize, Count;
PCHAR MsgBuffer = "Loading ramdisk...";
PCHAR MsgBuffer = "Loading RamDisk...";
ULONG PercentPerChunk, Percent;
FILEINFORMATION Information;
LARGE_INTEGER Position;
@ -136,16 +136,17 @@ RamDiskLoadVirtualFile(IN PCHAR FileName)
//
// Try opening the ramdisk file
//
ret = ArcOpen(FileName, OpenReadOnly, &RamFile);
if (ret == ESUCCESS)
{
RamFile = FsOpenFile(FileName);
if (!RamFile)
return;
//
// Get the file size
//
ret = ArcGetFileInformation(RamFile, &Information);
if (ret != ESUCCESS)
{
ArcClose(RamFile);
FsCloseFile(RamFile);
return;
}
@ -155,7 +156,7 @@ RamDiskLoadVirtualFile(IN PCHAR FileName)
if (Information.EndingAddress.HighPart != 0)
{
UiMessageBox("RAM disk too big\n");
ArcClose(RamFile);
FsCloseFile(RamFile);
return;
}
gRamDiskSize = Information.EndingAddress.LowPart;
@ -172,7 +173,7 @@ RamDiskLoadVirtualFile(IN PCHAR FileName)
if (!gRamDiskBase)
{
UiMessageBox("Failed to allocate memory for RAM disk\n");
ArcClose(RamFile);
FsCloseFile(RamFile);
return;
}
@ -220,15 +221,14 @@ RamDiskLoadVirtualFile(IN PCHAR FileName)
MmFreeMemory(gRamDiskBase);
gRamDiskBase = NULL;
gRamDiskSize = 0;
ArcClose(RamFile);
UiMessageBox("Failed to read ramdisk\n");
FsCloseFile(RamFile);
UiMessageBox("Failed to read RamDisk\n");
return;
}
}
ArcClose(RamFile);
FsCloseFile(RamFile);
// Register a new device for the ramdisk
FsRegisterDevice("ramdisk(0)", &RamDiskVtbl);
}
}

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

@ -55,31 +55,6 @@ static LIST_ENTRY DeviceListHead;
/* ARC FUNCTIONS **************************************************************/
ARC_STATUS ArcClose(ULONG FileId)
{
LONG ret;
if (FileId >= MAX_FDS || !FileData[FileId].FuncTable)
return EBADF;
ret = FileData[FileId].FuncTable->Close(FileId);
if (ret == ESUCCESS)
{
FileData[FileId].FuncTable = NULL;
FileData[FileId].Specific = NULL;
FileData[FileId].DeviceId = -1;
}
return ret;
}
ARC_STATUS ArcGetFileInformation(ULONG FileId, FILEINFORMATION* Information)
{
if (FileId >= MAX_FDS || !FileData[FileId].FuncTable)
return EBADF;
return FileData[FileId].FuncTable->GetFileInformation(FileId, Information);
}
ARC_STATUS ArcOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId)
{
ULONG Count, i, ret;
@ -239,6 +214,24 @@ ARC_STATUS ArcOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId)
return ret;
}
ARC_STATUS ArcClose(ULONG FileId)
{
LONG ret;
if (FileId >= MAX_FDS || !FileData[FileId].FuncTable)
return EBADF;
ret = FileData[FileId].FuncTable->Close(FileId);
if (ret == ESUCCESS)
{
FileData[FileId].FuncTable = NULL;
FileData[FileId].Specific = NULL;
FileData[FileId].DeviceId = -1;
}
return ret;
}
ARC_STATUS ArcRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count)
{
if (FileId >= MAX_FDS || !FileData[FileId].FuncTable)
@ -253,18 +246,24 @@ ARC_STATUS ArcSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode)
return FileData[FileId].FuncTable->Seek(FileId, Position, SeekMode);
}
ARC_STATUS ArcGetFileInformation(ULONG FileId, FILEINFORMATION* Information)
{
if (FileId >= MAX_FDS || !FileData[FileId].FuncTable)
return EBADF;
return FileData[FileId].FuncTable->GetFileInformation(FileId, Information);
}
/* FUNCTIONS ******************************************************************/
VOID FileSystemError(PCSTR ErrorString)
{
ERR("%s\n", ErrorString);
UiMessageBox(ErrorString);
}
PFILE FsOpenFile(PCSTR FileName)
{
CHAR FullPath[MAX_PATH];
CHAR FullPath[MAX_PATH] = "";
ULONG FileId;
LONG ret;
@ -274,9 +273,21 @@ PFILE FsOpenFile(PCSTR FileName)
TRACE("Opening file '%s'...\n", FileName);
//
// Create full file name
// Check whether FileName is a full path
// and if not, create a full file name.
//
// See ArcOpen: Search last ')', which delimits device and path.
//
if (strrchr(FileName, ')') == NULL)
{
/* This is not a full path. Use the current (i.e. boot) device. */
MachDiskGetBootPath(FullPath, sizeof(FullPath));
/* Append a path separator if needed */
if (FileName[0] != '\\' && FileName[0] != '/')
strcat(FullPath, "\\");
}
// Append (or just copy) the remaining file name.
strcat(FullPath, FileName);
//
@ -298,14 +309,10 @@ VOID FsCloseFile(PFILE FileHandle)
ULONG FileId = (ULONG)FileHandle;
//
// Close the handle
// Close the handle. Do not check for error,
// this function is supposed to always succeed.
//
ArcClose(FileId);
//
// Do not check for error; this function is
// supposed to always succeed
//
}
/*
@ -315,17 +322,21 @@ VOID FsCloseFile(PFILE FileHandle)
BOOLEAN FsReadFile(PFILE FileHandle, ULONG BytesToRead, ULONG* BytesRead, PVOID Buffer)
{
ULONG FileId = (ULONG)FileHandle;
LONG ret;
//
// Read the file
//
ret = ArcRead(FileId, Buffer, BytesToRead, BytesRead);
return (ArcRead(FileId, Buffer, BytesToRead, BytesRead) == ESUCCESS);
}
BOOLEAN FsGetFileInformation(PFILE FileHandle, FILEINFORMATION* Information)
{
ULONG FileId = (ULONG)FileHandle;
//
// Check for success
// Get file information
//
return (ret == ESUCCESS);
return (ArcGetFileInformation(FileId, Information) == ESUCCESS);
}
ULONG FsGetFileSize(PFILE FileHandle)
@ -357,16 +368,12 @@ VOID FsSetFilePointer(PFILE FileHandle, ULONG NewFilePointer)
LARGE_INTEGER Position;
//
// Set file position
// Set file position. Do not check for error,
// this function is supposed to always succeed.
//
Position.HighPart = 0;
Position.LowPart = NewFilePointer;
ArcSeek(FileId, &Position, SeekAbsolute);
//
// Do not check for error; this function is
// supposed to always succeed
//
}
/*

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

@ -36,6 +36,22 @@ typedef struct tagDEVVTBL
#define PFILE ULONG
ARC_STATUS ArcOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId);
ARC_STATUS ArcClose(ULONG FileId);
ARC_STATUS ArcRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count);
ARC_STATUS ArcSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode);
ARC_STATUS ArcGetFileInformation(ULONG FileId, FILEINFORMATION* Information);
VOID FileSystemError(PCSTR ErrorString);
PFILE FsOpenFile(PCSTR FileName);
VOID FsCloseFile(PFILE FileHandle);
BOOLEAN FsReadFile(PFILE FileHandle, ULONG BytesToRead, ULONG* BytesRead, PVOID Buffer);
BOOLEAN FsGetFileInformation(PFILE FileHandle, FILEINFORMATION* Information);
ULONG FsGetFileSize(PFILE FileHandle);
VOID FsSetFilePointer(PFILE FileHandle, ULONG NewFilePointer);
ULONG FsGetNumPathParts(PCSTR Path);
VOID FsGetFirstNameFromPath(PCHAR Buffer, PCSTR Path);
VOID FsRegisterDevice(CHAR* Prefix, const DEVVTBL* FuncTable);
LPCWSTR FsGetServiceName(ULONG FileId);
VOID FsSetDeviceSpecific(ULONG FileId, VOID* Specific);
@ -43,19 +59,4 @@ VOID* FsGetDeviceSpecific(ULONG FileId);
ULONG FsGetDeviceId(ULONG FileId);
VOID FsInit(VOID);
ARC_STATUS ArcClose(ULONG FileId);
ARC_STATUS ArcGetFileInformation(ULONG FileId, FILEINFORMATION* Information);
ARC_STATUS ArcOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId);
ARC_STATUS ArcRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count);
ARC_STATUS ArcSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode);
VOID FileSystemError(PCSTR ErrorString);
PFILE FsOpenFile(PCSTR FileName);
VOID FsCloseFile(PFILE FileHandle);
BOOLEAN FsReadFile(PFILE FileHandle, ULONG BytesToRead, ULONG* BytesRead, PVOID Buffer);
ULONG FsGetFileSize(PFILE FileHandle);
VOID FsSetFilePointer(PFILE FileHandle, ULONG NewFilePointer);
ULONG FsGetNumPathParts(PCSTR Path);
VOID FsGetFirstNameFromPath(PCHAR Buffer, PCSTR Path);
#define MAX_FDS 60