Changeset 3584 for trunk/src

Timestamp:

May 22, 2000, 7:21:11 PM (25 years ago)

Author:

cbratschi

Message:

merged controls with Corel WINE 20000513, maximize/minimize fix

Location:

trunk/src/user32

Files:

• button.cpp (modified) (4 diffs)
• combo.cpp (modified) (30 diffs)
• edit.cpp (modified) (11 diffs)
• listbox.cpp (modified) (20 diffs)
• menu.cpp (modified) (14 diffs)
• pmframe.cpp (modified) (7 diffs)
• win32wbase.cpp (modified) (22 diffs)

trunk/src/user32/button.cpp

@@ -1 @@
-/* $Id: button.cpp,v 1.34 2000-03-18 16:13:25 cbratschi Exp $ */
+/* $Id: button.cpp,v 1.35 2000-05-22 17:21:06 cbratschi Exp $ */
 /* File: button.cpp -- Button type widgets
  *
@@ -7 +7 @@
  * Copyright (c) 1999 Christoph Bratschi
  *
- * Corel version: 20000317
+ * Corel version: 20000513
  * (WINE version: 20000130)
  *
@@ -924 +924 @@
     DWORD dwStyle = GetWindowLongA(hwnd,GWL_STYLE);
     RECT rbox, rtext, client;
-    HBRUSH hBrush;
+    HBRUSH hBrush, hOldBrush;
+    HPEN hPen, hOldPen;
+    COLORREF colour;
     int textLen, delta;
     char* text = NULL;
@@ -960 +962 @@
 
     hBrush = GetSysColorBrush(COLOR_BTNFACE);
+
+    /* In order to make things right, draw the rectangle background! */
+    if ( !(infoPtr->state & BUTTON_HASFOCUS) && (action == ODA_DRAWENTIRE) )
+    {
+        colour = GetBkColor(hDC);
+        hPen = CreatePen( PS_SOLID, 1, colour );
+        if ( hPen )
+        {
+            hOldBrush = SelectObject( hDC, hBrush );
+            hOldPen = SelectObject( hDC, hPen );
+            Rectangle( hDC, client.left, client.top, client.right, client.bottom );
+            SelectObject( hDC, hOldPen );
+            SelectObject( hDC, hOldBrush );
+            DeleteObject( hPen );
+        }
+    }
 
     if (dwStyle & BS_LEFTTEXT)

trunk/src/user32/combo.cpp

@@ -1 @@
-/* $Id: combo.cpp,v 1.30 2000-03-28 17:13:46 sandervl Exp $ */
+/* $Id: combo.cpp,v 1.31 2000-05-22 17:21:07 cbratschi Exp $ */
 /*
  * Combo controls
@@ -8 +8 @@
  * FIXME: roll up in Netscape 3.01.
  *
- * Corel version: 20000317
+ * Corel version: 20000513
  * (WINE version: 991212)
  *
@@ -419 +419 @@
     if (posChanging->cy != newComboHeight)
     {
-      lphc->droppedRect.bottom = lphc->droppedRect.top + posChanging->cy - newComboHeight;
-
+      if (posChanging->cy > newComboHeight)
+         lphc->droppedRect.bottom = lphc->droppedRect.top + posChanging->cy - newComboHeight;
       posChanging->cy = newComboHeight;
     }
@@ -495 +495 @@
       /* create listbox popup */
 
-      lbeStyle = (LBS_NOTIFY | WS_BORDER | WS_CLIPSIBLINGS) |
+      lbeStyle = (LBS_NOTIFY | WS_BORDER | WS_CLIPSIBLINGS | WS_CHILD) |
                  (lpcs->style & (WS_VSCROLL | CBS_OWNERDRAWFIXED | CBS_OWNERDRAWVARIABLE));
 
