Skip to content

Commit 9ab5ff9

Browse files
iLauncherDeviLauncherDev
committed
[FREELDR] Fix tcpip.sys issue
1 parent 268e5e7 commit 9ab5ff9

File tree

4 files changed

+52
-24
lines changed

4 files changed

+52
-24
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/peloader.c‎

Lines changed: 18 additions & 4 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,28 +393,33 @@ 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
{
396401
CHAR FullDllName[256];
402+
CHAR ArcFullDllName[256];
397403
BOOLEAN Success;
398404
PVOID BasePA = NULL;
399405

400406
/* Prepare the full path to the file to be loaded */
401407
RtlStringCbCopyA(FullDllName, sizeof(FullDllName), DirectoryPath);
402408
RtlStringCbCatA(FullDllName, sizeof(FullDllName), ImportName);
403409

410+
RtlStringCbCopyA(ArcFullDllName, sizeof(ArcFullDllName), ArcPath);
411+
RtlStringCbCatA(ArcFullDllName, sizeof(ArcFullDllName), ImportName);
412+
404413
TRACE("Loading referenced DLL: %s\n", FullDllName);
405414

406415
if (PeLdrImportDllLoadCallback)
407416
PeLdrImportDllLoadCallback(FullDllName);
408417

409418
/* Load the image */
410-
Success = PeLdrLoadImage(FullDllName, LoaderBootDriver, &BasePA);
419+
Success = PeLdrLoadImage(ArcFullDllName, LoaderBootDriver, &BasePA);
411420
if (!Success)
412421
{
413-
ERR("PeLdrLoadImage('%s') failed\n", FullDllName);
422+
ERR("PeLdrLoadImage('%s') failed\n", ArcFullDllName);
414423
return Success;
415424
}
416425

@@ -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: 33 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ NtLdrOutputLoadMsg(
7575
VOID WinLdrSetOperatingSystemVersion(
7676
IN ULONG VersionToBoot)
7777
{
78+
WinLdrSystemBlock->OsVersion = VersionToBoot;
79+
7880
if (VersionToBoot >= _WIN32_WINNT_WIN7)
7981
{
8082
WinLdrSystemBlock->u1.LoaderBlockWin7.OsMajorVersion = (VersionToBoot & 0xFF00) >> 8;
@@ -371,6 +373,8 @@ WinLdrLoadDeviceDriver(PLIST_ENTRY LoadOrderListHead,
371373
PLDR_DATA_TABLE_ENTRY *DriverDTE)
372374
{
373375
CHAR FullPath[1024];
376+
CHAR FullFileName[1024];
377+
CHAR ArcPath[1024];
374378
CHAR DriverPath[1024];
375379
CHAR DllName[1024];
376380
PCHAR DriverNamePos;
@@ -406,20 +410,21 @@ WinLdrLoadDeviceDriver(PLIST_ENTRY LoadOrderListHead,
406410
}
407411

408412
// It's not loaded, we have to load it
409-
RtlStringCbPrintfA(FullPath, sizeof(FullPath), "%s%wZ", BootPath, FilePath);
413+
RtlStringCbPrintfA(ArcPath, sizeof(ArcPath), "%s%wZ", BootPath, FilePath);
410414

411-
NtLdrOutputLoadMsg(FullPath, NULL);
412-
Success = PeLdrLoadImage(FullPath, LoaderBootDriver, &DriverBase);
415+
NtLdrOutputLoadMsg(ArcPath, NULL);
416+
Success = PeLdrLoadImage(ArcPath, LoaderBootDriver, &DriverBase);
413417
if (!Success)
414418
{
415419
ERR("PeLdrLoadImage('%s') failed\n", DllName);
416420
return FALSE;
417421
}
418422

419423
// Allocate a DTE for it
424+
RtlStringCbPrintfA(FullFileName, sizeof(FullFileName), "\\SystemRoot\\%s%s", DriverPath, DllName);
420425
Success = PeLdrAllocateDataTableEntry(LoadOrderListHead,
421426
DllName,
422-
DllName,
427+
FullFileName,
423428
PaToVa(DriverBase),
424429
DriverDTE);
425430
if (!Success)
@@ -437,8 +442,9 @@ WinLdrLoadDeviceDriver(PLIST_ENTRY LoadOrderListHead,
437442
(*DriverDTE)->Flags |= Flags;
438443

439444
// Look for any dependencies it may have, and load them too
440-
RtlStringCbPrintfA(FullPath, sizeof(FullPath), "%s%s", BootPath, DriverPath);
441-
Success = PeLdrScanImportDescriptorTable(LoadOrderListHead, FullPath, *DriverDTE);
445+
RtlStringCbPrintfA(ArcPath, sizeof(ArcPath), "%s%s", BootPath, DriverPath);
446+
RtlStringCbPrintfA(FullPath, sizeof(FullPath), "\\SystemRoot\\%s", DriverPath);
447+
Success = PeLdrScanImportDescriptorTable(LoadOrderListHead, FullPath, ArcPath, *DriverDTE);
442448
if (!Success)
443449
{
444450
/* Cleanup and bail out */
@@ -592,6 +598,7 @@ PVOID
592598
LoadModule(
593599
IN OUT PLOADER_PARAMETER_BLOCK1 LoaderBlock1,
594600
IN PCCH Path,
601+
IN PCCH ArcPath,
595602
IN PCCH File,
596603
IN PCCH ImportName, // BaseDllName
597604
IN TYPE_OF_MEMORY MemoryType,
@@ -600,6 +607,7 @@ LoadModule(
600607
{
601608
BOOLEAN Success;
602609
CHAR FullFileName[MAX_PATH];
610+
CHAR ArcFileName[MAX_PATH];
603611
CHAR ProgressString[256];
604612
PVOID BaseAddress;
605613

@@ -609,8 +617,11 @@ LoadModule(
609617
RtlStringCbCopyA(FullFileName, sizeof(FullFileName), Path);
610618
RtlStringCbCatA(FullFileName, sizeof(FullFileName), File);
611619

612-
NtLdrOutputLoadMsg(FullFileName, NULL);
613-
Success = PeLdrLoadImage(FullFileName, MemoryType, &BaseAddress);
620+
RtlStringCbCopyA(ArcFileName, sizeof(ArcFileName), ArcPath);
621+
RtlStringCbCatA(ArcFileName, sizeof(ArcFileName), File);
622+
623+
NtLdrOutputLoadMsg(ArcFileName, NULL);
624+
Success = PeLdrLoadImage(ArcFileName, MemoryType, &BaseAddress);
614625
if (!Success)
615626
{
616627
ERR("PeLdrLoadImage('%s') failed\n", File);
@@ -626,7 +637,7 @@ LoadModule(
626637
if (!Success)
627638
{
628639
/* Cleanup and bail out */
629-
ERR("PeLdrAllocateDataTableEntry('%s') failed\n", FullFileName);
640+
ERR("PeLdrAllocateDataTableEntry('%s') failed\n", ArcFileName);
630641
MmFreeMemory(BaseAddress);
631642
return NULL;
632643
}
@@ -705,6 +716,7 @@ LoadWindowsCore(IN USHORT OperatingSystemVersion,
705716
ULONG OptionLength;
706717
PVOID KernelBase, HalBase, KdDllBase = NULL;
707718
PLDR_DATA_TABLE_ENTRY HalDTE, KdDllDTE = NULL;
719+
CHAR ArcPath[MAX_PATH];
708720
CHAR DirPath[MAX_PATH];
709721
CHAR HalFileName[MAX_PATH];
710722
CHAR KernelFileName[MAX_PATH];
@@ -713,8 +725,11 @@ LoadWindowsCore(IN USHORT OperatingSystemVersion,
713725
if (!KernelDTE) return FALSE;
714726

715727
/* Initialize SystemRoot\System32 path */
716-
RtlStringCbCopyA(DirPath, sizeof(DirPath), BootPath);
717-
RtlStringCbCatA(DirPath, sizeof(DirPath), "system32\\");
728+
RtlStringCbCopyA(DirPath, sizeof(DirPath), "\\SystemRoot\\system32\\");
729+
730+
/* Initialize SystemRoot\System32 arc path */
731+
RtlStringCbCopyA(ArcPath, sizeof(ArcPath), BootPath);
732+
RtlStringCbCatA(ArcPath, sizeof(ArcPath), "system32\\");
718733

719734
/* Parse the boot options */
720735
TRACE("LoadWindowsCore: BootOptions '%s'\n", BootOptions);
@@ -837,7 +852,7 @@ LoadWindowsCore(IN USHORT OperatingSystemVersion,
837852
*/
838853

839854
/* Load the Kernel */
840-
KernelBase = LoadModule(LoaderBlock1, DirPath, KernelFileName,
855+
KernelBase = LoadModule(LoaderBlock1, DirPath, ArcPath, KernelFileName,
841856
"ntoskrnl.exe", LoaderSystemCode, KernelDTE, 30);
842857
if (!KernelBase)
843858
{
@@ -847,7 +862,7 @@ LoadWindowsCore(IN USHORT OperatingSystemVersion,
847862
}
848863

849864
/* Load the HAL */
850-
HalBase = LoadModule(LoaderBlock1, DirPath, HalFileName,
865+
HalBase = LoadModule(LoaderBlock1, DirPath, ArcPath, HalFileName,
851866
"hal.dll", LoaderHalCode, &HalDTE, 35);
852867
if (!HalBase)
853868
{
@@ -922,7 +937,7 @@ LoadWindowsCore(IN USHORT OperatingSystemVersion,
922937
_strlwr(KdDllName);
923938

924939
/* Load the KD DLL. Override its base DLL name to the default "KDCOM.DLL". */
925-
KdDllBase = LoadModule(LoaderBlock1, DirPath, KdDllName,
940+
KdDllBase = LoadModule(LoaderBlock1, DirPath, ArcPath, KdDllName,
926941
"kdcom.dll", LoaderSystemCode, &KdDllDTE, 40);
927942
if (!KdDllBase)
928943
{
@@ -935,7 +950,7 @@ LoadWindowsCore(IN USHORT OperatingSystemVersion,
935950
IsCustomKdDll = FALSE;
936951
RtlStringCbCopyA(KdDllName, sizeof(KdDllName), "kdcom.dll");
937952

938-
KdDllBase = LoadModule(LoaderBlock1, DirPath, KdDllName,
953+
KdDllBase = LoadModule(LoaderBlock1, DirPath, ArcPath, KdDllName,
939954
"kdcom.dll", LoaderSystemCode, &KdDllDTE, 40);
940955
}
941956

@@ -949,21 +964,21 @@ LoadWindowsCore(IN USHORT OperatingSystemVersion,
949964
}
950965

951966
/* Load all referenced DLLs for Kernel, HAL and Kernel Debugger Transport DLL */
952-
Success = PeLdrScanImportDescriptorTable(&LoaderBlock1->LoadOrderListHead, DirPath, *KernelDTE);
967+
Success = PeLdrScanImportDescriptorTable(&LoaderBlock1->LoadOrderListHead, DirPath, ArcPath, *KernelDTE);
953968
if (!Success)
954969
{
955970
UiMessageBox("Could not load %s", KernelFileName);
956971
goto Quit;
957972
}
958-
Success = PeLdrScanImportDescriptorTable(&LoaderBlock1->LoadOrderListHead, DirPath, HalDTE);
973+
Success = PeLdrScanImportDescriptorTable(&LoaderBlock1->LoadOrderListHead, DirPath, ArcPath, HalDTE);
959974
if (!Success)
960975
{
961976
UiMessageBox("Could not load %s", HalFileName);
962977
goto Quit;
963978
}
964979
if (KdDllDTE)
965980
{
966-
Success = PeLdrScanImportDescriptorTable(&LoaderBlock1->LoadOrderListHead, DirPath, KdDllDTE);
981+
Success = PeLdrScanImportDescriptorTable(&LoaderBlock1->LoadOrderListHead, DirPath, ArcPath, KdDllDTE);
967982
if (!Success)
968983
{
969984
UiMessageBox("Could not load %s", KdDllName);

‎boot/freeldr/freeldr/ntldr/winldr.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,15 +81,13 @@ typedef struct _LOADER_PARAMETER_BLOCK2
8181

8282
typedef struct _LOADER_PARAMETER_BLOCK_VISTA
8383
{
84-
ULONG OsVersion;
8584
LOADER_PARAMETER_BLOCK1 Block1;
8685
PSETUP_LOADER_BLOCK SetupLdrBlock;
8786
LOADER_PARAMETER_BLOCK2 Block2;
8887
} LOADER_PARAMETER_BLOCK_VISTA, *PLOADER_PARAMETER_BLOCK_VISTA;
8988

9089
typedef struct _LOADER_PARAMETER_BLOCK_WIN7
9190
{
92-
ULONG OsVersion;
9391
ULONG OsMajorVersion;
9492
ULONG OsMinorVersion;
9593
ULONG Size;

0 commit comments

Comments
 (0)