[ros-diffs] [jimtabor] 50221: [Win32k|User32] - Fix most of the user32 wine win test_mdi tests. Leaving 6 failures dealing with rect size. Start A2U and U2A support.

Author: jimtabor
Date: Thu Dec 30 05:52:06 2010
New Revision: 50221

URL: http://svn.reactos.org/svn/reactos?rev=50221&view=rev
Log:
[Win32k|User32]
- Fix most of the user32 wine win test_mdi tests. Leaving 6 failures dealing with rect
size. Start A2U and U2A support.

Modified:
    trunk/reactos/dll/win32/user32/windows/message.c
    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] Thu Dec 30 05:52:06
2010
@@ -296,6 +296,26 @@
         }
         break;
 
+      case WM_MDICREATE:
+        {
+          MDICREATESTRUCTW *mCs = (MDICREATESTRUCTW *) KMMsg->lParam;
+          PCHAR Class;
+          mCs->szTitle = (LPCWSTR) ((PCHAR) mCs + (DWORD_PTR) mCs->szTitle);
+          Class = (PCHAR) mCs + (DWORD_PTR) mCs->szClass;
+          if (L'A' == *((WCHAR *) Class))
+            {
+              Class += sizeof(WCHAR);
+              mCs->szClass = (LPCWSTR)(DWORD_PTR) (*((ATOM *) Class));
+            }
+          else
+            {
+              ASSERT(L'S' == *((WCHAR *) Class));
+              Class += sizeof(WCHAR);
+              mCs->szClass = (LPCWSTR) Class;
+            }
+        }
+        break;
+
       case WM_DDE_ACK:
         {
           PKMDDELPARAM DdeLparam = (PKMDDELPARAM) KMMsg->lParam;
@@ -383,7 +403,7 @@
 }
 
 static BOOL FASTCALL
-MsgiAnsiToUnicodeMessage(LPMSG UnicodeMsg, LPMSG AnsiMsg)
+MsgiAnsiToUnicodeMessage(HWND hwnd, LPMSG UnicodeMsg, LPMSG AnsiMsg)
 {
   UNICODE_STRING UnicodeString;
 
@@ -457,6 +477,7 @@
     case WM_NCCREATE:
     case WM_CREATE:
       {
+        MDICREATESTRUCTW mdi_cs;
         struct s
         {
            CREATESTRUCTW cs;    /* new structure */
@@ -480,6 +501,15 @@
             RtlCreateUnicodeStringFromAsciiz(&UnicodeString,
(LPSTR)xs->cs.lpszClass);
             xs->lpszClass = xs->cs.lpszClass = UnicodeString.Buffer;
           }
+
+        if (GetWindowLongW(hwnd, GWL_EXSTYLE) & WS_EX_MDICHILD)
+        {
+           mdi_cs = *(MDICREATESTRUCTW *)xs->cs.lpCreateParams;
+           mdi_cs.szTitle = xs->cs.lpszName;
+           mdi_cs.szClass = xs->cs.lpszClass;
+           xs->cs.lpCreateParams = &mdi_cs;
+        }
+
         UnicodeMsg->lParam = (LPARAM)xs;
         break;
       }
@@ -648,7 +678,7 @@
 
 
 static BOOL FASTCALL
-MsgiUnicodeToAnsiMessage(LPMSG AnsiMsg, LPMSG UnicodeMsg)
+MsgiUnicodeToAnsiMessage(HWND hwnd, LPMSG AnsiMsg, LPMSG UnicodeMsg)
 {
   ANSI_STRING AnsiString;
   UNICODE_STRING UnicodeString;
@@ -660,6 +690,7 @@
       case WM_CREATE:
       case WM_NCCREATE:
         {
+          MDICREATESTRUCTA mdi_cs;
           CREATESTRUCTA* CsA;
           CREATESTRUCTW* CsW;
           NTSTATUS Status;
@@ -693,6 +724,15 @@
                 }
               CsA->lpszClass = AnsiString.Buffer;
             }
+
+          if (GetWindowLongW(hwnd, GWL_EXSTYLE) & WS_EX_MDICHILD)
+          {
+             mdi_cs = *(MDICREATESTRUCTA *)CsW->lpCreateParams;
+             mdi_cs.szTitle = CsA->lpszName; 
+             mdi_cs.szClass = CsA->lpszClass;
+             CsA->lpCreateParams = &mdi_cs;
+          }
+
           AnsiMsg->lParam = (LPARAM)CsA;
           break;
         }
@@ -1064,7 +1104,7 @@
       UnicodeMsg.message = Msg;
       UnicodeMsg.wParam = wParam;
       UnicodeMsg.lParam = lParam;
