wine-devel March 2021

wine-devel@winehq.org

75 participants
800 discussions

[PATCH] d2d1: Implement d2d_geometry_group_GetBounds().
by Nikolay Sivov 15 Mar '21

15 Mar '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50411 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/geometry.c | 19 ++++++++++++++-- dlls/d2d1/tests/d2d1.c | 49 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index c32de310353..6da93de3eb4 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -4880,9 +4880,24 @@ static void STDMETHODCALLTYPE d2d_geometry_group_GetFactory(ID2D1GeometryGroup * static HRESULT STDMETHODCALLTYPE d2d_geometry_group_GetBounds(ID2D1GeometryGroup *iface, const D2D1_MATRIX_3X2_F *transform, D2D1_RECT_F *bounds) { - FIXME("iface %p, transform %p, bounds %p stub!.\n", iface, transform, bounds); + struct d2d_geometry *geometry = impl_from_ID2D1GeometryGroup(iface); + D2D1_RECT_F rect; + unsigned int i; - return E_NOTIMPL; + TRACE("iface %p, transform %p, bounds %p.\n", iface, transform, bounds); + + bounds->left = FLT_MAX; + bounds->top = FLT_MAX; + bounds->right = -FLT_MAX; + bounds->bottom = -FLT_MAX; + + for (i = 0; i < geometry->u.group.geometry_count; ++i) + { + if (SUCCEEDED(ID2D1Geometry_GetBounds(geometry->u.group.src_geometries[i], transform, &rect))) + d2d_rect_union(bounds, &rect); + } + + return S_OK; } static HRESULT STDMETHODCALLTYPE d2d_geometry_group_GetWidenedBounds(ID2D1GeometryGroup *iface, diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 1dc7a27ca5b..a046a21c7f6 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9566,6 +9566,54 @@ static void test_colour_space(BOOL d3d11) } } +static void test_geometry_group(BOOL d3d11) +{ + ID2D1Factory *factory; + ID2D1GeometryGroup *group; + ID2D1Geometry *geometries[2]; + D2D1_RECT_F rect; + HRESULT hr; + D2D1_MATRIX_3X2_F matrix; + BOOL match; + + hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory); + ok(SUCCEEDED(hr), "Failed to create factory, hr %#x.\n", hr); + + set_rect(&rect, -1.0f, -1.0f, 1.0f, 1.0f); + hr = ID2D1Factory_CreateRectangleGeometry(factory, &rect, (ID2D1RectangleGeometry **)&geometries[0]); + ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr); + + set_rect(&rect, -2.0f, -2.0f, 0.0f, 2.0f); + hr = ID2D1Factory_CreateRectangleGeometry(factory, &rect, (ID2D1RectangleGeometry **)&geometries[1]); + ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr); + + hr = ID2D1Factory_CreateGeometryGroup(factory, D2D1_FILL_MODE_ALTERNATE, geometries, 2, &group); + ok(SUCCEEDED(hr), "Failed to create geometry group, hr %#x.\n", hr); + + set_rect(&rect, 0.0f, 0.0f, 0.0f, 0.0f); + hr = ID2D1GeometryGroup_GetBounds(group, NULL, &rect); + ok(SUCCEEDED(hr), "Failed to get geometry group bounds, hr %#x.\n", hr); + match = compare_rect(&rect, -2.0f, -2.0f, 1.0f, 2.0f, 0); + ok(match, "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e}.\n", + rect.left, rect.top, rect.right, rect.bottom); + + set_matrix_identity(&matrix); + translate_matrix(&matrix, 80.0f, 640.0f); + scale_matrix(&matrix, 2.0f, 0.5f); + hr = ID2D1GeometryGroup_GetBounds(group, &matrix, &rect); + ok(SUCCEEDED(hr), "Failed to get geometry group bounds, hr %#x.\n", hr); + match = compare_rect(&rect, 76.0f, 639.0f, 82.0f, 641.0f, 0); + ok(match, "Got unexpected rectangle {%.8e, %.8e, %.8e, %.8e}.\n", + rect.left, rect.top, rect.right, rect.bottom); + + ID2D1GeometryGroup_Release(group); + + ID2D1Geometry_Release(geometries[0]); + ID2D1Geometry_Release(geometries[1]); + + ID2D1Factory_Release(factory); +} + START_TEST(d2d1) { HMODULE d2d1_dll = GetModuleHandleA("d2d1.dll"); @@ -9625,6 +9673,7 @@ START_TEST(d2d1) queue_test(test_wic_bitmap_format); queue_d3d10_test(test_math); queue_d3d10_test(test_colour_space); + queue_test(test_geometry_group); run_queued_tests(); } -- 2.30.2

2 1

[PATCH 5/5] wined3d: Move feature level selection to wined3d_state_create().
by Henri Verbeet 15 Mar '21

