March 2021 - Wine-devel - list.winehq.org

[tools] testbot/LogUtils: Highlight the dll 'version' errors.
by Francois Gouget 16 Mar '21

16 Mar '21

WineTest replaces the dll version information with an error message when it cannot get that information, or if the dll is missing an entry point needed by the test. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index eced000cb..840a5526a 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -325,7 +325,9 @@ sub GetReportLineCategory($) { return "skip"; } - if ($Line =~ /^[_.a-z0-9-]+:[_a-z0-9]* start / or + if ($Line =~ /^ \w+=dll is (?:missing|native|a stub)/ or + $Line =~ /^ \w+=(?:load error|version error \d+|version not (?:found|present))$/ or + $Line =~ /^[_.a-z0-9-]+:[_a-z0-9]* start / or $Line =~ /: this is the last test seen before the exception/) { return "info"; -- 2.20.1

1 0

[PATCH] winetest: Don't parse the test list if 'test --list' failed.
by Francois Gouget 16 Mar '21

16 Mar '21

Any non-zero exit code is grounds for ignoring the 'test --list' output. This also causes get_subtests() to return the actual process exit code rather than a generic internal error when it fails to parse the test list. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> ---- The better diagnostic error code may help further diagnosing bug 48061. * WineTest: get_subtests() fails randomly https://bugs.winehq.org/show_bug.cgi?id=48061 --- programs/winetest/main.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index e203b781dc8..2e5fdc6ab8c 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -724,9 +724,12 @@ get_subtests (const char *tempdir, struct wine_test *test, LPSTR res_name) } heap_free (cmd); - if (status == -2) + if (status) { - report (R_ERROR, "Cannot run %s error %u", test->exename, err); + if (status == -2) + report (R_ERROR, "Cannot run %s error %u", test->exename, err); + else + err = status; CloseHandle( subfile ); goto quit; } -- 2.20.1

1 0

[PATCH] dwrite: Fix the case of FreeType in a comment.
by Francois Gouget 16 Mar '21

16 Mar '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/dwrite/opentype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index a74c9712b6a..6e5624c622a 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -6484,7 +6484,7 @@ BOOL opentype_has_kerning_pairs(struct dwrite_fontface *fontface) count = GET_BE_WORD(header->table_count); offset = sizeof(*header); - /* Freetype limits table count this way. */ + /* FreeType limits table count this way. */ count = min(count, 32); /* Check for presence of format 0 subtable with horizontal coverage. */ -- 2.20.1

1 0

[PATCH] msi: Fix building the fusion filename.
by Hans Leidekker 16 Mar '21

16 Mar '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50809 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/package.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 05f122fb545..bf93f3e9afe 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -534,7 +534,7 @@ static LPWSTR get_fusion_filename(MSIPACKAGE *package) if (!(filename = msi_alloc(len * sizeof(WCHAR)))) return NULL; lstrcpyW(filename, path); - lstrcpyW(filename, L"\\"); + lstrcatW(filename, L"\\"); lstrcatW(filename, L"fusion.dll"); if (GetFileAttributesW(filename) != INVALID_FILE_ATTRIBUTES) { -- 2.30.2

1 0

[PATCH] ntdll: Fall back to reading /dev/urandom if getrandom() is not supported.
by Hans Leidekker 16 Mar '21

16 Mar '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50168 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/ntdll/unix/system.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 48321957fb8..6fa71ddfb91 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2036,6 +2036,22 @@ static void get_timezone_info( RTL_DYNAMIC_TIME_ZONE_INFORMATION *tzi ) } +static void read_dev_urandom( void *buf, ULONG len ) +{ + int fd = open( "/dev/urandom", O_RDONLY ); + if (fd != -1) + { + int ret; + do + { + ret = read( fd, buf, len ); + } + while (ret == -1 && errno == EINTR); + close( fd ); + } + else WARN( "can't open /dev/urandom\n" ); +} + /****************************************************************************** * NtQuerySystemInformation (NTDLL.@) */ @@ -2525,19 +2541,10 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, ret = getrandom( info, len, 0 ); } while (ret == -1 && errno == EINTR); + + if (ret == -1 && errno == ENOSYS) read_dev_urandom( info, len ); #else - int fd = open( "/dev/urandom", O_RDONLY ); - if (fd != -1) - { - int ret; - do - { - ret = read( fd, info, len ); - } - while (ret == -1 && errno == EINTR); - close( fd ); - } - else WARN( "can't open /dev/urandom\n" ); + read_dev_urandom( info, len ); #endif } } -- 2.30.2

1 0

[PATCH 5/5] riched20: Handle sending EN_MSGFILTER notifications in the host.
by Huw Davies 16 Mar '21

16 Mar '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.c | 57 ++--------------------------------------- dlls/riched20/txthost.c | 40 +++++++++++++++++++++++++++-- 2 files changed, 40 insertions(+), 57 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 559ed88ea33..6f38231de9b 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2384,28 +2384,6 @@ static BOOL copy_or_cut( ME_TextEditor *editor, BOOL cut ) return SUCCEEDED( hr ); } -/* helper to send a msg filter notification */ -static BOOL -ME_FilterEvent(ME_TextEditor *editor, UINT msg, WPARAM* wParam, LPARAM* lParam) -{ - MSGFILTER msgf; - - if (!editor->hWnd || !editor->hwndParent) return FALSE; - msgf.nmhdr.hwndFrom = editor->hWnd; - msgf.nmhdr.idFrom = GetWindowLongW(editor->hWnd, GWLP_ID); - msgf.nmhdr.code = EN_MSGFILTER; - msgf.msg = msg; - msgf.wParam = *wParam; - msgf.lParam = *lParam; - if (SendMessageW(editor->hwndParent, WM_NOTIFY, msgf.nmhdr.idFrom, (LPARAM)&msgf)) - return FALSE; - *wParam = msgf.wParam; - *lParam = msgf.lParam; - msgf.wParam = *wParam; - - return TRUE; -} - static void ME_UpdateSelectionLinkAttribute(ME_TextEditor *editor) { ME_Paragraph *start_para, *end_para; @@ -4132,9 +4110,6 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, case WM_LBUTTONDOWN: { ME_CommitUndo(editor); /* End coalesced undos for typed characters */ - if ((editor->nEventMask & ENM_MOUSEEVENTS) && - !ME_FilterEvent(editor, msg, &wParam, &lParam)) - return 0; ITextHost_TxSetFocus(editor->texthost); ME_LButtonDown(editor, (short)LOWORD(lParam), (short)HIWORD(lParam), ME_CalculateClickCount(editor, msg, wParam, lParam)); @@ -4145,9 +4120,6 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, break; } case WM_MOUSEMOVE: - if ((editor->nEventMask & ENM_MOUSEEVENTS) && - !ME_FilterEvent(editor, msg, &wParam, &lParam)) - return 0; if (editor->bMouseCaptured) ME_MouseMove(editor, (short)LOWORD(lParam), (short)HIWORD(lParam)); else @@ -4163,9 +4135,6 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } if (editor->nSelectionType == stDocument) editor->nSelectionType = stPosition; - if ((editor->nEventMask & ENM_MOUSEEVENTS) && - !ME_FilterEvent(editor, msg, &wParam, &lParam)) - return 0; else { ME_SetCursor(editor); @@ -4176,9 +4145,6 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, case WM_RBUTTONDOWN: case WM_RBUTTONDBLCLK: ME_CommitUndo(editor); /* End coalesced undos for typed characters */ - if ((editor->nEventMask & ENM_MOUSEEVENTS) && - !ME_FilterEvent(editor, msg, &wParam, &lParam)) - return 0; ME_LinkNotify(editor, msg, wParam, lParam); goto do_default; case WM_CONTEXTMENU: @@ -4206,22 +4172,11 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, case WM_COMMAND: TRACE("editor wnd command = %d\n", LOWORD(wParam)); return 0; - case WM_KEYUP: - if ((editor->nEventMask & ENM_KEYEVENTS) && - !ME_FilterEvent(editor, msg, &wParam, &lParam)) - return 0; - goto do_default; case WM_KEYDOWN: - if ((editor->nEventMask & ENM_KEYEVENTS) && - !ME_FilterEvent(editor, msg, &wParam, &lParam)) - return 0; if (ME_KeyDown(editor, LOWORD(wParam))) return 0; goto do_default; case WM_CHAR: - if ((editor->nEventMask & ENM_KEYEVENTS) && - !ME_FilterEvent(editor, msg, &wParam, &lParam)) - return 0; return handle_wm_char( editor, wParam, lParam ); case WM_UNICHAR: if (unicode) @@ -4328,16 +4283,8 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } case WM_MOUSEWHEEL: { - int delta; - BOOL ctrl_is_down; - - if ((editor->nEventMask & ENM_MOUSEEVENTS) && - !ME_FilterEvent(editor, msg, &wParam, &lParam)) - return 0; - - ctrl_is_down = GetKeyState(VK_CONTROL) & 0x8000; - - delta = GET_WHEEL_DELTA_WPARAM(wParam); + int delta = GET_WHEEL_DELTA_WPARAM( wParam ); + BOOL ctrl_is_down = GetKeyState( VK_CONTROL ) & 0x8000; /* if scrolling changes direction, ignore left overs */ if ((delta < 0 && editor->wheel_remain < 0) || diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index d10b303a137..a8286905659 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -38,10 +38,10 @@ struct host LONG ref; ITextServices *text_srv; ME_TextEditor *editor; /* to be removed */ - HWND window; + HWND window, parent; BOOL emulate_10; PARAFORMAT2 para_fmt; - DWORD props, scrollbars; + DWORD props, scrollbars, event_mask; }; static const ITextHostVtbl textHostVtbl; @@ -82,6 +82,7 @@ struct host *host_create( HWND hwnd, CREATESTRUCTW *cs, BOOL emulate_10 ) texthost->ITextHost_iface.lpVtbl = &textHostVtbl; texthost->ref = 1; texthost->window = hwnd; + texthost->parent = cs->hwndParent; texthost->emulate_10 = emulate_10; memset( &texthost->para_fmt, 0, sizeof(texthost->para_fmt) ); texthost->para_fmt.cbSize = sizeof(texthost->para_fmt); @@ -93,6 +94,7 @@ struct host *host_create( HWND hwnd, CREATESTRUCTW *cs, BOOL emulate_10 ) texthost->para_fmt.wAlignment = PFA_CENTER; texthost->editor = NULL; host_init_props( texthost ); + texthost->event_mask = 0; return texthost; } @@ -842,6 +844,26 @@ static HRESULT set_options( struct host *host, DWORD op, DWORD value, LRESULT *r return hr; } +static LRESULT send_msg_filter( struct host *host, UINT msg, WPARAM *wparam, LPARAM *lparam ) +{ + MSGFILTER msgf; + LRESULT res; + + if (!host->parent) return 0; + msgf.nmhdr.hwndFrom = host->window; + msgf.nmhdr.idFrom = GetWindowLongW( host->window, GWLP_ID ); + msgf.nmhdr.code = EN_MSGFILTER; + msgf.msg = msg; + msgf.wParam = *wparam; + msgf.lParam = *lparam; + if ((res = SendMessageW( host->parent, WM_NOTIFY, msgf.nmhdr.idFrom, (LPARAM)&msgf ))) + return res; + *wparam = msgf.wParam; + *lparam = msgf.lParam; + + return 0; +} + static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, BOOL unicode ) { @@ -866,6 +888,15 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, else return DefWindowProcW( hwnd, msg, wparam, lparam ); } + if ((((host->event_mask & ENM_KEYEVENTS) && msg >= WM_KEYFIRST && msg <= WM_KEYLAST) || + ((host->event_mask & ENM_MOUSEEVENTS) && msg >= WM_MOUSEFIRST && msg <= WM_MOUSELAST)) && + send_msg_filter( host, msg, &wparam, &lparam )) + { + TRACE( "exit (filtered) hwnd %p msg %04x (%s) %lx %lx -> %lu\n", + hwnd, msg, get_msg_name(msg), wparam, lparam, res ); + return res; + } + editor = host->editor; switch (msg) { @@ -1042,6 +1073,11 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, res = len; break; } + case EM_SETEVENTMASK: + host->event_mask = lparam; + hr = ITextServices_TxSendMessage( host->text_srv, msg, wparam, lparam, &res ); + break; + case EM_SETOPTIONS: hr = set_options( host, wparam, lparam, &res ); break; -- 2.23.0

1 0

[PATCH 4/5] riched20: Use the multiline property rather than style.
by Huw Davies 16 Mar '21

16 Mar '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/caret.c | 4 ++-- dlls/riched20/editor.c | 20 ++++++-------------- dlls/riched20/paint.c | 4 ++-- 3 files changed, 10 insertions(+), 18 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 6417bbde442..96765cba25d 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -99,7 +99,7 @@ int ME_GetTextLengthEx(ME_TextEditor *editor, const GETTEXTLENGTHEX *how) length = ME_GetTextLength(editor); - if ((editor->styleFlags & ES_MULTILINE) + if ((editor->props & TXTBIT_MULTILINE) && (how->flags & GTL_USECRLF) && !editor->bEmulateVersion10) /* Ignore GTL_USECRLF flag in 1.0 emulation */ length += editor->nParagraphs - 1; @@ -549,7 +549,7 @@ void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, int eol_len = 0; /* Check if new line is allowed for this control */ - if (!(editor->styleFlags & ES_MULTILINE)) + if (!(editor->props & TXTBIT_MULTILINE)) break; /* Find number of CR and LF in end of paragraph run */ diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index b7c07058801..559ed88ea33 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2461,7 +2461,7 @@ static BOOL handle_enter(ME_TextEditor *editor) } } - if (editor->styleFlags & ES_MULTILINE) + if (editor->props & TXTBIT_MULTILINE) { ME_Cursor cursor = editor->pCursors[0]; ME_Paragraph *para = cursor.para; @@ -3118,15 +3118,7 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) if (ed->props & TXTBIT_USEPASSWORD) ITextHost_TxGetPasswordChar(texthost, &ed->cPasswordMask); - if (ed->props & TXTBIT_MULTILINE) { - ed->styleFlags |= ES_MULTILINE; - ed->bWordWrap = (ed->props & TXTBIT_WORDWRAP) != 0; - } else { - ed->bWordWrap = FALSE; - } - - if (ed->props & TXTBIT_DISABLEDRAG) - ed->styleFlags |= ES_NOOLEDRAGDROP; + ed->bWordWrap = (ed->props & TXTBIT_WORDWRAP) && (ed->props & TXTBIT_MULTILINE); ed->notified_cr.cpMin = ed->notified_cr.cpMax = 0; @@ -3435,7 +3427,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, if (lParam) editor->bDialogMode = TRUE; - if (editor->styleFlags & ES_MULTILINE) + if (editor->props & TXTBIT_MULTILINE) code |= DLGC_WANTMESSAGE; if (!(editor->props & TXTBIT_SAVESELECTION)) code |= DLGC_HASSETSEL; @@ -3784,7 +3776,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } case EM_LINESCROLL: { - if (!(editor->styleFlags & ES_MULTILINE)) + if (!(editor->props & TXTBIT_MULTILINE)) return FALSE; ME_ScrollDown( editor, lParam * get_default_line_height( editor ) ); return TRUE; @@ -4579,7 +4571,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, case EM_SETTARGETDEVICE: if (wParam == 0) { - BOOL new = (lParam == 0 && (editor->styleFlags & ES_MULTILINE)); + BOOL new = (lParam == 0 && (editor->props & TXTBIT_MULTILINE)); if (editor->nAvailWidth || editor->bWordWrap != new) { editor->bWordWrap = new; @@ -4588,7 +4580,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } } else { int width = max(0, lParam); - if ((editor->styleFlags & ES_MULTILINE) && + if ((editor->props & TXTBIT_MULTILINE) && (!editor->bWordWrap || editor->nAvailWidth != width)) { editor->nAvailWidth = width; diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 34d0ab8a54f..8ef5ada5855 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -1086,7 +1086,7 @@ void ME_ScrollAbs(ME_TextEditor *editor, int x, int y) bScrollBarIsVisible = (winStyle & WS_VSCROLL) != 0; bScrollBarWillBeVisible = (editor->nTotalLength > editor->sizeWindow.cy && (editor->scrollbars & WS_VSCROLL) - && (editor->styleFlags & ES_MULTILINE)) + && (editor->props & TXTBIT_MULTILINE)) || (editor->scrollbars & ES_DISABLENOSCROLL); if (bScrollBarIsVisible != bScrollBarWillBeVisible) ITextHost_TxShowScrollBar(editor->texthost, SB_VERT, @@ -1211,7 +1211,7 @@ void ME_UpdateScrollBar(ME_TextEditor *editor) /* Update vertical scrollbar */ bScrollBarWasVisible = editor->vert_si.nMax > editor->vert_si.nPage; bScrollBarWillBeVisible = editor->nTotalLength > editor->sizeWindow.cy && - (editor->styleFlags & ES_MULTILINE); + (editor->props & TXTBIT_MULTILINE); if (editor->vert_si.nPos && !bScrollBarWillBeVisible) { -- 2.23.0

1 0

[PATCH 3/5] riched20: Use the host to set hide/save-sel, auto-word-sel, and vertical properties.
by Huw Davies 16 Mar '21

16 Mar '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.c | 30 ++++++------------------------ dlls/riched20/paint.c | 6 +++--- dlls/riched20/txthost.c | 35 +++++++++++++++++++++++++++++++---- dlls/riched20/txtsrv.c | 2 ++ 4 files changed, 42 insertions(+), 31 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index cf723d66cf6..b7c07058801 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3118,20 +3118,13 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) if (ed->props & TXTBIT_USEPASSWORD) ITextHost_TxGetPasswordChar(texthost, &ed->cPasswordMask); - if (ed->props & TXTBIT_AUTOWORDSEL) - ed->styleFlags |= ECO_AUTOWORDSELECTION; if (ed->props & TXTBIT_MULTILINE) { ed->styleFlags |= ES_MULTILINE; ed->bWordWrap = (ed->props & TXTBIT_WORDWRAP) != 0; } else { ed->bWordWrap = FALSE; } - if (!(ed->props & TXTBIT_HIDESELECTION)) - ed->styleFlags |= ES_NOHIDESEL; - if (ed->props & TXTBIT_SAVESELECTION) - ed->styleFlags |= ES_SAVESEL; - if (ed->props & TXTBIT_VERTICAL) - ed->styleFlags |= ES_VERTICAL; + if (ed->props & TXTBIT_DISABLEDRAG) ed->styleFlags |= ES_NOOLEDRAGDROP; @@ -3444,7 +3437,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, editor->bDialogMode = TRUE; if (editor->styleFlags & ES_MULTILINE) code |= DLGC_WANTMESSAGE; - if (!(editor->styleFlags & ES_SAVESEL)) + if (!(editor->props & TXTBIT_SAVESELECTION)) code |= DLGC_HASSETSEL; return code; } @@ -3492,8 +3485,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, case EM_GETOPTIONS: { /* these flags are equivalent to the ES_* counterparts */ - DWORD mask = ECO_VERTICAL | - ECO_NOHIDESEL | ECO_WANTRETURN | ECO_SELECTIONBAR; + DWORD mask = ECO_WANTRETURN | ECO_SELECTIONBAR; DWORD settings = editor->styleFlags & mask; return settings; @@ -3544,9 +3536,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, /* these flags are equivalent to ES_* counterparts, except for * ECO_AUTOWORDSELECTION that doesn't have an ES_* counterpart, * but is still stored in editor->styleFlags. */ - const DWORD mask = ECO_VERTICAL | - ECO_NOHIDESEL | ECO_WANTRETURN | - ECO_SELECTIONBAR | ECO_AUTOWORDSELECTION; + const DWORD mask = ECO_WANTRETURN | ECO_SELECTIONBAR; DWORD settings = mask & editor->styleFlags; DWORD oldSettings = settings; DWORD changedSettings; @@ -3584,15 +3574,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, ME_RewrapRepaint(editor); } - if ((changedSettings & settings & ES_NOHIDESEL) && !editor->bHaveFocus) - ME_InvalidateSelection( editor ); - if (changedSettings & settings & ECO_VERTICAL) - FIXME("ECO_VERTICAL not implemented yet!\n"); - if (changedSettings & settings & ECO_AUTOHSCROLL) - FIXME("ECO_WANTRETURN not implemented yet!\n"); - if (changedSettings & settings & ECO_AUTOWORDSELECTION) - FIXME("ECO_AUTOWORDSELECTION not implemented yet!\n"); } return settings; @@ -4216,7 +4198,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, create_caret(editor); update_caret(editor); ME_SendOldNotify(editor, EN_SETFOCUS); - if (!editor->bHideSelection && !(editor->styleFlags & ES_NOHIDESEL)) + if (!editor->bHideSelection && (editor->props & TXTBIT_HIDESELECTION)) ME_InvalidateSelection( editor ); return 0; case WM_KILLFOCUS: @@ -4226,7 +4208,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, hide_caret(editor); DestroyCaret(); ME_SendOldNotify(editor, EN_KILLFOCUS); - if (!editor->bHideSelection && !(editor->styleFlags & ES_NOHIDESEL)) + if (!editor->bHideSelection && (editor->props & TXTBIT_HIDESELECTION)) ME_InvalidateSelection( editor ); return 0; case WM_COMMAND: diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index e22dc64ebdb..34d0ab8a54f 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -270,8 +270,8 @@ static void draw_space( ME_Context *c, ME_Run *run, int x, int y, SetRect( &rect, x, ymin, x + run->nWidth, ymin + cy ); - if (c->editor->bHideSelection || (!c->editor->bHaveFocus && - !(c->editor->styleFlags & ES_NOHIDESEL))) selected = FALSE; + if (c->editor->bHideSelection || (!c->editor->bHaveFocus && (c->editor->props & TXTBIT_HIDESELECTION))) + selected = FALSE; if (c->editor->bEmulateVersion10) { old_style_selected = selected; @@ -366,7 +366,7 @@ static void draw_text_with_style( ME_Context *c, ME_Run *run, int x, int y, int yOffset = 0; BOOL selected = (nSelFrom < run->len && nSelTo >= 0 && nSelFrom < nSelTo && !c->editor->bHideSelection && - (c->editor->bHaveFocus || (c->editor->styleFlags & ES_NOHIDESEL))); + (c->editor->bHaveFocus || !(c->editor->props & TXTBIT_HIDESELECTION))); BOOL old_style_selected = FALSE; RECT sel_rect; HRGN clip = NULL, sel_rgn = NULL; diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 027b079d654..d10b303a137 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -60,7 +60,7 @@ static void host_init_props( struct host *host ) if (style & WS_VSCROLL) host->scrollbars |= ES_AUTOVSCROLL; if ((style & WS_HSCROLL) && !host->emulate_10) host->scrollbars |= ES_AUTOHSCROLL; - host->props = TXTBIT_RICHTEXT | TXTBIT_AUTOWORDSEL | TXTBIT_ALLOWBEEP; + host->props = TXTBIT_RICHTEXT | TXTBIT_ALLOWBEEP; if (style & ES_MULTILINE) host->props |= TXTBIT_MULTILINE; if (style & ES_READONLY) host->props |= TXTBIT_READONLY; if (style & ES_PASSWORD) host->props |= TXTBIT_USEPASSWORD; @@ -765,9 +765,11 @@ static HRESULT get_text_rangeA( struct host *host, TEXTRANGEA *rangeA, LRESULT * static HRESULT set_options( struct host *host, DWORD op, DWORD value, LRESULT *res ) { DWORD style, old_options, new_options, change, props_mask = 0; - const DWORD mask = ECO_AUTOVSCROLL | ECO_AUTOHSCROLL | ECO_NOHIDESEL | ECO_READONLY | ECO_WANTRETURN | - ECO_SELECTIONBAR | ECO_VERTICAL; - const DWORD host_mask = ECO_AUTOVSCROLL | ECO_AUTOHSCROLL | ECO_READONLY; + DWORD mask = ECO_AUTOWORDSELECTION | ECO_AUTOVSCROLL | ECO_AUTOHSCROLL | ECO_NOHIDESEL | ECO_READONLY | + ECO_WANTRETURN | ECO_SAVESEL | ECO_SELECTIONBAR | ECO_VERTICAL; + const DWORD host_mask = ECO_AUTOWORDSELECTION | ECO_AUTOVSCROLL | ECO_AUTOHSCROLL | ECO_NOHIDESEL | ECO_READONLY | + ECO_SAVESEL | ECO_VERTICAL; + HRESULT hr = S_OK; new_options = old_options = SendMessageW( host->window, EM_GETOPTIONS, 0, 0 ); @@ -790,6 +792,11 @@ static HRESULT set_options( struct host *host, DWORD op, DWORD value, LRESULT *r change = (new_options ^ old_options); + if (change & ECO_AUTOWORDSELECTION) + { + host->props ^= TXTBIT_AUTOWORDSEL; + props_mask |= TXTBIT_AUTOWORDSEL; + } if (change & ECO_AUTOVSCROLL) { host->scrollbars ^= WS_VSCROLL; @@ -800,11 +807,26 @@ static HRESULT set_options( struct host *host, DWORD op, DWORD value, LRESULT *r host->scrollbars ^= WS_HSCROLL; props_mask |= TXTBIT_SCROLLBARCHANGE; } + if (change & ECO_NOHIDESEL) + { + host->props ^= TXTBIT_HIDESELECTION; + props_mask |= TXTBIT_HIDESELECTION; + } if (change & ECO_READONLY) { host->props ^= TXTBIT_READONLY; props_mask |= TXTBIT_READONLY; } + if (change & ECO_SAVESEL) + { + host->props ^= TXTBIT_SAVESELECTION; + props_mask |= TXTBIT_SAVESELECTION; + } + if (change & ECO_VERTICAL) + { + host->props ^= TXTBIT_VERTICAL; + props_mask |= TXTBIT_VERTICAL; + } if (props_mask) ITextServices_OnTxPropertyBitsChange( host->text_srv, props_mask, host->props & props_mask ); @@ -813,6 +835,7 @@ static HRESULT set_options( struct host *host, DWORD op, DWORD value, LRESULT *r hr = ITextServices_TxSendMessage( host->text_srv, EM_SETOPTIONS, op, value, res ); *res = (*res & ~host_mask) | (new_options & host_mask); + mask &= ~ECO_AUTOWORDSELECTION; /* doesn't correspond to a window style */ style = GetWindowLongW( host->window, GWL_STYLE ); style = (style & ~mask) | (*res & mask); SetWindowLongW( host->window, GWL_STYLE, style ); @@ -926,6 +949,10 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, case EM_GETOPTIONS: hr = ITextServices_TxSendMessage( host->text_srv, EM_GETOPTIONS, 0, 0, &res ); if (host->props & TXTBIT_READONLY) res |= ECO_READONLY; + if (!(host->props & TXTBIT_HIDESELECTION)) res |= ECO_NOHIDESEL; + if (host->props & TXTBIT_SAVESELECTION) res |= ECO_SAVESEL; + if (host->props & TXTBIT_AUTOWORDSEL) res |= ECO_AUTOWORDSELECTION; + if (host->props & TXTBIT_VERTICAL) res |= ECO_VERTICAL; if (host->scrollbars & ES_AUTOHSCROLL) res |= ECO_AUTOHSCROLL; if (host->scrollbars & ES_AUTOVSCROLL) res |= ECO_AUTOVSCROLL; break; diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index c017f5bae16..8fb6416d38b 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -347,6 +347,8 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_OnTxPropertyBitsChange( ITextServic } } + if ((mask & TXTBIT_HIDESELECTION) && !services->editor->bHaveFocus) ME_InvalidateSelection( services->editor ); + return S_OK; } -- 2.23.0

1 0

[PATCH 2/5] riched20: Handle scrollbar changes in the host.
by Huw Davies 16 Mar '21

16 Mar '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.c | 57 +++++--------------------------- dlls/riched20/editstr.h | 1 + dlls/riched20/paint.c | 32 +++++++++--------- dlls/riched20/txthost.c | 73 ++++++++++++++++++++++++++--------------- dlls/riched20/txtsrv.c | 21 ++++++++++-- 5 files changed, 92 insertions(+), 92 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 3d1eb458419..cf723d66cf6 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3049,9 +3049,7 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) TXTBIT_USEPASSWORD | TXTBIT_HIDESELECTION | TXTBIT_SAVESELECTION | TXTBIT_AUTOWORDSEL | TXTBIT_VERTICAL | TXTBIT_WORDWRAP | TXTBIT_DISABLEDRAG, &ed->props ); - ITextHost_TxGetScrollBars(texthost, &ed->styleFlags); - ed->styleFlags &= (WS_VSCROLL|WS_HSCROLL|ES_AUTOVSCROLL| - ES_AUTOHSCROLL|ES_DISABLENOSCROLL); + ITextHost_TxGetScrollBars( texthost, &ed->scrollbars ); ed->pBuffer = ME_MakeText(); ed->nZoomNumerator = ed->nZoomDenominator = 0; ed->nAvailWidth = 0; /* wrap to client area */ @@ -3307,21 +3305,21 @@ static LRESULT ME_WmCreate(ME_TextEditor *editor, LPARAM lParam, BOOL unicode) ME_SetDefaultFormatRect(editor); - max = (editor->styleFlags & ES_DISABLENOSCROLL) ? 1 : 0; - if (~editor->styleFlags & ES_DISABLENOSCROLL || editor->styleFlags & WS_VSCROLL) + max = (editor->scrollbars & ES_DISABLENOSCROLL) ? 1 : 0; + if (~editor->scrollbars & ES_DISABLENOSCROLL || editor->scrollbars & WS_VSCROLL) ITextHost_TxSetScrollRange(editor->texthost, SB_VERT, 0, max, TRUE); - if (~editor->styleFlags & ES_DISABLENOSCROLL || editor->styleFlags & WS_HSCROLL) + if (~editor->scrollbars & ES_DISABLENOSCROLL || editor->scrollbars & WS_HSCROLL) ITextHost_TxSetScrollRange(editor->texthost, SB_HORZ, 0, max, TRUE); - if (editor->styleFlags & ES_DISABLENOSCROLL) + if (editor->scrollbars & ES_DISABLENOSCROLL) { - if (editor->styleFlags & WS_VSCROLL) + if (editor->scrollbars & WS_VSCROLL) { ITextHost_TxEnableScrollBar(editor->texthost, SB_VERT, ESB_DISABLE_BOTH); ITextHost_TxShowScrollBar(editor->texthost, SB_VERT, TRUE); } - if (editor->styleFlags & WS_HSCROLL) + if (editor->scrollbars & WS_HSCROLL) { ITextHost_TxEnableScrollBar(editor->texthost, SB_HORZ, ESB_DISABLE_BOTH); ITextHost_TxShowScrollBar(editor->texthost, SB_HORZ, TRUE); @@ -3494,7 +3492,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, case EM_GETOPTIONS: { /* these flags are equivalent to the ES_* counterparts */ - DWORD mask = ECO_VERTICAL | ECO_AUTOHSCROLL | ECO_AUTOVSCROLL | + DWORD mask = ECO_VERTICAL | ECO_NOHIDESEL | ECO_WANTRETURN | ECO_SELECTIONBAR; DWORD settings = editor->styleFlags & mask; @@ -3546,7 +3544,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, /* these flags are equivalent to ES_* counterparts, except for * ECO_AUTOWORDSELECTION that doesn't have an ES_* counterpart, * but is still stored in editor->styleFlags. */ - const DWORD mask = ECO_VERTICAL | ECO_AUTOHSCROLL | ECO_AUTOVSCROLL | + const DWORD mask = ECO_VERTICAL | ECO_NOHIDESEL | ECO_WANTRETURN | ECO_SELECTIONBAR | ECO_AUTOWORDSELECTION; DWORD settings = mask & editor->styleFlags; @@ -3592,10 +3590,6 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, if (changedSettings & settings & ECO_VERTICAL) FIXME("ECO_VERTICAL not implemented yet!\n"); if (changedSettings & settings & ECO_AUTOHSCROLL) - FIXME("ECO_AUTOHSCROLL not implemented yet!\n"); - if (changedSettings & settings & ECO_AUTOVSCROLL) - FIXME("ECO_AUTOVSCROLL not implemented yet!\n"); - if (changedSettings & settings & ECO_WANTRETURN) FIXME("ECO_WANTRETURN not implemented yet!\n"); if (changedSettings & settings & ECO_AUTOWORDSELECTION) FIXME("ECO_AUTOWORDSELECTION not implemented yet!\n"); @@ -3632,39 +3626,6 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, return set_selection( editor, range.cpMin, range.cpMax ); } - case EM_SHOWSCROLLBAR: - { - DWORD flags; - - switch (wParam) - { - case SB_HORZ: - flags = WS_HSCROLL; - break; - case SB_VERT: - flags = WS_VSCROLL; - break; - case SB_BOTH: - flags = WS_HSCROLL|WS_VSCROLL; - break; - default: - return 0; - } - - if (lParam) { - editor->styleFlags |= flags; - if (flags & WS_HSCROLL) - ITextHost_TxShowScrollBar(editor->texthost, SB_HORZ, - editor->nTotalWidth > editor->sizeWindow.cx); - if (flags & WS_VSCROLL) - ITextHost_TxShowScrollBar(editor->texthost, SB_VERT, - editor->nTotalLength > editor->sizeWindow.cy); - } else { - editor->styleFlags &= ~flags; - ITextHost_TxShowScrollBar(editor->texthost, wParam, FALSE); - } - return 0; - } case EM_SETTEXTEX: { LPWSTR wszText; diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 7b78e5dccbe..f689194901c 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -386,6 +386,7 @@ typedef struct tagME_TextEditor DWORD styleFlags; DWORD exStyleFlags; DWORD props; + DWORD scrollbars; int nCursors; SIZE sizeWindow; int nTotalLength, nLastTotalLength; diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 2db3a4ea2c1..e22dc64ebdb 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -1070,24 +1070,24 @@ void ME_ScrollAbs(ME_TextEditor *editor, int x, int y) if (editor->hWnd) { LONG winStyle = GetWindowLongW(editor->hWnd, GWL_STYLE); - if (editor->styleFlags & WS_HSCROLL) + if (editor->scrollbars & WS_HSCROLL) { bScrollBarIsVisible = (winStyle & WS_HSCROLL) != 0; bScrollBarWillBeVisible = (editor->nTotalWidth > editor->sizeWindow.cx - && (editor->styleFlags & WS_HSCROLL)) - || (editor->styleFlags & ES_DISABLENOSCROLL); + && (editor->scrollbars & WS_HSCROLL)) + || (editor->scrollbars & ES_DISABLENOSCROLL); if (bScrollBarIsVisible != bScrollBarWillBeVisible) ITextHost_TxShowScrollBar(editor->texthost, SB_HORZ, bScrollBarWillBeVisible); } - if (editor->styleFlags & WS_VSCROLL) + if (editor->scrollbars & WS_VSCROLL) { bScrollBarIsVisible = (winStyle & WS_VSCROLL) != 0; bScrollBarWillBeVisible = (editor->nTotalLength > editor->sizeWindow.cy - && (editor->styleFlags & WS_VSCROLL) + && (editor->scrollbars & WS_VSCROLL) && (editor->styleFlags & ES_MULTILINE)) - || (editor->styleFlags & ES_DISABLENOSCROLL); + || (editor->scrollbars & ES_DISABLENOSCROLL); if (bScrollBarIsVisible != bScrollBarWillBeVisible) ITextHost_TxShowScrollBar(editor->texthost, SB_VERT, bScrollBarWillBeVisible); @@ -1152,7 +1152,7 @@ void ME_UpdateScrollBar(ME_TextEditor *editor) si.cbSize = sizeof(si); si.fMask = SIF_PAGE | SIF_RANGE | SIF_POS; si.nMin = 0; - if (editor->styleFlags & ES_DISABLENOSCROLL) + if (editor->scrollbars & ES_DISABLENOSCROLL) si.fMask |= SIF_DISABLENOSCROLL; /* Update horizontal scrollbar */ @@ -1177,7 +1177,7 @@ void ME_UpdateScrollBar(ME_TextEditor *editor) editor->horz_si.nMax = si.nMax; editor->horz_si.nPage = si.nPage; if ((bScrollBarWillBeVisible || bScrollBarWasVisible) && - editor->styleFlags & WS_HSCROLL) + editor->scrollbars & WS_HSCROLL) { if (si.nMax > 0xFFFF) { @@ -1196,11 +1196,11 @@ void ME_UpdateScrollBar(ME_TextEditor *editor) } } - if (editor->styleFlags & WS_HSCROLL) + if (editor->scrollbars & WS_HSCROLL) { if (si.fMask & SIF_DISABLENOSCROLL) { bScrollBarWillBeVisible = TRUE; - } else if (!(editor->styleFlags & WS_HSCROLL)) { + } else if (!(editor->scrollbars & WS_HSCROLL)) { bScrollBarWillBeVisible = FALSE; } @@ -1232,7 +1232,7 @@ void ME_UpdateScrollBar(ME_TextEditor *editor) editor->vert_si.nMax = si.nMax; editor->vert_si.nPage = si.nPage; if ((bScrollBarWillBeVisible || bScrollBarWasVisible) && - editor->styleFlags & WS_VSCROLL) + editor->scrollbars & WS_VSCROLL) { if (si.nMax > 0xFFFF) { @@ -1251,11 +1251,11 @@ void ME_UpdateScrollBar(ME_TextEditor *editor) } } - if (editor->styleFlags & WS_VSCROLL) + if (editor->scrollbars & WS_VSCROLL) { if (si.fMask & SIF_DISABLENOSCROLL) { bScrollBarWillBeVisible = TRUE; - } else if (!(editor->styleFlags & WS_VSCROLL)) { + } else if (!(editor->scrollbars & WS_VSCROLL)) { bScrollBarWillBeVisible = FALSE; } @@ -1273,7 +1273,7 @@ void editor_ensure_visible( ME_TextEditor *editor, ME_Cursor *cursor ) int x, y, yheight; - if (editor->styleFlags & ES_AUTOHSCROLL) + if (editor->scrollbars & ES_AUTOHSCROLL) { x = run->pt.x + ME_PointFromChar( editor, run, cursor->nOffset, TRUE ); if (x > editor->horz_si.nPos + editor->sizeWindow.cx) @@ -1281,7 +1281,7 @@ void editor_ensure_visible( ME_TextEditor *editor, ME_Cursor *cursor ) else if (x > editor->horz_si.nPos) x = editor->horz_si.nPos; - if (~editor->styleFlags & ES_AUTOVSCROLL) + if (~editor->scrollbars & ES_AUTOVSCROLL) { ME_HScrollAbs(editor, x); return; @@ -1289,7 +1289,7 @@ void editor_ensure_visible( ME_TextEditor *editor, ME_Cursor *cursor ) } else { - if (~editor->styleFlags & ES_AUTOVSCROLL) return; + if (~editor->scrollbars & ES_AUTOVSCROLL) return; x = editor->horz_si.nPos; } diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 79cc79daa9a..027b079d654 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -41,7 +41,7 @@ struct host HWND window; BOOL emulate_10; PARAFORMAT2 para_fmt; - DWORD props; + DWORD props, scrollbars; }; static const ITextHostVtbl textHostVtbl; @@ -51,12 +51,16 @@ static BOOL combobox_registered; static void host_init_props( struct host *host ) { - DWORD style, scrollbar; - - host->props = TXTBIT_RICHTEXT | TXTBIT_AUTOWORDSEL | TXTBIT_ALLOWBEEP; + DWORD style; style = GetWindowLongW( host->window, GWL_STYLE ); + host->scrollbars = style & (WS_VSCROLL | WS_HSCROLL | ES_AUTOVSCROLL | + ES_AUTOHSCROLL | ES_DISABLENOSCROLL); + if (style & WS_VSCROLL) host->scrollbars |= ES_AUTOVSCROLL; + if ((style & WS_HSCROLL) && !host->emulate_10) host->scrollbars |= ES_AUTOHSCROLL; + + host->props = TXTBIT_RICHTEXT | TXTBIT_AUTOWORDSEL | TXTBIT_ALLOWBEEP; if (style & ES_MULTILINE) host->props |= TXTBIT_MULTILINE; if (style & ES_READONLY) host->props |= TXTBIT_READONLY; if (style & ES_PASSWORD) host->props |= TXTBIT_USEPASSWORD; @@ -65,8 +69,7 @@ static void host_init_props( struct host *host ) if (style & ES_VERTICAL) host->props |= TXTBIT_VERTICAL; if (style & ES_NOOLEDRAGDROP) host->props |= TXTBIT_DISABLEDRAG; - ITextHost_TxGetScrollBars( &host->ITextHost_iface, &scrollbar ); - if (!(scrollbar & ES_AUTOHSCROLL)) host->props |= TXTBIT_WORDWRAP; + if (!(host->scrollbars & ES_AUTOHSCROLL)) host->props |= TXTBIT_WORDWRAP; } struct host *host_create( HWND hwnd, CREATESTRUCTW *cs, BOOL emulate_10 ) @@ -335,27 +338,11 @@ DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetMaxLength( ITextHost *ifac } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetScrollBars,8) -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetScrollBars( ITextHost *iface, DWORD *scrollbar ) +DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetScrollBars( ITextHost *iface, DWORD *scrollbars ) { struct host *host = impl_from_ITextHost( iface ); - const DWORD mask = WS_VSCROLL| - WS_HSCROLL| - ES_AUTOVSCROLL| - ES_AUTOHSCROLL| - ES_DISABLENOSCROLL; - if (host->editor) - { - *scrollbar = host->editor->styleFlags & mask; - } - else - { - DWORD style = GetWindowLongW( host->window, GWL_STYLE ); - if (style & WS_VSCROLL) - style |= ES_AUTOVSCROLL; - if (!host->emulate_10 && (style & WS_HSCROLL)) - style |= ES_AUTOHSCROLL; - *scrollbar = style & mask; - } + + *scrollbars = host->scrollbars; return S_OK; } @@ -780,7 +767,7 @@ static HRESULT set_options( struct host *host, DWORD op, DWORD value, LRESULT *r DWORD style, old_options, new_options, change, props_mask = 0; const DWORD mask = ECO_AUTOVSCROLL | ECO_AUTOHSCROLL | ECO_NOHIDESEL | ECO_READONLY | ECO_WANTRETURN | ECO_SELECTIONBAR | ECO_VERTICAL; - const DWORD host_mask = ECO_READONLY; + const DWORD host_mask = ECO_AUTOVSCROLL | ECO_AUTOHSCROLL | ECO_READONLY; HRESULT hr = S_OK; new_options = old_options = SendMessageW( host->window, EM_GETOPTIONS, 0, 0 ); @@ -803,6 +790,16 @@ static HRESULT set_options( struct host *host, DWORD op, DWORD value, LRESULT *r change = (new_options ^ old_options); + if (change & ECO_AUTOVSCROLL) + { + host->scrollbars ^= WS_VSCROLL; + props_mask |= TXTBIT_SCROLLBARCHANGE; + } + if (change & ECO_AUTOHSCROLL) + { + host->scrollbars ^= WS_HSCROLL; + props_mask |= TXTBIT_SCROLLBARCHANGE; + } if (change & ECO_READONLY) { host->props ^= TXTBIT_READONLY; @@ -929,6 +926,8 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, case EM_GETOPTIONS: hr = ITextServices_TxSendMessage( host->text_srv, EM_GETOPTIONS, 0, 0, &res ); if (host->props & TXTBIT_READONLY) res |= ECO_READONLY; + if (host->scrollbars & ES_AUTOHSCROLL) res |= ECO_AUTOHSCROLL; + if (host->scrollbars & ES_AUTOVSCROLL) res |= ECO_AUTOVSCROLL; break; case WM_GETTEXT: @@ -1040,6 +1039,28 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, if (text != (WCHAR *)lparam) ME_EndToUnicode( CP_ACP, text ); break; } + case EM_SHOWSCROLLBAR: + { + DWORD mask = 0, new; + + if (wparam == SB_HORZ) mask = WS_HSCROLL; + else if (wparam == SB_VERT) mask = WS_VSCROLL; + else if (wparam == SB_BOTH) mask = WS_HSCROLL | WS_VSCROLL; + + if (mask) + { + new = lparam ? mask : 0; + if ((host->scrollbars & mask) != new) + { + host->scrollbars &= ~mask; + host->scrollbars |= new; + ITextServices_OnTxPropertyBitsChange( host->text_srv, TXTBIT_SCROLLBARCHANGE, 0 ); + } + } + + res = 0; + break; + } default: res = ME_HandleMessage( editor, msg, wparam, lparam, unicode, &hr ); } diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index ecb5cec91c2..c017f5bae16 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -165,7 +165,7 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxGetHScroll( ITextServices *iface, if (max_pos) *max_pos = services->editor->horz_si.nMax; if (pos) *pos = services->editor->horz_si.nPos; if (page) *page = services->editor->horz_si.nPage; - if (enabled) *enabled = (services->editor->styleFlags & WS_HSCROLL) != 0; + if (enabled) *enabled = (services->editor->scrollbars & WS_HSCROLL) != 0; return S_OK; } @@ -179,7 +179,7 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxGetVScroll( ITextServices *iface, if (max_pos) *max_pos = services->editor->vert_si.nMax; if (pos) *pos = services->editor->vert_si.nPos; if (page) *page = services->editor->vert_si.nPage; - if (enabled) *enabled = (services->editor->styleFlags & WS_VSCROLL) != 0; + if (enabled) *enabled = (services->editor->scrollbars & WS_VSCROLL) != 0; return S_OK; } @@ -325,11 +325,28 @@ DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxPropertyBitsChange,12) DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_OnTxPropertyBitsChange( ITextServices *iface, DWORD mask, DWORD bits ) { struct text_services *services = impl_from_ITextServices( iface ); + DWORD scrollbars; + HRESULT hr; TRACE( "%p, mask %08x, bits %08x\n", services, mask, bits ); services->editor->props = (services->editor->props & ~mask) | (bits & mask); + if (mask & TXTBIT_SCROLLBARCHANGE) + { + hr = ITextHost_TxGetScrollBars( services->host, &scrollbars ); + if (SUCCEEDED( hr )) + { + if ((services->editor->scrollbars ^ scrollbars) & WS_HSCROLL) + ITextHost_TxShowScrollBar( services->host, SB_HORZ, (scrollbars & WS_HSCROLL) && + services->editor->nTotalWidth > services->editor->sizeWindow.cx ); + if ((services->editor->scrollbars ^ scrollbars) & WS_VSCROLL) + ITextHost_TxShowScrollBar( services->host, SB_VERT, (scrollbars & WS_VSCROLL) && + services->editor->nTotalLength > services->editor->sizeWindow.cy ); + services->editor->scrollbars = scrollbars; + } + } + return S_OK; } -- 2.23.0

1 0

[PATCH 1/5] riched20: Handle the read-only property setting in the host.
by Huw Davies 16 Mar '21

16 Mar '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.c | 49 +++++++++++++----------------- dlls/riched20/editstr.h | 1 + dlls/riched20/txthost.c | 67 +++++++++++++++++++++++++++++++++-------- dlls/riched20/txtsrv.c | 9 ++++-- 4 files changed, 83 insertions(+), 43 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 4988f6e0746..3d1eb458419 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2279,10 +2279,9 @@ static BOOL paste_special(ME_TextEditor *editor, UINT cf, REPASTESPECIAL *ps, BO IDataObject *data; /* Protect read-only edit control from modification */ - if (editor->styleFlags & ES_READONLY) + if (editor->props & TXTBIT_READONLY) { - if (!check_only) - MessageBeep(MB_ICONERROR); + if (!check_only) MessageBeep(MB_ICONERROR); return FALSE; } @@ -2354,7 +2353,7 @@ HRESULT editor_copy_or_cut( ME_TextEditor *editor, BOOL cut, ME_Cursor *start, i { HRESULT hr; - if (cut && (editor->styleFlags & ES_READONLY)) + if (cut && (editor->props & TXTBIT_READONLY)) { return E_ACCESSDENIED; } @@ -2469,7 +2468,7 @@ static BOOL handle_enter(ME_TextEditor *editor) int from, to; ME_Style *style, *eop_style; - if (editor->styleFlags & ES_READONLY) + if (editor->props & TXTBIT_READONLY) { MessageBeep(MB_ICONERROR); return TRUE; @@ -2631,7 +2630,7 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) case VK_DELETE: editor->nUDArrowX = -1; /* FIXME backspace and delete aren't the same, they act different wrt paragraph style of the merged paragraph */ - if (editor->styleFlags & ES_READONLY) + if (editor->props & TXTBIT_READONLY) return FALSE; if (ME_IsSelection(editor)) { @@ -2738,7 +2737,7 @@ static LRESULT handle_wm_char( ME_TextEditor *editor, WCHAR wstr, LPARAM flags ) if (editor->bMouseCaptured) return 0; - if (editor->styleFlags & ES_READONLY) + if (editor->props & TXTBIT_READONLY) { MessageBeep(MB_ICONERROR); return 0; /* FIXME really 0 ? */ @@ -3035,7 +3034,6 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) { ME_TextEditor *ed = heap_alloc(sizeof(*ed)); int i; - DWORD props; LONG selbarwidth; ed->hWnd = NULL; @@ -3047,13 +3045,10 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->styleFlags = 0; ed->exStyleFlags = 0; ed->total_rows = 0; - ITextHost_TxGetPropertyBits(texthost, - (TXTBIT_RICHTEXT|TXTBIT_MULTILINE| - TXTBIT_READONLY|TXTBIT_USEPASSWORD| - TXTBIT_HIDESELECTION|TXTBIT_SAVESELECTION| - TXTBIT_AUTOWORDSEL|TXTBIT_VERTICAL| - TXTBIT_WORDWRAP|TXTBIT_DISABLEDRAG), - &props); + ITextHost_TxGetPropertyBits( texthost, TXTBIT_RICHTEXT | TXTBIT_MULTILINE | TXTBIT_READONLY | + TXTBIT_USEPASSWORD | TXTBIT_HIDESELECTION | TXTBIT_SAVESELECTION | + TXTBIT_AUTOWORDSEL | TXTBIT_VERTICAL | TXTBIT_WORDWRAP | TXTBIT_DISABLEDRAG, + &ed->props ); ITextHost_TxGetScrollBars(texthost, &ed->styleFlags); ed->styleFlags &= (WS_VSCROLL|WS_HSCROLL|ES_AUTOVSCROLL| ES_AUTOHSCROLL|ES_DISABLENOSCROLL); @@ -3094,7 +3089,7 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->pfnWordBreak = NULL; ed->lpOleCallback = NULL; ed->mode = TM_MULTILEVELUNDO | TM_MULTICODEPAGE; - ed->mode |= (props & TXTBIT_RICHTEXT) ? TM_RICHTEXT : TM_PLAINTEXT; + ed->mode |= (ed->props & TXTBIT_RICHTEXT) ? TM_RICHTEXT : TM_PLAINTEXT; ed->AutoURLDetect_bEnable = FALSE; ed->bHaveFocus = FALSE; ed->bDialogMode = FALSE; @@ -3122,26 +3117,24 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->nSelectionType = stPosition; ed->cPasswordMask = 0; - if (props & TXTBIT_USEPASSWORD) + if (ed->props & TXTBIT_USEPASSWORD) ITextHost_TxGetPasswordChar(texthost, &ed->cPasswordMask); - if (props & TXTBIT_AUTOWORDSEL) + if (ed->props & TXTBIT_AUTOWORDSEL) ed->styleFlags |= ECO_AUTOWORDSELECTION; - if (props & TXTBIT_MULTILINE) { + if (ed->props & TXTBIT_MULTILINE) { ed->styleFlags |= ES_MULTILINE; - ed->bWordWrap = (props & TXTBIT_WORDWRAP) != 0; + ed->bWordWrap = (ed->props & TXTBIT_WORDWRAP) != 0; } else { ed->bWordWrap = FALSE; } - if (props & TXTBIT_READONLY) - ed->styleFlags |= ES_READONLY; - if (!(props & TXTBIT_HIDESELECTION)) + if (!(ed->props & TXTBIT_HIDESELECTION)) ed->styleFlags |= ES_NOHIDESEL; - if (props & TXTBIT_SAVESELECTION) + if (ed->props & TXTBIT_SAVESELECTION) ed->styleFlags |= ES_SAVESEL; - if (props & TXTBIT_VERTICAL) + if (ed->props & TXTBIT_VERTICAL) ed->styleFlags |= ES_VERTICAL; - if (props & TXTBIT_DISABLEDRAG) + if (ed->props & TXTBIT_DISABLEDRAG) ed->styleFlags |= ES_NOOLEDRAGDROP; ed->notified_cr.cpMin = ed->notified_cr.cpMax = 0; @@ -3502,7 +3495,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, { /* these flags are equivalent to the ES_* counterparts */ DWORD mask = ECO_VERTICAL | ECO_AUTOHSCROLL | ECO_AUTOVSCROLL | - ECO_NOHIDESEL | ECO_READONLY | ECO_WANTRETURN | ECO_SELECTIONBAR; + ECO_NOHIDESEL | ECO_WANTRETURN | ECO_SELECTIONBAR; DWORD settings = editor->styleFlags & mask; return settings; @@ -3554,7 +3547,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, * ECO_AUTOWORDSELECTION that doesn't have an ES_* counterpart, * but is still stored in editor->styleFlags. */ const DWORD mask = ECO_VERTICAL | ECO_AUTOHSCROLL | ECO_AUTOVSCROLL | - ECO_NOHIDESEL | ECO_READONLY | ECO_WANTRETURN | + ECO_NOHIDESEL | ECO_WANTRETURN | ECO_SELECTIONBAR | ECO_AUTOWORDSELECTION; DWORD settings = mask & editor->styleFlags; DWORD oldSettings = settings; diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 57dd45136af..7b78e5dccbe 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -385,6 +385,7 @@ typedef struct tagME_TextEditor ME_Cursor *pCursors; DWORD styleFlags; DWORD exStyleFlags; + DWORD props; int nCursors; SIZE sizeWindow; int nTotalLength, nLastTotalLength; diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index c810589b4a6..79cc79daa9a 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -775,12 +775,59 @@ static HRESULT get_text_rangeA( struct host *host, TEXTRANGEA *rangeA, LRESULT * return hr; } +static HRESULT set_options( struct host *host, DWORD op, DWORD value, LRESULT *res ) +{ + DWORD style, old_options, new_options, change, props_mask = 0; + const DWORD mask = ECO_AUTOVSCROLL | ECO_AUTOHSCROLL | ECO_NOHIDESEL | ECO_READONLY | ECO_WANTRETURN | + ECO_SELECTIONBAR | ECO_VERTICAL; + const DWORD host_mask = ECO_READONLY; + HRESULT hr = S_OK; + + new_options = old_options = SendMessageW( host->window, EM_GETOPTIONS, 0, 0 ); + + switch (op) + { + case ECOOP_SET: + new_options = value; + break; + case ECOOP_OR: + new_options |= value; + break; + case ECOOP_AND: + new_options &= value; + break; + case ECOOP_XOR: + new_options ^= value; + } + new_options &= mask; + + change = (new_options ^ old_options); + + if (change & ECO_READONLY) + { + host->props ^= TXTBIT_READONLY; + props_mask |= TXTBIT_READONLY; + } + + if (props_mask) + ITextServices_OnTxPropertyBitsChange( host->text_srv, props_mask, host->props & props_mask ); + + /* Handle the rest in the editor for now */ + hr = ITextServices_TxSendMessage( host->text_srv, EM_SETOPTIONS, op, value, res ); + *res = (*res & ~host_mask) | (new_options & host_mask); + + style = GetWindowLongW( host->window, GWL_STYLE ); + style = (style & ~mask) | (*res & mask); + SetWindowLongW( host->window, GWL_STYLE, style ); + return hr; +} + static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, BOOL unicode ) { struct host *host; ME_TextEditor *editor; - HRESULT hr; + HRESULT hr = S_OK; LRESULT res = 0; TRACE( "enter hwnd %p msg %04x (%s) %lx %lx, unicode %d\n", @@ -879,6 +926,11 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, } break; } + case EM_GETOPTIONS: + hr = ITextServices_TxSendMessage( host->text_srv, EM_GETOPTIONS, 0, 0, &res ); + if (host->props & TXTBIT_READONLY) res |= ECO_READONLY; + break; + case WM_GETTEXT: { GETTEXTEX params; @@ -965,18 +1017,9 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, break; } case EM_SETOPTIONS: - { - DWORD style; - const DWORD mask = ECO_VERTICAL | ECO_AUTOHSCROLL | ECO_AUTOVSCROLL | - ECO_NOHIDESEL | ECO_READONLY | ECO_WANTRETURN | - ECO_SELECTIONBAR; + hr = set_options( host, wparam, lparam, &res ); + break; - res = ME_HandleMessage( editor, msg, wparam, lparam, unicode, &hr ); - style = GetWindowLongW( hwnd, GWL_STYLE ); - style = (style & ~mask) | (res & mask); - SetWindowLongW( hwnd, GWL_STYLE, style ); - return res; - } case EM_SETREADONLY: { DWORD op = wparam ? ECOOP_OR : ECOOP_AND; diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 7893888af57..ecb5cec91c2 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -322,12 +322,15 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxGetDropTarget(ITextServices *ifac } DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxPropertyBitsChange,12) -DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_OnTxPropertyBitsChange(ITextServices *iface, DWORD dwMask, DWORD dwBits) +DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_OnTxPropertyBitsChange( ITextServices *iface, DWORD mask, DWORD bits ) { struct text_services *services = impl_from_ITextServices( iface ); - FIXME( "%p: STUB\n", services ); - return E_NOTIMPL; + TRACE( "%p, mask %08x, bits %08x\n", services, mask, bits ); + + services->editor->props = (services->editor->props & ~mask) | (bits & mask); + + return S_OK; } DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetCachedSize,12) -- 2.23.0

1 0