Use max tracking size instead of maximized size to limit window size.
[reactos.git] / reactos / lib / user32 / windows / defwnd.c
index b3898c1..2756baa 100644 (file)
@@ -1,4 +1,4 @@
-/* $Id: defwnd.c,v 1.103 2003/10/26 11:08:31 navaraf Exp $
+/* $Id$
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS user32.dll
 
 /* INCLUDES ******************************************************************/
 
-#include <windows.h>
 #include <user32.h>
-#include <window.h>
-#include <user32/wininternal.h>
-#include <string.h>
-#include <menu.h>
-#include <cursor.h>
-#include <winpos.h>
-
 #define NDEBUG
 #include <debug.h>
 
-LRESULT DefWndNCPaint(HWND hWnd, HRGN hRgn);
+#ifndef WM_SETVISIBLE
+#define WM_SETVISIBLE 9
+#endif
+#ifndef WM_QUERYDROPOBJECT
+#define WM_QUERYDROPOBJECT  0x022B
+#endif
+
+LRESULT DefWndNCPaint(HWND hWnd, HRGN hRgn, BOOL Active);
 LRESULT DefWndNCCalcSize(HWND hWnd, BOOL CalcSizeStruct, RECT *Rect);
 LRESULT DefWndNCActivate(HWND hWnd, WPARAM wParam);
 LRESULT DefWndNCHitTest(HWND hWnd, POINT Point);
 LRESULT DefWndNCLButtonDown(HWND hWnd, WPARAM wParam, LPARAM lParam);
 LRESULT DefWndNCLButtonDblClk(HWND hWnd, WPARAM wParam, LPARAM lParam);
+void FASTCALL MenuInitSysMenuPopup(HMENU Menu, DWORD Style, DWORD ClsStyle, LONG HitTest );
 
 /* GLOBALS *******************************************************************/
 
-/* TODO:  widgets will be cached here.
-static HBITMAP hbClose;
-static HBITMAP hbCloseD;
-static HBITMAP hbMinimize;
-static HBITMAP hbMinimizeD;
-static HBITMAP hbRestore;
-static HBITMAP hbRestoreD;
-static HBITMAP hbMaximize;
-static HBITMAP hbScrUp;
-static HBITMAP hbScrDwn;
-static HBITMAP hbScrLeft;
-static HBITMAP hbScrRight;
-*/
-
-
-static COLORREF SysColours[] =
-  {
-    RGB(192, 192, 192) /* COLOR_SCROLLBAR */,
-    RGB(58, 110, 165) /* COLOR_BACKGROUND */,
-    RGB(0, 0, 128) /* COLOR_ACTIVECAPTION */,
-    RGB(128, 128, 128) /* COLOR_INACTIVECAPTION */,
-    RGB(192, 192, 192) /* COLOR_MENU */,
-    RGB(255, 255, 255) /* COLOR_WINDOW */,
-    RGB(0, 0, 0) /* COLOR_WINDOWFRAME */,
-    RGB(0, 0, 0) /* COLOR_MENUTEXT */,
-    RGB(0, 0, 0) /* COLOR_WINDOWTEXT */,
-    RGB(255, 255, 255) /* COLOR_CAPTIONTEXT */,
-    RGB(192, 192, 192) /* COLOR_ACTIVEBORDER */,
-    RGB(192, 192, 192) /* COLOR_INACTIVEBORDER */,
-    RGB(128, 128, 128) /* COLOR_APPWORKSPACE */,
-    RGB(0, 0, 128) /* COLOR_HILIGHT */,
-    RGB(255, 255, 255) /* COLOR_HILIGHTTEXT */,
-    RGB(192, 192, 192) /* COLOR_BTNFACE */,
-    RGB(128, 128, 128) /* COLOR_BTNSHADOW */,
-    RGB(128, 128, 128) /* COLOR_GRAYTEXT */,
-    RGB(0, 0, 0) /* COLOR_BTNTEXT */,
-    RGB(192, 192, 192) /* COLOR_INACTIVECAPTIONTEXT */,
-    RGB(255, 255, 255) /* COLOR_BTNHILIGHT */,
-    RGB(32, 32, 32) /* COLOR_3DDKSHADOW */,
-    RGB(224, 224, 224) /* COLOR_3DLIGHT */,
-    RGB(0, 0, 0) /* COLOR_INFOTEXT */,
-    RGB(255, 255, 192) /* COLOR_INFOBK */,
-    RGB(180, 180, 180) /* COLOR_ALTERNATEBTNFACE */,
-    RGB(0, 0, 255) /* COLOR_HOTLIGHT */,
-    RGB(16, 132, 208) /* COLOR_GRADIENTACTIVECAPTION */,
-    RGB(181, 181, 181) /* COLOR_GRADIENTINACTIVECAPTION */,
-  };
-
-#define NUM_SYSCOLORS (sizeof(SysColours) / sizeof(SysColours[0]))
-
-ATOM AtomInternalPos;
+COLORREF SysColors[NUM_SYSCOLORS] = {0};
+HPEN SysPens[NUM_SYSCOLORS] = {0};
+HBRUSH SysBrushes[NUM_SYSCOLORS] = {0};
 
 /* Bits in the dwKeyData */
 #define KEYDATA_ALT   0x2000
 
 /* FUNCTIONS *****************************************************************/
 
