Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 22:02:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

[FREELDR] Some more code reorg before real fixes happen.

Browse source 
svn path=/trunk/; revision=65979
This commit is contained in:
Hermès Bélusca-Maïto 2015-01-04 19:37:12 +00:00
parent 4b33c4ba90
commit 9ac9e563c2
2 changed files with 179 additions and 181 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -133,10 +133,8 @@ DiskGetBootPath(char *BootPath, unsigned Size)
strcpy(BootPath, Path); strcpy(BootPath, Path);
strcat(BootPath, "fdisk");
_itoa(FrldrBootDrive, Device, 10); _itoa(FrldrBootDrive, Device, 10);
strcat(BootPath, "("); strcat(BootPath, "fdisk(");
strcat(BootPath, Device); strcat(BootPath, Device);
strcat(BootPath, ")"); strcat(BootPath, ")");
} }
@ -163,10 +161,8 @@ DiskGetBootPath(char *BootPath, unsigned Size)
strcpy(BootPath, Path); strcpy(BootPath, Path);
strcat(BootPath, "rdisk");
_itoa(FrldrBootDrive - 0x80, Device, 10); _itoa(FrldrBootDrive - 0x80, Device, 10);
strcat(BootPath, "("); strcat(BootPath, "rdisk(");
strcat(BootPath, Device); strcat(BootPath, Device);
strcat(BootPath, ")"); strcat(BootPath, ")");
@ -186,10 +182,8 @@ DiskGetBootPath(char *BootPath, unsigned Size)
strcpy(BootPath, Path); strcpy(BootPath, Path);
strcat(BootPath, "cdrom");
_itoa(FrldrBootDrive - 0x80, Device, 10); _itoa(FrldrBootDrive - 0x80, Device, 10);
strcat(BootPath, "("); strcat(BootPath, "cdrom(");
strcat(BootPath, Device); strcat(BootPath, Device);
strcat(BootPath, ")"); strcat(BootPath, ")");
} }

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