15 Mar '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/device.c | 3 ++- dlls/wined3d/cs.c | 6 +++--- dlls/wined3d/device.c | 29 +--------------------------- dlls/wined3d/stateblock.c | 35 +++++++++++++++++++++++++++++++--- dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.h | 3 ++- 7 files changed, 42 insertions(+), 38 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 414560be72a..16a1027beb9 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -295,7 +295,8 @@ static struct wined3d_state *d3d_device_context_state_get_wined3d_state(struct d if ((entry = d3d_device_context_state_get_entry(state, device))) return entry->wined3d_state; - if (FAILED(wined3d_state_create(device->wined3d_device, &wined3d_state))) + if (FAILED(wined3d_state_create(device->wined3d_device, + (enum wined3d_feature_level *)&device->feature_level, 1, &wined3d_state))) return NULL; if (!d3d_device_context_state_add_entry(state, device, wined3d_state)) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 69f6a437e97..886a76284ff 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3008,7 +3008,8 @@ static DWORD WINAPI wined3d_cs_run(void *ctx) FreeLibraryAndExitThread(wined3d_module, 0); } -struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device, enum wined3d_feature_level feature_level) +struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device, + const enum wined3d_feature_level *levels, unsigned int level_count) { const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info; struct wined3d_cs *cs; @@ -3016,12 +3017,11 @@ struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device, enum wined3d if (!(cs = heap_alloc_zero(sizeof(*cs)))) return NULL; - if (!(cs->c.state = heap_alloc_zero(sizeof(*cs->c.state)))) + if (FAILED(wined3d_state_create(device, levels, level_count, &cs->c.state))) { heap_free(cs); return NULL; } - state_init(cs->c.state, &device->adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT, feature_level); cs->c.ops = &wined3d_cs_st_ops; cs->c.device = device; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 42d97b2eb85..ca179c753ab 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5976,27 +5976,6 @@ static int wined3d_depth_stencil_state_compare(const void *key, const struct win return memcmp(&state->desc, key, sizeof(state->desc)); } -static BOOL wined3d_select_feature_level(const struct wined3d_adapter *adapter, - const enum wined3d_feature_level *levels, unsigned int level_count, - enum wined3d_feature_level *selected_level) -{ - const struct wined3d_d3d_info *d3d_info = &adapter->d3d_info; - unsigned int i; - - for (i = 0; i < level_count; ++i) - { - if (levels[i] && d3d_info->feature_level >= levels[i]) - { - *selected_level = levels[i]; - return TRUE; - } - } - - FIXME_(winediag)("None of the requested D3D feature levels is supported on this GPU " - "with the current shader backend.\n"); - return FALSE; -} - HRESULT wined3d_device_init(struct wined3d_device *device, struct wined3d *wined3d, unsigned int adapter_idx, enum wined3d_device_type device_type, HWND focus_window, unsigned int flags, BYTE surface_alignment, const enum wined3d_feature_level *levels, unsigned int level_count, @@ -6005,15 +5984,9 @@ HRESULT wined3d_device_init(struct wined3d_device *device, struct wined3d *wined struct wined3d_adapter *adapter = wined3d->adapters[adapter_idx]; const struct wined3d_fragment_pipe_ops *fragment_pipeline; const struct wined3d_vertex_pipe_ops *vertex_pipeline; - enum wined3d_feature_level feature_level; unsigned int i; HRESULT hr; - if (!wined3d_select_feature_level(adapter, levels, level_count, &feature_level)) - return E_FAIL; - - TRACE("Device feature level %s.\n", wined3d_debug_feature_level(feature_level)); - device->ref = 1; device->wined3d = wined3d; wined3d_incref(device->wined3d); @@ -6058,7 +6031,7 @@ HRESULT wined3d_device_init(struct wined3d_device *device, struct wined3d *wined device->max_frame_latency = 3; - if (!(device->cs = wined3d_cs_create(device, feature_level))) + if (!(device->cs = wined3d_cs_create(device, levels, level_count))) { WARN("Failed to create command stream.\n"); hr = E_FAIL; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 2cef5a6498a..1f1ba262336 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -27,6 +27,7 @@ #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); +WINE_DECLARE_DEBUG_CHANNEL(winediag); static const DWORD pixel_states_render[] = { @@ -1887,15 +1888,43 @@ void state_init(struct wined3d_state *state, const struct wined3d_d3d_info *d3d_ state_init_default(state, d3d_info); } -HRESULT CDECL wined3d_state_create(struct wined3d_device *device, struct wined3d_state **state) +static bool wined3d_select_feature_level(const struct wined3d_adapter *adapter, + const enum wined3d_feature_level *levels, unsigned int level_count, + enum wined3d_feature_level *selected_level) { + const struct wined3d_d3d_info *d3d_info = &adapter->d3d_info; + unsigned int i; + + for (i = 0; i < level_count; ++i) + { + if (levels[i] && d3d_info->feature_level >= levels[i]) + { + *selected_level = levels[i]; + return true; + } + } + + FIXME_(winediag)("None of the requested D3D feature levels is supported on this GPU " + "with the current shader backend.\n"); + return false; +} + +HRESULT CDECL wined3d_state_create(struct wined3d_device *device, + const enum wined3d_feature_level *levels, unsigned int level_count, struct wined3d_state **state) +{ + enum wined3d_feature_level feature_level; struct wined3d_state *object; - TRACE("device %p, state %p.\n", device, state); + TRACE("device %p, levels %p, level_count %u, state %p.\n", device, levels, level_count, state); + + if (!wined3d_select_feature_level(device->adapter, levels, level_count, &feature_level)) + return E_FAIL; + + TRACE("Selected feature level %s.\n", wined3d_debug_feature_level(feature_level)); if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; - state_init(object, &device->adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT, device->cs->c.state->feature_level); + state_init(object, &device->adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT, feature_level); *state = object; return S_OK; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index c91f488a7b4..3fe3e0cfd89 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -245,7 +245,7 @@ @ cdecl wined3d_shader_resource_view_get_parent(ptr) @ cdecl wined3d_shader_resource_view_incref(ptr) -@ cdecl wined3d_state_create(ptr ptr) +@ cdecl wined3d_state_create(ptr ptr long ptr) @ cdecl wined3d_state_destroy(ptr) @ cdecl wined3d_state_get_feature_level(ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e934d0f4b87..a8947f444cd 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4717,7 +4717,7 @@ struct wined3d_cs }; struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device, - enum wined3d_feature_level feature_level) DECLSPEC_HIDDEN; + const enum wined3d_feature_level *levels, unsigned int level_count) DECLSPEC_HIDDEN; void wined3d_cs_destroy(struct wined3d_cs *cs) DECLSPEC_HIDDEN; void wined3d_cs_destroy_object(struct wined3d_cs *cs, void (*callback)(void *object), void *object) DECLSPEC_HIDDEN; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 77c6c223b7b..3c091263742 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2745,7 +2745,8 @@ void __cdecl wined3d_shader_resource_view_generate_mipmaps(struct wined3d_shader void * __cdecl wined3d_shader_resource_view_get_parent(const struct wined3d_shader_resource_view *view); ULONG __cdecl wined3d_shader_resource_view_incref(struct wined3d_shader_resource_view *view); -HRESULT __cdecl wined3d_state_create(struct wined3d_device *device, struct wined3d_state **state); +HRESULT __cdecl wined3d_state_create(struct wined3d_device *device, + const enum wined3d_feature_level *levels, unsigned int level_count, struct wined3d_state **state); void __cdecl wined3d_state_destroy(struct wined3d_state *state); enum wined3d_feature_level __cdecl wined3d_state_get_feature_level(const struct wined3d_state *state); -- 2.20.1