-VOID
-UserSetupInternalPos(VOID)
+void
+InitStockObjects(void)
 {
-    LPSTR Str = "SysIP";
-    AtomInternalPos = GlobalAddAtomA(Str);
+  /* FIXME - Instead of copying the stuff to usermode we should map the tables to
+             userland. The current implementation has one big flaw: the system color
+             table doesn't get updated when another process changes them. That's why
+             we should rather map the table into usermode. But it only affects the
+             SysColors table - the pens, brushes and stock objects are not affected
+             as their handles never change. But it'd be faster to map them, too. */
+  if(SysBrushes[0] == NULL)
+  {
+    /* only initialize once */
+    NtUserGetSysColors(SysColors, NUM_SYSCOLORS);
+    NtUserGetSysColorPens(SysPens, NUM_SYSCOLORS);
+    NtUserGetSysColorBrushes(SysBrushes, NUM_SYSCOLORS);
+  }
 }
 
 /*
@@ -102,7 +65,13 @@ UserSetupInternalPos(VOID)
 DWORD STDCALL
 GetSysColor(int nIndex)
 {
-    return SysColours[nIndex];
+  if(nIndex >= 0 && nIndex <= NUM_SYSCOLORS)
+  {
+    return SysColors[nIndex];
+  }
+
+  SetLastError(ERROR_INVALID_PARAMETER);
+  return 0;
 }
 
 /*
@@ -111,22 +80,13 @@ GetSysColor(int nIndex)
 HPEN STDCALL
 GetSysColorPen(int nIndex)
 {
-  static HPEN SysPens[NUM_SYSCOLORS];
-
-  if (nIndex < 0 || NUM_SYSCOLORS < nIndex)
-    {
-      SetLastError(ERROR_INVALID_PARAMETER);
-      return NULL;
-    }
-
-  /* FIXME should register this object with DeleteObject() so it
-     can't be deleted */
-  if (NULL == SysPens[nIndex])
-    {
-      SysPens[nIndex] = CreatePen(PS_SOLID, 1, SysColours[nIndex]);
-    }
+  if(nIndex >= 0 && nIndex <= NUM_SYSCOLORS)
+  {
+    return SysPens[nIndex];
+  }
 
-  return SysPens[nIndex];
+  SetLastError(ERROR_INVALID_PARAMETER);
+  return NULL;
 }
 
 /*
@@ -135,93 +95,51 @@ GetSysColorPen(int nIndex)
 HBRUSH STDCALL
 GetSysColorBrush(int nIndex)
 {
-  static HBRUSH SysBrushes[NUM_SYSCOLORS];
-
-  if (nIndex < 0 || NUM_SYSCOLORS < nIndex)
-    {
-      SetLastError(ERROR_INVALID_PARAMETER);
-      return NULL;
-    }
-
-  /* FIXME should register this object with DeleteObject() so it
-     can't be deleted */
-  if (NULL == SysBrushes[nIndex])
-    {
-      SysBrushes[nIndex] = (HBRUSH) ((DWORD) CreateSolidBrush(SysColours[nIndex]) | 0x00800000);
-    }
+  if(nIndex >= 0 && nIndex <= NUM_SYSCOLORS)
+  {
+    return SysBrushes[nIndex];
+  }
 
-  return SysBrushes[nIndex];
+  SetLastError(ERROR_INVALID_PARAMETER);
+  return NULL;
 }
 
 /*
- * @unimplemented
- */
-LRESULT STDCALL
-DefFrameProcA( HWND hWnd,
-             HWND hWndMDIClient,
-             UINT uMsg,
-             WPARAM wParam,
-             LPARAM lParam )
-{
-    UNIMPLEMENTED;
-    return ((LRESULT)0);
-}
-
-/*
- * @unimplemented
+ * @implemented
  */
-LRESULT STDCALL
-DefFrameProcW(HWND hWnd,
-             HWND hWndMDIClient,
-             UINT uMsg,
-             WPARAM wParam,
-             LPARAM lParam)
-{
-    UNIMPLEMENTED;
-    return ((LRESULT)0);
-}
-
-PINTERNALPOS
-UserGetInternalPos(HWND hWnd)
+BOOL
+STDCALL
+SetSysColors(
+  int cElements,
+  CONST INT *lpaElements,
+  CONST COLORREF *lpaRgbValues)
 {
-    PINTERNALPOS lpPos;
-    lpPos = (PINTERNALPOS)GetPropA(hWnd, (LPSTR)(DWORD)AtomInternalPos);
-    return(lpPos);
-}
-
-ULONG
-UserHasAnyFrameStyle(ULONG Style, ULONG ExStyle)
-{
-    return ((Style & (WS_THICKFRAME | WS_DLGFRAME | WS_BORDER)) ||
-            (ExStyle & WS_EX_DLGMODALFRAME) ||
-            (!(Style & (WS_CHILD | WS_POPUP))));
-}
-
-ULONG
-UserHasDlgFrameStyle(ULONG Style, ULONG ExStyle)
-{
-    return ((ExStyle & WS_EX_DLGMODALFRAME) ||
-            ((Style & WS_DLGFRAME) && (!(Style & WS_THICKFRAME))));
-}
+  BOOL Ret;
+  struct
+  {
+    INT *Elements;
+    COLORREF *Colors;
+  } ChangeSysColors;
 
-ULONG
-UserHasThickFrameStyle(ULONG Style, ULONG ExStyle)
-{
-    return ((Style & WS_THICKFRAME) &&
-            (!((Style & (WS_DLGFRAME | WS_BORDER)) == WS_DLGFRAME)));
-}
+  ChangeSysColors.Elements = (INT*)lpaElements;
+  ChangeSysColors.Colors = (COLORREF*)lpaRgbValues;
 
-ULONG
-UserHasThinFrameStyle(ULONG Style, ULONG ExStyle)
-{
-    return ((Style & WS_BORDER) || (!(Style & (WS_CHILD | WS_POPUP))));
-}
+  if(cElements > 0)
+  {
+    Ret = NtUserSetSysColors(&ChangeSysColors, cElements);
+    if(Ret)
+    {
+      /* FIXME - just change it in the usermode structure, too, instead of asking win32k again */
+      NtUserGetSysColors(SysColors, NUM_SYSCOLORS);
+    }
+  }
+  else
+  {
+    SetLastError(ERROR_INVALID_PARAMETER);
+    Ret = FALSE;
+  }
 
