system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-15 06:10:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

user32: Move dialog proc setting implementation from win32u.

Browse source
This commit is contained in:
Jacek Caban 2022-08-18 01:47:36 +02:00 committed by Alexandre Julliard
parent 577fbb0ff1
commit 95791ea044
2 changed files with 26 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
dlls/user32/win.c
View file

@ -637,6 +637,18 @@ static LONG_PTR get_window_long_ptr( HWND hwnd, int offset, LONG_PTR ret, BOOL a
}
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 );
proc = NtUserGetDialogProc( (DLGPROC)ret, ansi );
if (proc) ret = (UINT_PTR)proc;
return ret;
}
/***********************************************************************
* GetDpiForWindow (USER32.@)
*/
@ -723,6 +735,10 @@ LONG WINAPI DECLSPEC_HOTPATCH SetWindowLongA( HWND hwnd, INT offset, LONG newval
WARN( "Invalid offset %d\n", offset );
SetLastError( ERROR_INVALID_INDEX );
return 0;
#else
case DWLP_DLGPROC:
if (NtUserGetDialogInfo( hwnd )) return set_dialog_proc( hwnd, newval, TRUE );
/* fall through */
#endif
default:
return NtUserSetWindowLong( hwnd, offset, newval, TRUE );
@ -811,6 +827,10 @@ LONG WINAPI DECLSPEC_HOTPATCH SetWindowLongW(
WARN("Invalid offset %d\n", offset );
SetLastError( ERROR_INVALID_INDEX );
return 0;
#else
case DWLP_DLGPROC:
if (NtUserGetDialogInfo( hwnd )) return set_dialog_proc( hwnd, newval, FALSE );
/* fall through */
#endif
default:
return NtUserSetWindowLong( hwnd, offset, newval, FALSE );
@ -1450,6 +1470,9 @@ LONG_PTR WINAPI GetWindowLongPtrA( HWND hwnd, INT offset )
*/
LONG_PTR WINAPI SetWindowLongPtrW( HWND hwnd, INT offset, LONG_PTR newval )
{
if (offset == DWLP_DLGPROC && NtUserGetDialogInfo( hwnd ))
return set_dialog_proc( hwnd, newval, FALSE );
return NtUserSetWindowLongPtr( hwnd, offset, newval, FALSE );
}
@ -1458,6 +1481,9 @@ LONG_PTR WINAPI SetWindowLongPtrW( HWND hwnd, INT offset, LONG_PTR newval )
*/
LONG_PTR WINAPI SetWindowLongPtrA( HWND hwnd, INT offset, LONG_PTR newval )
{
if (offset == DWLP_DLGPROC && NtUserGetDialogInfo( hwnd ))
return set_dialog_proc( hwnd, newval, TRUE );
return NtUserSetWindowLongPtr( hwnd, offset, newval, TRUE );
}

11
dlls/win32u/window.c
View file

@ -1309,17 +1309,6 @@ LONG_PTR set_window_long( HWND hwnd, INT offset, UINT size, LONG_PTR newval, BOO
case GWLP_HINSTANCE:
case GWLP_USERDATA:
break;
case DWLP_DLGPROC:
if ((win->cbWndExtra - sizeof(LONG_PTR) >= DWLP_DLGPROC) &&
(size == sizeof(LONG_PTR)) && win->dlgInfo)
{
WNDPROC *ptr = (WNDPROC *)((char *)win->wExtra + DWLP_DLGPROC);
retval = (ULONG_PTR)get_winproc( *ptr, ansi );
*ptr = alloc_winproc( (WNDPROC)newval, ansi );
release_win_ptr( win );
return retval;
}
/* fall through */
default:
if (offset < 0 || offset > (int)(win->cbWndExtra - size))
{