Commit ac5e7fab authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard

ntdll: Detect ntdll module also by module path comparison.

parent 871d2b94
......@@ -640,7 +640,7 @@ void *get_builtin_so_handle( void *module )
*/
static NTSTATUS get_builtin_unix_funcs( void *module, BOOL wow, const void **funcs )
{
const char *ptr_name = wow ? "__wine_unix_call_wow64_funcs" : "__wine_unix_call_funcs";
const char *p, *ptr_name = wow ? "__wine_unix_call_wow64_funcs" : "__wine_unix_call_funcs";
sigset_t sigset;
NTSTATUS status = STATUS_DLL_NOT_FOUND;
struct builtin_module *builtin;
......@@ -655,6 +655,12 @@ static NTSTATUS get_builtin_unix_funcs( void *module, BOOL wow, const void **fun
LIST_FOR_EACH_ENTRY( builtin, &builtin_modules, struct builtin_module, entry )
{
if (builtin->module != module) continue;
if (builtin->unix_path && (p = strrchr( builtin->unix_path, '/' )) && !strcmp( p, "/ntdll.so" ))
{
*funcs = wow ? __wine_unix_call_wow64_funcs : __wine_unix_call_funcs;
status = STATUS_SUCCESS;
break;
}
if (builtin->unix_path && !builtin->unix_handle)
builtin->unix_handle = dlopen( builtin->unix_path, RTLD_NOW );
if (builtin->unix_handle)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment