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

Daniel Lehman : msvcr120: Add fetestexcept.
by Alexandre Julliard March 12, 2021

March 12, 2021

Module: wine Branch: master Commit: 7981ab4fd0022b78f3856a7897916ebb2f55d6fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=7981ab4fd0022b78f3856a78… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Thu Mar 11 23:12:07 2021 -0800 msvcr120: Add fetestexcept. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-runtime-l1-1-0.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120/tests/msvcr120.c | 33 +++++++++++++++++++++- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/math.c | 8 ++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- include/msvcrt/fenv.h | 1 + 7 files changed, 45 insertions(+), 5 deletions(-) diff --git a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec index 74d682b33bf..66c2d8cc264 100644 --- a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec +++ b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec @@ -95,7 +95,7 @@ @ cdecl fesetenv(ptr) ucrtbase.fesetenv @ stub fesetexceptflag @ cdecl fesetround(long) ucrtbase.fesetround -@ stub fetestexcept +@ cdecl fetestexcept(long) ucrtbase.fetestexcept @ cdecl perror(str) ucrtbase.perror @ cdecl quick_exit(long) ucrtbase.quick_exit @ cdecl raise(long) ucrtbase.raise diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 0e1c7705166..27ae5a930f6 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2154,7 +2154,7 @@ @ cdecl fesetenv(ptr) @ stub fesetexceptflag @ cdecl fesetround(long) -@ stub fetestexcept +@ cdecl fetestexcept(long) @ stub feupdateenv @ cdecl fflush(ptr) @ cdecl fgetc(ptr) diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index e8ef2be3520..537e9077402 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -182,6 +182,7 @@ static int (CDECL *p_fegetenv)(fenv_t*); static int (CDECL *p_fesetenv)(const fenv_t*); static int (CDECL *p_fegetround)(void); static int (CDECL *p_fesetround)(int); +static int (CDECL *p_fetestexcept)(int); static int (CDECL *p__clearfp)(void); static _locale_t (__cdecl *p_wcreate_locale)(int, const wchar_t *); static void (__cdecl *p_free_locale)(_locale_t); @@ -257,6 +258,7 @@ static BOOL init(void) SET(p_fesetenv, "fesetenv"); SET(p_fegetround, "fegetround"); SET(p_fesetround, "fesetround"); + SET(p_fetestexcept, "fetestexcept"); SET(p__clearfp, "_clearfp"); SET(p_vsscanf, "vsscanf"); @@ -788,8 +790,17 @@ static void test_critical_section(void) static void test_feenv(void) { + static const int tests[] = { + 0, + FE_INEXACT, + FE_UNDERFLOW, + FE_OVERFLOW, + FE_DIVBYZERO, + FE_INVALID, + FE_ALL_EXCEPT, + }; fenv_t env, env2; - int ret; + int i, ret, flags; p__clearfp(); @@ -807,6 +818,26 @@ static void test_feenv(void) ok(!ret, "fesetenv returned %x\n", ret); ret = p_fegetround(); ok(ret == FE_TONEAREST, "Got unexpected round mode %#x.\n", ret); + + ret = p_fetestexcept(FE_ALL_EXCEPT); + ok(!ret, "fetestexcept returned %x\n", ret); + + flags = 0; + for(i=0; i<ARRAY_SIZE(tests); i++) { + ret = p_fegetenv(&env); + ok(!ret, "Test %d: fegetenv returned %x\n", i, ret); + env._Fe_stat |= tests[i]; + ret = p_fesetenv(&env); + ok(!ret, "Test %d: fesetenv returned %x\n", i, ret); + + ret = p_fetestexcept(tests[i]); + ok(ret == tests[i], "Test %d: expected %x, got %x\n", i, tests[i], ret); + + flags |= tests[i]; + ret = p_fetestexcept(FE_ALL_EXCEPT); + ok(ret == flags, "Test %d: expected %x, got %x\n", i, flags, ret); + } + p__clearfp(); } static void test__wcreate_locale(void) diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 05b8a97a084..daee644d965 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1820,7 +1820,7 @@ @ cdecl fesetenv(ptr) msvcr120.fesetenv @ stub fesetexceptflag @ cdecl fesetround(long) msvcr120.fesetround -@ stub fetestexcept +@ cdecl fetestexcept(long) msvcr120.fetestexcept @ stub feupdateenv @ cdecl fflush(ptr) msvcr120.fflush @ cdecl fgetc(ptr) msvcr120.fgetc diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index d6b0d9422e7..6c1d665c843 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2214,6 +2214,14 @@ int CDECL fegetenv(fenv_t *env) env->_Fe_stat = _statusfp(); return 0; } + +/********************************************************************* + * fetestexcept (MSVCR120.@) + */ +int CDECL fetestexcept(int flags) +{ + return _statusfp() & flags; +} #endif #if _MSVCR_VER>=140 diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 0a8d74521f5..d40df5e0efc 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2296,7 +2296,7 @@ @ cdecl fesetenv(ptr) @ stub fesetexceptflag @ cdecl fesetround(long) -@ stub fetestexcept +@ cdecl fetestexcept(long) @ cdecl fflush(ptr) @ cdecl fgetc(ptr) @ cdecl fgetpos(ptr ptr) diff --git a/include/msvcrt/fenv.h b/include/msvcrt/fenv.h index 92b341bd46b..3dcbcf0b8fe 100644 --- a/include/msvcrt/fenv.h +++ b/include/msvcrt/fenv.h @@ -34,6 +34,7 @@ _ACRTIMP int __cdecl fegetenv(fenv_t*); _ACRTIMP int __cdecl fesetenv(const fenv_t*); _ACRTIMP int __cdecl fegetround(void); _ACRTIMP int __cdecl fesetround(int); +_ACRTIMP int __cdecl fetestexcept(int); #ifdef __cplusplus }

1 0

Hugh McMaster : regedit: Stop parsing REG_SZ values containing NUL character sequences.
by Alexandre Julliard March 12, 2021

March 12, 2021

Module: wine Branch: master Commit: b8b7979f9c77db4457c7b4713b484b6fa2c2f8e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8b7979f9c77db4457c7b471… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Mar 12 22:27:33 2021 +1100 regedit: Stop parsing REG_SZ values containing NUL character sequences. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 3 +-- programs/regedit/tests/regedit.c | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 727f39f6158..5bb991865e6 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -402,8 +402,7 @@ static BOOL REGPROC_unescape_string(WCHAR *str, WCHAR **unparsed) str[val_idx] = '\r'; break; case '0': - str[val_idx] = '\0'; - break; + return FALSE; case '\\': case '"': str[val_idx] = str[str_idx]; diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 9b431fa6f38..7d2c9416bcc 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -1694,12 +1694,12 @@ static void test_invalid_import(void) "\"Wine33d\"=\"Value2\\0\\0\\0\\0\"\n" "\"Wine33e\"=\"Value3\\0Value4\"\n" "\"Wine33f\"=\"\\0Value5\"\n\n"); - todo_wine verify_reg_nonexist(hkey, "Wine33a"); - todo_wine verify_reg_nonexist(hkey, "Wine33b"); - todo_wine verify_reg_nonexist(hkey, "Wine33c"); - todo_wine verify_reg_nonexist(hkey, "Wine33d"); - todo_wine verify_reg_nonexist(hkey, "Wine33e"); - todo_wine verify_reg_nonexist(hkey, "Wine33f"); + verify_reg_nonexist(hkey, "Wine33a"); + verify_reg_nonexist(hkey, "Wine33b"); + verify_reg_nonexist(hkey, "Wine33c"); + verify_reg_nonexist(hkey, "Wine33d"); + verify_reg_nonexist(hkey, "Wine33e"); + verify_reg_nonexist(hkey, "Wine33f"); close_key(hkey); @@ -2205,12 +2205,12 @@ static void test_invalid_import_unicode(void) "\"Wine33d\"=\"Value2\\0\\0\\0\\0\"\n" "\"Wine33e\"=\"Value3\\0Value4\"\n" "\"Wine33f\"=\"\\0Value5\"\n\n"); - todo_wine verify_reg_nonexist(hkey, "Wine33a"); - todo_wine verify_reg_nonexist(hkey, "Wine33b"); - todo_wine verify_reg_nonexist(hkey, "Wine33c"); - todo_wine verify_reg_nonexist(hkey, "Wine33d"); - todo_wine verify_reg_nonexist(hkey, "Wine33e"); - todo_wine verify_reg_nonexist(hkey, "Wine33f"); + verify_reg_nonexist(hkey, "Wine33a"); + verify_reg_nonexist(hkey, "Wine33b"); + verify_reg_nonexist(hkey, "Wine33c"); + verify_reg_nonexist(hkey, "Wine33d"); + verify_reg_nonexist(hkey, "Wine33e"); + verify_reg_nonexist(hkey, "Wine33f"); close_key(hkey);

1 0

Huw Davies : richedit: Handle EM_GETTEXTRANGE's unicode conversion in the host.
by Alexandre Julliard March 12, 2021

March 12, 2021

Module: wine Branch: master Commit: 93fec636d5be64bbc16986f5b1b05e80f630adb3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93fec636d5be64bbc16986f5… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 12 09:01:36 2021 +0000 richedit: Handle EM_GETTEXTRANGE's unicode conversion in the host. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 5 ++--- dlls/riched20/tests/editor.c | 4 ++-- dlls/riched20/txthost.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/riched32/tests/editor.c | 2 +- 4 files changed, 43 insertions(+), 6 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 53d54a3b8e2..f96f52ef56d 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4014,15 +4014,14 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, int nEnd = rng->chrg.cpMax; int textlength = ME_GetTextLength(editor); - TRACE("EM_GETTEXTRANGE min=%d max=%d unicode=%d textlength=%d\n", - rng->chrg.cpMin, rng->chrg.cpMax, unicode, textlength); + TRACE( "EM_GETTEXTRANGE min = %d max = %d textlength = %d\n", rng->chrg.cpMin, rng->chrg.cpMax, textlength ); if (nStart < 0) return 0; if ((nStart == 0 && nEnd == -1) || nEnd > textlength) nEnd = textlength; if (nStart >= nEnd) return 0; cursor_from_char_ofs( editor, nStart, &start ); - return ME_GetTextRange(editor, rng->lpstrText, &start, nEnd - nStart, unicode); + return ME_GetTextRange( editor, rng->lpstrText, &start, nEnd - nStart, TRUE ); } case EM_GETLINE: { diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 4c87869c4a3..170c29f186e 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -1790,8 +1790,8 @@ static void test_EM_GETTEXTRANGE(void) textRange.chrg.cpMin = 4; textRange.chrg.cpMax = 8; result = SendMessageA(hwndRichEdit, EM_GETTEXTRANGE, 0, (LPARAM)&textRange); - todo_wine ok(result == 5, "EM_GETTEXTRANGE returned %ld\n", result); - todo_wine ok(!strcmp("ef\x8e\xf0g", buffer), "EM_GETTEXTRANGE filled %s\n", buffer); + ok(result == 5, "EM_GETTEXTRANGE returned %ld\n", result); + ok(!strcmp("ef\x8e\xf0g", buffer), "EM_GETTEXTRANGE filled %s\n", buffer); } DestroyWindow(hwndRichEdit); diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index ca911453010..3c968ddfecc 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -753,6 +753,39 @@ static BOOL create_windowed_editor( HWND hwnd, CREATESTRUCTW *create, BOOL emula return TRUE; } +static HRESULT get_text_rangeA( struct host *host, TEXTRANGEA *rangeA, LRESULT *res ) +{ + TEXTRANGEW range; + HRESULT hr; + unsigned int count; + LRESULT len; + + *res = 0; + if (rangeA->chrg.cpMin < 0) return S_OK; + ITextServices_TxSendMessage( host->text_srv, WM_GETTEXTLENGTH, 0, 0, &len ); + range.chrg = rangeA->chrg; + if ((range.chrg.cpMin == 0 && range.chrg.cpMax == -1) || range.chrg.cpMax > len) + range.chrg.cpMax = len; + if (range.chrg.cpMin >= range.chrg.cpMax) return S_OK; + count = range.chrg.cpMax - range.chrg.cpMin + 1; + range.lpstrText = heap_alloc( count * sizeof(WCHAR) ); + if (!range.lpstrText) return E_OUTOFMEMORY; + hr = ITextServices_TxSendMessage( host->text_srv, EM_GETTEXTRANGE, 0, (LPARAM)&range, &len ); + if (hr == S_OK && len) + { + if (!host->emulate_10) count = INT_MAX; + len = WideCharToMultiByte( CP_ACP, 0, range.lpstrText, -1, rangeA->lpstrText, count, NULL, NULL ); + if (!host->emulate_10) *res = len - 1; + else + { + *res = count - 1; + rangeA->lpstrText[*res] = '\0'; + } + } + heap_free( range.lpstrText ); + return hr; +} + static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, BOOL unicode ) { @@ -822,6 +855,11 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, hr = ITextServices_TxSendMessage( host->text_srv, EM_GETTEXTLENGTHEX, (WPARAM)&params, 0, &res ); break; } + case EM_GETTEXTRANGE: + if (unicode) hr = ITextServices_TxSendMessage( host->text_srv, msg, wparam, lparam, &res ); + else hr = get_text_rangeA( host, (TEXTRANGEA *)lparam, &res ); + break; + case WM_PAINT: { HDC hdc; diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index f4f6ebeb709..0f5ca9f738b 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -584,7 +584,7 @@ static void test_EM_GETTEXTRANGE(void) textRange.chrg.cpMax = 8; result = SendMessageA(hwndRichEdit, EM_GETTEXTRANGE, 0, (LPARAM)&textRange); ok(result == 4, "EM_GETTEXTRANGE returned %ld\n", result); - todo_wine ok(!strcmp("ef\x8e\xf0", buffer), "EM_GETTEXTRANGE filled %s\n", buffer); + ok(!strcmp("ef\x8e\xf0", buffer), "EM_GETTEXTRANGE filled %s\n", buffer); } DestroyWindow(hwndRichEdit);

1 0

Zebediah Figura : strmbase: Rename the "pFuncsTable" member of struct strmbase_renderer to "ops".
by Alexandre Julliard March 12, 2021

March 12, 2021

