Changeset 5630 for trunk/src/comctl32/comboex.c

Timestamp:

Apr 29, 2001, 12:30:59 PM (24 years ago)

Author:

sandervl

Message:

wine resync

File:

• trunk/src/comctl32/comboex.c (modified) (23 diffs)

trunk/src/comctl32/comboex.c

@@ -19 +19 @@
 
 /*
- * ComboBoxEx control v2 (mod4)
+ * ComboBoxEx control v2 (mod5)
  *
  * Copyright 1998, 1999 Eric Kohl
@@ -59 +59 @@
  *   5. The LBN_SELCHANGE is just for documentation purposes.
  *
+ *  mod 5
+ *   1. Add support for CB_GETITEMDATA to a Comboex. Returns the LPARAM
+ *      passed during insert of item.
+ *   2. Remember selected item and don't issue CB_SETCURSEL unless needed.
+ *   3. Add initial support for WM_NCCREATE to remove unwanted window styles
+ *      (Currently just WS_VSCROLL and WS_HSCROLL, but probably should be
+ *       more.)
+ *   4. Improve some traces.
+ *   5. Add support for CB_SETITEMDATA sets LPARAM value from item.
+ *
  * Test vehicals were the ControlSpy modules (rebar.exe and comboboxex.exe),
- *  and IE 4.0.
+ *  WinRAR, and IE 4.0.
  *
  */
@@ -69 +79 @@
 #include "debugtools.h"
 #include "wine/unicode.h"
-
 #ifdef __WIN32OS2__
 #include "ccbase.h"
@@ -109 +118 @@
     WNDPROC      prevComboWndProc;   /* previous Combo WNDPROC value */
     DWORD        dwExtStyle;
+    INT          selected;         /* index of selected item */
     DWORD        flags;            /* WINE internal flags */
     HFONT        font;
@@ -882 +892 @@
 
 static LRESULT
+COMBOEX_GetItemData (HWND hwnd, WPARAM wParam, LPARAM lParam)
+{
+    INT index = wParam;
+    COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr (hwnd);
+    CBE_ITEMDATA *item1, *item2;
+    LRESULT lret = 0;
+
+    item1 = (CBE_ITEMDATA *)COMBOEX_Forward (hwnd, CB_GETITEMDATA, 
+                                             wParam, lParam);
+    if ((item1 != NULL) && ((LRESULT)item1 != CB_ERR)) {
+        item2 = COMBOEX_FindItem (infoPtr, index);
+        if (item2 != item1) {
+            ERR("data structures damaged!\n");
+            return CB_ERR;
+        }
+        if (item1->mask & CBEIF_LPARAM)
+            lret = (LRESULT) item1->lParam;
+        TRACE("returning 0x%08lx\n", lret);
+        return lret;
+    }
+    lret = (LRESULT)item1;
+    TRACE("non-valid result from combo, returning 0x%08lx\n", lret);
+    return lret;
+}
+
+
+static LRESULT
 COMBOEX_SetCursel (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -896 +933 @@
     TRACE("selecting item %d text=%s\n", index, (item->pszText) ?
           debugstr_w(item->pszText) : "<null>");
+    infoPtr->selected = index;
 
     lret = SendMessageW (infoPtr->hwndCombo, CB_SETCURSEL, wParam, lParam);
     COMBOEX_SetEditText (infoPtr, item);
     return lret;
+}
+
+
+static LRESULT
+COMBOEX_SetItemData (HWND hwnd, WPARAM wParam, LPARAM lParam)
+{
+    INT index = wParam;
+    COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr (hwnd);
+    CBE_ITEMDATA *item1, *item2;
+
+    item1 = (CBE_ITEMDATA *)COMBOEX_Forward (hwnd, CB_GETITEMDATA, 
+                                             wParam, lParam);
+    if ((item1 != NULL) && ((LRESULT)item1 != CB_ERR)) {
+        item2 = COMBOEX_FindItem (infoPtr, index);
+        if (item2 != item1) {
+            ERR("data structures damaged!\n");
+            return CB_ERR;
+        }
+        item1->mask |= CBEIF_LPARAM;
+        item1->lParam = lParam;
+        TRACE("setting lparam to 0x%08lx\n", lParam);
+        return 0;
+    }
+    TRACE("non-valid result from combo 0x%08lx\n", (DWORD)item1);
+    return (LRESULT)item1;
 }
 
