[USER32] We're still using this one. Fixes build.
[reactos.git] / win32ss / user / user32 / windows / defwnd.c
index e6d2e1b..27dcc57 100644 (file)
@@ -2,41 +2,24 @@
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS user32.dll
- * FILE:            dll/win32/user32/windows/defwnd.c
+ * FILE:            win32ss/user/user32/windows/defwnd.c
  * PURPOSE:         Window management
  * PROGRAMMER:      Casper S. Hornstrup (chorns@users.sourceforge.net)
  * UPDATE HISTORY:
  *      06-06-2001  CSH  Created
  */
 
-/* INCLUDES ******************************************************************/
-
 #include <user32.h>
 
 #include <wine/debug.h>
 WINE_DEFAULT_DEBUG_CHANNEL(user32);
 
-LRESULT DefWndNCPaint(HWND hWnd, HRGN hRgn, BOOL Active);
-LRESULT DefWndNCCalcSize(HWND hWnd, BOOL CalcSizeStruct, RECT *Rect);
-LRESULT DefWndNCActivate(HWND hWnd, WPARAM wParam, LPARAM lParam);
-LRESULT DefWndNCHitTest(HWND hWnd, POINT Point);
-LRESULT DefWndNCLButtonDown(HWND hWnd, WPARAM wParam, LPARAM lParam);
-LRESULT DefWndNCLButtonDblClk(HWND hWnd, WPARAM wParam, LPARAM lParam);
-LRESULT NC_HandleNCRButtonDown( HWND hwnd, WPARAM wParam, LPARAM lParam );
-void FASTCALL MenuInitSysMenuPopup(HMENU Menu, DWORD Style, DWORD ClsStyle, LONG HitTest );
-void MENU_EndMenu( HWND );
-
-/* GLOBALS *******************************************************************/
-
-static short iF10Key = 0;
-static short iMenuSysKey = 0;
-
-/* FUNCTIONS *****************************************************************/
-
 /*
  * @implemented
  */
-DWORD WINAPI
+DWORD
+WINAPI
+DECLSPEC_HOTPATCH
 GetSysColor(int nIndex)
 {
   if(nIndex >= 0 && nIndex < NUM_SYSCOLORS)
@@ -51,7 +34,9 @@ GetSysColor(int nIndex)
 /*
  * @implemented
  */
-HBRUSH WINAPI
+HBRUSH
+WINAPI
+DECLSPEC_HOTPATCH
 GetSysColorBrush(int nIndex)
 {
   if(nIndex >= 0 && nIndex < NUM_SYSCOLORS)
@@ -59,7 +44,6 @@ GetSysColorBrush(int nIndex)
     return gpsi->ahbrSystem[nIndex];
   }
 
-  SetLastError(ERROR_INVALID_PARAMETER);
   return NULL;
 }
 
@@ -92,626 +76,39 @@ DefSetText(HWND hWnd, PCWSTR String, BOOL Ansi)
   }
   Ret = NtUserDefSetText(hWnd, (String ? &lsString : NULL));
 
-  if (Ret)
-     IntNotifyWinEvent(EVENT_OBJECT_NAMECHANGE, hWnd, OBJID_WINDOW, CHILDID_SELF, 0);
-
   return Ret;
 }
 