1 0

[PATCH 3/5] wined3d: Introduce wined3d_state_reset().
by Henri Verbeet 15 Mar '21

15 Mar '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/cs.c | 5 +---- dlls/wined3d/device.c | 6 ++---- dlls/wined3d/wined3d_private.h | 16 ++++++++++++---- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 6bb628b5d13..0d28cb7e0b1 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2079,11 +2079,8 @@ static void wined3d_cs_mt_push_constants(struct wined3d_device_context *context, static void wined3d_cs_exec_reset_state(struct wined3d_cs *cs, const void *data) { - struct wined3d_adapter *adapter = cs->c.device->adapter; - state_cleanup(&cs->state); - memset(&cs->state, 0, sizeof(cs->state)); - state_init(&cs->state, &adapter->d3d_info, WINED3D_STATE_NO_REF | WINED3D_STATE_INIT_DEFAULT); + wined3d_state_reset(&cs->state, &cs->c.device->adapter->d3d_info); } void wined3d_cs_emit_reset_state(struct wined3d_cs *cs) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 289c5d941d6..4fb6063741a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1251,8 +1251,7 @@ void wined3d_device_uninit_3d(struct wined3d_device *device) heap_free(device->swapchains); device->swapchains = NULL; - memset(state, 0, sizeof(*state)); - state_init(state, &device->adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); + wined3d_state_reset(state, &device->adapter->d3d_info); } /* Enables thread safety in the wined3d device and its resources. Called by DirectDraw @@ -5754,8 +5753,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, device->adapter->adapter_ops->adapter_uninit_3d(device); - memset(state, 0, sizeof(*state)); - state_init(state, &device->adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); + wined3d_state_reset(state, &device->adapter->d3d_info); device_init_swapchain_state(device, swapchain); if (wined3d_settings.logo) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 86d8061d005..06c7d74d199 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3710,6 +3710,18 @@ struct wined3d_state struct wined3d_rasterizer_state *rasterizer_state; }; +void state_cleanup(struct wined3d_state *state) DECLSPEC_HIDDEN; +void state_init(struct wined3d_state *state, const struct wined3d_d3d_info *d3d_info, uint32_t flags) DECLSPEC_HIDDEN; +void state_unbind_resources(struct wined3d_state *state) DECLSPEC_HIDDEN; + +static inline void wined3d_state_reset(struct wined3d_state *state, const struct wined3d_d3d_info *d3d_info) +{ + uint32_t flags = state->flags; + + memset(state, 0, sizeof(*state)); + state_init(state, d3d_info, flags); +} + static inline bool wined3d_state_uses_depth_buffer(const struct wined3d_state *state) { if (!state->depth_stencil_state) @@ -4639,10 +4651,6 @@ struct wined3d_light_info *wined3d_light_state_get_light(const struct wined3d_li HRESULT wined3d_light_state_set_light(struct wined3d_light_state *state, DWORD light_idx, const struct wined3d_light *params, struct wined3d_light_info **light_info) DECLSPEC_HIDDEN; -void state_cleanup(struct wined3d_state *state) DECLSPEC_HIDDEN; -void state_init(struct wined3d_state *state, const struct wined3d_d3d_info *d3d_info, DWORD flags) DECLSPEC_HIDDEN; -void state_unbind_resources(struct wined3d_state *state) DECLSPEC_HIDDEN; - enum wined3d_cs_queue_id { WINED3D_CS_QUEUE_DEFAULT = 0, -- 2.20.1

