[PATCH] ntdll: Fix loading .so dlls

[Andre Heider]

Fixes: 93eb4dbd "ntdll: Add a separate helper for creating the initial ntdll module."

Signed-off-by: Andre Heider <a.heider(a)gmail.com>
---
 dlls/ntdll/loader.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
index 644eee1e9d7..c21c62c10b0 100644
--- a/dlls/ntdll/loader.c
+++ b/dlls/ntdll/loader.c
@@ -2325,7 +2325,7 @@ static NTSTATUS load_so_dll( LPCWSTR load_path, const UNICODE_STRING *nt_name,
         SECTION_IMAGE_INFORMATION image_info = { 0 };
 
         image_info.u.s.WineBuiltin = 1;
-        if ((status = build_module( load_path, &win_name, &module, &image_info, NULL, flags, pwm )))
+        if ((status = build_module( load_path, &win_name, &module, &image_info, NULL, flags, &wm )))
         {
             if (module) unix_funcs->unload_builtin_dll( module );
             return status;
-- 
2.30.1

[Sveinar Søpler]

It seems this is:
https://bugs.winehq.org/show_bug.cgi?id=50731

https://bugs.winehq.org/attachment.cgi?id=69488&action=diff

Sveinar Søpler


----- On Feb 28, 2021, at 1:08 PM, Andre Heider a.heider(a)gmail.com wrote:
> Fixes: 93eb4dbd "ntdll: Add a separate helper for creating the initial ntdll
> module."
>
> Signed-off-by: Andre Heider <a.heider(a)gmail.com>
> ---
> dlls/ntdll/loader.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
> index 644eee1e9d7..c21c62c10b0 100644
> --- a/dlls/ntdll/loader.c
> +++ b/dlls/ntdll/loader.c
> @@ -2325,7 +2325,7 @@ static NTSTATUS load_so_dll( LPCWSTR load_path, const
> UNICODE_STRING *nt_name,
>         SECTION_IMAGE_INFORMATION image_info = { 0 };
>
> image_info.u.s.WineBuiltin = 1;
> -        if ((status = build_module( load_path, &win_name, &module, &image_info,
> NULL, flags, pwm )))
> +        if ((status = build_module( load_path, &win_name, &module, &image_info,
> NULL, flags, &wm )))
>         {
>             if (module) unix_funcs->unload_builtin_dll( module );
>             return status;
> --
> 2.30.1