- Wine-Devel - list.winehq.org

[PATCH 5/5] riched20: Fix-up the scrollbar visibility in the host.
by Huw Davies March 22, 2021

March 22, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/paint.c | 24 ++---------------------- dlls/riched20/txthost.c | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 0b29aba4f9f..1c957e46ee2 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -1057,7 +1057,6 @@ static void set_scroll_range_pos( ITextHost *host, INT bar, SCROLLINFO *info, BO void ME_ScrollAbs(ME_TextEditor *editor, int x, int y) { - BOOL old_vis, new_vis; int scrollX = 0, scrollY = 0; if (editor->horz_si.nPos != x) { @@ -1076,33 +1075,14 @@ void ME_ScrollAbs(ME_TextEditor *editor, int x, int y) set_scroll_range_pos( editor->texthost, SB_VERT, &editor->vert_si, FALSE ); } - if (abs(scrollX) > editor->sizeWindow.cx || - abs(scrollY) > editor->sizeWindow.cy) + if (abs(scrollX) > editor->sizeWindow.cx || abs(scrollY) > editor->sizeWindow.cy) ITextHost_TxInvalidateRect(editor->texthost, NULL, TRUE); else ITextHost_TxScrollWindowEx(editor->texthost, scrollX, scrollY, &editor->rcFormat, &editor->rcFormat, NULL, NULL, SW_INVALIDATE); - ME_Repaint(editor); - - if (editor->hWnd) - { - LONG winStyle = GetWindowLongW(editor->hWnd, GWL_STYLE); - if (editor->scrollbars & WS_HSCROLL) - { - old_vis = winStyle & WS_HSCROLL; - new_vis = editor->horz_sb_enabled || editor->scrollbars & ES_DISABLENOSCROLL; - if (!old_vis ^ !new_vis) ITextHost_TxShowScrollBar( editor->texthost, SB_HORZ, new_vis ); - } - - if (editor->scrollbars & WS_VSCROLL) - { - old_vis = winStyle & WS_VSCROLL; - new_vis = editor->vert_sb_enabled || editor->scrollbars & ES_DISABLENOSCROLL; - if (!old_vis ^ !new_vis) ITextHost_TxShowScrollBar( editor->texthost, SB_VERT, new_vis ); - } - } ME_UpdateScrollBar(editor); + ME_Repaint(editor); } void ME_HScrollAbs(ME_TextEditor *editor, int x) diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 818a28b2bc5..c1f175dc9c2 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -222,6 +222,24 @@ DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxSetScrollPos,16) DECLSPEC_HIDDEN BOOL __thiscall ITextHostImpl_TxSetScrollPos( ITextHost *iface, INT bar, INT pos, BOOL redraw ) { struct host *host = impl_from_ITextHost( iface ); + DWORD style = GetWindowLongW( host->window, GWL_STYLE ); + DWORD mask = (bar == SB_HORZ) ? WS_HSCROLL : WS_VSCROLL; + BOOL show = TRUE, shown = style & mask; + + if (bar != SB_HORZ && bar != SB_VERT) + { + FIXME( "Unexpected bar %d\n", bar ); + return FALSE; + } + + /* If the application has adjusted the scrollbar's visibility it is reset */ + if (!(host->scrollbars & ES_DISABLENOSCROLL)) + { + if (bar == SB_HORZ) ITextServices_TxGetHScroll( host->text_srv, NULL, NULL, NULL, NULL, &show ); + else ITextServices_TxGetVScroll( host->text_srv, NULL, NULL, NULL, NULL, &show ); + } + + if (!show ^ !shown) ShowScrollBar( host->window, bar, show ); return SetScrollPos( host->window, bar, pos, redraw ) != 0; } -- 2.23.0

1 0

[PATCH 4/5] riched20: Enable and show the scrollbar before updating its position and range.
by Huw Davies March 22, 2021

March 22, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/paint.c | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index c9e2fab0be6..0b29aba4f9f 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -1033,6 +1033,14 @@ static void draw_paragraph( ME_Context *c, ME_Paragraph *para ) SetTextAlign( c->hDC, align ); } +static void enable_show_scrollbar( ME_TextEditor *editor, INT bar, BOOL enable ) +{ + if (enable || editor->scrollbars & ES_DISABLENOSCROLL) + ITextHost_TxEnableScrollBar( editor->texthost, bar, enable ? 0 : ESB_DISABLE_BOTH ); + if (!(editor->scrollbars & ES_DISABLENOSCROLL)) + ITextHost_TxShowScrollBar( editor->texthost, bar, enable ); +} + static void set_scroll_range_pos( ITextHost *host, INT bar, SCROLLINFO *info, BOOL set_range ) { LONG max_pos = info->nMax, pos = info->nPos; @@ -1145,6 +1153,12 @@ void ME_UpdateScrollBar(ME_TextEditor *editor) return; } + if (editor->scrollbars & WS_HSCROLL && !enable ^ !editor->horz_sb_enabled) + { + editor->horz_sb_enabled = enable; + enable_show_scrollbar( editor, SB_HORZ, enable ); + } + if (editor->horz_si.nMax != editor->nTotalWidth || editor->horz_si.nPage != editor->sizeWindow.cx) { editor->horz_si.nMax = editor->nTotalWidth; @@ -1154,15 +1168,6 @@ void ME_UpdateScrollBar(ME_TextEditor *editor) set_scroll_range_pos( editor->texthost, SB_HORZ, &editor->horz_si, TRUE ); } - if (editor->scrollbars & WS_HSCROLL && !enable ^ !editor->horz_sb_enabled) - { - if (enable || editor->scrollbars & ES_DISABLENOSCROLL) - ITextHost_TxEnableScrollBar( editor->texthost, SB_HORZ, enable ? 0 : ESB_DISABLE_BOTH ); - if (!(editor->scrollbars & ES_DISABLENOSCROLL)) - ITextHost_TxShowScrollBar( editor->texthost, SB_HORZ, enable ); - editor->horz_sb_enabled = enable; - } - /* Update vertical scrollbar */ enable = editor->nTotalLength > editor->sizeWindow.cy && (editor->props & TXTBIT_MULTILINE); @@ -1173,6 +1178,12 @@ void ME_UpdateScrollBar(ME_TextEditor *editor) return; } + if (editor->scrollbars & WS_VSCROLL && !enable ^ !editor->vert_sb_enabled) + { + editor->vert_sb_enabled = enable; + enable_show_scrollbar( editor, SB_VERT, enable ); + } + if (editor->vert_si.nMax != editor->nTotalLength || editor->vert_si.nPage != editor->sizeWindow.cy) { editor->vert_si.nMax = editor->nTotalLength; @@ -1181,15 +1192,6 @@ void ME_UpdateScrollBar(ME_TextEditor *editor) if ((enable || editor->vert_sb_enabled) && editor->scrollbars & WS_VSCROLL) set_scroll_range_pos( editor->texthost, SB_VERT, &editor->vert_si, TRUE ); } - - if (editor->scrollbars & WS_VSCROLL && !enable ^ !editor->vert_sb_enabled) - { - if (enable || editor->scrollbars & ES_DISABLENOSCROLL) - ITextHost_TxEnableScrollBar( editor->texthost, SB_VERT, enable ? 0 : ESB_DISABLE_BOTH ); - if (!(editor->scrollbars & ES_DISABLENOSCROLL)) - ITextHost_TxShowScrollBar( editor->texthost, SB_VERT, enable ); - editor->vert_sb_enabled = enable; - } } void editor_ensure_visible( ME_TextEditor *editor, ME_Cursor *cursor ) -- 2.23.0

1 0

[PATCH 3/5] riched20: Update the scrollbar page size from the host.
by Huw Davies March 22, 2021

March 22, 2021