-void
-UserGetInsideRectNC(PWND Wnd, RECT *rect)
-{
-    ULONG Style;
-    ULONG ExStyle;
-
-    Style = Wnd->style;
-    ExStyle = Wnd->ExStyle;
-
-    rect->top    = rect->left = 0;
-    rect->right  = Wnd->rcWindow.right - Wnd->rcWindow.left;
-    rect->bottom = Wnd->rcWindow.bottom - Wnd->rcWindow.top;
-
-    if (Style & WS_ICONIC)
-    {
-        return;
-    }
-
-    /* Remove frame from rectangle */
-    if (UserHasThickFrameStyle(Style, ExStyle ))
-    {
-        InflateRect(rect, -GetSystemMetrics(SM_CXFRAME),
-                    -GetSystemMetrics(SM_CYFRAME));
-    }
-    else
-    {
-        if (UserHasDlgFrameStyle(Style, ExStyle ))
-        {
-            InflateRect(rect, -GetSystemMetrics(SM_CXDLGFRAME),
-                        -GetSystemMetrics(SM_CYDLGFRAME));
-            /* FIXME: this isn't in NC_AdjustRect? why not? */
-            if (ExStyle & WS_EX_DLGMODALFRAME)
-                   InflateRect( rect, -1, 0 );
-        }
-        else
-        {
-            if (UserHasThinFrameStyle(Style, ExStyle))
-            {
-                InflateRect(rect, -GetSystemMetrics(SM_CXBORDER),
-                            -GetSystemMetrics(SM_CYBORDER));
-            }
-        }
-    }
-}
-
-
-VOID
-DefWndSetRedraw(HWND hWnd, WPARAM wParam)
-{
-    LONG Style = GetWindowLongPtr(hWnd, GWL_STYLE);
-    /* Content can be redrawn after a change. */
-    if (wParam)
-    {
-       if (!(Style & WS_VISIBLE)) /* Not Visible */
-       {
-          SetWindowLongPtr(hWnd, GWL_STYLE, WS_VISIBLE);
-       }
-    }
-    else /* Content cannot be redrawn after a change. */
-    {
-       if (Style & WS_VISIBLE) /* Visible */
-       {
-            RedrawWindow( hWnd, NULL, 0, RDW_ALLCHILDREN | RDW_VALIDATE );
-            Style &= ~WS_VISIBLE;
-            SetWindowLongPtr(hWnd, GWL_STYLE, Style); /* clear bits */
-       }
-    }
-    return;
-}
-
-
-LRESULT
-DefWndHandleSetCursor(HWND hWnd, WPARAM wParam, LPARAM lParam, ULONG Style)
+HWND FASTCALL
+IntFindChildWindowToOwner(HWND hRoot, HWND hOwner)
 {
-  /* Not for child windows. */
-  if (hWnd != (HWND)wParam)
-    {
-      return(0);
-    }
+   HWND Ret;
+   PWND Child, OwnerWnd, Root, Owner;
 
-  switch((INT_PTR) LOWORD(lParam))
-    {
-    case HTERROR:
-      {
-       WORD Msg = HIWORD(lParam);
-       if (Msg == WM_LBUTTONDOWN || Msg == WM_MBUTTONDOWN ||
-           Msg == WM_RBUTTONDOWN || Msg == WM_XBUTTONDOWN)
-         {
-           MessageBeep(0);
-         }
-       break;
-      }
+   Root = ValidateHwnd(hRoot);
+   Owner = ValidateHwnd(hOwner);
 
-    case HTCLIENT:
-      {
-       HICON hCursor = (HICON)GetClassLongPtrW(hWnd, GCL_HCURSOR);
-       if (hCursor)
-         {
-           SetCursor(hCursor);
-           return(TRUE);
-         }
-       return(FALSE);
-      }
-
-    case HTLEFT:
-    case HTRIGHT:
-      {
-        if (Style & WS_MAXIMIZE)
-        {
-          break;
-        }
-       return((LRESULT)SetCursor(LoadCursorW(0, IDC_SIZEWE)));
-      }
-
-    case HTTOP:
-    case HTBOTTOM:
-      {
-        if (Style & WS_MAXIMIZE)
-        {
-          break;
-        }
-       return((LRESULT)SetCursor(LoadCursorW(0, IDC_SIZENS)));
-      }
-
-    case HTTOPLEFT:
-    case HTBOTTOMRIGHT:
-      {
-        if (Style & WS_MAXIMIZE)
-        {
-          break;
-        }
-       return((LRESULT)SetCursor(LoadCursorW(0, IDC_SIZENWSE)));
-      }
-
-    case HTBOTTOMLEFT:
-    case HTTOPRIGHT:
-      {
-        if (GetWindowLongPtrW(hWnd, GWL_STYLE) & WS_MAXIMIZE)
-        {
-          break;
-        }
-       return((LRESULT)SetCursor(LoadCursorW(0, IDC_SIZENESW)));
-      }
-    }
-  return((LRESULT)SetCursor(LoadCursorW(0, IDC_ARROW)));
-}
-
-static LONG
-DefWndStartSizeMove(HWND hWnd, PWND Wnd, WPARAM wParam, POINT *capturePoint)
-{
-  LONG hittest = 0;
-  POINT pt;
-  MSG msg;
-  RECT rectWindow;
-  ULONG Style = Wnd->style;
-
-  rectWindow = Wnd->rcWindow;
-
-  if ((wParam & 0xfff0) == SC_MOVE)
-    {
-      /* Move pointer at the center of the caption */
-      RECT rect;
-      UserGetInsideRectNC(Wnd, &rect);
-      if (Style & WS_SYSMENU)
-       rect.left += GetSystemMetrics(SM_CXSIZE) + 1;
-      if (Style & WS_MINIMIZEBOX)
-       rect.right -= GetSystemMetrics(SM_CXSIZE) + 1;
-      if (Style & WS_MAXIMIZEBOX)
-       rect.right -= GetSystemMetrics(SM_CXSIZE) + 1;
-      pt.x = rectWindow.left + (rect.right - rect.left) / 2;
-      pt.y = rectWindow.top + rect.top + GetSystemMetrics(SM_CYSIZE)/2;
-      hittest = HTCAPTION;
-      *capturePoint = pt;
-    }
-  else  /* SC_SIZE */
-    {
-      pt.x = pt.y = 0;
-      while(!hittest)
-       {
-          if (!GetMessageW(&msg, NULL, 0, 0)) break; //return 0;
-          if (CallMsgFilterW( &msg, MSGF_SIZE )) continue;
-
-         switch(msg.message)
-           {
-           case WM_MOUSEMOVE:
-             hittest = DefWndNCHitTest(hWnd, msg.pt);
-             if ((hittest < HTLEFT) || (hittest > HTBOTTOMRIGHT))
-               hittest = 0;
-             break;
-
-           case WM_LBUTTONUP:
-             return 0;
-
-           case WM_KEYDOWN:
-             switch(msg.wParam)
-               {
-               case VK_UP:
-                 hittest = HTTOP;
-                 pt.x =(rectWindow.left+rectWindow.right)/2;
-                 pt.y = rectWindow.top + GetSystemMetrics(SM_CYFRAME) / 2;
-                 break;
-               case VK_DOWN:
-                 hittest = HTBOTTOM;
-                 pt.x =(rectWindow.left+rectWindow.right)/2;
-                 pt.y = rectWindow.bottom - GetSystemMetrics(SM_CYFRAME) / 2;
-                 break;
-               case VK_LEFT:
-                 hittest = HTLEFT;
-                 pt.x = rectWindow.left + GetSystemMetrics(SM_CXFRAME) / 2;
-                 pt.y =(rectWindow.top+rectWindow.bottom)/2;
-                 break;
-               case VK_RIGHT:
-                 hittest = HTRIGHT;
-                 pt.x = rectWindow.right - GetSystemMetrics(SM_CXFRAME) / 2;
-                 pt.y =(rectWindow.top+rectWindow.bottom)/2;
-                 break;
-               case VK_RETURN:
-               case VK_ESCAPE:
-                 return 0;
-               }
-            default:
-              TranslateMessage( &msg );
-              DispatchMessageW( &msg );
-              break;
-           }
-       }
-      *capturePoint = pt;
-    }
-    SetCursorPos( pt.x, pt.y );
-    DefWndHandleSetCursor(hWnd, (WPARAM)hWnd, MAKELONG(hittest, WM_MOUSEMOVE), Style);
-    return hittest;
-}
-
-#define ON_LEFT_BORDER(hit) \
- (((hit) == HTLEFT) || ((hit) == HTTOPLEFT) || ((hit) == HTBOTTOMLEFT))
-#define ON_RIGHT_BORDER(hit) \
- (((hit) == HTRIGHT) || ((hit) == HTTOPRIGHT) || ((hit) == HTBOTTOMRIGHT))
-#define ON_TOP_BORDER(hit) \
- (((hit) == HTTOP) || ((hit) == HTTOPLEFT) || ((hit) == HTTOPRIGHT))
-#define ON_BOTTOM_BORDER(hit) \
- (((hit) == HTBOTTOM) || ((hit) == HTBOTTOMLEFT) || ((hit) == HTBOTTOMRIGHT))
-
-static VOID
-UserDrawWindowFrame(HDC hdc, const RECT *rect,
-                   ULONG width, ULONG height)
-{
-  static HBRUSH hDraggingRectBrush = NULL;
-  HBRUSH hbrush;
-
-  if(!hDraggingRectBrush)
-  {
-    static HBITMAP hDraggingPattern = NULL;
-    const DWORD Pattern[4] = {0x5555AAAA, 0x5555AAAA, 0x5555AAAA, 0x5555AAAA};
-
-    hDraggingPattern = CreateBitmap(8, 8, 1, 1, Pattern);
-    hDraggingRectBrush = CreatePatternBrush(hDraggingPattern);
-  }
-
-  hbrush = SelectObject( hdc, hDraggingRectBrush );
-  PatBlt( hdc, rect->left, rect->top,
-         rect->right - rect->left - width, height, PATINVERT );
-  PatBlt( hdc, rect->left, rect->top + height, width,
-         rect->bottom - rect->top - height, PATINVERT );
-  PatBlt( hdc, rect->left + width, rect->bottom - 1,
-         rect->right - rect->left - width, -height, PATINVERT );
-  PatBlt( hdc, rect->right - 1, rect->top, -width,
-         rect->bottom - rect->top - height, PATINVERT );
-  SelectObject( hdc, hbrush );
-}
-
-static VOID
-UserDrawMovingFrame(HDC hdc, RECT *rect, BOOL thickframe)
-{
-  if(thickframe)
-  {
-    UserDrawWindowFrame(hdc, rect, GetSystemMetrics(SM_CXFRAME), GetSystemMetrics(SM_CYFRAME));
-  }
-  else
-  {
-    UserDrawWindowFrame(hdc, rect, 1, 1);
-  }
-}
-
-static VOID
-DefWndDoSizeMove(HWND hwnd, WORD wParam)
-{
-  HRGN DesktopRgn;
-  MSG msg;
-  RECT sizingRect, mouseRect, origRect, clipRect, unmodRect;
-  HDC hdc;
-  LONG hittest = (LONG)(wParam & 0x0f);
-  HCURSOR hDragCursor = 0, hOldCursor = 0;
-  POINT minTrack, maxTrack;
-  POINT capturePoint, pt;
-  ULONG Style, ExStyle;
-  BOOL thickframe;
-  BOOL iconic;
-  BOOL moved = FALSE;
-  DWORD dwPoint = GetMessagePos();
-  BOOL DragFullWindows = FALSE;
-  HWND hWndParent = NULL;
-  PWND Wnd;
-
-  Wnd = ValidateHwnd(hwnd);
-  if (!Wnd)
-      return;
-
-  Style = Wnd->style;
-  ExStyle = Wnd->ExStyle;
-  iconic = (Style & WS_MINIMIZE) != 0;
-
-  SystemParametersInfoA(SPI_GETDRAGFULLWINDOWS, 0, &DragFullWindows, 0);
-
-  pt.x = GET_X_LPARAM(dwPoint);
-  pt.y = GET_Y_LPARAM(dwPoint);
-  capturePoint = pt;
-
-  if ((Style & WS_MAXIMIZE) || !IsWindowVisible(hwnd))
-    {
-      return;
-    }
-
-  thickframe = UserHasThickFrameStyle(Style, ExStyle) && !(Style & WS_MINIMIZE);
-  if ((wParam & 0xfff0) == SC_MOVE)
-    {
-      if (!hittest)
-       {
-         hittest = DefWndStartSizeMove(hwnd, Wnd, wParam, &capturePoint);
-       }
-      if (!hittest)
-       {
-         return;
-       }
-    }
-  else  /* SC_SIZE */
-    {
-      if (!thickframe)
-       {
-         return;
-       }
-      if (hittest && ((wParam & 0xfff0) != SC_MOUSEMENU))
-       {
-          hittest += (HTLEFT - WMSZ_LEFT);
-       }
-      else
-       {
-         SetCapture(hwnd);
-         hittest = DefWndStartSizeMove(hwnd, Wnd, wParam, &capturePoint);
-         if (!hittest)
-           {
-             ReleaseCapture();
-             return;
-           }
-       }
-    }
-
-  /* Get min/max info */
-
-  WinPosGetMinMaxInfo(hwnd, NULL, NULL, &minTrack, &maxTrack);
-  sizingRect = Wnd->rcWindow;
-  if (Style & WS_CHILD)
-    {
-      hWndParent = GetParent(hwnd);
-      MapWindowPoints( 0, hWndParent, (LPPOINT)&sizingRect, 2 );
-      unmodRect = sizingRect;
-      GetClientRect(hWndParent, &mouseRect );
-      clipRect = mouseRect;
-      MapWindowPoints(hWndParent, HWND_DESKTOP, (LPPOINT)&clipRect, 2);
-    }
-  else
-    {
-      if(!(ExStyle & WS_EX_TOPMOST))
-      {
-        SystemParametersInfoW(SPI_GETWORKAREA, 0, &clipRect, 0);
-        mouseRect = clipRect;
-      }
-      else
-      {
-        SetRect(&mouseRect, 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN));
-        clipRect = mouseRect;
-      }
-      unmodRect = sizingRect;
-    }
-  ClipCursor(&clipRect);
-
-  origRect = sizingRect;
-  if (ON_LEFT_BORDER(hittest))
-    {
-      mouseRect.left  = max( mouseRect.left, sizingRect.right-maxTrack.x );
-      mouseRect.right = min( mouseRect.right, sizingRect.right-minTrack.x );
-    }
-  else if (ON_RIGHT_BORDER(hittest))
-    {
-      mouseRect.left  = max( mouseRect.left, sizingRect.left+minTrack.x );
-      mouseRect.right = min( mouseRect.right, sizingRect.left+maxTrack.x );
-    }
-  if (ON_TOP_BORDER(hittest))
-    {
-      mouseRect.top    = max( mouseRect.top, sizingRect.bottom-maxTrack.y );
-      mouseRect.bottom = min( mouseRect.bottom,sizingRect.bottom-minTrack.y);
-    }
-  else if (ON_BOTTOM_BORDER(hittest))
-    {
-      mouseRect.top    = max( mouseRect.top, sizingRect.top+minTrack.y );
-      mouseRect.bottom = min( mouseRect.bottom, sizingRect.top+maxTrack.y );
-    }
-  if (Style & WS_CHILD)
-    {
-      MapWindowPoints( hWndParent, 0, (LPPOINT)&mouseRect, 2 );
-    }
-
-  SendMessageA( hwnd, WM_ENTERSIZEMOVE, 0, 0 );
-  NtUserxSetGUIThreadHandle(MSQ_STATE_MOVESIZE, hwnd);
-  if (GetCapture() != hwnd) SetCapture( hwnd );
-
-  if (Style & WS_CHILD)
-    {
-      /* Retrieve a default cache DC (without using the window style) */
-      hdc = GetDCEx(hWndParent, 0, DCX_CACHE);
-      DesktopRgn = NULL;
-    }
-  else
-    {
-      hdc = GetDC( 0 );
-      DesktopRgn = CreateRectRgnIndirect(&clipRect);
-    }
-
-  SelectObject(hdc, DesktopRgn);
-
-  if( iconic ) /* create a cursor for dragging */
-    {
-      HICON hIcon = (HICON)GetClassLongPtrW(hwnd, GCL_HICON);
-      if(!hIcon) hIcon = (HICON)SendMessageW( hwnd, WM_QUERYDRAGICON, 0, 0L);
-      if( hIcon ) hDragCursor = CursorIconToCursor( hIcon, TRUE );
-      if( !hDragCursor ) iconic = FALSE;
-    }
-
-  /* invert frame if WIN31_LOOK to indicate mouse click on caption */
-  if( !iconic && !DragFullWindows)
-    {
-      UserDrawMovingFrame( hdc, &sizingRect, thickframe);
-    }
-
-  for(;;)
-    {
-      int dx = 0, dy = 0;
-
-      if (!GetMessageW(&msg, 0, 0, 0)) break;
-      if (CallMsgFilterW( &msg, MSGF_SIZE )) continue;
-
-      /* Exit on button-up, Return, or Esc */
-      if ((msg.message == WM_LBUTTONUP) ||
-         ((msg.message == WM_KEYDOWN) &&
-          ((msg.wParam == VK_RETURN) || (msg.wParam == VK_ESCAPE)))) break;
-
-      if (msg.message == WM_PAINT)
-        {
-         if(!iconic && !DragFullWindows) UserDrawMovingFrame( hdc, &sizingRect, thickframe );
-         UpdateWindow( msg.hwnd );
-         if(!iconic && !DragFullWindows) UserDrawMovingFrame( hdc, &sizingRect, thickframe );
-         continue;
-        }
-
-      if ((msg.message != WM_KEYDOWN) && (msg.message != WM_MOUSEMOVE))
-      {
-         TranslateMessage( &msg );
-         DispatchMessageW( &msg );
-         continue;  /* We are not interested in other messages */
-      }
-
-      pt = msg.pt;
-
-      if (msg.message == WM_KEYDOWN) switch(msg.wParam)
-       {
-       case VK_UP:    pt.y -= 8; break;
-       case VK_DOWN:  pt.y += 8; break;
-       case VK_LEFT:  pt.x -= 8; break;
-       case VK_RIGHT: pt.x += 8; break;
-       }
-
-      pt.x = max( pt.x, mouseRect.left );
-      pt.x = min( pt.x, mouseRect.right );
-      pt.y = max( pt.y, mouseRect.top );
-      pt.y = min( pt.y, mouseRect.bottom );
-
-      dx = pt.x - capturePoint.x;
-      dy = pt.y - capturePoint.y;
-
-      if (dx || dy)
-       {
-         if( !moved )
-           {
-             moved = TRUE;
-
-               if( iconic ) /* ok, no system popup tracking */
-                 {
-                   hOldCursor = SetCursor(hDragCursor);
-                   ShowCursor( TRUE );
-                 }
-           }
-
-         if (msg.message == WM_KEYDOWN) SetCursorPos( pt.x, pt.y );
-         else
-           {
-             RECT newRect = unmodRect;
-             WPARAM wpSizingHit = 0;
-
-             if (hittest == HTCAPTION) OffsetRect( &newRect, dx, dy );
-             if (ON_LEFT_BORDER(hittest)) newRect.left += dx;
-             else if (ON_RIGHT_BORDER(hittest)) newRect.right += dx;
-             if (ON_TOP_BORDER(hittest)) newRect.top += dy;
-             else if (ON_BOTTOM_BORDER(hittest)) newRect.bottom += dy;
-             if(!iconic && !DragFullWindows) UserDrawMovingFrame( hdc, &sizingRect, thickframe );
-             capturePoint = pt;
-
-             /* determine the hit location */
-             if (hittest >= HTLEFT && hittest <= HTBOTTOMRIGHT)
-               wpSizingHit = WMSZ_LEFT + (hittest - HTLEFT);
-             unmodRect = newRect;
-             SendMessageA( hwnd, WM_SIZING, wpSizingHit, (LPARAM)&newRect );
-
-             if (!iconic)
-               {
-                 if(!DragFullWindows)
-                   UserDrawMovingFrame( hdc, &newRect, thickframe );
-                 else {
-                   /* To avoid any deadlocks, all the locks on the windows
-                      structures must be suspended before the SetWindowPos */
-                   SetWindowPos( hwnd, 0, newRect.left, newRect.top,
-                                 newRect.right - newRect.left,
-                                 newRect.bottom - newRect.top,
-                                 ( hittest == HTCAPTION ) ? SWP_NOSIZE : 0 );
-                 }
-               }
-             sizingRect = newRect;
-           }
-       }
-    }
-
-  ReleaseCapture();
-  ClipCursor(NULL);
-  if( iconic )
-    {
-      if( moved ) /* restore cursors, show icon title later on */
-       {
-         ShowCursor( FALSE );
-         SetCursor( hOldCursor );
-       }
-      DestroyCursor( hDragCursor );
-    }
-  else if(!DragFullWindows)
-      UserDrawMovingFrame( hdc, &sizingRect, thickframe );
-
-  if (Style & WS_CHILD)
-    ReleaseDC( hWndParent, hdc );
-  else
-  {
-    ReleaseDC( 0, hdc );
-    if(DesktopRgn)
-    {
-      DeleteObject(DesktopRgn);
-    }
-  }
-
-  if (ISITHOOKED(WH_CBT))
-  {
-      LRESULT lResult;
-      NtUserMessageCall( hwnd, WM_CBT, HCBT_MOVESIZE, (LPARAM)&sizingRect, (ULONG_PTR)&lResult, FNID_DEFWINDOWPROC, FALSE);
-      if (lResult) moved = FALSE;
-  }
-
-  NtUserxSetGUIThreadHandle(MSQ_STATE_MOVESIZE, NULL);
-  SendMessageA( hwnd, WM_EXITSIZEMOVE, 0, 0 );
-  SendMessageA( hwnd, WM_SETVISIBLE, !IsIconic(hwnd), 0L);
+   for( Child = Root->spwndChild ? DesktopPtrToUser(Root->spwndChild) : NULL;
+        Child;
+        Child = Child->spwndNext ? DesktopPtrToUser(Child->spwndNext) : NULL )
+   {
+      OwnerWnd = Child->spwndOwner ? DesktopPtrToUser(Child->spwndOwner) : NULL;
+      if(!OwnerWnd)
+         continue;
 
-  /* window moved or resized */
-  if (moved)
-    {
-      /* if the moving/resizing isn't canceled call SetWindowPos
-       * with the new position or the new size of the window
-       */
-      if (!((msg.message == WM_KEYDOWN) && (msg.wParam == VK_ESCAPE)) )
-        {
-         /* NOTE: SWP_NOACTIVATE prevents document window activation in Word 6 */
-         if(!DragFullWindows)
-           SetWindowPos( hwnd, 0, sizingRect.left, sizingRect.top,
-                         sizingRect.right - sizingRect.left,
-                         sizingRect.bottom - sizingRect.top,
-                         ( hittest == HTCAPTION ) ? SWP_NOSIZE : 0 );
-        }
-      else { /* restore previous size/position */
-       if(DragFullWindows)
-         SetWindowPos( hwnd, 0, origRect.left, origRect.top,
-                       origRect.right - origRect.left,
-                       origRect.bottom - origRect.top,
-                       ( hittest == HTCAPTION ) ? SWP_NOSIZE : 0 );
-      }
-    }
+      if (!(Child->style & WS_POPUP) || !(Child->style & WS_VISIBLE))
+         continue;
 
-  if( IsWindow(hwnd) )
-    if( Style & WS_MINIMIZE )
+      if(OwnerWnd == Owner)
       {
-       /* Single click brings up the system menu when iconized */
-
-       if( !moved )
-         {
-           if( Style & WS_SYSMENU )
-             SendMessageA( hwnd, WM_SYSCOMMAND,
-                           SC_MOUSEMENU + HTSYSMENU, MAKELONG(pt.x,pt.y));
-         }
+         Ret = Child->head.h;
+         return Ret;
       }
+   }
+   ERR("IDCWTO Nothing found\n");
+   return NULL;
 }
 