Module: wine Branch: master Commit: 60a2d66e40cd19d826be04bf903eb0cb07239d9f URL: https://source.winehq.org/git/wine.git/?a=commit;h=60a2d66e40cd19d826be04bf… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 11 17:22:00 2021 -0600 strmbase: Rename the "pFuncsTable" member of struct strmbase_renderer to "ops". Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/renderer.c | 42 +++++++++++++++++++++--------------------- include/wine/strmbase.h | 2 +- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 47be6e0fd30..ee8ff4c623f 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -198,7 +198,7 @@ static struct strmbase_pin *renderer_get_pin(struct strmbase_filter *iface, unsi static void renderer_destroy(struct strmbase_filter *iface) { struct strmbase_renderer *filter = impl_from_strmbase_filter(iface); - filter->pFuncsTable->renderer_destroy(filter); + filter->ops->renderer_destroy(filter); } static HRESULT renderer_query_interface(struct strmbase_filter *iface, REFIID iid, void **out) @@ -206,8 +206,8 @@ static HRESULT renderer_query_interface(struct strmbase_filter *iface, REFIID ii struct strmbase_renderer *filter = impl_from_strmbase_filter(iface); HRESULT hr; - if (filter->pFuncsTable->renderer_query_interface - && SUCCEEDED(hr = filter->pFuncsTable->renderer_query_interface(filter, iid, out))) + if (filter->ops->renderer_query_interface + && SUCCEEDED(hr = filter->ops->renderer_query_interface(filter, iid, out))) { return hr; } @@ -233,8 +233,8 @@ static HRESULT renderer_init_stream(struct strmbase_filter *iface) ResetEvent(filter->state_event); filter->eos = FALSE; ResetEvent(filter->flush_event); - if (filter->pFuncsTable->renderer_init_stream) - filter->pFuncsTable->renderer_init_stream(filter); + if (filter->ops->renderer_init_stream) + filter->ops->renderer_init_stream(filter); return filter->sink.pin.peer ? S_FALSE : S_OK; } @@ -249,8 +249,8 @@ static HRESULT renderer_start_stream(struct strmbase_filter *iface, REFERENCE_TI if (filter->sink.pin.peer) filter->eos = FALSE; reset_qos(filter); - if (filter->sink.pin.peer && filter->pFuncsTable->renderer_start_stream) - filter->pFuncsTable->renderer_start_stream(filter); + if (filter->sink.pin.peer && filter->ops->renderer_start_stream) + filter->ops->renderer_start_stream(filter); return S_OK; } @@ -261,8 +261,8 @@ static HRESULT renderer_stop_stream(struct strmbase_filter *iface) ResetEvent(filter->run_event); - if (filter->sink.pin.peer && filter->pFuncsTable->renderer_stop_stream) - filter->pFuncsTable->renderer_stop_stream(filter); + if (filter->sink.pin.peer && filter->ops->renderer_stop_stream) + filter->ops->renderer_stop_stream(filter); return S_OK; } @@ -302,7 +302,7 @@ static const struct strmbase_filter_ops filter_ops = static HRESULT sink_query_accept(struct strmbase_pin *pin, const AM_MEDIA_TYPE *mt) { struct strmbase_renderer *filter = impl_from_IPin(&pin->IPin_iface); - return filter->pFuncsTable->renderer_query_accept(filter, mt); + return filter->ops->renderer_query_accept(filter, mt); } static HRESULT sink_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) @@ -310,8 +310,8 @@ static HRESULT sink_query_interface(struct strmbase_pin *iface, REFIID iid, void struct strmbase_renderer *filter = impl_from_IPin(&iface->IPin_iface); HRESULT hr; - if (filter->pFuncsTable->renderer_pin_query_interface - && SUCCEEDED(hr = filter->pFuncsTable->renderer_pin_query_interface(filter, iid, out))) + if (filter->ops->renderer_pin_query_interface + && SUCCEEDED(hr = filter->ops->renderer_pin_query_interface(filter, iid, out))) return hr; if (IsEqualGUID(iid, &IID_IMemInputPin)) @@ -344,7 +344,7 @@ static HRESULT WINAPI BaseRenderer_Receive(struct strmbase_sink *pin, IMediaSamp TRACE("Format change.\n"); strmbase_dump_media_type(mt); - if (FAILED(filter->pFuncsTable->renderer_query_accept(filter, mt))) + if (FAILED(filter->ops->renderer_query_accept(filter, mt))) return VFW_E_TYPE_NOT_ACCEPTED; DeleteMediaType(mt); } @@ -361,7 +361,7 @@ static HRESULT WINAPI BaseRenderer_Receive(struct strmbase_sink *pin, IMediaSamp filter->current_sample = sample; - hr = filter->pFuncsTable->renderer_render(filter, sample); + hr = filter->ops->renderer_render(filter, sample); SetEvent(filter->state_event); LeaveCriticalSection(&filter->filter.stream_cs); @@ -401,14 +401,14 @@ static HRESULT WINAPI BaseRenderer_Receive(struct strmbase_sink *pin, IMediaSamp } if (state == State_Running) - hr = filter->pFuncsTable->renderer_render(filter, sample); + hr = filter->ops->renderer_render(filter, sample); perform_qos(filter, start, stop, jitter); } else { if (state == State_Running) - hr = filter->pFuncsTable->renderer_render(filter, sample); + hr = filter->ops->renderer_render(filter, sample); } return hr; @@ -418,8 +418,8 @@ static HRESULT sink_connect(struct strmbase_sink *iface, IPin *peer, const AM_ME { struct strmbase_renderer *filter = impl_from_IPin(&iface->pin.IPin_iface); - if (filter->pFuncsTable->renderer_connect) - return filter->pFuncsTable->renderer_connect(filter, mt); + if (filter->ops->renderer_connect) + return filter->ops->renderer_connect(filter, mt); return S_OK; } @@ -427,8 +427,8 @@ static void sink_disconnect(struct strmbase_sink *iface) { struct strmbase_renderer *filter = impl_from_IPin(&iface->pin.IPin_iface); - if (filter->pFuncsTable->renderer_disconnect) - filter->pFuncsTable->renderer_disconnect(filter); + if (filter->ops->renderer_disconnect) + filter->ops->renderer_disconnect(filter); } static HRESULT sink_eos(struct strmbase_sink *iface) @@ -580,7 +580,7 @@ void strmbase_renderer_init(struct strmbase_renderer *filter, IUnknown *outer, ISeekingPassThru_Init(&filter->passthrough.ISeekingPassThru_iface, TRUE, &filter->sink.pin.IPin_iface); filter->IQualityControl_iface.lpVtbl = &quality_control_vtbl; - filter->pFuncsTable = ops; + filter->ops = ops; strmbase_sink_init(&filter->sink, &filter->filter, sink_name, &sink_ops, NULL); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 9906a9ffd74..788abfd1c9f 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -300,7 +300,7 @@ struct strmbase_renderer REFERENCE_TIME last_left, avg_duration, avg_pt; double avg_rate; - const struct strmbase_renderer_ops *pFuncsTable; + const struct strmbase_renderer_ops *ops; BOOL eos; };

