wine-commits October 2020

wine-commits@winehq.org

1 participants
796 discussions

Henri Verbeet : wined3d: Clear the graphics pipeline key stencil test state when the stencil test is disabled.
by Alexandre Julliard 13 Oct '20

13 Oct '20

Module: wine Branch: master Commit: e154c95355227659524dd449e73f08a48e3b951c URL: https://source.winehq.org/git/wine.git/?a=commit;h=e154c95355227659524dd449… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 13 17:08:54 2020 +0330 wined3d: Clear the graphics pipeline key stencil test state when the stencil test is disabled. The state itself is ignored in this case, but could still cause additional pipeline variants to be created. That's mostly a consideration for Direct3D 9 and before, since Direct3D 10 and 11 already normalise disabled stencil test state themselves. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 92b8c14e23..f125884215 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -2080,6 +2080,11 @@ static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_conte key->ds_desc.back.reference = state->render_states[WINED3D_RS_STENCILREF] & ((1 << state->fb.depth_stencil->format->stencil_size) - 1); } + else + { + memset(&key->ds_desc.front, 0, sizeof(key->ds_desc.front)); + memset(&key->ds_desc.back, 0, sizeof(key->ds_desc.back)); + } } else {

1 0

Henri Verbeet : wined3d: Avoid accessing NULL depth/stencil state in wined3d_context_vk_update_graphics_pipeline_key().
by Alexandre Julliard 13 Oct '20

13 Oct '20