1 0

[PATCH 5/5] riched20: Initialize a copy of the properties in the host.
by Huw Davies 15 Mar '21

15 Mar '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/txthost.c | 69 ++++++++++++++--------------------------- 1 file changed, 23 insertions(+), 46 deletions(-) diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 5bd11c5aba2..c810589b4a6 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -41,6 +41,7 @@ struct host HWND window; BOOL emulate_10; PARAFORMAT2 para_fmt; + DWORD props; }; static const ITextHostVtbl textHostVtbl; @@ -48,6 +49,26 @@ static const ITextHostVtbl textHostVtbl; static BOOL listbox_registered; static BOOL combobox_registered; +static void host_init_props( struct host *host ) +{ + DWORD style, scrollbar; + + host->props = TXTBIT_RICHTEXT | TXTBIT_AUTOWORDSEL | TXTBIT_ALLOWBEEP; + + style = GetWindowLongW( host->window, GWL_STYLE ); + + if (style & ES_MULTILINE) host->props |= TXTBIT_MULTILINE; + if (style & ES_READONLY) host->props |= TXTBIT_READONLY; + if (style & ES_PASSWORD) host->props |= TXTBIT_USEPASSWORD; + if (!(style & ES_NOHIDESEL)) host->props |= TXTBIT_HIDESELECTION; + if (style & ES_SAVESEL) host->props |= TXTBIT_SAVESELECTION; + if (style & ES_VERTICAL) host->props |= TXTBIT_VERTICAL; + if (style & ES_NOOLEDRAGDROP) host->props |= TXTBIT_DISABLEDRAG; + + ITextHost_TxGetScrollBars( &host->ITextHost_iface, &scrollbar ); + if (!(scrollbar & ES_AUTOHSCROLL)) host->props |= TXTBIT_WORDWRAP; +} + struct host *host_create( HWND hwnd, CREATESTRUCTW *cs, BOOL emulate_10 ) { struct host *texthost; @@ -68,6 +89,7 @@ struct host *host_create( HWND hwnd, CREATESTRUCTW *cs, BOOL emulate_10 ) if (cs->style & ES_CENTER) texthost->para_fmt.wAlignment = PFA_CENTER; texthost->editor = NULL; + host_init_props( texthost ); return texthost; } @@ -373,53 +395,8 @@ DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetPropertyBits,12) DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetPropertyBits( ITextHost *iface, DWORD mask, DWORD *bits ) { struct host *host = impl_from_ITextHost( iface ); - DWORD style; - DWORD dwBits = 0; - DWORD dwScrollBar; - style = GetWindowLongW( host->window, GWL_STYLE ); - ITextHostImpl_TxGetScrollBars(iface, &dwScrollBar); - - dwBits |= TXTBIT_RICHTEXT|TXTBIT_AUTOWORDSEL; - if (!(dwScrollBar & ES_AUTOHSCROLL)) - dwBits |= TXTBIT_WORDWRAP; - - /* Bits that correspond to window styles. */ - if (style & ES_MULTILINE) - dwBits |= TXTBIT_MULTILINE; - if (style & ES_READONLY) - dwBits |= TXTBIT_READONLY; - if (style & ES_PASSWORD) - dwBits |= TXTBIT_USEPASSWORD; - if (!(style & ES_NOHIDESEL)) - dwBits |= TXTBIT_HIDESELECTION; - if (style & ES_SAVESEL) - dwBits |= TXTBIT_SAVESELECTION; - if (style & ES_VERTICAL) - dwBits |= TXTBIT_VERTICAL; - if (style & ES_NOOLEDRAGDROP) - dwBits |= TXTBIT_DISABLEDRAG; - - dwBits |= TXTBIT_ALLOWBEEP; - - /* The following bits are always FALSE because they are probably only - * needed for ITextServices_OnTxPropertyBitsChange: - * TXTBIT_VIEWINSETCHANGE - * TXTBIT_BACKSTYLECHANGE - * TXTBIT_MAXLENGTHCHANGE - * TXTBIT_CHARFORMATCHANGE - * TXTBIT_PARAFORMATCHANGE - * TXTBIT_SHOWACCELERATOR - * TXTBIT_EXTENTCHANGE - * TXTBIT_SELBARCHANGE - * TXTBIT_SCROLLBARCHANGE - * TXTBIT_CLIENTRECTCHANGE - * - * Documented by MSDN as not supported: - * TXTBIT_USECURRENTBKG - */ - - *bits = dwBits & mask; + *bits = host->props & mask; return S_OK; } -- 2.23.0