@@ -509 +509 @@
       if( CB_GETTYPE(lphc) == CBS_SIMPLE )      /* child listbox */
       {
-        lbeStyle |= WS_CHILD | WS_VISIBLE;
+        lbeStyle |= WS_VISIBLE;
 
         /*
@@ -518 +518 @@
         lbeExStyle |= WS_EX_CLIENTEDGE;
       }
-      else                                      /* popup listbox */
-      {
-        lbeStyle |= WS_POPUP;
-        lbeStyle |= WS_EX_TOOLWINDOW;
-      }
-
-     /* Dropdown ComboLBox is not a child window and we cannot pass
-      * ID_CB_LISTBOX directly because it will be treated as a menu handle.
-      */
+
       lphc->hWndLBox = CreateWindowExA(lbeExStyle,
                                        clbName,
@@ -536 +528 @@
                                        lphc->droppedRect.bottom - lphc->droppedRect.top,
                                        lphc->hwndself,
-                                       (lphc->dwStyle & CBS_DROPDOWN)? (HMENU)0 : (HMENU)ID_CB_LISTBOX,
+                                       (HMENU)ID_CB_LISTBOX,
                                        GetWindowLongA(lphc->hwndself,GWL_HINSTANCE),
                                        (LPVOID)lphc );
-
-      /*
-       * The ComboLBox is a strange little beast (when it's not a CBS_SIMPLE)...
-       * It's a popup window but, when you get the window style, you get WS_CHILD.
-       * When created, it's parent is the combobox but, when you ask for it's parent
-       * after that, you're supposed to get the desktop. (see MFC code function
-       * AfxCancelModes)
-       * To achieve this in Wine, we have to create it as a popup and change
-       * it's style to child after the creation.
-       */
-      if ( (lphc->hWndLBox!= 0) &&
-           (CB_GETTYPE(lphc) != CBS_SIMPLE) )
-      {
-        /*  Not using SetWindowLongA here because it doesn't allow us to
-         *  change the WS_CHILD style. This code should be equivalent (excluding
-         *  the change in owner) to:
-         *       SetWindowLongA(lphc->hWndLBox, GWL_STYLE,
-         *      (GetWindowLongA(lphc->hWndLBox,GWL_STYLE) | WS_CHILD) & ~WS_POPUP);
-         */
-        STYLESTRUCT style;
-        Win32BaseWindow *win32wnd = Win32BaseWindow::GetWindowFromHandle(lphc->hWndLBox);
-
-        if (!win32wnd)
-        {
-          /* Is this the right error? */
-          SetLastError( ERROR_INVALID_WINDOW_HANDLE );
-          return 0;
-        }
-
-        /* save old style, set new style */
-        style.styleOld = win32wnd->getStyle();
-        style.styleNew = (style.styleOld | WS_CHILD) & ~WS_POPUP;
-
-        SendMessageA(lphc->hWndLBox,WM_STYLECHANGING,GWL_STYLE,(LPARAM)&style);
-#if 0 //CB: our code doesn't work with this style change
-        win32wnd->setStyle(style.styleNew);
-#endif
-        SendMessageA(lphc->hWndLBox,WM_STYLECHANGED,GWL_STYLE,(LPARAM)&style);
-
-        /* Set owner to NULL - it seems to be what Windows does to a ComboLBox
-         * after creation.
-         */
-        win32wnd->setOwner(NULL);
-      }
 
       if( lphc->hWndLBox )
       {
           BOOL  bEdit = TRUE;
-          lbeStyle = WS_CHILD | WS_VISIBLE | ES_NOHIDESEL | ES_LEFT;
+          lbeStyle = WS_CHILD | WS_VISIBLE | ES_NOHIDESEL | ES_LEFT | ES_COMBO;
 
           /*
@@ -622 +570 @@
           if( bEdit )
           {
-            /*
-             * If the combo is a dropdown, we must resize the control to fit only
-             * the text area and button. To do this, we send a dummy resize and the
-             * WM_WINDOWPOSCHANGING message will take care of setting the height for
-             * us.
-             */
-            if( CB_GETTYPE(lphc) != CBS_SIMPLE )
-            {
+            if( CB_GETTYPE(lphc) != CBS_SIMPLE )
+            {
+              /* Now do the trick with parent */
+              SetParent(lphc->hWndLBox, HWND_DESKTOP);
+
+              /*
+               * If the combo is a dropdown, we must resize the control to fit only
+               * the text area and button. To do this, we send a dummy resize and the
+               * WM_WINDOWPOSCHANGING message will take care of setting the height for
+               * us.
+               */
+
               CBForceDummyResize(lphc);
             }
@@ -918 +870 @@
 static LRESULT COMBO_GetDlgCode(HWND hwnd,WPARAM wParam,LPARAM lParam)
 {
-  return DLGC_WANTARROWS | DLGC_WANTCHARS;
+  LPHEADCOMBO lphc = (LPHEADCOMBO)GetInfoPtr(hwnd);
+  LRESULT result = DLGC_WANTARROWS | DLGC_WANTCHARS;
+
+  if (lParam && (((LPMSG)lParam)->message == WM_KEYDOWN))
+  {
+    int vk = (int)((LPMSG)lParam)->wParam;
+
+    if ((vk == VK_RETURN || vk == VK_ESCAPE) && (lphc->wState & CBF_DROPPED))
+      result |= DLGC_WANTMESSAGE;
+  }
+  return  result;
 }
 
@@ -985 +947 @@
  * Select listbox entry according to the contents of the edit control.
  */
-static INT CBUpdateLBox( LPHEADCOMBO lphc )
+static INT CBUpdateLBox( LPHEADCOMBO lphc, BOOL bSelect )
 {
    INT  length, idx;
@@ -1007 +969 @@
    }
 
-   if( idx >= 0 )
-   {
-       /* the LB_SETCARETINDEX message should scroll the list box if required
-          and sending LB_SETTOPINDEX can generate annoying behaviors  */
-       /* probably superfluous but Windows sends this too */
-       SendMessageA( lphc->hWndLBox, LB_SETCARETINDEX, (WPARAM)idx, 0 );
-   }
+   SendMessageA( lphc->hWndLBox, LB_SETCURSEL, (WPARAM)(bSelect ? idx : -1), 0 );
+
+   /* the LB_SETCARETINDEX message should scroll the list box if required
+      and sending LB_SETTOPINDEX can generate annoying behaviors  */
+   /* probably superfluous but Windows sends this too */
+   SendMessageA( lphc->hWndLBox, LB_SETCARETINDEX, (WPARAM)(idx < 0 ? 0 : idx), 0 );
+   SendMessageA( lphc->hWndLBox, LB_SETTOPINDEX, (WPARAM)(idx < 0 ? 0 : idx), 0 );
+
    return idx;
 }
@@ -1045 +1008 @@
 
    SendMessageA( lphc->hWndEdit, WM_SETTEXT, 0, pText ? (LPARAM)pText : (LPARAM)"" );
+
+   lphc->wState &= ~CBF_NOEDITNOTIFY;
+
    if( lphc->wState & CBF_FOCUSED )
      SendMessageA( lphc->hWndEdit, EM_SETSEL, 0, (LPARAM)(-1) );
@@ -1062 +1028 @@
    RECT rect;
    int nItems = 0;
-   int i;
-   int nHeight;
-   int nDroppedHeight,nTempDroppedHeight;
-   int screenH
+   int nDroppedHeight;
+
+   HWND hWnd = 0;
+   RECT DesktopRect;
 
    //TRACE("[%04x]: drop down\n", CB_HWND(lphc));
@@ -1076 +1042 @@
    if( CB_GETTYPE(lphc) == CBS_DROPDOWN )
    {
-       lphc->droppedIndex = CBUpdateLBox( lphc );
+       lphc->droppedIndex = CBUpdateLBox( lphc,TRUE );
 
        if( !(lphc->wState & CBF_CAPTURE) )
@@ -1088 +1054 @@
          lphc->droppedIndex = 0;
 
-       SendMessageA( lphc->hWndLBox, LB_SETTOPINDEX, (WPARAM)lphc->droppedIndex, 0 );
+       SendMessageA( lphc->hWndLBox, LB_SETTOPINDEX,
+                     (WPARAM)(lphc->droppedIndex == LB_ERR ? 0 : lphc->droppedIndex), 0 );
        SendMessageA( lphc->hWndLBox, LB_CARETON, 0, 0 );
    }
@@ -1108 +1075 @@
    nDroppedHeight = lphc->droppedRect.bottom - lphc->droppedRect.top;
    nItems = (int)SendMessageA (lphc->hWndLBox, LB_GETCOUNT, 0, 0);
-   nHeight = COMBO_YBORDERSIZE();
-   nTempDroppedHeight = 0;
-   for (i = 0; i < nItems; i++)
-   {
-     nHeight += (int)SendMessageA (lphc->hWndLBox, LB_GETITEMHEIGHT, i, 0);
-
-     /* Did we pass the limit of what can be displayed */
-     if (nHeight > nDroppedHeight)
-     {
-       break;
+
+   if (nItems > 0)
+   {
+      int nHeight;
+
+      nHeight = (int)SendMessageA (lphc->hWndLBox, LB_GETITEMHEIGHT, 0, 0);
+      nHeight *= nItems;
+
+      if (nHeight < nDroppedHeight - COMBO_YBORDERSIZE())
+         nDroppedHeight = nHeight + COMBO_YBORDERSIZE();
    }
-     nTempDroppedHeight = nHeight;
+
+   /*Now we should know screen size. */
+   hWnd = GetDesktopWindow();
+
+   if( hWnd )
+   {
+     GetClientRect( hWnd, &DesktopRect );
    }
 
-   nDroppedHeight = nTempDroppedHeight;
 
    /*If height of dropped rectangle gets beyond a screen size it should go up, otherwise down.*/
-   screenH = GetSystemMetrics(SM_CYSCREEN);
-   if((rect.bottom + nDroppedHeight) >= screenH)
-   {
-     SetWindowPos( lphc->hWndLBox, HWND_TOP, rect.left, rect.top - nDroppedHeight,
-                 lphc->droppedRect.right - lphc->droppedRect.left,
-                 nDroppedHeight,
-                 SWP_NOACTIVATE | SWP_NOREDRAW);
-   }
-   else
-   {
-     SetWindowPos( lphc->hWndLBox, HWND_TOP, rect.left, rect.bottom,
-                 lphc->droppedRect.right - lphc->droppedRect.left,
-                 nDroppedHeight,
-                 SWP_NOACTIVATE | SWP_NOREDRAW);
-   }
+   if((rect.bottom + nDroppedHeight) >= DesktopRect.bottom)
+      rect.bottom = rect.top - nDroppedHeight;
+
+   SetWindowPos( lphc->hWndLBox, HWND_TOP, rect.left, rect.bottom,
+                 lphc->droppedRect.right - lphc->droppedRect.left,
+                 nDroppedHeight,
+                 SWP_NOACTIVATE | SWP_SHOWWINDOW);
+
 
    if( !(lphc->wState & CBF_NOREDRAW) )
      RedrawWindow( lphc->hwndself, NULL, 0, RDW_INVALIDATE |
-                           RDW_ERASE | RDW_UPDATENOW | RDW_NOCHILDREN );
+                           RDW_ERASE | RDW_UPDATENOW | RDW_NOCHILDREN );
 
    EnableWindow( lphc->hWndLBox, TRUE );
-   //SvL: Don't activate combo listbox window or else focus will change
-   //     (this window's parent is the desktop)
-   ShowWindow( lphc->hWndLBox, SW_SHOWNOACTIVATE);
-
+   if (GetCapture() != lphc->hwndself)
+      SetCapture(lphc->hWndLBox);
 }
 
@@ -1173 +1136 @@
 
            lphc->wState &= ~CBF_DROPPED;
+           /* By hiding the window, the capture by lphc->hWndLBox will be released too */
+        
            ShowWindow( lphc->hWndLBox, SW_HIDE );
-           if(GetCapture() == lphc->hWndLBox)
-           {
-               ReleaseCapture();
-           }
 
            if( CB_GETTYPE(lphc) == CBS_DROPDOWN )
            {
-               INT index = SendMessageA( lphc->hWndLBox, LB_GETCURSEL, 0, 0 );
-               CBUpdateEdit( lphc, index );
-               rect = lphc->buttonRect;
+               rect = lphc->buttonRect;
            }
            else
@@ -1212 +1171 @@
  * Used by the ComboLBox to show/hide itself in response to VK_F4, etc...
  */
-BOOL COMBO_FlipListbox( LPHEADCOMBO lphc, BOOL bRedrawButton )
+BOOL COMBO_FlipListbox( LPHEADCOMBO lphc, BOOL ok, BOOL bRedrawButton )
 {
    if( lphc->wState & CBF_DROPPED )
    {
-       CBRollUp( lphc, TRUE, bRedrawButton );
+       CBRollUp( lphc, ok, bRedrawButton );
        return FALSE;
    }
@@ -1223 +1182 @@
    return TRUE;
 }
-
-/***********************************************************************
- *           COMBO_GetLBWindow
- *
- * Edit control helper.
- */
-HWND COMBO_GetLBWindow( HWND hwnd )
-{
-  LPHEADCOMBO lphc = (LPHEADCOMBO)GetInfoPtr(hwnd);
-
-  return lphc ? lphc->hWndLBox:0;
-}
-
 
 /***********************************************************************
@@ -1379 +1325 @@
                 else
                 {
-                  CBUpdateLBox( lphc );
+                  CBUpdateLBox( lphc, lphc->wState & CBF_DROPPED );
                 }
                 break;
@@ -1428 +1374 @@
                  * by arrowkeys in the dropdown listbox */
 
-                if( (lphc->dwStyle & CBS_SIMPLE) ||
+                if( (CB_GETTYPE(lphc) == CBS_SIMPLE) ||
                     ((lphc->wState & CBF_DROPPED) && !(lphc->wState & CBF_NOROLLUP)) )
                 {
@@ -1435 +1381 @@
                 else lphc->wState &= ~CBF_NOROLLUP;
 
-                if( lphc->wState & CBF_EDIT )
-                {
-                    INT index = SendMessageA(lphc->hWndLBox, LB_GETCURSEL, 0, 0);
-
-                    lphc->wState |= CBF_NOLBSELECT;
-                    CBUpdateEdit( lphc, index );
-                    /* select text in edit, as Windows does */
-                    SendMessageA( lphc->hWndEdit, EM_SETSEL, 0, (LPARAM)(-1) );
+                CB_NOTIFY( lphc, CBN_SELCHANGE );
+
+                if( HIWORD(wParam) == LBN_SELCHANGE)
+                {
+                  if( lphc->wState & CBF_EDIT )
+                  {
+                      INT index = SendMessageA(lphc->hWndLBox, LB_GETCURSEL, 0, 0);
+
+                      lphc->wState |= CBF_NOLBSELECT;
+                      CBUpdateEdit( lphc, index );
+                      /* select text in edit, as Windows does */
+                      SendMessageA( lphc->hWndEdit, EM_SETSEL, 0, (LPARAM)(-1) );
+                  }
+                  else
+                      InvalidateRect(CB_HWND(lphc), &lphc->textRect, TRUE);
                 }
-                else
-                    InvalidateRect(CB_HWND(lphc), &lphc->textRect, TRUE);
-
-                CB_NOTIFY( lphc, CBN_SELCHANGE );
+
                 /* fall through */
 
@@ -1548 +1498 @@
 }
 
+static LRESULT COMBO_GetTextLength(HWND hwnd,WPARAM wParam,LPARAM lParam)
+{
+  LPHEADCOMBO lphc = (LPHEADCOMBO)GetInfoPtr(hwnd);
+
+  if (!(lphc->wState & CBF_EDIT))
+  {
+    int idx = SendMessageA( lphc->hWndLBox, LB_GETCURSEL, 0, 0 );
+
+    if (idx == -1) return 0;
+    return SendMessageA( lphc->hWndLBox, LB_GETTEXTLEN, idx, 0 );
+  } else if (lphc->wState & CBF_EDIT)
+  {
+    /* Don't bother turning on CBF_NOEDITNOTIFY. */
+    return SendMessageA( lphc->hWndEdit, WM_GETTEXTLENGTH, wParam, lParam );
+  } else return CB_ERR;
+}
+
 static LRESULT COMBO_HandleText(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam)
 {
@@ -1558 +1525 @@
   }
 
-  if ((message == WM_GETTEXTLENGTH) && !(lphc->wState & CBF_EDIT))
-  {
-    int j = SendMessageA( lphc->hWndLBox, LB_GETCURSEL, 0, 0 );
-
-    if (j == -1) return 0;
-    return SendMessageA( lphc->hWndLBox, LB_GETTEXTLEN, j, 0);
-  } else if( lphc->wState & CBF_EDIT )
-  {
+  if (lphc->wState & CBF_EDIT)
+  {
+    LRESULT res;
+
     lphc->wState |= CBF_NOEDITNOTIFY;
-
-    return SendMessageA( lphc->hWndEdit, message, wParam, lParam );
-  } else return  CB_ERR;
+    res = SendMessageA( lphc->hWndEdit, message, wParam, lParam );
+    lphc->wState &= ~CBF_NOEDITNOTIFY;
+    return res;
+  } else return CB_ERR;
 }
 
@@ -1728 +1692 @@
 
            lphc->wState |= CBF_CAPTURE;
+           SetCapture( hwnd );
            CBDropDown( lphc );
-           SetCapture( hwnd );
        }
        if( bButton ) CBRepaintButton( lphc );
@@ -1751 +1715 @@
        if( CB_GETTYPE(lphc) == CBS_DROPDOWN )
        {
-           INT index = CBUpdateLBox( lphc );
-           CBUpdateEdit( lphc, index );
+           INT index = CBUpdateLBox( lphc, TRUE );
+
+           lphc->wState |= CBF_NOLBSELECT;
+           CBUpdateEdit( lphc, index );
+           lphc->wState &= ~CBF_NOLBSELECT;
        }
-       ReleaseCapture();
-//SvL: Don't set the capture here. Otherwise other controls don't respond the first time!
-//       SetCapture(lphc->hWndLBox);
+       SetCapture(lphc->hWndLBox);
    }
 
@@ -1804 +1769 @@
        lphc->wState &= ~CBF_CAPTURE;
        ReleaseCapture();
-       if( CB_GETTYPE(lphc) == CBS_DROPDOWN ) CBUpdateLBox( lphc );
+       if( CB_GETTYPE(lphc) == CBS_DROPDOWN ) CBUpdateLBox( lphc,TRUE );
 
        /* hand over pointer tracking */
@@ -1860 +1825 @@
   if( KEYDATA_ALT & HIWORD(lParam) )
     if( wParam == VK_UP || wParam == VK_DOWN )
-      COMBO_FlipListbox( lphc, TRUE );
-
-  return DefWindowProcA(hwnd,WM_SYSKEYDOWN,wParam,lParam);
+      COMBO_FlipListbox( lphc,FALSE,FALSE );
+
+  return 0;
 }
 