-
 /***********************************************************************
  *           DefWndTrackScrollBar
  *
@@ -746,12 +143,31 @@ LRESULT WINAPI DoAppSwitch( WPARAM wParam, LPARAM lParam);
 LRESULT
 DefWndHandleSysCommand(HWND hWnd, WPARAM wParam, LPARAM lParam)
 {
-//  WINDOWPLACEMENT wp;
   POINT Pt;
   LRESULT lResult;
 
   if (!IsWindowEnabled( hWnd )) return 0;
 
+  switch (wParam & 0xfff0)
+    {
+      case SC_MOVE:
+      case SC_SIZE:
+//      case SC_DEFAULT:
+      case SC_MOUSEMENU:
+      case SC_KEYMENU:
+      case SC_SCREENSAVE:
+      case SC_MINIMIZE:
+      case SC_MAXIMIZE:
+      case SC_RESTORE:
+      case SC_CLOSE:
+      case SC_HOTKEY:
+        NtUserMessageCall( hWnd, WM_SYSCOMMAND, wParam, lParam, (ULONG_PTR)&lResult, FNID_DEFWINDOWPROC, FALSE);
+        return 0;
+
+      default:
+        break;
+    }
+
   if (ISITHOOKED(WH_CBT))
   {
      NtUserMessageCall( hWnd, WM_SYSCOMMAND, wParam, lParam, (ULONG_PTR)&lResult, FNID_DEFWINDOWPROC, FALSE);
@@ -760,41 +176,7 @@ DefWndHandleSysCommand(HWND hWnd, WPARAM wParam, LPARAM lParam)
 
   switch (wParam & 0xfff0)
     {
-      case SC_MOVE:
-      case SC_SIZE:
-       DefWndDoSizeMove(hWnd, wParam);
-       break;
-    case SC_MINIMIZE:
-        if (hWnd == GetActiveWindow())
-            ShowOwnedPopups(hWnd,FALSE);
-        ShowWindow( hWnd, SW_MINIMIZE );
-        break;
-
-    case SC_MAXIMIZE:
-        if (IsIconic(hWnd) && hWnd == GetActiveWindow())
-            ShowOwnedPopups(hWnd,TRUE);
-        ShowWindow( hWnd, SW_MAXIMIZE );
-        break;
-
-    case SC_RESTORE:
-        if (IsIconic(hWnd) && hWnd == GetActiveWindow())
-            ShowOwnedPopups(hWnd,TRUE);
-        ShowWindow( hWnd, SW_RESTORE );
-        break;
 
-      case SC_CLOSE:
-        return SendMessageW(hWnd, WM_CLOSE, 0, 0);
-//      case SC_DEFAULT:
-      case SC_MOUSEMENU:
-        {
-          Pt.x = (short)LOWORD(lParam);
-          Pt.y = (short)HIWORD(lParam);
-          MenuTrackMouseMenuBar(hWnd, wParam & 0x000f, Pt);
-        }
-       break;
-      case SC_KEYMENU:
-        MenuTrackKbdMenuBar(hWnd, wParam, (WCHAR)lParam);
-       break;
       case SC_VSCROLL:
       case SC_HSCROLL:
         {
@@ -808,39 +190,12 @@ DefWndHandleSysCommand(HWND hWnd, WPARAM wParam, LPARAM lParam)
         WinExec( "taskman.exe", SW_SHOWNORMAL );
         break;
 
-      case SC_SCREENSAVE:
-        NtUserMessageCall( hWnd, WM_SYSCOMMAND, wParam, lParam, (ULONG_PTR)&lResult, FNID_DEFWINDOWPROC, FALSE);
-        break;
 
       case SC_NEXTWINDOW:
       case SC_PREVWINDOW:
         DoAppSwitch( wParam, lParam);
         break;
 
-      case SC_HOTKEY:
-        {
-           HWND hwnd, hWndLastActive;
-           PWND pWnd;
-
-           hwnd = (HWND)lParam;
-           pWnd = ValidateHwnd(hwnd);
-           if (pWnd)
-           {
-              hWndLastActive = GetLastActivePopup(hwnd);
-              if (hWndLastActive)
-              {
-                 hwnd = hWndLastActive;
-                 pWnd = ValidateHwnd(hwnd);
-              }
-              SetForegroundWindow(hwnd);
-              if (pWnd->style & WS_MINIMIZE)
-              {
-                 PostMessage(hwnd, WM_SYSCOMMAND, SC_RESTORE, 0);
-              }
-           }
-        }
-        break;
-
       default:
         FIXME("Unimplemented DefWndHandleSysCommand wParam 0x%x\n",wParam);
         break;
@@ -849,64 +204,6 @@ DefWndHandleSysCommand(HWND hWnd, WPARAM wParam, LPARAM lParam)
   return(0);
 }
 
-LRESULT
-DefWndHandleWindowPosChanging(HWND hWnd, WINDOWPOS* Pos)
-{
-    POINT maxTrack, minTrack;
-    LONG style = GetWindowLongPtrA(hWnd, GWL_STYLE);
-
-    if (Pos->flags & SWP_NOSIZE) return 0;
-    if ((style & WS_THICKFRAME) || ((style & (WS_POPUP | WS_CHILD)) == 0))
-    {
-        WinPosGetMinMaxInfo(hWnd, NULL, NULL, &minTrack, &maxTrack);
-        Pos->cx = min(Pos->cx, maxTrack.x);
-        Pos->cy = min(Pos->cy, maxTrack.y);
-        if (!(style & WS_MINIMIZE))
-        {
-            if (Pos->cx < minTrack.x) Pos->cx = minTrack.x;
-            if (Pos->cy < minTrack.y) Pos->cy = minTrack.y;
-        }
-    }
-    else
-    {
-        Pos->cx = max(Pos->cx, 0);
-        Pos->cy = max(Pos->cy, 0);
-    }
-    return 0;
-}
-
-LRESULT
-DefWndHandleWindowPosChanged(HWND hWnd, WINDOWPOS* Pos)
-{
-  RECT Rect;
-
-  GetClientRect(hWnd, &Rect);
-  MapWindowPoints(hWnd, (GetWindowLongPtrW(hWnd, GWL_STYLE) & WS_CHILD ?
-                         GetParent(hWnd) : NULL), (LPPOINT) &Rect, 2);
-
-  if (! (Pos->flags & SWP_NOCLIENTMOVE))
-    {
-      SendMessageW(hWnd, WM_MOVE, 0, MAKELONG(Rect.left, Rect.top));
-    }
-
-  if (! (Pos->flags & SWP_NOCLIENTSIZE))
-    {
-      WPARAM wp = SIZE_RESTORED;
-      if (IsZoomed(hWnd))
-        {
-          wp = SIZE_MAXIMIZED;
-        }
-      else if (IsIconic(hWnd))
-        {
-          wp = SIZE_MINIMIZED;
-        }
-      SendMessageW(hWnd, WM_SIZE, wp,
-                   MAKELONG(Rect.right - Rect.left, Rect.bottom - Rect.top));
-    }
-
-  return 0;
-}
-
 /***********************************************************************
  *           DefWndControlColor
  *
@@ -948,38 +245,6 @@ DefWndControlColor(HDC hDC, UINT ctlType)
   return GetSysColorBrush(COLOR_WINDOW);
 }
 
-static void DefWndPrint( HWND hwnd, HDC hdc, ULONG uFlags)
-{
-  /*
-   * Visibility flag.
-   */
-  if ( (uFlags & PRF_CHECKVISIBLE) &&
-       !IsWindowVisible(hwnd) )
-      return;
-
-  /*
-   * Unimplemented flags.
-   */
-  if ( (uFlags & PRF_CHILDREN) ||
-       (uFlags & PRF_OWNED)    ||
-       (uFlags & PRF_NONCLIENT) )
-  {
-    FIXME("WM_PRINT message with unsupported flags\n");
-  }
-
-  /*
-   * Background
-   */
-  if ( uFlags & PRF_ERASEBKGND)
-    SendMessageW(hwnd, WM_ERASEBKGND, (WPARAM)hdc, 0);
-
-  /*
-   * Client area
-   */
-  if ( uFlags & PRF_CLIENT)
-    SendMessageW(hwnd, WM_PRINTCLIENT, (WPARAM)hdc, uFlags);
-}
-
 static BOOL CALLBACK
 UserSendUiUpdateMsg(HWND hwnd, LPARAM lParam)
 {
@@ -987,43 +252,40 @@ UserSendUiUpdateMsg(HWND hwnd, LPARAM lParam)
     return TRUE;
 }
 
