[PATCH 0/2] MR5358: ntdll/tests: Import from ntdll before other DLLs.

[Jinoh Kang (＠iamahuman)]

Some symbols (e.g., RtlPcToFileHeader) are exported by both kernel32 and
ntdll.  In this case, prefer ntdll's export over kernel32's one.

[PATCH 1/2] ntdll/tests: Import from ntdll before other DLLs.

[Jinoh Kang]

From: Jinoh Kang

Some symbols (e.g., RtlPcToFileHeader) are exported by both kernel32 and
ntdll.  In this case, prefer ntdll's export over kernel32's one.
---
 dlls/ntdll/tests/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/ntdll/tests/Makefile.in b/dlls/ntdll/tests/Makefile.in
index 3742968c415..c9a746a0b58 100644
--- a/dlls/ntdll/tests/Makefile.in
+++ b/dlls/ntdll/tests/Makefile.in
@@ -1,5 +1,5 @@
 TESTDLL   = ntdll.dll
-IMPORTS   = user32 advapi32
+IMPORTS   = ntdll user32 advapi32

SOURCES = \
    atom.c \

[PATCH 2/2] ntdll/tests: Import RtlPcToFileHeader statically.

[Jinoh Kang]

From: Jinoh Kang

---
 dlls/ntdll/tests/exception.c | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c
index 67b02cbd8b6..1dcc464f43d 100644
--- a/dlls/ntdll/tests/exception.c
+++ b/dlls/ntdll/tests/exception.c
@@ -65,7 +65,6 @@ static void *    (WINAPI *pRtlLocateExtendedFeature)(CONTEXT_EX *context_ex, ULO
 static void *    (WINAPI *pRtlLocateLegacyContext)(CONTEXT_EX *context_ex, ULONG *length);
 static void      (WINAPI *pRtlSetExtendedFeaturesMask)(CONTEXT_EX *context_ex, ULONG64 feature_mask);
 static ULONG64   (WINAPI *pRtlGetExtendedFeaturesMask)(CONTEXT_EX *context_ex);
-static void *    (WINAPI *pRtlPcToFileHeader)(PVOID pc, PVOID *address);
 static void      (WINAPI *pRtlGetCallersAddress)(void**,void**);
 static NTSTATUS  (WINAPI *pNtRaiseException)(EXCEPTION_RECORD *rec, CONTEXT *context, BOOL first_chance);
 static NTSTATUS  (WINAPI *pNtReadVirtualMemory)(HANDLE, const void*, void*, SIZE_T, SIZE_T*);
@@ -2138,11 +2137,11 @@ static void CDECL hook_KiUserCallbackDispatcher( void *eip, ULONG id, ULONG *arg
         ok( (char *)esp - ((char *)args + len) < 0x10, "wrong esp offset %p / %p\n", esp, args );
     }

-    if (eip && pRtlPcToFileHeader)
+    if (eip && RtlPcToFileHeader)
     {
         void *mod, *win32u = GetModuleHandleA("win32u.dll");

-        pRtlPcToFileHeader( eip, &mod );
+        RtlPcToFileHeader( eip, &mod );
         if (win32u) ok( mod == win32u, "ret address %p not in win32u %p\n", eip, win32u );
         else trace( "ret address %p in %p\n", eip, mod );
     }
@@ -4930,11 +4929,11 @@ static void WINAPI hook_KiUserCallbackDispatcher(void *rsp)
     ok( (BYTE *)stack->frame.rsp - &stack->args_data[stack->len] <= 16, "wrong rsp %p / %p\n",
         (void *)stack->frame.rsp, &stack->args_data[stack->len] );

-    if (stack->frame.rip && pRtlPcToFileHeader)
+    if (stack->frame.rip && RtlPcToFileHeader)
     {
         void *mod, *win32u = GetModuleHandleA("win32u.dll");

-        pRtlPcToFileHeader( (void *)stack->frame.rip, &mod );
+        RtlPcToFileHeader( (void *)stack->frame.rip, &mod );
         if (win32u) ok( mod == win32u, "ret address %Ix not in win32u %p\n", stack->frame.rip, win32u );
         else trace( "ret address %Ix in %p\n", stack->frame.rip, mod );
     }
@@ -5921,11 +5920,11 @@ static void WINAPI hook_KiUserCallbackDispatcher(void *sp)
     ok( redzone >= 8 && redzone <= 16, "wrong sp %p / %p (%Iu)\n",
         (void *)stack->sp, stack->args_data, redzone );

-    if (pRtlPcToFileHeader)
+    if (RtlPcToFileHeader)
     {
         void *mod, *win32u = GetModuleHandleA("win32u.dll");

-        pRtlPcToFileHeader( (void *)stack->pc, &mod );
+        RtlPcToFileHeader( (void *)stack->pc, &mod );
         ok( mod == win32u, "pc %lx not in win32u %p\n", stack->pc, win32u );
     }
     NtCallbackReturn( NULL, 0, func( stack->args, stack->len ));
@@ -7208,11 +7207,11 @@ static void WINAPI hook_KiUserCallbackDispatcher(void *sp)
     ok( redzone >= 16 && redzone <= 32, "wrong sp %p / %p (%Iu)\n",
         (void *)stack->sp, stack->args_data, redzone );

-    if (pRtlPcToFileHeader)
+    if (RtlPcToFileHeader)
     {
         void *mod, *win32u = GetModuleHandleA("win32u.dll");

-        pRtlPcToFileHeader( (void *)stack->pc, &mod );
+        RtlPcToFileHeader( (void *)stack->pc, &mod );
         ok( mod == win32u, "pc %Ix not in win32u %p\n", stack->pc, win32u );
     }
     NtCallbackReturn( NULL, 0, func( stack->args, stack->len ));
@@ -10831,11 +10830,11 @@ static void test_backtrace(void)
     ok( count > 0, "got %u entries\n", count );
     for (i = hash_expect = 0; i < count; i++) hash_expect += (ULONG_PTR)buffer[i];
     ok( hash == hash_expect, "hash mismatch %lx / %lx\n", hash, hash_expect );
-    pRtlPcToFileHeader( buffer[0], &module );
+    RtlPcToFileHeader( buffer[0], &module );
     if (is_arm64ec && module == hntdll)  /* Windows arm64ec has an extra frame for the entry thunk */
     {
         ok( count > 1, "wrong count %u\n", count );
-        pRtlPcToFileHeader( buffer[1], &module );
+        RtlPcToFileHeader( buffer[1], &module );
     }
     GetModuleFileNameW( module, name, ARRAY_SIZE(name) );
     ok( module == GetModuleHandleA(0), "wrong module %p %s / %p for %p\n",
@@ -10855,7 +10854,7 @@ static void test_backtrace(void)

if (count && !buffer[count - 1]) count--;  /* win11 32-bit */
     if (count <= 1) return;
-    pRtlPcToFileHeader( buffer[count - 1], &module );
+    RtlPcToFileHeader( buffer[count - 1], &module );
     GetModuleFileNameW( module, name, ARRAY_SIZE(name) );
     ok( module == hntdll, "wrong module %p %s for frame %u %p\n",
         module, debugstr_w(name), count - 1, buffer[count - 1] );
@@ -10912,7 +10911,6 @@ START_TEST(exception)
     X(RtlLocateLegacyContext);
     X(RtlSetExtendedFeaturesMask);
     X(RtlGetExtendedFeaturesMask);
-    X(RtlPcToFileHeader);
     X(RtlGetCallersAddress);
     X(RtlCopyContext);
     X(RtlCopyExtendedContext);