@@ -1868 +1833 @@
 {
   LPHEADCOMBO lphc = (LPHEADCOMBO)GetInfoPtr(hwnd);
+
+  if (((CHAR)wParam == VK_RETURN || (CHAR)wParam == VK_ESCAPE) && (lphc->wState & CBF_DROPPED))
+  {
+    CBRollUp( lphc, (CHAR)wParam == VK_RETURN, FALSE );
+    return TRUE;
+  }
 
   if( lphc->wState & CBF_EDIT )
@@ -2272 +2243 @@
           return COMBO_GetText(hwnd,wParam,lParam);
 
+        case WM_GETTEXTLENGTH:
+          return COMBO_GetTextLength(hwnd,wParam,lParam);
+
         case WM_SETTEXT:
-        case WM_GETTEXTLENGTH:
         case WM_CLEAR:
         case WM_CUT:

trunk/src/user32/edit.cpp

@@ -1 @@
-/* $Id: edit.cpp,v 1.38 2000-03-18 16:13:26 cbratschi Exp $ */
+/* $Id: edit.cpp,v 1.39 2000-05-22 17:21:07 cbratschi Exp $ */
 /*
  *      Edit control
@@ -9 +9 @@
  *      Copyright  1999 Christoph Bratschi
  *
- * Corel version: 20000317
+ * Corel version: 20000513
  * (WINE version: 991212)
  *
@@ -109 +109 @@
         BOOL bCaptureState; /* flag indicating whether mouse was captured */
         BOOL bEnableState;             /* flag keeping the enable state */
+        HWND hwndListBox;              /* handle of ComboBox's listbox or NULL */
         /*
          *      only for multi line controls
@@ -590 +591 @@
         case WM_GETDLGCODE:
                 //DPRINTF_EDIT_MSG32("WM_GETDLGCODE");
-                result = DLGC_HASSETSEL | DLGC_WANTCHARS | DLGC_WANTARROWS;
-                if (es->style & ES_WANTRETURN)
+                result = DLGC_HASSETSEL | DLGC_WANTCHARS | DLGC_WANTARROWS;
+
+                if (lParam && (((LPMSG)lParam)->message == WM_KEYDOWN))
                 {
-                   LPMSG msg = (LPMSG)lParam;
-                   if (msg && (msg->message == WM_KEYDOWN) && (msg->wParam == VK_RETURN))
+                   int vk = (int)((LPMSG)lParam)->wParam;
+
+                   if ((GetWindowLongA(hwnd,GWL_STYLE) & ES_WANTRETURN) && vk == VK_RETURN)
+                   {
                       result |= DLGC_WANTMESSAGE;
+                   }
+                   else if (es->hwndListBox && (vk == VK_RETURN || vk == VK_ESCAPE))
+                   {
+                      if (SendMessageA(GetParent(hwnd), CB_GETDROPPEDSTATE, 0, 0))
+                         result |= DLGC_WANTMESSAGE;
+                   }
                 }
                 break;
@@ -601 +611 @@
         case WM_CHAR:
                 //DPRINTF_EDIT_MSG32("WM_CHAR");
+                if (((CHAR)wParam == VK_RETURN || (CHAR)wParam == VK_ESCAPE) && es->hwndListBox)
+                {
+                   HWND hwndParent = GetParent(hwnd);
+                
+                   if (SendMessageA(hwndParent, CB_GETDROPPEDSTATE, 0, 0))
+                      SendMessageA(hwndParent, WM_KEYDOWN, wParam, 0);
+                   break;
+                }
                 EDIT_WM_Char(hwnd, es, (CHAR)wParam, (DWORD)lParam);
                 break;
@@ -3369 +3387 @@
  *
  */
-static BOOL EDIT_CheckCombo(HWND hwnd, UINT msg, INT key, DWORD key_data)
-{
-        HWND hLBox;
-
-        /********************************************************************
-         * This if statement used to check to see if the parent of the
-         * edit control was a 'combobox' by comparing the ATOM of the parent
-         * to a table of internal window control ATOMs.  However, this check
-         * would fail if the parent was a superclassed combobox (Although
-         * having the same basic functionality of a combobox, it has a
-         * different name and ATOM, thus defeating this check.)
-         *
-         * The safe way to determine if the parent is a combobox is to send it
-         * a message only a combo box would understand.  I send it a message
-         * CB_GETCOUNT, if I get 0 then the parent is not a combobox -
-         * return FALSE.  If I get > 0, then the parent IS a combobox
-         * (or sub/super classed derrivative thereof)
-         ********************************************************************/
-#if 0 //CB: our code
-        if (GetClassWord(GetParent(hwnd),GCW_ATOM) ==  GlobalFindAtomA(COMBOBOXCLASSNAME) &&
-                        (hLBox = COMBO_GetLBWindow(GetParent(hwnd))))
-#else
-        if (
-             ((SendMessageA(GetParent(hwnd), CB_GETCOUNT, 0, 0)) > 0) &&
-             (hLBox = COMBO_GetLBWindow(GetParent(hwnd)))
-           )
-#endif
-        {
-                HWND hCombo = GetParent(hwnd);
-                BOOL bUIFlip = TRUE;
-
-                //TRACE_(combo)("[%04x]: handling msg %04x (%04x)\n",
-                //             wnd->hwndSelf, (UINT16)msg, (UINT16)key);
-
-                switch (msg) {
-                case WM_KEYDOWN: /* Handle F4 and arrow keys */
-                        if (key != VK_F4) {
-                                bUIFlip = (BOOL)SendMessageA(hCombo, CB_GETEXTENDEDUI, 0, 0);
-                                if (SendMessageA(hCombo, CB_GETDROPPEDSTATE, 0, 0))
-                                        bUIFlip = FALSE;
-                        }
-                        if (!bUIFlip)
-                                SendMessageA(hLBox, WM_KEYDOWN, (WPARAM)key, 0);
-                        else {
-                                /* make sure ComboLBox pops up */
-                                SendMessageA(hCombo, CB_SETEXTENDEDUI, 0, 0);
-                                SendMessageA(hLBox, WM_KEYDOWN, VK_F4, 0);
-                                SendMessageA(hCombo, CB_SETEXTENDEDUI, 1, 0);
-                        }
-                        break;
-                case WM_SYSKEYDOWN: /* Handle Alt+up/down arrows */
-                        bUIFlip = (BOOL)SendMessageA(hCombo, CB_GETEXTENDEDUI, 0, 0);
-                        if (bUIFlip) {
-                                bUIFlip = (BOOL)SendMessageA(hCombo, CB_GETDROPPEDSTATE, 0, 0);
-                                SendMessageA(hCombo, CB_SHOWDROPDOWN, (bUIFlip) ? FALSE : TRUE, 0);
-                        } else
-                                SendMessageA(hLBox, WM_KEYDOWN, VK_F4, 0);
-                        break;
-                }
-                return TRUE;
-        }
-        return FALSE;
-}
-
+static BOOL EDIT_CheckCombo(HWND hwnd, EDITSTATE *es, UINT msg, INT key, DWORD key_data)
+{
+   HWND hLBox = es->hwndListBox;
+   HWND hCombo;
+   BOOL bDropped;
+   int  nEUI;
+
+   if (!hLBox)
+      return FALSE;
+
+   hCombo   = GetParent(hwnd);
+   bDropped = TRUE;
+   nEUI     = 0;
+
+   //TRACE_(combo)("[%04x]: handling msg %04x (%04x)\n",
+   //                        wnd->hwndSelf, (UINT16)msg, (UINT16)key);
+
+   if (key == VK_UP || key == VK_DOWN)
+   {
+      if (SendMessageA(hCombo, CB_GETEXTENDEDUI, 0, 0))
+         nEUI = 1;
+
+      if (msg == WM_KEYDOWN || nEUI)
+          bDropped = (BOOL)SendMessageA(hCombo, CB_GETDROPPEDSTATE, 0, 0);
+   }
+
+   switch (msg)
+   {
+      case WM_KEYDOWN:
+         if (!bDropped && nEUI && (key == VK_UP || key == VK_DOWN))
+         {
+            /* make sure ComboLBox pops up */
+            SendMessageA(hCombo, CB_SETEXTENDEDUI, FALSE, 0);
+            key = VK_F4;
+            nEUI = 2;
+         }
+
+         SendMessageA(hLBox, WM_KEYDOWN, (WPARAM)key, 0);
+         break;
+
+      case WM_SYSKEYDOWN: /* Handle Alt+up/down arrows */
+         if (nEUI)
+            SendMessageA(hCombo, CB_SHOWDROPDOWN, bDropped ? FALSE : TRUE, 0);
+         else
+            SendMessageA(hLBox, WM_KEYDOWN, (WPARAM)VK_F4, 0);
+         break;
+   }
+
+   if(nEUI == 2)
+      SendMessageA(hCombo, CB_SETEXTENDEDUI, TRUE, 0);
+
+   return TRUE;
+}
 
 /*********************************************************************
@@ -3456 +3463 @@
         case VK_F4:
         case VK_UP:
-                if (EDIT_CheckCombo(hwnd, WM_KEYDOWN, key, key_data))
-                        break;
-                if (key == VK_F4)
+                if (EDIT_CheckCombo(hwnd,es, WM_KEYDOWN, key, key_data) || key == VK_F4)
                         break;
                 /* fall through */
@@ -3471 +3476 @@
                 break;
         case VK_DOWN:
-                if (EDIT_CheckCombo(hwnd, WM_KEYDOWN, key, key_data))
+                if (EDIT_CheckCombo(hwnd,es, WM_KEYDOWN, key, key_data))
                         break;
                 /* fall through */
@@ -3491 +3496 @@
                 if (es->style & ES_MULTILINE)
                         EDIT_MovePageUp_ML(hwnd, es, shift);
+                else
+                        EDIT_CheckCombo(hwnd, es, WM_KEYDOWN, key, key_data);
                 break;
         case VK_NEXT:
                 if (es->style & ES_MULTILINE)
                         EDIT_MovePageDown_ML(hwnd, es, shift);
+                else
+                        EDIT_CheckCombo(hwnd, es, WM_KEYDOWN, key, key_data);
                 break;
         case VK_DELETE:
@@ -3709 +3718 @@
         }
 
