[PATCH 0/1] MR1271: user32: Use NtUserSetWindowLongPtr() in set_dialog_proc().

[Zhiyi Zhang (＠zhiyi)]

Using NtUserSetWindowLong() truncates 64bit dialog procedure pointers to 32bit.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53631

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

[PATCH 1/1] user32: Use NtUserSetWindowLongPtr() in set_dialog_proc().

[Zhiyi Zhang]

From: Zhiyi Zhang <zzhang(a)codeweavers.com>

Using NtUserSetWindowLong() truncates 64bit dialog procedure pointers to 32bit.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53631
---
 dlls/user32/win.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/user32/win.c b/dlls/user32/win.c
index 0605f94abe1..3750d4b9643 100644
--- a/dlls/user32/win.c
+++ b/dlls/user32/win.c
@@ -632,7 +632,7 @@ static LONG_PTR set_dialog_proc( HWND hwnd, LONG_PTR newval, BOOL ansi )
     DLGPROC proc;
     LONG_PTR ret;
     newval = NtUserCallTwoParam( newval, ansi, NtUserAllocWinProc );
-    ret = NtUserSetWindowLong( hwnd, DWLP_DLGPROC, newval, ansi );
+    ret = NtUserSetWindowLongPtr( hwnd, DWLP_DLGPROC, newval, ansi );
     proc = NtUserGetDialogProc( (DLGPROC)ret, ansi );
     if (proc) ret = (UINT_PTR)proc;
     return ret;
-- 
GitLab

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

[PATCH 1/1] user32: Use NtUserSetWindowLongPtr() in set_dialog_proc().

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

Your paranoid android.


=== debian11 (32 bit report) ===

ddraw:
ddraw7.c:15681: Test failed: Expected unsynchronised map for flags 0x1000.
ddraw7.c:15681: Test failed: Expected unsynchronised map for flags 0x3000.

[PATCH 0/1] MR1271: user32: Use NtUserSetWindowLongPtr() in set_dialog_proc(). - approved

[Huw Davies (＠huw)]

This merge request was approved by Huw Davies.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/1271