1 0

Huw Davies : riched20: Use EM_GETTEXTEX to implement WM_GETTEXT.
by Alexandre Julliard March 12, 2021

March 12, 2021

Module: wine Branch: master Commit: 6a173becd46d9930ffbc1f25cc3f9d2cdce403ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a173becd46d9930ffbc1f25… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 12 09:01:35 2021 +0000 riched20: Use EM_GETTEXTEX to implement WM_GETTEXT. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 4 ++-- dlls/riched20/txthost.c | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 6532f7c65cb..53d54a3b8e2 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3978,9 +3978,9 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, case WM_GETTEXT: { GETTEXTEX ex; - ex.cb = wParam * (unicode ? sizeof(WCHAR) : sizeof(CHAR)); + ex.cb = wParam * sizeof(WCHAR); ex.flags = GT_USECRLF; - ex.codepage = unicode ? CP_UNICODE : CP_ACP; + ex.codepage = CP_UNICODE; ex.lpDefaultChar = NULL; ex.lpUsedDefChar = NULL; return ME_GetTextEx(editor, &ex, lParam); diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index e401759991f..ca911453010 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -801,6 +801,18 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, FillRect( hdc, &rc, editor->hbrBackground ); return 1; } + case WM_GETTEXT: + { + GETTEXTEX params; + + params.cb = wparam * (unicode ? sizeof(WCHAR) : sizeof(CHAR)); + params.flags = GT_USECRLF; + params.codepage = unicode ? CP_UNICODE : CP_ACP; + params.lpDefaultChar = NULL; + params.lpUsedDefChar = NULL; + hr = ITextServices_TxSendMessage( host->text_srv, EM_GETTEXTEX, (WPARAM)&params, lparam, &res ); + break; + } case WM_GETTEXTLENGTH: { GETTEXTLENGTHEX params;

1 0

Huw Davies : riched20: Handle EM_FINDTEXTEX's unicode conversion in the host.
by Alexandre Julliard March 12, 2021

March 12, 2021

Module: wine Branch: master Commit: 87717c9cbfba843de7600042f477e585ea87b327 URL: https://source.winehq.org/git/wine.git/?a=commit;h=87717c9cbfba843de7600042… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 12 09:01:38 2021 +0000 riched20: Handle EM_FINDTEXTEX's unicode conversion in the host. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 19 +------------------ dlls/riched20/txthost.c | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 93daa472048..eb1ec78d962 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4167,30 +4167,13 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, { return editor->nTextLimit; } - case EM_FINDTEXTEX: - { - LRESULT r; - if(!unicode){ - FINDTEXTEXA *ex = (FINDTEXTEXA *)lParam; - int nChars = MultiByteToWideChar(CP_ACP, 0, ex->lpstrText, -1, NULL, 0); - WCHAR *tmp; - - if ((tmp = heap_alloc(nChars * sizeof(*tmp))) != NULL) - MultiByteToWideChar(CP_ACP, 0, ex->lpstrText, -1, tmp, nChars); - r = ME_FindText(editor, wParam, &ex->chrg, tmp, &ex->chrgText); - heap_free(tmp); - }else{ - FINDTEXTEXW *ex = (FINDTEXTEXW *)lParam; - r = ME_FindText(editor, wParam, &ex->chrg, ex->lpstrText, &ex->chrgText); - } - return r; - } case EM_FINDTEXT: case EM_FINDTEXTW: { FINDTEXTW *ft = (FINDTEXTW *)lParam; return ME_FindText(editor, wParam, &ft->chrg, ft->lpstrText, NULL); } + case EM_FINDTEXTEX: case EM_FINDTEXTEXW: { FINDTEXTEXW *ex = (FINDTEXTEXW *)lParam; diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 00801b5b9af..d249137d829 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -850,6 +850,27 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, if (!unicode) ME_EndToUnicode( CP_ACP, (WCHAR *)new_params.lpstrText ); break; } + case EM_FINDTEXTEX: + { + FINDTEXTEXA *paramsA = (FINDTEXTEXA *)lparam; + FINDTEXTEXW *params = (FINDTEXTEXW *)lparam; + FINDTEXTEXW new_params; + int len; + + if (!unicode) + { + new_params.chrg = params->chrg; + new_params.lpstrText = ME_ToUnicode( CP_ACP, (char *)params->lpstrText, &len ); + params = &new_params; + } + hr = ITextServices_TxSendMessage( host->text_srv, EM_FINDTEXTEXW, wparam, (LPARAM)params, &res ); + if (!unicode) + { + ME_EndToUnicode( CP_ACP, (WCHAR *)new_params.lpstrText ); + paramsA->chrgText = params->chrgText; + } + break; + } case WM_GETTEXT: { GETTEXTEX params;

1 0

Nikolay Sivov : dwrite/tests: Remove tests failing on Win10 20H2.
by Alexandre Julliard March 12, 2021

March 12, 2021

Module: wine Branch: master Commit: 9c5f2853eca3ce4eedcdc442938bee4da572eb1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c5f2853eca3ce4eedcdc442… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 12 15:06:58 2021 +0300 dwrite/tests: Remove tests failing on Win10 20H2. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index d0940c3b145..4b31c331872 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -2460,11 +2460,6 @@ static void test_system_fontcollection(void) ok(coll2 == collection, "got %p, was %p\n", coll2, collection); IDWriteFontCollection_Release(coll2); - hr = IDWriteFactory_GetSystemFontCollection(factory, &coll2, TRUE); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(coll2 == collection, "got %p, was %p\n", coll2, collection); - IDWriteFontCollection_Release(coll2); - factory2 = create_factory(); hr = IDWriteFactory_GetSystemFontCollection(factory2, &coll2, FALSE); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -2652,10 +2647,8 @@ todo_wine hr = IDWriteFactory6_GetSystemFontCollection(factory6, FALSE, DWRITE_FONT_FAMILY_MODEL_WEIGHT_STRETCH_STYLE, &collection2); ok(hr == S_OK, "Failed to get collection, hr %#x.\n", hr); - ok(collection == (IDWriteFontCollection *)collection2, "Unexpected instance.\n"); IDWriteFontCollection2_Release(collection2); } - IDWriteFactory6_Release(factory6); } else

