Piotr Caban : user32: Let ComboBox edit control handle the redraw even if CBF_NOREDRAW is set.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 910129fcf7a7ade52a78d588685a860acae8d8b8
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=910129fcf7a7ade52a78d5886...

Author: Piotr Caban <piotr(a)codeweavers.com>
Date:   Fri Jan  5 19:25:20 2018 +0100

user32: Let ComboBox edit control handle the redraw even if CBF_NOREDRAW is set.

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/user32/combo.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c
index 0e64e85..956385f 100644
--- a/dlls/user32/combo.c
+++ b/dlls/user32/combo.c
@@ -703,8 +703,6 @@ static void CBPaintText(
    INT	id, size = 0;
    LPWSTR pText = NULL;
 
-   if( lphc->wState & CBF_NOREDRAW ) return;
-
    TRACE("\n");
 
    /* follow Windows combobox that sends a bunch of text
@@ -733,8 +731,9 @@ static void CBPaintText(
 	if( lphc->wState & CBF_FOCUSED )
            SendMessageW(lphc->hWndEdit, EM_SETSEL, 0, -1);
    }
-   else if( IsWindowVisible( lphc->self )) /* paint text field ourselves */
+   else if(!(lphc->wState & CBF_NOREDRAW) && IsWindowVisible( lphc->self ))
    {
+     /* paint text field ourselves */
      HDC hdc = hdc_paint ? hdc_paint : GetDC(lphc->self);
      UINT itemState = ODS_COMBOBOXEDIT;
      HFONT hPrevFont = (lphc->hFont) ? SelectObject(hdc, lphc->hFont) : 0;