system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-02 18:43:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

wow64win: Always use NtUserSetWindowLongPtr() for GWLP_HINSTANCE and GWLP_WNDPROC.

Browse source
This commit is contained in:
Sven Baars 2023-07-12 09:07:50 +02:00 committed by Alexandre Julliard
parent 86893ce299
commit 94d61d1b28
2 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
dlls/user32/tests/win.c
View file

@ -7293,6 +7293,15 @@ static void test_SetWindowLong(void)
"SetWindowLongPtr on invalid window proc shouldn't have changed the value returned by GetWindowLongPtr, instead of changing it to 0x%Ix\n", retval);
ok(IsWindowUnicode(hwndMain), "hwndMain should now be Unicode\n");
/* Make sure nothing changes if we set the same proc */
retval = SetWindowLongPtrW(hwndMain, GWLP_WNDPROC, (LONG_PTR)old_window_procW);
todo_wine
ok((WNDPROC)retval == main_window_procA, "unexpected proc 0x%Ix\n", retval);
retval = GetWindowLongPtrW(hwndMain, GWLP_WNDPROC);
ok((WNDPROC)retval == old_window_procW, "unexpected proc 0x%Ix\n", retval);
retval = GetWindowLongPtrA(hwndMain, GWLP_WNDPROC);
ok((WNDPROC)retval == main_window_procA, "unexpected proc 0x%Ix\n", retval);
/* set it back to ANSI */
SetWindowLongPtrA(hwndMain, GWLP_WNDPROC, 0);
}

7
dlls/wow64win/user.c
View file

@ -3832,6 +3832,13 @@ NTSTATUS WINAPI wow64_NtUserSetWindowLong( UINT *args )
LONG newval = get_ulong( &args );
BOOL ansi = get_ulong( &args );
switch (offset)
{
case GWLP_HINSTANCE:
case GWLP_WNDPROC:
return NtUserSetWindowLongPtr( hwnd, offset, (ULONG)newval, ansi );
}
return NtUserSetWindowLong( hwnd, offset, newval, ansi );
}