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

ntdll: Use RtlEqualUnicodeString() instead of strcmpiW(). 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2020-03-27 13:39:20 +01:00
parent f831b3bd3d
commit 4d93bafe96
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dlls/ntdll/actctx.c
View File

@ -1002,7 +1002,7 @@ static void free_entity_array(struct entity_array *array)
static BOOL is_matching_string( const WCHAR *str1, const WCHAR *str2 ) static BOOL is_matching_string( const WCHAR *str1, const WCHAR *str2 )
{ {
if (!str1) return !str2; if (!str1) return !str2;
return str2 && !strcmpiW( str1, str2 ); return str2 && !RtlCompareUnicodeStrings( str1, strlenW(str1), str2, strlenW(str2), TRUE );
} }
static BOOL is_matching_identity( const struct assembly_identity *id1, static BOOL is_matching_identity( const struct assembly_identity *id1,
@ -1012,7 +1012,7 @@ static BOOL is_matching_identity( const struct assembly_identity *id1,
if (!is_matching_string( id1->arch, id2->arch )) return FALSE; if (!is_matching_string( id1->arch, id2->arch )) return FALSE;
if (!is_matching_string( id1->public_key, id2->public_key )) return FALSE; if (!is_matching_string( id1->public_key, id2->public_key )) return FALSE;
if (id1->language && id2->language && strcmpiW( id1->language, id2->language )) if (id1->language && id2->language && !is_matching_string( id1->language, id2->language ))
{ {
if (strcmpW( wildcardW, id1->language ) && strcmpW( wildcardW, id2->language )) if (strcmpW( wildcardW, id1->language ) && strcmpW( wildcardW, id2->language ))
return FALSE; return FALSE;
@ -3479,6 +3479,7 @@ static NTSTATUS build_dllredirect_section(ACTIVATION_CONTEXT* actctx, struct str
static struct string_index *find_string_index(const struct strsection_header *section, const UNICODE_STRING *name) static struct string_index *find_string_index(const struct strsection_header *section, const UNICODE_STRING *name)
{ {
struct string_index *iter, *index = NULL; struct string_index *iter, *index = NULL;
UNICODE_STRING str;
ULONG hash = 0, i; ULONG hash = 0, i;
RtlHashUnicodeString(name, TRUE, HASH_STRING_ALGORITHM_X65599, &hash); RtlHashUnicodeString(name, TRUE, HASH_STRING_ALGORITHM_X65599, &hash);
@ -3488,9 +3489,9 @@ static struct string_index *find_string_index(const struct strsection_header *se
{ {
if (iter->hash == hash) if (iter->hash == hash)
{ {
const WCHAR *nameW = (WCHAR*)((BYTE*)section + iter->name_offset); str.Buffer = (WCHAR *)((BYTE *)section + iter->name_offset);
str.Length = iter->name_len;
if (!strcmpiW(nameW, name->Buffer)) if (RtlEqualUnicodeString( &str, name, TRUE ))
{ {
index = iter; index = iter;
break; break;
@ -3724,6 +3725,7 @@ static NTSTATUS find_window_class(ACTIVATION_CONTEXT* actctx, const UNICODE_STRI
{ {
struct string_index *iter, *index = NULL; struct string_index *iter, *index = NULL;
struct wndclass_redirect_data *class; struct wndclass_redirect_data *class;
UNICODE_STRING str;
ULONG hash; ULONG hash;
int i; int i;
@ -3748,9 +3750,9 @@ static NTSTATUS find_window_class(ACTIVATION_CONTEXT* actctx, const UNICODE_STRI
{ {
if (iter->hash == hash) if (iter->hash == hash)
{ {
const WCHAR *nameW = (WCHAR*)((BYTE*)actctx->wndclass_section + iter->name_offset); str.Buffer = (WCHAR *)((BYTE *)actctx->wndclass_section + iter->name_offset);
str.Length = iter->name_len;
if (!strcmpiW(nameW, name->Buffer)) if (RtlEqualUnicodeString( &str, name, TRUE ))
{ {
index = iter; index = iter;
break; break;

7
dlls/ntdll/loader.c
View File

@ -491,15 +491,18 @@ static WINE_MODREF *get_modref( HMODULE hmod )
static WINE_MODREF *find_basename_module( LPCWSTR name ) static WINE_MODREF *find_basename_module( LPCWSTR name )
{ {
PLIST_ENTRY mark, entry; PLIST_ENTRY mark, entry;
UNICODE_STRING name_str;
if (cached_modref && !strcmpiW( name, cached_modref->ldr.BaseDllName.Buffer )) RtlInitUnicodeString( &name_str, name );
if (cached_modref && RtlEqualUnicodeString( &name_str, &cached_modref->ldr.BaseDllName, TRUE ))
return cached_modref; return cached_modref;
mark = &NtCurrentTeb()->Peb->LdrData->InLoadOrderModuleList; mark = &NtCurrentTeb()->Peb->LdrData->InLoadOrderModuleList;
for (entry = mark->Flink; entry != mark; entry = entry->Flink) for (entry = mark->Flink; entry != mark; entry = entry->Flink)
{ {
LDR_MODULE *mod = CONTAINING_RECORD(entry, LDR_MODULE, InLoadOrderModuleList); LDR_MODULE *mod = CONTAINING_RECORD(entry, LDR_MODULE, InLoadOrderModuleList);
if (!strcmpiW( name, mod->BaseDllName.Buffer )) if (RtlEqualUnicodeString( &name_str, &mod->BaseDllName, TRUE ))
{ {
cached_modref = CONTAINING_RECORD(mod, WINE_MODREF, ldr); cached_modref = CONTAINING_RECORD(mod, WINE_MODREF, ldr);
return cached_modref; return cached_modref;