[PATCH 4/5] ntdll: Factor out is_import_dll_system() function.
Paul Gofman
pgofman at codeweavers.com
Tue Nov 2 05:26:43 CDT 2021
Signed-off-by: Paul Gofman <pgofman at codeweavers.com>
---
dlls/ntdll/loader.c | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
index 3b5d1de0f3e..cf188f4395e 100644
--- a/dlls/ntdll/loader.c
+++ b/dlls/ntdll/loader.c
@@ -585,6 +585,16 @@ static WINE_MODREF *find_fileid_module( const struct file_id *id )
return NULL;
}
+/***********************************************************************
+ * is_import_dll_system
+ */
+static BOOL is_import_dll_system( LDR_DATA_TABLE_ENTRY *mod, const IMAGE_IMPORT_DESCRIPTOR *import )
+{
+ const char *name = get_rva( mod->DllBase, import->Name );
+
+ return !strcmp( name, "ntdll.dll" ) || !strcmp( name, "kernel32.dll" );
+}
+
/**********************************************************************
* insert_single_list_tail
*/
@@ -1066,7 +1076,6 @@ static BOOL is_dll_native_subsystem( LDR_DATA_TABLE_ENTRY *mod, const IMAGE_NT_H
{
const IMAGE_IMPORT_DESCRIPTOR *imports;
DWORD i, size;
- WCHAR buffer[16];
if (nt->OptionalHeader.Subsystem != IMAGE_SUBSYSTEM_NATIVE) return FALSE;
if (nt->OptionalHeader.SectionAlignment < page_size) return TRUE;
@@ -1076,17 +1085,11 @@ static BOOL is_dll_native_subsystem( LDR_DATA_TABLE_ENTRY *mod, const IMAGE_NT_H
IMAGE_DIRECTORY_ENTRY_IMPORT, &size )))
{
for (i = 0; imports[i].Name; i++)
- {
- const char *name = get_rva( mod->DllBase, imports[i].Name );
- DWORD len = strlen(name);
- if (len * sizeof(WCHAR) >= sizeof(buffer)) continue;
- ascii_to_unicode( buffer, name, len + 1 );
- if (!wcsicmp( buffer, L"ntdll.dll" ) || !wcsicmp( buffer, L"kernel32.dll" ))
+ if (is_import_dll_system( mod, &imports[i] ))
{
- TRACE( "%s imports %s, assuming not native\n", debugstr_w(filename), debugstr_w(buffer) );
+ TRACE( "%s imports system dll, assuming not native\n", debugstr_w(filename) );
return FALSE;
}
- }
}
return TRUE;
}
--
2.31.1
More information about the wine-devel
mailing list