user32: Set the edit text in a combobox only if combobox has strings.

0e799c6d · Dmitry Timoshkov · Alexandre Julliard · 9e3ab87a · 0e799c6d
Commit 0e799c6d authored Dec 19, 2007 by Dmitry Timoshkov Committed by Alexandre Julliard Dec 19, 2007
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

combo.c dlls/user32/combo.c +6 -3

No files found.
--- a/dlls/user32/combo.c
+++ b/dlls/user32/combo.c
@@ -1030,9 +1030,12 @@ static void CBUpdateEdit( LPHEADCOMBO lphc , INT index )
       }
   }

-   lphc->wState |= (CBF_NOEDITNOTIFY | CBF_NOLBSELECT);
-   SendMessageW(lphc->hWndEdit, WM_SETTEXT, 0, pText ? (LPARAM)pText : (LPARAM)empty_stringW);
-   lphc->wState &= ~(CBF_NOEDITNOTIFY | CBF_NOLBSELECT);
+   if( CB_HASSTRINGS(lphc) )
+   {
+      lphc->wState |= (CBF_NOEDITNOTIFY | CBF_NOLBSELECT);
+      SendMessageW(lphc->hWndEdit, WM_SETTEXT, 0, pText ? (LPARAM)pText : (LPARAM)empty_stringW);
+      lphc->wState &= ~(CBF_NOEDITNOTIFY | CBF_NOLBSELECT);
+   }

   if( lphc->wState & CBF_FOCUSED )
      SendMessageW(lphc->hWndEdit, EM_SETSEL, 0, (LPARAM)(-1));