-ULONG
-UserHasBigFrameStyle(ULONG Style, ULONG ExStyle)
-{
-    return ((Style & (WS_THICKFRAME | WS_DLGFRAME)) ||
-            (ExStyle & WS_EX_DLGMODALFRAME));
+  return Ret;
 }
 
 void
@@ -274,12 +192,17 @@ UserGetInsideRectNC(HWND hWnd, RECT *rect)
 VOID
 DefWndSetRedraw(HWND hWnd, WPARAM wParam)
 {
+  if ((BOOL) wParam && 0 == (GetWindowLong(hWnd, GWL_STYLE) & WS_VISIBLE))
+    {
+      ShowWindow(hWnd, SW_NORMAL);
+    }
+
   UNIMPLEMENTED;
 }
 
 
 LRESULT
-DefWndHandleSetCursor(HWND hWnd, WPARAM wParam, LPARAM lParam)
+DefWndHandleSetCursor(HWND hWnd, WPARAM wParam, LPARAM lParam, ULONG Style)
 {
   /* Not for child windows. */
   if (hWnd != (HWND)wParam)
@@ -287,7 +210,7 @@ DefWndHandleSetCursor(HWND hWnd, WPARAM wParam, LPARAM lParam)
       return(0);
     }
 
-  switch(LOWORD(lParam))
+  switch((INT_PTR) LOWORD(lParam))
     {
     case HTERROR:
       {
@@ -314,39 +237,55 @@ DefWndHandleSetCursor(HWND hWnd, WPARAM wParam, LPARAM lParam)
     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 (GetWindowLongW(hWnd, GWL_STYLE) & WS_MAXIMIZE)
+        {
+          break;
+        }
        return((LRESULT)SetCursor(LoadCursorW(0, IDC_SIZENESW)));
       }
     }
   return((LRESULT)SetCursor(LoadCursorW(0, IDC_ARROW)));
 }
 
-static LONG 
+static LONG
 DefWndStartSizeMove(HWND hWnd, WPARAM wParam, POINT *capturePoint)
 {
   LONG hittest = 0;
   POINT pt;
   MSG msg;
   RECT rectWindow;
-  ULONG Style = GetWindowLongW(hWnd, GWL_STYLE); 
-  
+  ULONG Style = GetWindowLongW(hWnd, GWL_STYLE);
+
   GetWindowRect(hWnd, &rectWindow);
 
   if ((wParam & 0xfff0) == SC_MOVE)
@@ -367,9 +306,11 @@ DefWndStartSizeMove(HWND hWnd, WPARAM wParam, POINT *capturePoint)
     }
   else  /* SC_SIZE */
     {
+      pt.x = pt.y = 0;
       while(!hittest)
        {
-         GetMessageW(&msg, NULL, 0, 0);
+         if (GetMessageW(&msg, NULL, 0, 0) <= 0)
+           break;
          switch(msg.message)
            {
            case WM_MOUSEMOVE:
@@ -377,10 +318,10 @@ DefWndStartSizeMove(HWND hWnd, WPARAM wParam, POINT *capturePoint)
              if ((hittest < HTLEFT) || (hittest > HTBOTTOMRIGHT))
                hittest = 0;
              break;
-             
+
            case WM_LBUTTONUP:
              return 0;
-             
+
            case WM_KEYDOWN:
              switch(msg.wParam)
                {
@@ -412,7 +353,7 @@ DefWndStartSizeMove(HWND hWnd, WPARAM wParam, POINT *capturePoint)
       *capturePoint = pt;
     }
     SetCursorPos( pt.x, pt.y );
-    DefWndHandleSetCursor(hWnd, (WPARAM)hWnd, MAKELONG(hittest, WM_MOUSEMOVE));
+    DefWndHandleSetCursor(hWnd, (WPARAM)hWnd, MAKELONG(hittest, WM_MOUSEMOVE), Style);
     return hittest;
 }
 
@@ -425,66 +366,82 @@ DefWndStartSizeMove(HWND hWnd, WPARAM wParam, POINT *capturePoint)
 #define ON_BOTTOM_BORDER(hit) \
  (((hit) == HTBOTTOM) || ((hit) == HTBOTTOMLEFT) || ((hit) == HTBOTTOMRIGHT))
 
-VOID STATIC 
+VOID STATIC
 UserDrawWindowFrame(HDC hdc, const RECT *rect,
-                   ULONG width, ULONG height, DWORD rop )
+                   ULONG width, ULONG height)
 {
-  HBRUSH hbrush = SelectObject( hdc, GetStockObject( GRAY_BRUSH ) );
+  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, rop );
+         rect->right - rect->left - width, height, PATINVERT );
   PatBlt( hdc, rect->left, rect->top + height, width,
-         rect->bottom - rect->top - height, rop );
+         rect->bottom - rect->top - height, PATINVERT );
   PatBlt( hdc, rect->left + width, rect->bottom - 1,
-         rect->right - rect->left - width, -height, rop );
+         rect->right - rect->left - width, -height, PATINVERT );
   PatBlt( hdc, rect->right - 1, rect->top, -width,
-         rect->bottom - rect->top - height, rop );
+         rect->bottom - rect->top - height, PATINVERT );
   SelectObject( hdc, hbrush );
 }
 
 VOID STATIC
 UserDrawMovingFrame(HDC hdc, RECT *rect, BOOL thickframe)
 {
-  if (thickframe)
-    {
-      UserDrawWindowFrame(hdc, rect, GetSystemMetrics(SM_CXFRAME),
-                         GetSystemMetrics(SM_CYFRAME), PATINVERT );
-    }
-  else DrawFocusRect( hdc, rect );
+  if(thickframe)
+  {
+    UserDrawWindowFrame(hdc, rect, GetSystemMetrics(SM_CXFRAME), GetSystemMetrics(SM_CYFRAME));
+  }
+  else
+  {
+    UserDrawWindowFrame(hdc, rect, 1, 1);
+  }
 }
 
 VOID STATIC
 DefWndDoSizeMove(HWND hwnd, WORD wParam)
 {
+  HRGN DesktopRgn;
   MSG msg;
-  RECT sizingRect, mouseRect, origRect, clipRect;
+  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 = GetWindowLongW(hwnd, GWL_STYLE);
-  ULONG ExStyle = GetWindowLongW(hwnd, GWL_EXSTYLE); 
-  BOOL thickframe = UserHasThickFrameStyle(Style, ExStyle);
+  ULONG ExStyle = GetWindowLongW(hwnd, GWL_EXSTYLE);
+  BOOL thickframe;
   BOOL iconic = Style & WS_MINIMIZE;
   BOOL moved = FALSE;
   DWORD dwPoint = GetMessagePos();
   BOOL DragFullWindows = FALSE;
-  HWND hWndParent;
+  HWND hWndParent = NULL;
 
   SystemParametersInfoA(SPI_GETDRAGFULLWINDOWS, 0, &DragFullWindows, 0);
-  
-  pt.x = SLOWORD(dwPoint);
-  pt.y = SHIWORD(dwPoint);
+
+  pt.x = GET_X_LPARAM(dwPoint);
+  pt.y = GET_Y_LPARAM(dwPoint);
   capturePoint = pt;
-  
+
   if (IsZoomed(hwnd) || !IsWindowVisible(hwnd))
     {
       return;
     }
-  
+
+  thickframe = UserHasThickFrameStyle(Style, ExStyle) && !(Style & WS_MINIMIZE);
   if ((wParam & 0xfff0) == SC_MOVE)
     {
-      if (!hittest) 
+      if (!hittest)
        {
          hittest = DefWndStartSizeMove(hwnd, wParam, &capturePoint);
        }
@@ -499,9 +456,9 @@ DefWndDoSizeMove(HWND hwnd, WORD wParam)
        {
          return;
        }
-      if (hittest && hittest != HTSYSMENU) 
+      if (hittest && ((wParam & 0xfff0) != SC_MOUSEMENU))
        {
-         hittest += 2;
+          hittest += (HTLEFT - WMSZ_LEFT);
        }
       else
        {
@@ -515,30 +472,35 @@ DefWndDoSizeMove(HWND hwnd, WORD wParam)
        }
     }
 
-  if (Style & WS_CHILD)
-    {
-      hWndParent = GetParent(hwnd);
-    }
-  
   /* Get min/max info */
-  
+
   WinPosGetMinMaxInfo(hwnd, NULL, NULL, &minTrack, &maxTrack);
   GetWindowRect(hwnd, &sizingRect);
   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 
+  else
     {
-      SetRect(&mouseRect, 0, 0, GetSystemMetrics(SM_CXSCREEN), 
-             GetSystemMetrics(SM_CYSCREEN));
-      SystemParametersInfoW(SPI_GETWORKAREA, 0, &clipRect, 0);
+      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))
     {
@@ -561,23 +523,28 @@ DefWndDoSizeMove(HWND hwnd, WORD wParam)
       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 );
