[ros-diffs] [jimtabor] 65540: [Win32k] - Use thread state for GetMessageExtraInfo.

Author: jimtabor
Date: Mon Dec  1 14:47:05 2014
New Revision: 65540

URL: http://svn.reactos.org/svn/reactos?rev=65540&view=rev
Log:
[Win32k]
- Use thread state for GetMessageExtraInfo.

Modified:
    trunk/reactos/win32ss/include/ntuser.h
    trunk/reactos/win32ss/user/ntuser/misc.c
    trunk/reactos/win32ss/user/ntuser/simplecall.c
    trunk/reactos/win32ss/user/user32/include/ntwrapper.h

Modified: trunk/reactos/win32ss/include/ntuser.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntuser.h?re...
==============================================================================
--- trunk/reactos/win32ss/include/ntuser.h	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/include/ntuser.h	[iso-8859-1] Mon Dec  1 14:47:05 2014
@@ -2296,7 +2296,8 @@
     THREADSTATE_GETINPUTSTATE,
     THREADSTATE_UPTIMELASTREAD,
     THREADSTATE_FOREGROUNDTHREAD,
-    THREADSTATE_GETCURSOR
+    THREADSTATE_GETCURSOR,
+    THREADSTATE_GETMESSAGEEXTRAINFO
 };

DWORD_PTR
@@ -3375,7 +3376,6 @@
  */

#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

Modified: trunk/reactos/win32ss/user/ntuser/misc.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/misc.c?...
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/misc.c	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/misc.c	[iso-8859-1] Mon Dec  1 14:47:05 2014
@@ -271,6 +271,9 @@
          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);

Modified: trunk/reactos/win32ss/user/ntuser/simplecall.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/simplec...
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/simplecall.c	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/simplecall.c	[iso-8859-1] Mon Dec  1 14:47:05 2014
@@ -85,10 +85,6 @@

case NOPARAM_ROUTINE_UNINIT_MESSAGE_PUMP:
          Result = (DWORD_PTR)IntUninitMessagePumpHook();
-         break;
-
-      case NOPARAM_ROUTINE_GETMESSAGEEXTRAINFO:
-         Result = (DWORD_PTR)MsqGetMessageExtraInfo();
          break;

case NOPARAM_ROUTINE_MSQCLEARWAKEMASK:

Modified: trunk/reactos/win32ss/user/user32/include/ntwrapper.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/include...
==============================================================================
--- trunk/reactos/win32ss/user/user32/include/ntwrapper.h	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/user32/include/ntwrapper.h	[iso-8859-1] Mon Dec  1 14:47:05 2014
@@ -788,7 +788,7 @@

EXTINLINE LPARAM NtUserxGetMessageExtraInfo(VOID)
 {
-  return (LPARAM)NtUserCallNoParam(NOPARAM_ROUTINE_GETMESSAGEEXTRAINFO);
+  return (LPARAM)NtUserGetThreadState(THREADSTATE_GETMESSAGEEXTRAINFO);
 }

EXTINLINE BOOL NtUserxSwitchCaretShowing(THRDCARETINFO* CaretInfo)