@@ -968 +1031 @@
     infoPtr->nb_items = 0;
     infoPtr->hwndSelf = hwnd;
+    infoPtr->selected = -1;
 
     SetWindowLongA (hwnd, 0, (DWORD)infoPtr);
@@ -975 +1039 @@
                         (CBS_SIMPLE|CBS_DROPDOWN|CBS_DROPDOWNLIST|WS_CHILD);
 
-    TRACE("combo style=%08lx, additional style=%08lx\n", dwComboStyle,
+    GetWindowRect(hwnd, &wnrc1);
+    GetClientRect(hwnd, &clrc1);
+    TRACE("EX window=(%d,%d)-(%d,%d) client=(%d,%d)-(%d,%d)\n",
+          wnrc1.left, wnrc1.top, wnrc1.right, wnrc1.bottom,
+          clrc1.left, clrc1.top, clrc1.right, clrc1.bottom);
+    TRACE("combo style=%08lx, adding style=%08lx\n", dwComboStyle,
           WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_VSCROLL |
           CBS_NOINTEGRALHEIGHT | CBS_DROPDOWNLIST |
@@ -1077 +1146 @@
     GetClientRect(hwnd, &clrc1);
     GetWindowRect(infoPtr->hwndCombo, &cmbwrc);
-    TRACE("Ex wnd=(%d,%d)-(%d,%d) Ex clt=(%d,%d)-(%d,%d) Cb wnd=(%d,%d)-(%d,%d)\n",
+    TRACE("EX window=(%d,%d)-(%d,%d) client=(%d,%d)-(%d,%d) CB wnd=(%d,%d)-(%d,%d)\n",
           wnrc1.left, wnrc1.top, wnrc1.right, wnrc1.bottom,
           clrc1.left, clrc1.top, clrc1.right, clrc1.bottom,
@@ -1086 +1155 @@
 
     GetWindowRect(infoPtr->hwndCombo, &cmbwrc);
-    TRACE("Ex wnd=(%d,%d)-(%d,%d)\n",
+    TRACE("CB window=(%d,%d)-(%d,%d)\n",
           cmbwrc.left, cmbwrc.top, cmbwrc.right, cmbwrc.bottom);
     SetWindowPos(hwnd, HWND_TOP, 
@@ -1118 +1187 @@
     INT cursel, n, oldItem;
     NMCBEENDEDITA cbeend;
+    DWORD oldflags;
 
     TRACE("for command %d\n", command);
@@ -1171 +1241 @@
             }
         }
-        if (infoPtr->flags & WCBE_ACTEDIT) {
+
+        /* Save flags for testing and reset them */
+        oldflags = infoPtr->flags;
+        infoPtr->flags &= ~(WCBE_ACTEDIT | WCBE_EDITCHG);
+
+        if (oldflags & WCBE_ACTEDIT) {
             WideCharToMultiByte (CP_ACP, 0, item->pszText, -1,
                                  cbeend.szText, sizeof(cbeend.szText),
                                  NULL, NULL);
-            cbeend.fChanged = (infoPtr->flags & WCBE_EDITCHG);
+            cbeend.fChanged = (oldflags & WCBE_EDITCHG);
             cbeend.iNewSelection = SendMessageW (infoPtr->hwndCombo,
                                                  CB_GETCURSEL, 0, 0);
             cbeend.iWhy = CBENF_DROPDOWN;
 
-            infoPtr->flags &= ~(WCBE_ACTEDIT | WCBE_EDITCHG);
             if (COMBOEX_Notify (infoPtr, CBEN_ENDEDITA, 
                                 (NMHDR *)&cbeend, FALSE)) {
@@ -1188 +1262 @@
             }
         }
-        SendMessageW (hwnd, CB_SETCURSEL, cursel, 0);
-        SetFocus(infoPtr->hwndCombo);
+
+        /* if selection has changed the set the new current selection */
+        cursel = SendMessageW (infoPtr->hwndCombo, CB_GETCURSEL, 0, 0);
+        if ((oldflags & WCBE_EDITCHG) || (cursel != infoPtr->selected)) {
+            infoPtr->selected = cursel;
+            SendMessageW (hwnd, CB_SETCURSEL, cursel, 0);
+            SetFocus(infoPtr->hwndCombo);
+        }
         return 0;
 
@@ -1210 +1290 @@
             ERR("item %d not found. Problem!\n", oldItem);
             break;
-        }  
+        }
+        infoPtr->selected = oldItem;
         COMBOEX_SetEditText (infoPtr, item);
         return SendMessageW (GetParent (hwnd), WM_COMMAND, wParam, 
@@ -1619 +1700 @@
 
 static LRESULT
+COMBOEX_NCCreate (HWND hwnd, WPARAM wParam, LPARAM lParam)
+{
+    /* WARNING: The COMBOEX_INFO structure is not yet created */
+    DWORD oldstyle, newstyle;
+
+    oldstyle = (DWORD)GetWindowLongA (hwnd, GWL_STYLE);
+    newstyle = oldstyle & ~(WS_VSCROLL | WS_HSCROLL);
+    if (newstyle != oldstyle) {
+        TRACE("req style %08lx, reseting style %08lx\n",
+              oldstyle, newstyle);
+        SetWindowLongA (hwnd, GWL_STYLE, newstyle);
+    }
+    return 1;
+}
+
+
+static LRESULT
 COMBOEX_Size (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -1656 +1754 @@
             - (cbx_crect.right-cbx_crect.left); 
 
+    TRACE("winpos=(%d,%d %dx%d) flags=0x%08x\n",
+          wp->x, wp->y, wp->cx, wp->cy, wp->flags);
     TRACE("EX window=(%d,%d)-(%d,%d), client=(%d,%d)-(%d,%d)\n",
           cbx_wrect.left, cbx_wrect.top, cbx_wrect.right, cbx_wrect.bottom,
@@ -1771 +1871 @@
                     break;
                 }
-                  
+                infoPtr->selected = oldItem;              
                 COMBOEX_SetEditText (infoPtr, item);
                 RedrawWindow (infoPtr->hwndCombo, 0, 0, RDW_ERASE | 
@@ -2110 +2210 @@
 {
     TRACE("hwnd=%x msg=%x wparam=%x lParam=%lx\n", hwnd, uMsg, wParam, lParam);
-    if (!COMBOEX_GetInfoPtr (hwnd) && (uMsg != WM_CREATE))
+
+    if (!COMBOEX_GetInfoPtr (hwnd)) {
+        if (uMsg == WM_CREATE)
+            return COMBOEX_Create (hwnd, wParam, lParam);
+        if (uMsg == WM_NCCREATE)
+            COMBOEX_NCCreate (hwnd, wParam, lParam);
         return DefWindowProcA (hwnd, uMsg, wParam, lParam);
+    }
 
     switch (uMsg)
@@ -2167 +2273 @@
 /*   Combo messages we are not sure if we need to process or just forward */
         case CB_GETDROPPEDCONTROLRECT:
-        case CB_GETITEMDATA:
         case CB_GETITEMHEIGHT:
         case CB_GETLBTEXT:
@@ -2175 +2280 @@
         case CB_RESETCONTENT:
         case CB_SELECTSTRING:
-        case CB_SETITEMDATA:
         case WM_SETTEXT:
         case WM_GETTEXT:
-            FIXME("(0x%x 0x%x 0x%lx): possible missing fucntion\n", 
+            FIXME("(0x%x 0x%x 0x%lx): possibly missing function\n",
                   uMsg, wParam, lParam);
             return COMBOEX_Forward (hwnd, uMsg, wParam, lParam);
@@ -2196 +2300 @@
                                             wParam, lParam);
 
+        case CB_GETITEMDATA:
+            return COMBOEX_GetItemData (hwnd, wParam, lParam);
+
         case CB_SETCURSEL:
             return COMBOEX_SetCursel (hwnd, wParam, lParam);
+
+        case CB_SETITEMDATA:
+            return COMBOEX_SetItemData (hwnd, wParam, lParam);
 
         case CB_SETITEMHEIGHT:
@@ -2213 +2323 @@
 
 /*   Window messages we need to process */
-        case WM_CREATE:
-            return COMBOEX_Create (hwnd, wParam, lParam);
-
         case WM_DELETEITEM:
             return COMBOEX_WM_DeleteItem (hwnd, wParam, lParam);
@@ -2241 +2348 @@
             return defComCtl32ProcA (hwnd, uMsg, wParam, lParam);
 #else
-            return DefWindowProcA (hwnd, uMsg, wParam, lParam);
+            return DefWindowProcA (hwnd, uMsg, wParam, lParam);
 #endif
     }