Changeset 21949 for trunk/src

Timestamp:

Jan 19, 2012, 6:55:02 PM (14 years ago)

Author:

dmik

Message:

Add GetComboBoxInfo() to USER32.

Taken from the recent Wine sources. Fixes the Winrar startup
problem.

Location:

trunk/src/user32

Files:

• combo.c (modified) (3 diffs)
• user32.def (modified) (1 diff)
• user32dbg.def (modified) (1 diff)

trunk/src/user32/combo.c

@@ -1886 +1886 @@
 }
 
+static LRESULT COMBO_GetComboBoxInfo(const HEADCOMBO *lphc, COMBOBOXINFO *pcbi)
+{
+    if (!pcbi || (pcbi->cbSize < sizeof(COMBOBOXINFO)))
+        return FALSE;
+
+    pcbi->rcItem = lphc->textRect;
+    pcbi->rcButton = lphc->buttonRect;
+    pcbi->stateButton = 0;
+    if (lphc->wState & CBF_BUTTONDOWN)
+        pcbi->stateButton |= STATE_SYSTEM_PRESSED;
+    if (IsRectEmpty(&lphc->buttonRect))
+        pcbi->stateButton |= STATE_SYSTEM_INVISIBLE;
+    pcbi->hwndCombo = lphc->self;
+    pcbi->hwndItem = lphc->hWndEdit;
+    pcbi->hwndList = lphc->hWndLBox;
+    return TRUE;
+}
 
 /***********************************************************************
@@ -2279 +2296 @@
     case CB_GETEXTENDEDUI:
         return  (lphc->wState & CBF_EUI) ? TRUE : FALSE;
-
+    case CB_GETCOMBOBOXINFO:
+        return COMBO_GetComboBoxInfo(lphc, (COMBOBOXINFO *)lParam);
     default:
         if (message >= WM_USER)
@@ -2310 +2328 @@
     return ComboWndProc_common( hwnd, message, wParam, lParam, TRUE );
 }
+
+/*************************************************************************
+ *           GetComboBoxInfo   (USER32.@)
+ */
+BOOL WINAPI GetComboBoxInfo(HWND hwndCombo,      /* [in] handle to combo box */
+                PCOMBOBOXINFO pcbi   /* [in/out] combo box information */)
+{
+    TRACE("(%p, %p)\n", hwndCombo, pcbi);
+    return SendMessageW(hwndCombo, CB_GETCOMBOBOXINFO, 0, (LPARAM)pcbi);
+}

trunk/src/user32/user32.def

@@ -697 +697 @@
     PrivateExtractIconExA      = "_PrivateExtractIconExA@20"   @1018
 
+
+    GetComboBoxInfo            = "_GetComboBoxInfo@8"          @1019
+
 ;
 ; ENDOFEXPORTS

trunk/src/user32/user32dbg.def

@@ -696 +696 @@
     PrivateExtractIconExA      = "_PrivateExtractIconExA@20"   @1018
 
+
+    GetComboBoxInfo            = "_GetComboBoxInfo@8"          @1019
+
 ;
 ; ENDOFEXPORTS