-  
-  if (GetCapture() != hwnd) SetCapture( hwnd );    
-  
+  NtUserSetGUIThreadHandle(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)GetClassLongW(hwnd, GCL_HICON);
@@ -585,24 +552,25 @@ DefWndDoSizeMove(HWND hwnd, WORD wParam)
       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 );
+      UserDrawMovingFrame( hdc, &sizingRect, thickframe);
     }
-  
-  while(1)
+
+  for(;;)
     {
       int dx = 0, dy = 0;
 
-      GetMessageW(&msg, 0, 0, 0);
-      
+      if (GetMessageW(&msg, 0, 0, 0) <= 0)
+        break;
+
       /* Exit on button-up, Return, or Esc */
       if ((msg.message == WM_LBUTTONUP) ||
-         ((msg.message == WM_KEYDOWN) && 
+         ((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 );
@@ -610,48 +578,47 @@ DefWndDoSizeMove(HWND hwnd, WORD wParam)
          if(!iconic && !DragFullWindows) UserDrawMovingFrame( hdc, &sizingRect, thickframe );
          continue;
         }
-      
+
       if ((msg.message != WM_KEYDOWN) && (msg.message != WM_MOUSEMOVE))
        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;                
+       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 );
-                   WinPosShowIconTitle( hwnd, FALSE );
-                 } 
+                 }
            }
-         
+
          if (msg.message == WM_KEYDOWN) SetCursorPos( pt.x, pt.y );
          else
            {
-             RECT newRect = sizingRect;
+             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;
@@ -659,12 +626,13 @@ DefWndDoSizeMove(HWND hwnd, WORD wParam)
              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)
@@ -682,7 +650,7 @@ DefWndDoSizeMove(HWND hwnd, WORD wParam)
            }
        }
     }
-  
+
   ReleaseCapture();
   ClipCursor(NULL);
   if( iconic )
@@ -696,15 +664,21 @@ DefWndDoSizeMove(HWND hwnd, WORD wParam)
     }
   else if(!DragFullWindows)
       UserDrawMovingFrame( hdc, &sizingRect, thickframe );
-  
+
   if (Style & WS_CHILD)
     ReleaseDC( hWndParent, hdc );
   else
+  {
     ReleaseDC( 0, hdc );
-  
+    if(DesktopRgn)
+    {
+      DeleteObject(DesktopRgn);
+    }
+  }
+  NtUserSetGUIThreadHandle(MSQ_STATE_MOVESIZE, NULL);
   SendMessageA( hwnd, WM_EXITSIZEMOVE, 0, 0 );
   SendMessageA( hwnd, WM_SETVISIBLE, !IsIconic(hwnd), 0L);
-  
+
   /* window moved or resized */
   if (moved)
     {
@@ -726,43 +700,103 @@ DefWndDoSizeMove(HWND hwnd, WORD wParam)
                        origRect.right - origRect.left,
                        origRect.bottom - origRect.top,
                        ( hittest == HTCAPTION ) ? SWP_NOSIZE : 0 );
-      }      
+      }
     }
