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

Fixed LdrpCompareModuleNames() to accept fully qualified path names too.

Browse source 
svn path=/trunk/; revision=3048
This commit is contained in:
Eric Kohl 2002-06-11 18:37:23 +00:00
parent a89e08d368
commit 30a776c6e9
1 changed files with 42 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

48
reactos/ntoskrnl/ldr/loader.c
View file

@ -1,4 +1,4 @@
/* $Id: loader.c,v 1.107 2002/06/10 23:04:48 ekohl Exp $ /* $Id: loader.c,v 1.108 2002/06/11 18:37:23 ekohl Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -1276,17 +1276,53 @@ static LONG
LdrpCompareModuleNames(IN PUNICODE_STRING String1, LdrpCompareModuleNames(IN PUNICODE_STRING String1,
IN PUNICODE_STRING String2) IN PUNICODE_STRING String2)
{ {
ULONG len1, len2; ULONG len1, len2, i;
PWCHAR s1, s2; PWCHAR s1, s2, p;
WCHAR c1, c2; WCHAR c1, c2;
if (String1 && String2) if (String1 && String2)
{ {
/* Search String1 for last path component */
len1 = String1->Length / sizeof(WCHAR); len1 = String1->Length / sizeof(WCHAR);
len2 = String2->Length / sizeof(WCHAR);
s1 = String1->Buffer; s1 = String1->Buffer;
s2 = String2->Buffer; for (i = 0, p = String1->Buffer; i < String1->Length; i = i + sizeof(WCHAR), p++)
{
if (*p == L'\\')
{
if (i == String1->Length - sizeof(WCHAR))
{
s1 = NULL;
len1 = 0;
}
else
{
s1 = p + 1;
len1 = (String1->Length - i) / sizeof(WCHAR);
}
}
}
/* Search String2 for last path component */
len2 = String2->Length / sizeof(WCHAR);
s2 = String2->Buffer;
for (i = 0, p = String2->Buffer; i < String2->Length; i = i + sizeof(WCHAR), p++)
{
if (*p == L'\\')
{
if (i == String2->Length - sizeof(WCHAR))
{
s2 = NULL;
len2 = 0;
}
else
{
s2 = p + 1;
len2 = (String2->Length - i) / sizeof(WCHAR);
}
}
}
/* Compare last path components */
if (s1 && s2) if (s1 && s2)
{ {
while (1) while (1)
@ -1327,7 +1363,7 @@ LdrGetModuleObject(PUNICODE_STRING ModuleName)
if (!LdrpCompareModuleNames(&Module->BaseName, ModuleName)) if (!LdrpCompareModuleNames(&Module->BaseName, ModuleName))
{ {
DPRINT("Module %x\n", Module); DPRINT("Module %wZ\n", &Module->BaseName);
KeReleaseSpinLock(&ModuleListLock, Irql); KeReleaseSpinLock(&ModuleListLock, Irql);
return(Module); return(Module);
} }