[PATCH 0/1] MR1509: ntdll: Make init_builtin_dll return a value on FreeBSD

[Gerald Pfeifer (＠gerald)]

With commit 1d1690782b167f3ea24990c260665f71a0e70d1c init_builtin_dll
gained a return value, alas the FreeBSD-specific code (under #ifdef)
was not adjusted and still returned void.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/1509

[PATCH 1/1] ntdll: Make init_builtin_dll return a value on FreeBSD

[Gerald Pfeifer]

From: Gerald Pfeifer <gerald(a)pfeifer.com>

With commit 1d1690782b167f3ea24990c260665f71a0e70d1c init_builtin_dll
gained a return value, alas the FreeBSD-specific code (under #ifdef)
was not adjusted and still returned void.
---
 dlls/ntdll/unix/loader.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c
index 3bb7f056b2a..210a54aed16 100644
--- a/dlls/ntdll/unix/loader.c
+++ b/dlls/ntdll/unix/loader.c
@@ -1949,7 +1949,7 @@ static NTSTATUS init_builtin_dll( void *module )
         /* On older FreeBSD versions, l_addr was the absolute load address, now it's the relocation offset. */
         if (offsetof(struct link_map, l_addr) == 0)
             if (!get_relocbase(map->l_addr, &relocbase))
-                return;
+                return STATUS_UNSUCCESSFUL;
 #endif
         switch (dyn->d_tag)
         {
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/1509