Dmitry Timoshkov : user32: Restore erroneously removed chunk of code.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: cecd205f13d0576c39ed6f60aac01d4c942daaae
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=cecd205f13d0576c39ed6f60aa...

Author: Dmitry Timoshkov <dmitry(a)codeweavers.com>
Date:   Fri Mar 16 00:41:01 2007 +0800

user32: Restore erroneously removed chunk of code.

---

 dlls/user32/mdi.c |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c
index de43ae3..8da2060 100644
--- a/dlls/user32/mdi.c
+++ b/dlls/user32/mdi.c
@@ -910,11 +910,19 @@ static BOOL MDI_RestoreFrameMenu( HWND frame, HWND hChild )
 {
     MENUITEMINFOW menuInfo;
     HMENU menu = GetMenu( frame );
+    INT nItems;
+    UINT iId;
 
     TRACE("frame %p, child %p\n", frame, hChild);
 
     if( !menu ) return 0;
 
+    /* if there is no system buttons then nothing to do */
+    nItems = GetMenuItemCount(menu) - 1;
+    iId = GetMenuItemID(menu, nItems);
+    if ( !(iId == SC_RESTORE || iId == SC_CLOSE) )
+        return 0;
+
     /*
      * Remove the system menu, If that menu is the icon of the window
      * as it is in win95, we have to delete the bitmap.
@@ -1531,7 +1539,7 @@ LRESULT WINAPI DefMDIChildProcW( HWND hwnd, UINT message,
 
             frame = GetParent(client);
             MDI_RestoreFrameMenu( frame, hwnd );
-            MDI_UpdateFrameText( frame, client, FALSE, NULL );
+            MDI_UpdateFrameText( frame, client, TRUE, NULL );
         }
 
         if( wParam == SIZE_MAXIMIZED )