Skip to content

Commit 8eaa1fd

Browse files
iLauncherDeviLauncherDev
committed
[FREELDR] Fix tcpip.sys issue
1 parent cdb5251 commit 8eaa1fd

File tree

4 files changed

+58
-40
lines changed

4 files changed

+58
-40
lines changed

‎boot/freeldr/freeldr/include/peloader.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ BOOLEAN
5959
PeLdrScanImportDescriptorTable(
6060
IN OUT PLIST_ENTRY ModuleListHead,
6161
IN PCCH DirectoryPath,
62+
IN PCCH ArcPath,
6263
IN PLDR_DATA_TABLE_ENTRY ScanDTE);
6364

6465
BOOLEAN

‎boot/freeldr/freeldr/lib/fs/ntfs.c‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -525,19 +525,9 @@ static BOOLEAN NtfsCompareFileName(PCHAR FileName, PNTFS_INDEX_ENTRY IndexEntry)
525525
if (strlen(FileName) != EntryFileNameLength)
526526
return FALSE;
527527

528-
/* Do case-sensitive compares for Posix file names. */
529-
if (IndexEntry->FileName.FileNameType == NTFS_FILE_NAME_POSIX)
530-
{
531-
for (i = 0; i < EntryFileNameLength; i++)
532-
if (EntryFileName[i] != FileName[i])
533-
return FALSE;
534-
}
535-
else
536-
{
537-
for (i = 0; i < EntryFileNameLength; i++)
538-
if (tolower(EntryFileName[i]) != tolower(FileName[i]))
539-
return FALSE;
540-
}
528+
for (i = 0; i < EntryFileNameLength; i++)
529+
if (tolower(EntryFileName[i]) != tolower(FileName[i]))
530+
return FALSE;
541531

542532
return TRUE;
543533
}

