November 2018 - Wine-commits

Józef Kucia : vkd3d: Allow depth rendering without pixel shader.
by Alexandre Julliard 15 Nov '18

15 Nov '18

Module: vkd3d Branch: master Commit: a39d2aa3a850b237bbc23ff0b870ce11297f99d4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a39d2aa3a850b237bbc23ff… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 15 16:32:38 2018 +0100 vkd3d: Allow depth rendering without pixel shader. 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/state.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 35b9000..bf4eee9 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1893,6 +1893,17 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s HRESULT hr; int ret; + static const DWORD default_ps_code[] = + { +#if 0 + ps_4_0 + ret +#endif + 0x43425844, 0x19cbf606, 0x18f562b9, 0xdaeed4db, 0xc324aa46, 0x00000001, 0x00000060, 0x00000003, + 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x00000008, 0x00000000, 0x00000008, 0x52444853, 0x0000000c, 0x00000040, 0x00000003, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE default_ps = {default_ps_code, sizeof(default_ps_code)}; static const struct { enum VkShaderStageFlagBits stage; @@ -1984,6 +1995,15 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s graphics->attachment_references[0].attachment = 0; graphics->attachment_references[0].layout = depth_layout; ++graphics->rt_idx; + + if (!desc->PS.pShaderBytecode) + { + if (FAILED(hr = create_shader_stage(device, &graphics->stages[graphics->stage_count], + VK_SHADER_STAGE_FRAGMENT_BIT, &default_ps, NULL, NULL))) + goto fail; + + ++graphics->stage_count; + } } for (i = 0; i < rt_count; ++i)

1 0

Józef Kucia : tests: Add test for depth rendering without pixel shader.
by Alexandre Julliard 15 Nov '18

15 Nov '18

Module: vkd3d Branch: master Commit: 08ff23a0b12b35f64343bea1f3d2e5b45c398dfc URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=08ff23a0b12b35f64343bea… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 15 16:32:39 2018 +0100 tests: Add test for depth rendering without pixel shader. 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 | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index e98dbfa..7fb0b41 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -4792,6 +4792,105 @@ static void test_scissor(void) destroy_test_context(&context); } +static void test_draw_depth_no_ps(void) +{ + D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; + ID3D12GraphicsCommandList *command_list; + D3D12_INPUT_LAYOUT_DESC input_layout; + struct depth_stencil_resource ds; + struct test_context_desc desc; + D3D12_VERTEX_BUFFER_VIEW vbv; + struct test_context context; + ID3D12CommandQueue *queue; + ID3D12Resource *vb; + HRESULT hr; + + static const D3D12_INPUT_ELEMENT_DESC layout_desc[] = + { + {"POSITION", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 0, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + }; + static const struct + { + struct vec4 position; + } + quad[] = + { + {{-1.0f, -1.0f, 0.5f, 1.0f}}, + {{-1.0f, 1.0f, 0.5f, 1.0f}}, + {{ 1.0f, -1.0f, 0.5f, 1.0f}}, + {{ 1.0f, 1.0f, 0.5f, 1.0f}}, + }; + static const DWORD vs_code[] = + { +#if 0 + void main(float4 in_position : POSITION, out float4 out_position : SV_POSITION) + { + out_position = in_position; + } +#endif + 0x43425844, 0xa7a2f22d, 0x83ff2560, 0xe61638bd, 0x87e3ce90, 0x00000001, 0x000000d8, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x49534f50, 0x4e4f4954, 0xababab00, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x52444853, 0x0000003c, 0x00010040, + 0x0000000f, 0x0300005f, 0x001010f2, 0x00000000, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, + 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE vs = {vs_code, sizeof(vs_code)}; + + memset(&desc, 0, sizeof(desc)); + desc.no_render_target = true; + if (!init_test_context(&context, &desc)) + return; + command_list = context.list; + queue = context.queue; + + vb = create_upload_buffer(context.device, sizeof(quad), quad); + + vbv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb); + vbv.StrideInBytes = sizeof(*quad); + vbv.SizeInBytes = sizeof(quad); + + init_depth_stencil(&ds, context.device, 640, 480, 1, DXGI_FORMAT_D32_FLOAT, 0, NULL); + set_viewport(&context.viewport, 0.0f, 0.0f, 640.0f, 480.0f, 0.0f, 1.0f); + set_rect(&context.scissor_rect, 0, 0, 640, 480); + + context.root_signature = create_empty_root_signature(context.device, + D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT); + input_layout.pInputElementDescs = layout_desc; + input_layout.NumElements = ARRAY_SIZE(layout_desc); + init_pipeline_state_desc(&pso_desc, context.root_signature, 0, &vs, NULL, &input_layout); + memset(&pso_desc.PS, 0, sizeof(pso_desc.PS)); + pso_desc.NumRenderTargets = 0; + pso_desc.DSVFormat = DXGI_FORMAT_D32_FLOAT; + pso_desc.DepthStencilState.DepthEnable = TRUE; + pso_desc.DepthStencilState.DepthWriteMask = D3D12_DEPTH_WRITE_MASK_ALL; + pso_desc.DepthStencilState.DepthFunc = D3D12_COMPARISON_FUNC_ALWAYS; + hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + ok(hr == S_OK, "Failed to create graphics pipeline state, hr %#x.\n", hr); + + ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, ds.dsv_handle, + D3D12_CLEAR_FLAG_DEPTH, 1.0f, 0, 0, NULL); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 0, NULL, FALSE, &ds.dsv_handle); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 1, &vbv); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0); + + transition_resource_state(command_list, ds.texture, + D3D12_RESOURCE_STATE_DEPTH_WRITE, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_float(ds.texture, 0, queue, command_list, 0.5f, 1); + + destroy_depth_stencil(&ds); + ID3D12Resource_Release(vb); + destroy_test_context(&context); +} + static void test_draw_depth_only(void) { D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; @@ -21533,6 +21632,7 @@ START_TEST(d3d12) run_test(test_fragment_coords); run_test(test_fractional_viewports); run_test(test_scissor); + run_test(test_draw_depth_no_ps); run_test(test_draw_depth_only); run_test(test_draw_uav_only); run_test(test_texture_resource_barriers);

1 0

Józef Kucia : vkd3d-shader: Implement shader visibility for UAV counters.
by Alexandre Julliard 15 Nov '18

15 Nov '18

Module: vkd3d Branch: master Commit: 7decb65f54246172da64e36ea81fb047d507c34c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7decb65f54246172da64e36… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 15 16:32:40 2018 +0100 vkd3d-shader: Implement shader visibility for UAV counters. 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> --- include/vkd3d_shader.h | 1 + libs/vkd3d-shader/spirv.c | 4 +++- libs/vkd3d/state.c | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index c0d1f65..7d9bf70 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -111,6 +111,7 @@ struct vkd3d_shader_combined_resource_sampler struct vkd3d_shader_uav_counter_binding { unsigned int register_index; /* u# */ + enum vkd3d_shader_visibility shader_visibility; struct vkd3d_shader_descriptor_binding binding; unsigned int offset; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 1655bf3..12fa300 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2086,10 +2086,12 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor { const struct vkd3d_shader_uav_counter_binding *current = &shader_interface->uav_counters[i]; + if (!vkd3d_dxbc_compiler_check_shader_visibility(compiler, current->shader_visibility)) + continue; + if (current->offset) FIXME("Atomic counter offsets are not supported yet.\n"); - /* FIXME: Implement shader visibility for UAV counters. */ if (current->register_index == reg_idx) return current->binding; } diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index bf4eee9..3ee602f 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1367,6 +1367,7 @@ static HRESULT d3d12_pipeline_state_init_compute_uav_counters(struct d3d12_pipel continue; state->uav_counters[j].register_index = i; + state->uav_counters[j].shader_visibility = VKD3D_SHADER_VISIBILITY_COMPUTE; state->uav_counters[j].binding.set = context.set_index; state->uav_counters[j].binding.binding = context.descriptor_binding;

1 0

Józef Kucia : vkd3d: Use VkDeviceSize for buffer view offset and range (Coverity).
by Alexandre Julliard 15 Nov '18

15 Nov '18

Module: vkd3d Branch: master Commit: 06c3d1779e42dc12ddf29697a3f797c58df26c25 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=06c3d1779e42dc12ddf2969… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 15 16:32:41 2018 +0100 vkd3d: Use VkDeviceSize for buffer view offset and range (Coverity). 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/resource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index bfbbad5..56af010 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1482,8 +1482,8 @@ static bool vkd3d_create_buffer_view(struct d3d12_device *device, { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; const struct vkd3d_format *format; + VkDeviceSize element_size; struct vkd3d_view *object; - unsigned int element_size; VkBufferView vk_view; if (view_format == DXGI_FORMAT_R32_TYPELESS && (flags & VKD3D_VIEW_RAW_BUFFER))

1 0

Sven Baars : mf: Add a trace to MFCreateTopology.
by Alexandre Julliard 14 Nov '18

14 Nov '18

Module: wine Branch: master Commit: d1a37bfa5725d64eeee5cc23f6921862eef559f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1a37bfa5725d64eeee5cc23… Author: Sven Baars <sven.wine(a)gmail.com> Date: Tue Nov 13 23:20:44 2018 +0100 mf: Add a trace to MFCreateTopology. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/topology.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index 924d386..e8389cf 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -507,6 +507,8 @@ HRESULT WINAPI MFCreateTopology(IMFTopology **topology) { mftopology *object; + TRACE("(%p)\n", topology); + if (!topology) return E_POINTER;

1 0

Alistair Leslie-Hughes : advapi32: Add DECL_HOTPATCH to registry functions.
by Alexandre Julliard 14 Nov '18

14 Nov '18

Module: wine Branch: master Commit: cb8353b6e8d54ddab8ba0a54e9c9d411b7f2d09c URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb8353b6e8d54ddab8ba0a54… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 13 22:56:29 2018 +0000 advapi32: Add DECL_HOTPATCH to registry functions. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46135 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/registry.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index b537f69..3018372 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -363,7 +363,7 @@ LSTATUS WINAPI RegOverridePredefKey( HKEY hkey, HKEY override ) * * See RegCreateKeyExA. */ -LSTATUS WINAPI RegCreateKeyExW( HKEY hkey, LPCWSTR name, DWORD reserved, LPWSTR class, +LSTATUS WINAPI DECLSPEC_HOTPATCH RegCreateKeyExW( HKEY hkey, LPCWSTR name, DWORD reserved, LPWSTR class, DWORD options, REGSAM access, SECURITY_ATTRIBUTES *sa, PHKEY retkey, LPDWORD dispos ) { @@ -410,7 +410,7 @@ LSTATUS WINAPI RegCreateKeyExW( HKEY hkey, LPCWSTR name, DWORD reserved, LPWSTR * FIXME * MAXIMUM_ALLOWED in access mask not supported by server */ -LSTATUS WINAPI RegCreateKeyExA( HKEY hkey, LPCSTR name, DWORD reserved, LPSTR class, +LSTATUS WINAPI DECLSPEC_HOTPATCH RegCreateKeyExA( HKEY hkey, LPCSTR name, DWORD reserved, LPSTR class, DWORD options, REGSAM access, SECURITY_ATTRIBUTES *sa, PHKEY retkey, LPDWORD dispos ) { @@ -516,7 +516,7 @@ LSTATUS WINAPI RegCreateKeyTransactedA( HKEY hkey, LPCSTR name, DWORD reserved, * * See RegOpenKeyExA. */ -LSTATUS WINAPI RegOpenKeyExW( HKEY hkey, LPCWSTR name, DWORD options, REGSAM access, PHKEY retkey ) +LSTATUS WINAPI DECLSPEC_HOTPATCH RegOpenKeyExW( HKEY hkey, LPCWSTR name, DWORD options, REGSAM access, PHKEY retkey ) { OBJECT_ATTRIBUTES attr; UNICODE_STRING nameW; @@ -1333,7 +1333,7 @@ LSTATUS WINAPI RegDeleteKeyA( HKEY hkey, LPCSTR name ) * Success: ERROR_SUCCESS * Failure: Error code */ -LSTATUS WINAPI RegSetValueExW( HKEY hkey, LPCWSTR name, DWORD reserved, +LSTATUS WINAPI DECLSPEC_HOTPATCH RegSetValueExW( HKEY hkey, LPCWSTR name, DWORD reserved, DWORD type, const BYTE *data, DWORD count ) { UNICODE_STRING nameW; @@ -1365,7 +1365,7 @@ LSTATUS WINAPI RegSetValueExW( HKEY hkey, LPCWSTR name, DWORD reserved, * win95 does not care about count for REG_SZ and finds out the len by itself (js) * NT does definitely care (aj) */ -LSTATUS WINAPI RegSetValueExA( HKEY hkey, LPCSTR name, DWORD reserved, DWORD type, +LSTATUS WINAPI DECLSPEC_HOTPATCH RegSetValueExA( HKEY hkey, LPCSTR name, DWORD reserved, DWORD type, const BYTE *data, DWORD count ) { ANSI_STRING nameA; @@ -1759,7 +1759,7 @@ static DWORD query_perf_data(const WCHAR *query, DWORD *type, void *data, DWORD * * See RegQueryValueExA. */ -LSTATUS WINAPI RegQueryValueExW( HKEY hkey, LPCWSTR name, LPDWORD reserved, LPDWORD type, +LSTATUS WINAPI DECLSPEC_HOTPATCH RegQueryValueExW( HKEY hkey, LPCWSTR name, LPDWORD reserved, LPDWORD type, LPBYTE data, LPDWORD count ) { NTSTATUS status;

1 0

Zebediah Figura : rpcrt4: Write type format strings for coclasses.
by Alexandre Julliard 14 Nov '18

14 Nov '18

Module: wine Branch: master Commit: 5d44b1d4bd21b6f36bc50bdef1e7afaa0f6d4b83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d44b1d4bd21b6f36bc50bde… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 14 08:47:59 2018 -0600 rpcrt4: Write type format strings for coclasses. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=19016 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/ndr_typelib.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/rpcrt4/ndr_typelib.c b/dlls/rpcrt4/ndr_typelib.c index 215ea7d..8a08ad9 100644 --- a/dlls/rpcrt4/ndr_typelib.c +++ b/dlls/rpcrt4/ndr_typelib.c @@ -324,6 +324,32 @@ static size_t write_ip_tfs(unsigned char *str, size_t *len, const GUID *iid) return off; } +static void get_default_iface(ITypeInfo *typeinfo, WORD count, GUID *iid) +{ + ITypeInfo *refinfo; + HREFTYPE reftype; + TYPEATTR *attr; + int flags, i; + + for (i = 0; i < count; ++i) + { + ITypeInfo_GetImplTypeFlags(typeinfo, i, &flags); + if (flags & IMPLTYPEFLAG_FDEFAULT) + break; + } + + /* If no interface was explicitly marked default, choose the first one. */ + if (i == count) + i = 0; + + ITypeInfo_GetRefTypeOfImplType(typeinfo, i, &reftype); + ITypeInfo_GetRefTypeInfo(typeinfo, reftype, &refinfo); + ITypeInfo_GetTypeAttr(refinfo, &attr); + *iid = attr->guid; + ITypeInfo_ReleaseTypeAttr(refinfo, attr); + ITypeInfo_Release(refinfo); +} + static size_t write_pointer_tfs(ITypeInfo *typeinfo, unsigned char *str, size_t *len, TYPEDESC *desc, BOOL toplevel, BOOL onstack) { @@ -331,6 +357,7 @@ static size_t write_pointer_tfs(ITypeInfo *typeinfo, unsigned char *str, size_t ref, off = *len; ITypeInfo *refinfo; TYPEATTR *attr; + GUID guid; if (desc->vt == VT_USERDEFINED) { @@ -358,6 +385,10 @@ static size_t write_pointer_tfs(ITypeInfo *typeinfo, unsigned char *str, case TKIND_DISPATCH: write_ip_tfs(str, len, &attr->guid); break; + case TKIND_COCLASS: + get_default_iface(refinfo, attr->cImplTypes, &guid); + write_ip_tfs(str, len, &guid); + break; case TKIND_ALIAS: off = write_pointer_tfs(refinfo, str, len, &attr->tdescAlias, toplevel, onstack); break;

1 0

Sebastian Lackner : oleaut32: Pass a HREFTYPE to get_iface_guid.
by Alexandre Julliard 14 Nov '18

14 Nov '18

Module: wine Branch: master Commit: ab6d4a9d3dcd8fa6e2f275ae748d015fbeb8e52b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab6d4a9d3dcd8fa6e2f275ae… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Nov 14 08:48:00 2018 -0600 oleaut32: Pass a HREFTYPE to get_iface_guid. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index b4d7f7c..6474b51 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -6567,13 +6567,13 @@ static HRESULT typedescvt_to_variantvt(ITypeInfo *tinfo, const TYPEDESC *tdesc, return hr; } -static HRESULT get_iface_guid(ITypeInfo *tinfo, const TYPEDESC *tdesc, GUID *guid) +static HRESULT get_iface_guid(ITypeInfo *tinfo, HREFTYPE href, GUID *guid) { ITypeInfo *tinfo2; TYPEATTR *tattr; HRESULT hres; - hres = ITypeInfo_GetRefTypeInfo(tinfo, tdesc->u.hreftype, &tinfo2); + hres = ITypeInfo_GetRefTypeInfo(tinfo, href, &tinfo2); if(FAILED(hres)) return hres; @@ -6585,7 +6585,7 @@ static HRESULT get_iface_guid(ITypeInfo *tinfo, const TYPEDESC *tdesc, GUID *gui switch(tattr->typekind) { case TKIND_ALIAS: - hres = get_iface_guid(tinfo2, &tattr->tdescAlias, guid); + hres = get_iface_guid(tinfo2, tattr->tdescAlias.u.hreftype, guid); break; case TKIND_INTERFACE: @@ -7299,7 +7299,10 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( IUnknown *userdefined_iface; GUID guid; - hres = get_iface_guid((ITypeInfo*)iface, tdesc->vt == VT_PTR ? tdesc->u.lptdesc : tdesc, &guid); + if (tdesc->vt == VT_PTR) + tdesc = tdesc->u.lptdesc; + + hres = get_iface_guid((ITypeInfo*)iface, tdesc->u.hreftype, &guid); if(FAILED(hres)) break;

1 0

Zebediah Figura : oleaut32: Handle coclasses in ITypeInfo_Invoke().
by Alexandre Julliard 14 Nov '18

14 Nov '18

Module: wine Branch: master Commit: 94f4b49d78f8b17bfd95826c653b7513dc1522b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94f4b49d78f8b17bfd95826c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 14 08:48:01 2018 -0600 oleaut32: Handle coclasses in ITypeInfo_Invoke(). Based on a patch by Sebastian Lackner. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39799 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/tmarshal.c | 2 +- dlls/oleaut32/typelib.c | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 4049d19..e1564d5 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -2591,7 +2591,7 @@ static void test_typelibmarshal(void) dispparams.rgvarg = vararg; VariantInit(&varresult); hr = IDispatch_Invoke(pDispatch, DISPID_TM_COCLASS, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL); - todo_wine ok_ole_success(hr, IDispatch_Invoke); + ok_ole_success(hr, IDispatch_Invoke); ok(excepinfo.wCode == 0x0 && excepinfo.scode == S_OK, "EXCEPINFO differs from expected: wCode = 0x%x, scode = 0x%08x\n", excepinfo.wCode, excepinfo.scode); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 6474b51..f32bed3 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -6572,6 +6572,7 @@ static HRESULT get_iface_guid(ITypeInfo *tinfo, HREFTYPE href, GUID *guid) ITypeInfo *tinfo2; TYPEATTR *tattr; HRESULT hres; + int flags, i; hres = ITypeInfo_GetRefTypeInfo(tinfo, href, &tinfo2); if(FAILED(hres)) @@ -6593,6 +6594,22 @@ static HRESULT get_iface_guid(ITypeInfo *tinfo, HREFTYPE href, GUID *guid) *guid = tattr->guid; break; + case TKIND_COCLASS: + for (i = 0; i < tattr->cImplTypes; i++) + { + ITypeInfo_GetImplTypeFlags(tinfo2, i, &flags); + if (flags & IMPLTYPEFLAG_FDEFAULT) + break; + } + + if (i == tattr->cImplTypes) + i = 0; + + hres = ITypeInfo_GetRefTypeOfImplType(tinfo2, i, &href); + if (SUCCEEDED(hres)) + hres = get_iface_guid(tinfo2, href, guid); + break; + default: ERR("Unexpected typekind %d\n", tattr->typekind); hres = E_UNEXPECTED;

1 0

Zebediah Figura : oleaut32/tests: Add some tests for marshalling of coclasses.
by Alexandre Julliard 14 Nov '18

14 Nov '18

Module: wine Branch: master Commit: 2cba0ed944261577530826d5bfb707718fdaa999 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2cba0ed944261577530826d5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 14 08:48:02 2018 -0600 oleaut32/tests: Add some tests for marshalling of coclasses. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/tmarshal.c | 448 ++++++++++++++++++++++++++++++++++++--- dlls/oleaut32/tests/tmarshal.idl | 57 ++++- 2 files changed, 477 insertions(+), 28 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2cba0ed9442615775308…

1 0