December 2023 - Wine-commits

Conor McCarthy : vkd3d-shader/spirv: Support declared component type and count in immediate constant buffers.
by Alexandre Julliard 07 Dec '23

07 Dec '23

Module: vkd3d Branch: master Commit: ef940cb778df0a45ef502f6b8c2f6fd5262fda8f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ef940cb778df0a45ef502f6b8c2f6… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Nov 15 15:18:47 2023 +1000 vkd3d-shader/spirv: Support declared component type and count in immediate constant buffers. --- libs/vkd3d-shader/spirv.c | 40 ++++++++++++++++++---------------------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 8cc124fd..633bd7ce 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3767,18 +3767,24 @@ static uint32_t spirv_compiler_emit_load_scalar(struct spirv_compiler *compiler, } static uint32_t spirv_compiler_emit_constant_array(struct spirv_compiler *compiler, - const struct vkd3d_shader_immediate_constant_buffer *icb) + const struct vkd3d_shader_immediate_constant_buffer *icb, uint32_t *type_id_out) { uint32_t *elements, elem_type_id, length_id, type_id, const_id; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - unsigned int i, element_count; + enum vkd3d_shader_component_type component_type; + unsigned int i, element_count, component_count; element_count = icb->element_count; - elem_type_id = vkd3d_spirv_get_type_id_for_data_type(builder, icb->data_type, 1); + component_type = vkd3d_component_type_from_data_type(icb->data_type); + component_count = icb->component_count; + elem_type_id = vkd3d_spirv_get_type_id_for_data_type(builder, icb->data_type, component_count); length_id = spirv_compiler_get_constant_uint(compiler, element_count); type_id = vkd3d_spirv_get_op_type_array(builder, elem_type_id, length_id); + if (type_id_out) + *type_id_out = type_id; + if (icb->is_null) { /* All values are null. Workgroup memory initialisers require OpConstantNull. */ @@ -3799,14 +3805,16 @@ static uint32_t spirv_compiler_emit_constant_array(struct spirv_compiler *compil case VKD3D_DATA_INT: case VKD3D_DATA_UINT: for (i = 0; i < element_count; ++i) - elements[i] = vkd3d_spirv_get_op_constant(builder, elem_type_id, icb->data[i]); + elements[i] = spirv_compiler_get_constant(compiler, component_type, component_count, + &icb->data[component_count * i]); break; case VKD3D_DATA_DOUBLE: case VKD3D_DATA_UINT64: { uint64_t *data = (uint64_t *)icb->data; for (i = 0; i < element_count; ++i) - elements[i] = vkd3d_spirv_get_op_constant64(builder, elem_type_id, data[i]); + elements[i] = spirv_compiler_get_constant64(compiler, component_type, component_count, + &data[component_count * i]); break; } default: @@ -5582,7 +5590,7 @@ static void spirv_compiler_emit_dcl_indexable_temp(struct spirv_compiler *compil type_id = vkd3d_spirv_get_op_type_array(builder, type_id, length_id); ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, storage_class, type_id); if (temp->initialiser) - init_id = spirv_compiler_emit_constant_array(compiler, temp->initialiser); + init_id = spirv_compiler_emit_constant_array(compiler, temp->initialiser, NULL); id = vkd3d_spirv_build_op_variable(builder, &builder->function_stream, ptr_type_id, storage_class, init_id); spirv_compiler_emit_register_debug_name(builder, id, &reg); @@ -5809,34 +5817,22 @@ static void spirv_compiler_emit_dcl_immediate_constant_buffer(struct spirv_compi const struct vkd3d_shader_instruction *instruction) { const struct vkd3d_shader_immediate_constant_buffer *icb = instruction->declaration.icb; - uint32_t *elements, length_id, type_id, const_id, ptr_type_id, icb_id; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + uint32_t type_id, const_id, ptr_type_id, icb_id; struct vkd3d_shader_register reg; struct vkd3d_symbol reg_symbol; - unsigned int i; - assert(icb->data_type == VKD3D_DATA_FLOAT); - assert(icb->component_count == VKD3D_VEC4_SIZE); - - if (!(elements = vkd3d_calloc(icb->element_count, sizeof(*elements)))) - return; - for (i = 0; i < icb->element_count; ++i) - elements[i] = spirv_compiler_get_constant(compiler, - VKD3D_SHADER_COMPONENT_FLOAT, VKD3D_VEC4_SIZE, &icb->data[4 * i]); - type_id = vkd3d_spirv_get_type_id(builder, VKD3D_SHADER_COMPONENT_FLOAT, VKD3D_VEC4_SIZE); - length_id = spirv_compiler_get_constant_uint(compiler, icb->element_count); - type_id = vkd3d_spirv_get_op_type_array(builder, type_id, length_id); - const_id = vkd3d_spirv_build_op_constant_composite(builder, type_id, elements, icb->element_count); + const_id = spirv_compiler_emit_constant_array(compiler, icb, &type_id); ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, SpvStorageClassPrivate, type_id); icb_id = vkd3d_spirv_build_op_variable(builder, &builder->global_stream, ptr_type_id, SpvStorageClassPrivate, const_id); vkd3d_spirv_build_op_name(builder, icb_id, "icb"); - vkd3d_free(elements); vsir_register_init(&reg, VKD3DSPR_IMMCONSTBUFFER, VKD3D_DATA_FLOAT, 0); vkd3d_symbol_make_register(&reg_symbol, &reg); vkd3d_symbol_set_register_info(&reg_symbol, icb_id, SpvStorageClassPrivate, - VKD3D_SHADER_COMPONENT_FLOAT, VKD3DSP_WRITEMASK_ALL); + vkd3d_component_type_from_data_type(icb->data_type), + vkd3d_write_mask_from_component_count(icb->component_count)); spirv_compiler_put_symbol(compiler, &reg_symbol); }

1 0

Conor McCarthy : vkd3d-shader: Add a register index to struct vkd3d_shader_immediate_constant_buffer.
by Alexandre Julliard 07 Dec '23

07 Dec '23

Module: vkd3d Branch: master Commit: cb88844a3d90a4d9e566f0b135570c323c86f22e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/cb88844a3d90a4d9e566f0b135570… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Nov 15 16:27:41 2023 +1000 vkd3d-shader: Add a register index to struct vkd3d_shader_immediate_constant_buffer. --- libs/vkd3d-shader/dxil.c | 2 ++ libs/vkd3d-shader/spirv.c | 7 +++++-- libs/vkd3d-shader/tpf.c | 10 ++++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 7c711d7c..ebd78909 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -581,6 +581,7 @@ struct sm6_parser size_t descriptor_count; unsigned int indexable_temp_count; + unsigned int icb_count; struct sm6_value *values; size_t value_count; @@ -2433,6 +2434,7 @@ static enum vkd3d_result value_allocate_constant_array(struct sm6_value *dst, co dst->value_type = VALUE_TYPE_ICB; dst->u.icb = icb; + icb->register_idx = sm6->icb_count++; icb->data_type = vkd3d_data_type_from_sm6_type(elem_type); icb->element_count = type->u.array.count; icb->component_count = 1; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 633bd7ce..dc3d9631 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2162,6 +2162,7 @@ static void vkd3d_symbol_make_register(struct vkd3d_symbol *symbol, break; case VKD3DSPR_IMMCONSTBUFFER: + symbol->key.reg.idx = reg->idx_count > 1 ? reg->idx[0].offset : 0; break; default: @@ -3508,7 +3509,7 @@ static void spirv_compiler_emit_dereference_register(struct spirv_compiler *comp } else if (reg->type == VKD3DSPR_IMMCONSTBUFFER) { - indexes[index_count++] = spirv_compiler_emit_register_addressing(compiler, &reg->idx[0]); + indexes[index_count++] = spirv_compiler_emit_register_addressing(compiler, &reg->idx[reg->idx_count - 1]); } else if (reg->type == VKD3DSPR_IDXTEMP) { @@ -5828,7 +5829,9 @@ static void spirv_compiler_emit_dcl_immediate_constant_buffer(struct spirv_compi ptr_type_id, SpvStorageClassPrivate, const_id); vkd3d_spirv_build_op_name(builder, icb_id, "icb"); - vsir_register_init(&reg, VKD3DSPR_IMMCONSTBUFFER, VKD3D_DATA_FLOAT, 0); + /* Set an index count of 2 so vkd3d_symbol_make_register() uses idx[0] as a buffer id. */ + vsir_register_init(&reg, VKD3DSPR_IMMCONSTBUFFER, VKD3D_DATA_FLOAT, 2); + reg.idx[0].offset = icb->register_idx; vkd3d_symbol_make_register(&reg_symbol, &reg); vkd3d_symbol_set_register_info(&reg_symbol, icb_id, SpvStorageClassPrivate, vkd3d_component_type_from_data_type(icb->data_type), diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index ba504c41..163cd90e 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -792,6 +792,7 @@ static void shader_sm4_read_shader_data(struct vkd3d_shader_instruction *ins, ui ins->handler_idx = VKD3DSIH_INVALID; return; } + icb->register_idx = 0; icb->data_type = VKD3D_DATA_FLOAT; icb->component_count = VKD3D_VEC4_SIZE; icb->element_count = icb_size / VKD3D_VEC4_SIZE; @@ -1931,6 +1932,15 @@ static bool shader_sm4_read_param(struct vkd3d_shader_sm4_parser *priv, const ui break; } } + else if (register_type == VKD3D_SM4_RT_IMMCONSTBUFFER) + { + if (param->idx_count != 1) + { + WARN("Unexpected idx count %u.\n", param->idx_count); + vkd3d_shader_parser_error(&priv->p, VKD3D_SHADER_ERROR_TPF_INVALID_REGISTER_INDEX_COUNT, + "Invalid index count %u for immediate const buffer register; expected count 1.", param->idx_count); + } + } else if (!shader_is_sm_5_1(priv) && vsir_register_is_descriptor(param)) { /* SM5.1 places a symbol identifier in idx[0] and moves diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 3458b8f5..a94a8152 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -793,6 +793,7 @@ struct vkd3d_shader_version struct vkd3d_shader_immediate_constant_buffer { + unsigned int register_idx; enum vkd3d_data_type data_type; /* total count is element_count * component_count */ unsigned int element_count;

1 0

Conor McCarthy : vkd3d-shader/dxil: Emit constant global arrays as immediate constant buffers.
by Alexandre Julliard 07 Dec '23

07 Dec '23

Module: vkd3d Branch: master Commit: cc5e703802521d66601b76f20e62e7da9ed7b660 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/cc5e703802521d66601b76f20e62e… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Nov 15 16:30:02 2023 +1000 vkd3d-shader/dxil: Emit constant global arrays as immediate constant buffers. --- libs/vkd3d-shader/dxil.c | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index ebd78909..c26e3b5a 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -2630,6 +2630,18 @@ static struct vkd3d_shader_instruction *sm6_parser_add_instruction(struct sm6_pa return ins; } +static void sm6_parser_declare_icb(struct sm6_parser *sm6, const struct sm6_type *elem_type, unsigned int count, + unsigned int alignment, unsigned int init, struct sm6_value *dst) +{ + enum vkd3d_data_type data_type = vkd3d_data_type_from_sm6_type(elem_type); + struct vkd3d_shader_instruction *ins; + + ins = sm6_parser_add_instruction(sm6, VKD3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER); + /* The icb value index will be resolved later so forward references can be handled. */ + ins->declaration.icb = (void *)(intptr_t)init; + register_init_with_id(&dst->u.reg, VKD3DSPR_IMMCONSTBUFFER, data_type, init); +} + static void sm6_parser_declare_indexable_temp(struct sm6_parser *sm6, const struct sm6_type *elem_type, unsigned int count, unsigned int alignment, unsigned int init, struct sm6_value *dst) { @@ -2766,7 +2778,10 @@ static bool sm6_parser_declare_global(struct sm6_parser *sm6, const struct dxil_ if (address_space == ADDRESS_SPACE_DEFAULT) { - sm6_parser_declare_indexable_temp(sm6, scalar_type, count, alignment, init, dst); + if (is_constant) + sm6_parser_declare_icb(sm6, scalar_type, count, alignment, init, dst); + else + sm6_parser_declare_indexable_temp(sm6, scalar_type, count, alignment, init, dst); } else if (address_space == ADDRESS_SPACE_GROUPSHARED) { @@ -2810,11 +2825,11 @@ static const struct vkd3d_shader_immediate_constant_buffer *resolve_forward_init static enum vkd3d_result sm6_parser_globals_init(struct sm6_parser *sm6) { const struct dxil_block *block = &sm6->root_block; + size_t i, base_value_idx = sm6->value_count; struct vkd3d_shader_instruction *ins; const struct dxil_record *record; enum vkd3d_result ret; uint64_t version; - size_t i; sm6->p.location.line = block->id; sm6->p.location.column = 0; @@ -2872,6 +2887,21 @@ static enum vkd3d_result sm6_parser_globals_init(struct sm6_parser *sm6) ins->declaration.indexable_temp.initialiser = resolve_forward_initialiser( (uintptr_t)ins->declaration.indexable_temp.initialiser, sm6); } + else if (ins->handler_idx == VKD3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER) + { + ins->declaration.icb = resolve_forward_initialiser((uintptr_t)ins->declaration.icb, sm6); + } + } + for (i = base_value_idx; i < sm6->value_count; ++i) + { + const struct vkd3d_shader_immediate_constant_buffer *icb; + struct sm6_value *value = &sm6->values[i]; + + if (!sm6_value_is_register(value) || value->u.reg.type != VKD3DSPR_IMMCONSTBUFFER) + continue; + + if ((icb = resolve_forward_initialiser(value->u.reg.idx[0].offset, sm6))) + value->u.reg.idx[0].offset = icb->register_idx; } return VKD3D_OK;

1 0

Fabian Maurer : coml2: Move StgCreatePropSetStg from ole32.
by Alexandre Julliard 06 Dec '23

06 Dec '23

Module: wine Branch: master Commit: 8e48d7fdbdbdcf0bf2f2ff48b9abfcfdcfe2aae0 URL: https://gitlab.winehq.org/wine/wine/-/commit/8e48d7fdbdbdcf0bf2f2ff48b9abfc… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sun Dec 3 23:26:55 2023 +0100 coml2: Move StgCreatePropSetStg from ole32. --- dlls/coml2/coml2.spec | 2 +- dlls/coml2/storage32.c | 12 ++++++++++++ dlls/ole32/storage32.c | 13 ------------- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/coml2/coml2.spec b/dlls/coml2/coml2.spec index 694790350cc..f9747cb449d 100644 --- a/dlls/coml2/coml2.spec +++ b/dlls/coml2/coml2.spec @@ -19,7 +19,7 @@ @ stdcall ReadClassStm(ptr ptr) @ stub StgCreateDocfile @ stub StgCreateDocfileOnILockBytes -@ stub StgCreatePropSetStg +@ stdcall StgCreatePropSetStg(ptr long ptr) @ stub StgCreatePropStg @ stub StgCreateStorageEx @ stdcall StgIsStorageFile(wstr) diff --git a/dlls/coml2/storage32.c b/dlls/coml2/storage32.c index dd803c817c9..d6dab7d6b17 100644 --- a/dlls/coml2/storage32.c +++ b/dlls/coml2/storage32.c @@ -226,3 +226,15 @@ HRESULT WINAPI StgIsStorageFile(LPCOLESTR fn) TRACE(" -> Invalid header.\n"); return S_FALSE; } + +/****************************************************************************** + * StgCreatePropSetStg [coml2.@] + */ +HRESULT WINAPI StgCreatePropSetStg(IStorage *pstg, DWORD reserved, IPropertySetStorage **propset) +{ + TRACE("%p, %#lx, %p.\n", pstg, reserved, propset); + if (reserved) + return STG_E_INVALIDPARAMETER; + + return IStorage_QueryInterface(pstg, &IID_IPropertySetStorage, (void**)propset); +} diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index f0ec0b5e954..1bf08e45701 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -8649,19 +8649,6 @@ HRESULT WINAPI StgCreateStorageEx(const WCHAR* pwcsName, DWORD grfMode, DWORD st return STG_E_INVALIDPARAMETER; } -/****************************************************************************** - * StgCreatePropSetStg [OLE32.@] - */ -HRESULT WINAPI StgCreatePropSetStg(IStorage *pstg, DWORD reserved, - IPropertySetStorage **propset) -{ - TRACE("%p, %#lx, %p.\n", pstg, reserved, propset); - if (reserved) - return STG_E_INVALIDPARAMETER; - - return IStorage_QueryInterface(pstg, &IID_IPropertySetStorage, (void**)propset); -} - /****************************************************************************** * StgOpenStorageEx [OLE32.@] */

1 0

Matteo Bruni : d3dx9: Check for successful sprite draw in DrawTextW().
by Alexandre Julliard 06 Dec '23

06 Dec '23

Module: wine Branch: master Commit: bc1ba439424877a37504162b15a25344d5ab8505 URL: https://gitlab.winehq.org/wine/wine/-/commit/bc1ba439424877a37504162b15a253… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Dec 1 23:29:53 2023 +0100 d3dx9: Check for successful sprite draw in DrawTextW(). --- dlls/d3dx9_36/font.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c index cc447e68f22..67058d91ecb 100644 --- a/dlls/d3dx9_36/font.c +++ b/dlls/d3dx9_36/font.c @@ -656,6 +656,7 @@ static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite, unsigned int count; RECT r = {0}; WCHAR *line; + HRESULT hr; SIZE size; TRACE("iface %p, sprite %p, string %s, in_count %d, rect %s, format %#lx, color 0x%08lx.\n", @@ -775,8 +776,14 @@ static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite, black_box.bottom = black_box.top + rect->bottom - pos.y; } - ID3DXSprite_Draw(target, texture, &black_box, NULL, &pos, color); + hr = ID3DXSprite_Draw(target, texture, &black_box, NULL, &pos, color); IDirect3DTexture9_Release(texture); + if (FAILED(hr)) + { + free(results.lpCaretPos); + free(results.lpGlyphs); + goto cleanup; + } } free(results.lpCaretPos);

1 0

Zebediah Figura : quartz: Return the rect from get_default_rect() through a pointer.
by Alexandre Julliard 06 Dec '23

06 Dec '23

Module: wine Branch: master Commit: 20b1ef6ed0f701e213b48cc148da0ae6101ba7d5 URL: https://gitlab.winehq.org/wine/wine/-/commit/20b1ef6ed0f701e213b48cc148da0a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Dec 5 23:04:55 2023 -0600 quartz: Return the rect from get_default_rect() through a pointer. Notably, this avoids the incorrect use of a static variable. --- dlls/quartz/quartz_private.h | 2 +- dlls/quartz/videorenderer.c | 9 +++------ dlls/quartz/vmr9.c | 11 ++++------- dlls/quartz/window.c | 4 ++-- 4 files changed, 10 insertions(+), 16 deletions(-) diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h index 849795d9c1b..58d8bb775a9 100644 --- a/dlls/quartz/quartz_private.h +++ b/dlls/quartz/quartz_private.h @@ -108,7 +108,7 @@ struct video_window struct video_window_ops { - RECT (*get_default_rect)(struct video_window *window); + void (*get_default_rect)(struct video_window *window, RECT *rect); HRESULT (*get_current_image)(struct video_window *window, LONG *size, LONG *image); }; diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index f725a9998ce..e6735367cb3 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -199,14 +199,11 @@ static HRESULT video_renderer_connect(struct strmbase_renderer *iface, const AM_ return S_OK; } -static RECT video_renderer_get_default_rect(struct video_window *iface) +static void video_renderer_get_default_rect(struct video_window *iface, RECT *rect) { - struct video_renderer *This = impl_from_video_window(iface); - static RECT defRect; - - SetRect(&defRect, 0, 0, This->VideoWidth, This->VideoHeight); + struct video_renderer *filter = impl_from_video_window(iface); - return defRect; + SetRect(rect, 0, 0, filter->VideoWidth, filter->VideoHeight); } static const struct strmbase_renderer_ops renderer_ops = diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index e34e6cee2ba..bc4ad4898f7 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -642,15 +642,12 @@ static const struct strmbase_renderer_ops renderer_ops = .renderer_pin_query_interface = vmr_pin_query_interface, }; -static RECT vmr_get_default_rect(struct video_window *This) +static void vmr_get_default_rect(struct video_window *iface, RECT *rect) { - struct quartz_vmr *pVMR9 = impl_from_video_window(This); - const BITMAPINFOHEADER *bmiheader = get_filter_bitmap_header(pVMR9); - static RECT defRect; - - SetRect(&defRect, 0, 0, bmiheader->biWidth, bmiheader->biHeight); + struct quartz_vmr *filter = impl_from_video_window(iface); + const BITMAPINFOHEADER *bitmap_header = get_filter_bitmap_header(filter); - return defRect; + SetRect(rect, 0, 0, bitmap_header->biWidth, bitmap_header->biHeight); } static HRESULT vmr_get_current_image(struct video_window *iface, LONG *size, LONG *image) diff --git a/dlls/quartz/window.c b/dlls/quartz/window.c index 4a9c4aed8f7..02c6a826bb2 100644 --- a/dlls/quartz/window.c +++ b/dlls/quartz/window.c @@ -655,7 +655,7 @@ HRESULT WINAPI BaseControlWindowImpl_GetMinIdealImageSize(IVideoWindow *iface, L TRACE("window %p, width %p, height %p.\n", window, width, height); - rect = window->ops->get_default_rect(window); + window->ops->get_default_rect(window, &rect); *width = rect.right - rect.left; *height = rect.bottom - rect.top; return S_OK; @@ -668,7 +668,7 @@ HRESULT WINAPI BaseControlWindowImpl_GetMaxIdealImageSize(IVideoWindow *iface, L TRACE("window %p, width %p, height %p.\n", window, width, height); - rect = window->ops->get_default_rect(window); + window->ops->get_default_rect(window, &rect); *width = rect.right - rect.left; *height = rect.bottom - rect.top; return S_OK;

1 0

Zebediah Figura : quartz: Do not forward IVMRFilterConfig::SetRenderingMode() to IVMRFilterConfig9.
by Alexandre Julliard 06 Dec '23

06 Dec '23

Module: wine Branch: master Commit: 096172f27f9f7cc2d1dd4adacb5507b280589c81 URL: https://gitlab.winehq.org/wine/wine/-/commit/096172f27f9f7cc2d1dd4adacb5507… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Dec 6 13:37:17 2023 -0600 quartz: Do not forward IVMRFilterConfig::SetRenderingMode() to IVMRFilterConfig9. --- dlls/quartz/vmr9.c | 41 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index bc4ad4898f7..e0bcd970783 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -926,10 +926,47 @@ static HRESULT WINAPI VMR7FilterConfig_GetRenderingPrefs(IVMRFilterConfig *iface static HRESULT WINAPI VMR7FilterConfig_SetRenderingMode(IVMRFilterConfig *iface, DWORD mode) { struct quartz_vmr *filter = impl_from_IVMRFilterConfig(iface); + struct default_presenter *default_presenter; + HRESULT hr = S_OK; + + TRACE("filter %p, mode %lu.\n", filter, mode); + + EnterCriticalSection(&filter->renderer.filter.filter_cs); + if (filter->mode) + { + LeaveCriticalSection(&filter->renderer.filter.filter_cs); + return VFW_E_WRONG_STATE; + } + + switch (mode) + { + case VMRMode_Windowed: + case VMRMode_Windowless: + if (FAILED(hr = default_presenter_create(filter, &default_presenter))) + { + ERR("Failed to create default presenter, hr %#lx.\n", hr); + LeaveCriticalSection(&filter->renderer.filter.filter_cs); + return hr; + } + filter->allocator = &default_presenter->IVMRSurfaceAllocator9_iface; + filter->presenter = &default_presenter->IVMRImagePresenter9_iface; + IVMRImagePresenter9_AddRef(filter->presenter); - TRACE("iface %p, mode %#lx.\n", iface, mode); + IVMRSurfaceAllocator9_AdviseNotify(filter->allocator, &filter->IVMRSurfaceAllocatorNotify9_iface); + break; + case VMRMode_Renderless: + break; + default: + LeaveCriticalSection(&filter->renderer.filter.filter_cs); + return E_INVALIDARG; + } - return IVMRFilterConfig9_SetRenderingMode(&filter->IVMRFilterConfig9_iface, mode); + if (mode != VMRMode_Windowed) + video_window_cleanup(&filter->window); + + filter->mode = mode; + LeaveCriticalSection(&filter->renderer.filter.filter_cs); + return hr; } static HRESULT WINAPI VMR7FilterConfig_GetRenderingMode(IVMRFilterConfig *iface, DWORD *mode)

1 0

Zebediah Figura : quartz: Improve the IVMRFilterConfig::SetNumberOfStreams() stub.
by Alexandre Julliard 06 Dec '23

06 Dec '23

Module: wine Branch: master Commit: ecc04319e63d356ab5e23bcc860feae88a13a580 URL: https://gitlab.winehq.org/wine/wine/-/commit/ecc04319e63d356ab5e23bcc860fea… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Dec 6 13:39:53 2023 -0600 quartz: Improve the IVMRFilterConfig::SetNumberOfStreams() stub. Bring it up to parity with IVMRFilterConfig9::SetNumberOfStreams(). --- dlls/quartz/tests/vmr7.c | 76 +++++++++++++++++++++++++++--------------------- dlls/quartz/vmr9.c | 22 ++++++++++++-- 2 files changed, 63 insertions(+), 35 deletions(-) diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index c30fefbd3ab..50e3da462d2 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -54,7 +54,7 @@ static HRESULT set_mixing_mode(IBaseFilter *filter) ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IVMRFilterConfig_SetNumberOfStreams(config, 2); - todo_wine ok(hr == VFW_E_DDRAW_CAPS_NOT_SUITABLE || hr == S_OK, "Got hr %#lx.\n", hr); + ok(hr == VFW_E_DDRAW_CAPS_NOT_SUITABLE || hr == S_OK, "Got hr %#lx.\n", hr); IVMRFilterConfig_Release(config); return hr; @@ -171,7 +171,7 @@ static void test_filter_config(void) hr = IVMRFilterConfig_SetNumberOfStreams(config, 3); if (hr != VFW_E_DDRAW_CAPS_NOT_SUITABLE) { - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IVMRFilterConfig_GetNumberOfStreams(config, &count); todo_wine { @@ -502,7 +502,7 @@ static void test_enum_pins(void) if (SUCCEEDED(set_mixing_mode(filter))) { hr = IEnumPins_Next(enum1, 1, pins, NULL); - todo_wine ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); hr = IEnumPins_Reset(enum1); ok(hr == S_OK, "Got hr %#lx.\n", hr); @@ -512,8 +512,9 @@ static void test_enum_pins(void) IPin_Release(pins[0]); hr = IEnumPins_Next(enum1, 1, pins, NULL); - ok(hr == S_OK, "Got hr %#lx.\n", hr); - IPin_Release(pins[0]); + todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); + if (hr == S_OK) + IPin_Release(pins[0]); hr = IEnumPins_Next(enum1, 1, pins, NULL); ok(hr == S_FALSE, "Got hr %#lx.\n", hr); @@ -522,19 +523,21 @@ static void test_enum_pins(void) ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IEnumPins_Next(enum1, 2, pins, &count); - ok(hr == S_OK, "Got hr %#lx.\n", hr); - ok(count == 2, "Got count %lu.\n", count); + todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); + todo_wine ok(count == 2, "Got count %lu.\n", count); IPin_Release(pins[0]); - IPin_Release(pins[1]); + if (count == 2) + IPin_Release(pins[1]); hr = IEnumPins_Reset(enum1); ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IEnumPins_Next(enum1, 3, pins, &count); ok(hr == S_FALSE, "Got hr %#lx.\n", hr); - ok(count == 2, "Got count %lu.\n", count); + todo_wine ok(count == 2, "Got count %lu.\n", count); IPin_Release(pins[0]); - IPin_Release(pins[1]); + if (count == 2) + IPin_Release(pins[1]); } else skip("Mixing mode is not supported.\n"); @@ -584,12 +587,15 @@ static void test_find_pin(void) IPin_Release(pin2); hr = IBaseFilter_FindPin(filter, L"VMR Input1", &pin); - ok(hr == S_OK, "Got hr %#lx.\n", hr); - hr = IEnumPins_Next(enum_pins, 1, &pin2, NULL); - ok(hr == S_OK, "Got hr %#lx.\n", hr); - ok(pin == pin2, "Pins did not match.\n"); - IPin_Release(pin); - IPin_Release(pin2); + todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); + if (hr == S_OK) + { + hr = IEnumPins_Next(enum_pins, 1, &pin2, NULL); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(pin == pin2, "Pins did not match.\n"); + IPin_Release(pin); + IPin_Release(pin2); + } hr = IBaseFilter_FindPin(filter, L"VMR Input2", &pin); ok(hr == VFW_E_NOT_FOUND, "Got hr %#lx.\n", hr); @@ -635,26 +641,30 @@ static void test_pin_info(void) if (SUCCEEDED(set_mixing_mode(filter))) { - IBaseFilter_FindPin(filter, L"VMR Input1", &pin); - hr = IPin_QueryPinInfo(pin, &info); - ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); - ok(info.dir == PINDIR_INPUT, "Got direction %d.\n", info.dir); - ok(!wcscmp(info.achName, L"VMR Input1"), "Got name %s.\n", wine_dbgstr_w(info.achName)); - IBaseFilter_Release(info.pFilter); - - hr = IPin_QueryDirection(pin, &dir); - ok(hr == S_OK, "Got hr %#lx.\n", hr); - ok(dir == PINDIR_INPUT, "Got direction %d.\n", dir); + hr = IBaseFilter_FindPin(filter, L"VMR Input1", &pin); + todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); + if (hr == S_OK) + { + hr = IPin_QueryPinInfo(pin, &info); + ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); + ok(info.dir == PINDIR_INPUT, "Got direction %d.\n", info.dir); + ok(!wcscmp(info.achName, L"VMR Input1"), "Got name %s.\n", wine_dbgstr_w(info.achName)); + IBaseFilter_Release(info.pFilter); - hr = IPin_QueryId(pin, &id); - ok(hr == S_OK, "Got hr %#lx.\n", hr); - ok(!wcscmp(id, L"VMR Input1"), "Got id %s.\n", wine_dbgstr_w(id)); - CoTaskMemFree(id); + hr = IPin_QueryDirection(pin, &dir); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(dir == PINDIR_INPUT, "Got direction %d.\n", dir); - hr = IPin_QueryInternalConnections(pin, NULL, &count); - ok(hr == E_NOTIMPL, "Got hr %#lx.\n", hr); + hr = IPin_QueryId(pin, &id); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(!wcscmp(id, L"VMR Input1"), "Got id %s.\n", wine_dbgstr_w(id)); + CoTaskMemFree(id); - IPin_Release(pin); + hr = IPin_QueryInternalConnections(pin, NULL, &count); + ok(hr == E_NOTIMPL, "Got hr %#lx.\n", hr); + + IPin_Release(pin); + } } else skip("Mixing mode is not supported.\n"); diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index e0bcd970783..38ebfbfa3bb 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -893,9 +893,27 @@ static HRESULT WINAPI VMR7FilterConfig_SetNumberOfStreams(IVMRFilterConfig *ifac { struct quartz_vmr *filter = impl_from_IVMRFilterConfig(iface); - FIXME("filter %p, count %lu, stub!\n", filter, count); + FIXME("iface %p, count %lu, stub!\n", iface, count); - return E_NOTIMPL; + if (!count) + { + WARN("Application requested zero streams; returning E_INVALIDARG.\n"); + return E_INVALIDARG; + } + + EnterCriticalSection(&filter->renderer.filter.filter_cs); + + if (filter->stream_count) + { + LeaveCriticalSection(&filter->renderer.filter.filter_cs); + WARN("Stream count is already set; returning VFW_E_WRONG_STATE.\n"); + return VFW_E_WRONG_STATE; + } + + filter->stream_count = count; + + LeaveCriticalSection(&filter->renderer.filter.filter_cs); + return S_OK; } static HRESULT WINAPI VMR7FilterConfig_GetNumberOfStreams(IVMRFilterConfig *iface, DWORD *max)

1 0

Zebediah Figura : quartz: Do not forward IVMRWindowlessControl::SetVideoClippingWindow() to IVMRWindowlessControl9.
by Alexandre Julliard 06 Dec '23

06 Dec '23

Module: wine Branch: master Commit: edc843d36ffab840a406359832930770f27b6f65 URL: https://gitlab.winehq.org/wine/wine/-/commit/edc843d36ffab840a4063598329307… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Dec 6 13:40:54 2023 -0600 quartz: Do not forward IVMRWindowlessControl::SetVideoClippingWindow() to IVMRWindowlessControl9. --- dlls/quartz/vmr9.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 38ebfbfa3bb..38380e05b76 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -1578,10 +1578,31 @@ static HRESULT WINAPI VMR7WindowlessControl_SetAspectRatioMode(IVMRWindowlessCon static HRESULT WINAPI VMR7WindowlessControl_SetVideoClippingWindow(IVMRWindowlessControl *iface, HWND window) { struct quartz_vmr *filter = impl_from_IVMRWindowlessControl(iface); + HRESULT hr; + + TRACE("filter %p, window %p.\n", filter, window); + + if (!IsWindow(window)) + { + WARN("Invalid window %p, returning E_INVALIDARG.\n", window); + return E_INVALIDARG; + } + + EnterCriticalSection(&filter->renderer.filter.filter_cs); - TRACE("iface %p, window %p.\n", iface, window); + if (filter->renderer.sink.pin.peer) + { + LeaveCriticalSection(&filter->renderer.filter.filter_cs); + WARN("Attempt to set the clipping window while connected; returning VFW_E_WRONG_STATE.\n"); + return VFW_E_WRONG_STATE; + } - return IVMRWindowlessControl9_SetVideoClippingWindow(&filter->IVMRWindowlessControl9_iface, window); + filter->clipping_window = window; + + hr = IVMRFilterConfig_SetNumberOfStreams(&filter->IVMRFilterConfig_iface, 4); + + LeaveCriticalSection(&filter->renderer.filter.filter_cs); + return hr; } static HRESULT WINAPI VMR7WindowlessControl_RepaintVideo(IVMRWindowlessControl *iface,

1 0

Zebediah Figura : quartz: Split the VMR into two separate filters.
by Alexandre Julliard 06 Dec '23

06 Dec '23

Module: wine Branch: master Commit: dea65774ce45b1ba7bf67d807e3cfda39603d18d URL: https://gitlab.winehq.org/wine/wine/-/commit/dea65774ce45b1ba7bf67d807e3cfd… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Dec 5 21:39:32 2023 -0600 quartz: Split the VMR into two separate filters. Rewrite requires renderless mode in the VMR7, which means that it needs to actually use ddraw instead of d3d9. At that point the two will share almost no common code. Split them into separate objects which live in separate files. This commit essentially copies vmr9.c into vmr7.c, then removes the VMR7-specific interfaces from the VMR9 and vice versa. The default presenter is retained for now (but will be replaced eventually). Since the VMR7 no longer exposes IVMRSurfaceAllocatorNotify9, the relevant calls to AdviseNotify(), SetD3DDevice(), and AllocateSurfaceHelper() are changed from COM methods to direct function calls. No other change should be made. --- dlls/quartz/Makefile.in | 1 + dlls/quartz/vmr7.c | 2121 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/quartz/vmr9.c | 684 +-------------- 3 files changed, 2132 insertions(+), 674 deletions(-)

1 0