Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 20:35:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

[FREELDR]

Browse source 
- Refactor some multiply used overly complex expressions into human readable variable names
- Output some useful debuginfo when an import could bot be resolved

svn path=/trunk/; revision=56247
This commit is contained in:
Timo Kreuzer 2012-03-27 09:47:10 +00:00
parent a9e1b2d9f5
commit 5a911e8752
1 changed files with 22 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

38
reactos/boot/freeldr/freeldr/windows/peloader.c
View file

@ -156,7 +156,8 @@ WinLdrScanImportDescriptorTable(IN OUT PLIST_ENTRY ModuleListHead,
if (!Status) if (!Status)
{ {
ERR("WinLdrpScanImportAddressTable() failed\n"); ERR("WinLdrpScanImportAddressTable() failed: ImportName = '%s', DirectoryPath = '%s'\n",
ImportName, DirectoryPath);
return Status; return Status;
} }
} }
@ -507,6 +508,8 @@ WinLdrpBindImportName(IN OUT PLIST_ENTRY ModuleListHead,
PUSHORT OrdinalTable; PUSHORT OrdinalTable;
LONG High, Low, Middle, Result; LONG High, Low, Middle, Result;
ULONG Hint; ULONG Hint;
PIMAGE_IMPORT_BY_NAME ImportData;
PCHAR ExportName;
//TRACE("WinLdrpBindImportName(): DllBase 0x%X, ImageBase 0x%X, ThunkData 0x%X, ExportDirectory 0x%X, ExportSize %d, ProcessForwards 0x%X\n", //TRACE("WinLdrpBindImportName(): DllBase 0x%X, ImageBase 0x%X, ThunkData 0x%X, ExportDirectory 0x%X, ExportSize %d, ProcessForwards 0x%X\n",
// DllBase, ImageBase, ThunkData, ExportDirectory, ExportSize, ProcessForwards); // DllBase, ImageBase, ThunkData, ExportDirectory, ExportSize, ProcessForwards);
@ -540,9 +543,12 @@ WinLdrpBindImportName(IN OUT PLIST_ENTRY ModuleListHead,
//TRACE("WinLdrpBindImportName(): ThunkData->u1.AOD became %p\n", ThunkData->u1.AddressOfData); //TRACE("WinLdrpBindImportName(): ThunkData->u1.AOD became %p\n", ThunkData->u1.AddressOfData);
} }
/* Get the import name */
ImportData = VaToPa((PVOID)ThunkData->u1.AddressOfData);
/* Get pointers to Name and Ordinal tables (RVA -> VA) */ /* Get pointers to Name and Ordinal tables (RVA -> VA) */
NameTable = (PULONG)VaToPa(RVA(DllBase, ExportDirectory->AddressOfNames)); NameTable = VaToPa(RVA(DllBase, ExportDirectory->AddressOfNames));
OrdinalTable = (PUSHORT)VaToPa(RVA(DllBase, ExportDirectory->AddressOfNameOrdinals)); OrdinalTable = VaToPa(RVA(DllBase, ExportDirectory->AddressOfNameOrdinals));
//TRACE("NameTable 0x%X, OrdinalTable 0x%X, ED->AddressOfNames 0x%X, ED->AOFO 0x%X\n", //TRACE("NameTable 0x%X, OrdinalTable 0x%X, ED->AddressOfNames 0x%X, ED->AOFO 0x%X\n",
// NameTable, OrdinalTable, ExportDirectory->AddressOfNames, ExportDirectory->AddressOfNameOrdinals); // NameTable, OrdinalTable, ExportDirectory->AddressOfNames, ExportDirectory->AddressOfNameOrdinals);
@ -551,15 +557,13 @@ WinLdrpBindImportName(IN OUT PLIST_ENTRY ModuleListHead,
Hint = ((PIMAGE_IMPORT_BY_NAME)VaToPa((PVOID)ThunkData->u1.AddressOfData))->Hint; Hint = ((PIMAGE_IMPORT_BY_NAME)VaToPa((PVOID)ThunkData->u1.AddressOfData))->Hint;
//TRACE("HintIndex %d\n", Hint); //TRACE("HintIndex %d\n", Hint);
/* Get the export name from the hint */
ExportName = VaToPa(RVA(DllBase, NameTable[Hint]));
/* If Hint is less than total number of entries in the export directory, /* If Hint is less than total number of entries in the export directory,
and import name == export name, then we can just get it from the OrdinalTable */ and import name == export name, then we can just get it from the OrdinalTable */
if ( if ((Hint < ExportDirectory->NumberOfNames) &&
(Hint < ExportDirectory->NumberOfNames) && (strcmp(ExportName, (PCHAR)ImportData->Name) == 0))
(
strcmp(VaToPa(&((PIMAGE_IMPORT_BY_NAME)VaToPa((PVOID)ThunkData->u1.AddressOfData))->Name[0]),
(PCHAR)VaToPa( RVA(DllBase, NameTable[Hint])) ) == 0
)
)
{ {
Ordinal = OrdinalTable[Hint]; Ordinal = OrdinalTable[Hint];
//TRACE("WinLdrpBindImportName(): Ordinal %d\n", Ordinal); //TRACE("WinLdrpBindImportName(): Ordinal %d\n", Ordinal);
@ -579,11 +583,13 @@ WinLdrpBindImportName(IN OUT PLIST_ENTRY ModuleListHead,
while (High >= Low) while (High >= Low)
{ {
/* Divide by 2 by shifting to the right once */ /* Divide by 2 by shifting to the right once */
Middle = (Low + High) >> 1; Middle = (Low + High) / 2;
/* Get the name from the name table */
ExportName = VaToPa(RVA(DllBase, NameTable[Middle]));
/* Compare the names */ /* Compare the names */
Result = strcmp(VaToPa(&((PIMAGE_IMPORT_BY_NAME)VaToPa((PVOID)ThunkData->u1.AddressOfData))->Name[0]), Result = strcmp(ExportName, (PCHAR)ImportData->Name);
(PCHAR)VaToPa(RVA(DllBase, NameTable[Middle])));
/*TRACE("Binary search: comparing Import '__', Export '%s'\n",*/ /*TRACE("Binary search: comparing Import '__', Export '%s'\n",*/
/*VaToPa(&((PIMAGE_IMPORT_BY_NAME)VaToPa(ThunkData->u1.AddressOfData))->Name[0]),*/ /*VaToPa(&((PIMAGE_IMPORT_BY_NAME)VaToPa(ThunkData->u1.AddressOfData))->Name[0]),*/
@ -595,12 +601,12 @@ WinLdrpBindImportName(IN OUT PLIST_ENTRY ModuleListHead,
/* Depending on result of strcmp, perform different actions */ /* Depending on result of strcmp, perform different actions */
if (Result < 0) if (Result > 0)
{ {
/* Adjust top boundary */ /* Adjust top boundary */
High = Middle - 1; High = Middle - 1;
} }
else if (Result > 0) else if (Result < 0)
{ {
/* Adjust bottom boundary */ /* Adjust bottom boundary */
Low = Middle + 1; Low = Middle + 1;
@ -616,7 +622,7 @@ WinLdrpBindImportName(IN OUT PLIST_ENTRY ModuleListHead,
if (High < Low) if (High < Low)
{ {
//Print(L"Error in binary search\n"); //Print(L"Error in binary search\n");
ERR("Error in binary search!\n"); ERR("Did not find export '%s'!\n", (PCHAR)ImportData->Name);
return FALSE; return FALSE;
} }