Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 23:13:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

dll name comparison in LdrFindDll() must be case-insensitive

Browse source 
svn path=/trunk/; revision=842
This commit is contained in:
Eric Kohl 1999-12-09 19:14:45 +00:00
parent ec235d7468
commit 5d99e9003a
1 changed files with 40 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

37
reactos/lib/ntdll/ldr/utils.c
View file

@ -1,4 +1,4 @@
/* $Id: utils.c,v 1.17 1999/11/25 10:47:56 dwelch Exp $ /* $Id: utils.c,v 1.18 1999/12/09 19:14:45 ekohl Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -78,11 +78,9 @@ NTSTATUS LdrLoadDll (PDLL* Dll,
HANDLE SectionHandle; HANDLE SectionHandle;
PDLLMAIN_FUNC Entrypoint; PDLLMAIN_FUNC Entrypoint;
if ( Dll == NULL ) if ( Dll == NULL )
return -1; return -1;
if ( Name == NULL ) { if ( Name == NULL ) {
*Dll = &LdrDllListHead; *Dll = &LdrDllListHead;
return STATUS_SUCCESS; return STATUS_SUCCESS;
@ -90,8 +88,6 @@ NTSTATUS LdrLoadDll (PDLL* Dll,
DPRINT("LdrLoadDll(Base %x, Name \"%s\")\n", Dll, Name); DPRINT("LdrLoadDll(Base %x, Name \"%s\")\n", Dll, Name);
/* /*
* Build the DLL's absolute name * Build the DLL's absolute name
*/ */
@ -99,12 +95,12 @@ NTSTATUS LdrLoadDll (PDLL* Dll,
if ( strncmp(Name,"\\??\\",3) != 0 ) { if ( strncmp(Name,"\\??\\",3) != 0 ) {
strcat(fqname, Name); strcat(fqname, Name);
} }
else else
strncpy(fqname, Name, 256); strncpy(fqname, Name, 256);
DPRINT("fqname \"%s\"\n", fqname); DPRINT("fqname \"%s\"\n", fqname);
/* /*
* Open the DLL's image file. * Open the DLL's image file.
*/ */
@ -230,11 +226,11 @@ NTSTATUS LdrLoadDll (PDLL* Dll,
&InitialViewSize, &InitialViewSize,
0, 0,
MEM_COMMIT, MEM_COMMIT,
PAGE_READWRITE PAGE_READWRITE
); );
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
dprintf("NTDLL.LDR: map view of section failed (Status %x)", dprintf("NTDLL.LDR: map view of section failed (Status %x)\n",
Status); Status);
ZwClose(FileHandle); ZwClose(FileHandle);
return(Status); return(Status);
@ -285,7 +281,7 @@ NTSTATUS LdrLoadDll (PDLL* Dll,
{ {
DPRINT("NTDLL.LDR: Entrypoint is NULL for \"%s\"\n", fqname); DPRINT("NTDLL.LDR: Entrypoint is NULL for \"%s\"\n", fqname);
} }
} }
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
@ -339,7 +335,7 @@ static NTSTATUS LdrFindDll(PDLL* Dll, PCHAR Name)
DPRINT("Scanning %s %s\n", DPRINT("Scanning %s %s\n",
ExportDir->Name + current->BaseAddress, Name); ExportDir->Name + current->BaseAddress, Name);
if (strcmp(ExportDir->Name + current->BaseAddress, Name) == 0) if (_stricmp(ExportDir->Name + current->BaseAddress, Name) == 0)
{ {
*Dll = current; *Dll = current;
current->ReferenceCount++; current->ReferenceCount++;
@ -903,7 +899,7 @@ NTSTATUS LdrUnloadDll(PDLL Dll)
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
if ( Dll->Headers->FileHeader.Characteristics & IMAGE_FILE_DLL == IMAGE_FILE_DLL ) { if (( Dll->Headers->FileHeader.Characteristics & IMAGE_FILE_DLL ) == IMAGE_FILE_DLL ) {
Entrypoint = (PDLLMAIN_FUNC) LdrPEStartup(Dll->BaseAddress, Entrypoint = (PDLLMAIN_FUNC) LdrPEStartup(Dll->BaseAddress,
Dll->SectionHandle); Dll->SectionHandle);
@ -941,7 +937,7 @@ static IMAGE_RESOURCE_DIRECTORY_ENTRY * LdrGetNextEntry(IMAGE_RESOURCE_DIRECTORY
WORD NumberOfNamedEntries; WORD NumberOfNamedEntries;
WORD NumberOfIdEntries; WORD NumberOfIdEntries;
WORD Entries; WORD Entries;
ULONG Length; ULONG Length;
@ -1049,10 +1045,6 @@ NTSTATUS LdrFindResource_U(DLL *Dll, IMAGE_RESOURCE_DATA_ENTRY **ResourceDataEnt
NTSTATUS LdrAccessResource(DLL *Dll, IMAGE_RESOURCE_DATA_ENTRY *ResourceDataEntry, void **Data) NTSTATUS LdrAccessResource(DLL *Dll, IMAGE_RESOURCE_DATA_ENTRY *ResourceDataEntry, void **Data)
{ {
PIMAGE_SECTION_HEADER Sections; PIMAGE_SECTION_HEADER Sections;
int i; int i;
@ -1065,7 +1057,6 @@ NTSTATUS LdrAccessResource(DLL *Dll, IMAGE_RESOURCE_DATA_ENTRY *ResourceDataEntr
if ( Dll == NULL ) if ( Dll == NULL )
return -1; return -1;
Sections = (PIMAGE_SECTION_HEADER) SECHDROFFSET(Dll->BaseAddress); Sections = (PIMAGE_SECTION_HEADER) SECHDROFFSET(Dll->BaseAddress);
for ( i = 0; for ( i = 0;
@ -1073,27 +1064,21 @@ NTSTATUS LdrAccessResource(DLL *Dll, IMAGE_RESOURCE_DATA_ENTRY *ResourceDataEntr
i++ i++
) )
{ {
if (Sections[i].VirtualAddress <= ResourceDataEntry->OffsetToData
if (Sections[i].VirtualAddress <= ResourceDataEntry->OffsetToData
&& Sections[i].VirtualAddress + Sections[i].Misc.VirtualSize > ResourceDataEntry->OffsetToData ) && Sections[i].VirtualAddress + Sections[i].Misc.VirtualSize > ResourceDataEntry->OffsetToData )
break; break;
} }
if ( i == Dll->Headers->FileHeader.NumberOfSections ) { if ( i == Dll->Headers->FileHeader.NumberOfSections ) {
*Data = NULL; *Data = NULL;
return -1; return -1;
} }
*Data = (void *)(((ULONG)Dll->BaseAddress + ResourceDataEntry->OffsetToData - (ULONG)Sections[i].VirtualAddress) + *Data = (void *)(((ULONG)Dll->BaseAddress + ResourceDataEntry->OffsetToData - (ULONG)Sections[i].VirtualAddress) +
(ULONG)Sections[i].PointerToRawData); (ULONG)Sections[i].PointerToRawData);
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
/* EOF */ /* EOF */