@ -18,6 +18,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
/* INCLUDES *******************************************************************/
#include <freeldr.h> #include <freeldr.h>
#define NDEBUG #define NDEBUG
@ -25,181 +27,11 @@
DBG_DEFAULT_CHANNEL(FILESYSTEM); DBG_DEFAULT_CHANNEL(FILESYSTEM);
/* GLOBALS ********************************************************************/
#define TAG_DEVICE_NAME 'NDsF' #define TAG_DEVICE_NAME 'NDsF'
#define TAG_DEVICE 'vDsF' #define TAG_DEVICE 'vDsF'
/////////////////////////////////////////////////////////////////////////////////////////////
// FUNCTIONS
/////////////////////////////////////////////////////////////////////////////////////////////
VOID FileSystemError(PCSTR ErrorString)
{
ERR("%s\n", ErrorString);
UiMessageBox(ErrorString);
}
PFILE FsOpenFile(PCSTR FileName)
{
CHAR FullPath[MAX_PATH];
ULONG FileId;
LONG ret;
//
// Print status message
//
TRACE("Opening file '%s'...\n", FileName);
//
// Create full file name
//
MachDiskGetBootPath(FullPath, sizeof(FullPath));
strcat(FullPath, FileName);
//
// Open the file
//
ret = ArcOpen(FullPath, OpenReadOnly, &FileId);
//
// Check for success
//
if (ret == ESUCCESS)
return (PFILE)FileId;
else
return (PFILE)0;
}
VOID FsCloseFile(PFILE FileHandle)
{
ULONG FileId = (ULONG)FileHandle;
//
// Close the handle
//
ArcClose(FileId);
//
// Do not check for error; this function is
// supposed to always succeed
//
}
/*
* ReadFile()
* returns number of bytes read or EOF
*/
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);
//
// Check for success
//
return (ret == ESUCCESS);
}
ULONG FsGetFileSize(PFILE FileHandle)
{
ULONG FileId = (ULONG)FileHandle;
FILEINFORMATION Information;
LONG ret;
//
// Query file informations
//
ret = ArcGetFileInformation(FileId, &Information);
//
// Check for error
//
if (ret != ESUCCESS || Information.EndingAddress.HighPart != 0)
return 0;
//
// Return file size
//
return Information.EndingAddress.LowPart;
}
VOID FsSetFilePointer(PFILE FileHandle, ULONG NewFilePointer)
{
ULONG FileId = (ULONG)FileHandle;
LARGE_INTEGER Position;
//
// Set file position
//
Position.HighPart = 0;
Position.LowPart = NewFilePointer;
ArcSeek(FileId, &Position, SeekAbsolute);
//
// Do not check for error; this function is
// supposed to always succeed
//
}
/*
* FsGetNumPathParts()
* 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(PCSTR Path)
{
size_t i;
ULONG num;
for (i = 0, num = 0; i < strlen(Path); i++)
{
if ((Path[i] == '\\') || (Path[i] == '/'))
{
num++;
}
}
num++;
TRACE("FsGetNumPathParts() Path = %s NumPathParts = %d\n", Path, num);
return num;
}
/*
* FsGetFirstNameFromPath()
* This function parses a path in the form of dir1\dir2\file1.ext
* and puts the first name of the path (e.g. "dir1") in buffer
* compatible with the MSDOS directory structure
*/
VOID FsGetFirstNameFromPath(PCHAR Buffer, PCSTR Path)
{
size_t i;
// Copy all the characters up to the end of the
// string or until we hit a '\' character
// and put them in Buffer
for (i = 0; i < strlen(Path); i++)
{
if ((Path[i] == '\\') || (Path[i] == '/'))
{
break;
}
else
{
Buffer[i] = Path[i];
}
}
Buffer[i] = 0;
TRACE("FsGetFirstNameFromPath() Path = %s FirstName = %s\n", Path, Buffer);
}
typedef struct tagFILEDATA typedef struct tagFILEDATA
{ {
ULONG DeviceId; ULONG DeviceId;
@ -221,6 +53,8 @@ typedef struct tagDEVICE
static FILEDATA FileData[MAX_FDS]; static FILEDATA FileData[MAX_FDS];
static LIST_ENTRY DeviceListHead; static LIST_ENTRY DeviceListHead;
/* ARC FUNCTIONS **************************************************************/
ARC_STATUS ArcClose(ULONG FileId) ARC_STATUS ArcClose(ULONG FileId)
{ {
LONG ret; LONG ret;
@ -419,6 +253,176 @@ ARC_STATUS ArcSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode)
return FileData[FileId].FuncTable->Seek(FileId, Position, SeekMode); return FileData[FileId].FuncTable->Seek(FileId, Position, SeekMode);
} }
/* FUNCTIONS ******************************************************************/
VOID FileSystemError(PCSTR ErrorString)
{
ERR("%s\n", ErrorString);
UiMessageBox(ErrorString);
}
PFILE FsOpenFile(PCSTR FileName)
{
CHAR FullPath[MAX_PATH];
ULONG FileId;
LONG ret;
//
// Print status message
//
TRACE("Opening file '%s'...\n", FileName);
//
// Create full file name
//
MachDiskGetBootPath(FullPath, sizeof(FullPath));
strcat(FullPath, FileName);
//
// Open the file
//
ret = ArcOpen(FullPath, OpenReadOnly, &FileId);
//
// Check for success
//
if (ret == ESUCCESS)
return (PFILE)FileId;
else
return (PFILE)0;
}
VOID FsCloseFile(PFILE FileHandle)
{
ULONG FileId = (ULONG)FileHandle;
//
// Close the handle
//
ArcClose(FileId);
//
// Do not check for error; this function is
// supposed to always succeed
//
}
/*
* ReadFile()
* returns number of bytes read or EOF
*/
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);
//
// Check for success
//
return (ret == ESUCCESS);
}
ULONG FsGetFileSize(PFILE FileHandle)
{
ULONG FileId = (ULONG)FileHandle;
FILEINFORMATION Information;
LONG ret;
//
// Query file informations
//
ret = ArcGetFileInformation(FileId, &Information);
//
// Check for error
//
if (ret != ESUCCESS || Information.EndingAddress.HighPart != 0)
return 0;
//
// Return file size
//
return Information.EndingAddress.LowPart;
}
VOID FsSetFilePointer(PFILE FileHandle, ULONG NewFilePointer)
{
ULONG FileId = (ULONG)FileHandle;
LARGE_INTEGER Position;
//
// Set file position
//
Position.HighPart = 0;
Position.LowPart = NewFilePointer;
ArcSeek(FileId, &Position, SeekAbsolute);
//
// Do not check for error; this function is
// supposed to always succeed
//
}
/*
* FsGetNumPathParts()
* 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(PCSTR Path)
{
size_t i;
ULONG num;
for (i = 0, num = 0; i < strlen(Path); i++)
{
if ((Path[i] == '\\') || (Path[i] == '/'))
{
num++;
}
}
num++;
TRACE("FsGetNumPathParts() Path = %s NumPathParts = %d\n", Path, num);
return num;
}
/*
* FsGetFirstNameFromPath()
* This function parses a path in the form of dir1\dir2\file1.ext
* and puts the first name of the path (e.g. "dir1") in buffer
* compatible with the MSDOS directory structure
*/
VOID FsGetFirstNameFromPath(PCHAR Buffer, PCSTR Path)
{
size_t i;
// Copy all the characters up to the end of the
// string or until we hit a '\' character
// and put them in Buffer
for (i = 0; i < strlen(Path); i++)
{
if ((Path[i] == '\\') || (Path[i] == '/'))
{
break;
}
else
{
Buffer[i] = Path[i];
}
}
Buffer[i] = 0;
TRACE("FsGetFirstNameFromPath() Path = %s FirstName = %s\n", Path, Buffer);
}
VOID FsRegisterDevice(CHAR* Prefix, const DEVVTBL* FuncTable) VOID FsRegisterDevice(CHAR* Prefix, const DEVVTBL* FuncTable)
{ {
DEVICE* pNewEntry; DEVICE* pNewEntry;