-      if (! MsgiUnicodeToAnsiMessage(&AnsiMsg, &UnicodeMsg))
+      if (! MsgiUnicodeToAnsiMessage(hWnd, &AnsiMsg, &UnicodeMsg))
       {
           goto Exit;
       }
@@ -1248,7 +1288,7 @@
       AnsiMsg.message = Msg;
       AnsiMsg.wParam = wParam;
       AnsiMsg.lParam = lParam;
-      if (! MsgiAnsiToUnicodeMessage(&UnicodeMsg, &AnsiMsg))
+      if (! MsgiAnsiToUnicodeMessage(hWnd, &UnicodeMsg, &AnsiMsg))
       {
           goto Exit;
       }
@@ -1512,7 +1552,7 @@
        }
        else
        {
-          if (!MsgiAnsiToUnicodeMessage(&UnicodeMsg, (LPMSG)lpmsg))
+          if (!MsgiAnsiToUnicodeMessage(lpmsg->hwnd, &UnicodeMsg, (LPMSG)lpmsg))
           {
              return FALSE;
           }
@@ -1970,7 +2010,7 @@
   AnsiMsg.wParam = wParam;
   AnsiMsg.lParam = lParam;
 
-  if (!MsgiAnsiToUnicodeMessage(&UcMsg, &AnsiMsg))
+  if (!MsgiAnsiToUnicodeMessage(Wnd, &UcMsg, &AnsiMsg))
   {
      return FALSE;
   }
@@ -2020,7 +2060,7 @@
   AnsiMsg.wParam = wParam;
   AnsiMsg.lParam = lParam;
 
-  if (!MsgiAnsiToUnicodeMessage(&UcMsg, &AnsiMsg))
+  if (!MsgiAnsiToUnicodeMessage(hWnd, &UcMsg, &AnsiMsg))
   {
       return FALSE;
   }
@@ -2118,7 +2158,7 @@
   AnsiMsg.wParam = wParam;
   AnsiMsg.lParam = lParam;
 
-  if (! MsgiAnsiToUnicodeMessage(&UcMsg, &AnsiMsg))
+  if (! MsgiAnsiToUnicodeMessage(hWnd, &UcMsg, &AnsiMsg))
   {
       return FALSE;
   }
@@ -2221,7 +2261,7 @@
   AnsiMsg.message = Msg;
   AnsiMsg.wParam = wParam;
   AnsiMsg.lParam = lParam;
-  if (! MsgiAnsiToUnicodeMessage(&UcMsg, &AnsiMsg))
+  if (! MsgiAnsiToUnicodeMessage(hWnd, &UcMsg, &AnsiMsg))
   {
      return FALSE;
   }

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] Thu Dec 30
05:52:06 2010
@@ -31,6 +31,81 @@
 IntCleanupMessageImpl(VOID)
 {
     return STATUS_SUCCESS;
+}
+
+/* From wine: */
+/* flag for messages that contain pointers */
+/* 32 messages per entry, messages 0..31 map to bits 0..31 */
+
+#define SET(msg) (1 << ((msg) & 31))
+
+static const unsigned int message_pointer_flags[] =
+{
+    /* 0x00 - 0x1f */
+    SET(WM_CREATE) | SET(WM_SETTEXT) | SET(WM_GETTEXT) |
+    SET(WM_WININICHANGE) | SET(WM_DEVMODECHANGE),
+    /* 0x20 - 0x3f */
+    SET(WM_GETMINMAXINFO) | SET(WM_DRAWITEM) | SET(WM_MEASUREITEM) | SET(WM_DELETEITEM)
|
+    SET(WM_COMPAREITEM),
+    /* 0x40 - 0x5f */
+    SET(WM_WINDOWPOSCHANGING) | SET(WM_WINDOWPOSCHANGED) | SET(WM_COPYDATA) |
+    SET(WM_COPYGLOBALDATA) | SET(WM_NOTIFY) | SET(WM_HELP),
+    /* 0x60 - 0x7f */
+    SET(WM_STYLECHANGING) | SET(WM_STYLECHANGED),
+    /* 0x80 - 0x9f */
+    SET(WM_NCCREATE) | SET(WM_NCCALCSIZE) | SET(WM_GETDLGCODE),
+    /* 0xa0 - 0xbf */
+    SET(EM_GETSEL) | SET(EM_GETRECT) | SET(EM_SETRECT) | SET(EM_SETRECTNP),
+    /* 0xc0 - 0xdf */
+    SET(EM_REPLACESEL) | SET(EM_GETLINE) | SET(EM_SETTABSTOPS),
+    /* 0xe0 - 0xff */
+    SET(SBM_GETRANGE) | SET(SBM_SETSCROLLINFO) | SET(SBM_GETSCROLLINFO) |
SET(SBM_GETSCROLLBARINFO),
+    /* 0x100 - 0x11f */
+    0,
+    /* 0x120 - 0x13f */
+    0,
+    /* 0x140 - 0x15f */
+    SET(CB_GETEDITSEL) | SET(CB_ADDSTRING) | SET(CB_DIR) | SET(CB_GETLBTEXT) |
+    SET(CB_INSERTSTRING) | SET(CB_FINDSTRING) | SET(CB_SELECTSTRING) |
+    SET(CB_GETDROPPEDCONTROLRECT) | SET(CB_FINDSTRINGEXACT),
+    /* 0x160 - 0x17f */
+    0,
+    /* 0x180 - 0x19f */
+    SET(LB_ADDSTRING) | SET(LB_INSERTSTRING) | SET(LB_GETTEXT) | SET(LB_SELECTSTRING) |
+    SET(LB_DIR) | SET(LB_FINDSTRING) |
+    SET(LB_GETSELITEMS) | SET(LB_SETTABSTOPS) | SET(LB_ADDFILE) | SET(LB_GETITEMRECT),
+    /* 0x1a0 - 0x1bf */
+    SET(LB_FINDSTRINGEXACT),
+    /* 0x1c0 - 0x1df */
+    0,
+    /* 0x1e0 - 0x1ff */
+    0,
+    /* 0x200 - 0x21f */
+    SET(WM_NEXTMENU) | SET(WM_SIZING) | SET(WM_MOVING) | SET(WM_DEVICECHANGE),
+    /* 0x220 - 0x23f */
+    SET(WM_MDICREATE) | SET(WM_MDIGETACTIVE) | SET(WM_DROPOBJECT) |
+    SET(WM_QUERYDROPOBJECT) | SET(WM_DRAGLOOP) | SET(WM_DRAGSELECT) | SET(WM_DRAGMOVE),
+    /* 0x240 - 0x25f */
+    0,
+    /* 0x260 - 0x27f */
+    0,
+    /* 0x280 - 0x29f */
+    0,
+    /* 0x2a0 - 0x2bf */
+    0,
+    /* 0x2c0 - 0x2df */
+    0,
+    /* 0x2e0 - 0x2ff */
+    0,
+    /* 0x300 - 0x31f */
+    SET(WM_ASKCBFORMATNAME)
+};
+
+/* check whether a given message type includes pointers */
+static inline int is_pointer_message( UINT message )
+{
+    if (message >= 8*sizeof(message_pointer_flags)) return FALSE;
+        return (message_pointer_flags[message / 32] & SET(message)) != 0;
 }
 
 #define MMS_SIZE_WPARAM      -1
