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

RFC: ERROR_SXS_CANT_GEN_ACTCTX trying to run atl80:atl
by Francois Gouget 22 Mar '21

22 Mar '21

Both WineTest and the TestBot fail to run the atl80 tests because CreateProcess() fails with ERROR_SXS_CANT_GEN_ACTCTX: https://test.winehq.org/data/41df83c50e1c3cfdd6e8ffb65de7838f8503632c/win10… -> see this line: atl80 load error 14001 On the TestBot a few configurations succeed: https://testbot.winehq.org/JobDetails.pl?Key=87365 * 32-bit wvistau64, w8 * 64-bit wvistau64 Before the e618fb526d06 commit, WineTest was not even trying so the current situation is be somewhat better: https://test.winehq.org/data/tests/atl80:atl.html But does anyone know how to get the atl80 tests to run? -- Francois Gouget <fgouget(a)codeweavers.com>

2 1

RFC: Missing entry points -> skip or failure?
by Francois Gouget 22 Mar '21

22 Mar '21

TestLauncher now detects missing entry points. For instance: https://testbot.winehq.org/JobDetails.pl?Key=87361&f201=exe32.report#k201 rtworkq.c:0: Tests skipped: missing entry point (details below) | rtworkq_test.exe - Entry Point Not Found | The procedure entry point CoGetApartmentType could not be located in the dynamic link library ole32.dll. The two lines starting with "|" are extracted from the Windows critical error dialog and clearly show the issue. The remaining question is whether this case should really be a skip or a failure. If a dll is missing the past policy was to just skip the test so I carried on for missing entry points, ordinals, and indirectly missing dlls (when a test links with a dll which links with a missing dll). Reporting missing entry points as failures would make it more obvious that the test needs fixing to use GetProcAddress(). But in some cases, such as rtworkq:rtworkq here, that may be somewhat pointless (it would be unable to perform any of the current tests without CoGetApartmentType()). So what's the general consensus on this? See also: https://bugs.winehq.org/show_bug.cgi?id=48208 -- Francois Gouget <fgouget(a)codeweavers.com>

2 2

winegcc library creation/import broken
by Peter Dons Tychsen 22 Mar '21

22 Mar '21

Hi AJ, > Because of the loader changes needed to support PE builtins, importing a > Winelib library directly at the Unix level is currently broken. It may > be reimplemented at some point, but that's not trivial. > You can still link to a library at the Unix level (as opposed to > building an import library and linking to that), but you have to tell > Wine explicitly about the loaded library. This can be done by adding a > LoadLibraryA("libtest.so") at the start of your app. Has anyone tried this recently? Are there any examples of this still working? I tried to insert LoadLibraryA("libtest.so") with success, but this did not change anything. Still the same crash. Thanks, /pedro

2 8

[tools] testbot/LogUtils: Don't include garbage in the .errors file.
by Francois Gouget 22 Mar '21

22 Mar '21

When failure lines are garbled because of a race condition or a missing '\n' they often contain unwanted characters at the start of the line. If included in the .errors file these prevent the line from matching past instances of the failure (if only because of line numbers), thus causing it to be incorrectly reported as new. So only include the parts of the line matched by the error matching regular expression. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50491 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- There are some performance implications for using things like $& and $' but that's only for old Perl versions, older than is used on the TestBot. Furthermore nowadays we only parse reports when a task completes, not every time we present the results on the website. For the following wtbsuite test: WTBS Garbled trace, ok, todo, skip sampler (advpack:advpack). --- testbot/lib/WineTestBot/LogUtils.pm | 8 ++++---- testbot/src/reporttest/report.testwtbs | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 840a5526a..903afe495 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -573,7 +573,7 @@ sub ParseWineTestReport($$$) $Line =~ /^([_a-z0-9]+)\.c:\d+:[0-9.]* Test (?:failed|succeeded inside todo block): /) { _CheckUnit($LogInfo, $Cur, $1, "failure"); - _AddReportError($LogInfo, $Cur, $LineNo, $Line); + _AddReportError($LogInfo, $Cur, $LineNo, "$&$'"); $Cur->{LineFailures}++; } elsif (($Cur->{Unit} ne "" and @@ -625,7 +625,7 @@ sub ParseWineTestReport($$$) $Cur->{Pids}->{$Pid || 0} = 1; $Cur->{SummaryFailures}++; } - _AddReportError($LogInfo, $Cur, $LineNo, $Line); + _AddReportError($LogInfo, $Cur, $LineNo, "$&$'"); $Cur->{LineFailures}++; } } @@ -636,7 +636,7 @@ sub ParseWineTestReport($$$) # This also replaces a test summary line. The pid is unknown so use 0. $Cur->{Pids}->{0} = 1; $Cur->{SummaryFailures}++; - _AddReportError($LogInfo, $Cur, $LineNo, $Line); + _AddReportError($LogInfo, $Cur, $LineNo, "$&$'"); $Cur->{LineFailures}++; } } @@ -654,7 +654,7 @@ sub ParseWineTestReport($$$) $Cur->{Pids}->{$Pid || 0} = 1; $Cur->{SummaryFailures}++; } - _AddReportError($LogInfo, $Cur, $LineNo, $Line); + _AddReportError($LogInfo, $Cur, $LineNo, $&); $Cur->{LineFailures}++; } } diff --git a/testbot/src/reporttest/report.testwtbs b/testbot/src/reporttest/report.testwtbs index e1988278c..104c8ea60 100644 --- a/testbot/src/reporttest/report.testwtbs +++ b/testbot/src/reporttest/report.testwtbs @@ -50,11 +50,11 @@ n 0 comboex.c:40: Test failed: A failure in the main process n 0 comboex.c:41: Test succeeded inside todo block: Success in the main process n 0 header.c:1: Test failed: Something wrong n 0 1234:rebar: unhandled exception c0000005 at 0040167C -n 0 garbled0123:status: unhandled exception c0000005 at 0040167C -n 0 status.c:33: unhandled exception c0000005 in child process 0123dead +n 0 0123:status: unhandled exception c0000005 at 0040167C +n 0 status.c:33: unhandled exception c0000005 in child process 0123 n 0 1234:subclass: unhandled exception c0000005 at 0040167C -n 0 Do not cut syslink.c:40: Test failed: Something wrong -n 0 Do not cut syslink.c:41: Test succeeded inside todo block: Something right! +n 0 syslink.c:40: Test failed: Something wrong +n 0 syslink.c:41: Test succeeded inside todo block: Something right! n 0 Unhandled exception: page fault on write access to 0x00000000 in 32-bit code (0x0054376d). n 0 1234:taskdialog: unhandled exception c0000005 at 0040167C n 0 taskdialog.c:471: unhandled exception c0000005 in child process 1234 -- 2.20.1