+        if (es->style & ES_COMBO)
+           es->hwndListBox = GetDlgItem(cs->hwndParent, ID_CB_LISTBOX);
+
         if (es->style & ES_MULTILINE) {
                 es->buffer_size = BUFSTART_MULTI;
@@ -4076 +4088 @@
                 return 0;
         } else if ((key == VK_UP) || (key == VK_DOWN))
-                if (EDIT_CheckCombo(hwnd, WM_SYSKEYDOWN, key, key_data))
+        {
+                if (EDIT_CheckCombo(hwnd,es, WM_SYSKEYDOWN, key, key_data))
                         return 0;
+         }
         return DefWindowProcA(hwnd, WM_SYSKEYDOWN, (WPARAM)key, (LPARAM)key_data);
 }

trunk/src/user32/listbox.cpp

@@ -1 @@
-/* $Id: listbox.cpp,v 1.24 2000-03-18 16:13:30 cbratschi Exp $ */
+/* $Id: listbox.cpp,v 1.25 2000-05-22 17:21:08 cbratschi Exp $ */
 /*
  * Listbox controls
@@ -6 +6 @@
  * Copyright 1999 Christoph Bratschi (ported from WINE)
  *
- * Corel version: 20000317
+ * Corel version: 20000513
  * (WINE version: 991212)
  *
@@ -34 +34 @@
  - VK_LINEDOWN -> bottom most item not always visible
  - performance not optimized
- - ownerdraw is broken -> toolbar customize dialog
  - first item selection mark not redrawn on new selection
+ - LISTBOX_HandleLButtonDownCombo fails, bug in GetWindowRect or ClientToScreen!
+   I clicked on the vertical scrollbar, this happens:
+    t1: SendInternalMessageA WM_LBUTTONDOWN for 68000009 1 1d00c6
+    t1: GetClientRect of 68000009 returned (0,0) (191,110)
+    t1: USER32: GetCapture returned 68000009
+    t1: GetWindowRect 68000009 (450,130) (657,242)
+    t1: ClientToScreen 68000009 (198,29) -> (424,108)
+   mouse position is ok, but screen point is outside window rect!!!
+   the new point is left-top and not on the right!!!
  */
 
