The system menu icon on a MDI child window was corrupted when the

windows/mdi.c

@@ -808,6 +808,7 @@ static BOOL MDI_AugmentFrameMenu( MDICLIENTINFO* ci, WND *frame,
 {
     WND*	child = WIN_FindWndPtr(hChild);
     HMENU  	hSysPopup = 0;
+  HBITMAP hSysMenuBitmap = 0;
 
     TRACE(mdi,"frame %p,child %04x\n",frame,hChild);
 
@@ -831,8 +832,44 @@ static BOOL MDI_AugmentFrameMenu( MDICLIENTINFO* ci, WND *frame,
     AppendMenuA(frame->wIDmenu,MF_HELP | MF_BITMAP,
                    SC_RESTORE, (LPSTR)(DWORD)HBMMENU_MBAR_RESTORE );
 
+  /* In Win 95 look, the system menu is replaced by the child icon */
+
+  if(TWEAK_WineLook > WIN31_LOOK)
+  {
+    HICON hIcon = GetClassLongA(hChild, GCL_HICONSM);
+    if (!hIcon)
+      hIcon = GetClassLongA(hChild, GCL_HICON);
+    if (hIcon)
+    {
+      HDC hMemDC;
+      HBITMAP hBitmap, hOldBitmap;
+      HBRUSH hBrush;
+      HDC hdc = GetDC(hChild);
+
+      if (hdc)
+      {
+        int cx, cy;
+        cx = GetSystemMetrics(SM_CXSMICON);
+        cy = GetSystemMetrics(SM_CYSMICON);
+        hMemDC = CreateCompatibleDC(hdc);
+        hBitmap = CreateCompatibleBitmap(hdc, cx, cy);
+        hOldBitmap = SelectObject(hMemDC, hBitmap);
+        SetMapMode(hMemDC, MM_TEXT);
+        hBrush = CreateSolidBrush(GetSysColor(COLOR_MENU));
+        DrawIconEx(hMemDC, 0, 0, hIcon, cx, cy, 0, hBrush, DI_NORMAL);
+        SelectObject (hMemDC, hOldBitmap);
+        DeleteObject(hBrush);
+        DeleteDC(hMemDC);
+        ReleaseDC(hChild, hdc);
+        hSysMenuBitmap = hBitmap;
+      }
+    }
+  }
+  else
+    hSysMenuBitmap = hBmpClose;
+
     if( !InsertMenuA(frame->wIDmenu,0,MF_BYPOSITION | MF_BITMAP | MF_POPUP,
-                    hSysPopup, (LPSTR)(DWORD)hBmpClose ))
+                    hSysPopup, (LPSTR)(DWORD)hSysMenuBitmap))
     {  
         TRACE(mdi,"not inserted\n");
 	DestroyMenu(hSysPopup); 

windows/sysmetrics.c

@@ -117,8 +117,7 @@ void SYSMETRICS_Init(void)
     sysMetrics[SM_CYEDGE] = sysMetrics[SM_CXEDGE];
     sysMetrics[SM_CXMINSPACING] = 160;
     sysMetrics[SM_CYMINSPACING] = 24;
-    sysMetrics[SM_CXSMICON] =
-	sysMetrics[SM_CYSIZE] - (sysMetrics[SM_CYSIZE] % 2) - 2;
+    sysMetrics[SM_CXSMICON] = sysMetrics[SM_CYSIZE] - (sysMetrics[SM_CYSIZE] % 2);
     sysMetrics[SM_CYSMICON] = sysMetrics[SM_CXSMICON];
     sysMetrics[SM_CYSMCAPTION] = 16;
     sysMetrics[SM_CXSMSIZE] = 15;