There isn't an explicit ITextHost method that does this, however ITextHost_TxSetScrollRange() is called whenever the client size changes, so the host can update the page size there. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/paint.c | 86 +++++++++++++---------------------------- dlls/riched20/txthost.c | 21 +++++++++- 2 files changed, 46 insertions(+), 61 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 90283d0c82f..c9e2fab0be6 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -1033,6 +1033,20 @@ static void draw_paragraph( ME_Context *c, ME_Paragraph *para ) SetTextAlign( c->hDC, align ); } +static void set_scroll_range_pos( ITextHost *host, INT bar, SCROLLINFO *info, BOOL set_range ) +{ + LONG max_pos = info->nMax, pos = info->nPos; + + /* Scale the scrollbar info to 16-bit values. */ + if (max_pos > 0xffff) + { + pos = MulDiv( pos, 0xffff, max_pos ); + max_pos = 0xffff; + } + if (set_range) ITextHost_TxSetScrollRange( host, bar, 0, max_pos, FALSE ); + ITextHost_TxSetScrollPos( host, bar, pos, TRUE ); +} + void ME_ScrollAbs(ME_TextEditor *editor, int x, int y) { BOOL old_vis, new_vis; @@ -1043,9 +1057,7 @@ void ME_ScrollAbs(ME_TextEditor *editor, int x, int y) x = max(x, editor->horz_si.nMin); scrollX = editor->horz_si.nPos - x; editor->horz_si.nPos = x; - if (editor->horz_si.nMax > 0xFFFF) /* scale to 16-bit value */ - x = MulDiv(x, 0xFFFF, editor->horz_si.nMax); - ITextHost_TxSetScrollPos(editor->texthost, SB_HORZ, x, TRUE); + set_scroll_range_pos( editor->texthost, SB_HORZ, &editor->horz_si, FALSE ); } if (editor->vert_si.nPos != y) { @@ -1053,9 +1065,7 @@ void ME_ScrollAbs(ME_TextEditor *editor, int x, int y) y = max(y, editor->vert_si.nMin); scrollY = editor->vert_si.nPos - y; editor->vert_si.nPos = y; - if (editor->vert_si.nMax > 0xFFFF) /* scale to 16-bit value */ - y = MulDiv(y, 0xFFFF, editor->vert_si.nMax); - ITextHost_TxSetScrollPos(editor->texthost, SB_VERT, y, TRUE); + set_scroll_range_pos( editor->texthost, SB_VERT, &editor->vert_si, FALSE ); } if (abs(scrollX) > editor->sizeWindow.cx || @@ -1121,19 +1131,11 @@ void ME_UpdateScrollBar(ME_TextEditor *editor) { /* Note that this is the only function that should ever call * SetScrollInfo with SIF_PAGE or SIF_RANGE. */ - - SCROLLINFO si; BOOL enable; if (ME_WrapMarkedParagraphs(editor)) FIXME("ME_UpdateScrollBar had to call ME_WrapMarkedParagraphs\n"); - si.cbSize = sizeof(si); - si.fMask = SIF_PAGE | SIF_RANGE | SIF_POS; - si.nMin = 0; - if (editor->scrollbars & ES_DISABLENOSCROLL) - si.fMask |= SIF_DISABLENOSCROLL; - /* Update horizontal scrollbar */ enable = editor->nTotalWidth > editor->sizeWindow.cx; if (editor->horz_si.nPos && !enable) @@ -1143,31 +1145,13 @@ void ME_UpdateScrollBar(ME_TextEditor *editor) return; } - si.nMax = editor->nTotalWidth; - si.nPos = editor->horz_si.nPos; - si.nPage = editor->sizeWindow.cx; - - if (si.nMax != editor->horz_si.nMax || - si.nPage != editor->horz_si.nPage) + if (editor->horz_si.nMax != editor->nTotalWidth || editor->horz_si.nPage != editor->sizeWindow.cx) { - TRACE("min=%d max=%d page=%d\n", si.nMin, si.nMax, si.nPage); - editor->horz_si.nMax = si.nMax; - editor->horz_si.nPage = si.nPage; + editor->horz_si.nMax = editor->nTotalWidth; + editor->horz_si.nPage = editor->sizeWindow.cx; + TRACE( "min = %d max = %d page = %d\n", editor->horz_si.nMin, editor->horz_si.nMax, editor->horz_si.nPage ); if ((enable || editor->horz_sb_enabled) && editor->scrollbars & WS_HSCROLL) - { - if (si.nMax > 0xFFFF) - { - /* Native scales the scrollbar info to 16-bit external values. */ - si.nPos = MulDiv(si.nPos, 0xFFFF, si.nMax); - si.nMax = 0xFFFF; - } - if (editor->hWnd) { - SetScrollInfo(editor->hWnd, SB_HORZ, &si, TRUE); - } else { - ITextHost_TxSetScrollRange(editor->texthost, SB_HORZ, si.nMin, si.nMax, FALSE); - ITextHost_TxSetScrollPos(editor->texthost, SB_HORZ, si.nPos, TRUE); - } - } + set_scroll_range_pos( editor->texthost, SB_HORZ, &editor->horz_si, TRUE ); } if (editor->scrollbars & WS_HSCROLL && !enable ^ !editor->horz_sb_enabled) @@ -1189,31 +1173,13 @@ void ME_UpdateScrollBar(ME_TextEditor *editor) return; } - si.nMax = editor->nTotalLength; - si.nPos = editor->vert_si.nPos; - si.nPage = editor->sizeWindow.cy; - - if (si.nMax != editor->vert_si.nMax || - si.nPage != editor->vert_si.nPage) + if (editor->vert_si.nMax != editor->nTotalLength || editor->vert_si.nPage != editor->sizeWindow.cy) { - TRACE("min=%d max=%d page=%d\n", si.nMin, si.nMax, si.nPage); - editor->vert_si.nMax = si.nMax; - editor->vert_si.nPage = si.nPage; + editor->vert_si.nMax = editor->nTotalLength; + editor->vert_si.nPage = editor->sizeWindow.cy; + TRACE( "min = %d max = %d page = %d\n", editor->vert_si.nMin, editor->vert_si.nMax, editor->vert_si.nPage ); if ((enable || editor->vert_sb_enabled) && editor->scrollbars & WS_VSCROLL) - { - if (si.nMax > 0xFFFF) - { - /* Native scales the scrollbar info to 16-bit external values. */ - si.nPos = MulDiv(si.nPos, 0xFFFF, si.nMax); - si.nMax = 0xFFFF; - } - if (editor->hWnd) { - SetScrollInfo(editor->hWnd, SB_VERT, &si, TRUE); - } else { - ITextHost_TxSetScrollRange(editor->texthost, SB_VERT, si.nMin, si.nMax, FALSE); - ITextHost_TxSetScrollPos(editor->texthost, SB_VERT, si.nPos, TRUE); - } - } + set_scroll_range_pos( editor->texthost, SB_VERT, &editor->vert_si, TRUE ); } if (editor->scrollbars & WS_VSCROLL && !enable ^ !editor->vert_sb_enabled) diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 5797046317c..818a28b2bc5 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -99,6 +99,7 @@ struct host *host_create( HWND hwnd, CREATESTRUCTW *cs, BOOL emulate_10 ) texthost->ITextHost_iface.lpVtbl = &textHostVtbl; texthost->ref = 1; + texthost->text_srv = NULL; texthost->window = hwnd; texthost->parent = cs->hwndParent; texthost->emulate_10 = emulate_10; @@ -196,7 +197,25 @@ DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxSetScrollRange,20) DECLSPEC_HIDDEN BOOL __thiscall ITextHostImpl_TxSetScrollRange( ITextHost *iface, INT bar, LONG min_pos, INT max_pos, BOOL redraw ) { struct host *host = impl_from_ITextHost( iface ); - return SetScrollRange( host->window, bar, min_pos, max_pos, redraw ); + SCROLLINFO info = { .cbSize = sizeof(info), .fMask = SIF_PAGE | SIF_RANGE }; + + if (bar != SB_HORZ && bar != SB_VERT) + { + FIXME( "Unexpected bar %d\n", bar ); + return FALSE; + } + + if (host->scrollbars & ES_DISABLENOSCROLL) info.fMask |= SIF_DISABLENOSCROLL; + + if (host->text_srv) /* This can be called during text services creation */ + { + if (bar == SB_HORZ) ITextServices_TxGetHScroll( host->text_srv, NULL, NULL, NULL, (LONG *)&info.nPage, NULL ); + else ITextServices_TxGetVScroll( host->text_srv, NULL, NULL, NULL, (LONG *)&info.nPage, NULL ); + } + + info.nMin = min_pos; + info.nMax = max_pos; + return SetScrollInfo( host->window, bar, &info, redraw ); } DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxSetScrollPos,16) -- 2.23.0

1 0

[PATCH 2/5] riched20: TxGet[HV]Scroll should return the actual enabled state.
by Huw Davies March 22, 2021

March 22, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/tests/txtsrv.c | 85 +++++++++++++++++++++++++++++++++--- dlls/riched20/txtsrv.c | 4 +- 2 files changed, 81 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index de6d8a8df24..20eb318d464 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -85,7 +85,10 @@ typedef struct ITextHostTestImpl { ITextHost ITextHost_iface; LONG refCount; + HWND window; + RECT client_rect; CHARFORMAT2W char_format; + DWORD scrollbars, props; } ITextHostTestImpl; static inline ITextHostTestImpl *impl_from_ITextHost(ITextHost *iface) @@ -93,6 +96,11 @@ static inline ITextHostTestImpl *impl_from_ITextHost(ITextHost *iface) return CONTAINING_RECORD(iface, ITextHostTestImpl, ITextHost_iface); } +static const WCHAR lorem[] = L"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. " + "Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. " + "Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. " + "Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."; + static HRESULT WINAPI ITextHostImpl_QueryInterface(ITextHost *iface, REFIID riid, LPVOID *ppvObject) @@ -133,6 +141,7 @@ static HDC __thiscall ITextHostImpl_TxGetDC(ITextHost *iface) { ITextHostTestImpl *This = impl_from_ITextHost(iface); TRACECALL("Call to TxGetDC(%p)\n", This); + if (This->window) return GetDC( This->window ); return NULL; } @@ -140,6 +149,7 @@ static INT __thiscall ITextHostImpl_TxReleaseDC(ITextHost *iface, HDC hdc) { ITextHostTestImpl *This = impl_from_ITextHost(iface); TRACECALL("Call to TxReleaseDC(%p)\n", This); + if (This->window) return ReleaseDC( This->window, hdc ); return 0; } @@ -287,7 +297,8 @@ static HRESULT __thiscall ITextHostImpl_TxGetClientRect(ITextHost *iface, LPRECT { ITextHostTestImpl *This = impl_from_ITextHost(iface); TRACECALL("Call to TxGetClientRect(%p, prc=%p)\n", This, prc); - return E_NOTIMPL; + *prc = This->client_rect; + return S_OK; } static HRESULT __thiscall ITextHostImpl_TxGetViewInset(ITextHost *iface, LPRECT prc) @@ -333,12 +344,12 @@ static HRESULT __thiscall ITextHostImpl_TxGetMaxLength(ITextHost *iface, DWORD * return E_NOTIMPL; } -static HRESULT __thiscall ITextHostImpl_TxGetScrollBars(ITextHost *iface, DWORD *pdwScrollBar) +static HRESULT __thiscall ITextHostImpl_TxGetScrollBars(ITextHost *iface, DWORD *scrollbars) { ITextHostTestImpl *This = impl_from_ITextHost(iface); - TRACECALL("Call to TxGetScrollBars(%p, pdwScrollBar=%p)\n", - This, pdwScrollBar); - return E_NOTIMPL; + TRACECALL("Call to TxGetScrollBars(%p, scrollbars=%p)\n", This, scrollbars); + *scrollbars = This->scrollbars; + return S_OK; } static HRESULT __thiscall ITextHostImpl_TxGetPasswordChar(ITextHost *iface, WCHAR *pch) @@ -383,7 +394,7 @@ static HRESULT __thiscall ITextHostImpl_TxGetPropertyBits(ITextHost *iface, DWOR ITextHostTestImpl *This = impl_from_ITextHost(iface); TRACECALL("Call to TxGetPropertyBits(%p, dwMask=0x%08x, pdwBits=%p)\n", This, dwMask, pdwBits); - *pdwBits = 0; + *pdwBits = This->props & dwMask; return S_OK; } @@ -591,9 +602,13 @@ static BOOL init_texthost(ITextServices **txtserv, ITextHost **ret) } dummyTextHost->ITextHost_iface.lpVtbl = &itextHostVtbl; dummyTextHost->refCount = 1; + dummyTextHost->window = NULL; + SetRectEmpty( &dummyTextHost->client_rect ); memset(&dummyTextHost->char_format, 0, sizeof(dummyTextHost->char_format)); dummyTextHost->char_format.cbSize = sizeof(dummyTextHost->char_format); dummyTextHost->char_format.dwMask = CFM_ALL2; + dummyTextHost->scrollbars = 0; + dummyTextHost->props = 0; hf = GetStockObject(DEFAULT_GUI_FONT); hf_to_cf(hf, &dummyTextHost->char_format); @@ -988,16 +1003,74 @@ static void test_TxGetScroll(void) ITextServices *txtserv; ITextHost *host; HRESULT ret; + LONG min_pos, max_pos, pos, page; + BOOL enabled; + ITextHostTestImpl *host_impl; + RECT client = {0, 0, 100, 100}; if (!init_texthost(&txtserv, &host)) return; + host_impl = impl_from_ITextHost( host ); + ret = ITextServices_TxGetHScroll(txtserv, NULL, NULL, NULL, NULL, NULL); ok(ret == S_OK, "ITextServices_TxGetHScroll failed: 0x%08x.\n", ret); ret = ITextServices_TxGetVScroll(txtserv, NULL, NULL, NULL, NULL, NULL); ok(ret == S_OK, "ITextServices_TxGetVScroll failed: 0x%08x.\n", ret); + ret = ITextServices_TxGetVScroll( txtserv, &min_pos, &max_pos, &pos, &page, &enabled ); + ok( ret == S_OK, "ITextServices_TxGetHScroll failed: 0x%08x.\n", ret ); + ok( min_pos == 0, "got %d\n", min_pos ); + ok( max_pos == 0, "got %d\n", max_pos ); + ok( pos == 0, "got %d\n", pos ); + ok( page == 0, "got %d\n", page ); + ok( !enabled, "got %d\n", enabled ); + + host_impl->scrollbars = WS_VSCROLL; + host_impl->props = TXTBIT_MULTILINE | TXTBIT_RICHTEXT | TXTBIT_WORDWRAP; + ITextServices_OnTxPropertyBitsChange( txtserv, TXTBIT_SCROLLBARCHANGE | TXTBIT_MULTILINE | TXTBIT_RICHTEXT | TXTBIT_WORDWRAP, host_impl->props ); + + host_impl->window = CreateWindowExA( 0, "static", NULL, WS_POPUP | WS_VISIBLE, + 0, 0, 400, 400, 0, 0, 0, NULL ); + host_impl->client_rect = client; + ret = ITextServices_OnTxInPlaceActivate( txtserv, &client ); + ok( ret == S_OK, "got 0x%08x.\n", ret ); + + ret = ITextServices_TxGetVScroll( txtserv, &min_pos, &max_pos, &pos, &page, &enabled ); + ok( ret == S_OK, "ITextServices_TxGetHScroll failed: 0x%08x.\n", ret ); + ok( min_pos == 0, "got %d\n", min_pos ); +todo_wine + ok( max_pos == 0, "got %d\n", max_pos ); + ok( pos == 0, "got %d\n", pos ); + ok( page == client.bottom, "got %d\n", page ); + ok( !enabled, "got %d\n", enabled ); + + ret = ITextServices_TxSetText( txtserv, lorem ); + ok( ret == S_OK, "got 0x%08x.\n", ret ); + + ret = ITextServices_TxGetVScroll( txtserv, &min_pos, &max_pos, &pos, &page, &enabled ); + ok( ret == S_OK, "ITextServices_TxGetHScroll failed: 0x%08x.\n", ret ); + ok( min_pos == 0, "got %d\n", min_pos ); + ok( max_pos > client.bottom, "got %d\n", max_pos ); + ok( pos == 0, "got %d\n", pos ); + ok( page == client.bottom, "got %d\n", page ); + ok( enabled, "got %d\n", enabled ); + + host_impl->scrollbars = WS_VSCROLL | ES_DISABLENOSCROLL; + ITextServices_OnTxPropertyBitsChange( txtserv, TXTBIT_SCROLLBARCHANGE, host_impl->props ); + ITextServices_TxSetText( txtserv, L"short" ); + + ret = ITextServices_TxGetVScroll( txtserv, &min_pos, &max_pos, &pos, &page, &enabled ); + ok( ret == S_OK, "ITextServices_TxGetHScroll failed: 0x%08x.\n", ret ); + ok( min_pos == 0, "got %d\n", min_pos ); +todo_wine + ok( max_pos == 0, "got %d\n", max_pos ); + ok( pos == 0, "got %d\n", pos ); + ok( page == client.bottom, "got %d\n", page ); + ok( !enabled, "got %d\n", enabled ); + + DestroyWindow( host_impl->window ); ITextServices_Release(txtserv); ITextHost_Release(host); } diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index d95a3ac4c7e..7bdd6ab924b 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->scrollbars & WS_HSCROLL) != 0; + if (enabled) *enabled = services->editor->horz_sb_enabled; 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->scrollbars & WS_VSCROLL) != 0; + if (enabled) *enabled = services->editor->vert_sb_enabled; return S_OK; } -- 2.23.0

1 0

[PATCH 1/5] riched20: Implement ITextServices_OnTxInPlaceActivate().
by Huw Davies March 22, 2021

March 22, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.c | 1 + dlls/riched20/editstr.h | 3 ++- dlls/riched20/txtsrv.c | 22 +++++++++++++++++----- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 7027b148188..293ac0bad5a 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2936,6 +2936,7 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->texthost = texthost; ed->reOle = NULL; ed->bEmulateVersion10 = bEmulateVersion10; + ed->in_place_active = FALSE; ed->total_rows = 0; ITextHost_TxGetPropertyBits( texthost, TXTBIT_RICHTEXT | TXTBIT_MULTILINE | TXTBIT_READONLY | TXTBIT_USEPASSWORD | TXTBIT_HIDESELECTION | TXTBIT_SAVESELECTION | diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 2d2816340bc..c0fef69547e 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -380,7 +380,8 @@ typedef struct tagME_TextEditor HWND hWnd, hwndParent; ITextHost *texthost; IUnknown *reOle; - BOOL bEmulateVersion10; + unsigned int bEmulateVersion10 : 1; + unsigned int in_place_active : 1; ME_TextBuffer *pBuffer; ME_Cursor *pCursors; DWORD props; diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index d637d52ea3b..d95a3ac4c7e 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -233,12 +233,23 @@ static HRESULT update_client_rect( struct text_services *services, const RECT *c } DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxInPlaceActivate,8) -DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_OnTxInPlaceActivate(ITextServices *iface, LPCRECT prcClient) +DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_OnTxInPlaceActivate( ITextServices *iface, const RECT *client ) { struct text_services *services = impl_from_ITextServices( iface ); + HRESULT hr; + BOOL old_active = services->editor->in_place_active; - FIXME( "%p: STUB\n", services ); - return E_NOTIMPL; + TRACE( "%p: %s\n", services, wine_dbgstr_rect( client ) ); + + services->editor->in_place_active = TRUE; + hr = update_client_rect( services, client ); + if (FAILED( hr )) + { + services->editor->in_place_active = old_active; + return hr; + } + ME_RewrapRepaint( services->editor ); + return S_OK; } DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxInPlaceDeactivate,4) @@ -246,8 +257,9 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_OnTxInPlaceDeactivate(ITextServices { struct text_services *services = impl_from_ITextServices( iface ); - FIXME( "%p: STUB\n", services ); - return E_NOTIMPL; + TRACE( "%p\n", services ); + services->editor->in_place_active = FALSE; + return S_OK; } DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxUIActivate,4) -- 2.23.0

1 0

[PATCH v2 3/3] mscms: Allow any COLORTYPE translation equally.
by Hans Leidekker March 22, 2021

March 22, 2021

From: Lauri Kenttä <lauri.kentta(a)gmail.com> If we assume that trying a color translation is at least as good as just returning FALSE, then there's no point in cheching COLORTYPE. COLOR is union, so offsetof will be 0 anyway and can be omitted too. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/mscms/liblcms.c | 26 ++------------------------ 1 file changed, 2 insertions(+), 24 deletions(-) diff --git a/dlls/mscms/liblcms.c b/dlls/mscms/liblcms.c index 5dbfc463522..5710fc49b75 100644 --- a/dlls/mscms/liblcms.c +++ b/dlls/mscms/liblcms.c @@ -123,36 +123,14 @@ static BOOL CDECL lcms_translate_bits( void *transform, void *srcbits, BMFORMAT return TRUE; } -static int lcms_offsetof_type( COLORTYPE type ) -{ - switch (type) - { - case COLOR_GRAY: return offsetof(COLOR, gray); - case COLOR_RGB: return offsetof(COLOR, rgb); - case COLOR_CMYK: return offsetof(COLOR, cmyk); - case COLOR_XYZ: return offsetof(COLOR, XYZ); - case COLOR_3_CHANNEL: return offsetof(COLOR, gen3ch); - case COLOR_Lab: return offsetof(COLOR, Lab); - default: break; - } - return -1; -} - static BOOL CDECL lcms_translate_colors( void *transform, COLOR *in, DWORD count, COLORTYPE input_type, COLOR *out, COLORTYPE output_type ) { unsigned int i; - int input_field_offset = lcms_offsetof_type( input_type ); - int output_field_offset = lcms_offsetof_type( output_type ); if (!cmsChangeBuffersFormat( transform, from_type(input_type), from_type(output_type) )) return FALSE; - if (input_field_offset == -1 || output_field_offset == -1) - { - FIXME("unhandled input/output pair: %d/%d\n", input_type, output_type); - return FALSE; - } - for (i = 0; i < count; i++) - cmsDoTransform( transform, (char*)&in[i] + input_field_offset, (char*)&out[i] + output_field_offset, 1 ); + + for (i = 0; i < count; i++) cmsDoTransform( transform, &in[i], &out[i], 1 ); return TRUE; } -- 2.30.2

1 0

[PATCH v2 2/3] mscms: Eliminate duplicate code.
by Hans Leidekker March 22, 2021

March 22, 2021

From: Lauri Kenttä <lauri.kentta(a)gmail.com> v2: Add default case in switch statement. No need to use nested switch statements for all COLORTYPE pairs, since they are all symmetrically either supported or not. Calculate COLOR member offset with offsetof and use that in a single loop to avoid duplicate code. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/mscms/liblcms.c | 85 ++++++++++++-------------------------------- 1 file changed, 23 insertions(+), 62 deletions(-) diff --git a/dlls/mscms/liblcms.c b/dlls/mscms/liblcms.c index 04fae980d26..5dbfc463522 100644 --- a/dlls/mscms/liblcms.c +++ b/dlls/mscms/liblcms.c @@ -123,76 +123,37 @@ static BOOL CDECL lcms_translate_bits( void *transform, void *srcbits, BMFORMAT return TRUE; } +static int lcms_offsetof_type( COLORTYPE type ) +{ + switch (type) + { + case COLOR_GRAY: return offsetof(COLOR, gray); + case COLOR_RGB: return offsetof(COLOR, rgb); + case COLOR_CMYK: return offsetof(COLOR, cmyk); + case COLOR_XYZ: return offsetof(COLOR, XYZ); + case COLOR_3_CHANNEL: return offsetof(COLOR, gen3ch); + case COLOR_Lab: return offsetof(COLOR, Lab); + default: break; + } + return -1; +} + static BOOL CDECL lcms_translate_colors( void *transform, COLOR *in, DWORD count, COLORTYPE input_type, COLOR *out, COLORTYPE output_type ) { unsigned int i; + int input_field_offset = lcms_offsetof_type( input_type ); + int output_field_offset = lcms_offsetof_type( output_type ); if (!cmsChangeBuffersFormat( transform, from_type(input_type), from_type(output_type) )) return FALSE; - - switch (input_type) + if (input_field_offset == -1 || output_field_offset == -1) { - case COLOR_RGB: - switch (output_type) - { - case COLOR_RGB: for (i = 0; i < count; i++) cmsDoTransform( transform, &in[i].rgb, &out[i].rgb, 1 ); return TRUE; - case COLOR_Lab: for (i = 0; i < count; i++) cmsDoTransform( transform, &in[i].rgb, &out[i].Lab, 1 ); return TRUE; - case COLOR_GRAY: for (i = 0; i < count; i++) cmsDoTransform( transform, &in[i].rgb, &out[i].gray, 1 ); return TRUE; - case COLOR_CMYK: for (i = 0; i < count; i++) cmsDoTransform( transform, &in[i].rgb, &out[i].cmyk, 1 ); return TRUE; - case COLOR_XYZ: for (i = 0; i < count; i++) cmsDoTransform( transform, &in[i].rgb, &out[i].XYZ, 1 ); return TRUE; - default: break; - } - break; - case COLOR_Lab: - switch (output_type) - { - case COLOR_RGB: for (i = 0; i < count; i++) cmsDoTransform( transform, &in[i].Lab, &out[i].rgb, 1 ); return TRUE; - case COLOR_Lab: for (i = 0; i < count; i++) cmsDoTransform( transform, &in[i].Lab, &out[i].Lab, 1 ); return TRUE; - case COLOR_GRAY: for (i = 0; i < count; i++) cmsDoTransform( transform, &in[i].Lab, &out[i].gray, 1 ); return TRUE; - case COLOR_CMYK: for (i = 0; i < count; i++) cmsDoTransform( transform, &in[i].Lab, &out[i].cmyk, 1 ); return TRUE; - case COLOR_XYZ: for (i = 0; i < count; i++) cmsDoTransform( transform, &in[i].Lab, &out[i].XYZ, 1 ); return TRUE; - default: break; - } - break; - case COLOR_GRAY: - switch (output_type) - { - case COLOR_RGB: for (i = 0; i < count; i++) cmsDoTransform( transform, &in[i].gray, &out[i].rgb, 1 ); return TRUE; - case COLOR_Lab: for (i = 0; i < count; i++) cmsDoTransform( transform, &in[i].gray, &out[i].Lab, 1 ); return TRUE; - case COLOR_GRAY: for (i = 0; i < count; i++) cmsDoTransform( transform, &in[i].gray, &out[i].gray, 1 ); return TRUE; - case COLOR_CMYK: for (i = 0; i < count; i++) cmsDoTransform( transform, &in[i].gray, &out[i].cmyk, 1 ); return TRUE; - case COLOR_XYZ: for (i = 0; i < count; i++) cmsDoTransform( transform, &in[i].gray, &out[i].XYZ, 1 ); return TRUE; - default: break; - } - break; - case COLOR_CMYK: - switch (output_type) - { - case COLOR_RGB: for (i = 0; i < count; i++) cmsDoTransform( transform, &in[i].cmyk, &out[i].rgb, 1 ); return TRUE; - case COLOR_Lab: for (i = 0; i < count; i++) cmsDoTransform( transform, &in[i].cmyk, &out[i].Lab, 1 ); return TRUE; - case COLOR_GRAY: for (i = 0; i < count; i++) cmsDoTransform( transform, &in[i].cmyk, &out[i].gray, 1 ); return TRUE; - case COLOR_CMYK: for (i = 0; i < count; i++) cmsDoTransform( transform, &in[i].cmyk, &out[i].cmyk, 1 ); return TRUE; - case COLOR_XYZ: for (i = 0; i < count; i++) cmsDoTransform( transform, &in[i].cmyk, &out[i].XYZ, 1 ); return TRUE; - case COLOR_3_CHANNEL: for (i = 0; i < count; i++) cmsDoTransform( transform, &in[i].cmyk, &out[i].gen3ch, 1 ); return TRUE; - default: break; - } - break; - case COLOR_XYZ: - switch (output_type) - { - case COLOR_RGB: for (i = 0; i < count; i++) cmsDoTransform( transform, &in[i].XYZ, &out[i].rgb, 1 ); return TRUE; - case COLOR_Lab: for (i = 0; i < count; i++) cmsDoTransform( transform, &in[i].XYZ, &out[i].Lab, 1 ); return TRUE; - case COLOR_GRAY: for (i = 0; i < count; i++) cmsDoTransform( transform, &in[i].XYZ, &out[i].gray, 1 ); return TRUE; - case COLOR_CMYK: for (i = 0; i < count; i++) cmsDoTransform( transform, &in[i].XYZ, &out[i].cmyk, 1 ); return TRUE; - case COLOR_XYZ: for (i = 0; i < count; i++) cmsDoTransform( transform, &in[i].XYZ, &out[i].XYZ, 1 ); return TRUE; - default: break; - } - break; - default: - break; + FIXME("unhandled input/output pair: %d/%d\n", input_type, output_type); + return FALSE; } - FIXME("unhandled input/output pair: %d/%d\n", input_type, output_type); - return FALSE; + for (i = 0; i < count; i++) + cmsDoTransform( transform, (char*)&in[i] + input_field_offset, (char*)&out[i] + output_field_offset, 1 ); + return TRUE; } static void CDECL lcms_close_transform( void *transform ) -- 2.30.2

1 0

[PATCH v2 1/3] mscms: Support COLOR_CMYK to COLOR_3_CHANNEL translation.
by Hans Leidekker March 22, 2021

March 22, 2021

From: Lauri Kenttä <lauri.kentta(a)gmail.com> It doesn't seem to matter whether COLOR_3_CHANNEL is mapped to TYPE_RGB or TYPE_CMY, so I've left it as TYPE_RGB as is the default. This makes Purple Pen orienteering map app usable (colors, not B/W). Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/mscms/liblcms.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mscms/liblcms.c b/dlls/mscms/liblcms.c index 1f43c359c4a..04fae980d26 100644 --- a/dlls/mscms/liblcms.c +++ b/dlls/mscms/liblcms.c @@ -173,6 +173,7 @@ static BOOL CDECL lcms_translate_colors( void *transform, COLOR *in, DWORD count case COLOR_GRAY: for (i = 0; i < count; i++) cmsDoTransform( transform, &in[i].cmyk, &out[i].gray, 1 ); return TRUE; case COLOR_CMYK: for (i = 0; i < count; i++) cmsDoTransform( transform, &in[i].cmyk, &out[i].cmyk, 1 ); return TRUE; case COLOR_XYZ: for (i = 0; i < count; i++) cmsDoTransform( transform, &in[i].cmyk, &out[i].XYZ, 1 ); return TRUE; + case COLOR_3_CHANNEL: for (i = 0; i < count; i++) cmsDoTransform( transform, &in[i].cmyk, &out[i].gen3ch, 1 ); return TRUE; default: break; } break; -- 2.30.2

1 0

[PATCH] dwrite: Return complete outline data from freetype integration code.
by Nikolay Sivov March 22, 2021

March 22, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- It makes it possible to cache outlines in directwrite format, that always differs at least because of Y axis direction transformation. At the same time user callbacks are not longer called from freetype integration code, which is important for splitting the library. dlls/dwrite/dwrite_private.h | 33 +++++++++- dlls/dwrite/font.c | 71 +++++++++++++++++++- dlls/dwrite/freetype.c | 123 +++++++++++++++++++---------------- 3 files changed, 168 insertions(+), 59 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index fe1a16c8899..47be661555c 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -457,14 +457,43 @@ struct dwrite_glyphbitmap DWRITE_MATRIX *m; }; +enum dwrite_outline_tags +{ + OUTLINE_BEGIN_FIGURE, + OUTLINE_END_FIGURE, + OUTLINE_LINE, + OUTLINE_BEZIER, +}; + +struct dwrite_outline +{ + struct + { + unsigned char *values; + size_t count; + size_t size; + } tags; + + struct + { + D2D1_POINT_2F *values; + size_t count; + size_t size; + } points; +}; + +extern int dwrite_outline_push_tag(struct dwrite_outline *outline, unsigned char tag) DECLSPEC_HIDDEN; +extern int dwrite_outline_push_points(struct dwrite_outline *outline, const D2D1_POINT_2F *points, + unsigned int count) DECLSPEC_HIDDEN; + extern BOOL init_freetype(void) DECLSPEC_HIDDEN; extern void release_freetype(void) DECLSPEC_HIDDEN; extern HRESULT freetype_get_design_glyph_metrics(struct dwrite_fontface *fontface, UINT16 glyph, DWRITE_GLYPH_METRICS *metrics) DECLSPEC_HIDDEN; extern void freetype_notify_cacheremove(IDWriteFontFace5 *fontface) DECLSPEC_HIDDEN; -extern HRESULT freetype_get_glyph_outline(IDWriteFontFace5 *fontface, float emSize, UINT16 glyph, - D2D1_POINT_2F origin, IDWriteGeometrySink *sink) DECLSPEC_HIDDEN; +extern int freetype_get_glyph_outline(IDWriteFontFace5 *fontface, float emSize, UINT16 glyph, + struct dwrite_outline *outline) DECLSPEC_HIDDEN; extern UINT16 freetype_get_glyphcount(IDWriteFontFace5 *fontface) DECLSPEC_HIDDEN; extern void freetype_get_glyph_bbox(struct dwrite_glyphbitmap *bitmap_desc) DECLSPEC_HIDDEN; extern BOOL freetype_get_glyph_bitmap(struct dwrite_glyphbitmap*) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 0167878e912..4c62f2a0e37 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -823,13 +823,50 @@ static void WINAPI dwritefontface_ReleaseFontTable(IDWriteFontFace5 *iface, void IDWriteFontFileStream_ReleaseFileFragment(fontface->stream, table_context); } +int dwrite_outline_push_tag(struct dwrite_outline *outline, unsigned char tag) +{ + if (!dwrite_array_reserve((void **)&outline->tags.values, &outline->tags.size, outline->tags.count + 1, + sizeof(*outline->tags.values))) + { + return 1; + } + + outline->tags.values[outline->tags.count++] = tag; + + return 0; +} + +int dwrite_outline_push_points(struct dwrite_outline *outline, const D2D1_POINT_2F *points, unsigned int count) +{ + if (!dwrite_array_reserve((void **)&outline->points.values, &outline->points.size, outline->points.count + count, + sizeof(*outline->points.values))) + { + return 1; + } + + memcpy(&outline->points.values[outline->points.count], points, sizeof(*points) * count); + outline->points.count += count; + + return 0; +} + +static void apply_outline_point_offset(const D2D1_POINT_2F *src, const D2D1_POINT_2F *offset, + D2D1_POINT_2F *dst) +{ + dst->x = src->x + offset->x; + dst->y = src->y + offset->y; +} + static HRESULT WINAPI dwritefontface_GetGlyphRunOutline(IDWriteFontFace5 *iface, FLOAT emSize, UINT16 const *glyphs, FLOAT const* advances, DWRITE_GLYPH_OFFSET const *offsets, UINT32 count, BOOL is_sideways, BOOL is_rtl, IDWriteGeometrySink *sink) { D2D1_POINT_2F *origins, baseline_origin = { 0 }; + struct dwrite_outline outline = { 0 }; + D2D1_BEZIER_SEGMENT segment; + D2D1_POINT_2F point; DWRITE_GLYPH_RUN run; - unsigned int i; + unsigned int i, j, p; HRESULT hr; TRACE("%p, %.8e, %p, %p, %p, %u, %d, %d, %p.\n", iface, emSize, glyphs, advances, offsets, @@ -863,10 +900,40 @@ static HRESULT WINAPI dwritefontface_GetGlyphRunOutline(IDWriteFontFace5 *iface, for (i = 0; i < count; ++i) { - if (FAILED(hr = freetype_get_glyph_outline(iface, emSize, glyphs[i], origins[i], sink))) + outline.tags.count = outline.points.count = 0; + if (freetype_get_glyph_outline(iface, emSize, glyphs[i], &outline)) + { WARN("Failed to get glyph outline for glyph %u.\n", glyphs[i]); + continue; + } + + for (j = 0, p = 0; j < outline.tags.count; ++j) + { + switch (outline.tags.values[j]) + { + case OUTLINE_BEGIN_FIGURE: + apply_outline_point_offset(&outline.points.values[p++], &origins[i], &point); + ID2D1SimplifiedGeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED); + break; + case OUTLINE_END_FIGURE: + ID2D1SimplifiedGeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED); + break; + case OUTLINE_LINE: + apply_outline_point_offset(&outline.points.values[p++], &origins[i], &point); + ID2D1SimplifiedGeometrySink_AddLines(sink, &point, 1); + break; + case OUTLINE_BEZIER: + apply_outline_point_offset(&outline.points.values[p++], &origins[i], &segment.point1); + apply_outline_point_offset(&outline.points.values[p++], &origins[i], &segment.point2); + apply_outline_point_offset(&outline.points.values[p++], &origins[i], &segment.point3); + ID2D1SimplifiedGeometrySink_AddBeziers(sink, &segment, 1); + break; + } + } } + heap_free(outline.tags.values); + heap_free(outline.points.values); heap_free(origins); return S_OK; diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index 83b2ae1bc88..9e4001d11c2 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -296,40 +296,46 @@ HRESULT freetype_get_design_glyph_metrics(struct dwrite_fontface *fontface, UINT return S_OK; } -struct decompose_context { - IDWriteGeometrySink *sink; - D2D1_POINT_2F offset; +struct decompose_context +{ + struct dwrite_outline *outline; BOOL figure_started; BOOL move_to; /* last call was 'move_to' */ FT_Vector origin; /* 'pen' position from last call */ }; -static inline void ft_vector_to_d2d_point(const FT_Vector *v, D2D1_POINT_2F offset, D2D1_POINT_2F *p) +static inline void ft_vector_to_d2d_point(const FT_Vector *v, D2D1_POINT_2F *p) { - p->x = (v->x / 64.0f) + offset.x; - p->y = (v->y / 64.0f) + offset.y; + p->x = v->x / 64.0f; + p->y = v->y / 64.0f; } -static void decompose_beginfigure(struct decompose_context *ctxt) +static int decompose_beginfigure(struct decompose_context *ctxt) { D2D1_POINT_2F point; + int ret; if (!ctxt->move_to) - return; + return 0; - ft_vector_to_d2d_point(&ctxt->origin, ctxt->offset, &point); - ID2D1SimplifiedGeometrySink_BeginFigure(ctxt->sink, point, D2D1_FIGURE_BEGIN_FILLED); + ft_vector_to_d2d_point(&ctxt->origin, &point); + if ((ret = dwrite_outline_push_tag(ctxt->outline, OUTLINE_BEGIN_FIGURE))) return ret; + if ((ret = dwrite_outline_push_points(ctxt->outline, &point, 1))) return ret; ctxt->figure_started = TRUE; ctxt->move_to = FALSE; + + return 0; } static int decompose_move_to(const FT_Vector *to, void *user) { - struct decompose_context *ctxt = (struct decompose_context*)user; + struct decompose_context *ctxt = (struct decompose_context *)user; + int ret; - if (ctxt->figure_started) { - ID2D1SimplifiedGeometrySink_EndFigure(ctxt->sink, D2D1_FIGURE_END_CLOSED); + if (ctxt->figure_started) + { + if ((ret = dwrite_outline_push_tag(ctxt->outline, OUTLINE_END_FIGURE))) return ret; ctxt->figure_started = FALSE; } @@ -340,17 +346,19 @@ static int decompose_move_to(const FT_Vector *to, void *user) static int decompose_line_to(const FT_Vector *to, void *user) { - struct decompose_context *ctxt = (struct decompose_context*)user; + struct decompose_context *ctxt = (struct decompose_context *)user; D2D1_POINT_2F point; + int ret; /* Special case for empty contours, in a way freetype returns them. */ if (ctxt->move_to && !memcmp(to, &ctxt->origin, sizeof(*to))) return 0; - decompose_beginfigure(ctxt); + ft_vector_to_d2d_point(to, &point); - ft_vector_to_d2d_point(to, ctxt->offset, &point); - ID2D1SimplifiedGeometrySink_AddLines(ctxt->sink, &point, 1); + if ((ret = decompose_beginfigure(ctxt))) return ret; + if ((ret = dwrite_outline_push_points(ctxt->outline, &point, 1))) return ret; + if ((ret = dwrite_outline_push_tag(ctxt->outline, OUTLINE_LINE))) return ret; ctxt->origin = *to; return 0; @@ -358,11 +366,13 @@ static int decompose_line_to(const FT_Vector *to, void *user) static int decompose_conic_to(const FT_Vector *control, const FT_Vector *to, void *user) { - struct decompose_context *ctxt = (struct decompose_context*)user; + struct decompose_context *ctxt = (struct decompose_context *)user; D2D1_POINT_2F points[3]; FT_Vector cubic[3]; + int ret; - decompose_beginfigure(ctxt); + if ((ret = decompose_beginfigure(ctxt))) + return ret; /* convert from quadratic to cubic */ @@ -394,10 +404,11 @@ static int decompose_conic_to(const FT_Vector *control, const FT_Vector *to, voi cubic[1].y += (to->y + 1) / 3; cubic[2] = *to; - ft_vector_to_d2d_point(cubic, ctxt->offset, points); - ft_vector_to_d2d_point(cubic + 1, ctxt->offset, points + 1); - ft_vector_to_d2d_point(cubic + 2, ctxt->offset, points + 2); - ID2D1SimplifiedGeometrySink_AddBeziers(ctxt->sink, (D2D1_BEZIER_SEGMENT*)points, 1); + ft_vector_to_d2d_point(cubic, points); + ft_vector_to_d2d_point(cubic + 1, points + 1); + ft_vector_to_d2d_point(cubic + 2, points + 2); + if ((ret = dwrite_outline_push_points(ctxt->outline, points, 3))) return ret; + if ((ret = dwrite_outline_push_tag(ctxt->outline, OUTLINE_BEZIER))) return ret; ctxt->origin = *to; return 0; } @@ -405,22 +416,28 @@ static int decompose_conic_to(const FT_Vector *control, const FT_Vector *to, voi static int decompose_cubic_to(const FT_Vector *control1, const FT_Vector *control2, const FT_Vector *to, void *user) { - struct decompose_context *ctxt = (struct decompose_context*)user; + struct decompose_context *ctxt = (struct decompose_context *)user; D2D1_POINT_2F points[3]; + int ret; - decompose_beginfigure(ctxt); + if ((ret = decompose_beginfigure(ctxt))) + return ret; - ft_vector_to_d2d_point(control1, ctxt->offset, points); - ft_vector_to_d2d_point(control2, ctxt->offset, points + 1); - ft_vector_to_d2d_point(to, ctxt->offset, points + 2); - ID2D1SimplifiedGeometrySink_AddBeziers(ctxt->sink, (D2D1_BEZIER_SEGMENT*)points, 1); + ft_vector_to_d2d_point(control1, points); + ft_vector_to_d2d_point(control2, points + 1); + ft_vector_to_d2d_point(to, points + 2); ctxt->origin = *to; + + if ((ret = dwrite_outline_push_points(ctxt->outline, points, 3))) return ret; + if ((ret = dwrite_outline_push_tag(ctxt->outline, OUTLINE_BEZIER))) return ret; + return 0; } -static void decompose_outline(FT_Outline *outline, D2D1_POINT_2F offset, IDWriteGeometrySink *sink) +static int decompose_outline(FT_Outline *ft_outline, struct dwrite_outline *outline) { - static const FT_Outline_Funcs decompose_funcs = { + static const FT_Outline_Funcs decompose_funcs = + { decompose_move_to, decompose_line_to, decompose_conic_to, @@ -428,19 +445,17 @@ static void decompose_outline(FT_Outline *outline, D2D1_POINT_2F offset, IDWrite 0, 0 }; - struct decompose_context context; + struct decompose_context context = { 0 }; + int ret; - context.sink = sink; - context.offset = offset; - context.figure_started = FALSE; - context.move_to = FALSE; - context.origin.x = 0; - context.origin.y = 0; + context.outline = outline; - pFT_Outline_Decompose(outline, &decompose_funcs, &context); + ret = pFT_Outline_Decompose(ft_outline, &decompose_funcs, &context); - if (context.figure_started) - ID2D1SimplifiedGeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED); + if (!ret && context.figure_started) + ret = dwrite_outline_push_tag(outline, OUTLINE_END_FIGURE); + + return ret; } static void embolden_glyph_outline(FT_Outline *outline, FLOAT emsize) @@ -464,13 +479,13 @@ static void embolden_glyph(FT_Glyph glyph, FLOAT emsize) embolden_glyph_outline(&outline_glyph->outline, emsize); } -HRESULT freetype_get_glyph_outline(IDWriteFontFace5 *fontface, float emSize, UINT16 glyph, - D2D1_POINT_2F origin, IDWriteGeometrySink *sink) +int freetype_get_glyph_outline(IDWriteFontFace5 *fontface, float emSize, UINT16 glyph, + struct dwrite_outline *outline) { FTC_ScalerRec scaler; USHORT simulations; - HRESULT hr = S_OK; FT_Size size; + int ret; simulations = IDWriteFontFace5_GetSimulations(fontface); @@ -482,31 +497,29 @@ HRESULT freetype_get_glyph_outline(IDWriteFontFace5 *fontface, float emSize, UIN scaler.y_res = 0; EnterCriticalSection(&freetype_cs); - if (pFTC_Manager_LookupSize(cache_manager, &scaler, &size) == 0) + if (!(ret = pFTC_Manager_LookupSize(cache_manager, &scaler, &size))) { if (pFT_Load_Glyph(size->face, glyph, FT_LOAD_NO_BITMAP) == 0) { - FT_Outline *outline = &size->face->glyph->outline; + FT_Outline *ft_outline = &size->face->glyph->outline; FT_Matrix m; if (simulations & DWRITE_FONT_SIMULATIONS_BOLD) - embolden_glyph_outline(outline, emSize); + embolden_glyph_outline(ft_outline, emSize); m.xx = 1 << 16; m.xy = simulations & DWRITE_FONT_SIMULATIONS_OBLIQUE ? (1 << 16) / 3 : 0; m.yx = 0; m.yy = -(1 << 16); /* flip Y axis */ - pFT_Outline_Transform(outline, &m); + pFT_Outline_Transform(ft_outline, &m); - decompose_outline(outline, origin, sink); + ret = decompose_outline(ft_outline, outline); } } - else - hr = E_FAIL; LeaveCriticalSection(&freetype_cs); - return hr; + return ret; } UINT16 freetype_get_glyphcount(IDWriteFontFace5 *fontface) @@ -797,10 +810,10 @@ HRESULT freetype_get_design_glyph_metrics(struct dwrite_fontface *fontface, UINT return E_NOTIMPL; } -HRESULT freetype_get_glyph_outline(IDWriteFontFace5 *fontface, float emSize, UINT16 glyph, - D2D1_POINT_2F origin, IDWriteGeometrySink *sink) +int freetype_get_glyph_outline(IDWriteFontFace5 *fontface, float emSize, UINT16 glyph, + struct dwrite_outline *outline) { - return E_NOTIMPL; + return 1; } UINT16 freetype_get_glyphcount(IDWriteFontFace5 *fontface) -- 2.30.2

1 0

[PATCH] mfreadwrite/reader: Consider audio block alignment when creating output buffers for the decoder.
by Nikolay Sivov March 22, 2021

March 22, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- A fix from ec5bd49bf85606a7a4b1a5f4146fbaabf53c1256 applied to the Reader API. dlls/mfreadwrite/reader.c | 44 ++++++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 15 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index ab959c26165..cb4166265a0 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -105,11 +105,17 @@ enum media_stream_flags STREAM_FLAG_PRESENTED = 0x4, /* Set if stream was selected last time Start() was called. */ }; +struct stream_transform +{ + IMFTransform *transform; + unsigned int min_buffer_size; +}; + struct media_stream { IMFMediaStream *stream; IMFMediaType *current; - IMFTransform *decoder; + struct stream_transform decoder; IMFVideoSampleAllocatorEx *allocator; IMFVideoSampleAllocatorNotify notify_cb; unsigned int id; @@ -643,12 +649,13 @@ static HRESULT source_reader_pull_stream_samples(struct source_reader *reader, s { MFT_OUTPUT_STREAM_INFO stream_info = { 0 }; MFT_OUTPUT_DATA_BUFFER out_buffer; + unsigned int buffer_size; IMFMediaBuffer *buffer; LONGLONG timestamp; DWORD status; HRESULT hr; - if (FAILED(hr = IMFTransform_GetOutputStreamInfo(stream->decoder, 0, &stream_info))) + if (FAILED(hr = IMFTransform_GetOutputStreamInfo(stream->decoder.transform, 0, &stream_info))) { WARN("Failed to get output stream info, hr %#x.\n", hr); return hr; @@ -663,7 +670,9 @@ static HRESULT source_reader_pull_stream_samples(struct source_reader *reader, s if (FAILED(hr = MFCreateSample(&out_buffer.pSample))) break; - if (FAILED(hr = MFCreateAlignedMemoryBuffer(stream_info.cbSize, stream_info.cbAlignment, &buffer))) + buffer_size = max(stream_info.cbSize, stream->decoder.min_buffer_size); + + if (FAILED(hr = MFCreateAlignedMemoryBuffer(buffer_size, stream_info.cbAlignment, &buffer))) { IMFSample_Release(out_buffer.pSample); break; @@ -673,7 +682,7 @@ static HRESULT source_reader_pull_stream_samples(struct source_reader *reader, s IMFMediaBuffer_Release(buffer); } - if (FAILED(hr = IMFTransform_ProcessOutput(stream->decoder, 0, 1, &out_buffer, &status))) + if (FAILED(hr = IMFTransform_ProcessOutput(stream->decoder.transform, 0, 1, &out_buffer, &status))) { if (out_buffer.pSample) IMFSample_Release(out_buffer.pSample); @@ -700,7 +709,7 @@ static HRESULT source_reader_process_sample(struct source_reader *reader, struct LONGLONG timestamp; HRESULT hr; - if (!stream->decoder) + if (!stream->decoder.transform) { timestamp = 0; if (FAILED(IMFSample_GetSampleTime(sample, &timestamp))) @@ -715,7 +724,7 @@ static HRESULT source_reader_process_sample(struct source_reader *reader, struct hr = source_reader_pull_stream_samples(reader, stream); if (hr == MF_E_TRANSFORM_NEED_MORE_INPUT) { - if (FAILED(hr = IMFTransform_ProcessInput(stream->decoder, 0, sample, 0))) + if (FAILED(hr = IMFTransform_ProcessInput(stream->decoder.transform, 0, sample, 0))) { WARN("Transform failed to process input, hr %#x.\n", hr); return hr; @@ -812,7 +821,7 @@ static HRESULT source_reader_media_stream_state_handler(struct source_reader *re stream->state = STREAM_STATE_EOS; stream->flags &= ~STREAM_FLAG_SAMPLE_REQUESTED; - if (stream->decoder && SUCCEEDED(IMFTransform_ProcessMessage(stream->decoder, + if (stream->decoder.transform && SUCCEEDED(IMFTransform_ProcessMessage(stream->decoder.transform, MFT_MESSAGE_COMMAND_DRAIN, 0))) { if ((hr = source_reader_pull_stream_samples(reader, stream)) != MF_E_TRANSFORM_NEED_MORE_INPUT) @@ -1161,8 +1170,8 @@ static void source_reader_flush_stream(struct source_reader *reader, DWORD strea struct media_stream *stream = &reader->streams[stream_index]; source_reader_release_responses(reader, stream); - if (stream->decoder) - IMFTransform_ProcessMessage(stream->decoder, MFT_MESSAGE_COMMAND_FLUSH, 0); + if (stream->decoder.transform) + IMFTransform_ProcessMessage(stream->decoder.transform, MFT_MESSAGE_COMMAND_FLUSH, 0); stream->requests = 0; } @@ -1378,8 +1387,8 @@ static ULONG WINAPI src_reader_Release(IMFSourceReader *iface) IMFMediaStream_Release(stream->stream); if (stream->current) IMFMediaType_Release(stream->current); - if (stream->decoder) - IMFTransform_Release(stream->decoder); + if (stream->decoder.transform) + IMFTransform_Release(stream->decoder.transform); if (stream->allocator) IMFVideoSampleAllocatorEx_Release(stream->allocator); } @@ -1672,8 +1681,10 @@ static HRESULT source_reader_configure_decoder(struct source_reader *reader, DWO IMFMediaType *input_type, IMFMediaType *output_type) { IMFMediaTypeHandler *type_handler; + unsigned int block_alignment = 0; IMFTransform *transform = NULL; IMFMediaType *type = NULL; + GUID major = { 0 }; DWORD flags; HRESULT hr; int i = 0; @@ -1710,12 +1721,15 @@ static HRESULT source_reader_configure_decoder(struct source_reader *reader, DWO if (FAILED(hr = IMFMediaType_CopyAllItems(type, (IMFAttributes *)reader->streams[index].current))) WARN("Failed to copy attributes, hr %#x.\n", hr); + if (SUCCEEDED(IMFMediaType_GetMajorType(type, &major)) && IsEqualGUID(&major, &MFMediaType_Audio)) + IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_BLOCK_ALIGNMENT, &block_alignment); IMFMediaType_Release(type); - if (reader->streams[index].decoder) - IMFTransform_Release(reader->streams[index].decoder); + if (reader->streams[index].decoder.transform) + IMFTransform_Release(reader->streams[index].decoder.transform); - reader->streams[index].decoder = transform; + reader->streams[index].decoder.transform = transform; + reader->streams[index].decoder.min_buffer_size = block_alignment; return S_OK; } @@ -2082,7 +2096,7 @@ static HRESULT WINAPI src_reader_GetServiceForStream(IMFSourceReader *iface, DWO hr = MF_E_INVALIDSTREAMNUMBER; else { - obj = (IUnknown *)reader->streams[index].decoder; + obj = (IUnknown *)reader->streams[index].decoder.transform; if (!obj) hr = E_NOINTERFACE; } break; -- 2.30.2

1 0