Module: wine Branch: master Commit: 227605569a105c9f6d27ebf2154c71b7c06bf4c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=227605569a105c9f6d27ebf2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 13 17:08:53 2020 +0330 wined3d: Avoid accessing NULL depth/stencil state in wined3d_context_vk_update_graphics_pipeline_key(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index fa5aac28fd..92b8c14e23 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -2058,6 +2058,7 @@ static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_conte { key->ds_desc.depthTestEnable = d->desc.depth; key->ds_desc.depthWriteEnable = d->desc.depth_write; + key->ds_desc.depthCompareOp = vk_compare_op_from_wined3d(d->desc.depth_func); key->ds_desc.stencilTestEnable = state->fb.depth_stencil && d->desc.stencil; if (key->ds_desc.stencilTestEnable) { @@ -2084,9 +2085,9 @@ static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_conte { key->ds_desc.depthTestEnable = VK_TRUE; key->ds_desc.depthWriteEnable = VK_TRUE; + key->ds_desc.depthCompareOp = VK_COMPARE_OP_LESS; key->ds_desc.stencilTestEnable = VK_FALSE; } - key->ds_desc.depthCompareOp = vk_compare_op_from_wined3d(d->desc.depth_func); update = true; }

1 0

Nikolay Sivov : evr/tests: Use wide string literals.
by Alexandre Julliard 13 Oct '20

13 Oct '20

Module: wine Branch: master Commit: a1dc382812726be7dea5ba6b46f851e7767826ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1dc382812726be7dea5ba6b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 13 15:26:48 2020 +0300 evr/tests: Use wide string literals. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/tests/evr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index ff17f57b7e..6a69305c9e 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -29,7 +29,7 @@ #include "initguid.h" #include "evr9.h" -static const WCHAR sink_id[] = {'E','V','R',' ','I','n','p','u','t','0',0}; +static const WCHAR sink_id[] = L"EVR Input0"; static void set_rect(MFVideoNormalizedRect *rect, float left, float top, float right, float bottom) {

1 0

Nikolay Sivov : evr/mixer: Keep original media type instances for inputs.
by Alexandre Julliard 13 Oct '20

13 Oct '20

Module: wine Branch: master Commit: d6e5fa7bd37ff382b7e357c9bd51f3dfe17e0d74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6e5fa7bd37ff382b7e357c9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 13 15:26:47 2020 +0300 evr/mixer: Keep original media type instances for inputs. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 6 ++-- dlls/evr/tests/evr.c | 79 +++++++++++++++++++++++++++------------------------- 2 files changed, 45 insertions(+), 40 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d6e5fa7bd37ff382b7e3…

1 0

Nikolay Sivov : evr/tests: Add a test for MF_SA_REQUIRED_SAMPLE_COUNT.
by Alexandre Julliard 13 Oct '20

13 Oct '20

Module: wine Branch: master Commit: 25872a51727d893296633c3734447304c566cc2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=25872a51727d893296633c37… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 13 15:26:46 2020 +0300 evr/tests: Add a test for MF_SA_REQUIRED_SAMPLE_COUNT. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/tests/evr.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 7a51b3c17d..72642110a7 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -658,6 +658,12 @@ todo_wine attributes = NULL; hr = IMFTransform_GetInputStreamAttributes(transform, 0, &attributes); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFAttributes_GetCount(attributes, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(count == 1, "Unexpected count %u.\n", count); + hr = IMFAttributes_GetUINT32(attributes, &MF_SA_REQUIRED_SAMPLE_COUNT, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(count == 1, "Unexpected count %u.\n", count); ok(!!attributes, "Unexpected attributes.\n"); attributes2 = NULL;

1 0

Nikolay Sivov : mf/evr: Trigger media type negotiation through presenter for reference stream.
by Alexandre Julliard 13 Oct '20

13 Oct '20

Module: wine Branch: master Commit: 421924ae0a780e6e3304d123b68cb2214f79f626 URL: https://source.winehq.org/git/wine.git/?a=commit;h=421924ae0a780e6e3304d123… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 13 15:26:45 2020 +0300 mf/evr: Trigger media type negotiation through presenter for reference stream. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 298d320ec0..1d55344fe1 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -419,6 +419,8 @@ static HRESULT WINAPI video_stream_typehandler_SetCurrentMediaType(IMFMediaTypeH return MF_E_STREAMSINK_REMOVED; hr = IMFTransform_SetInputType(stream->parent->mixer, stream->id, type, 0); + if (SUCCEEDED(hr) && !stream->id) + hr = IMFVideoPresenter_ProcessMessage(stream->parent->presenter, MFVP_MESSAGE_INVALIDATEMEDIATYPE, 0); return hr; }

1 0

Nikolay Sivov : mf/evr: Do not use IMFVideoMediaType when setting mixer types.
by Alexandre Julliard 13 Oct '20

13 Oct '20

Module: wine Branch: master Commit: 4bdaeaeb48a9cd5fd08f7b2cdc17b5c062db787d URL: https://source.winehq.org/git/wine.git/?a=commit;h=4bdaeaeb48a9cd5fd08f7b2c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 13 15:26:44 2020 +0300 mf/evr: Do not use IMFVideoMediaType when setting mixer types. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 39 ++------------------------------------- 1 file changed, 2 insertions(+), 37 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index c3548170af..298d320ec0 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -362,35 +362,10 @@ static ULONG WINAPI video_stream_typehandler_Release(IMFMediaTypeHandler *iface) return IMFStreamSink_Release(&stream->IMFStreamSink_iface); } -/* Mixer expects special video media type instance. */ -static HRESULT video_renderer_create_video_type(IMFMediaType *media_type, IMFVideoMediaType **video_type) -{ - GUID subtype; - HRESULT hr; - - *video_type = NULL; - - if (FAILED(hr = IMFMediaType_GetGUID(media_type, &MF_MT_SUBTYPE, &subtype))) - return hr; - - if (FAILED(hr = MFCreateVideoMediaTypeFromSubtype(&subtype, video_type))) - return hr; - - hr = IMFMediaType_CopyAllItems(media_type, (IMFAttributes *)*video_type); - if (FAILED(hr)) - { - IMFVideoMediaType_Release(*video_type); - *video_type = NULL; - } - - return hr; -} - static HRESULT WINAPI video_stream_typehandler_IsMediaTypeSupported(IMFMediaTypeHandler *iface, IMFMediaType *in_type, IMFMediaType **out_type) { struct video_stream *stream = impl_from_IMFMediaTypeHandler(iface); - IMFVideoMediaType *video_type; HRESULT hr; TRACE("%p, %p, %p.\n", iface, in_type, out_type); @@ -401,17 +376,12 @@ static HRESULT WINAPI video_stream_typehandler_IsMediaTypeSupported(IMFMediaType if (!stream->parent) return MF_E_INVALIDMEDIATYPE; - if (FAILED(hr = video_renderer_create_video_type(in_type, &video_type))) - return hr; - - if (SUCCEEDED(hr = IMFTransform_SetInputType(stream->parent->mixer, stream->id, (IMFMediaType *)video_type, + if (SUCCEEDED(hr = IMFTransform_SetInputType(stream->parent->mixer, stream->id, in_type, MFT_SET_TYPE_TEST_ONLY))) { if (out_type) *out_type = NULL; } - IMFVideoMediaType_Release(video_type); - return hr; } @@ -438,7 +408,6 @@ static HRESULT WINAPI video_stream_typehandler_GetMediaTypeByIndex(IMFMediaTypeH static HRESULT WINAPI video_stream_typehandler_SetCurrentMediaType(IMFMediaTypeHandler *iface, IMFMediaType *type) { struct video_stream *stream = impl_from_IMFMediaTypeHandler(iface); - IMFVideoMediaType *video_type; HRESULT hr; TRACE("%p, %p.\n", iface, type); @@ -449,11 +418,7 @@ static HRESULT WINAPI video_stream_typehandler_SetCurrentMediaType(IMFMediaTypeH if (!stream->parent) return MF_E_STREAMSINK_REMOVED; - if (FAILED(hr = video_renderer_create_video_type(type, &video_type))) - return hr; - - hr = IMFTransform_SetInputType(stream->parent->mixer, stream->id, (IMFMediaType *)video_type, 0); - IMFVideoMediaType_Release(video_type); + hr = IMFTransform_SetInputType(stream->parent->mixer, stream->id, type, 0); return hr; }

1 0

Nikolay Sivov : d3d11/tests: Add some more tests for device context state.
by Alexandre Julliard 13 Oct '20

13 Oct '20

Module: wine Branch: master Commit: c6671ac1c717a9f631cc0af12e88c29b0bef524e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6671ac1c717a9f631cc0af1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 13 15:26:31 2020 +0300 d3d11/tests: Add some more tests for device context state. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 127 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 127 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index e1a6dd6159..9fc09a5ec8 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -6599,11 +6599,14 @@ static void test_device_context_state(void) { ID3DDeviceContextState *context_state, *previous_context_state; ID3D11SamplerState *sampler, *tmp_sampler; + D3D11_DEVICE_CONTEXT_TYPE context_type; ID3D11DeviceContext1 *context = NULL; D3D11_SAMPLER_DESC sampler_desc; D3D_FEATURE_LEVEL feature_level; ID3D11Device *d3d11_device; ID3D11Device1 *device; + struct vec4 constant; + ID3D11Buffer *cb, *tmp_cb; ULONG refcount; HRESULT hr; @@ -6650,6 +6653,36 @@ static void test_device_context_state(void) ok(tmp_sampler == sampler, "Got sampler %p, expected %p.\n", tmp_sampler, sampler); ID3D11SamplerState_Release(tmp_sampler); + ID3D11DeviceContext1_CSSetSamplers(context, 0, 1, &sampler); + tmp_sampler = NULL; + ID3D11DeviceContext1_CSGetSamplers(context, 0, 1, &tmp_sampler); + ok(tmp_sampler == sampler, "Got sampler %p, expected %p.\n", tmp_sampler, sampler); + ID3D11SamplerState_Release(tmp_sampler); + + ID3D11DeviceContext1_DSSetSamplers(context, 0, 1, &sampler); + tmp_sampler = NULL; + ID3D11DeviceContext1_DSGetSamplers(context, 0, 1, &tmp_sampler); + ok(tmp_sampler == sampler, "Got sampler %p, expected %p.\n", tmp_sampler, sampler); + ID3D11SamplerState_Release(tmp_sampler); + + ID3D11DeviceContext1_GSSetSamplers(context, 0, 1, &sampler); + tmp_sampler = NULL; + ID3D11DeviceContext1_GSGetSamplers(context, 0, 1, &tmp_sampler); + ok(tmp_sampler == sampler, "Got sampler %p, expected %p.\n", tmp_sampler, sampler); + ID3D11SamplerState_Release(tmp_sampler); + + ID3D11DeviceContext1_HSSetSamplers(context, 0, 1, &sampler); + tmp_sampler = NULL; + ID3D11DeviceContext1_HSGetSamplers(context, 0, 1, &tmp_sampler); + ok(tmp_sampler == sampler, "Got sampler %p, expected %p.\n", tmp_sampler, sampler); + ID3D11SamplerState_Release(tmp_sampler); + + ID3D11DeviceContext1_VSSetSamplers(context, 0, 1, &sampler); + tmp_sampler = NULL; + ID3D11DeviceContext1_VSGetSamplers(context, 0, 1, &tmp_sampler); + ok(tmp_sampler == sampler, "Got sampler %p, expected %p.\n", tmp_sampler, sampler); + ID3D11SamplerState_Release(tmp_sampler); + feature_level = min(feature_level, D3D_FEATURE_LEVEL_10_1); hr = ID3D11Device1_CreateDeviceContextState(device, 0, &feature_level, 1, D3D11_SDK_VERSION, &IID_ID3D10Device, NULL, &context_state); @@ -6664,6 +6697,47 @@ todo_wine refcount = get_refcount(context_state); ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + context_type = ID3D11DeviceContext1_GetType(context); + ok(context_type == D3D11_DEVICE_CONTEXT_IMMEDIATE, "Unexpected context type %u.\n", context_type); + + cb = create_buffer((ID3D11Device *)device, D3D11_BIND_CONSTANT_BUFFER, sizeof(constant), NULL); + + ID3D11DeviceContext1_CSSetConstantBuffers(context, 0, 1, &cb); + tmp_cb = NULL; + ID3D11DeviceContext1_CSGetConstantBuffers(context, 0, 1, &tmp_cb); + ok(tmp_cb == cb, "Got buffer %p, expected %p.\n", tmp_cb, cb); + ID3D11Buffer_Release(tmp_cb); + + ID3D11DeviceContext1_PSSetConstantBuffers(context, 0, 1, &cb); + tmp_cb = NULL; + ID3D11DeviceContext1_PSGetConstantBuffers(context, 0, 1, &tmp_cb); + ok(tmp_cb == cb, "Got buffer %p, expected %p.\n", tmp_cb, cb); + ID3D11Buffer_Release(tmp_cb); + + ID3D11DeviceContext1_VSSetConstantBuffers(context, 0, 1, &cb); + tmp_cb = NULL; + ID3D11DeviceContext1_VSGetConstantBuffers(context, 0, 1, &tmp_cb); + ok(tmp_cb == cb, "Got buffer %p, expected %p.\n", tmp_cb, cb); + ID3D11Buffer_Release(tmp_cb); + + ID3D11DeviceContext1_DSSetConstantBuffers(context, 0, 1, &cb); + tmp_cb = NULL; + ID3D11DeviceContext1_DSGetConstantBuffers(context, 0, 1, &tmp_cb); + ok(tmp_cb == cb, "Got buffer %p, expected %p.\n", tmp_cb, cb); + ID3D11Buffer_Release(tmp_cb); + + ID3D11DeviceContext1_GSSetConstantBuffers(context, 0, 1, &cb); + tmp_cb = NULL; + ID3D11DeviceContext1_GSGetConstantBuffers(context, 0, 1, &tmp_cb); + ok(tmp_cb == cb, "Got buffer %p, expected %p.\n", tmp_cb, cb); + ID3D11Buffer_Release(tmp_cb); + + ID3D11DeviceContext1_HSSetConstantBuffers(context, 0, 1, &cb); + tmp_cb = NULL; + ID3D11DeviceContext1_HSGetConstantBuffers(context, 0, 1, &tmp_cb); + ok(tmp_cb == cb, "Got buffer %p, expected %p.\n", tmp_cb, cb); + ID3D11Buffer_Release(tmp_cb); + /* Enable ID3D10Device behavior. */ previous_context_state = NULL; ID3D11DeviceContext1_SwapDeviceContextState(context, context_state, &previous_context_state); @@ -6677,6 +6751,58 @@ todo_wine if (!enable_debug_layer) ID3D11DeviceContext1_PSSetSamplers(context, 0, 1, &tmp_sampler); + ID3D11DeviceContext1_CSSetSamplers(context, 0, 1, &sampler); + tmp_sampler = (ID3D11SamplerState *)0xdeadbeef; + ID3D11DeviceContext1_CSGetSamplers(context, 0, 1, &tmp_sampler); + ok(!tmp_sampler, "Got unexpected sampler %p.\n", tmp_sampler); + + ID3D11DeviceContext1_DSSetSamplers(context, 0, 1, &sampler); + tmp_sampler = (ID3D11SamplerState *)0xdeadbeef; + ID3D11DeviceContext1_DSGetSamplers(context, 0, 1, &tmp_sampler); + ok(!tmp_sampler, "Got unexpected sampler %p.\n", tmp_sampler); + + ID3D11DeviceContext1_GSSetSamplers(context, 0, 1, &sampler); + tmp_sampler = (ID3D11SamplerState *)0xdeadbeef; + ID3D11DeviceContext1_GSGetSamplers(context, 0, 1, &tmp_sampler); + ok(!tmp_sampler, "Got unexpected sampler %p.\n", tmp_sampler); + + ID3D11DeviceContext1_HSSetSamplers(context, 0, 1, &sampler); + tmp_sampler = (ID3D11SamplerState *)0xdeadbeef; + ID3D11DeviceContext1_HSGetSamplers(context, 0, 1, &tmp_sampler); + ok(!tmp_sampler, "Got unexpected sampler %p.\n", tmp_sampler); + + ID3D11DeviceContext1_VSSetSamplers(context, 0, 1, &sampler); + tmp_sampler = (ID3D11SamplerState *)0xdeadbeef; + ID3D11DeviceContext1_VSGetSamplers(context, 0, 1, &tmp_sampler); + ok(!tmp_sampler, "Got unexpected sampler %p.\n", tmp_sampler); + + context_type = ID3D11DeviceContext1_GetType(context); + ok(context_type == D3D11_DEVICE_CONTEXT_IMMEDIATE, "Unexpected context type %u.\n", context_type); + + tmp_cb = (ID3D11Buffer *)0xdeadbeef; + ID3D11DeviceContext1_CSGetConstantBuffers(context, 0, 1, &tmp_cb); + ok(!tmp_cb, "Got unexpected buffer %p.\n", tmp_cb); + + tmp_cb = (ID3D11Buffer *)0xdeadbeef; + ID3D11DeviceContext1_PSGetConstantBuffers(context, 0, 1, &tmp_cb); + ok(!tmp_cb, "Got unexpected buffer %p.\n", tmp_cb); + + tmp_cb = (ID3D11Buffer *)0xdeadbeef; + ID3D11DeviceContext1_VSGetConstantBuffers(context, 0, 1, &tmp_cb); + ok(!tmp_cb, "Got unexpected buffer %p.\n", tmp_cb); + + tmp_cb = (ID3D11Buffer *)0xdeadbeef; + ID3D11DeviceContext1_DSGetConstantBuffers(context, 0, 1, &tmp_cb); + ok(!tmp_cb, "Got unexpected buffer %p.\n", tmp_cb); + + tmp_cb = (ID3D11Buffer *)0xdeadbeef; + ID3D11DeviceContext1_GSGetConstantBuffers(context, 0, 1, &tmp_cb); + ok(!tmp_cb, "Got unexpected buffer %p.\n", tmp_cb); + + tmp_cb = (ID3D11Buffer *)0xdeadbeef; + ID3D11DeviceContext1_HSGetConstantBuffers(context, 0, 1, &tmp_cb); + ok(!tmp_cb, "Got unexpected buffer %p.\n", tmp_cb); + check_interface(device, &IID_ID3D10Device, TRUE, FALSE); check_interface(device, &IID_ID3D10Device1, TRUE, FALSE); @@ -6706,6 +6832,7 @@ todo_wine check_interface(device, &IID_ID3D10Device, TRUE, FALSE); check_interface(device, &IID_ID3D10Device1, TRUE, FALSE); + ID3D11Buffer_Release(cb); ID3D11SamplerState_Release(sampler); ID3D11DeviceContext1_Release(context); refcount = ID3D11Device1_Release(device);

1 0

Huw Davies : riched20: Return a run ptr from the run creation function.
by Alexandre Julliard 13 Oct '20

13 Oct '20

Module: wine Branch: master Commit: a37147c083fe627a66b967448e36b8d4f2effd42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a37147c083fe627a66b96744… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 13 11:16:37 2020 +0100 riched20: Return a run ptr from the run creation function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.h | 2 +- dlls/riched20/para.c | 29 ++++++------ dlls/riched20/run.c | 121 +++++++++++++++++++++++++------------------------ 3 files changed, 78 insertions(+), 74 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index de029f5bcb..244010df73 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -120,7 +120,7 @@ ME_DisplayItem *ME_FindRowWithNumber(ME_TextEditor *editor, int nRow) DECLSPEC_H int ME_RowNumberFromCharOfs(ME_TextEditor *editor, int nOfs) DECLSPEC_HIDDEN; /* run.c */ -ME_DisplayItem *ME_MakeRun(ME_Style *s, int nFlags) DECLSPEC_HIDDEN; +ME_Run *run_create( ME_Style *s, int nFlags ) DECLSPEC_HIDDEN; ME_DisplayItem *ME_InsertRunAtCursor(ME_TextEditor *editor, ME_Cursor *cursor, ME_Style *style, const WCHAR *str, int len, int flags) DECLSPEC_HIDDEN; void ME_CheckCharOffsets(ME_TextEditor *editor) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 1ae7caad61..99ce170663 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -131,7 +131,7 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor) HFONT hf; ME_TextBuffer *text = editor->pBuffer; ME_DisplayItem *para = make_para(editor); - ME_DisplayItem *run; + ME_Run *run; ME_Style *style; int eol_len; @@ -177,15 +177,14 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor) eol_len = editor->bEmulateVersion10 ? 2 : 1; para->member.para.text = ME_MakeStringN( cr_lf, eol_len ); - run = ME_MakeRun(style, MERF_ENDPARA); - run->member.run.nCharOfs = 0; - run->member.run.len = eol_len; - run->member.run.para = &para->member.para; - - para->member.para.eop_run = &run->member.run; + run = run_create( style, MERF_ENDPARA ); + run->nCharOfs = 0; + run->len = eol_len; + run->para = &para->member.para; + para->member.para.eop_run = run; ME_InsertBefore(text->pLast, para); - ME_InsertBefore(text->pLast, run); + ME_InsertBefore(text->pLast, run_get_di( run )); para->member.para.prev_para = text->pFirst; para->member.para.next_para = text->pLast; text->pFirst->member.para.next_para = para; @@ -523,7 +522,7 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, ME_DisplayItem *next_para = NULL; ME_DisplayItem *run_para = NULL; ME_DisplayItem *new_para = make_para(editor); - ME_DisplayItem *end_run; + ME_Run *end_run; int ofs, i; ME_DisplayItem *pp; int run_flags = MERF_ENDPARA; @@ -549,10 +548,10 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, new_para->member.para.text = ME_VSplitString( run_para->member.para.text, run->member.run.nCharOfs ); - end_run = ME_MakeRun(style, run_flags); - ofs = end_run->member.run.nCharOfs = run->member.run.nCharOfs; - end_run->member.run.len = eol_len; - end_run->member.run.para = run->member.run.para; + end_run = run_create( style, run_flags ); + ofs = end_run->nCharOfs = run->member.run.nCharOfs; + end_run->len = eol_len; + end_run->para = run->member.run.para; ME_AppendString( run_para->member.para.text, eol_str, eol_len ); next_para = run_para->member.para.next_para; assert(next_para == ME_FindItemFwd(run_para, diParagraphOrEnd)); @@ -592,11 +591,11 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, /* insert end run of the old paragraph, and new paragraph, into DI double linked list */ ME_InsertBefore(run, new_para); - ME_InsertBefore(new_para, end_run); + ME_InsertBefore( new_para, run_get_di( end_run )); /* Fix up the paras' eop_run ptrs */ new_para->member.para.eop_run = run_para->member.para.eop_run; - run_para->member.para.eop_run = &end_run->member.run; + run_para->member.para.eop_run = end_run; if (!editor->bEmulateVersion10) { /* v4.1 */ if (paraFlags & (MEPF_ROWSTART|MEPF_CELL)) diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index eb5aeff050..84b851039b 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -273,63 +273,67 @@ void run_join( ME_TextEditor *editor, ME_Run *run ) * Does the most basic job of splitting a run into two - it does not * update the positions and extents. */ -ME_DisplayItem *ME_SplitRunSimple(ME_TextEditor *editor, ME_Cursor *cursor) +ME_DisplayItem *ME_SplitRunSimple( ME_TextEditor *editor, ME_Cursor *cursor ) { - ME_DisplayItem *run = cursor->pRun; - ME_DisplayItem *new_run; - int i; - int nOffset = cursor->nOffset; - - assert(!(run->member.run.nFlags & MERF_NONTEXT)); - - new_run = ME_MakeRun(run->member.run.style, - run->member.run.nFlags & MERF_SPLITMASK); - new_run->member.run.nCharOfs = run->member.run.nCharOfs + nOffset; - new_run->member.run.len = run->member.run.len - nOffset; - new_run->member.run.para = run->member.run.para; - run->member.run.len = nOffset; - cursor->pRun = new_run; - cursor->nOffset = 0; - - ME_InsertBefore(run->next, new_run); - - ME_UpdateRunFlags(editor, &run->member.run); - ME_UpdateRunFlags(editor, &new_run->member.run); - for (i = 0; i < editor->nCursors; i++) { - if (editor->pCursors[i].pRun == run && - editor->pCursors[i].nOffset >= nOffset) { - editor->pCursors[i].pRun = new_run; - editor->pCursors[i].nOffset -= nOffset; + ME_Run *run = &cursor->pRun->member.run, *new_run; + int i; + int nOffset = cursor->nOffset; + + assert( !(run->nFlags & MERF_NONTEXT) ); + + new_run = run_create( run->style, run->nFlags & MERF_SPLITMASK ); + new_run->nCharOfs = run->nCharOfs + nOffset; + new_run->len = run->len - nOffset; + new_run->para = run->para; + run->len = nOffset; + cursor->pRun = run_get_di( new_run ); + cursor->nOffset = 0; + + ME_InsertBefore( run_get_di( run )->next, run_get_di( new_run ) ); + + ME_UpdateRunFlags( editor, run ); + ME_UpdateRunFlags( editor, new_run ); + for (i = 0; i < editor->nCursors; i++) + { + if (editor->pCursors[i].pRun == run_get_di( run ) && + editor->pCursors[i].nOffset >= nOffset) + { + editor->pCursors[i].pRun = run_get_di( new_run ); + editor->pCursors[i].nOffset -= nOffset; + } } - } - para_mark_rewrap( editor, &cursor->pPara->member.para ); - return run; + para_mark_rewrap( editor, run->para ); + return run_get_di( run ); } /****************************************************************************** - * ME_MakeRun + * run_create * * A helper function to create run structures quickly. */ -ME_DisplayItem *ME_MakeRun(ME_Style *s, int nFlags) +ME_Run *run_create( ME_Style *s, int flags ) { - ME_DisplayItem *item = ME_MakeDI(diRun); - item->member.run.style = s; - item->member.run.reobj = NULL; - item->member.run.nFlags = nFlags; - item->member.run.nCharOfs = -1; - item->member.run.len = 0; - item->member.run.para = NULL; - item->member.run.num_glyphs = 0; - item->member.run.max_glyphs = 0; - item->member.run.glyphs = NULL; - item->member.run.vis_attrs = NULL; - item->member.run.advances = NULL; - item->member.run.offsets = NULL; - item->member.run.max_clusters = 0; - item->member.run.clusters = NULL; - ME_AddRefStyle(s); - return item; + ME_DisplayItem *item = ME_MakeDI( diRun ); + ME_Run *run = &item->member.run; + + if (!item) return NULL; + + ME_AddRefStyle( s ); + run->style = s; + run->reobj = NULL; + run->nFlags = flags; + run->nCharOfs = -1; + run->len = 0; + run->para = NULL; + run->num_glyphs = 0; + run->max_glyphs = 0; + run->glyphs = NULL; + run->vis_attrs = NULL; + run->advances = NULL; + run->offsets = NULL; + run->max_clusters = 0; + run->clusters = NULL; + return run; } /****************************************************************************** @@ -343,7 +347,8 @@ ME_DisplayItem * ME_InsertRunAtCursor(ME_TextEditor *editor, ME_Cursor *cursor, ME_Style *style, const WCHAR *str, int len, int flags) { - ME_DisplayItem *pDI, *insert_before = cursor->pRun, *prev; + ME_DisplayItem *insert_before = cursor->pRun, *prev; + ME_Run *run; if (cursor->nOffset) { @@ -362,18 +367,18 @@ ME_InsertRunAtCursor(ME_TextEditor *editor, ME_Cursor *cursor, ME_Style *style, add_undo_delete_run( editor, insert_before->member.run.para->nCharOfs + insert_before->member.run.nCharOfs, len ); - pDI = ME_MakeRun(style, flags); - pDI->member.run.nCharOfs = insert_before->member.run.nCharOfs; - pDI->member.run.len = len; - pDI->member.run.para = insert_before->member.run.para; - ME_InsertString( pDI->member.run.para->text, pDI->member.run.nCharOfs, str, len ); - ME_InsertBefore( insert_before, pDI ); + run = run_create( style, flags ); + run->nCharOfs = insert_before->member.run.nCharOfs; + run->len = len; + run->para = insert_before->member.run.para; + ME_InsertString( run->para->text, run->nCharOfs, str, len ); + ME_InsertBefore( insert_before, run_get_di( run ) ); TRACE("Shift length:%d\n", len); ME_PropagateCharOffset( insert_before, len ); para_mark_rewrap( editor, insert_before->member.run.para ); /* Move any cursors that were at the end of the previous run to the end of the inserted run */ - prev = ME_FindItemBack( pDI, diRun ); + prev = ME_FindItemBack( run_get_di( run ), diRun ); if (prev) { int i; @@ -383,13 +388,13 @@ ME_InsertRunAtCursor(ME_TextEditor *editor, ME_Cursor *cursor, ME_Style *style, if (editor->pCursors[i].pRun == prev && editor->pCursors[i].nOffset == prev->member.run.len) { - editor->pCursors[i].pRun = pDI; + editor->pCursors[i].pRun = run_get_di( run ); editor->pCursors[i].nOffset = len; } } } - return pDI; + return run_get_di( run ); } static BOOL run_is_splittable( const ME_Run *run )

1 0

Huw Davies : riched20: Pass a run ptr to the run joining function.
by Alexandre Julliard 13 Oct '20

13 Oct '20

Module: wine Branch: master Commit: 3cade70f14aeb12afef4ba53ec14eff3418abbd8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3cade70f14aeb12afef4ba53… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 13 11:16:36 2020 +0100 riched20: Pass a run ptr to the run joining function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.h | 2 +- dlls/riched20/run.c | 33 ++++++++++++++++++--------------- dlls/riched20/wrap.c | 2 +- 3 files changed, 20 insertions(+), 17 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index f61caa6478..de029f5bcb 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -131,7 +131,7 @@ int ME_CharFromPoint(ME_TextEditor *editor, int cx, ME_Run *run, BOOL closest, B int ME_PointFromCharContext(ME_Context *c, ME_Run *pRun, int nOffset, BOOL visual_order) DECLSPEC_HIDDEN; int ME_PointFromChar(ME_TextEditor *editor, ME_Run *pRun, int nOffset, BOOL visual_order) DECLSPEC_HIDDEN; BOOL ME_CanJoinRuns(const ME_Run *run1, const ME_Run *run2) DECLSPEC_HIDDEN; -void ME_JoinRuns(ME_TextEditor *editor, ME_DisplayItem *p) DECLSPEC_HIDDEN; +void run_join( ME_TextEditor *editor, ME_Run *run ) DECLSPEC_HIDDEN; ME_DisplayItem *ME_SplitRunSimple(ME_TextEditor *editor, ME_Cursor *cursor) DECLSPEC_HIDDEN; void ME_UpdateRunFlags(ME_TextEditor *editor, ME_Run *run) DECLSPEC_HIDDEN; SIZE ME_GetRunSizeCommon(ME_Context *c, const ME_Paragraph *para, ME_Run *run, int nLen, diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index c3bc7f50b3..eb5aeff050 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -237,31 +237,34 @@ void ME_RunOfsFromCharOfs(ME_TextEditor *editor, } /****************************************************************************** - * ME_JoinRuns + * run_join * * Merges two adjacent runs, the one given as a parameter and the next one. */ -void ME_JoinRuns(ME_TextEditor *editor, ME_DisplayItem *p) +void run_join( ME_TextEditor *editor, ME_Run *run ) { - ME_DisplayItem *pNext = p->next; + ME_Run *next = run_next( run ); int i; - assert(p->type == diRun && pNext->type == diRun); - assert(p->member.run.nCharOfs != -1); - para_mark_rewrap( editor, &ME_GetParagraph( p )->member.para ); + + assert( run ); + assert( run->nCharOfs != -1 ); + para_mark_rewrap( editor, run->para ); /* Update all cursors so that they don't contain the soon deleted run */ - for (i=0; i<editor->nCursors; i++) { - if (editor->pCursors[i].pRun == pNext) { - editor->pCursors[i].pRun = p; - editor->pCursors[i].nOffset += p->member.run.len; + for (i = 0; i < editor->nCursors; i++) + { + if (&editor->pCursors[i].pRun->member.run == next) + { + editor->pCursors[i].pRun = run_get_di( run ); + editor->pCursors[i].nOffset += run->len; } } - p->member.run.len += pNext->member.run.len; - ME_Remove(pNext); - ME_DestroyDisplayItem(pNext); - ME_UpdateRunFlags(editor, &p->member.run); - ME_CheckCharOffsets(editor); + run->len += next->len; + ME_Remove( run_get_di( next ) ); + ME_DestroyDisplayItem( run_get_di( next ) ); + ME_UpdateRunFlags( editor, run ); + ME_CheckCharOffsets( editor ); } /****************************************************************************** diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index c7b99f5ee2..fda1d99557 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -714,7 +714,7 @@ static void ME_PrepareParagraphForWrapping( ME_TextEditor *editor, ME_Context *c if (p->type == diRun) { while (p->next->type == diRun && ME_CanJoinRuns( &p->member.run, &p->next->member.run )) - ME_JoinRuns( c->editor, p ); + run_join( c->editor, &p->member.run ); } } }

1 0

← Newer
1
...
39
40
41
42
43
44
45
...
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-commits October 2020