- Fixed the WM_SYSCOMMAND with SC_SIZE messages to have correct codes in wParam.
authorFilip Navara <filip.navara@gmail.com>
Wed, 12 May 2004 20:34:38 +0000 (20:34 +0000)
committerFilip Navara <filip.navara@gmail.com>
Wed, 12 May 2004 20:34:38 +0000 (20:34 +0000)
svn path=/trunk/; revision=9359

reactos/lib/user32/windows/defwnd.c
reactos/lib/user32/windows/nonclient.c

index 9a19459..0a7295a 100644 (file)
@@ -1,4 +1,4 @@
-/* $Id: defwnd.c,v 1.135 2004/05/01 11:43:52 weiden Exp $
+/* $Id: defwnd.c,v 1.136 2004/05/12 20:34:38 navaraf Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS user32.dll
@@ -539,9 +539,9 @@ DefWndDoSizeMove(HWND hwnd, WORD wParam)
        {
          return;
        }
-      if (hittest && hittest != HTSYSMENU) 
+      if (hittest && ((wParam & 0xfff0) != SC_MOUSEMENU))
        {
-         hittest += 2;
+          hittest += (HTLEFT - WMSZ_LEFT);
        }
       else
        {
@@ -575,7 +575,7 @@ DefWndDoSizeMove(HWND hwnd, WORD wParam)
     {
       SetRect(&mouseRect, 0, 0, GetSystemMetrics(SM_CXSCREEN), 
              GetSystemMetrics(SM_CYSCREEN));
-      SystemParametersInfoW(SPI_GETWORKAREA, 0, &clipRect, 0);
+      clipRect = mouseRect;
     }
   ClipCursor(&clipRect);
   
index 060a7c7..0ae8dbe 100644 (file)
@@ -1012,17 +1012,7 @@ DefWndNCLButtonDown(HWND hWnd, WPARAM wParam, LPARAM lParam)
         case HTBOTTOMLEFT:
         case HTBOTTOMRIGHT:
         {
-            HWND Parent;
-            
-            if(wParam == HTBOTTOMRIGHT && (Parent = GetParent(hWnd)) &&
-               (GetWindowLongW(hWnd, GWL_STYLE) & WS_CHILD) && 
-               !(GetWindowLongW(hWnd, GWL_EXSTYLE) & WS_EX_MDICHILD) && 
-               !(GetWindowLongW(Parent, GWL_STYLE) & WS_MAXIMIZE))
-            {
-              SendMessageW(Parent, WM_SYSCOMMAND, SC_SIZE + wParam - 2, lParam);
-              break;
-            }
-            SendMessageW(hWnd, WM_SYSCOMMAND, SC_SIZE + wParam - 2, lParam);
+            SendMessageW(hWnd, WM_SYSCOMMAND, SC_SIZE + wParam - (HTLEFT - WMSZ_LEFT), lParam);
             break;
         }
     }