- Use thread state for GetMessageExtraInfo.

svn path=/trunk/; revision=65540
This commit is contained in:
James Tabor 2014-12-01 14:47:05 +00:00
parent 8b417dd15d
commit 0bc45dba49
4 changed files with 6 additions and 7 deletions

View file

@ -2296,7 +2296,8 @@ enum ThreadStateRoutines
THREADSTATE_GETINPUTSTATE,
THREADSTATE_UPTIMELASTREAD,
THREADSTATE_FOREGROUNDTHREAD,
THREADSTATE_GETCURSOR
THREADSTATE_GETCURSOR,
THREADSTATE_GETMESSAGEEXTRAINFO
};
DWORD_PTR
@ -3375,7 +3376,6 @@ typedef struct tagKMDDELPARAM
*/
#define NOPARAM_ROUTINE_ISCONSOLEMODE 0xffff0001
#define NOPARAM_ROUTINE_GETMESSAGEEXTRAINFO 0xffff0005
#define ONEPARAM_ROUTINE_SWITCHCARETSHOWING 0xfffe0008
#define ONEPARAM_ROUTINE_ENABLEPROCWNDGHSTING 0xfffe000d
#define ONEPARAM_ROUTINE_GETDESKTOPMAPPING 0xfffe000e

View file

@ -271,6 +271,9 @@ NtUserGetThreadState(
ret = (DWORD_PTR) (GetW32ThreadInfo()->MessageQueue->CursorObject ?
UserHMGetHandle(GetW32ThreadInfo()->MessageQueue->CursorObject) : 0);
break;
case THREADSTATE_GETMESSAGEEXTRAINFO:
ret = (DWORD_PTR)MsqGetMessageExtraInfo();
break;
}
TRACE("Leave NtUserGetThreadState, ret=%lu\n", ret);

View file

@ -87,10 +87,6 @@ NtUserCallNoParam(DWORD Routine)
Result = (DWORD_PTR)IntUninitMessagePumpHook();
break;
case NOPARAM_ROUTINE_GETMESSAGEEXTRAINFO:
Result = (DWORD_PTR)MsqGetMessageExtraInfo();
break;
case NOPARAM_ROUTINE_MSQCLEARWAKEMASK:
RETURN( (DWORD_PTR)IntMsqClearWakeMask());

View file

@ -788,7 +788,7 @@ EXTINLINE BOOL NtUserxSetForegroundWindow(HWND hWnd)
EXTINLINE LPARAM NtUserxGetMessageExtraInfo(VOID)
{
return (LPARAM)NtUserCallNoParam(NOPARAM_ROUTINE_GETMESSAGEEXTRAINFO);
return (LPARAM)NtUserGetThreadState(THREADSTATE_GETMESSAGEEXTRAINFO);
}
EXTINLINE BOOL NtUserxSwitchCaretShowing(THRDCARETINFO* CaretInfo)