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

[PATCH 5/6] jscript: Add Object.freeze implementation.
by Jacek Caban 01 Apr '21

01 Apr '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/dispex.c | 13 +++++++++++++ dlls/jscript/jscript.h | 1 + dlls/jscript/object.c | 24 +++++++++++++++++++++++ dlls/mshtml/tests/es5.js | 41 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 79 insertions(+)

2 1

[PATCH 2/2 v2] msvcrt: Handle negative zero, infinity and nan in _ecvt and others.
by Piotr Caban 01 Apr '21

01 Apr '21

From: Lauri Kenttä <lauri.kentta(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50885 Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 65 +++++++++++++++----------------------- dlls/msvcrt/tests/printf.c | 11 +++++++ 2 files changed, 36 insertions(+), 40 deletions(-)

1 0

[PATCH 1/2 v2] msvcrt: Cleanup _ecvt tests.
by Piotr Caban 01 Apr '21

01 Apr '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v2: - also fix the functions for NAN, -NAN, INFINITY and -INFINITY dlls/msvcrt/tests/printf.c | 43 +++++++++++++++----------------------- 1 file changed, 17 insertions(+), 26 deletions(-)

1 0

[PATCH 4/6] jscript: Support non-extensible objects in jsdisp_define_property.
by Jacek Caban 01 Apr '21

01 Apr '21

2 1

[PATCH 3/6] jscript: Add Object.isExtensible implementation.
by Jacek Caban 01 Apr '21

01 Apr '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/object.c | 22 ++++++++++++++++++++++ dlls/mshtml/tests/es5.js | 15 +++++++++++++++ 2 files changed, 37 insertions(+)

2 1

[PATCH 2/6] jscript: Support non-extensible objects.
by Jacek Caban 01 Apr '21

01 Apr '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/dispex.c | 12 +++++++++--- dlls/jscript/jscript.h | 1 + dlls/jscript/object.c | 3 ++- dlls/mshtml/tests/es5.js | 8 +++++++- 4 files changed, 19 insertions(+), 5 deletions(-)

2 1

[PATCH] mf/session: Prefer transform-provided sample path.
by Nikolay Sivov 01 Apr '21

01 Apr '21

From: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/session.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index c2334f82d62..20ccdd0535e 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -2750,7 +2750,7 @@ static HRESULT transform_node_pull_samples(const struct media_session *session, if (FAILED(hr = IMFTransform_GetOutputStreamInfo(node->object.transform, buffers[i].dwStreamID, &stream_info))) break; - if (!(stream_info.dwFlags & MFT_OUTPUT_STREAM_PROVIDES_SAMPLES)) + if (!(stream_info.dwFlags & (MFT_OUTPUT_STREAM_PROVIDES_SAMPLES | MFT_OUTPUT_STREAM_CAN_PROVIDE_SAMPLES))) { if (FAILED(hr = transform_get_external_output_sample(session, node, i, &stream_info, &buffers[i].pSample))) break; -- 2.30.2

1 0

[PATCH 1/6] jscript: Get dispid and call invoke in a single step when setting a member property.
by Jacek Caban 01 Apr '21

01 Apr '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/compile.c | 89 ++++++++++++++++++-------------------- dlls/jscript/dispex.c | 32 ++++++++++++++ dlls/jscript/engine.c | 54 +++++++++++++++++++++++ dlls/jscript/engine.h | 2 + dlls/jscript/jscript.h | 1 + dlls/jscript/tests/lang.js | 6 +++ dlls/jscript/tests/run.c | 19 ++++++++ 7 files changed, 156 insertions(+), 47 deletions(-)

1 0

[PATCH 1/5] wined3d: Check for a valid index buffer in d3d[89]_device_DrawIndexedPrimitive().
by Zebediah Figura 01 Apr '21

01 Apr '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d8/device.c | 13 +++++++++---- dlls/d3d8/tests/device.c | 2 +- dlls/d3d9/device.c | 19 +++++++++++-------- dlls/ddraw/device.c | 6 +++--- dlls/wined3d/device.c | 14 +------------- include/wine/wined3d.h | 2 +- 6 files changed, 26 insertions(+), 30 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index f4bdb748275..f0bfab660a7 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2518,22 +2518,27 @@ static HRESULT WINAPI d3d8_device_DrawIndexedPrimitive(IDirect3DDevice8 *iface, struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); unsigned int index_count; int base_vertex_index; - HRESULT hr; TRACE("iface %p, primitive_type %#x, min_vertex_idx %u, vertex_count %u, start_idx %u, primitive_count %u.\n", iface, primitive_type, min_vertex_idx, vertex_count, start_idx, primitive_count); index_count = vertex_count_from_primitive_count(primitive_type, primitive_count); wined3d_mutex_lock(); + if (!device->stateblock_state->index_buffer) + { + wined3d_mutex_unlock(); + WARN("Index buffer not set, returning D3D_OK.\n"); + return D3D_OK; + } base_vertex_index = device->stateblock_state->base_vertex_index; d3d8_device_upload_sysmem_vertex_buffers(device, base_vertex_index + min_vertex_idx, vertex_count); d3d8_device_upload_sysmem_index_buffer(device, start_idx, index_count); wined3d_device_set_primitive_type(device->wined3d_device, wined3d_primitive_type_from_d3d(primitive_type), 0); wined3d_device_apply_stateblock(device->wined3d_device, device->state); - hr = wined3d_device_draw_indexed_primitive(device->wined3d_device, start_idx, index_count); + wined3d_device_draw_indexed_primitive(device->wined3d_device, start_idx, index_count); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } /* The caller is responsible for wined3d locking */ @@ -2752,7 +2757,7 @@ static HRESULT WINAPI d3d8_device_DrawIndexedPrimitiveUP(IDirect3DDevice8 *iface wined3d_device_set_primitive_type(device->wined3d_device, wined3d_primitive_type_from_d3d(primitive_type), 0); wined3d_device_apply_stateblock(device->wined3d_device, device->state); - hr = wined3d_device_draw_indexed_primitive(device->wined3d_device, ib_pos / idx_fmt_size, idx_count); + wined3d_device_draw_indexed_primitive(device->wined3d_device, ib_pos / idx_fmt_size, idx_count); wined3d_stateblock_set_stream_source(device->state, 0, NULL, 0, 0); wined3d_stateblock_set_index_buffer(device->state, NULL, WINED3DFMT_UNKNOWN); diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 4eb1ab65e72..fc94dcaaad7 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -10176,7 +10176,7 @@ static void test_draw_primitive(void) hr = IDirect3DDevice8_SetIndices(device, NULL, 0); ok(SUCCEEDED(hr), "SetIndices failed, hr %#x.\n", hr); hr = IDirect3DDevice8_DrawIndexedPrimitive(device, D3DPT_TRIANGLELIST, 0, 4, 0, 2); - todo_wine ok(SUCCEEDED(hr), "DrawIndexedPrimitive failed, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); /* Valid index buffer, NULL stream source. */ hr = IDirect3DDevice8_SetIndices(device, index_buffer, 1); diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 229fc59521c..aa216edfcc0 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3049,7 +3049,6 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitive(IDirect3DDevice9Ex *iface { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); unsigned int index_count; - HRESULT hr; TRACE("iface %p, primitive_type %#x, base_vertex_idx %u, min_vertex_idx %u, " "vertex_count %u, start_idx %u, primitive_count %u.\n", @@ -3063,6 +3062,12 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitive(IDirect3DDevice9Ex *iface WARN("Called without a valid vertex declaration set.\n"); return D3DERR_INVALIDCALL; } + if (!device->stateblock_state->index_buffer) + { + wined3d_mutex_unlock(); + WARN("Called without a valid index buffer set.\n"); + return D3DERR_INVALIDCALL; + } index_count = vertex_count_from_primitive_count(primitive_type, primitive_count); d3d9_device_upload_sysmem_vertex_buffers(device, base_vertex_idx, min_vertex_idx, vertex_count); d3d9_device_upload_sysmem_index_buffer(device, start_idx, index_count); @@ -3070,12 +3075,11 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitive(IDirect3DDevice9Ex *iface wined3d_stateblock_set_base_vertex_index(device->state, base_vertex_idx); wined3d_device_set_primitive_type(device->wined3d_device, wined3d_primitive_type_from_d3d(primitive_type), 0); wined3d_device_apply_stateblock(device->wined3d_device, device->state); - hr = wined3d_device_draw_indexed_primitive(device->wined3d_device, start_idx, index_count); - if (SUCCEEDED(hr)) - d3d9_rts_flag_auto_gen_mipmap(device); + wined3d_device_draw_indexed_primitive(device->wined3d_device, start_idx, index_count); + d3d9_rts_flag_auto_gen_mipmap(device); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } /* The caller is responsible for wined3d locking */ @@ -3322,13 +3326,12 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitiveUP(IDirect3DDevice9Ex *ifa wined3d_device_apply_stateblock(device->wined3d_device, device->state); wined3d_device_set_primitive_type(device->wined3d_device, wined3d_primitive_type_from_d3d(primitive_type), 0); - hr = wined3d_device_draw_indexed_primitive(device->wined3d_device, ib_pos / idx_fmt_size, idx_count); + wined3d_device_draw_indexed_primitive(device->wined3d_device, ib_pos / idx_fmt_size, idx_count); wined3d_stateblock_set_stream_source(device->state, 0, NULL, 0, 0); wined3d_stateblock_set_index_buffer(device->state, NULL, WINED3DFMT_UNKNOWN); - if (SUCCEEDED(hr)) - d3d9_rts_flag_auto_gen_mipmap(device); + d3d9_rts_flag_auto_gen_mipmap(device); done: wined3d_mutex_unlock(); diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index bf2e77e5b71..ce937b0c543 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -3736,7 +3736,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitive(IDirect3DDevice7 *iface, wined3d_stateblock_set_base_vertex_index(device->state, vb_pos / stride); wined3d_device_apply_stateblock(device->wined3d_device, device->state); d3d_device_sync_surfaces(device); - hr = wined3d_device_draw_indexed_primitive(device->wined3d_device, ib_pos / sizeof(*indices), index_count); + wined3d_device_draw_indexed_primitive(device->wined3d_device, ib_pos / sizeof(*indices), index_count); done: wined3d_mutex_unlock(); @@ -4200,7 +4200,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveStrided(IDirect3DDevice7 *iface, wined3d_device_set_primitive_type(device->wined3d_device, wined3d_primitive_type_from_ddraw(primitive_type), 0); wined3d_device_apply_stateblock(device->wined3d_device, device->state); d3d_device_sync_surfaces(device); - hr = wined3d_device_draw_indexed_primitive(device->wined3d_device, ib_pos / sizeof(WORD), index_count); + wined3d_device_draw_indexed_primitive(device->wined3d_device, ib_pos / sizeof(WORD), index_count); done: wined3d_mutex_unlock(); @@ -4478,7 +4478,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, wined3d_device_set_primitive_type(device->wined3d_device, wined3d_primitive_type_from_ddraw(primitive_type), 0); wined3d_device_apply_stateblock(device->wined3d_device, device->state); d3d_device_sync_surfaces(device); - hr = wined3d_device_draw_indexed_primitive(device->wined3d_device, ib_pos / sizeof(WORD), index_count); + wined3d_device_draw_indexed_primitive(device->wined3d_device, ib_pos / sizeof(WORD), index_count); wined3d_mutex_unlock(); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 71ca6740c37..0389a73b924 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4480,26 +4480,14 @@ void CDECL wined3d_device_draw_primitive_instanced_indirect(struct wined3d_devic state->patch_vertex_count, buffer, offset, false); } -HRESULT CDECL wined3d_device_draw_indexed_primitive(struct wined3d_device *device, UINT start_idx, UINT index_count) +void CDECL wined3d_device_draw_indexed_primitive(struct wined3d_device *device, UINT start_idx, UINT index_count) { struct wined3d_state *state = device->cs->c.state; TRACE("device %p, start_idx %u, index_count %u.\n", device, start_idx, index_count); - if (!state->index_buffer) - { - /* D3D9 returns D3DERR_INVALIDCALL when DrawIndexedPrimitive is called - * without an index buffer set. (The first time at least...) - * D3D8 simply dies, but I doubt it can do much harm to return - * D3DERR_INVALIDCALL there as well. */ - WARN("Called without a valid index buffer set, returning WINED3DERR_INVALIDCALL.\n"); - return WINED3DERR_INVALIDCALL; - } - wined3d_device_context_emit_draw(&device->cs->c, state->primitive_type, state->patch_vertex_count, state->base_vertex_index, start_idx, index_count, 0, 0, true); - - return WINED3D_OK; } void CDECL wined3d_device_draw_indexed_primitive_instanced(struct wined3d_device *device, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 197a56d1952..bc6f2e29b7f 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2372,7 +2372,7 @@ void __cdecl wined3d_device_dispatch_compute(struct wined3d_device *device, unsigned int group_count_x, unsigned int group_count_y, unsigned int group_count_z); void __cdecl wined3d_device_dispatch_compute_indirect(struct wined3d_device *device, struct wined3d_buffer *buffer, unsigned int offset); -HRESULT __cdecl wined3d_device_draw_indexed_primitive(struct wined3d_device *device, UINT start_idx, UINT index_count); +void __cdecl wined3d_device_draw_indexed_primitive(struct wined3d_device *device, UINT start_idx, UINT index_count); void __cdecl wined3d_device_draw_indexed_primitive_instanced(struct wined3d_device *device, UINT start_idx, UINT index_count, UINT start_instance, UINT instance_count); void __cdecl wined3d_device_draw_indexed_primitive_instanced_indirect(struct wined3d_device *device, -- 2.30.2

4 11

[PATCH] include: Add ID2D1DeviceContext1 definition.
by Nikolay Sivov 01 Apr '21

01 Apr '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/d2d1_2.idl | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/include/d2d1_2.idl b/include/d2d1_2.idl index 3506c796ccb..39e285dc221 100644 --- a/include/d2d1_2.idl +++ b/include/d2d1_2.idl @@ -18,8 +18,6 @@ import "d2d1_1.idl"; -interface ID2D1DeviceContext1; - typedef enum D2D1_RENDERING_PRIORITY { D2D1_RENDERING_PRIORITY_NORMAL = 0, @@ -27,6 +25,40 @@ typedef enum D2D1_RENDERING_PRIORITY D2D1_RENDERING_PRIORITY_FORCE_DWORD = 0xffffffff, } D2D1_RENDERING_PRIORITY; +[ + object, + uuid(a16907d7-bc02-4801-99e8-8cf7f485f774), + local, +] +interface ID2D1GeometryRealization : ID2D1Resource +{ +} + +[ + object, + uuid(d37f57e4-6908-459f-a199-e72f24f79987), + local, +] +interface ID2D1DeviceContext1 : ID2D1DeviceContext +{ + HRESULT CreateFilledGeometryRealization( + [in] ID2D1Geometry *geometry, + [in] float tolerance, + [out] ID2D1GeometryRealization **realization + ); + HRESULT CreateStrokedGeometryRealization( + [in] ID2D1Geometry *geometry, + [in] float tolerance, + [in] float stroke_width, + [in] ID2D1StrokeStyle *stroke_style, + [out] ID2D1GeometryRealization **realization + ); + void DrawGeometryRealization( + [in] ID2D1GeometryRealization *realization, + [in] ID2D1Brush *brush + ); +} + [ object, uuid(d21768e1-23a4-4823-a14b-7c3eba85d658), -- 2.30.2

2 1