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] Addendum to 31a3f317.

Browse source
This commit is contained in:
Hermès Bélusca-Maïto 2019-08-10 19:47:49 +02:00
parent d7d13b3226
commit 8823a0c51e
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
4 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
boot/freeldr/freeldr/include/fs.h
View file

@ -26,7 +26,7 @@ typedef struct tagDEVVTBL
ARC_OPEN Open; ARC_OPEN Open;
ARC_READ Read; ARC_READ Read;
ARC_SEEK Seek; ARC_SEEK Seek;
LPCWSTR ServiceName; PCWSTR ServiceName;
} DEVVTBL; } DEVVTBL;
#define MAX_FDS 60 #define MAX_FDS 60
@ -43,7 +43,7 @@ ULONG FsGetNumPathParts(PCSTR Path);
VOID FsGetFirstNameFromPath(PCHAR Buffer, PCSTR Path); VOID FsGetFirstNameFromPath(PCHAR Buffer, PCSTR Path);
VOID FsRegisterDevice(CHAR* Prefix, const DEVVTBL* FuncTable); VOID FsRegisterDevice(CHAR* Prefix, const DEVVTBL* FuncTable);
LPCWSTR FsGetServiceName(ULONG FileId); PCWSTR FsGetServiceName(ULONG FileId);
VOID FsSetDeviceSpecific(ULONG FileId, VOID* Specific); VOID FsSetDeviceSpecific(ULONG FileId, VOID* Specific);
VOID* FsGetDeviceSpecific(ULONG FileId); VOID* FsGetDeviceSpecific(ULONG FileId);
ULONG FsGetDeviceId(ULONG FileId); ULONG FsGetDeviceId(ULONG FileId);

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

@ -385,7 +385,7 @@ VOID FsRegisterDevice(CHAR* Prefix, const DEVVTBL* FuncTable)
InsertHeadList(&DeviceListHead, &pNewEntry->ListEntry); InsertHeadList(&DeviceListHead, &pNewEntry->ListEntry);
} }
LPCWSTR FsGetServiceName(ULONG FileId) PCWSTR FsGetServiceName(ULONG FileId)
{ {
if (FileId >= MAX_FDS || !FileData[FileId].FuncTable) if (FileId >= MAX_FDS || !FileData[FileId].FuncTable)
return NULL; return NULL;

8
boot/freeldr/freeldr/ntldr/winldr.h
View file

@ -112,7 +112,7 @@ WinLdrInitSystemHive(
IN BOOLEAN Setup); IN BOOLEAN Setup);
BOOLEAN WinLdrScanSystemHive(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, BOOLEAN WinLdrScanSystemHive(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock,
IN PCSTR DirectoryPath); IN PCSTR SystemRoot);
// winldr.c // winldr.c
VOID VOID
@ -129,9 +129,9 @@ WinLdrLoadNLSData(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock,
IN PCSTR LanguageFileName); IN PCSTR LanguageFileName);
BOOLEAN BOOLEAN
WinLdrAddDriverToList(LIST_ENTRY *BootDriverListHead, WinLdrAddDriverToList(LIST_ENTRY *BootDriverListHead,
LPWSTR RegistryPath, PWSTR RegistryPath,
LPWSTR ImagePath, PWSTR ImagePath,
LPWSTR ServiceName); PWSTR ServiceName);
VOID VOID
WinLdrpDumpMemoryDescriptors(PLOADER_PARAMETER_BLOCK LoaderBlock); WinLdrpDumpMemoryDescriptors(PLOADER_PARAMETER_BLOCK LoaderBlock);

12
boot/freeldr/freeldr/ntldr/wlregistry.c
View file

@ -106,7 +106,7 @@ WinLdrLoadSystemHive(
Success = WinLdrAddDriverToList(&LoaderBlock->BootDriverListHead, Success = WinLdrAddDriverToList(&LoaderBlock->BootDriverListHead,
L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\", L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\",
NULL, NULL,
(LPWSTR)FsService); (PWSTR)FsService);
if (!Success) if (!Success)
TRACE(" Failed to add filesystem service\n"); TRACE(" Failed to add filesystem service\n");
} }
@ -490,13 +490,13 @@ WinLdrScanRegistry(IN OUT PLIST_ENTRY BootDriverListHead,
{ {
LONG rc = 0; LONG rc = 0;
HKEY hGroupKey, hOrderKey, hServiceKey, hDriverKey; HKEY hGroupKey, hOrderKey, hServiceKey, hDriverKey;
LPWSTR GroupNameBuffer; PWSTR GroupNameBuffer;
WCHAR ServiceName[256]; WCHAR ServiceName[256];
ULONG OrderList[128]; ULONG OrderList[128];
ULONG BufferSize; ULONG BufferSize;
ULONG Index; ULONG Index;
ULONG TagIndex; ULONG TagIndex;
LPWSTR GroupName; PWSTR GroupName;
ULONG ValueSize; ULONG ValueSize;
ULONG ValueType; ULONG ValueType;
@ -773,9 +773,9 @@ InsertInBootDriverList(
BOOLEAN BOOLEAN
WinLdrAddDriverToList(LIST_ENTRY *BootDriverListHead, WinLdrAddDriverToList(LIST_ENTRY *BootDriverListHead,
LPWSTR RegistryPath, PWSTR RegistryPath,
LPWSTR ImagePath, PWSTR ImagePath,
LPWSTR ServiceName) PWSTR ServiceName)
{ {
PBOOT_DRIVER_LIST_ENTRY BootDriverEntry; PBOOT_DRIVER_LIST_ENTRY BootDriverEntry;
NTSTATUS Status; NTSTATUS Status;