September 2018 - Wine-commits

Józef Kucia : vkd3d-shader: Correctly handle multiple clip/cull distance output registers.
by Alexandre Julliard 05 Sep '18

05 Sep '18

Module: vkd3d Branch: master Commit: 5398d65d3e459601d00415d63af06841002b3583 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5398d65d3e459601d00415d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Sep 5 13:45:29 2018 +0200 vkd3d-shader: Correctly handle multiple clip/cull distance output registers. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 45 ++++++++++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 19 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index ca463f8..1181c84 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1867,7 +1867,7 @@ struct vkd3d_dxbc_compiler { uint32_t id; enum vkd3d_component_type component_type; - bool is_spirv_array; + uint32_t array_element_mask; } *output_info; uint32_t private_output_variable[MAX_REG_OUTPUT + 1]; /* 1 entry for oDepth */ uint32_t output_setup_function_id; @@ -3306,6 +3306,7 @@ static void vkd3d_dxbc_compiler_emit_shader_signature_outputs(struct vkd3d_dxbc_ clip_distance_id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->global_stream, SpvStorageClassOutput, builtin->component_type, builtin->component_count, count); vkd3d_spirv_add_iface_variable(builder, clip_distance_id); + vkd3d_dxbc_compiler_decorate_builtin(compiler, clip_distance_id, builtin->spirv_builtin); } if (cull_distance_mask) @@ -3315,6 +3316,7 @@ static void vkd3d_dxbc_compiler_emit_shader_signature_outputs(struct vkd3d_dxbc_ cull_distance_id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->global_stream, SpvStorageClassOutput, builtin->component_type, builtin->component_count, count); vkd3d_spirv_add_iface_variable(builder, cull_distance_id); + vkd3d_dxbc_compiler_decorate_builtin(compiler, cull_distance_id, builtin->spirv_builtin); } for (i = 0; i < output_signature->element_count; ++i) @@ -3325,10 +3327,12 @@ static void vkd3d_dxbc_compiler_emit_shader_signature_outputs(struct vkd3d_dxbc_ { case VKD3D_SV_CLIP_DISTANCE: compiler->output_info[i].id = clip_distance_id; + compiler->output_info[i].array_element_mask = clip_distance_mask; break; case VKD3D_SV_CULL_DISTANCE: compiler->output_info[i].id = cull_distance_id; + compiler->output_info[i].array_element_mask = cull_distance_mask; break; default: @@ -3388,24 +3392,23 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler id = vkd3d_dxbc_compiler_emit_variable(compiler, &builder->global_stream, storage_class, component_type, output_component_count); vkd3d_spirv_add_iface_variable(builder, id); - } - if (builtin) - { - vkd3d_dxbc_compiler_decorate_builtin(compiler, id, builtin->spirv_builtin); - if (component_idx) - FIXME("Unhandled component index %u.\n", component_idx); - } - else - { - vkd3d_spirv_build_op_decorate1(builder, id, SpvDecorationLocation, reg->idx[0].offset); - if (component_idx) - vkd3d_spirv_build_op_decorate1(builder, id, SpvDecorationComponent, component_idx); + if (builtin) + { + vkd3d_dxbc_compiler_decorate_builtin(compiler, id, builtin->spirv_builtin); + if (component_idx) + FIXME("Unhandled component index %u.\n", component_idx); + } + else + { + vkd3d_spirv_build_op_decorate1(builder, id, SpvDecorationLocation, reg->idx[0].offset); + if (component_idx) + vkd3d_spirv_build_op_decorate1(builder, id, SpvDecorationComponent, component_idx); + } } compiler->output_info[signature_idx].id = id; compiler->output_info[signature_idx].component_type = component_type; - compiler->output_info[signature_idx].is_spirv_array = builtin && builtin->is_spirv_array; use_private_variable = component_type != VKD3D_TYPE_FLOAT || component_count != VKD3D_VEC4_SIZE || get_shader_output_swizzle(compiler, signature_element->register_index) != VKD3D_NO_SWIZZLE @@ -6361,10 +6364,10 @@ static void vkd3d_dxbc_compiler_emit_store_shader_output(struct vkd3d_dxbc_compi { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; uint32_t type_id, zero_id, ptr_type_id, chain_id, object_id; - uint32_t write_mask, use_mask, uninit_mask, swizzle; + uint32_t write_mask, use_mask, uninit_mask, swizzle, mask; + uint32_t output_id, indexes[1]; unsigned int component_count; unsigned int i, index; - uint32_t output_id; write_mask = output->mask & 0xff; use_mask = (output->mask >> 8) & 0xff; @@ -6392,7 +6395,7 @@ static void vkd3d_dxbc_compiler_emit_store_shader_output(struct vkd3d_dxbc_compi output_id = output_info->id; - if (!output_info->is_spirv_array) + if (!output_info->array_element_mask) { vkd3d_spirv_build_op_store(builder, output_id, val_id, SpvMemoryAccessMaskNone); return; @@ -6400,10 +6403,14 @@ static void vkd3d_dxbc_compiler_emit_store_shader_output(struct vkd3d_dxbc_compi type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_FLOAT, 1); ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, SpvStorageClassOutput, type_id); - for (i = 0, index = output->semantic_index * VKD3D_VEC4_SIZE; i < component_count; ++i, ++index) + mask = output_info->array_element_mask; + mask &= (1u << (output->semantic_index * VKD3D_VEC4_SIZE)) - 1; + for (i = 0, index = vkd3d_popcount(mask); i < VKD3D_VEC4_SIZE; ++i) { - uint32_t indexes[] = {vkd3d_dxbc_compiler_get_constant_uint(compiler, index)}; + if (!(write_mask & (VKD3DSP_WRITEMASK_0 << i))) + continue; + indexes[0] = vkd3d_dxbc_compiler_get_constant_uint(compiler, index++); chain_id = vkd3d_spirv_build_op_access_chain(builder, ptr_type_id, output_id, indexes, ARRAY_SIZE(indexes)); object_id = vkd3d_dxbc_compiler_emit_swizzle_ext(compiler, val_id,

1 0

Józef Kucia : tests: Add test for clip distance.
by Alexandre Julliard 05 Sep '18

05 Sep '18

Module: vkd3d Branch: master Commit: ee6fcba034642e831fb01dbd4cb713f68a7514f4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ee6fcba034642e831fb01db… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Sep 5 13:45:30 2018 +0200 tests: Add test for clip distance. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 577 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 577 insertions(+) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=ee6fcba034642e831fb…

1 0

Józef Kucia : tests: Add test for combined clip and cull distances.
by Alexandre Julliard 05 Sep '18

05 Sep '18

Module: vkd3d Branch: master Commit: 0a499012adfc5d247e5d69a5aafda6f823cb25bf URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0a499012adfc5d247e5d69a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Sep 5 13:45:31 2018 +0200 tests: Add test for combined clip and cull distances. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 283 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 283 insertions(+) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=0a499012adfc5d247e5…

1 0

Nikolay Sivov : opcservices: Store part properties on creation.
by Alexandre Julliard 04 Sep '18

04 Sep '18

Module: wine Branch: master Commit: 3f459d9c93c1c5c29d8a3edf198baab99c4ad786 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f459d9c93c1c5c29d8a3edf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 4 08:04:53 2018 +0300 opcservices: Store part properties on creation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/Makefile.in | 2 +- dlls/opcservices/package.c | 61 +++++++++++++++++++++++++++++++----- dlls/opcservices/tests/opcservices.c | 24 ++++++++++++++ 3 files changed, 79 insertions(+), 8 deletions(-) diff --git a/dlls/opcservices/Makefile.in b/dlls/opcservices/Makefile.in index 651cb41..47fbbe4 100644 --- a/dlls/opcservices/Makefile.in +++ b/dlls/opcservices/Makefile.in @@ -1,5 +1,5 @@ MODULE = opcservices.dll -IMPORTS = uuid +IMPORTS = uuid ole32 C_SRCS = \ factory.c \ diff --git a/dlls/opcservices/package.c b/dlls/opcservices/package.c index a3a2fab..e673f0c 100644 --- a/dlls/opcservices/package.c +++ b/dlls/opcservices/package.c @@ -23,6 +23,7 @@ #include "winbase.h" #include "wine/debug.h" +#include "wine/unicode.h" #include "opc_private.h" @@ -40,6 +41,10 @@ struct opc_part { IOpcPart IOpcPart_iface; LONG refcount; + + IOpcPartUri *name; + WCHAR *content_type; + DWORD compression_options; }; struct opc_part_set @@ -63,6 +68,24 @@ static inline struct opc_part *impl_from_IOpcPart(IOpcPart *iface) return CONTAINING_RECORD(iface, struct opc_part, IOpcPart_iface); } +static WCHAR *opc_strdupW(const WCHAR *str) +{ + WCHAR *ret = NULL; + + if (str) + { + size_t size; + + size = (strlenW(str) + 1) * sizeof(WCHAR); + ret = CoTaskMemAlloc(size); + if (ret) + memcpy(ret, str, size); + } + + return ret; +} + + static HRESULT WINAPI opc_part_QueryInterface(IOpcPart *iface, REFIID iid, void **out) { TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); @@ -97,7 +120,11 @@ static ULONG WINAPI opc_part_Release(IOpcPart *iface) TRACE("%p decreasing refcount to %u.\n", iface, refcount); if (!refcount) + { + IOpcPartUri_Release(part->name); + CoTaskMemFree(part->content_type); heap_free(part); + } return refcount; } @@ -118,16 +145,24 @@ static HRESULT WINAPI opc_part_GetContentStream(IOpcPart *iface, IStream **strea static HRESULT WINAPI opc_part_GetName(IOpcPart *iface, IOpcPartUri **name) { - FIXME("iface %p, name %p stub!\n", iface, name); + struct opc_part *part = impl_from_IOpcPart(iface); - return E_NOTIMPL; + TRACE("iface %p, name %p.\n", iface, name); + + *name = part->name; + IOpcPartUri_AddRef(*name); + + return S_OK; } static HRESULT WINAPI opc_part_GetContentType(IOpcPart *iface, LPWSTR *type) { - FIXME("iface %p, type %p stub!\n", iface, type); + struct opc_part *part = impl_from_IOpcPart(iface); - return E_NOTIMPL; + TRACE("iface %p, type %p.\n", iface, type); + + *type = opc_strdupW(part->content_type); + return *type ? S_OK : E_OUTOFMEMORY; } static HRESULT WINAPI opc_part_GetCompressionOptions(IOpcPart *iface, OPC_COMPRESSION_OPTIONS *options) @@ -149,15 +184,27 @@ static const IOpcPartVtbl opc_part_vtbl = opc_part_GetCompressionOptions, }; -static HRESULT opc_part_create(IOpcPart **out) +static HRESULT opc_part_create(IOpcPartUri *name, const WCHAR *content_type, + DWORD compression_options, IOpcPart **out) { struct opc_part *part; + if (!name) + return E_POINTER; + if (!(part = heap_alloc_zero(sizeof(*part)))) return E_OUTOFMEMORY; part->IOpcPart_iface.lpVtbl = &opc_part_vtbl; part->refcount = 1; + part->name = name; + IOpcPartUri_AddRef(name); + part->compression_options = compression_options; + if (!(part->content_type = opc_strdupW(content_type))) + { + IOpcPart_Release(&part->IOpcPart_iface); + return E_OUTOFMEMORY; + } *out = &part->IOpcPart_iface; TRACE("Created part %p.\n", *out); @@ -213,10 +260,10 @@ static HRESULT WINAPI opc_part_set_GetPart(IOpcPartSet *iface, IOpcPartUri *name static HRESULT WINAPI opc_part_set_CreatePart(IOpcPartSet *iface, IOpcPartUri *name, LPCWSTR content_type, OPC_COMPRESSION_OPTIONS compression_options, IOpcPart **part) { - FIXME("iface %p, name %p, content_type %s, compression_options %#x, part %p stub!\n", iface, name, + TRACE("iface %p, name %p, content_type %s, compression_options %#x, part %p.\n", iface, name, debugstr_w(content_type), compression_options, part); - return opc_part_create(part); + return opc_part_create(name, content_type, compression_options, part); } static HRESULT WINAPI opc_part_set_DeletePart(IOpcPartSet *iface, IOpcPartUri *name) diff --git a/dlls/opcservices/tests/opcservices.c b/dlls/opcservices/tests/opcservices.c index e257c6e..9ef44e6 100644 --- a/dlls/opcservices/tests/opcservices.c +++ b/dlls/opcservices/tests/opcservices.c @@ -36,10 +36,15 @@ static IOpcFactory *create_factory(void) static void test_package(void) { + static const WCHAR typeW[] = {'t','y','p','e','/','s','u','b','t','y','p','e',0}; + static const WCHAR uriW[] = {'/','u','r','i',0}; IOpcPartSet *partset, *partset2; + IOpcPartUri *part_uri; IOpcFactory *factory; IOpcPackage *package; + IOpcPart *part; HRESULT hr; + BOOL ret; factory = create_factory(); @@ -58,6 +63,25 @@ static void test_package(void) ok(SUCCEEDED(hr), "Failed to create a part set, hr %#x.\n", hr); ok(partset == partset2, "Expected same part set instance.\n"); + /* CreatePart */ + hr = IOpcFactory_CreatePartUri(factory, uriW, &part_uri); + ok(SUCCEEDED(hr), "Failed to create part uri, hr %#x.\n", hr); + + hr = IOpcPartSet_CreatePart(partset, NULL, typeW, OPC_COMPRESSION_NONE, &part); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IOpcPartSet_CreatePart(partset, part_uri, typeW, OPC_COMPRESSION_NONE, &part); + ok(SUCCEEDED(hr), "Failed to create a part, hr %#x.\n", hr); + + ret = FALSE; + hr = IOpcPartSet_PartExists(partset, part_uri, &ret); +todo_wine { + ok(SUCCEEDED(hr), "Unexpected hr %#x.\n", hr); + ok(ret, "Expected part to exist.\n"); +} + IOpcPartUri_Release(part_uri); + IOpcPart_Release(part); + IOpcPackage_Release(package); IOpcFactory_Release(factory);

1 0

Nikolay Sivov : opcservices: Add IOpcRelationshipSet stub.
by Alexandre Julliard 04 Sep '18

04 Sep '18

Module: wine Branch: master Commit: bde0de68fc7b95cb7ebfd266a3c6d7268fb52868 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bde0de68fc7b95cb7ebfd266… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 4 08:04:54 2018 +0300 opcservices: Add IOpcRelationshipSet stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/package.c | 150 ++++++++++++++++++++++++++++++++++- dlls/opcservices/tests/opcservices.c | 11 +++ 2 files changed, 158 insertions(+), 3 deletions(-) diff --git a/dlls/opcservices/package.c b/dlls/opcservices/package.c index e673f0c..09014ff 100644 --- a/dlls/opcservices/package.c +++ b/dlls/opcservices/package.c @@ -35,6 +35,7 @@ struct opc_package LONG refcount; IOpcPartSet *part_set; + IOpcRelationshipSet *relationship_set; }; struct opc_part @@ -53,6 +54,12 @@ struct opc_part_set LONG refcount; }; +struct opc_relationship_set +{ + IOpcRelationshipSet IOpcRelationshipSet_iface; + LONG refcount; +}; + static inline struct opc_package *impl_from_IOpcPackage(IOpcPackage *iface) { return CONTAINING_RECORD(iface, struct opc_package, IOpcPackage_iface); @@ -68,6 +75,11 @@ static inline struct opc_part *impl_from_IOpcPart(IOpcPart *iface) return CONTAINING_RECORD(iface, struct opc_part, IOpcPart_iface); } +static inline struct opc_relationship_set *impl_from_IOpcRelationshipSet(IOpcRelationshipSet *iface) +{ + return CONTAINING_RECORD(iface, struct opc_relationship_set, IOpcRelationshipSet_iface); +} + static WCHAR *opc_strdupW(const WCHAR *str) { WCHAR *ret = NULL; @@ -85,7 +97,6 @@ static WCHAR *opc_strdupW(const WCHAR *str) return ret; } - static HRESULT WINAPI opc_part_QueryInterface(IOpcPart *iface, REFIID iid, void **out) { TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); @@ -299,6 +310,128 @@ static const IOpcPartSetVtbl opc_part_set_vtbl = opc_part_set_GtEnumerator, }; +static HRESULT WINAPI opc_relationship_set_QueryInterface(IOpcRelationshipSet *iface, REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualIID(iid, &IID_IOpcRelationshipSet) || + IsEqualIID(iid, &IID_IUnknown)) + { + *out = iface; + IOpcRelationshipSet_AddRef(iface); + return S_OK; + } + + WARN("Unsupported interface %s.\n", debugstr_guid(iid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI opc_relationship_set_AddRef(IOpcRelationshipSet *iface) +{ + struct opc_relationship_set *relationship_set = impl_from_IOpcRelationshipSet(iface); + ULONG refcount = InterlockedIncrement(&relationship_set->refcount); + + TRACE("%p increasing refcount to %u.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI opc_relationship_set_Release(IOpcRelationshipSet *iface) +{ + struct opc_relationship_set *relationship_set = impl_from_IOpcRelationshipSet(iface); + ULONG refcount = InterlockedDecrement(&relationship_set->refcount); + + TRACE("%p decreasing refcount to %u.\n", iface, refcount); + + if (!refcount) + heap_free(relationship_set); + + return refcount; +} + +static HRESULT WINAPI opc_relationship_set_GetRelationship(IOpcRelationshipSet *iface, const WCHAR *id, + IOpcRelationship **relationship) +{ + FIXME("iface %p, id %s, relationship %p stub!\n", iface, debugstr_w(id), relationship); + + return E_NOTIMPL; +} + +static HRESULT WINAPI opc_relationship_set_CreateRelationship(IOpcRelationshipSet *iface, const WCHAR *id, + const WCHAR *type, IUri *target_uri, OPC_URI_TARGET_MODE target_mode, IOpcRelationship **relationship) +{ + FIXME("iface %p, id %s, type %s, target_uri %p, target_mode %d, relationship %p stub!\n", iface, debugstr_w(id), + debugstr_w(type), target_uri, target_mode, relationship); + + return E_NOTIMPL; +} + +static HRESULT WINAPI opc_relationship_set_DeleteRelationship(IOpcRelationshipSet *iface, const WCHAR *id) +{ + FIXME("iface %p, id %s stub!\n", iface, debugstr_w(id)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI opc_relationship_set_RelationshipExists(IOpcRelationshipSet *iface, const WCHAR *id, BOOL *exists) +{ + FIXME("iface %p, id %s, exists %p stub!\n", iface, debugstr_w(id), exists); + + return E_NOTIMPL; +} + +static HRESULT WINAPI opc_relationship_set_GetEnumerator(IOpcRelationshipSet *iface, + IOpcRelationshipEnumerator **enumerator) +{ + FIXME("iface %p, enumerator %p stub!\n", iface, enumerator); + + return E_NOTIMPL; +} + +static HRESULT WINAPI opc_relationship_set_GetEnumeratorForType(IOpcRelationshipSet *iface, const WCHAR *type, + IOpcRelationshipEnumerator **enumerator) +{ + FIXME("iface %p, type %s, enumerator %p stub!\n", iface, debugstr_w(type), enumerator); + + return E_NOTIMPL; +} + +static HRESULT WINAPI opc_relationship_set_GetRelationshipsContentStream(IOpcRelationshipSet *iface, IStream **stream) +{ + FIXME("iface %p, stream %p stub!\n", iface, stream); + + return E_NOTIMPL; +} + +static const IOpcRelationshipSetVtbl opc_relationship_set_vtbl = +{ + opc_relationship_set_QueryInterface, + opc_relationship_set_AddRef, + opc_relationship_set_Release, + opc_relationship_set_GetRelationship, + opc_relationship_set_CreateRelationship, + opc_relationship_set_DeleteRelationship, + opc_relationship_set_RelationshipExists, + opc_relationship_set_GetEnumerator, + opc_relationship_set_GetEnumeratorForType, + opc_relationship_set_GetRelationshipsContentStream, +}; + +static HRESULT opc_relationship_set_create(IOpcRelationshipSet **out) +{ + struct opc_relationship_set *relationship_set; + + if (!(relationship_set = heap_alloc_zero(sizeof(*relationship_set)))) + return E_OUTOFMEMORY; + + relationship_set->IOpcRelationshipSet_iface.lpVtbl = &opc_relationship_set_vtbl; + relationship_set->refcount = 1; + + *out = &relationship_set->IOpcRelationshipSet_iface; + TRACE("Created relationship set %p.\n", *out); + return S_OK; +} + static HRESULT WINAPI opc_package_QueryInterface(IOpcPackage *iface, REFIID iid, void **out) { TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); @@ -336,6 +469,8 @@ static ULONG WINAPI opc_package_Release(IOpcPackage *iface) { if (package->part_set) IOpcPartSet_Release(package->part_set); + if (package->relationship_set) + IOpcRelationshipSet_Release(package->relationship_set); heap_free(package); } @@ -368,9 +503,18 @@ static HRESULT WINAPI opc_package_GetPartSet(IOpcPackage *iface, IOpcPartSet **p static HRESULT WINAPI opc_package_GetRelationshipSet(IOpcPackage *iface, IOpcRelationshipSet **relationship_set) { - FIXME("iface %p, relationship_set %p stub!\n", iface, relationship_set); + struct opc_package *package = impl_from_IOpcPackage(iface); + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, relationship_set %p.\n", iface, relationship_set); + + if (!package->relationship_set && FAILED(hr = opc_relationship_set_create(&package->relationship_set))) + return hr; + + *relationship_set = package->relationship_set; + IOpcRelationshipSet_AddRef(*relationship_set); + + return S_OK; } static const IOpcPackageVtbl opc_package_vtbl = diff --git a/dlls/opcservices/tests/opcservices.c b/dlls/opcservices/tests/opcservices.c index 9ef44e6..118ef8f 100644 --- a/dlls/opcservices/tests/opcservices.c +++ b/dlls/opcservices/tests/opcservices.c @@ -38,6 +38,7 @@ static void test_package(void) { static const WCHAR typeW[] = {'t','y','p','e','/','s','u','b','t','y','p','e',0}; static const WCHAR uriW[] = {'/','u','r','i',0}; + IOpcRelationshipSet *relset, *relset2; IOpcPartSet *partset, *partset2; IOpcPartUri *part_uri; IOpcFactory *factory; @@ -82,6 +83,16 @@ todo_wine { IOpcPartUri_Release(part_uri); IOpcPart_Release(part); + /* Relationships */ + hr = IOpcPackage_GetRelationshipSet(package, &relset); + ok(SUCCEEDED(hr), "Failed to get relationship set, hr %#x.\n", hr); + + hr = IOpcPackage_GetRelationshipSet(package, &relset2); + ok(SUCCEEDED(hr), "Failed to get relationship set, hr %#x.\n", hr); + ok(relset == relset2, "Expected same part set instance.\n"); + IOpcRelationshipSet_Release(relset); + IOpcRelationshipSet_Release(relset2); + IOpcPackage_Release(package); IOpcFactory_Release(factory);

1 0

Nikolay Sivov : opcservices: Add IOpcRelationship stub.
by Alexandre Julliard 04 Sep '18

04 Sep '18

Module: wine Branch: master Commit: 42792e2fadca01cefa65a68af79f2ceba31da17a URL: https://source.winehq.org/git/wine.git/?a=commit;h=42792e2fadca01cefa65a68a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 4 08:04:55 2018 +0300 opcservices: Add IOpcRelationship stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/package.c | 114 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 113 insertions(+), 1 deletion(-) diff --git a/dlls/opcservices/package.c b/dlls/opcservices/package.c index 09014ff..a9b4d14 100644 --- a/dlls/opcservices/package.c +++ b/dlls/opcservices/package.c @@ -54,6 +54,12 @@ struct opc_part_set LONG refcount; }; +struct opc_relationship +{ + IOpcRelationship IOpcRelationship_iface; + LONG refcount; +}; + struct opc_relationship_set { IOpcRelationshipSet IOpcRelationshipSet_iface; @@ -80,6 +86,11 @@ static inline struct opc_relationship_set *impl_from_IOpcRelationshipSet(IOpcRel return CONTAINING_RECORD(iface, struct opc_relationship_set, IOpcRelationshipSet_iface); } +static inline struct opc_relationship *impl_from_IOpcRelationship(IOpcRelationship *iface) +{ + return CONTAINING_RECORD(iface, struct opc_relationship, IOpcRelationship_iface); +} + static WCHAR *opc_strdupW(const WCHAR *str) { WCHAR *ret = NULL; @@ -310,6 +321,107 @@ static const IOpcPartSetVtbl opc_part_set_vtbl = opc_part_set_GtEnumerator, }; +static HRESULT WINAPI opc_relationship_QueryInterface(IOpcRelationship *iface, REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualIID(iid, &IID_IOpcRelationship) || + IsEqualIID(iid, &IID_IUnknown)) + { + *out = iface; + IOpcRelationship_AddRef(iface); + return S_OK; + } + + WARN("Unsupported interface %s.\n", debugstr_guid(iid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI opc_relationship_AddRef(IOpcRelationship *iface) +{ + struct opc_relationship *relationship = impl_from_IOpcRelationship(iface); + ULONG refcount = InterlockedIncrement(&relationship->refcount); + + TRACE("%p increasing refcount to %u.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI opc_relationship_Release(IOpcRelationship *iface) +{ + struct opc_relationship *relationship = impl_from_IOpcRelationship(iface); + ULONG refcount = InterlockedDecrement(&relationship->refcount); + + TRACE("%p decreasing refcount to %u.\n", iface, refcount); + + if (!refcount) + heap_free(relationship); + + return refcount; +} + +static HRESULT WINAPI opc_relationship_GetId(IOpcRelationship *iface, WCHAR **id) +{ + FIXME("iface %p, id %p stub!\n", iface, id); + + return E_NOTIMPL; +} + +static HRESULT WINAPI opc_relationship_GetRelationshipType(IOpcRelationship *iface, WCHAR **type) +{ + FIXME("iface %p, type %p stub!\n", iface, type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI opc_relationship_GetSourceUri(IOpcRelationship *iface, IOpcUri **uri) +{ + FIXME("iface %p, uri %p stub!\n", iface, uri); + + return E_NOTIMPL; +} + +static HRESULT WINAPI opc_relationship_GetTargetUri(IOpcRelationship *iface, IUri **target) +{ + FIXME("iface %p, target %p stub!\n", iface, target); + + return E_NOTIMPL; +} + +static HRESULT WINAPI opc_relationship_GetTargetMode(IOpcRelationship *iface, OPC_URI_TARGET_MODE *target_mode) +{ + FIXME("iface %p, target_mode %p stub!\n", iface, target_mode); + + return E_NOTIMPL; +} + +static const IOpcRelationshipVtbl opc_relationship_vtbl = +{ + opc_relationship_QueryInterface, + opc_relationship_AddRef, + opc_relationship_Release, + opc_relationship_GetId, + opc_relationship_GetRelationshipType, + opc_relationship_GetSourceUri, + opc_relationship_GetTargetUri, + opc_relationship_GetTargetMode, +}; + +static HRESULT opc_relationship_create(IOpcRelationship **out) +{ + struct opc_relationship *relationship; + + if (!(relationship = heap_alloc_zero(sizeof(*relationship)))) + return E_OUTOFMEMORY; + + relationship->IOpcRelationship_iface.lpVtbl = &opc_relationship_vtbl; + relationship->refcount = 1; + + *out = &relationship->IOpcRelationship_iface; + TRACE("Created relationship %p.\n", *out); + return S_OK; +} + static HRESULT WINAPI opc_relationship_set_QueryInterface(IOpcRelationshipSet *iface, REFIID iid, void **out) { TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); @@ -363,7 +475,7 @@ static HRESULT WINAPI opc_relationship_set_CreateRelationship(IOpcRelationshipSe FIXME("iface %p, id %s, type %s, target_uri %p, target_mode %d, relationship %p stub!\n", iface, debugstr_w(id), debugstr_w(type), target_uri, target_mode, relationship); - return E_NOTIMPL; + return opc_relationship_create(relationship); } static HRESULT WINAPI opc_relationship_set_DeleteRelationship(IOpcRelationshipSet *iface, const WCHAR *id)

1 0

Nikolay Sivov : opcservices: Implement IOpcPart::GetRelationshipSet().
by Alexandre Julliard 04 Sep '18

04 Sep '18

Module: wine Branch: master Commit: e062281259ca162281afdce7805b76ce03d9aa6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e062281259ca162281afdce7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 4 08:04:56 2018 +0300 opcservices: Implement IOpcPart::GetRelationshipSet(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/package.c | 18 ++++++++++++++++-- dlls/opcservices/tests/opcservices.c | 9 +++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/opcservices/package.c b/dlls/opcservices/package.c index a9b4d14..cd4741d 100644 --- a/dlls/opcservices/package.c +++ b/dlls/opcservices/package.c @@ -46,6 +46,7 @@ struct opc_part IOpcPartUri *name; WCHAR *content_type; DWORD compression_options; + IOpcRelationshipSet *relationship_set; }; struct opc_part_set @@ -91,6 +92,8 @@ static inline struct opc_relationship *impl_from_IOpcRelationship(IOpcRelationsh return CONTAINING_RECORD(iface, struct opc_relationship, IOpcRelationship_iface); } +static HRESULT opc_relationship_set_create(IOpcRelationshipSet **relationship_set); + static WCHAR *opc_strdupW(const WCHAR *str) { WCHAR *ret = NULL; @@ -143,6 +146,8 @@ static ULONG WINAPI opc_part_Release(IOpcPart *iface) if (!refcount) { + if (part->relationship_set) + IOpcRelationshipSet_Release(part->relationship_set); IOpcPartUri_Release(part->name); CoTaskMemFree(part->content_type); heap_free(part); @@ -153,9 +158,18 @@ static ULONG WINAPI opc_part_Release(IOpcPart *iface) static HRESULT WINAPI opc_part_GetRelationshipSet(IOpcPart *iface, IOpcRelationshipSet **relationship_set) { - FIXME("iface %p, relationship_set %p stub!\n", iface, relationship_set); + struct opc_part *part = impl_from_IOpcPart(iface); + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, relationship_set %p.\n", iface, relationship_set); + + if (!part->relationship_set && FAILED(hr = opc_relationship_set_create(&part->relationship_set))) + return hr; + + *relationship_set = part->relationship_set; + IOpcRelationshipSet_AddRef(*relationship_set); + + return S_OK; } static HRESULT WINAPI opc_part_GetContentStream(IOpcPart *iface, IStream **stream) diff --git a/dlls/opcservices/tests/opcservices.c b/dlls/opcservices/tests/opcservices.c index 118ef8f..8ab7f39 100644 --- a/dlls/opcservices/tests/opcservices.c +++ b/dlls/opcservices/tests/opcservices.c @@ -74,6 +74,15 @@ static void test_package(void) hr = IOpcPartSet_CreatePart(partset, part_uri, typeW, OPC_COMPRESSION_NONE, &part); ok(SUCCEEDED(hr), "Failed to create a part, hr %#x.\n", hr); + hr = IOpcPart_GetRelationshipSet(part, &relset); + ok(SUCCEEDED(hr), "Failed to get relationship set, hr %#x.\n", hr); + + hr = IOpcPart_GetRelationshipSet(part, &relset2); + ok(SUCCEEDED(hr), "Failed to get relationship set, hr %#x.\n", hr); + ok(relset == relset2, "Expected same part set instance.\n"); + IOpcRelationshipSet_Release(relset); + IOpcRelationshipSet_Release(relset2); + ret = FALSE; hr = IOpcPartSet_PartExists(partset, part_uri, &ret); todo_wine {

1 0

Nikolay Sivov : opcservices: Partially implement file-based stream.
by Alexandre Julliard 04 Sep '18

04 Sep '18

Module: wine Branch: master Commit: 07da138e6de4661e7dc7c1f7a8341c1a69b88265 URL: https://source.winehq.org/git/wine.git/?a=commit;h=07da138e6de4661e7dc7c1f7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 4 08:04:57 2018 +0300 opcservices: Partially implement file-based stream. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/factory.c | 252 ++++++++++++++++++++++++++++++++++- dlls/opcservices/tests/opcservices.c | 98 ++++++++++++++ 2 files changed, 348 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=07da138e6de4661e7dc7…

1 0

Nikolay Sivov : opcservices: Remove unnecessary trace message.
by Alexandre Julliard 04 Sep '18

04 Sep '18

Module: wine Branch: master Commit: 3b4985066bc6f695472dd3121a8699751bb18473 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b4985066bc6f695472dd312… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 4 08:04:58 2018 +0300 opcservices: Remove unnecessary trace message. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/factory.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/opcservices/factory.c b/dlls/opcservices/factory.c index ca46d0a..7d72b39 100644 --- a/dlls/opcservices/factory.c +++ b/dlls/opcservices/factory.c @@ -465,7 +465,6 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD reason, void *reserved) HRESULT WINAPI DllRegisterServer(void) { - FIXME("\n"); return __wine_register_resources( OPC_hInstance ); }

1 0

Zebediah Figura : msi/tests: Remove some workarounds in test_publish_assemblies().
by Alexandre Julliard 04 Sep '18

04 Sep '18

Module: wine Branch: master Commit: 9a96657910c2ce30f6f8492bdd562932d63ba430 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a96657910c2ce30f6f8492b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Sep 3 19:17:55 2018 -0500 msi/tests: Remove some workarounds in test_publish_assemblies(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/action.c | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index cb8514d..57044bf 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -6192,11 +6192,6 @@ static void test_publish_assemblies(void) skip("Not enough rights to perform tests\n"); goto done; } - if (r == ERROR_INSTALL_FAILURE) - { - skip("No support for installing side-by-side assemblies\n"); - goto done; - } ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); res = RegOpenKeyA(HKEY_CURRENT_USER, path_dotnet, &hkey); @@ -6211,23 +6206,20 @@ static void test_publish_assemblies(void) RegCloseKey(hkey); res = RegOpenKeyA(HKEY_CURRENT_USER, path_win32, &hkey); - ok(res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND /* win2k without sxs support */, - "Expected ERROR_SUCCESS, got %d\n", res); - if (res == ERROR_SUCCESS) CHECK_REG_STR(hkey, name_win32, "rcHQPHq?CA(a)Uv-XqMI1e>}NJjwR'%D9v1p!v{WV(%"); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + CHECK_REG_STR(hkey, name_win32, "rcHQPHq?CA(a)Uv-XqMI1e>}NJjwR'%D9v1p!v{WV(%"); RegCloseKey(hkey); path = (is_wow64 || is_64bit) ? path_win32_local_wow64 : path_win32_local; res = RegOpenKeyA(HKEY_CURRENT_USER, path, &hkey); - ok(res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND /* win2k without sxs support */, - "Expected ERROR_SUCCESS, got %d\n", res); - if (res == ERROR_SUCCESS) CHECK_REG_STR(hkey, name_win32_local, "rcHQPHq?CA(a)Uv-XqMI1e>C)Uvlj*53A)u(QQ9=)X!"); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + CHECK_REG_STR(hkey, name_win32_local, "rcHQPHq?CA(a)Uv-XqMI1e>C)Uvlj*53A)u(QQ9=)X!"); RegCloseKey(hkey); r = MsiInstallProductA(msifile, "REMOVE=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); res = RegOpenKeyA(HKEY_CURRENT_USER, path_dotnet, &hkey); - ok(res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND, "got %d\n", res); if (res == ERROR_SUCCESS) { res = RegDeleteValueA(hkey, name_dotnet); @@ -6240,7 +6232,6 @@ static void test_publish_assemblies(void) ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); res = RegOpenKeyA(HKEY_CURRENT_USER, path_win32, &hkey); - ok(res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND, "got %d\n", res); if (res == ERROR_SUCCESS) { res = RegDeleteValueA(hkey, name_win32); @@ -6274,23 +6265,20 @@ static void test_publish_assemblies(void) RegCloseKey(hkey); res = RegOpenKeyExA(HKEY_CLASSES_ROOT, classes_path_win32, 0, access, &hkey); - ok(res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND /* win2k without sxs support */, - "Expected ERROR_SUCCESS, got %d\n", res); - if (res == ERROR_SUCCESS) CHECK_REG_STR(hkey, name_win32, "rcHQPHq?CA(a)Uv-XqMI1e>}NJjwR'%D9v1p!v{WV(%"); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + CHECK_REG_STR(hkey, name_win32, "rcHQPHq?CA(a)Uv-XqMI1e>}NJjwR'%D9v1p!v{WV(%"); RegCloseKey(hkey); path = (is_wow64 || is_64bit) ? classes_path_win32_local_wow64 : classes_path_win32_local; res = RegOpenKeyExA(HKEY_CLASSES_ROOT, path, 0, access, &hkey); - ok(res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND /* win2k without sxs support */, - "Expected ERROR_SUCCESS, got %d\n", res); - if (res == ERROR_SUCCESS) CHECK_REG_STR(hkey, name_win32_local, "rcHQPHq?CA(a)Uv-XqMI1e>C)Uvlj*53A)u(QQ9=)X!"); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + CHECK_REG_STR(hkey, name_win32_local, "rcHQPHq?CA(a)Uv-XqMI1e>C)Uvlj*53A)u(QQ9=)X!"); RegCloseKey(hkey); r = MsiInstallProductA(msifile, "REMOVE=ALL ALLUSERS=1"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); res = RegOpenKeyA(HKEY_CLASSES_ROOT, classes_path_dotnet, &hkey); - ok(res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND, "got %d\n", res); if (res == ERROR_SUCCESS) { res = RegDeleteValueA(hkey, name_dotnet); @@ -6303,7 +6291,6 @@ static void test_publish_assemblies(void) ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); res = RegOpenKeyA(HKEY_CLASSES_ROOT, classes_path_win32, &hkey); - ok(res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND, "got %d\n", res); if (res == ERROR_SUCCESS) { res = RegDeleteValueA(hkey, name_win32);

1 0