@@ -64,6 +139,7 @@
     { WM_COPYGLOBALDATA, MMS_SIZE_WPARAM, MMS_FLAG_READ },
     { WM_WINDOWPOSCHANGED, sizeof(WINDOWPOS), MMS_FLAG_READ },
     { WM_WINDOWPOSCHANGING, sizeof(WINDOWPOS), MMS_FLAG_READWRITE },
+    { WM_MDICREATE, MMS_SIZE_SPECIAL, MMS_FLAG_READWRITE },
 };
 
 static PMSGMEMORY FASTCALL
@@ -89,6 +165,7 @@
 MsgMemorySize(PMSGMEMORY MsgMemoryEntry, WPARAM wParam, LPARAM lParam)
 {
     CREATESTRUCTW *Cs;
+    MDICREATESTRUCTW *mCs;
     PUNICODE_STRING WindowName;
     PUNICODE_STRING ClassName;
     UINT Size = 0;
@@ -127,6 +204,21 @@
                 }
                 break;
 
+            case WM_MDICREATE:
+                mCs = (MDICREATESTRUCTW *)lParam;
+                WindowName = (PUNICODE_STRING) mCs->szTitle;
+                ClassName = (PUNICODE_STRING) mCs->szClass;
+                Size = sizeof(MDICREATESTRUCTW) + WindowName->Length + sizeof(WCHAR);
+                if (IS_ATOM(ClassName->Buffer))
+                {
+                    Size += sizeof(WCHAR) + sizeof(ATOM);
+                }
+                else
+                {
+                    Size += sizeof(WCHAR) + ClassName->Length + sizeof(WCHAR);
+                }
+                break;
+
             case WM_NCCALCSIZE:
                 Size = wParam ? sizeof(NCCALCSIZE_PARAMS) + sizeof(WINDOWPOS) :
