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:
parent
356f37466f
commit
3e94864540
|
@ -4638,9 +4638,6 @@ ULONG_PTR WINAPI NtUserCallNoParam( ULONG code )
|
|||
case NtUserCallNoParam_GetInputState:
|
||||
return get_input_state();
|
||||
|
||||
case NtUserCallNoParam_GetMessagePos:
|
||||
return NtUserGetThreadInfo()->message_pos;
|
||||
|
||||
case NtUserCallNoParam_ReleaseCapture:
|
||||
return release_capture();
|
||||
|
||||
|
|
|
@ -572,7 +572,7 @@ static void set_input_focus( struct x11drv_win_data *data )
|
|||
if (EVENT_x11_time_to_win32_time(0))
|
||||
/* ICCCM says don't use CurrentTime, so try to use last message time if possible */
|
||||
/* 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
|
||||
timestamp = CurrentTime;
|
||||
|
||||
|
|
|
@ -1617,7 +1617,7 @@ void move_resize_window( HWND hwnd, int dir )
|
|||
|
||||
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 ) );
|
||||
|
||||
if (NtUserGetKeyState( VK_LBUTTON ) & 0x8000) button = 1;
|
||||
|
|
|
@ -596,7 +596,6 @@ enum
|
|||
{
|
||||
NtUserCallNoParam_GetDesktopWindow,
|
||||
NtUserCallNoParam_GetInputState,
|
||||
NtUserCallNoParam_GetMessagePos,
|
||||
NtUserCallNoParam_ReleaseCapture,
|
||||
/* temporary exports */
|
||||
NtUserExitingThread,
|
||||
|
@ -614,11 +613,6 @@ static inline BOOL NtUserGetInputState(void)
|
|||
return NtUserCallNoParam( NtUserCallNoParam_GetInputState );
|
||||
}
|
||||
|
||||
static inline DWORD NtUserGetMessagePos(void)
|
||||
{
|
||||
return NtUserCallNoParam( NtUserCallNoParam_GetMessagePos );
|
||||
}
|
||||
|
||||
static inline BOOL NtUserReleaseCapture(void)
|
||||
{
|
||||
return NtUserCallNoParam( NtUserCallNoParam_ReleaseCapture );
|
||||
|
|
Loading…
Reference in New Issue