[jimtabor] 54397: [Win32k|User32] - Correct more types.

Author: jimtabor
Date: Wed Nov 16 16:35:50 2011
New Revision: 54397

URL: http://svn.reactos.org/svn/reactos?rev=54397&view=rev
Log:
[Win32k|User32]
- Correct more types.

Modified:
    trunk/reactos/dll/win32/user32/windows/message.c
    trunk/reactos/include/reactos/win32k/ntuser.h
    trunk/reactos/subsystems/win32/win32k/ntuser/message.c

Modified: trunk/reactos/dll/win32/user32/windows/message.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] Wed Nov 16 16:35:50
2011
@@ -2369,7 +2369,7 @@
                               UcMsg.wParam,
                               UcMsg.lParam,
                              (ULONG_PTR)&dsm,
-                              FNID_SENDMESSAGETIMEOUT,
+                              FNID_SENDMESSAGEWTOOPTION,
                               TRUE);
 
   MsgiAnsiToUnicodeReply(&UcMsg, &AnsiMsg, &Result);
@@ -2436,7 +2436,7 @@
                               wParam,
                               lParam,
                              (ULONG_PTR)&dsm,
-                              FNID_SENDMESSAGETIMEOUT,
+                              FNID_SENDMESSAGEWTOOPTION,
                               FALSE);
 
   if (lpdwResult) *lpdwResult = dsm.Result;

Modified: trunk/reactos/include/reactos/win32k/ntuser.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu…
==============================================================================
--- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Wed Nov 16 16:35:50 2011
@@ -696,7 +696,7 @@
 #define FNID_SENDMESSAGEFF          0x02B2
 // Kernel has option to use TimeOut or normal msg send, based on type of msg.
 #define FNID_SENDMESSAGEWTOOPTION   0x02B3
-#define FNID_SENDMESSAGETIMEOUT     0x02B4
+#define FNID_SENDMESSAGECALLPROC    0x02B4
 #define FNID_BROADCASTSYSTEMMESSAGE 0x02B5
 #define FNID_TOOLTIPS               0x02B6 
 #define FNID_SENDNOTIFYMESSAGE      0x02B7
@@ -894,7 +894,7 @@
 typedef struct _WNDMSG
 {
   DWORD maxMsgs;
-  DWORD abMsgs;
+  PINT abMsgs;
 } WNDMSG, *PWNDMSG;
 
 typedef struct _SHAREDINFO

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Wed Nov 16
16:35:50 2011
@@ -2418,7 +2418,8 @@
             }
             break;
         }
-    case FNID_SENDMESSAGETIMEOUT:
+    case FNID_SENDMESSAGEFF:
+    case FNID_SENDMESSAGEWTOOPTION:
         {
             DOSENDMESSAGE dsm, *pdsm = (PDOSENDMESSAGE)ResultInfo;
             if (ResultInfo)