[PATCH 1/2] ntdll: Compare builtins by their device and inode number directly.

[Zebediah Figura]

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com>
---
 dlls/ntdll/unix/loader.c | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c
index afb6405864a..499d9bf58b1 100644
--- a/dlls/ntdll/unix/loader.c
+++ b/dlls/ntdll/unix/loader.c
@@ -129,7 +129,8 @@ static HMODULE ntdll_module;
 
 struct file_id
 {
-    BYTE ObjectId[16];
+    dev_t dev;
+    ino_t ino;
 };
 
 struct builtin_module
@@ -142,13 +143,17 @@ struct builtin_module
 
 static struct list builtin_modules = LIST_INIT( builtin_modules );
 
-static NTSTATUS add_builtin_module( void *module, void *handle, const FILE_OBJECTID_BUFFER *id )
+static NTSTATUS add_builtin_module( void *module, void *handle, const struct stat *st )
 {
     struct builtin_module *builtin;
     if (!(builtin = malloc( sizeof(*builtin) ))) return STATUS_NO_MEMORY;
     builtin->handle = handle;
     builtin->module = module;
-    if (id) memcpy( &builtin->id, id->ObjectId, sizeof(builtin->id) );
+    if (st)
+    {
+        builtin->id.dev = st->st_dev;
+        builtin->id.ino = st->st_ino;
+    }
     else memset( &builtin->id, 0, sizeof(builtin->id) );
     list_add_tail( &builtin_modules, &builtin->entry );
     return STATUS_SUCCESS;
@@ -996,9 +1001,7 @@ static NTSTATUS open_dll_file( const char *name, void **module, pe_image_info_t
 {
     struct builtin_module *builtin;
     OBJECT_ATTRIBUTES attr = { sizeof(attr) };
-    IO_STATUS_BLOCK io;
     LARGE_INTEGER size;
-    FILE_OBJECTID_BUFFER id;
     struct stat st;
     SIZE_T len = 0;
     NTSTATUS status;
@@ -1017,11 +1020,11 @@ static NTSTATUS open_dll_file( const char *name, void **module, pe_image_info_t
         return STATUS_DLL_NOT_FOUND;
     }
 
-    if (!NtFsControlFile( handle, 0, NULL, NULL, &io, FSCTL_GET_OBJECT_ID, NULL, 0, &id, sizeof(id) ))
+    if (!stat( name, &st ))
     {
         LIST_FOR_EACH_ENTRY( builtin, &builtin_modules, struct builtin_module, entry )
         {
-            if (!memcmp( &builtin->id, id.ObjectId, sizeof(builtin->id) ))
+            if (builtin->id.dev == st.st_dev && builtin->id.ino == st.st_ino)
             {
                 TRACE( "%s is the same file as existing module %p\n", debugstr_a(name),
                        builtin->module );
@@ -1032,7 +1035,7 @@ static NTSTATUS open_dll_file( const char *name, void **module, pe_image_info_t
             }
         }
     }
-    else memset( id.ObjectId, 0, sizeof(id.ObjectId) );
+    else memset( &st, 0, sizeof(st) );
 
     size.QuadPart = 0;
     status = NtCreateSection( &mapping, STANDARD_RIGHTS_REQUIRED | SECTION_QUERY |
@@ -1063,7 +1066,7 @@ static NTSTATUS open_dll_file( const char *name, void **module, pe_image_info_t
         status = STATUS_IMAGE_MACHINE_TYPE_MISMATCH;
     }
 
-    if (!status) status = add_builtin_module( *module, NULL, &id );
+    if (!status) status = add_builtin_module( *module, NULL, &st );
 
     if (status)
     {
-- 
2.27.0

[PATCH 2/2] ntdll: Append ntdll.dll to the builtin_modules list.

[Zebediah Figura]

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49626
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com>
---
 dlls/ntdll/unix/loader.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c
index 499d9bf58b1..818b04d8b44 100644
--- a/dlls/ntdll/unix/loader.c
+++ b/dlls/ntdll/unix/loader.c
@@ -1301,7 +1301,10 @@ static HMODULE load_ntdll(void)
 
     if ((fd = open( name, O_RDONLY )) != -1)
     {
-        status = virtual_map_ntdll( fd, &module );
+        struct stat st;
+        if (fstat( fd, &st )) memset(&st, 0, sizeof(st));
+        if (!(status = virtual_map_ntdll( fd, &module )))
+            add_builtin_module( module, NULL, &st );
         close( fd );
     }
     else
-- 
2.27.0