ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winex11: Use NtUserGetThreadInfo to access thread data. 

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2022-04-19 15:31:17 +02:00 committed by Alexandre Julliard
parent 356f37466f
commit 3e94864540
4 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/win32u/sysparams.c
View File

@ -4638,9 +4638,6 @@ ULONG_PTR WINAPI NtUserCallNoParam( ULONG code )
case NtUserCallNoParam_GetInputState: case NtUserCallNoParam_GetInputState:
return get_input_state(); return get_input_state();
case NtUserCallNoParam_GetMessagePos:
return NtUserGetThreadInfo()->message_pos;
case NtUserCallNoParam_ReleaseCapture: case NtUserCallNoParam_ReleaseCapture:
return release_capture(); return release_capture();

2
dlls/winex11.drv/event.c
View File

@ -572,7 +572,7 @@ static void set_input_focus( struct x11drv_win_data *data )
if (EVENT_x11_time_to_win32_time(0)) if (EVENT_x11_time_to_win32_time(0))
/* ICCCM says don't use CurrentTime, so try to use last message time if possible */ /* ICCCM says don't use CurrentTime, so try to use last message time if possible */
/* FIXME: this is not entirely correct */ /* FIXME: this is not entirely correct */
timestamp = GetMessageTime() - EVENT_x11_time_to_win32_time(0); timestamp = NtUserGetThreadInfo()->message_time - EVENT_x11_time_to_win32_time(0);
else else
timestamp = CurrentTime; timestamp = CurrentTime;

2
dlls/winex11.drv/mouse.c
View File

@ -1617,7 +1617,7 @@ void move_resize_window( HWND hwnd, int dir )
if (!(win = X11DRV_get_whole_window( hwnd ))) return; if (!(win = X11DRV_get_whole_window( hwnd ))) return;
pt = NtUserGetMessagePos(); pt = NtUserGetThreadInfo()->message_pos;
pos = virtual_screen_to_root( (short)LOWORD( pt ), (short)HIWORD( pt ) ); pos = virtual_screen_to_root( (short)LOWORD( pt ), (short)HIWORD( pt ) );
if (NtUserGetKeyState( VK_LBUTTON ) & 0x8000) button = 1; if (NtUserGetKeyState( VK_LBUTTON ) & 0x8000) button = 1;

6
include/ntuser.h
View File

@ -596,7 +596,6 @@ enum
{ {
NtUserCallNoParam_GetDesktopWindow, NtUserCallNoParam_GetDesktopWindow,
NtUserCallNoParam_GetInputState, NtUserCallNoParam_GetInputState,
NtUserCallNoParam_GetMessagePos,
NtUserCallNoParam_ReleaseCapture, NtUserCallNoParam_ReleaseCapture,
/* temporary exports */ /* temporary exports */
NtUserExitingThread, NtUserExitingThread,
@ -614,11 +613,6 @@ static inline BOOL NtUserGetInputState(void)
return NtUserCallNoParam( NtUserCallNoParam_GetInputState ); return NtUserCallNoParam( NtUserCallNoParam_GetInputState );
} }
static inline DWORD NtUserGetMessagePos(void)
{
return NtUserCallNoParam( NtUserCallNoParam_GetMessagePos );
}
static inline BOOL NtUserReleaseCapture(void) static inline BOOL NtUserReleaseCapture(void)
{ {
return NtUserCallNoParam( NtUserCallNoParam_ReleaseCapture ); return NtUserCallNoParam( NtUserCallNoParam_ReleaseCapture );