1 0

[PATCH 4/5] riched20: Implement EM_SETREADONLY using EM_SETOPTIONS.
by Huw Davies 15 Mar '21

15 Mar '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.c | 8 -------- dlls/riched20/txthost.c | 11 ++++------- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 994e91ce3d5..4988f6e0746 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3779,14 +3779,6 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, return 0; } - case EM_SETREADONLY: - { - if (wParam) - editor->styleFlags |= ES_READONLY; - else - editor->styleFlags &= ~ES_READONLY; - return 1; - } case EM_SETEVENTMASK: { DWORD nOldMask = editor->nEventMask; diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 278b0a64379..5bd11c5aba2 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -1002,14 +1002,11 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, } case EM_SETREADONLY: { - DWORD style; + DWORD op = wparam ? ECOOP_OR : ECOOP_AND; + DWORD mask = wparam ? ECO_READONLY : ~ECO_READONLY; - res = ME_HandleMessage( editor, msg, wparam, lparam, unicode, &hr ); - style = GetWindowLongW( hwnd, GWL_STYLE ); - style &= ~ES_READONLY; - if (wparam) style |= ES_READONLY; - SetWindowLongW( hwnd, GWL_STYLE, style ); - return res; + SendMessageW( hwnd, EM_SETOPTIONS, op, mask ); + return 1; } case WM_SETTEXT: { -- 2.23.0

1 0

[PATCH 3/5] riched20: Remove unused code from ITextHost_TxGetPropertyBits.
by Huw Davies 15 Mar '21

15 Mar '21

