[User32]

- Patch by Piotr Caban : Make it possible to activate a window with parent and no WS_CHILD flag in WS_NCLBUTTONDOWN function.
- Sync port from wine with modifications and addons.

svn path=/trunk/; revision=62610

reactos/win32ss/user/user32/windows/nonclient.c

@@ -980,11 +980,22 @@ DefWndDoButton(HWND hWnd, WPARAM wParam)
 LRESULT
 DefWndNCLButtonDown(HWND hWnd, WPARAM wParam, LPARAM lParam)
 {
+    PWND Wnd = ValidateHwnd(hWnd);
+
     switch (wParam)
     {
         case HTCAPTION:
         {
-	        HWND hTopWnd = GetAncestor(hWnd, GA_ROOT);
+            HWND hTopWnd = hWnd, parent;
+            while(1)
+            {
+                if ((GetWindowLongW( hTopWnd, GWL_STYLE ) & (WS_POPUP|WS_CHILD)) != WS_CHILD)
+                    break;
+                parent = GetAncestor( hTopWnd, GA_PARENT );
+                if (!parent || parent == GetDesktopWindow()) break;
+                hTopWnd = parent;
+            }
+
             if ( NtUserCallHwndLock(hTopWnd, HWNDLOCK_ROUTINE_SETFOREGROUNDWINDOWMOUSE) ||
                  GetActiveWindow() == hTopWnd)
             {
@@ -997,8 +1008,15 @@ DefWndNCLButtonDown(HWND hWnd, WPARAM wParam, LPARAM lParam)
           LONG style = GetWindowLongPtrW( hWnd, GWL_STYLE );
           if (style & WS_SYSMENU)
           {
-	      SendMessageW(hWnd, WM_SYSCOMMAND, SC_MOUSEMENU + HTSYSMENU,
+              if( Wnd && !(style & WS_MINIMIZE) )
-			   lParam);
+              {
+                RECT rect;
+                HDC hDC = GetWindowDC(hWnd);
+                UserGetInsideRectNC(Wnd, &rect);
+                UserDrawSysMenuButton(hWnd, hDC, &rect, TRUE);
+                ReleaseDC( hWnd, hDC );
+              }
+	      SendMessageW(hWnd, WM_SYSCOMMAND, SC_MOUSEMENU + HTSYSMENU, lParam);
 	  }
 	  break;
         }
@@ -1070,7 +1088,14 @@ DefWndNCLButtonDblClk(HWND hWnd, WPARAM wParam, LPARAM lParam)
     }
     case HTSYSMENU:
     {
-      SendMessageW(hWnd, WM_SYSCOMMAND, SC_CLOSE, 0);
+      HMENU hSysMenu = GetSystemMenu(hWnd, FALSE);
+      UINT state = GetMenuState(hSysMenu, SC_CLOSE, MF_BYCOMMAND);
+                  
+      /* If the close item of the sysmenu is disabled or not present do nothing */
+      if ((state & (MF_DISABLED | MF_GRAYED)) || (state == 0xFFFFFFFF))
+          break;
+
+      SendMessageW(hWnd, WM_SYSCOMMAND, SC_CLOSE, lParam);
       break;
     }
     default: