[ros-diffs] [reactos] 01/01: [WINESYNC] user32/edit: Allow buffer access after EM_GETHANDLE.

[Thomas Faber]

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

commit 8e0c920fd2649b1127abe37b88f5753647df5d7d
Author:     Thomas Faber <thomas.faber(a)reactos.org>
AuthorDate: Sun Mar 5 14:42:22 2023 -0500
Commit:     Thomas Faber <thomas.faber(a)reactos.org>
CommitDate: Tue Mar 7 21:48:06 2023 -0500

    [WINESYNC] user32/edit: Allow buffer access after EM_GETHANDLE.
    
    wine commit id f62d8dc58fb3fb5f11a8ab55620ab9b2fbdaf967 by Nikolay Sivov
<nsivov(a)codeweavers.com>
---
 win32ss/user/user32/controls/edit.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/win32ss/user/user32/controls/edit.c b/win32ss/user/user32/controls/edit.c
index a65a4d6dab3..46a0ed5b8b7 100644
--- a/win32ss/user/user32/controls/edit.c
+++ b/win32ss/user/user32/controls/edit.c
@@ -1293,8 +1293,6 @@ static inline void text_buffer_changed(EDITSTATE *es)
  */
 static void EDIT_LockBuffer(EDITSTATE *es)
 {
-        if (es->hlocapp) return;
-
 	if (!es->text) {
 
 #ifdef __REACTOS__
@@ -1358,8 +1356,6 @@ static void EDIT_LockBuffer(EDITSTATE *es)
  */
 static void EDIT_UnlockBuffer(EDITSTATE *es, BOOL force)
 {
-        if (es->hlocapp) return;
-
 	/* Edit window might be already destroyed */
 	if(!IsWindow(es->hwndSelf))
 	{
@@ -5346,12 +5342,12 @@ LRESULT WINAPI EditWndProc_common( HWND hwnd, UINT msg, WPARAM
wParam, LPARAM lP
 	}
 
 #ifdef __REACTOS__
-	/* ReactOS: check GetWindowLong in case es has been destroyed during processing */
-	if (IsWindow(hwnd) && es && GetWindowLongPtrW(hwnd, 0))
-		EDIT_UnlockBuffer(es, FALSE);
+        /* ReactOS: check GetWindowLong in case es has been destroyed during processing
*/
+        if (IsWindow(hwnd) && es && msg != EM_GETHANDLE &&
GetWindowLongPtrW(hwnd, 0))
 #else
-	if (IsWindow(hwnd) && es) EDIT_UnlockBuffer(es, FALSE);
+        if (IsWindow(hwnd) && es && msg != EM_GETHANDLE)
 #endif
+            EDIT_UnlockBuffer(es, FALSE);
 
         TRACE("hwnd=%p msg=%x (%s) -- 0x%08lx\n", hwnd, msg,
SPY_GetMsgName(msg, hwnd), result);