Currently TxGetPropertyBits is only called during text services creation, so the editor is not set. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/txthost.c | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 1acf1d1e207..278b0a64379 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -375,28 +375,14 @@ DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetPropertyBits( ITextHost *i struct host *host = impl_from_ITextHost( iface ); DWORD style; DWORD dwBits = 0; + DWORD dwScrollBar; - if (host->editor) - { - style = host->editor->styleFlags; - if (host->editor->mode & TM_RICHTEXT) - dwBits |= TXTBIT_RICHTEXT; - if (host->editor->bWordWrap) - dwBits |= TXTBIT_WORDWRAP; - if (style & ECO_AUTOWORDSELECTION) - dwBits |= TXTBIT_AUTOWORDSEL; - } - else - { - DWORD dwScrollBar; - - style = GetWindowLongW( host->window, GWL_STYLE ); - ITextHostImpl_TxGetScrollBars(iface, &dwScrollBar); + style = GetWindowLongW( host->window, GWL_STYLE ); + ITextHostImpl_TxGetScrollBars(iface, &dwScrollBar); - dwBits |= TXTBIT_RICHTEXT|TXTBIT_AUTOWORDSEL; - if (!(dwScrollBar & ES_AUTOHSCROLL)) - dwBits |= TXTBIT_WORDWRAP; - } + dwBits |= TXTBIT_RICHTEXT|TXTBIT_AUTOWORDSEL; + if (!(dwScrollBar & ES_AUTOHSCROLL)) + dwBits |= TXTBIT_WORDWRAP; /* Bits that correspond to window styles. */ if (style & ES_MULTILINE) -- 2.23.0

1 0

[PATCH 2/5] riched20: Handle EM_GETSELTEXT's unicode conversion in the host.
by Huw Davies 15 Mar '21

15 Mar '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.c | 24 ++++++------------------ dlls/riched20/tests/editor.c | 4 ++-- dlls/riched20/txthost.c | 14 ++++++++++++++ dlls/riched32/tests/editor.c | 6 +++--- 4 files changed, 25 insertions(+), 23 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index c27a691de4f..994e91ce3d5 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2132,22 +2132,11 @@ static int ME_GetTextEx(ME_TextEditor *editor, GETTEXTEX *ex, LPARAM pText) } } -static int ME_GetTextRange(ME_TextEditor *editor, WCHAR *strText, - const ME_Cursor *start, int nLen, BOOL unicode) +static int get_text_range( ME_TextEditor *editor, WCHAR *buffer, + const ME_Cursor *start, int len ) { - if (!strText) return 0; - if (unicode) { - return ME_GetTextW(editor, strText, INT_MAX, start, nLen, FALSE, FALSE); - } else { - int nChars; - WCHAR *p = heap_alloc((nLen+1) * sizeof(*p)); - if (!p) return 0; - nChars = ME_GetTextW(editor, p, nLen, start, nLen, FALSE, FALSE); - WideCharToMultiByte(CP_ACP, 0, p, nChars+1, (char *)strText, - nLen+1, NULL, NULL); - heap_free(p); - return nChars; - } + if (!buffer) return 0; + return ME_GetTextW( editor, buffer, INT_MAX, start, len, FALSE, FALSE ); } int set_selection( ME_TextEditor *editor, int to, int from ) @@ -3991,8 +3980,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, { int nFrom, nTo, nStartCur = ME_GetSelectionOfs(editor, &nFrom, &nTo); ME_Cursor *from = &editor->pCursors[nStartCur]; - return ME_GetTextRange(editor, (WCHAR *)lParam, from, - nTo - nFrom, unicode); + return get_text_range( editor, (WCHAR *)lParam, from, nTo - nFrom ); } case EM_GETSCROLLPOS: { @@ -4021,7 +4009,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, if (nStart >= nEnd) return 0; cursor_from_char_ofs( editor, nStart, &start ); - return ME_GetTextRange( editor, rng->lpstrText, &start, nEnd - nStart, TRUE ); + return get_text_range( editor, rng->lpstrText, &start, nEnd - nStart ); } case EM_GETLINE: { diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 170c29f186e..1ce94f8ae64 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -1828,8 +1828,8 @@ static void test_EM_GETSELTEXT(void) SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"abcdef\x8e\xf0ghijk"); SendMessageA(hwndRichEdit, EM_SETSEL, 4, 8); result = SendMessageA(hwndRichEdit, EM_GETSELTEXT, 0, (LPARAM)buffer); - todo_wine ok(result == 5, "EM_GETSELTEXT returned %ld\n", result); - todo_wine ok(!strcmp("ef\x8e\xf0g", buffer), "EM_GETSELTEXT filled %s\n", buffer); + ok(result == 5, "EM_GETSELTEXT returned %ld\n", result); + ok(!strcmp("ef\x8e\xf0g", buffer), "EM_GETSELTEXT filled %s\n", buffer); } DestroyWindow(hwndRichEdit); diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index a10b77e8ebb..1acf1d1e207 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -902,6 +902,20 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, else hr = get_lineA( host->text_srv, wparam, lparam, &res ); break; + case EM_GETSELTEXT: + { + TEXTRANGEA range; + + if (unicode) hr = ITextServices_TxSendMessage( host->text_srv, msg, wparam, lparam, &res ); + else + { + ITextServices_TxSendMessage( host->text_srv, EM_EXGETSEL, 0, (LPARAM)&range.chrg, &res ); + range.lpstrText = (char *)lparam; + range.lpstrText[0] = '\0'; + hr = get_text_rangeA( host, &range, &res ); + } + break; + } case WM_GETTEXT: { GETTEXTEX params; diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index 0f5ca9f738b..5e3a70c5c7d 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -623,7 +623,7 @@ static void test_EM_GETSELTEXT(void) SendMessageA(hwndRichEdit, EM_SETSEL, 4, 8); result = SendMessageA(hwndRichEdit, EM_GETSELTEXT, 0, (LPARAM)buffer); ok(result == 4, "EM_GETSELTEXT returned %ld\n", result); - todo_wine ok(!strcmp("ef\x8e\xf0", buffer), "EM_GETSELTEXT filled %s\n", buffer); + ok(!strcmp("ef\x8e\xf0", buffer), "EM_GETSELTEXT filled %s\n", buffer); } DestroyWindow(hwndRichEdit); @@ -1362,7 +1362,7 @@ static void test_EM_EXSETSEL(void) result = SendMessageA(hwndRichEdit, EM_EXSETSEL, 0, (LPARAM)&cr); todo_wine ok(result == 7, "EM_EXSETSEL return %ld expected 7\n", result); result = SendMessageA(hwndRichEdit, EM_GETSELTEXT, sizeof(bufA), (LPARAM)bufA); - todo_wine ok(!strcmp(bufA, "ef\x8e\xf0"), "EM_GETSELTEXT return incorrect string\n"); + ok(!strcmp(bufA, "ef\x8e\xf0"), "EM_GETSELTEXT return incorrect string\n"); SendMessageA(hwndRichEdit, EM_EXGETSEL, 0, (LPARAM)&cr); ok(cr.cpMin == 4, "Selection start incorrectly: %d expected 4\n", cr.cpMin); ok(cr.cpMax == 8, "Selection end incorrectly: %d expected 8\n", cr.cpMax); @@ -1421,7 +1421,7 @@ static void test_EM_SETSEL(void) result = SendMessageA(hwndRichEdit, EM_SETSEL, 4, 8); todo_wine ok(result == 7, "EM_SETSEL return %ld expected 7\n", result); result = SendMessageA(hwndRichEdit, EM_GETSELTEXT, sizeof(buffA), (LPARAM)buffA); - todo_wine ok(!strcmp(buffA, "ef\x8e\xf0"), "EM_GETSELTEXT return incorrect string\n"); + ok(!strcmp(buffA, "ef\x8e\xf0"), "EM_GETSELTEXT return incorrect string\n"); result = SendMessageA(hwndRichEdit, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); ok(sel_start == 4, "Selection start incorrectly: %d expected 4\n", sel_start); ok(sel_end == 8, "Selection end incorrectly: %d expected 8\n", sel_end); -- 2.23.0

1 0

[PATCH 1/5] riched20: Handle EM_GETLINE's unicode conversion in the host.
by Huw Davies 15 Mar '21

15 Mar '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.c | 24 +++++------------------- dlls/riched20/txthost.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 19 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index eb1ec78d962..c27a691de4f 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4030,11 +4030,9 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, const unsigned int nMaxChars = *(WORD *) lParam; unsigned int nCharsLeft = nMaxChars; char *dest = (char *) lParam; - BOOL wroteNull = FALSE; ME_Cursor start, end; - TRACE("EM_GETLINE: row=%d, nMaxChars=%d (%s)\n", (int) wParam, nMaxChars, - unicode ? "Unicode" : "Ansi"); + TRACE( "EM_GETLINE: row=%d, nMaxChars=%d\n", (int)wParam, nMaxChars ); row = row_from_row_number( editor, wParam ); if (row == NULL) return 0; @@ -4052,30 +4050,18 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, str = get_text( run, ofs ); nCopy = min( nCharsLeft, len ); - if (unicode) - memcpy(dest, str, nCopy * sizeof(WCHAR)); - else - nCopy = WideCharToMultiByte(CP_ACP, 0, str, nCopy, dest, - nCharsLeft, NULL, NULL); - dest += nCopy * (unicode ? sizeof(WCHAR) : 1); + memcpy(dest, str, nCopy * sizeof(WCHAR)); + dest += nCopy * sizeof(WCHAR); nCharsLeft -= nCopy; if (run == end.run) break; run = row_next_run( row, run ); } /* append line termination, space allowing */ - if (nCharsLeft > 0) - { - if (unicode) - *((WCHAR *)dest) = '\0'; - else - *dest = '\0'; - nCharsLeft--; - wroteNull = TRUE; - } + if (nCharsLeft > 0) *((WCHAR *)dest) = '\0'; TRACE("EM_GETLINE: got %u characters\n", nMaxChars - nCharsLeft); - return nMaxChars - nCharsLeft - (wroteNull ? 1 : 0); + return nMaxChars - nCharsLeft; } case EM_GETLINECOUNT: { diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index d249137d829..a10b77e8ebb 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -753,6 +753,32 @@ static BOOL create_windowed_editor( HWND hwnd, CREATESTRUCTW *create, BOOL emula return TRUE; } +static HRESULT get_lineA( ITextServices *text_srv, WPARAM wparam, LPARAM lparam, LRESULT *res ) +{ + LRESULT len = USHRT_MAX; + WORD sizeA; + HRESULT hr; + WCHAR *buf; + + *res = 0; + sizeA = *(WORD *)lparam; + *(WORD *)lparam = 0; + if (!sizeA) return S_OK; + buf = heap_alloc( len * sizeof(WCHAR) ); + if (!buf) return E_OUTOFMEMORY; + *(WORD *)buf = len; + hr = ITextServices_TxSendMessage( text_srv, EM_GETLINE, wparam, (LPARAM)buf, &len ); + if (hr == S_OK && len) + { + len = WideCharToMultiByte( CP_ACP, 0, buf, len, (char *)lparam, sizeA, NULL, NULL ); + if (!len && GetLastError() == ERROR_INSUFFICIENT_BUFFER) len = sizeA; + if (len < sizeA) ((char *)lparam)[len] = '\0'; + *res = len; + } + heap_free( buf ); + return hr; +} + static HRESULT get_text_rangeA( struct host *host, TEXTRANGEA *rangeA, LRESULT *res ) { TEXTRANGEW range; @@ -871,6 +897,11 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, } break; } + case EM_GETLINE: + if (unicode) hr = ITextServices_TxSendMessage( host->text_srv, msg, wparam, lparam, &res ); + else hr = get_lineA( host->text_srv, wparam, lparam, &res ); + break; + case WM_GETTEXT: { GETTEXTEX params; -- 2.23.0

1 0

[tools] winetest/dissect: Improve the pid detection on garbled lines.
by Francois Gouget 15 Mar '21

15 Mar '21

1 0

[tools] testbot/LogUtils: Improve the pid detection on garbled lines.
by Francois Gouget 15 Mar '21

15 Mar '21

The pid is always printed with a fixed width so this should be taken into account to avoid matching too much. For instance in 'garbage1234:unit.c:...' one should match '1234', not 'e1234' which would lead to a mismatch with the pids on other lines. This is particularly important for the exception, summary and done lines. This also means the matching can be simplified a bit since we know where the relevant part of the line starts. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- For the following wtbsuite test: WTBS Garbled trace, ok, todo, skip sampler (advpack:advpack). --- testbot/lib/WineTestBot/LogUtils.pm | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index e93eac01b..eced000cb 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -321,7 +321,7 @@ sub GetReportLineCategory($) if ($Line =~ /:[0-9.]* Tests skipped: / or $Line =~ /^[_.a-z0-9-]+:[_a-z0-9]* skipped / or $Line =~ /^[_.a-z0-9-]+:\d+:[0-9.]* Line has been silenced after \d+ occurrences$/ or - $Line =~ /^[0-9a-f]+:[_a-z0-9]+:[0-9.]* Silenced \d+ todos, \d+ skips and \d+ traces\.$/) + $Line =~ /^[0-9a-f]{4}:[_a-z0-9]+:[0-9.]* Silenced \d+ todos, \d+ skips and \d+ traces\.$/) { return "skip"; } @@ -459,7 +459,7 @@ sub _AddReportError($$$$) # Make the timeout messages more user-friendly my $ErrLine = $Line; - if ($ErrLine =~ /^[^:]+:([^:]*):[0-9a-f]+ done $258$/) + if ($ErrLine =~ /^[^:]+:([^:]*):[0-9a-f]{4} done $258$/) { my $Unit = $1; $ErrLine = $Unit ne "" ? "$Unit: Timeout" : "Timeout"; @@ -611,9 +611,7 @@ sub ParseWineTestReport($$$) _CheckUnit($LogInfo, $Cur, $Unit, "ignore exceptions"); $Cur->{IgnoreExceptions} = $Ignore; } - elsif (($Cur->{Unit} ne "" and - $Line =~ /([0-9a-f]+):($Cur->{UnitsRE}):[0-9.]* unhandled exception [0-9a-fA-F]{8} at /) or - $Line =~ /^([0-9a-f]+):([_.a-z0-9]+):[0-9.]* unhandled exception [0-9a-fA-F]{8} at /) + elsif ($Line =~ /([0-9a-f]{4}):([_.a-z0-9]+):[0-9.]* unhandled exception [0-9a-fA-F]{8} at /) { my ($Pid, $Unit) = ($1, $2); _CheckUnit($LogInfo, $Cur, $Unit, "unhandled exception"); @@ -641,8 +639,8 @@ sub ParseWineTestReport($$$) } } elsif (($Cur->{Unit} ne "" and - $Line =~ /($Cur->{UnitsRE})\.c:\d+:[0-9.]* unhandled exception [0-9a-fA-F]{8} in child process ([0-9a-f]+)/) or - $Line =~ /^([_.a-z0-9]+)\.c:\d+:[0-9.]* unhandled exception [0-9a-fA-F]{8} in child process ([0-9a-f]+)/) + $Line =~ /($Cur->{UnitsRE})\.c:\d+:[0-9.]* unhandled exception [0-9a-fA-F]{8} in child process ([0-9a-f]{4})/) or + $Line =~ /^([_.a-z0-9]+)\.c:\d+:[0-9.]* unhandled exception [0-9a-fA-F]{8} in child process ([0-9a-f]{4})/) { my ($Unit, $Pid) = ($1, $2); _CheckUnit($LogInfo, $Cur, $Unit, "child exception"); @@ -658,9 +656,7 @@ sub ParseWineTestReport($$$) $Cur->{LineFailures}++; } } - elsif (($Cur->{Unit} ne "" and - $Line =~ /([0-9a-f]+):($Cur->{Unit}):[0-9.]* \d+ tests? executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\./) or - $Line =~ /^([0-9a-f]+):([_a-z0-9]+):[0-9.]* \d+ tests? executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\./) + elsif ($Line =~ /([0-9a-f]{4}):([_a-z0-9]+):[0-9.]* \d+ tests? executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\./) { my ($Pid, $Unit, $Todos, $Failures, $Skips) = ($1, $2, $3, $4, $5); @@ -681,8 +677,8 @@ sub ParseWineTestReport($$$) } } elsif (($Cur->{Dll} ne "" and - $Line =~ /(\Q$Cur->{Dll}\E):([_a-z0-9]*):([0-9a-f]+) done $(-?\d+)$ in /) or - $Line =~ /^([_.a-z0-9-]+):([_a-z0-9]*):([0-9a-f]+) done $(-?\d+)$ in /) + $Line =~ /(\Q$Cur->{Dll}\E):([_a-z0-9]*):([0-9a-f]{4}) done $(-?\d+)$ in /) or + $Line =~ /^([_.a-z0-9-]+):([_a-z0-9]*):([0-9a-f]{4}) done $(-?\d+)$ in /) { my ($Dll, $Unit, $Pid, $Rc) = ($1, $2, $3, $4); @@ -1149,10 +1145,9 @@ sub _GetLineKey($) # Remove the crash code address: it changes whenever the test is recompiled or $Line =~ s/^(Unhandled exception: .* code) $0x[0-9a-fA-F]{8,16}$\.$/$1/ # or the process id in Wine's exc_filter() lines - or $Line =~ s/^[0-9a-f]+:([_a-z0-9]+:)[0-9.]*( unhandled exception [0-9a-fA-F]{8} at )[0-9a-fA-F]{8,16}$/$1$2/ + or $Line =~ s/[0-9a-f]{4}:([_a-z0-9]+:)[0-9.]*( unhandled exception [0-9a-fA-F]{8} at )[0-9a-fA-F]{8,16}$/$1$2/ # or child process id - or $Line =~ s/^([_a-z0-9]+\.c:)\d+:[0-9.]*( unhandled exception [0-9a-fA-F]{8} in child process )[0-9a-fA-F]{4}$/$1$2/ - + or $Line =~ s/^([_a-z0-9]+\.c:)\d+:[0-9.]*( unhandled exception [0-9a-fA-F]{8} in child process )[0-9a-f]{4}/$1$2/ # The exact amount of data printed does not change the error or $Line =~ s/^([_.a-z0-9-]+:[_a-z0-9]* prints too much data )$\d+ bytes$$/$1/; -- 2.20.1

1 0

← Newer
1
...
43
44
45
46
47
48
49
...
80
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel March 2021