1 0

[PATCH 1/4] wineboot: Initialize user shared data Qpc flags and frequency.
by Rémi Bernon 22 Mar '21

22 Mar '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- This is probably more an RFC but I don't expect it to be merged right away anyway. It fixes the high overhead (Rtl)QueryPerformanceCounter now have with the new syscall frames. There's a few things I'm still not completely confident with: * The reported Qpc frequency now changes from the default 10MHz. This is also the case on some Windows version (since they introduced QpcBypass but before they introduced the hypervisor page), and applications shouldn't rely on a fixed frequency, but we can expect that some do. Since the hypervisor page, the reported frequency is 10MHz again, and the divider is stored in the new shared page. We could very well implement the same thing, but it required the new shared memory page to be introduced. * The rdtsc(p) frequency calibration done when we cannot get the information from cpuid (on AMD and older Intel CPU) is still a little bit imprecise, and I'm not sure how to make it better while keeping the calibration time small. On my computer I can see a ±100KHz error for a nominal 3.6GHz frequency. I believe the Linux kernel also does some estimation there, but it has access to hardware timers that may help to get a better approximation. programs/wineboot/wineboot.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 9427448b612..9e36b3c22dd 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -82,6 +82,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(wineboot); +#define TICKSPERSEC 10000000 + extern BOOL shutdown_close_windows( BOOL force ); extern BOOL shutdown_all_desktops( BOOL force ); extern void kill_processes( BOOL kill_desktop ); @@ -241,12 +243,28 @@ static void initialize_xstate_features(struct _KUSER_SHARED_DATA *data) TRACE("XSAVE feature 2 %#x, %#x, %#x, %#x.\n", regs[0], regs[1], regs[2], regs[3]); } +static void initialize_qpc_features(struct _KUSER_SHARED_DATA *data) +{ + data->QpcBypassEnabled = 0; + data->QpcFrequency = TICKSPERSEC; + data->QpcShift = 0; + data->QpcBias = 0; +} + #else static void initialize_xstate_features(struct _KUSER_SHARED_DATA *data) { } +static void initialize_qpc_features(struct _KUSER_SHARED_DATA *data) +{ + data->QpcBypassEnabled = 0; + data->QpcFrequency = TICKSPERSEC; + data->QpcShift = 0; + data->QpcBias = 0; +} + #endif static void create_user_shared_data(void) @@ -336,6 +354,7 @@ static void create_user_shared_data(void) data->ActiveGroupCount = 1; initialize_xstate_features( data ); + initialize_qpc_features( data ); UnmapViewOfFile( data ); } -- 2.30.2

1 3

[PATCH 5/5] riched20: Fix-up the scrollbar visibility in the host.
by Huw Davies 22 Mar '21

22 Mar '21

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 22 Mar '21

22 Mar '21

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 22 Mar '21

22 Mar '21

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 22 Mar '21

22 Mar '21

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 22 Mar '21

22 Mar '21

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