marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

user32/edit: Allow buffer access after EM_GETHANDLE. 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
oldstable
Nikolay Sivov 2017-12-05 15:09:03 +03:00 committed by Alexandre Julliard
parent a0a12d9f41
commit f62d8dc58f
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/user32/edit.c
View File

@ -1264,8 +1264,6 @@ static inline void text_buffer_changed(EDITSTATE *es)
*/ */
static void EDIT_LockBuffer(EDITSTATE *es) static void EDIT_LockBuffer(EDITSTATE *es)
{ {
if (es->hlocapp) return;
if (!es->text) { if (!es->text) {
if(!es->hloc32W) return; if(!es->hloc32W) return;
@ -1306,8 +1304,6 @@ static void EDIT_LockBuffer(EDITSTATE *es)
*/ */
static void EDIT_UnlockBuffer(EDITSTATE *es, BOOL force) static void EDIT_UnlockBuffer(EDITSTATE *es, BOOL force)
{ {
if (es->hlocapp) return;
/* Edit window might be already destroyed */ /* Edit window might be already destroyed */
if(!IsWindow(es->hwndSelf)) if(!IsWindow(es->hwndSelf))
{ {
@ -1323,7 +1319,6 @@ static void EDIT_UnlockBuffer(EDITSTATE *es, BOOL force)
ERR("es->text == 0 ... please report\n"); ERR("es->text == 0 ... please report\n");
return; return;
} }
if (force || (es->lock_count == 1)) { if (force || (es->lock_count == 1)) {
if (es->hloc32W) { if (es->hloc32W) {
UINT countA = 0; UINT countA = 0;
@ -5205,7 +5200,8 @@ LRESULT EditWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, B
break; break;
} }
if (IsWindow(hwnd) && es) EDIT_UnlockBuffer(es, FALSE); if (IsWindow(hwnd) && es && msg != EM_GETHANDLE)
EDIT_UnlockBuffer(es, FALSE);
TRACE("hwnd=%p msg=%x (%s) -- 0x%08lx\n", hwnd, msg, SPY_GetMsgName(msg, hwnd), result); TRACE("hwnd=%p msg=%x (%s) -- 0x%08lx\n", hwnd, msg, SPY_GetMsgName(msg, hwnd), result);

21
dlls/user32/tests/edit.c
View File

@ -2786,12 +2786,10 @@ static void test_EM_GETHANDLE(void)
/* See if WM_GETTEXTLENGTH/WM_GETTEXT still work. */ /* See if WM_GETTEXTLENGTH/WM_GETTEXT still work. */
len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0);
todo_wine
ok(len == lstrlenA(str1), "Unexpected text length %d.\n", len); ok(len == lstrlenA(str1), "Unexpected text length %d.\n", len);
lstrcpyA(current, str0); lstrcpyA(current, str0);
r = SendMessageA(hEdit, WM_GETTEXT, sizeof(current), (LPARAM)current); r = SendMessageA(hEdit, WM_GETTEXT, sizeof(current), (LPARAM)current);
todo_wine
ok((r == lstrlenA(str1)) && !lstrcmpA(current, str1), ok((r == lstrlenA(str1)) && !lstrcmpA(current, str1),
"Unexpected retval %d and text \"%s\" (expected %d and \"%s\")\n", r, current, lstrlenA(str1), str1); "Unexpected retval %d and text \"%s\" (expected %d and \"%s\")\n", r, current, lstrlenA(str1), str1);
@ -2802,15 +2800,28 @@ todo_wine
LocalUnlock(hmem); LocalUnlock(hmem);
len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0);
todo_wine ok(len == lstrlenA(str1_1), "Unexpected text length %d.\n", len);
ok(len == lstrlenA(str1), "Unexpected text length %d.\n", len);
lstrcpyA(current, str0); lstrcpyA(current, str0);
r = SendMessageA(hEdit, WM_GETTEXT, sizeof(current), (LPARAM)current); r = SendMessageA(hEdit, WM_GETTEXT, sizeof(current), (LPARAM)current);
todo_wine
ok((r == lstrlenA(str1_1)) && !lstrcmpA(current, str1_1), ok((r == lstrlenA(str1_1)) && !lstrcmpA(current, str1_1),
"Unexpected retval %d and text \"%s\" (expected %d and \"%s\")\n", r, current, lstrlenA(str1_1), str1_1); "Unexpected retval %d and text \"%s\" (expected %d and \"%s\")\n", r, current, lstrlenA(str1_1), str1_1);
/* See if WM_SETTEXT/EM_REPLACESEL work. */
r = SendMessageA(hEdit, WM_SETTEXT, 0, (LPARAM)str1);
ok(r, "Failed to set text.\n");
buffer = LocalLock(hmem);
ok(buffer != NULL && buffer[0] == '1', "Unexpected buffer contents\n");
LocalUnlock(hmem);
r = SendMessageA(hEdit, EM_REPLACESEL, 0, (LPARAM)str1_1);
ok(r, "Failed to replace selection.\n");
buffer = LocalLock(hmem);
ok(buffer != NULL && buffer[0] == '2', "Unexpected buffer contents\n");
LocalUnlock(hmem);
/* use LocalAlloc first to get a different handle */ /* use LocalAlloc first to get a different handle */
halloc = LocalAlloc(LMEM_MOVEABLE, 42); halloc = LocalAlloc(LMEM_MOVEABLE, 42);
ok(halloc != NULL, "got %p (expected != NULL)\n", halloc); ok(halloc != NULL, "got %p (expected != NULL)\n", halloc);