[PATCH 0/1] MR6714: winecrt0: Use version 2 of CHPE metadata.

[PATCH 1/1] winecrt0: Use version 2 of CHPE metadata.

[Jacek Caban]

From: Jacek Caban

---
 dlls/ntdll/loader.c     |  3 ---
 dlls/ntdll/ntdll_misc.h |  3 ---
 dlls/winecrt0/arm64ec.c | 11 ++++-------
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
index 2982b1e049b..2f2a7fe5427 100644
--- a/dlls/ntdll/loader.c
+++ b/dlls/ntdll/loader.c
@@ -309,9 +309,6 @@ static void update_hybrid_metadata( void *module, IMAGE_NT_HEADERS *nt,
             SET_FUNC( __os_arm64x_dispatch_icall, __os_arm64x_check_icall );
             SET_FUNC( __os_arm64x_dispatch_icall_cfg, __os_arm64x_check_icall_cfg );
             SET_FUNC( __os_arm64x_dispatch_ret, __os_arm64x_dispatch_ret );
-            SET_FUNC( __os_arm64x_helper0, __os_arm64x_helper0 );
-            SET_FUNC( __os_arm64x_helper1, __os_arm64x_helper1 );
-            SET_FUNC( __os_arm64x_helper2, __os_arm64x_helper2 );
             SET_FUNC( __os_arm64x_helper3, __os_arm64x_helper3 );
             SET_FUNC( __os_arm64x_helper4, __os_arm64x_helper4 );
             SET_FUNC( __os_arm64x_helper5, __os_arm64x_helper5 );
diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h
index 92248af989e..e58a07ba02a 100644
--- a/dlls/ntdll/ntdll_misc.h
+++ b/dlls/ntdll/ntdll_misc.h
@@ -174,9 +174,6 @@ extern void *__os_arm64x_dispatch_fptr;
 extern void *__os_arm64x_dispatch_ret;
 extern void *__os_arm64x_get_x64_information;
 extern void *__os_arm64x_set_x64_information;
-extern void *__os_arm64x_helper0;
-extern void *__os_arm64x_helper1;
-extern void *__os_arm64x_helper2;
 extern void *__os_arm64x_helper3;
 extern void *__os_arm64x_helper4;
 extern void *__os_arm64x_helper5;
diff --git a/dlls/winecrt0/arm64ec.c b/dlls/winecrt0/arm64ec.c
index 65b8df4de24..a3af06b380d 100644
--- a/dlls/winecrt0/arm64ec.c
+++ b/dlls/winecrt0/arm64ec.c
@@ -31,9 +31,6 @@ void *__os_arm64x_dispatch_ret = 0;
 void *__os_arm64x_get_x64_information = 0;
 void *__os_arm64x_set_x64_information = 0;

-void *__os_arm64x_helper0 = 0;
-void *__os_arm64x_helper1 = 0;
-void *__os_arm64x_helper2 = 0;
 void *__os_arm64x_helper3 = 0;
 void *__os_arm64x_helper4 = 0;
 void *__os_arm64x_helper5 = 0;
@@ -76,7 +73,7 @@ asm( "\t.section .rdata,"dr"\n"
      "\t.globl __chpe_metadata\n"
      "\t.balign 4\n"
      "__chpe_metadata:\n"
-     "\t.word 1\n"
+     "\t.word 2\n"
      "\t.rva __hybrid_code_map\n"
      "\t.word __hybrid_code_map_count\n"
      "\t.rva __x64_code_ranges_to_entry_points\n"
@@ -96,9 +93,9 @@ asm( "\t.section .rdata,"dr"\n"
      "\t.word __arm64x_extra_rfe_table_size\n"
      "\t.rva __os_arm64x_dispatch_fptr\n"
      "\t.rva __hybrid_auxiliary_iat_copy\n"
-     "\t.rva __os_arm64x_helper0\n"
-     "\t.rva __os_arm64x_helper1\n"
-     "\t.rva __os_arm64x_helper2\n"
+     "\t.rva __hybrid_auxiliary_delayload_iat\n"
+     "\t.rva __hybrid_auxiliary_delayload_iat_copy\n"
+     "\t.word __hybrid_image_info_bitfield\n"
      "\t.rva __os_arm64x_helper3\n"
      "\t.rva __os_arm64x_helper4\n"
      "\t.rva __os_arm64x_helper5\n"

[PATCH 1/1] winecrt0: Use version 2 of CHPE metadata.

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=149202

Your paranoid android.

=== debian11b (64 bit WoW report) ===

user32:
input.c:4305: Test succeeded inside todo block: button_down_hwnd_todo 1: got MSG_TEST_WIN hwnd 0000000001B30106, msg WM_LBUTTONDOWN, wparam 0x1, lparam 0x320032