sizeof(RECT);
                 break;
@@ -162,6 +254,7 @@
     NCCALCSIZE_PARAMS *PackedNcCalcsize;
     CREATESTRUCTW *UnpackedCs;
     CREATESTRUCTW *PackedCs;
+    MDICREATESTRUCTW *UnpackedmCs, *PackedmCs;
     PLARGE_STRING WindowName;
     PUNICODE_STRING ClassName;
     POOL_TYPE PoolType;
@@ -240,6 +333,53 @@
         ASSERT(CsData == (PCHAR) PackedCs + Size);
         *lParamPacked = (LPARAM) PackedCs;
     }
+    else if (WM_MDICREATE == Msg)
+    {
+        UnpackedmCs = (MDICREATESTRUCTW *) lParam;
+        WindowName = (PLARGE_STRING) UnpackedmCs->szTitle;
+        ClassName = (PUNICODE_STRING) UnpackedmCs->szClass;
+        Size = sizeof(MDICREATESTRUCTW) + WindowName->Length + sizeof(WCHAR);
+        if (IS_ATOM(ClassName->Buffer))
+        {
+            Size += sizeof(WCHAR) + sizeof(ATOM);
+        }
+        else
+        {
+            Size += sizeof(WCHAR) + ClassName->Length + sizeof(WCHAR);
+        }
+        PackedmCs = ExAllocatePoolWithTag(PoolType, Size, TAG_MSG);
+        if (NULL == PackedmCs)
+        {
+            DPRINT1("Not enough memory to pack lParam\n");
+            return STATUS_NO_MEMORY;
+        }
+        RtlCopyMemory(PackedmCs, UnpackedmCs, sizeof(CREATESTRUCTW));
+        CsData = (PCHAR) (PackedmCs + 1);
+        PackedmCs->szTitle = (LPCWSTR) (CsData - (PCHAR) PackedmCs);
+        RtlCopyMemory(CsData, WindowName->Buffer, WindowName->Length);
+        CsData += WindowName->Length;
+        *((WCHAR *) CsData) = L'\0';
+        CsData += sizeof(WCHAR);
+        PackedmCs->szClass = (LPCWSTR) (CsData - (PCHAR) PackedmCs);
+        if (IS_ATOM(ClassName->Buffer))
+        {
+            *((WCHAR *) CsData) = L'A';
+            CsData += sizeof(WCHAR);
+            *((ATOM *) CsData) = (ATOM)(DWORD_PTR) ClassName->Buffer;
+            CsData += sizeof(ATOM);
+        }
+        else
+        {
+            *((WCHAR *) CsData) = L'S';
+            CsData += sizeof(WCHAR);
+            RtlCopyMemory(CsData, ClassName->Buffer, ClassName->Length);
+            CsData += ClassName->Length;
+            *((WCHAR *) CsData) = L'\0';
+            CsData += sizeof(WCHAR);
+        }
+        ASSERT(CsData == (PCHAR) PackedmCs + Size);
+        *lParamPacked = (LPARAM) PackedmCs;
+    }
     else if (PoolType == NonPagedPool)
     {
         PMSGMEMORY MsgMemoryEntry;
@@ -288,6 +428,11 @@
     {
         ExFreePool((PVOID) lParamPacked);
 
+        return STATUS_SUCCESS;
+    }
+    else if (WM_MDICREATE == Msg)
+    {
+        ExFreePool((PVOID) lParamPacked);
         return STATUS_SUCCESS;
     }
     else if (NonPagedPoolUsed)
@@ -910,7 +1055,7 @@
     LARGE_INTEGER LargeTickCount;
     NTSTATUS Status;
 
-    if (FindMsgMemory(Msg) != 0)
+    if (is_pointer_message(Msg))
     {
         EngSetLastError(ERROR_MESSAGE_SYNC_ONLY );
         return FALSE;
@@ -990,7 +1135,7 @@
         return TRUE;
     }
 
-    if (MsgMemoryEntry)
+    if (is_pointer_message(Message.message))
     {
         EngSetLastError(ERROR_MESSAGE_SYNC_ONLY );
         return FALSE;
@@ -1486,7 +1631,7 @@
 {
     BOOL Ret = TRUE;
 
-    if (FindMsgMemory(Msg) != 0)
+    if (is_pointer_message(Msg))
     {
         EngSetLastError(ERROR_MESSAGE_SYNC_ONLY );
         return FALSE;