@@ -112 +120 @@
 #define SEND_NOTIFICATION(hwnd,descr,code) \
     (SendMessageA( (descr)->owner, WM_COMMAND, \
-     MAKEWPARAM((((descr)->lphc)?ID_CB_LISTBOX:GetWindowLongA(hwnd,GWL_ID)), (code) ), hwnd ))
+     MAKEWPARAM(GetWindowLongA(hwnd,GWL_ID), (code)), hwnd ))
 
 /* Current timer status */
@@ -482 +490 @@
     {
         DRAWITEMSTRUCT dis;
-        UINT           id = (descr->lphc) ? ID_CB_LISTBOX : GetWindowLongA(hwnd,GWL_ID);
+        UINT           id = GetWindowLongA(hwnd,GWL_ID);
 
         if (!item)
@@ -714 +722 @@
         {
             COMPAREITEMSTRUCT cis;
-            UINT                id = (descr->lphc) ? ID_CB_LISTBOX : GetWindowLongA(hwnd,GWL_ID);
+            UINT                id = GetWindowLongA(hwnd,GWL_ID);
 
             cis.CtlType    = ODT_LISTBOX;
@@ -887 +895 @@
     INT focusItem;
 
+    if (descr->style & LBS_NOREDRAW) return 0;
+
     SetRect( &rect, 0, 0, descr->width, descr->height );
-    if (descr->style & LBS_NOREDRAW) return 0;
     if (descr->style & LBS_MULTICOLUMN)
         rect.right = rect.left + descr->column_width;
@@ -966 +975 @@
     /* Paint the focus item now */
     descr->focus_item = focusItem;
-    if (focusRect.top != focusRect.bottom)
+    if (focusRect.top != focusRect.bottom && descr->caret_on)
         LISTBOX_DrawItem( hwnd, descr, hdc, &focusRect, descr->focus_item, ODA_FOCUS );
 
@@ -1281 +1290 @@
     {
         INT oldsel = descr->selected_item;
-        //SvL: Why was this commented out??? (enabled in latest wine code)
-        if (index == oldsel) return LB_OKAY;
-
-        if (oldsel != -1) descr->items[oldsel].selected = FALSE;
-        if (index != -1) descr->items[index].selected = TRUE;
-        descr->selected_item = index;
-        if (oldsel != -1) LISTBOX_RepaintItem( hwnd, descr, oldsel, ODA_SELECT);
-        if (index != -1) LISTBOX_RepaintItem( hwnd, descr, index, ODA_SELECT );
-        if (send_notify && descr->nb_items) SEND_NOTIFICATION( hwnd, descr,
-                               (index != -1) ? LBN_SELCHANGE : LBN_SELCANCEL );
-        else
-            if( descr->lphc ) /* set selection change flag for parent combo */
-                descr->lphc->wState |= CBF_SELCHANGE;
-    }
-    return LB_OKAY;
+
+        if (index != oldsel)
+        {
+          if (oldsel != -1) descr->items[oldsel].selected = FALSE;
+          if (index != -1) descr->items[index].selected = TRUE;
+
+          descr->selected_item = index;
+
+          if (oldsel != -1)
+            LISTBOX_RepaintItem( hwnd, descr, oldsel, ODA_SELECT);
+          if (index != -1)
+            LISTBOX_RepaintItem( hwnd, descr, index, ODA_SELECT );
+
+          if (send_notify && descr->nb_items)
+            SEND_NOTIFICATION( hwnd, descr, (index != -1)
+                               ? LBN_SELCHANGE : LBN_SELCANCEL );
+          else
+            if( descr->lphc )
+              /* set selection change flag for parent combo */
+              descr->lphc->wState |= CBF_SELCHANGE;
+        }
+    }
+
+    /* "If the index parameter is -1, the return value is LB_ERR even though
+     * no error occurred." (At least for single selection boxes.) */
+    return (index == -1) ? LB_ERR : LB_OKAY;
 }
 
@@ -1396 +1416 @@
     {
         MEASUREITEMSTRUCT mis;
-        UINT                id = (descr->lphc) ? ID_CB_LISTBOX : GetWindowLongA(hwnd,GWL_ID);
+        UINT              id = GetWindowLongA(hwnd,GWL_ID);
 
         mis.CtlType    = ODT_LISTBOX;
@@ -1490 +1510 @@
     {
         DELETEITEMSTRUCT dis;
-        UINT               id = (descr->lphc) ? ID_CB_LISTBOX : GetWindowLongA(hwnd,GWL_ID);
+        UINT             id = GetWindowLongA(hwnd,GWL_ID);
 
         dis.CtlType  = ODT_LISTBOX;
@@ -1977 +1997 @@
 
 static LRESULT LISTBOX_HandleLButtonDownCombo( HWND hwnd, LB_DESCR *pDescr,
-                                               WPARAM wParam, INT x, INT y)
+                                               UINT msg,WPARAM wParam, INT x, INT y)
 {
     RECT clientRect, screenRect;
@@ -1989 +2009 @@
     if(PtInRect(&clientRect, mousePos))
     {
-        /* MousePos is in client, resume normal processing */
-        return LISTBOX_HandleLButtonDown( hwnd, pDescr, wParam, x, y);
+      /* MousePos is in client, resume normal processing */
+      if (msg == WM_LBUTTONDOWN)
+      {
+         pDescr->lphc->droppedIndex = pDescr->nb_items ? pDescr->selected_item : -1;
+         return LISTBOX_HandleLButtonDown( hwnd, pDescr, wParam, x, y);
+      }
+      else if (pDescr->style & LBS_NOTIFY)
+        SEND_NOTIFICATION( hwnd, pDescr, LBN_DBLCLK );
+      return 0;
     }
     else
     {
-        POINT screenMousePos;
-        HWND hWndOldCapture;
-
-        /* Check the Non-Client Area */
-        screenMousePos = mousePos;
-        hWndOldCapture = GetCapture();
+      POINT screenMousePos;
+      RECT screenRect;
+      HWND hWndOldCapture;
+//CB: read buglist
+      /* Check the Non-Client Area */
+      screenMousePos = mousePos;
+      hWndOldCapture = GetCapture();
+      GetWindowRect(hwnd,&screenRect);
+      ClientToScreen(hwnd,&screenMousePos);
+
+      if (!PtInRect(&screenRect,screenMousePos))
+      {
         ReleaseCapture();
-        GetWindowRect(hwnd, &screenRect);
-        ClientToScreen(hwnd, &screenMousePos);
-
-        if(!PtInRect(&screenRect, screenMousePos))
-        {
-            /* Close The Drop Down */
-            SEND_NOTIFICATION( hwnd, pDescr, LBN_SELCANCEL );
-            return 0;
-        }
-        else
-        {
-            /* Check to see the NC is a scrollbar */
-            INT nHitTestType=0;
-            DWORD dwStyle = GetWindowLongA(hwnd,GWL_STYLE);
-            /* Check Vertical scroll bar */
-            if (dwStyle & WS_VSCROLL)
-            {
-                clientRect.right += GetSystemMetrics(SM_CXVSCROLL);
-                if (PtInRect( &clientRect, mousePos ))
-                {
-                    nHitTestType = HTVSCROLL;
-                }
-            }
-              /* Check horizontal scroll bar */
-            if (dwStyle & WS_HSCROLL)
-            {
-                clientRect.bottom += GetSystemMetrics(SM_CYHSCROLL);
-                if (PtInRect( &clientRect, mousePos ))
-                {
-                    nHitTestType = HTHSCROLL;
-                }
-            }
-            /* Windows sends this message when a scrollbar is clicked
-             */
-
-            if(nHitTestType != 0)
-            {
-                SendMessageA(hwnd, WM_NCLBUTTONDOWN, nHitTestType,
-                    MAKELONG(screenMousePos.x, screenMousePos.y));
-            }
-            /* Resume the Capture after scrolling is complete
-             */
-            if(hWndOldCapture != 0)
-            {
-                SetCapture(hWndOldCapture);
-            }
-        }
+        LISTBOX_SetSelection( hwnd, pDescr, pDescr->lphc->droppedIndex, FALSE, FALSE );
+        COMBO_FlipListbox( pDescr->lphc, FALSE, FALSE );
+
+        return 0;
+      } else
+      {
+        /* Check to see the NC is a scrollbar */
+        INT nHitTestType = SendMessageA(hwnd,WM_NCHITTEST,0,MAKELONG(screenMousePos.x,screenMousePos.y));
+
+        /* Windows sends this message when a scrollbar is clicked
+         */
+        if (nHitTestType != HTCLIENT)
+        {
+          SendMessageA(hwnd,(msg == WM_LBUTTONDOWN) ? WM_NCLBUTTONDOWN:WM_NCLBUTTONDBLCLK,nHitTestType,MAKELONG(screenMousePos.x,screenMousePos.y));
+        }
+
+        /* Resume the Capture after scrolling is complete
+         */
+        if (hWndOldCapture)
+        {
+          SetCapture(hWndOldCapture);
+        }
+      }
     }
     return 0;
@@ -2135 +2144 @@
 {
     INT index;
-    TIMER_DIRECTION dir;
+    TIMER_DIRECTION dir = LB_TIMER_NONE;
 
     if (GetCapture() != hwnd) return 0;
@@ -2156 +2165 @@
             x = descr->width - 1;
         }
-        else dir = LB_TIMER_NONE;  /* inside */
     }
     else
@@ -2162 +2170 @@
         if (y < 0) dir = LB_TIMER_UP;  /* above */
         else if (y >= descr->height) dir = LB_TIMER_DOWN;  /* below */
-        else dir = LB_TIMER_NONE;  /* inside */
     }
 