-// WM_SETICON
-LRESULT FASTCALL
-DefWndSetIcon(PWND pWnd, WPARAM wParam, LPARAM lParam)
+/* WARNING: Redundant with /ntuser/defwnd.c!UserPaintCaption !!
+   Use TWOPARAM_ROUTINE_REDRAWTITLE/REDRAWFRAME or HWNDLOCK_ROUTINE_REDRAWFRAMEANDHOOK .
+ */
+static void
+UserPaintCaption(PWND pwnd, INT Flags)
 {
-    HICON hIcon, hIconSmall, hIconOld;
-    if ( wParam > ICON_SMALL2 )
-    {  
-        SetLastError(ERROR_INVALID_PARAMETER);
-        return 0;
+  if ( pwnd->style & WS_VISIBLE && (pwnd->style & WS_CAPTION) == WS_CAPTION )
+  {
+     if (pwnd->state & WNDS_HASCAPTION && NtUserQueryWindow(UserHMGetHandle(pwnd), QUERY_WINDOW_FOREGROUND))
+        Flags |= DC_ACTIVE;
+    /* 
+     * When themes are not enabled we can go on and paint the non client area.
+     * However if we do that with themes enabled we will draw a classic frame.
+     * This is solved by sending a themes specific message to notify the themes
+     * engine that the caption needs to be redrawn 
+     */
+    if(gpsi->dwSRVIFlags & SRVINFO_APIHOOK)
+    {
+        /* 
+         * This will cause uxtheme to either paint the themed caption or call
+         * RealUserDrawCaption in order to draw the classic caption when themes
+         * are disabled but the themes service is enabled
+         */
+        SendMessageW(UserHMGetHandle(pwnd), WM_NCUAHDRAWCAPTION, Flags, 0);
     }
-    hIconSmall = UserGetProp(UserHMGetHandle(pWnd), gpsi->atomIconSmProp);
-    hIcon = UserGetProp(UserHMGetHandle(pWnd), gpsi->atomIconProp);
-
-    hIconOld = wParam == ICON_BIG ? hIcon : hIconSmall;
-
-    switch(wParam)
+    else
     {
-        case ICON_BIG:
-            hIcon = (HICON)lParam;
-            break;
-        case ICON_SMALL:
-            hIconSmall = (HICON)lParam;
-            break;
-        case ICON_SMALL2:
-            ERR("FIXME: Set ICON_SMALL2 support!\n");
-        default:
-            break;
+        RECT rc = {0,0,0,0};
+        HDC hDC = GetDCEx(UserHMGetHandle(pwnd), NULL, DCX_WINDOW|DCX_USESTYLE);
+        NtUserDrawCaption(UserHMGetHandle(pwnd), hDC, &rc, DC_DRAWCAPTIONMD|Flags);
+        ReleaseDC(UserHMGetHandle(pwnd), hDC);
     }
-
-    NtUserSetProp(UserHMGetHandle(pWnd), gpsi->atomIconProp, hIcon);
-    NtUserSetProp(UserHMGetHandle(pWnd), gpsi->atomIconSmProp, hIconSmall);
-
-    if ((pWnd->style & WS_CAPTION ) == WS_CAPTION)
-       DefWndNCPaint(UserHMGetHandle(pWnd), HRGN_WINDOW, -1);  /* Repaint caption */
-
-    return (LRESULT)hIconOld;
+  }
+  //NtUserCallTwoParam((DWORD_PTR)UserHMGetHandle(pwnd),Flags,TWOPARAM_ROUTINE_REDRAWTITLE)
 }
 
 LRESULT FASTCALL
@@ -1038,11 +300,11 @@ DefWndGetIcon(PWND pWnd, WPARAM wParam, LPARAM lParam)
     switch(wParam)
     {
         case ICON_BIG:
-            hIconRet = UserGetProp(UserHMGetHandle(pWnd), gpsi->atomIconProp);
+            hIconRet = UserGetProp(UserHMGetHandle(pWnd), gpsi->atomIconProp, TRUE);
             break;
         case ICON_SMALL:
         case ICON_SMALL2:
-            hIconRet = UserGetProp(UserHMGetHandle(pWnd), gpsi->atomIconSmProp);
+            hIconRet = UserGetProp(UserHMGetHandle(pWnd), gpsi->atomIconSmProp, TRUE);
             break;
         default:
             break;
@@ -1050,49 +312,13 @@ DefWndGetIcon(PWND pWnd, WPARAM wParam, LPARAM lParam)
     return (LRESULT)hIconRet;
 }
 
-VOID FASTCALL
-DefWndScreenshot(HWND hWnd)
-{
-    RECT rect;
-    HDC hdc;
-    INT w;
-    INT h;
-    HBITMAP hbitmap;
-    HDC hdc2;
-
-    OpenClipboard(hWnd);
-    EmptyClipboard();
-
-    hdc = GetWindowDC(hWnd);
-    GetWindowRect(hWnd, &rect);
-    w = rect.right - rect.left;
-    h = rect.bottom - rect.top;
-
-    hbitmap = CreateCompatibleBitmap(hdc, w, h);
-    hdc2 = CreateCompatibleDC(hdc);
-    SelectObject(hdc2, hbitmap);
-
-    BitBlt(hdc2, 0, 0, w, h,
-           hdc, 0, 0,
-           SRCCOPY);
-
-    SetClipboardData(CF_BITMAP, hbitmap);
-
-    ReleaseDC(hWnd, hdc);
-    ReleaseDC(hWnd, hdc2);
-
-    CloseClipboard();
-
-}
-
-
 
 LRESULT WINAPI
 User32DefWindowProc(HWND hWnd,
-                   UINT Msg,
-                   WPARAM wParam,
-                   LPARAM lParam,
-                   BOOL bUnicode)
+                    UINT Msg,
+                    WPARAM wParam,
+                    LPARAM lParam,
+                    BOOL bUnicode)
 {
     PWND pWnd = NULL;
     if (hWnd)
@@ -1103,80 +329,21 @@ User32DefWindowProc(HWND hWnd,
 
     switch (Msg)
     {
-       case WM_NCPAINT:
-       {
-            return DefWndNCPaint(hWnd, (HRGN)wParam, -1);
-        }
-
-        case WM_NCCALCSIZE:
-        {
-            return DefWndNCCalcSize(hWnd, (BOOL)wParam, (RECT*)lParam);
-        }
-
         case WM_POPUPSYSTEMMENU:
         {
             /* This is an undocumented message used by the windows taskbar to
                display the system menu of windows that belong to other processes. */
             HMENU menu = GetSystemMenu(hWnd, FALSE);
-
+            ERR("WM_POPUPSYSTEMMENU\n");
             if (menu)
-                TrackPopupMenu(menu, TPM_LEFTBUTTON|TPM_RIGHTBUTTON,
+                TrackPopupMenu(menu, TPM_LEFTBUTTON|TPM_RIGHTBUTTON|TPM_SYSTEM_MENU,
                                LOWORD(lParam), HIWORD(lParam), 0, hWnd, NULL);
             return 0;
         }
 
-        case WM_NCACTIVATE:
-        {
-            return DefWndNCActivate(hWnd, wParam, lParam);
-        }
-
-        case WM_NCHITTEST:
-        {
-            POINT Point;
-            Point.x = GET_X_LPARAM(lParam);
-            Point.y = GET_Y_LPARAM(lParam);
-            return (DefWndNCHitTest(hWnd, Point));
-        }
-
-        case WM_LBUTTONDOWN:
-        case WM_RBUTTONDOWN:
-        case WM_MBUTTONDOWN:
-            iF10Key = iMenuSysKey = 0;
-            break;
-
-        case WM_NCLBUTTONDOWN:
-        {
-            return (DefWndNCLButtonDown(hWnd, wParam, lParam));
-        }
-
-        case WM_LBUTTONDBLCLK:
-            return (DefWndNCLButtonDblClk(hWnd, HTCLIENT, lParam));
-
-        case WM_NCLBUTTONDBLCLK:
-        {
-            return (DefWndNCLButtonDblClk(hWnd, wParam, lParam));
-        }
-
-        case WM_WINDOWPOSCHANGING:
-        {
-            return (DefWndHandleWindowPosChanging(hWnd, (WINDOWPOS*)lParam));
-        }
-
-        case WM_WINDOWPOSCHANGED:
-        {
-            return (DefWndHandleWindowPosChanged(hWnd, (WINDOWPOS*)lParam));
-        }
-
-        case WM_NCRBUTTONDOWN:
-            return NC_HandleNCRButtonDown( hWnd, wParam, lParam );
-
         case WM_RBUTTONUP:
         {
             POINT Pt;
-            if (hWnd == GetCapture())
-            {
-                ReleaseCapture();
-            }
             Pt.x = GET_X_LPARAM(lParam);
             Pt.y = GET_Y_LPARAM(lParam);
             ClientToScreen(hWnd, &Pt);
@@ -1199,6 +366,16 @@ User32DefWindowProc(HWND hWnd,
            * "If it is appropriate to do so, the system sends the WM_SYSCOMMAND
            * message to the window". When is it appropriate?
            */
+           ERR("WM_NCRBUTTONUP\n");
+            break;
+
+        case WM_XBUTTONUP:
+        case WM_NCXBUTTONUP:
+            if (HIWORD(wParam) == XBUTTON1 || HIWORD(wParam) == XBUTTON2)
+            {
+               SendMessageW(hWnd, WM_APPCOMMAND, (WPARAM)hWnd,
+                         MAKELPARAM(LOWORD(wParam), FAPPCOMMAND_MOUSE | HIWORD(wParam)));
+            }
             break;
 
         case WM_CONTEXTMENU:
@@ -1216,123 +393,11 @@ User32DefWindowProc(HWND hWnd,
             }
             else
             {
-                POINT Pt;
-                LONG_PTR Style;
-                LONG HitCode;
-
-                Style = GetWindowLongPtrW(hWnd, GWL_STYLE);
-
-                Pt.x = GET_X_LPARAM(lParam);
-                Pt.y = GET_Y_LPARAM(lParam);
-                if (Style & WS_CHILD)
-                {
-                    ScreenToClient(GetParent(hWnd), &Pt);
-                }
-
-                HitCode = DefWndNCHitTest(hWnd, Pt);
-
-                if (HitCode == HTCAPTION || HitCode == HTSYSMENU)
-                {
-                    HMENU SystemMenu;
-                    UINT Flags;
-
-                    if((SystemMenu = GetSystemMenu(hWnd, FALSE)))
-                    {
-                      MenuInitSysMenuPopup(SystemMenu, GetWindowLongPtrW(hWnd, GWL_STYLE),
-                                           GetClassLongPtrW(hWnd, GCL_STYLE), HitCode);
-
-                      if(HitCode == HTCAPTION)
-                        Flags = TPM_LEFTBUTTON | TPM_RIGHTBUTTON;
-                      else
-                        Flags = TPM_LEFTBUTTON;
-
-                      TrackPopupMenu(SystemMenu, Flags,
-                                     Pt.x, Pt.y, 0, hWnd, NULL);
-                    }
-                }
-           }
-            break;
-        }
-
-        case WM_PRINT:
-        {
-            DefWndPrint(hWnd, (HDC)wParam, lParam);
-            return (0);
-        }
-
-        case WM_SYSCOLORCHANGE:
-        {
-            /* force to redraw non-client area */
-            DefWndNCPaint(hWnd, HRGN_WINDOW, -1);
-            /* Use InvalidateRect to redraw client area, enable
-             * erase to redraw all subcontrols otherwise send the
-             * WM_SYSCOLORCHANGE to child windows/controls is required
-             */
-            InvalidateRect(hWnd,NULL,TRUE);
-            return (0);
-        }
-
-        case WM_PAINTICON:
-        case WM_PAINT:
-        {
-            PAINTSTRUCT Ps;
-            HDC hDC;
-
-            /* If already in Paint and Client area is not empty just return. */
-            if (pWnd->state2 & WNDS2_STARTPAINT && !IsRectEmpty(&pWnd->rcClient))
-            {
-               ERR("In Paint and Client area is not empty!\n");
-               return 0;
+               goto GoSS;
             }
-
-            hDC = BeginPaint(hWnd, &Ps);
-            if (hDC)
-            {
-                HICON hIcon;
-
-                if (IsIconic(hWnd) && ((hIcon = (HICON)GetClassLongPtrW( hWnd, GCLP_HICON))))
-                {
-                    RECT ClientRect;
-                    INT x, y;
-                    GetClientRect(hWnd, &ClientRect);
-                    x = (ClientRect.right - ClientRect.left -
-                         GetSystemMetrics(SM_CXICON)) / 2;
-                    y = (ClientRect.bottom - ClientRect.top -
-                         GetSystemMetrics(SM_CYICON)) / 2;
-                    DrawIcon(hDC, x, y, hIcon);
-                }
-                EndPaint(hWnd, &Ps);
-            }
-            return (0);
-        }
-/*
-        case WM_SYNCPAINT:
-        {
-            HRGN hRgn;
-            hRgn = CreateRectRgn(0, 0, 0, 0);
-            if (GetUpdateRgn(hWnd, hRgn, FALSE) != NULLREGION)
-            {
-                RedrawWindow(hWnd, NULL, hRgn,
-                               RDW_ERASENOW | RDW_ERASE | RDW_FRAME |
-                    RDW_ALLCHILDREN);
-            }
-            DeleteObject(hRgn);
-            return (0);
+            break;
         }
 
-        case WM_SETREDRAW:
-        {
-            LONG_PTR Style = GetWindowLongPtrW(hWnd, GWL_STYLE);
-            if (wParam) SetWindowLongPtr(hWnd, GWL_STYLE, Style | WS_VISIBLE);
-            else
-            {
-                RedrawWindow(hWnd, NULL, 0, RDW_ALLCHILDREN | RDW_VALIDATE);
-                Style &= ~WS_VISIBLE;
-                SetWindowLongPtr(hWnd, GWL_STYLE, Style);
-            }
-            return (0);
-        }
-*/
         case WM_CLOSE:
             DestroyWindow(hWnd);
             return (0);
@@ -1392,145 +457,14 @@ User32DefWindowProc(HWND hWnd,
         case WM_CTLCOLORDLG:
         case WM_CTLCOLORSTATIC:
         case WM_CTLCOLORSCROLLBAR:
-           return (LRESULT) DefWndControlColor((HDC)wParam, Msg - WM_CTLCOLORMSGBOX);
+            return (LRESULT) DefWndControlColor((HDC)wParam, Msg - WM_CTLCOLORMSGBOX);
 
         case WM_CTLCOLOR:
             return (LRESULT) DefWndControlColor((HDC)wParam, HIWORD(lParam));
 
-        case WM_SETCURSOR:
-        {
-            LONG_PTR Style = GetWindowLongPtrW(hWnd, GWL_STYLE);
-
-            if (Style & WS_CHILD)
-            {
-                /* with the exception of the border around a resizable wnd,
-                 * give the parent first chance to set the cursor */
-                if (LOWORD(lParam) < HTLEFT || LOWORD(lParam) > HTBOTTOMRIGHT)
-                {
-                    HWND parent = GetParent( hWnd );
-                    if (bUnicode)
-                    {
-                       if (parent != GetDesktopWindow() &&
-                           SendMessageW( parent, WM_SETCURSOR, wParam, lParam))
-                          return TRUE;
-                    }
-                    else
-                    {
-                       if (parent != GetDesktopWindow() &&                    
-                           SendMessageA( parent, WM_SETCURSOR, wParam, lParam))
-                          return TRUE;
-                    }
-                }
-            }
-            return (DefWndHandleSetCursor(hWnd, wParam, lParam, Style));
-        }
-
         case WM_SYSCOMMAND:
             return (DefWndHandleSysCommand(hWnd, wParam, lParam));
 
-        case WM_KEYDOWN:
-            if(wParam == VK_F10) iF10Key = VK_F10;
-            break;
-
-        case WM_SYSKEYDOWN:
-        {
-            if (HIWORD(lParam) & KF_ALTDOWN)
-            {   /* Previous state, if the key was down before this message,
-                   this is a cheap way to ignore autorepeat keys. */
-                if ( !(HIWORD(lParam) & KF_REPEAT) )
-                {
-                   if ( ( wParam == VK_MENU  ||
-                          wParam == VK_LMENU ||
-                          wParam == VK_RMENU ) && !iMenuSysKey )
-                       iMenuSysKey = 1;
-                   else
-                       iMenuSysKey = 0;
-                }
-
-                iF10Key = 0;
-
-                if (wParam == VK_F4) /* Try to close the window */
-                {
-                   HWND top = GetAncestor(hWnd, GA_ROOT);
-                   if (!(GetClassLongPtrW(top, GCL_STYLE) & CS_NOCLOSE))
-                      PostMessageW(top, WM_SYSCOMMAND, SC_CLOSE, 0);
-                }
-                else if (wParam == VK_SNAPSHOT) // Alt-VK_SNAPSHOT?
-                {
-                   HWND hwnd = hWnd;
-                   while (GetParent(hwnd) != NULL)
-                   {
-                       hwnd = GetParent(hwnd);
-                   }
-                   DefWndScreenshot(hwnd);
-                }
-                else if ( wParam == VK_ESCAPE || wParam == VK_TAB ) // Alt-Tab/ESC Alt-Shift-Tab/ESC
-                {
-                   WPARAM wParamTmp;
-                   HWND Active = GetActiveWindow(); // Noticed MDI problem.
-                   if (!Active)
-                   {
-                      FIXME("WM_SYSKEYDOWN VK_ESCAPE no active\n");
-                      break;
-                   }
-                   wParamTmp = GetKeyState(VK_SHIFT) & 0x8000 ? SC_PREVWINDOW : SC_NEXTWINDOW;
-                   SendMessageW( Active, WM_SYSCOMMAND, wParamTmp, wParam );
-                }
-            }
-            else if( wParam == VK_F10 )
-            {
-                if (GetKeyState(VK_SHIFT) & 0x8000)
-                    SendMessageW( hWnd, WM_CONTEXTMENU, (WPARAM)hWnd, MAKELPARAM(-1, -1) );
-                iF10Key = 1;
-            }
-            break;
-        }
-
-        case WM_KEYUP:
-        case WM_SYSKEYUP:
-        {
-           /* Press and release F10 or ALT */
-            if (((wParam == VK_MENU || wParam == VK_LMENU || wParam == VK_RMENU)
-                 && iMenuSysKey) || ((wParam == VK_F10) && iF10Key))
-                SendMessageW( GetAncestor( hWnd, GA_ROOT ), WM_SYSCOMMAND, SC_KEYMENU, 0L );
-            iMenuSysKey = iF10Key = 0;
-            break;
-        }
-
-        case WM_SYSCHAR:
-        {
-            iMenuSysKey = 0;
-            if (wParam == VK_RETURN && IsIconic(hWnd))
-            {
-                PostMessageW( hWnd, WM_SYSCOMMAND, SC_RESTORE, 0L );
-                break;
-            }
-            if ((HIWORD(lParam) & KF_ALTDOWN) && wParam)
-            {
-                if (wParam == VK_TAB || wParam == VK_ESCAPE) break;
-                if (wParam == VK_SPACE && (GetWindowLongPtrW( hWnd, GWL_STYLE ) & WS_CHILD))
-                    SendMessageW( GetParent(hWnd), Msg, wParam, lParam );
-                else
-                    SendMessageW( hWnd, WM_SYSCOMMAND, SC_KEYMENU, wParam );
-            }
-            else /* check for Ctrl-Esc */
-                if (wParam != VK_ESCAPE) MessageBeep(0);
-            break;
-        }
-
-        case WM_CANCELMODE:
-        {
-            iMenuSysKey = 0;
-            /* FIXME: Check for a desktop. */
-            //if (!(GetWindowLongPtrW( hWnd, GWL_STYLE ) & WS_CHILD)) EndMenu();
-            MENU_EndMenu( hWnd );
-            if (GetCapture() == hWnd)
-            {
-                ReleaseCapture();
-            }
-            break;
-        }
-
         case WM_VKEYTOITEM:
         case WM_CHARTOITEM:
             return (-1);
@@ -1581,11 +515,6 @@ User32DefWindowProc(HWND hWnd,
             break;
         }
 
-        case WM_SETICON:
-        {
-           return DefWndSetIcon(pWnd, wParam, lParam);
-        }
-
         case WM_GETICON:
         {
            return DefWndGetIcon(pWnd, wParam, lParam);
@@ -1604,22 +533,6 @@ User32DefWindowProc(HWND hWnd,
             break;
         }
 
-        case WM_SYSTIMER:
-        {
-          THRDCARETINFO CaretInfo;
-          switch(wParam)
-          {
-            case 0xffff: /* Caret timer */
-              /* switch showing byte in win32k and get information about the caret */
-              if(NtUserxSwitchCaretShowing(&CaretInfo) && (CaretInfo.hWnd == hWnd))
-              {
-                DrawCaret(hWnd, &CaretInfo);
-              }
-              break;
-          }
-          break;
-        }
-
         case WM_QUERYOPEN:
         case WM_QUERYENDSESSION:
         {
@@ -1836,14 +749,44 @@ User32DefWindowProc(HWND hWnd,
             break;
         }
 
-/* Move to win32k !*/
+/* Move to Win32k !*/
         case WM_SHOWWINDOW:
             if (!lParam) break; // Call when it is necessary.
+        case WM_LBUTTONDOWN:
+        case WM_RBUTTONDOWN:
+        case WM_MBUTTONDOWN:
+        case WM_NCLBUTTONDOWN:
+        case WM_NCRBUTTONDOWN:
+        case WM_LBUTTONDBLCLK:
+        case WM_NCLBUTTONDBLCLK:
+        case WM_KEYF1:
+        case WM_KEYUP:
+        case WM_SYSKEYUP:
+        case WM_KEYDOWN:
+        case WM_SYSKEYDOWN:
+        case WM_SYSCHAR:
+        case WM_CANCELMODE:
+        case WM_PAINTICON:
+        case WM_PAINT:
+        case WM_PRINT:
+        case WM_SETICON:
+        case WM_SYSCOLORCHANGE:
+        case WM_NCUAHDRAWCAPTION:
+        case WM_NCUAHDRAWFRAME:
+        case WM_NCPAINT:
+        case WM_NCACTIVATE:
+        case WM_NCCALCSIZE:
+        case WM_NCHITTEST:
         case WM_SYNCPAINT:
         case WM_SETREDRAW:
         case WM_CLIENTSHUTDOWN:
         case WM_GETHOTKEY:
         case WM_SETHOTKEY:
+        case WM_WINDOWPOSCHANGING:
+        case WM_WINDOWPOSCHANGED:
+        case WM_APPCOMMAND:
+        case WM_SETCURSOR:
+GoSS:
         {
             LRESULT lResult;
             NtUserMessageCall( hWnd, Msg, wParam, lParam, (ULONG_PTR)&lResult, FNID_DEFWINDOWPROC, !bUnicode);
@@ -2033,15 +976,8 @@ RealDefWindowProcA(HWND hWnd,
 
             if ((GetWindowLongPtrW(hWnd, GWL_STYLE) & WS_CAPTION) == WS_CAPTION)
             {
-                /* FIXME: this is not 100% correct */
-                if(gpsi->dwSRVIFlags & SRVINFO_APIHOOK)
-                {
-                    SendMessage(hWnd, WM_NCUAHDRAWCAPTION,0,0);
-                }
-                else
-                {
-                    DefWndNCPaint(hWnd, HRGN_WINDOW, -1);
-                }
+                UserPaintCaption(Wnd, DC_TEXT);
+                IntNotifyWinEvent(EVENT_OBJECT_NAMECHANGE, hWnd, OBJID_WINDOW, CHILDID_SELF, 0);
             }
             Result = 1;
             break;
@@ -2072,6 +1008,7 @@ RealDefWindowProcA(HWND hWnd,
         case WM_IME_ENDCOMPOSITION:
         case WM_IME_SELECT:
         case WM_IME_NOTIFY:
+        case WM_IME_CONTROL:
         {
             HWND hwndIME;
 
@@ -2204,17 +1141,7 @@ RealDefWindowProcW(HWND hWnd,
             DefSetText(hWnd, (PCWSTR)lParam, FALSE);
 
             if ((GetWindowLongPtrW(hWnd, GWL_STYLE) & WS_CAPTION) == WS_CAPTION)
-            {
-                /* FIXME: this is not 100% correct */
-                if(gpsi->dwSRVIFlags & SRVINFO_APIHOOK)
-                {
-                    SendMessage(hWnd, WM_NCUAHDRAWCAPTION,0,0);
-                }
-                else
-                {
-                    DefWndNCPaint(hWnd, HRGN_WINDOW, -1);
-                }
-            }
+                UserPaintCaption(Wnd, DC_TEXT);
             Result = 1;
             break;
         }
@@ -2243,6 +1170,7 @@ RealDefWindowProcW(HWND hWnd,
         case WM_IME_ENDCOMPOSITION:
         case WM_IME_SELECT:
         case WM_IME_NOTIFY:
+        case WM_IME_CONTROL:
         {
             HWND hwndIME;