1 0

Zebediah Figura : strmbase: Rename pfnDoRenderSample to renderer_render.
by Alexandre Julliard March 12, 2021

March 12, 2021

Module: wine Branch: master Commit: 4abf09f02e690f3ae90a4b94cae73d2856eaa056 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4abf09f02e690f3ae90a4b94… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 11 17:21:56 2021 -0600 strmbase: Rename pfnDoRenderSample to renderer_render. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/evr.c | 4 ++-- dlls/qedit/nullrenderer.c | 4 ++-- dlls/quartz/videorenderer.c | 4 ++-- dlls/quartz/vmr9.c | 4 ++-- dlls/strmbase/renderer.c | 6 +++--- include/wine/strmbase.h | 3 +-- 6 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/evr/evr.c b/dlls/evr/evr.c index ff89d85ac8c..94239417794 100644 --- a/dlls/evr/evr.c +++ b/dlls/evr/evr.c @@ -48,7 +48,7 @@ static void evr_destroy(struct strmbase_renderer *iface) free(filter); } -static HRESULT WINAPI evr_DoRenderSample(struct strmbase_renderer *iface, IMediaSample *sample) +static HRESULT evr_render(struct strmbase_renderer *iface, IMediaSample *sample) { FIXME("Not implemented.\n"); return E_NOTIMPL; @@ -63,7 +63,7 @@ static HRESULT evr_query_accept(struct strmbase_renderer *iface, const AM_MEDIA_ static const struct strmbase_renderer_ops renderer_ops = { .renderer_query_accept = evr_query_accept, - .pfnDoRenderSample = evr_DoRenderSample, + .renderer_render = evr_render, .renderer_destroy = evr_destroy, }; diff --git a/dlls/qedit/nullrenderer.c b/dlls/qedit/nullrenderer.c index a9319b06efe..5dc74c77809 100644 --- a/dlls/qedit/nullrenderer.c +++ b/dlls/qedit/nullrenderer.c @@ -36,7 +36,7 @@ static struct null_renderer *impl_from_strmbase_renderer(struct strmbase_rendere return CONTAINING_RECORD(iface, struct null_renderer, renderer); } -static HRESULT WINAPI NullRenderer_DoRenderSample(struct strmbase_renderer *iface, IMediaSample *sample) +static HRESULT null_renderer_render(struct strmbase_renderer *iface, IMediaSample *sample) { return S_OK; } @@ -57,7 +57,7 @@ static void null_renderer_destroy(struct strmbase_renderer *iface) static const struct strmbase_renderer_ops renderer_ops = { .renderer_query_accept = null_renderer_query_accept, - .pfnDoRenderSample = NullRenderer_DoRenderSample, + .renderer_render = null_renderer_render, .renderer_destroy = null_renderer_destroy, }; diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index ec40bc8db9c..1a59a9b5213 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -79,7 +79,7 @@ static void VideoRenderer_AutoShowWindow(struct video_renderer *This) ShowWindow(This->window.hwnd, SW_SHOW); } -static HRESULT WINAPI VideoRenderer_DoRenderSample(struct strmbase_renderer *iface, IMediaSample *pSample) +static HRESULT video_renderer_render(struct strmbase_renderer *iface, IMediaSample *pSample) { struct video_renderer *filter = impl_from_strmbase_renderer(iface); RECT src = filter->window.src, dst = filter->window.dst; @@ -214,7 +214,7 @@ static RECT video_renderer_get_default_rect(struct video_window *iface) static const struct strmbase_renderer_ops renderer_ops = { .renderer_query_accept = video_renderer_query_accept, - .pfnDoRenderSample = VideoRenderer_DoRenderSample, + .renderer_render = video_renderer_render, .renderer_init_stream = video_renderer_init_stream, .renderer_stop_stream = video_renderer_stop_stream, .renderer_destroy = video_renderer_destroy, diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 9e8a037eca0..f95c2bfbce2 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -206,7 +206,7 @@ static inline struct quartz_vmr *impl_from_IBaseFilter(IBaseFilter *iface) return CONTAINING_RECORD(iface, struct quartz_vmr, renderer.filter.IBaseFilter_iface); } -static HRESULT WINAPI VMR9_DoRenderSample(struct strmbase_renderer *iface, IMediaSample *sample) +static HRESULT vmr_render(struct strmbase_renderer *iface, IMediaSample *sample) { struct quartz_vmr *filter = impl_from_IBaseFilter(&iface->filter.IBaseFilter_iface); unsigned int data_size, width, depth, src_pitch; @@ -638,7 +638,7 @@ static HRESULT vmr_pin_query_interface(struct strmbase_renderer *iface, REFIID i static const struct strmbase_renderer_ops renderer_ops = { .renderer_query_accept = vmr_query_accept, - .pfnDoRenderSample = VMR9_DoRenderSample, + .renderer_render = vmr_render, .renderer_init_stream = vmr_init_stream, .renderer_start_stream = vmr_start_stream, .renderer_stop_stream = vmr_stop_stream, diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 7718232e97c..e6adf41add9 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -361,7 +361,7 @@ static HRESULT WINAPI BaseRenderer_Receive(struct strmbase_sink *pin, IMediaSamp filter->current_sample = sample; - hr = filter->pFuncsTable->pfnDoRenderSample(filter, sample); + hr = filter->pFuncsTable->renderer_render(filter, sample); SetEvent(filter->state_event); LeaveCriticalSection(&filter->filter.stream_cs); @@ -401,14 +401,14 @@ static HRESULT WINAPI BaseRenderer_Receive(struct strmbase_sink *pin, IMediaSamp } if (state == State_Running) - hr = filter->pFuncsTable->pfnDoRenderSample(filter, sample); + hr = filter->pFuncsTable->renderer_render(filter, sample); perform_qos(filter, start, stop, jitter); } else { if (state == State_Running) - hr = filter->pFuncsTable->pfnDoRenderSample(filter, sample); + hr = filter->pFuncsTable->renderer_render(filter, sample); } return hr; diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index dbb4a21c071..347482b1eb9 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -305,13 +305,12 @@ struct strmbase_renderer BOOL eos; }; -typedef HRESULT (WINAPI *BaseRenderer_DoRenderSample)(struct strmbase_renderer *iface, IMediaSample *sample); typedef HRESULT (WINAPI *BaseRenderer_BreakConnect) (struct strmbase_renderer *iface); struct strmbase_renderer_ops { HRESULT (*renderer_query_accept)(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt); - BaseRenderer_DoRenderSample pfnDoRenderSample; + HRESULT (*renderer_render)(struct strmbase_renderer *iface, IMediaSample *sample); void (*renderer_init_stream)(struct strmbase_renderer *iface); void (*renderer_start_stream)(struct strmbase_renderer *iface); void (*renderer_stop_stream)(struct strmbase_renderer *iface);

1 0

Francois Gouget : testbot/LibvirtTool: Trace the sleep time in Revert().
by Alexandre Julliard March 12, 2021

March 12, 2021

Module: tools Branch: master Commit: ec9cba38c90137314f0f7034d2541b027eb5ca35 URL: https://source.winehq.org/git/tools.git/?a=commit;h=ec9cba38c90137314f0f703… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 12 01:58:06 2021 +0100 testbot/LibvirtTool: Trace the sleep time in Revert(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 59adf2f..be6c575 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -674,7 +674,7 @@ sub Revert() { my $Sleep = ($Booting and $SleepAfterBoot > $SleepAfterRevert) ? $SleepAfterBoot : $SleepAfterRevert; - Debug(Elapsed($Start), " Sleeping\n"); + Debug(Elapsed($Start), " Sleeping ${Sleep}s\n"); LogMsg "Letting $VMKey settle down for ${Sleep}s\n"; sleep($Sleep); }

1 0

Francois Gouget : testbot/reporttest: Add a test for WINETEST_TIME.
by Alexandre Julliard March 12, 2021

March 12, 2021

Module: tools Branch: master Commit: a9e09357310ea7ae356db7bc601c4d97efced75b URL: https://source.winehq.org/git/tools.git/?a=commit;h=a9e09357310ea7ae356db7b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 11 14:02:25 2021 +0100 testbot/reporttest: Add a test for WINETEST_TIME. Add a test with lines that contain timing information and make sure they are detected as expected. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/reporttest/report.template | 12 +++++++++++- testbot/src/reporttest/report.testwtbs | 4 +++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/testbot/src/reporttest/report.template b/testbot/src/reporttest/report.template index ef3dc7d..afdc317 100644 --- a/testbot/src/reporttest/report.template +++ b/testbot/src/reporttest/report.template @@ -621,7 +621,17 @@ shadow.c:222: Subtest black 01a8:filedlg: 10 tests executed (0 marked as todo, 0 failures), 0 skipped. comdlg32:filedlg:01a8 done (0) in 0s -stub comdlg32:finddlg +comdlg32:finddlg start dlls/comdlg32/tests/finddlg.c - +----- WTBS Trace, ok, todo, skips with timing information +----- Tests messages starting generated when WINETEST_TIME=1. +----- Expected assessement: 2 failures, 1 todo, 1 skip +finddlg.c:222:0.141 WTBS Testing messages that contain timing information +finddlg.c:224:0.142 Test failed: WTBS A test failure +finddlg.c:227:0.143 Test marked todo: WTBS A todo test failing as expected +finddlg.c:228:0.144 Test succeeded inside todo block: WTBS A todo test unexpectedly succeeding +finddlg.c:229:0.145 Tests skipped: WTBS A plain skip +01a8:finddlg:0.146 10 tests executed (1 marked as todo, 2 failures), 1 skipped. +comdlg32:finddlg:01a8 done (2) in 0s comdlg32:fontdlg start dlls/comdlg32/tests/fontdlg.c - ----- Check support for IgnoreExceptions diff --git a/testbot/src/reporttest/report.testwtbs b/testbot/src/reporttest/report.testwtbs index eefbbc0..09264ca 100644 --- a/testbot/src/reporttest/report.testwtbs +++ b/testbot/src/reporttest/report.testwtbs @@ -13,7 +13,7 @@ with: ----- TestWTBS ----- -p tests.TestFailures 64 +p tests.TestFailures 66 p build.HasTask 0 a wine.log.GrepV ^Applying patch @@ -63,6 +63,8 @@ n 0 treeview.c:40: Test failed: Unreported failure n 0 vorlon.c:40: Test failed: Unreported failure g 0 tests.report.comdlg32 +n 0 finddlg.c:224:4.321 Test failed: WTBS A test failure +n 0 finddlg.c:228:1.234 Test succeeded inside todo block: WTBS A todo test unexpectedly succeeding n 0 01bd:fontdlg: unhandled exception c0000005 at 00001111 n 0 Unhandled exception: page fault on read access to 0x00000000 in 32-bit code (0x00001111). n 0 fontdlg.c:10: unhandled exception c0000005 in child process 1111

1 0