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

[NTDLL:LDR]

Browse source 
- Apply OffsetModuleName to the first import entry, not the current one in LdrpUpdateLoadCount3. Fixes missing reference updates on dependency-loaded DLLs.
CORE-5125 CORE-7127 #resolve

svn path=/trunk/; revision=66433
This commit is contained in:
Thomas Faber 2015-02-23 19:03:08 +00:00
parent 558bb053a2
commit c385450c93
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
reactos/dll/ntdll/ldr/ldrutils.c
View file

@ -223,6 +223,7 @@ LdrpUpdateLoadCount3(IN PLDR_DATA_TABLE_ENTRY LdrEntry,
OUT PUNICODE_STRING UpdateString) OUT PUNICODE_STRING UpdateString)
{ {
PIMAGE_BOUND_FORWARDER_REF NewImportForwarder; PIMAGE_BOUND_FORWARDER_REF NewImportForwarder;
PIMAGE_BOUND_IMPORT_DESCRIPTOR FirstEntry;
PIMAGE_BOUND_IMPORT_DESCRIPTOR BoundEntry; PIMAGE_BOUND_IMPORT_DESCRIPTOR BoundEntry;
PIMAGE_IMPORT_DESCRIPTOR ImportEntry; PIMAGE_IMPORT_DESCRIPTOR ImportEntry;
PIMAGE_THUNK_DATA FirstThunk; PIMAGE_THUNK_DATA FirstThunk;
@ -256,12 +257,12 @@ LdrpUpdateLoadCount3(IN PLDR_DATA_TABLE_ENTRY LdrEntry,
ImportNameUnic = &NtCurrentTeb()->StaticUnicodeString; ImportNameUnic = &NtCurrentTeb()->StaticUnicodeString;
/* Try to get the new import entry */ /* Try to get the new import entry */
BoundEntry = (PIMAGE_BOUND_IMPORT_DESCRIPTOR)RtlImageDirectoryEntryToData(LdrEntry->DllBase, FirstEntry = RtlImageDirectoryEntryToData(LdrEntry->DllBase,
TRUE, TRUE,
IMAGE_DIRECTORY_ENTRY_BOUND_IMPORT, IMAGE_DIRECTORY_ENTRY_BOUND_IMPORT,
&ImportSize); &ImportSize);
if (BoundEntry) if (FirstEntry)
{ {
/* Set entry flags if refing/derefing */ /* Set entry flags if refing/derefing */
if (Flags == LDRP_UPDATE_REFCOUNT) if (Flags == LDRP_UPDATE_REFCOUNT)
@ -269,10 +270,11 @@ LdrpUpdateLoadCount3(IN PLDR_DATA_TABLE_ENTRY LdrEntry,
else if (Flags == LDRP_UPDATE_DEREFCOUNT) else if (Flags == LDRP_UPDATE_DEREFCOUNT)
LdrEntry->Flags |= LDRP_UNLOAD_IN_PROGRESS; LdrEntry->Flags |= LDRP_UNLOAD_IN_PROGRESS;
BoundEntry = FirstEntry;
while (BoundEntry->OffsetModuleName) while (BoundEntry->OffsetModuleName)
{ {
/* Get pointer to the current import name */ /* Get pointer to the current import name */
ImportName = (PCHAR)BoundEntry + BoundEntry->OffsetModuleName; ImportName = (LPSTR)FirstEntry + BoundEntry->OffsetModuleName;
RtlInitAnsiString(&ImportNameAnsi, ImportName); RtlInitAnsiString(&ImportNameAnsi, ImportName);
Status = RtlAnsiStringToUnicodeString(ImportNameUnic, &ImportNameAnsi, FALSE); Status = RtlAnsiStringToUnicodeString(ImportNameUnic, &ImportNameAnsi, FALSE);
@ -315,9 +317,9 @@ LdrpUpdateLoadCount3(IN PLDR_DATA_TABLE_ENTRY LdrEntry,
/* Go through forwarders */ /* Go through forwarders */
NewImportForwarder = (PIMAGE_BOUND_FORWARDER_REF)(BoundEntry + 1); NewImportForwarder = (PIMAGE_BOUND_FORWARDER_REF)(BoundEntry + 1);
for (i=0; i<BoundEntry->NumberOfModuleForwarderRefs; i++) for (i = 0; i < BoundEntry->NumberOfModuleForwarderRefs; i++)
{ {
ImportName = (PCHAR)BoundEntry + NewImportForwarder->OffsetModuleName; ImportName = (LPSTR)FirstEntry + NewImportForwarder->OffsetModuleName;
RtlInitAnsiString(&ImportNameAnsi, ImportName); RtlInitAnsiString(&ImportNameAnsi, ImportName);
Status = RtlAnsiStringToUnicodeString(ImportNameUnic, &ImportNameAnsi, FALSE); Status = RtlAnsiStringToUnicodeString(ImportNameUnic, &ImportNameAnsi, FALSE);