@@ -2356 +2363 @@
     descr->nb_tabs       = 0;
     descr->tabs          = NULL;
-    descr->caret_on      = TRUE;
+    descr->caret_on      = lphc ? FALSE:TRUE;
     descr->in_focus      = FALSE;
     descr->captured      = FALSE;
@@ -2388 +2395 @@
         else
         {
-            UINT        id = (descr->lphc ) ? ID_CB_LISTBOX : GetWindowLongA(hwnd,GWL_ID);
+            UINT        id = GetWindowLongA(hwnd,GWL_ID);
 
             mis.CtlType    = ODT_LISTBOX;
@@ -3062 +3069 @@
             }
             case WM_LBUTTONDOWN:
-                 return LISTBOX_HandleLButtonDownCombo( hwnd, descr, wParam,
+            case WM_LBUTTONDBLCLK:
+                 return LISTBOX_HandleLButtonDownCombo( hwnd, descr,msg, wParam,
                          (INT16)LOWORD(lParam), (INT16)HIWORD(lParam));
             case WM_MOUSEACTIVATE:
@@ -3077 +3085 @@
                            && (wParam == VK_DOWN || wParam == VK_UP)) )
                      {
-                         COMBO_FlipListbox( lphc, FALSE );
+                         COMBO_FlipListbox( lphc, FALSE, FALSE );
                          return 0;
                      }

trunk/src/user32/menu.cpp

@@ -1 @@
-/* $Id: menu.cpp,v 1.21 2000-05-09 18:56:56 sandervl Exp $*/
+/* $Id: menu.cpp,v 1.22 2000-05-22 17:21:09 cbratschi Exp $*/
 /*
  * Menu functions
@@ -9 +9 @@
  * Copyright 1999 Christoph Bratschi
  *
- * Corel version: 20000317
+ * Corel version: 200005313
  * (WINE version: 20000130)
  *
@@ -837 +837 @@
         lpitem->rect.right  += mis.itemWidth;
 
-        //SvL: Add size of space between two menu items (fixes RealPlayer 7 menu)
+        //SvL: Add size of space between two menu items (fixes RealPlayer 7 menu)
         if(menuBar)
         {
@@ -1599 +1599 @@
             if (!pTopPopupWnd)
             {
-                DebugInt3();
+                DebugInt3();
                 return FALSE;
             }
@@ -1616 +1616 @@
                 if( !menu->hWnd )
                 {
-                    DebugInt3();
+                    DebugInt3();
                     return FALSE;
                 }
@@ -2187 +2187 @@
         if(win32wnd==NULL) {
             //SvL: This happens in Moraff's YourJongg 2.0, return here
-            //TODO: Check if this is supposed to happen at all...
+            //TODO: Check if this is supposed to happen at all...
             return (HMENU)0;
-        }
+        }
 
         ht = win32wnd->HandleNCHitTest(pt);
@@ -2433 +2433 @@
               functionality.
             */
-            pmt->hCurrentMenu = MENU_ShowSubPopup(pmt->hOwnerWnd,hPtMenu,FALSE,wFlags,&pmt->pt);
+            pmt->hCurrentMenu = MENU_ShowSubPopup(pmt->hOwnerWnd,hPtMenu,FALSE,wFlags,&pmt->pt);
             return TRUE;
          }
@@ -2784 +2784 @@
                     goto buttondown;
                 case WM_LBUTTONDBLCLK:
-                    if (bSysMenu && (hmenu == mt.hTopMenu))
-                    {
-                        fEndMenu = TRUE;
-                        break;
-                    }
-                    /* fall through */
+                    if (bSysMenu && (hmenu == mt.hTopMenu))
+                    {
+                        fEndMenu = TRUE;
+                        break;
+                    }
+                    /* fall through */
                 case WM_LBUTTONDOWN:
                     /* If the message belongs to the menu, removes it from the queue */
                     /* Else, end menu tracking */
 
-                 buttondown:
+                 buttondown:
                     /* Forcing mouse popup NOW - Ensure timer doesn't popup menu also */
-                    mouseOverMenuID = -1;
+                    mouseOverMenuID = -1;
                     fRemove = MENU_ButtonDown( &mt, hmenu, wFlags );
                     fEndMenu = !fRemove;
@@ -2809 +2809 @@
                     {
                         /* Forcing mouse popup NOW - Ensure timer doesn't popup menu also */
-                        mouseOverMenuID = -1;
+                        mouseOverMenuID = -1;
                         executedMenuId = MENU_ButtonUp( &mt, hmenu, wFlags);
 
@@ -2852 +2852 @@
                    MENU_FindItemByCoords( ptmenu, mt.pt, &id );
 
-                 /* If it is over the same item that set up the timer originally .... */
-                 if (mouseOverMenuID != -1 && mouseOverMenuID == id)
-                 {
-                   /* .... Pop up the menu */
+                 /* If it is over the same item that set up the timer originally .... */
+                 if (mouseOverMenuID != -1 && mouseOverMenuID == id)
+                 {
+                   /* .... Pop up the menu */
                    mt.hCurrentMenu = MENU_ShowSubPopup(mt.hOwnerWnd, hmenu, FALSE, wFlags,&mt.pt);
-                  }
+                  }
               }
 
@@ -2968 +2968 @@
             }  /* switch(msg.message) - kbd */
         }
-        else if (msg.message == WM_SYSCOMMAND)
-        {
-                /* The user clicked on the system menu/button */
+        else if (msg.message == WM_SYSCOMMAND)
+        {
+                /* The user clicked on the system menu/button */
         fEndMenu = TRUE;
         break;
-        }
+        }
         else
         {
@@ -3482 +3482 @@
     //TRACE("menu=%04x item=%04x ptr=%p len=%d flags=%04x\n",
     //             hMenu, wItemID, str, nMaxSiz, wFlags );
-    if (!(item = MENU_FindItem( &hMenu, &wItemID, wFlags ))) return 0;
-    if (!IS_STRING_ITEM(item->fType)) return 0;
-    if (!str || !nMaxSiz) return strlen(item->text);
+
+    item = MENU_FindItem( &hMenu, &wItemID, wFlags );
+
+    if (!str || !nMaxSiz)
+    {
+        if (item && IS_STRING_ITEM(item->fType))
+            return strlen(item->text);
+        else
+            return 0;
+    }
+
     str[0] = '\0';
-    lstrcpynA( str, item->text, nMaxSiz );
-    //TRACE("returning '%s'\n", str );
+
+    if (item)
+    {
+        if (!IS_STRING_ITEM(item->fType)) return 0;
+        lstrcpynA( str, item->text, nMaxSiz );
+    }
+
     return strlen(str);
 }