‎boot/freeldr/freeldr/lib/peloader.c‎

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ static BOOLEAN
130130
PeLdrpLoadAndScanReferencedDll(
131131
IN OUT PLIST_ENTRY ModuleListHead,
132132
IN PCCH DirectoryPath,
133+
IN PCCH ArcPath,
133134
IN PCH ImportName,
134135
IN PLIST_ENTRY Parent OPTIONAL,
135136
OUT PLDR_DATA_TABLE_ENTRY *DataTableEntry);
@@ -145,6 +146,7 @@ PeLdrpBindImportName(
145146
_In_ ULONG ExportSize,
146147
_In_ BOOLEAN ProcessForwards,
147148
_In_ PCSTR DirectoryPath,
149+
_In_ PCSTR ArcPath,
148150
_In_ PLIST_ENTRY Parent)
149151
{
150152
ULONG Ordinal;
@@ -316,6 +318,7 @@ PeLdrpBindImportName(
316318
/* Now let's try to load it! */
317319
Success = PeLdrpLoadAndScanReferencedDll(ModuleListHead,
318320
DirectoryPath,
321+
ArcPath,
319322
ForwardDllName,
320323
Parent,
321324
&DataTableEntry);
@@ -366,6 +369,7 @@ PeLdrpBindImportName(
366369
RefExportSize,
367370
TRUE,
368371
DirectoryPath,
372+
ArcPath,
369373
Parent);
370374

371375
/* Fill out the ThunkData with data from RefThunkData */
@@ -389,31 +393,36 @@ static BOOLEAN
389393
PeLdrpLoadAndScanReferencedDll(
390394
IN OUT PLIST_ENTRY ModuleListHead,
391395
IN PCCH DirectoryPath,
396+
IN PCCH ArcPath,
392397
IN PCH ImportName,
393398
IN PLIST_ENTRY Parent OPTIONAL,
394399
OUT PLDR_DATA_TABLE_ENTRY *DataTableEntry)
395400
{
401+
CHAR ArcDllName[256];
396402
CHAR FullDllName[256];
397403
BOOLEAN Success;
398404
PVOID BasePA = NULL;
399405

400406
/* Prepare the full path to the file to be loaded */
401-
RtlStringCbCopyA(FullDllName, sizeof(FullDllName), DirectoryPath);
402-
RtlStringCbCatA(FullDllName, sizeof(FullDllName), ImportName);
407+
RtlStringCbCopyA(ArcDllName, sizeof(ArcDllName), ArcPath);
408+
RtlStringCbCatA(ArcDllName, sizeof(ArcDllName), ImportName);
403409

404-
TRACE("Loading referenced DLL: %s\n", FullDllName);
410+
TRACE("Loading referenced DLL: %s\n", ArcDllName);
405411

406412
if (PeLdrImportDllLoadCallback)
407-
PeLdrImportDllLoadCallback(FullDllName);
413+
PeLdrImportDllLoadCallback(ArcDllName);
408414

409415
/* Load the image */
410-
Success = PeLdrLoadImage(FullDllName, LoaderBootDriver, &BasePA);
416+
Success = PeLdrLoadImage(ArcDllName, LoaderBootDriver, &BasePA);
411417
if (!Success)
412418
{
413-
ERR("PeLdrLoadImage('%s') failed\n", FullDllName);
419+
ERR("PeLdrLoadImage('%s') failed\n", ArcDllName);
414420
return Success;
415421
}
416422

423+
RtlStringCbCopyA(FullDllName, sizeof(FullDllName), DirectoryPath);
424+
RtlStringCbCatA(FullDllName, sizeof(FullDllName), ImportName);
425+
417426
/* Allocate DTE for newly loaded DLL */
418427
Success = PeLdrAllocateDataTableEntry(Parent ? Parent->Blink : ModuleListHead,
419428
ImportName,
@@ -437,7 +446,7 @@ PeLdrpLoadAndScanReferencedDll(
437446
TRACE("PeLdrScanImportDescriptorTable() calling ourselves for '%.*S'\n",
438447
(*DataTableEntry)->BaseDllName.Length / sizeof(WCHAR),
439448
VaToPa((*DataTableEntry)->BaseDllName.Buffer));
440-
Success = PeLdrScanImportDescriptorTable(ModuleListHead, DirectoryPath, *DataTableEntry);
449+
Success = PeLdrScanImportDescriptorTable(ModuleListHead, DirectoryPath, ArcPath, *DataTableEntry);
441450
if (!Success)
442451
{
443452
/* Cleanup and bail out */
@@ -458,6 +467,7 @@ PeLdrpScanImportAddressTable(
458467
_In_ PIMAGE_THUNK_DATA ThunkName,
459468
_Inout_ PIMAGE_THUNK_DATA ThunkData,
460469
_In_ PCSTR DirectoryPath,
470+
_In_ PCSTR ArcPath,
461471
_In_ PLIST_ENTRY Parent)
462472
{
463473
PIMAGE_EXPORT_DIRECTORY ExportDirectory = NULL;
@@ -504,6 +514,7 @@ PeLdrpScanImportAddressTable(
504514
ExportSize,
505515
FALSE,
506516
DirectoryPath,
517+
ArcPath,
507518
Parent);
508519
/* Fail if binding was unsuccessful */
509520
if (!Success)
@@ -629,6 +640,7 @@ BOOLEAN
629640
PeLdrScanImportDescriptorTable(
630641
IN OUT PLIST_ENTRY ModuleListHead,
631642
IN PCCH DirectoryPath,
643+
IN PCCH ArcPath,
632644
IN PLDR_DATA_TABLE_ENTRY ScanDTE)
633645
{
634646
PLDR_DATA_TABLE_ENTRY DataTableEntry;
@@ -675,6 +687,7 @@ PeLdrScanImportDescriptorTable(
675687
{
676688
Success = PeLdrpLoadAndScanReferencedDll(ModuleListHead,
677689
DirectoryPath,
690+
ArcPath,
678691
ImportName,
679692
&ScanDTE->InLoadOrderLinks,
680693
&DataTableEntry);
@@ -692,6 +705,7 @@ PeLdrScanImportDescriptorTable(
692705
ThunkName,
693706
ThunkData,
694707
DirectoryPath,
708+
ArcPath,
695709
&ScanDTE->InLoadOrderLinks);
696710

697711
if (!Success)
@@ -1083,7 +1097,7 @@ PeLdrLoadBootImage(
10831097
}
10841098

10851099
/* Resolve imports */
1086-
Success = PeLdrScanImportDescriptorTable(&FrLdrModuleList, "", *DataTableEntry);
1100+
Success = PeLdrScanImportDescriptorTable(&FrLdrModuleList, "", "", *DataTableEntry);
10871101
if (!Success)
10881102
{
10891103
/* Cleanup and bail out */

‎boot/freeldr/freeldr/ntldr/winldr.c‎

Lines changed: 32 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -316,6 +316,8 @@ WinLdrLoadDeviceDriver(PLIST_ENTRY LoadOrderListHead,
316316
PLDR_DATA_TABLE_ENTRY *DriverDTE)
317317
{
318318
CHAR FullPath[1024];
319+
CHAR FullFileName[1024];
320+
CHAR ArcPath[1024];
319321
CHAR DriverPath[1024];
320322
CHAR DllName[1024];
321323
PCHAR DriverNamePos;
@@ -351,10 +353,11 @@ WinLdrLoadDeviceDriver(PLIST_ENTRY LoadOrderListHead,
351353
}
352354

353355
// It's not loaded, we have to load it
354-
RtlStringCbPrintfA(FullPath, sizeof(FullPath), "%s%wZ", BootPath, FilePath);
356+
RtlStringCbPrintfA(ArcPath, sizeof(ArcPath), "%s%wZ", BootPath, FilePath);
357+
RtlStringCbPrintfA(FullFileName, sizeof(FullFileName), "\\SystemRoot\\%s%s", DriverPath, DllName);
355358

356-
NtLdrOutputLoadMsg(FullPath, NULL);
357-
Success = PeLdrLoadImage(FullPath, LoaderBootDriver, &DriverBase);
359+
NtLdrOutputLoadMsg(ArcPath, NULL);
360+
Success = PeLdrLoadImage(ArcPath, LoaderBootDriver, &DriverBase);
358361
if (!Success)
359362
{
360363
ERR("PeLdrLoadImage('%s') failed\n", DllName);
@@ -363,9 +366,9 @@ WinLdrLoadDeviceDriver(PLIST_ENTRY LoadOrderListHead,
363366

364367
// Allocate a DTE for it
365368
Success = PeLdrAllocateDataTableEntry(LoadOrderListHead,
366-
DllName,
367-
DllName,
368-
PaToVa(DriverBase),
369+
DllName,
370+
FullFileName,
371+
PaToVa(DriverBase),
369372
DriverDTE);
370373
if (!Success)
371374
{
@@ -382,8 +385,10 @@ WinLdrLoadDeviceDriver(PLIST_ENTRY LoadOrderListHead,
382385
(*DriverDTE)->Flags |= Flags;
383386

384387
// Look for any dependencies it may have, and load them too
385-
RtlStringCbPrintfA(FullPath, sizeof(FullPath), "%s%s", BootPath, DriverPath);
386-
Success = PeLdrScanImportDescriptorTable(LoadOrderListHead, FullPath, *DriverDTE);
388+
RtlStringCbPrintfA(ArcPath, sizeof(ArcPath), "%s%s", BootPath, DriverPath);
389+
RtlStringCbPrintfA(FullPath, sizeof(FullPath), "\\SystemRoot\\%s", DriverPath);
390+
391+
Success = PeLdrScanImportDescriptorTable(LoadOrderListHead, FullPath, ArcPath, *DriverDTE);
387392
if (!Success)
388393
{
389394
/* Cleanup and bail out */
@@ -537,6 +542,7 @@ PVOID
537542
LoadModule(
538543
IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock,
539544
IN PCCH Path,
545+
IN PCCH ArcPath,
540546
IN PCCH File,
541547
IN PCCH ImportName, // BaseDllName
542548
IN TYPE_OF_MEMORY MemoryType,
@@ -545,6 +551,7 @@ LoadModule(
545551
{
546552
BOOLEAN Success;
547553
CHAR FullFileName[MAX_PATH];
554+
CHAR ArcFileName[MAX_PATH];
548555
CHAR ProgressString[256];
549556
PVOID BaseAddress;
550557

@@ -554,8 +561,11 @@ LoadModule(
554561
RtlStringCbCopyA(FullFileName, sizeof(FullFileName), Path);
555562
RtlStringCbCatA(FullFileName, sizeof(FullFileName), File);
556563

557-
NtLdrOutputLoadMsg(FullFileName, NULL);
558-
Success = PeLdrLoadImage(FullFileName, MemoryType, &BaseAddress);
564+
RtlStringCbCopyA(ArcFileName, sizeof(ArcFileName), ArcPath);
565+
RtlStringCbCatA(ArcFileName, sizeof(ArcFileName), File);
566+
567+
NtLdrOutputLoadMsg(ArcFileName, NULL);
568+
Success = PeLdrLoadImage(ArcFileName, MemoryType, &BaseAddress);
559569
if (!Success)
560570
{
561571
ERR("PeLdrLoadImage('%s') failed\n", File);
@@ -651,15 +661,18 @@ LoadWindowsCore(IN USHORT OperatingSystemVersion,
651661
PVOID KernelBase, HalBase, KdDllBase = NULL;
652662
PLDR_DATA_TABLE_ENTRY HalDTE, KdDllDTE = NULL;
653663
CHAR DirPath[MAX_PATH];
664+
CHAR ArcPath[MAX_PATH];
654665
CHAR HalFileName[MAX_PATH];
655666
CHAR KernelFileName[MAX_PATH];
656667
CHAR KdDllName[MAX_PATH];
657668

658669
if (!KernelDTE) return FALSE;
659670

660671
/* Initialize SystemRoot\System32 path */
661-
RtlStringCbCopyA(DirPath, sizeof(DirPath), BootPath);
662-
RtlStringCbCatA(DirPath, sizeof(DirPath), "system32\\");
672+
RtlStringCbCopyA(DirPath, sizeof(DirPath), "\\SystemRoot\\system32\\");
673+
674+
RtlStringCbCopyA(ArcPath, sizeof(ArcPath), BootPath);
675+
RtlStringCbCatA(ArcPath, sizeof(ArcPath), "system32\\");
663676

664677
/* Parse the boot options */
665678
TRACE("LoadWindowsCore: BootOptions '%s'\n", BootOptions);
@@ -782,7 +795,7 @@ LoadWindowsCore(IN USHORT OperatingSystemVersion,
782795
*/
783796

784797
/* Load the Kernel */
785-
KernelBase = LoadModule(LoaderBlock, DirPath, KernelFileName,
798+
KernelBase = LoadModule(LoaderBlock, DirPath, ArcPath, KernelFileName,
786799
"ntoskrnl.exe", LoaderSystemCode, KernelDTE, 30);
787800
if (!KernelBase)
788801
{
@@ -792,7 +805,7 @@ LoadWindowsCore(IN USHORT OperatingSystemVersion,
792805
}
793806

794807
/* Load the HAL */
795-
HalBase = LoadModule(LoaderBlock, DirPath, HalFileName,
808+
HalBase = LoadModule(LoaderBlock, DirPath, ArcPath, HalFileName,
796809
"hal.dll", LoaderHalCode, &HalDTE, 35);
797810
if (!HalBase)
798811
{
@@ -867,7 +880,7 @@ LoadWindowsCore(IN USHORT OperatingSystemVersion,
867880
_strlwr(KdDllName);
868881

869882
/* Load the KD DLL. Override its base DLL name to the default "KDCOM.DLL". */
870-
KdDllBase = LoadModule(LoaderBlock, DirPath, KdDllName,
883+
KdDllBase = LoadModule(LoaderBlock, DirPath, ArcPath, KdDllName,
871884
"kdcom.dll", LoaderSystemCode, &KdDllDTE, 40);
872885
if (!KdDllBase)
873886
{
@@ -880,7 +893,7 @@ LoadWindowsCore(IN USHORT OperatingSystemVersion,
880893
IsCustomKdDll = FALSE;
881894
RtlStringCbCopyA(KdDllName, sizeof(KdDllName), "kdcom.dll");
882895

883-
KdDllBase = LoadModule(LoaderBlock, DirPath, KdDllName,
896+
KdDllBase = LoadModule(LoaderBlock, DirPath, ArcPath, KdDllName,
884897
"kdcom.dll", LoaderSystemCode, &KdDllDTE, 40);
885898
}
886899

@@ -894,21 +907,21 @@ LoadWindowsCore(IN USHORT OperatingSystemVersion,
894907
}
895908

896909
/* Load all referenced DLLs for Kernel, HAL and Kernel Debugger Transport DLL */
897-
Success = PeLdrScanImportDescriptorTable(&LoaderBlock->LoadOrderListHead, DirPath, *KernelDTE);
910+
Success = PeLdrScanImportDescriptorTable(&LoaderBlock->LoadOrderListHead, DirPath, ArcPath, *KernelDTE);
898911
if (!Success)
899912
{
900913
UiMessageBox("Could not load %s", KernelFileName);
901914
goto Quit;
902915
}
903-
Success = PeLdrScanImportDescriptorTable(&LoaderBlock->LoadOrderListHead, DirPath, HalDTE);
916+
Success = PeLdrScanImportDescriptorTable(&LoaderBlock->LoadOrderListHead, DirPath, ArcPath, HalDTE);
904917
if (!Success)
905918
{
906919
UiMessageBox("Could not load %s", HalFileName);
907920
goto Quit;
908921
}
909922
if (KdDllDTE)
910923
{
911-
Success = PeLdrScanImportDescriptorTable(&LoaderBlock->LoadOrderListHead, DirPath, KdDllDTE);
924+
Success = PeLdrScanImportDescriptorTable(&LoaderBlock->LoadOrderListHead, DirPath, ArcPath, KdDllDTE);
912925
if (!Success)
913926
{
914927
UiMessageBox("Could not load %s", KdDllName);

0 commit comments

Comments
 (0)