[ros-diffs] [reactos] 01/01: [USER32] EDIT_WM_KillFocus(): Restore Wine code, #ifdef'ed out

[Serge Gautherie]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c2dbc18660d4a5e33702e…

commit c2dbc18660d4a5e33702e0df7b6183d2c42ff3c2
Author:     Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr>
AuthorDate: Thu Dec 27 17:37:54 2018 +0100
Commit:     Mark Jansen <mark.jansen(a)reactos.org>
CommitDate: Sun Apr 26 17:48:41 2020 +0200

    [USER32] EDIT_WM_KillFocus(): Restore Wine code, #ifdef'ed out
    
    Use '#ifdef __REACTOS__' for WINESYNC'ed code.
    
    Partially reverts 71ab0b5d4cb7fe00e0047308a18ae48c734266b9.
    CORE-10266
---
 win32ss/user/user32/controls/edit.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/win32ss/user/user32/controls/edit.c b/win32ss/user/user32/controls/edit.c
index 1eccfbf1684..f01558a9d06 100644
--- a/win32ss/user/user32/controls/edit.c
+++ b/win32ss/user/user32/controls/edit.c
@@ -3634,6 +3634,7 @@ static LRESULT EDIT_WM_KeyDown(EDITSTATE *es, INT key)
  */
 static LRESULT EDIT_WM_KillFocus(EDITSTATE *es)
 {
+#ifdef __REACTOS__
 	HWND hCombo;
 	LONG lStyles;
 
@@ -3654,8 +3655,16 @@ static LRESULT EDIT_WM_KillFocus(EDITSTATE *es)
 		if ((lStyles & CBS_DROPDOWN) || (lStyles & CBS_SIMPLE))
 			SendMessage(hCombo, WM_CBLOSTTEXTFOCUS, 0, 0);
 	}
-
-	return 0;
+#else
+        es->flags &= ~EF_FOCUSED;
+        DestroyCaret();
+        if(!(es->style & ES_NOHIDESEL))
+                EDIT_InvalidateText(es, es->selection_start, es->selection_end);
+        EDIT_NOTIFY_PARENT(es, EN_KILLFOCUS);
+        /* throw away left over scroll when we lose focus */
+        es->wheelDeltaRemainder = 0;
+#endif
+        return 0;
 }