@@ -3504 +3517 @@
     //TRACE("menu=%04x item=%04x ptr=%p len=%d flags=%04x\n",
     //             hMenu, wItemID, str, nMaxSiz, wFlags );
-    if (!(item = MENU_FindItem( &hMenu, &wItemID, wFlags ))) return 0;
-    if (!IS_STRING_ITEM(item->fType)) return 0;
-    if (!str || !nMaxSiz) return strlen(item->text);
+
+    item = MENU_FindItem( &hMenu, &wItemID, wFlags );
+
+    if (!str || !nMaxSiz)
+    {
+        if (item && IS_STRING_ITEM(item->fType))
+            return strlen(item->text);
+        else
+            return 0;
+    }
+
     str[0] = '\0';
-    lstrcpynAtoW( str, item->text, nMaxSiz );
+
+    if (item)
+    {
+        if (!IS_STRING_ITEM(item->fType)) return 0;
+        lstrcpynAtoW( str, item->text, nMaxSiz );
+    }
+
     return lstrlenW(str);
 }
@@ -4727 +4754 @@
  *         IsMenuActive    (Internal)
  */
-BOOL IsMenuActive()
+BOOL IsMenuActive(void)
 {
     return pTopPopupWnd &&  (GetWindowLongA(pTopPopupWnd,GWL_STYLE) & WS_VISIBLE);

trunk/src/user32/pmframe.cpp

@@ -1 @@
-/* $Id: pmframe.cpp,v 1.53 2000-05-12 18:09:41 sandervl Exp $ */
+/* $Id: pmframe.cpp,v 1.54 2000-05-22 17:21:10 cbratschi Exp $ */
 /*
  * Win32 Frame Managment Code for OS/2
@@ -168 +168 @@
     case WM_HITTEST:
     {
-        if(win32wnd->getWindowHandle() != pWinMsg->hwnd) {
-                win32wnd = Win32BaseWindow::GetWindowFromHandle(pWinMsg->hwnd);
-        }
+        if(win32wnd->getWindowHandle() != pWinMsg->hwnd) {
+                win32wnd = Win32BaseWindow::GetWindowFromHandle(pWinMsg->hwnd);
+        }
         if(win32wnd && win32wnd->IsWindowCreated())
         {
@@ -192 +192 @@
     case WM_BUTTON3DBLCLK:
     {
-        if(win32wnd->getWindowHandle() != pWinMsg->hwnd) {
-                win32wnd = Win32BaseWindow::GetWindowFromHandle(pWinMsg->hwnd);
-        }
+        if(win32wnd->getWindowHandle() != pWinMsg->hwnd) {
+                win32wnd = Win32BaseWindow::GetWindowFromHandle(pWinMsg->hwnd);
+        }
         if(win32wnd && win32wnd->IsWindowCreated())
         {
@@ -217 +217 @@
     case WM_MOUSEMOVE:
     {
-        if(win32wnd->getWindowHandle() != pWinMsg->hwnd) {
-                win32wnd = Win32BaseWindow::GetWindowFromHandle(pWinMsg->hwnd);
-        }
+        if(win32wnd->getWindowHandle() != pWinMsg->hwnd) {
+                win32wnd = Win32BaseWindow::GetWindowFromHandle(pWinMsg->hwnd);
+        }
         if(win32wnd && win32wnd->IsWindowCreated())
-                win32wnd->MsgMouseMove(pWinMsg);
+                win32wnd->MsgMouseMove(pWinMsg);
         RestoreOS2TIB();
         return (MRESULT)TRUE;
@@ -230 +230 @@
         dprintf(("PMFRAME: WM_PAINT"));
         if(win32wnd->getStyle() & WS_MINIMIZE_W)
-                goto RunDefFrameProc;
+                goto RunDefFrameProc;
         if(win32wnd->IsWindowCreated())
-                win32wnd->MsgNCPaint();
+                win32wnd->MsgNCPaint();
 
         goto RunDefWndProc;
@@ -441 +441 @@
 
     case WM_SHOW:
-        dprintf(("PMFRAME: WM_SHOW"));
+        dprintf(("PMFRAME: WM_SHOW"));
         break;
 
@@ -497 +497 @@
 
     case WM_VRNENABLED:
-        if(!win32wnd->isComingToTop() && ((win32wnd->getExStyle() & WS_EX_TOPMOST_W) == WS_EX_TOPMOST_W))
-        {
-                HWND hwndrelated;
-                Win32BaseWindow *topwindow;
-
-                win32wnd->setComingToTop(TRUE);
-
-                hwndrelated = WinQueryWindow(hwnd, QW_PREV);
-                dprintf(("WM_VRNENABLED hwndrelated = %x (hwnd=%x)", hwndrelated, hwnd));
-                topwindow = Win32BaseWindow::GetWindowFromOS2FrameHandle(hwndrelated);
-                if(topwindow == NULL || ((win32wnd->getExStyle() & WS_EX_TOPMOST_W) == 0)) {
-                        //put window at the top of z order
-                        WinSetWindowPos( hwnd, HWND_TOP, 0, 0, 0, 0, SWP_ZORDER );
-                }
-
-                win32wnd->setComingToTop(FALSE);
-                break;
-        }
-        goto RunDefFrameProc;
+        if(!win32wnd->isComingToTop() && ((win32wnd->getExStyle() & WS_EX_TOPMOST_W) == WS_EX_TOPMOST_W))
+        {
+                HWND hwndrelated;
+                Win32BaseWindow *topwindow;
+
+                win32wnd->setComingToTop(TRUE);
+
+                hwndrelated = WinQueryWindow(hwnd, QW_PREV);
+                dprintf(("WM_VRNENABLED hwndrelated = %x (hwnd=%x)", hwndrelated, hwnd));
+                topwindow = Win32BaseWindow::GetWindowFromOS2FrameHandle(hwndrelated);
+                if(topwindow == NULL || ((win32wnd->getExStyle() & WS_EX_TOPMOST_W) == 0)) {
+                        //put window at the top of z order
+                        WinSetWindowPos( hwnd, HWND_TOP, 0, 0, 0, 0, SWP_ZORDER );
+                }
+
+                win32wnd->setComingToTop(FALSE);
+                break;
+        }
+        goto RunDefFrameProc;
 
     default:

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.191 2000-05-20 14:57:24 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.192 2000-05-22 17:21:11 cbratschi Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -208 +208 @@
     }
     if(propertyList) {
-        removeWindowProps();
+        removeWindowProps();
     }
 }
@@ -503 +503 @@
 #if 0
   if(((dwStyle & (WS_CAPTION|WS_POPUP)) == WS_CAPTION) && (getParent() == NULL || getParent() == windowDesktop)) {
-        fTaskList = TRUE;
+        fTaskList = TRUE;
   }
 #else
@@ -867 +867 @@
     //SvL: Don't send WM_(NC)ACTIVATE messages when the window is being destroyed
     if(fDestroyWindowCalled) {
-        return 0;
+        return 0;
     }
 
@@ -916 +916 @@
     //SvL: Don't send WM_(NC)ACTIVATE messages when the window is being destroyed
     if(fDestroyWindowCalled) {
-        return 0;
+        return 0;
     }
 
@@ -927 +927 @@
     //SvL: Don't send WM_(NC)ACTIVATE messages when the window is being destroyed
     if(fDestroyWindowCalled) {
-        return 0;
+        return 0;
     }
     return  SendInternalMessageA(WM_KILLFOCUS, hwnd, 0);
@@ -1056 +1056 @@
     RECT client = rectClient;
 
-        if ((rect.left >= client.left) && (rect.left < client.right) &&
+        if ((rect.left >= client.left) && (rect.left < client.right) &&
            (rect.right >= client.left) && (rect.right < client.right) &&
            (rect.top  >= client.top) && (rect.top < client.bottom) &&
            (rect.bottom >= client.top) && (rect.bottom < client.bottom))
         {
-                return 0;
-        }
-
-        dprintf(("MsgNCPaint (%d,%d)(%d,%d)", rect.left, rect.top, rect.right, rect.bottom));
-        hrgn = CreateRectRgnIndirect(&rect);
-        if (!hrgn) return 0;
-
-        rc = SendInternalMessageA(WM_NCPAINT,hrgn,0);
-
-        DeleteObject(hrgn);
-
-        return rc;
-  }
-  else  return 0;
+                return 0;
+        }
+
+        dprintf(("MsgNCPaint (%d,%d)(%d,%d)", rect.left, rect.top, rect.right, rect.bottom));
+        hrgn = CreateRectRgnIndirect(&rect);
+        if (!hrgn) return 0;
+
+        rc = SendInternalMessageA(WM_NCPAINT,hrgn,0);
+
+        DeleteObject(hrgn);
+
+        return rc;
+  }
+  else  return 0;
 }
 //******************************************************************************
@@ -1329 +1329 @@
         if ((dwStyle & WS_CAPTION) == WS_CAPTION)
         {
-//          HandleNCPaint((HRGN)1);
+          HandleNCPaint((HRGN)1);
           OSLibWinSetWindowText(OS2HwndFrame,(LPSTR)windowNameA);
         }
@@ -1638 +1638 @@
         if((HIWORD(lParam) & KEYDATA_ALT) && wParam)
         {
-                if (wParam == VK_TAB || wParam == VK_ESCAPE) 
-                        break;
+                if (wParam == VK_TAB || wParam == VK_ESCAPE)
+                        break;
                 if (wParam == VK_SPACE && (getStyle() & WS_CHILD)) {
-                        getParent()->SendMessageA(Msg, wParam, lParam );
-                }
+                        getParent()->SendMessageA(Msg, wParam, lParam );
+                }
                 else    SendMessageA(WM_SYSCOMMAND, (WPARAM)SC_KEYMENU, (LPARAM)(DWORD)wParam );
         }
         else /* check for Ctrl-Esc */
-                if (wParam != VK_ESCAPE) MessageBeep(0);
-                        break;
+                if (wParam != VK_ESCAPE) MessageBeep(0);
+                        break;
     }
 