-  
+
   if( IsWindow(hwnd) )
     if( Style & WS_MINIMIZE )
       {
        /* Single click brings up the system menu when iconized */
-       
-       if( !moved ) 
+
+       if( !moved )
          {
-           if( Style & WS_SYSMENU ) 
+           if( Style & WS_SYSMENU )
              SendMessageA( hwnd, WM_SYSCOMMAND,
                            SC_MOUSEMENU + HTSYSMENU, MAKELONG(pt.x,pt.y));
          }
-       else WinPosShowIconTitle( hwnd, TRUE );
       }
 }
 
 
+/***********************************************************************
+ *           DefWndTrackScrollBar
+ *
+ * Track a mouse button press on the horizontal or vertical scroll-bar.
+ */
+STATIC VOID
+DefWndTrackScrollBar(HWND Wnd, WPARAM wParam, POINT Pt)
+{
+  INT ScrollBar;
+
+  if (SC_HSCROLL == (wParam & 0xfff0))
+    {
+      if (HTHSCROLL != (wParam & 0x0f))
+        {
+          return;
+        }
+      ScrollBar = SB_HORZ;
+    }
+  else  /* SC_VSCROLL */
+    {
+      if (HTVSCROLL != (wParam & 0x0f))
+        {
+          return;
+        }
+      ScrollBar = SB_VERT;
+    }
+  ScrollTrackScrollBar(Wnd, ScrollBar, Pt );
+}
+
+
 LRESULT
 DefWndHandleSysCommand(HWND hWnd, WPARAM wParam, POINT Pt)
 {
+  WINDOWPLACEMENT wp;
+
   switch (wParam & 0xfff0)
     {
       case SC_MOVE:
       case SC_SIZE:
        DefWndDoSizeMove(hWnd, wParam);
        break;
+      case SC_MINIMIZE:
+        wp.length = sizeof(WINDOWPLACEMENT);
+        if(GetWindowPlacement(hWnd, &wp))
+        {
+          wp.showCmd = SW_MINIMIZE;
+          SetWindowPlacement(hWnd, &wp);
+        }
+        break;
+      case SC_MAXIMIZE:
+        wp.length = sizeof(WINDOWPLACEMENT);
+        if(GetWindowPlacement(hWnd, &wp))
+        {
+          wp.showCmd = SW_MAXIMIZE;
+          SetWindowPlacement(hWnd, &wp);
+        }
+        break;
+      case SC_RESTORE:
+        wp.length = sizeof(WINDOWPLACEMENT);
+        if(GetWindowPlacement(hWnd, &wp))
+        {
+          wp.showCmd = SW_RESTORE;
+          SetWindowPlacement(hWnd, &wp);
+        }
+        break;
       case SC_CLOSE:
         SendMessageA(hWnd, WM_CLOSE, 0, 0);
         break;
       case SC_MOUSEMENU:
-        MenuTrackMouseMenuBar(hWnd, wParam, Pt);
+        MenuTrackMouseMenuBar(hWnd, wParam & 0x000f, Pt);
        break;
       case SC_KEYMENU:
         MenuTrackKbdMenuBar(hWnd, wParam, Pt.x);
        break;
+      case SC_VSCROLL:
+      case SC_HSCROLL:
+        DefWndTrackScrollBar(hWnd, wParam, Pt);
+       break;
+
       default:
        /* FIXME: Implement */
         UNIMPLEMENTED;
@@ -775,21 +809,26 @@ DefWndHandleSysCommand(HWND hWnd, WPARAM wParam, POINT Pt)
 LRESULT
 DefWndHandleWindowPosChanging(HWND hWnd, WINDOWPOS* Pos)
 {
-    POINT maxSize, minTrack;
+    POINT maxTrack, minTrack;
     LONG style = GetWindowLongA(hWnd, GWL_STYLE);
 
     if (Pos->flags & SWP_NOSIZE) return 0;
     if ((style & WS_THICKFRAME) || ((style & (WS_POPUP | WS_CHILD)) == 0))
     {
-        WinPosGetMinMaxInfo(hWnd, &maxSize, NULL, &minTrack, NULL);
-        Pos->cx = min(Pos->cx, maxSize.x);
-        Pos->cy = min(Pos->cy, maxSize.y);
+        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;
 }
 
@@ -834,7 +873,7 @@ DefWndHandleWindowPosChanged(HWND hWnd, WINDOWPOS* Pos)
  *
  * Default colors for control painting.
  */
-static HBRUSH
+HBRUSH
 DefWndControlColor(HDC hDC, UINT ctlType)
 {
   if (CTLCOLOR_SCROLLBAR == ctlType)
@@ -850,11 +889,19 @@ DefWndControlColor(HDC hDC, UINT ctlType)
        */
       if (bk == GetSysColor(COLOR_WINDOW))
        {
-#if 0 /* FIXME */
-         return CACHE_GetPattern55AABrush();
-#else
-         return NULL;
-#endif
+          static const WORD wPattern55AA[] =
+          {
+              0x5555, 0xaaaa, 0x5555, 0xaaaa,
+              0x5555, 0xaaaa, 0x5555, 0xaaaa
+          };
+          static HBITMAP hPattern55AABitmap = NULL;
+          static HBRUSH hPattern55AABrush = NULL;
+          if (hPattern55AABrush == NULL)
+            {
+              hPattern55AABitmap = CreateBitmap(8, 8, 1, 1, wPattern55AA);
+              hPattern55AABrush = CreatePatternBrush(hPattern55AABitmap);
+            }
+          return hPattern55AABrush;
        }
       UnrealizeObject(hb);
       return hb;
@@ -875,6 +922,11 @@ DefWndControlColor(HDC hDC, UINT ctlType)
   return GetSysColorBrush(COLOR_WINDOW);
 }
 
+VOID FASTCALL
+DefWndScreenshot(HWND hWnd)
+{
+
+}
 
 LRESULT STDCALL
 User32DefWindowProc(HWND hWnd,
@@ -887,7 +939,7 @@ User32DefWindowProc(HWND hWnd,
     {
        case WM_NCPAINT:
        {
-            return DefWndNCPaint(hWnd, (HRGN)wParam);
+            return DefWndNCPaint(hWnd, (HRGN)wParam, -1);
         }
 
         case WM_NCCALCSIZE:
@@ -903,8 +955,8 @@ User32DefWindowProc(HWND hWnd,
         case WM_NCHITTEST:
         {
             POINT Point;
-            Point.x = SLOWORD(lParam);
-            Point.y = SHIWORD(lParam);
+            Point.x = GET_X_LPARAM(lParam);
+            Point.y = GET_Y_LPARAM(lParam);
             return (DefWndNCHitTest(hWnd, Point));
         }
 
@@ -913,21 +965,11 @@ User32DefWindowProc(HWND hWnd,
             return (DefWndNCLButtonDown(hWnd, wParam, lParam));
         }
 
-        case WM_LBUTTONDBLCLK:
         case WM_NCLBUTTONDBLCLK:
         {
             return (DefWndNCLButtonDblClk(hWnd, wParam, lParam));
         }
 
-        case WM_NCRBUTTONDOWN:
-        {
-            if (wParam == HTCAPTION)
-            {
-                SetCapture(hWnd);
-            }
-            break;
-        }
-
         case WM_WINDOWPOSCHANGING:
         {
             return (DefWndHandleWindowPosChanging(hWnd, (WINDOWPOS*)lParam));
@@ -945,8 +987,8 @@ User32DefWindowProc(HWND hWnd,
             {
                 ReleaseCapture();
             }
-            Pt.x = SLOWORD(lParam);
-            Pt.y = SHIWORD(lParam);
+            Pt.x = GET_X_LPARAM(lParam);
+            Pt.y = GET_Y_LPARAM(lParam);
             ClientToScreen(hWnd, &Pt);
             lParam = MAKELPARAM(Pt.x, Pt.y);
             if (bUnicode)
@@ -975,12 +1017,15 @@ User32DefWindowProc(HWND hWnd,
             }
             else
             {
-                LONG HitCode;
                 POINT Pt;
+                DWORD Style;
+                LONG HitCode;
 
-                Pt.x = SLOWORD(lParam);
-                Pt.y = SHIWORD(lParam);
-                if (GetWindowLongW(hWnd, GWL_STYLE) & WS_CHILD)
+                Style = GetWindowLongW(hWnd, GWL_STYLE);
+
+                Pt.x = GET_X_LPARAM(lParam);
+                Pt.y = GET_Y_LPARAM(lParam);
+                if (Style & WS_CHILD)
                 {
                     ScreenToClient(GetParent(hWnd), &Pt);
                 }
@@ -989,9 +1034,22 @@ User32DefWindowProc(HWND hWnd,
 
                 if (HitCode == HTCAPTION || HitCode == HTSYSMENU)
                 {
-                    TrackPopupMenu(GetSystemMenu(hWnd, FALSE),
-                                   TPM_LEFTBUTTON | TPM_RIGHTBUTTON,
-                                   Pt.x, Pt.y, 0, hWnd, NULL);
+                    HMENU SystemMenu;
+                    UINT Flags;
+
+                    if((SystemMenu = GetSystemMenu(hWnd, FALSE)))
+                    {
+                      MenuInitSysMenuPopup(SystemMenu, GetWindowLongW(hWnd, GWL_STYLE),
+                                           GetClassLongW(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;
@@ -1009,7 +1067,7 @@ User32DefWindowProc(HWND hWnd,
             PAINTSTRUCT Ps;
             HDC hDC = BeginPaint(hWnd, &Ps);
             if (hDC)
-            {          
+            {
                 HICON hIcon;
                 if (GetWindowLongW(hWnd, GWL_STYLE) & WS_MINIMIZE &&
                     (hIcon = (HICON)GetClassLongW(hWnd, GCL_HICON)) != NULL)
@@ -1022,7 +1080,7 @@ User32DefWindowProc(HWND hWnd,
                     y = (ClientRect.bottom - ClientRect.top -
                          GetSystemMetrics(SM_CYICON)) / 2;
                     DrawIcon(hDC, x, y, hIcon);
-                } 
+                }
                 EndPaint(hWnd, &Ps);
             }
             return (0);
@@ -1080,7 +1138,7 @@ User32DefWindowProc(HWND hWnd,
         case WM_ACTIVATE:
         {
             /* Check if the window is minimized. */
-            if (LOWORD(lParam) != WA_INACTIVE &&
+            if (LOWORD(wParam) != WA_INACTIVE &&
                 !(GetWindowLongW(hWnd, GWL_STYLE) & WS_MINIMIZE))
             {
                 SetFocus(hWnd);
@@ -1141,7 +1199,9 @@ User32DefWindowProc(HWND hWnd,
 
         case WM_SETCURSOR:
         {
-            if (GetWindowLongW(hWnd, GWL_STYLE) & WS_CHILD)
+            ULONG Style = GetWindowLongW(hWnd, GWL_STYLE);
+
+            if (Style & WS_CHILD)
             {
                 if (LOWORD(lParam) < HTLEFT || LOWORD(lParam) > HTBOTTOMRIGHT)
                 {
@@ -1162,14 +1222,14 @@ User32DefWindowProc(HWND hWnd,
                     }
                 }
             }
-            return (DefWndHandleSetCursor(hWnd, wParam, lParam));
+            return (DefWndHandleSetCursor(hWnd, wParam, lParam, Style));
         }
 
         case WM_SYSCOMMAND:
         {
             POINT Pt;
-            Pt.x = SLOWORD(lParam);
-            Pt.y = SHIWORD(lParam);
+            Pt.x = GET_X_LPARAM(lParam);
+            Pt.y = GET_Y_LPARAM(lParam);
             return (DefWndHandleSysCommand(hWnd, wParam, Pt));
         }
 
@@ -1196,11 +1256,15 @@ User32DefWindowProc(HWND hWnd,
                         else
                             PostMessageA(top, WM_SYSCOMMAND, SC_CLOSE, 0);
                     }
-                   }
+                }
+                else if (wParam == VK_SNAPSHOT)
+                {
+                    DefWndScreenshot(hWnd);
+                }
             }
             break;
         }
-        
+
         case WM_SHOWWINDOW:
         {
             LONG Style;
@@ -1208,14 +1272,15 @@ User32DefWindowProc(HWND hWnd,
             if (!lParam)
                 return 0;
             Style = GetWindowLongW(hWnd, GWL_STYLE);
-            if (!(Style & WS_POPUP))
-                return 0;
+//            if (!(Style & WS_POPUP))
+//                return 0;
             if ((Style & WS_VISIBLE) && wParam)
                 return 0;
             if (!(Style & WS_VISIBLE) && !wParam)
                 return 0;
             if (!GetWindow(hWnd, GW_OWNER))
                 return 0;
+            NtUserCallTwoParam((DWORD) hWnd, (DWORD) wParam, TWOPARAM_ROUTINE_ROS_SHOWWINDOW);
             ShowWindow(hWnd, wParam ? SW_SHOWNA : SW_HIDE);
             break;
         }
@@ -1233,11 +1298,11 @@ User32DefWindowProc(HWND hWnd,
         case WM_VKEYTOITEM:
         case WM_CHARTOITEM:
             return (-1);
-
+/*
         case WM_DROPOBJECT:
-            /* FIXME: Implement this. */
-            break;
 
+            break;
+*/
         case WM_QUERYDROPOBJECT:
         {
             if (GetWindowLongW(hWnd, GWL_EXSTYLE) & WS_EX_ACCEPTFILES)
@@ -1294,7 +1359,7 @@ User32DefWindowProc(HWND hWnd,
 
         case WM_GETICON:
         {
-            INT Index = (wParam != 0) ? GCL_HICON : GCL_HICONSM;
+            INT Index = (wParam == ICON_BIG) ? GCL_HICON : GCL_HICONSM;
             return (GetClassLongW(hWnd, Index));
         }
 
@@ -1310,7 +1375,7 @@ User32DefWindowProc(HWND hWnd,
             }
             break;
         }
-        
+
         case WM_SYSTIMER:
         {
           THRDCARETINFO CaretInfo;
@@ -1318,7 +1383,7 @@ User32DefWindowProc(HWND hWnd,
           {
             case 0xffff: /* Caret timer */
               /* switch showing byte in win32k and get information about the caret */
-              if(NtUserCallOneParam((DWORD)&CaretInfo, ONEPARAM_ROUTINE_SWITCHCARETSHOWING) && (CaretInfo.hWnd == hWnd))
+              if(NtUserSwitchCaretShowing(&CaretInfo) && (CaretInfo.hWnd == hWnd))
               {
                 DrawCaret(hWnd, &CaretInfo);
               }
@@ -1343,75 +1408,64 @@ DefWindowProcA(HWND hWnd,
               WPARAM wParam,
               LPARAM lParam)
 {
-    static LPSTR WindowTextAtom = 0;
-    PSTR WindowText;
-
     switch (Msg)
     {
         case WM_NCCREATE:
         {
-            CREATESTRUCTA *Cs = (CREATESTRUCTA*)lParam;
-            if (HIWORD(Cs->lpszName))
-            {
-                if (0 == WindowTextAtom)
-                {
-                    WindowTextAtom =
-                        (LPSTR)(ULONG)GlobalAddAtomA("USER32!WindowTextAtomA");
-                }
-                WindowText = RtlAllocateHeap(RtlGetProcessHeap(), 0,
-                    (strlen(Cs->lpszName) + 1) * sizeof(CHAR));
-                strcpy(WindowText, Cs->lpszName);
-                SetPropA(hWnd, WindowTextAtom, WindowText);
-               }
-            return (1);
+            return TRUE;
         }
 
         case WM_GETTEXTLENGTH:
         {
-            if (WindowTextAtom == 0 ||
-                (WindowText = GetPropA(hWnd, WindowTextAtom)) == NULL)
-            {
-                return(0);
-            }
-            return (strlen(WindowText));
+            return (LRESULT)NtUserInternalGetWindowText(hWnd, NULL, 0);
         }
 
         case WM_GETTEXT:
         {
-            if (WindowTextAtom == 0 ||
-                (WindowText = GetPropA(hWnd, WindowTextAtom)) == NULL)
+            LPWSTR Buffer;
+            LPSTR AnsiBuffer = (LPSTR)lParam;
+            INT Length;
+
+            if (wParam > 1)
             {
-                if (wParam > 1)
-                   {
-                    *((PSTR)lParam) = '\0';
-                }
-                return (0);
+                *((PWSTR)lParam) = '\0';
             }
-            strncpy((LPSTR)lParam, WindowText, wParam);
-            return (min(wParam, strlen(WindowText)));
+            Buffer = HeapAlloc(GetProcessHeap(), 0, wParam * sizeof(WCHAR));
+            if (!Buffer)
+                return FALSE;
+            Length = NtUserInternalGetWindowText(hWnd, Buffer, wParam);
+            if (Length > 0 && wParam > 0 &&
+                !WideCharToMultiByte(CP_ACP, 0, Buffer, -1,
+                AnsiBuffer, wParam, NULL, NULL))
+            {
+                AnsiBuffer[0] = '\0';
+            }
+
+            HeapFree(GetProcessHeap(), 0, Buffer);
+
+            return (LRESULT)Length;
         }
 
         case WM_SETTEXT:
         {
-            if (0 == WindowTextAtom)
+            ANSI_STRING AnsiString;
+            UNICODE_STRING UnicodeString;
+
+            if(lParam)
             {
-                WindowTextAtom =
-                    (LPSTR)(DWORD)GlobalAddAtomA("USER32!WindowTextAtomA");
-               }
-            if (WindowTextAtom != 0 &&
-                (WindowText = GetPropA(hWnd, WindowTextAtom)) == NULL)
-               {
-                RtlFreeHeap(RtlGetProcessHeap(), 0, WindowText);
+              RtlInitAnsiString(&AnsiString, (LPSTR)lParam);
+              RtlAnsiStringToUnicodeString(&UnicodeString, &AnsiString, TRUE);
+              NtUserDefSetText(hWnd, &UnicodeString);
+              RtlFreeUnicodeString(&UnicodeString);
             }
-            WindowText = RtlAllocateHeap(RtlGetProcessHeap(), 0,
-                (strlen((PSTR)lParam) + 1) * sizeof(CHAR));
-            strcpy(WindowText, (PSTR)lParam);
-            SetPropA(hWnd, WindowTextAtom, WindowText);
+            else
+              NtUserDefSetText(hWnd, NULL);
+
             if ((GetWindowLongW(hWnd, GWL_STYLE) & WS_CAPTION) == WS_CAPTION)
             {
-                DefWndNCPaint(hWnd, (HRGN)1);
+                DefWndNCPaint(hWnd, (HRGN)1, -1);
             }
-            return (1);
+            return TRUE;
         }
 
 /*
@@ -1425,16 +1479,6 @@ DefWindowProcA(HWND hWnd,
         case WM_IME_SELECT:
         case WM_IME_SETCONTEXT:
 */
-
-        case WM_NCDESTROY:
-        {
-            if (WindowTextAtom != 0 &&
-                (WindowText = RemovePropA(hWnd, WindowTextAtom)) == NULL)
-            {
-                RtlFreeHeap(GetProcessHeap(), 0, WindowText);
-            }
-            return(0);
-        }
     }
 
     return User32DefWindowProc(hWnd, Msg, wParam, lParam, FALSE);
@@ -1447,73 +1491,39 @@ DefWindowProcW(HWND hWnd,
               WPARAM wParam,
               LPARAM lParam)
 {
-    static LPWSTR WindowTextAtom = 0;
-    PWSTR WindowText;
-
     switch (Msg)
     {
         case WM_NCCREATE:
         {
-            CREATESTRUCTW* CreateStruct = (CREATESTRUCTW*)lParam;
-            if (HIWORD(CreateStruct->lpszName))
-            {
-                if (0 == WindowTextAtom)
-                {
-                    WindowTextAtom =
-                        (LPWSTR)(DWORD)GlobalAddAtomW(L"USER32!WindowTextAtomW");
-                }
-                WindowText = RtlAllocateHeap(RtlGetProcessHeap(), 0,
-                               (wcslen(CreateStruct->lpszName) + 1) * sizeof(WCHAR));
-                wcscpy(WindowText, CreateStruct->lpszName);
-                SetPropW(hWnd, WindowTextAtom, WindowText);
-            }
-            return (1);
+            return TRUE;
         }
 
         case WM_GETTEXTLENGTH:
         {
-            if (WindowTextAtom == 0 ||
-                (WindowText = GetPropW(hWnd, WindowTextAtom)) == NULL)
-            {
-                return(0);
-            }
-            return (wcslen(WindowText));
+            return (LRESULT)NtUserInternalGetWindowText(hWnd, NULL, 0);
         }
 
         case WM_GETTEXT:
         {
-            if (WindowTextAtom == 0 ||
-                (WindowText = GetPropW(hWnd, WindowTextAtom)) == NULL)
+            if (wParam > 1)
             {
-               if (wParam > 1)
-               {
-                   ((PWSTR)lParam) = '\0';
-               }
-               return (0);
+                *((PWSTR)lParam) = L'\0';
             }
-            wcsncpy((PWSTR)lParam, WindowText, wParam);
-            return (min(wParam, wcslen(WindowText)));
+            return (LRESULT)NtUserInternalGetWindowText(hWnd, (PWSTR)lParam, wParam);
         }
 
         case WM_SETTEXT:
         {
-            if (WindowTextAtom == 0)
-            {
-                WindowTextAtom =
-                    (LPWSTR)(DWORD)GlobalAddAtomW(L"USER32!WindowTextAtomW");
-            }
-            if (WindowTextAtom != 0 &&
-                (WindowText = GetPropW(hWnd, WindowTextAtom)) == NULL)
-            {
-                RtlFreeHeap(RtlGetProcessHeap(), 0, WindowText);
-            }
-            WindowText = RtlAllocateHeap(RtlGetProcessHeap(), 0,
-                           (wcslen((PWSTR)lParam) + 1) * sizeof(WCHAR));
-            wcscpy(WindowText, (PWSTR)lParam);
-            SetPropW(hWnd, WindowTextAtom, WindowText);
+            UNICODE_STRING UnicodeString;
+
+            if(lParam)
+              RtlInitUnicodeString(&UnicodeString, (LPWSTR)lParam);
+
+            NtUserDefSetText(hWnd, (lParam ? &UnicodeString : NULL));
+
             if ((GetWindowLongW(hWnd, GWL_STYLE) & WS_CAPTION) == WS_CAPTION)
             {
-                DefWndNCPaint(hWnd, (HRGN)1);
+                DefWndNCPaint(hWnd, (HRGN)1, -1);
             }
             return (1);
         }
@@ -1529,16 +1539,6 @@ DefWindowProcW(HWND hWnd,
             /* FIXME */
             return (0);
         }
-
-        case WM_NCDESTROY:
-        {
-            if (WindowTextAtom != 0 &&
-                (WindowText = RemovePropW(hWnd, WindowTextAtom)) == NULL)
-            {
-                RtlFreeHeap(RtlGetProcessHeap(), 0, WindowText);
-            }
-            return (0);
-        }
     }
 
     return User32DefWindowProc(hWnd, Msg, wParam, lParam, TRUE);