ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Append .dll extension in all cases (spotted by Mike Hearn).

This commit is contained in:
Alexandre Julliard 2004-11-23 14:03:49 +00:00
parent 5c38e1b561
commit b98c2e3847
1 changed files with 29 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
dlls/ntdll/loader.c
View File

@ -1354,45 +1354,42 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname,
OBJECT_ATTRIBUTES attr; OBJECT_ATTRIBUTES attr;
IO_STATUS_BLOCK io; IO_STATUS_BLOCK io;
UNICODE_STRING nt_name; UNICODE_STRING nt_name;
WCHAR *file_part, *ext; WCHAR *file_part, *ext, *dllname;
ULONG len; ULONG len;
/* first append .dll if needed */
dllname = NULL;
if (!(ext = strrchrW( libname, '.')) || strchrW( ext, '/' ) || strchrW( ext, '\\'))
{
if (!(dllname = RtlAllocateHeap( GetProcessHeap(), 0,
(strlenW(libname) * sizeof(WCHAR)) + sizeof(dllW) )))
return STATUS_NO_MEMORY;
strcpyW( dllname, libname );
strcatW( dllname, dllW );
libname = dllname;
}
nt_name.Buffer = NULL; nt_name.Buffer = NULL;
if (RtlDetermineDosPathNameType_U( libname ) == RELATIVE_PATH) if (RtlDetermineDosPathNameType_U( libname ) == RELATIVE_PATH)
{ {
/* we need to search for it */ /* we need to search for it */
/* but first append .dll because RtlDosSearchPath extension handling is broken */ len = RtlDosSearchPath_U( load_path, libname, NULL, *size, filename, &file_part );
if (!(ext = strrchrW( libname, '.')) || strchrW( ext, '/' ) || strchrW( ext, '\\'))
{
WCHAR *dllname;
if (!(dllname = RtlAllocateHeap( GetProcessHeap(), 0,
(strlenW(libname) * sizeof(WCHAR)) + sizeof(dllW) )))
return STATUS_NO_MEMORY;
strcpyW( dllname, libname );
strcatW( dllname, dllW );
len = RtlDosSearchPath_U( load_path, dllname, NULL, *size, filename, &file_part );
RtlFreeHeap( GetProcessHeap(), 0, dllname );
}
else len = RtlDosSearchPath_U( load_path, libname, NULL, *size, filename, &file_part );
if (len) if (len)
{ {
if (len >= *size) if (len >= *size) goto overflow;
{ if ((*pwm = find_fullname_module( filename )) != NULL) goto found;
*size = len + sizeof(WCHAR);
return STATUS_BUFFER_TOO_SMALL;
}
if ((*pwm = find_fullname_module( filename )) != NULL) return STATUS_SUCCESS;
/* check for already loaded module in a different path */ /* check for already loaded module in a different path */
if (!contains_path( libname )) if (!contains_path( libname ))
{ {
if ((*pwm = find_basename_module( file_part )) != NULL) return STATUS_SUCCESS; if ((*pwm = find_basename_module( file_part )) != NULL) goto found;
} }
if (!RtlDosPathNameToNtPathName_U( filename, &nt_name, NULL, NULL )) if (!RtlDosPathNameToNtPathName_U( filename, &nt_name, NULL, NULL ))
{
RtlFreeHeap( GetProcessHeap(), 0, dllname );
return STATUS_NO_MEMORY; return STATUS_NO_MEMORY;
}
attr.Length = sizeof(attr); attr.Length = sizeof(attr);
attr.RootDirectory = 0; attr.RootDirectory = 0;
attr.Attributes = OBJ_CASE_INSENSITIVE; attr.Attributes = OBJ_CASE_INSENSITIVE;
@ -1400,8 +1397,7 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname,
attr.SecurityDescriptor = NULL; attr.SecurityDescriptor = NULL;
attr.SecurityQualityOfService = NULL; attr.SecurityQualityOfService = NULL;
if (NtOpenFile( handle, GENERIC_READ, &attr, &io, FILE_SHARE_READ|FILE_SHARE_DELETE, 0 )) *handle = 0; if (NtOpenFile( handle, GENERIC_READ, &attr, &io, FILE_SHARE_READ|FILE_SHARE_DELETE, 0 )) *handle = 0;
RtlFreeUnicodeString( &nt_name ); goto found;
return STATUS_SUCCESS;
} }
/* not found */ /* not found */
@ -1413,31 +1409,21 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname,
len = strlenW(libname) * sizeof(WCHAR); len = strlenW(libname) * sizeof(WCHAR);
if (len >= *size) goto overflow; if (len >= *size) goto overflow;
strcpyW( filename, libname ); strcpyW( filename, libname );
if (!strchrW( filename, '.' ))
{
len += sizeof(dllW) - sizeof(WCHAR);
if (len >= *size) goto overflow;
strcatW( filename, dllW );
}
*pwm = find_basename_module( filename ); *pwm = find_basename_module( filename );
return STATUS_SUCCESS; goto found;
} }
} }
/* absolute path name, or relative path name but not found above */ /* absolute path name, or relative path name but not found above */
if (!RtlDosPathNameToNtPathName_U( libname, &nt_name, &file_part, NULL )) if (!RtlDosPathNameToNtPathName_U( libname, &nt_name, &file_part, NULL ))
{
RtlFreeHeap( GetProcessHeap(), 0, dllname );
return STATUS_NO_MEMORY; return STATUS_NO_MEMORY;
}
len = nt_name.Length - 4*sizeof(WCHAR); /* for \??\ prefix */ len = nt_name.Length - 4*sizeof(WCHAR); /* for \??\ prefix */
if (len >= *size) goto overflow; if (len >= *size) goto overflow;
memcpy( filename, nt_name.Buffer + 4, len + sizeof(WCHAR) ); memcpy( filename, nt_name.Buffer + 4, len + sizeof(WCHAR) );
if (file_part && !strchrW( file_part, '.' ))
{
len += sizeof(dllW) - sizeof(WCHAR);
if (len >= *size) goto overflow;
strcatW( filename, dllW );
}
if (!(*pwm = find_fullname_module( filename ))) if (!(*pwm = find_fullname_module( filename )))
{ {
attr.Length = sizeof(attr); attr.Length = sizeof(attr);
@ -1448,11 +1434,14 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname,
attr.SecurityQualityOfService = NULL; attr.SecurityQualityOfService = NULL;
if (NtOpenFile( handle, GENERIC_READ, &attr, &io, FILE_SHARE_READ|FILE_SHARE_DELETE, 0 )) *handle = 0; if (NtOpenFile( handle, GENERIC_READ, &attr, &io, FILE_SHARE_READ|FILE_SHARE_DELETE, 0 )) *handle = 0;
} }
found:
RtlFreeUnicodeString( &nt_name ); RtlFreeUnicodeString( &nt_name );
RtlFreeHeap( GetProcessHeap(), 0, dllname );
return STATUS_SUCCESS; return STATUS_SUCCESS;
overflow: overflow:
RtlFreeUnicodeString( &nt_name ); RtlFreeUnicodeString( &nt_name );
RtlFreeHeap( GetProcessHeap(), 0, dllname );
*size = len + sizeof(WCHAR); *size = len + sizeof(WCHAR);
return STATUS_BUFFER_TOO_SMALL; return STATUS_BUFFER_TOO_SMALL;
} }