@@ -2037 +2037 @@
  ULONG showstate = 0;
  HWND  hWinAfter;
- BOOL  rc;
+ BOOL  rc,wasVisible,showFlag;
 
     dprintf(("ShowWindow %x %x", getWindowHandle(), nCmdShow));
@@ -2048 +2048 @@
         break;
     case SW_HIDE:
+        if (!wasVisible) return wasVisible;
+         if(GetCapture() == getWindowHandle() || IsChild(GetCapture()))
+           ReleaseCapture();
+
         showstate = SWPOS_HIDE;
         break;
@@ -2077 +2081 @@
 
     /* We can't activate a child window (WINE) */
-    if(getStyle() & WS_CHILD)
+    if((getStyle() & WS_CHILD) && !(getExStyle() & WS_EX_MDICHILD))
         showstate &= ~SWPOS_ACTIVATE;
 
@@ -2085 +2089 @@
     else    setStyle(getStyle() & ~WS_VISIBLE);
 
+    showFlag = (nCmdShow != SW_HIDE);
+
     rc = OSLibWinShowWindow(OS2HwndFrame, showstate);
     OSLibWinShowWindow(OS2Hwnd, showstate);
 
-    SendInternalMessageA(WM_SHOWWINDOW, (showstate & SWPOS_SHOW) ? 1 : 0, 0);
+    //CB: PMFrame: WM_MINMAXFRAME SWP_* handling isn't always successful!
+    if ((showstate & SWPOS_MAXIMIZE) == SWPOS_MAXIMIZE)
+      setStyle((getStyle() & ~WS_MINIMIZE) | WS_MAXIMIZE);
+    else if ((showstate & SWPOS_MINIMIZE) == SWPOS_MINIMIZE)
+      setStyle((getStyle() & ~WS_MAXIMIZE) | WS_MINIMIZE);
+    else if ((showstate & SWPOS_RESTORE) == SWPOS_RESTORE)
+      setStyle(getStyle() & ~(WS_MINIMIZE | WS_MAXIMIZE));
 
     if (flags & WIN_NEED_SIZE)
@@ -2140 +2152 @@
     else
     {
-        if (!(fuFlags & SWP_SHOWWINDOW)) 
-              fuFlags |= SWP_NOREDRAW;
-        fuFlags &= ~SWP_HIDEWINDOW;
-    }
-
-    if(cx < 0) cx = 0; 
+        if (!(fuFlags & SWP_SHOWWINDOW))
+              fuFlags |= SWP_NOREDRAW;
+        fuFlags &= ~SWP_HIDEWINDOW;
+    }
+
+    if(cx < 0) cx = 0;
     if(cy < 0) cy = 0;
 
@@ -2159 +2171 @@
         fuFlags |= SWP_NOACTIVATE;   /* Already active */
     }
-    else 
+    else
     if((getStyle() & (WS_POPUP | WS_CHILD)) != WS_CHILD )
     {
@@ -2165 +2177 @@
         {
             fuFlags &= ~SWP_NOZORDER;
-            hwndInsertAfter = HWND_TOP;           
+            hwndInsertAfter = HWND_TOP;
         }
     }
@@ -2219 +2231 @@
 
     if(fuFlags & SWP_SHOWWINDOW && !IsWindowVisible()) {
-        setStyle(getStyle() | WS_VISIBLE);
-        //SvL: TODO: Send WM_SHOWWINDOW??
-        OSLibWinShowWindow(OS2Hwnd, SWPOS_SHOW);
+        setStyle(getStyle() | WS_VISIBLE);
+        //SvL: TODO: Send WM_SHOWWINDOW??
+        OSLibWinShowWindow(OS2Hwnd, SWPOS_SHOW);
     }
     else
     if(fuFlags & SWP_HIDEWINDOW && IsWindowVisible()) {
-        setStyle(getStyle() & ~WS_VISIBLE);
-        //SvL: TODO: Send WM_SHOWWINDOW??
-        OSLibWinShowWindow(OS2Hwnd, SWPOS_HIDE);
+        setStyle(getStyle() & ~WS_VISIBLE);
+        //SvL: TODO: Send WM_SHOWWINDOW??
+        OSLibWinShowWindow(OS2Hwnd, SWPOS_HIDE);
     }
     rc = OSLibWinSetMultWindowPos(&swp, 1);
@@ -2233 +2245 @@
 #ifdef DEBUG
     if(fShow) {
-        dprintf(("Frame style 0x%08x, client style 0x%08x", OSLibQueryWindowStyle(OS2HwndFrame), OSLibQueryWindowStyle(OS2Hwnd)));
+        dprintf(("Frame style 0x%08x, client style 0x%08x", OSLibQueryWindowStyle(OS2HwndFrame), OSLibQueryWindowStyle(OS2Hwnd)));
     }
 #endif
@@ -2306 +2318 @@
     {
         SetWindowPos(0, 0, 0, 0, 0, SWP_HIDEWINDOW |
-                     SWP_NOACTIVATE|SWP_NOZORDER|SWP_NOMOVE|SWP_NOSIZE);
+                     SWP_NOACTIVATE|SWP_NOZORDER|SWP_NOMOVE|SWP_NOSIZE);
         if(!::IsWindow(hwnd))
         {
-                return TRUE;
+                return TRUE;
         }
     }
@@ -2674 +2686 @@
   rc = (getStyle() & WS_DISABLED) != 0;
   if(rc && !fEnable) {
-        SendMessageA(WM_CANCELMODE, 0, 0);
+        SendMessageA(WM_CANCELMODE, 0, 0);
   }
   OSLibWinEnableWindow(OS2HwndFrame, fEnable);
   if(fEnable == FALSE) {
-        //SvL: No need to clear focus as PM already does this
-        if(getWindowHandle() == GetCapture()) {
-                ReleaseCapture();  /* A disabled window can't capture the mouse */
-                dprintf(("Released capture for window %x that is being disabled", getWindowHandle()));
-        }
+        //SvL: No need to clear focus as PM already does this
+        if(getWindowHandle() == GetCapture()) {
+                ReleaseCapture();  /* A disabled window can't capture the mouse */
+                dprintf(("Released capture for window %x that is being disabled", getWindowHandle()));
+        }
   }
   return rc;
@@ -2984 +2996 @@
 }
 //******************************************************************************
-//Note: Should return NULL if window is frame window! (IsOS2FrameWindowHandle depends on this 
+//Note: Should return NULL if window is frame window! (IsOS2FrameWindowHandle depends on this
 //      behaviour)
 //******************************************************************************
@@ -3060 +3072 @@
 
     if(window->getOS2FrameWindowHandle() == hwndOS2) {
-        return TRUE;
+        return TRUE;
     }
     return FALSE;