[PATCH 0/2] MR5937: Fix hotpatch prologue in GetProcAddress().

[Paul Gofman (＠gofman)]

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

[PATCH 1/2] kernel32: Fix hotpatch prologue in GetProcAddress() on x64.

[Paul Gofman]

From: Paul Gofman <pgofman(a)codeweavers.com>

---
 dlls/kernel32/module.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c
index ed15e57c29c..ca66ea425d6 100644
--- a/dlls/kernel32/module.c
+++ b/dlls/kernel32/module.c
@@ -322,7 +322,7 @@ FARPROC WINAPI __attribute__((naked)) GetProcAddress( HMODULE module, LPCSTR fun
 }
 #elif defined(__x86_64__)
 __ASM_GLOBAL_FUNC( GetProcAddress,
-                   ".byte 0x48\n\t"  /* hotpatch prolog */
+                   ".byte 0x48,0x8d,0xa4,0x24,0x00,0x00,0x00,0x00\n\t" /* hotpatch prolog */
                    "pushq %rbp\n\t"
                    __ASM_SEH(".seh_pushreg %rbp\n\t")
                    __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t")
-- 
GitLab


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

[PATCH 2/2] kernelbase: Fix hotpatch prologue in GetProcAddress() on x64.

[Paul Gofman]

From: Paul Gofman <pgofman(a)codeweavers.com>

---
 dlls/kernelbase/loader.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/kernelbase/loader.c b/dlls/kernelbase/loader.c
index 7afbe0460eb..f82ee0b2a81 100644
--- a/dlls/kernelbase/loader.c
+++ b/dlls/kernelbase/loader.c
@@ -457,7 +457,7 @@ FARPROC WINAPI __attribute__((naked)) GetProcAddress( HMODULE module, LPCSTR fun
 }
 #elif defined(__x86_64__)
 __ASM_GLOBAL_FUNC( GetProcAddress,
-                   ".byte 0x48\n\t"  /* hotpatch prolog */
+                   ".byte 0x48,0x8d,0xa4,0x24,0x00,0x00,0x00,0x00\n\t" /* hotpatch prolog */
                    "pushq %rbp\n\t"
                    __ASM_SEH(".seh_pushreg %rbp\n\t")
                    __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t")
-- 
GitLab

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

[PATCH 2/2] kernelbase: Fix hotpatch prologue in GetProcAddress() on x64.

[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=146591

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 0000000000B600F0, msg WM_LBUTTONDOWN, wparam 0x1, lparam 0x320032