wine-commits March 2019

wine-commits@winehq.org

2 participants
1097 discussions

Józef Kucia : tests: Add test for SRV component mapping.
by Alexandre Julliard 22 Mar '19

22 Mar '19

Module: vkd3d Branch: master Commit: 7175a8282185ef01fe4a0459b6d417a5cccc3180 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7175a8282185ef01fe4a045… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 22 15:11:38 2019 +0100 tests: Add test for SRV component mapping. 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 | 247 +++++++++++++++++++++++++++++++++++++++++++++++ tests/d3d12_test_utils.h | 2 + 2 files changed, 249 insertions(+) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=7175a8282185ef01fe4…

1 0

Józef Kucia : vkd3d: Implement component mapping for SRVs.
by Alexandre Julliard 22 Mar '19

22 Mar '19

Module: vkd3d Branch: master Commit: eb741c9ecd6b764968b47c6481e47a4dd5a1e20c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=eb741c9ecd6b764968b47c6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 22 15:11:37 2019 +0100 vkd3d: Implement component mapping for SRVs. 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_d3d12.idl | 4 ++ libs/vkd3d/resource.c | 105 ++++++++++++++++++++++++++++++++++++++++++--- libs/vkd3d/utils.c | 31 +++++++++++++ libs/vkd3d/vkd3d_private.h | 1 + 4 files changed, 136 insertions(+), 5 deletions(-) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 9d5fd73..e3f9df0 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -931,6 +931,10 @@ cpp_quote(" | (((w) & D3D12_SHADER_COMPONENT_MAPPING_MASK) << (D3D12_SHAD cpp_quote(" | D3D12_SHADER_COMPONENT_MAPPING_ALWAYS_SET_BIT_AVOIDING_ZEROMEM_MISTAKES)") cpp_quote("#define D3D12_DEFAULT_SHADER_4_COMPONENT_MAPPING D3D12_ENCODE_SHADER_4_COMPONENT_MAPPING(0, 1, 2, 3)") +cpp_quote("#define D3D12_DECODE_SHADER_4_COMPONENT_MAPPING(i, mapping) \\") +cpp_quote(" ((D3D12_SHADER_COMPONENT_MAPPING)(mapping >> (i * D3D12_SHADER_COMPONENT_MAPPING_SHIFT) \\") +cpp_quote(" & D3D12_SHADER_COMPONENT_MAPPING_MASK))") + typedef struct D3D12_BUFFER_SRV { UINT64 FirstElement; diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 1d13be5..1cfc9b3 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1618,10 +1618,10 @@ static bool vkd3d_create_buffer_view(struct d3d12_device *device, static void vkd3d_set_view_swizzle_for_format(VkComponentMapping *components, const struct vkd3d_format *format, bool allowed_swizzle) { - components->r = VK_COMPONENT_SWIZZLE_IDENTITY; - components->g = VK_COMPONENT_SWIZZLE_IDENTITY; - components->b = VK_COMPONENT_SWIZZLE_IDENTITY; - components->a = VK_COMPONENT_SWIZZLE_IDENTITY; + components->r = VK_COMPONENT_SWIZZLE_R; + components->g = VK_COMPONENT_SWIZZLE_G; + components->b = VK_COMPONENT_SWIZZLE_B; + components->a = VK_COMPONENT_SWIZZLE_A; if (format->vk_aspect_mask == VK_IMAGE_ASPECT_STENCIL_BIT) { @@ -1671,6 +1671,89 @@ static void vkd3d_set_view_swizzle_for_format(VkComponentMapping *components, } } +static VkComponentSwizzle vk_component_swizzle_from_d3d12(unsigned int component_mapping, + unsigned int component_index) +{ + D3D12_SHADER_COMPONENT_MAPPING mapping + = D3D12_DECODE_SHADER_4_COMPONENT_MAPPING(component_index, component_mapping); + + switch (mapping) + { + case D3D12_SHADER_COMPONENT_MAPPING_FROM_MEMORY_COMPONENT_0: + return VK_COMPONENT_SWIZZLE_R; + case D3D12_SHADER_COMPONENT_MAPPING_FROM_MEMORY_COMPONENT_1: + return VK_COMPONENT_SWIZZLE_G; + case D3D12_SHADER_COMPONENT_MAPPING_FROM_MEMORY_COMPONENT_2: + return VK_COMPONENT_SWIZZLE_B; + case D3D12_SHADER_COMPONENT_MAPPING_FROM_MEMORY_COMPONENT_3: + return VK_COMPONENT_SWIZZLE_A; + case D3D12_SHADER_COMPONENT_MAPPING_FORCE_VALUE_0: + return VK_COMPONENT_SWIZZLE_ZERO; + case D3D12_SHADER_COMPONENT_MAPPING_FORCE_VALUE_1: + return VK_COMPONENT_SWIZZLE_ONE; + } + + FIXME("Invalid component mapping %#x.\n", mapping); + return VK_COMPONENT_SWIZZLE_IDENTITY; +} + +static void vk_component_mapping_from_d3d12(VkComponentMapping *components, + unsigned int component_mapping) +{ + components->r = vk_component_swizzle_from_d3d12(component_mapping, 0); + components->g = vk_component_swizzle_from_d3d12(component_mapping, 1); + components->b = vk_component_swizzle_from_d3d12(component_mapping, 2); + components->a = vk_component_swizzle_from_d3d12(component_mapping, 3); +} + +static VkComponentSwizzle swizzle_vk_component(const VkComponentMapping *components, + VkComponentSwizzle component, VkComponentSwizzle swizzle) +{ + switch (swizzle) + { + case VK_COMPONENT_SWIZZLE_IDENTITY: + break; + + case VK_COMPONENT_SWIZZLE_R: + component = components->r; + break; + + case VK_COMPONENT_SWIZZLE_G: + component = components->g; + break; + + case VK_COMPONENT_SWIZZLE_B: + component = components->b; + break; + + case VK_COMPONENT_SWIZZLE_A: + component = components->a; + break; + + case VK_COMPONENT_SWIZZLE_ONE: + case VK_COMPONENT_SWIZZLE_ZERO: + component = swizzle; + break; + + default: + FIXME("Invalid component swizzle %#x.\n", swizzle); + break; + } + + assert(component != VK_COMPONENT_SWIZZLE_IDENTITY); + return component; +} + +static void vk_component_mapping_compose(VkComponentMapping *dst, const VkComponentMapping *b) +{ + const VkComponentMapping a = *dst; + + dst->r = swizzle_vk_component(&a, a.r, b->r); + dst->g = swizzle_vk_component(&a, a.g, b->g); + dst->b = swizzle_vk_component(&a, a.b, b->b); + dst->a = swizzle_vk_component(&a, a.a, b->a); +} + struct vkd3d_texture_view_desc { VkImageViewType view_type; @@ -1679,6 +1762,7 @@ struct vkd3d_texture_view_desc unsigned int miplevel_count; unsigned int layer_idx; unsigned int layer_count; + VkComponentMapping components; bool allowed_swizzle; }; @@ -1719,6 +1803,10 @@ static bool init_default_texture_view_desc(struct vkd3d_texture_view_desc *desc, return false; } + desc->components.r = VK_COMPONENT_SWIZZLE_IDENTITY; + desc->components.g = VK_COMPONENT_SWIZZLE_IDENTITY; + desc->components.b = VK_COMPONENT_SWIZZLE_IDENTITY; + desc->components.a = VK_COMPONENT_SWIZZLE_IDENTITY; desc->allowed_swizzle = false; return true; } @@ -1743,6 +1831,8 @@ static bool vkd3d_create_texture_view(struct d3d12_device *device, view_desc.viewType = desc->view_type; view_desc.format = format->vk_format; vkd3d_set_view_swizzle_for_format(&view_desc.components, format, desc->allowed_swizzle); + if (desc->allowed_swizzle) + vk_component_mapping_compose(&view_desc.components, &desc->components); view_desc.subresourceRange.aspectMask = format->vk_aspect_mask; view_desc.subresourceRange.baseMipLevel = desc->miplevel_idx; view_desc.subresourceRange.levelCount = desc->miplevel_count; @@ -1874,7 +1964,12 @@ void d3d12_desc_create_srv(struct d3d12_desc *descriptor, if (desc) { if (desc->Shader4ComponentMapping != D3D12_DEFAULT_SHADER_4_COMPONENT_MAPPING) - FIXME("Ignoring component mapping %#x.\n", desc->Shader4ComponentMapping); + { + TRACE("Component mapping %s for format %#x.\n", + debug_d3d12_shader_component_mapping(desc->Shader4ComponentMapping), desc->Format); + + vk_component_mapping_from_d3d12(&vkd3d_desc.components, desc->Shader4ComponentMapping); + } switch (desc->ViewDimension) { diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index e0af3f6..afa4da3 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -331,6 +331,37 @@ const char *debug_d3d12_box(const D3D12_BOX *box) box->right, box->bottom, box->back); } +static const char *debug_d3d12_shader_component(D3D12_SHADER_COMPONENT_MAPPING component) +{ + switch (component) + { + case D3D12_SHADER_COMPONENT_MAPPING_FROM_MEMORY_COMPONENT_0: + return "r"; + case D3D12_SHADER_COMPONENT_MAPPING_FROM_MEMORY_COMPONENT_1: + return "g"; + case D3D12_SHADER_COMPONENT_MAPPING_FROM_MEMORY_COMPONENT_2: + return "b"; + case D3D12_SHADER_COMPONENT_MAPPING_FROM_MEMORY_COMPONENT_3: + return "a"; + case D3D12_SHADER_COMPONENT_MAPPING_FORCE_VALUE_0: + return "0"; + case D3D12_SHADER_COMPONENT_MAPPING_FORCE_VALUE_1: + return "1"; + } + + FIXME("Invalid component mapping %#x.\n", component); + return "invalid"; +} + +const char *debug_d3d12_shader_component_mapping(unsigned int mapping) +{ + return vkd3d_dbg_sprintf("{%s, %s, %s, %s}", + debug_d3d12_shader_component(D3D12_DECODE_SHADER_4_COMPONENT_MAPPING(mapping, 0)), + debug_d3d12_shader_component(D3D12_DECODE_SHADER_4_COMPONENT_MAPPING(mapping, 1)), + debug_d3d12_shader_component(D3D12_DECODE_SHADER_4_COMPONENT_MAPPING(mapping, 2)), + debug_d3d12_shader_component(D3D12_DECODE_SHADER_4_COMPONENT_MAPPING(mapping, 3))); +} + const char *debug_vk_extent_3d(VkExtent3D extent) { return vkd3d_dbg_sprintf("(%u, %u, %u)", diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index a6ada4b..ab66291 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -1016,6 +1016,7 @@ HRESULT return_interface(void *iface, REFIID iface_iid, REFIID requested_iid, void **object) DECLSPEC_HIDDEN; const char *debug_d3d12_box(const D3D12_BOX *box) DECLSPEC_HIDDEN; +const char *debug_d3d12_shader_component_mapping(unsigned int mapping) DECLSPEC_HIDDEN; const char *debug_vk_extent_3d(VkExtent3D extent) DECLSPEC_HIDDEN; const char *debug_vk_memory_heap_flags(VkMemoryHeapFlags flags) DECLSPEC_HIDDEN; const char *debug_vk_memory_property_flags(VkMemoryPropertyFlags flags) DECLSPEC_HIDDEN;

1 0

Isira Seneviratne : po: Update Sinhala translation.
by Alexandre Julliard 21 Mar '19

21 Mar '19

Module: wine Branch: master Commit: 6325d85406fbf7f46770bc739da4b7e2c9b199d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6325d85406fbf7f46770bc73… Author: Isira Seneviratne <isirasen96(a)gmail.com> Date: Wed Mar 20 05:24:35 2019 +0530 po: Update Sinhala translation. Signed-off-by: Isira Seneviratne <isirasen96(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/si.po | 561 ++++++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 319 insertions(+), 242 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6325d85406fbf7f46770…

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 21 Mar '19

21 Mar '19

Module: wine Branch: master Commit: d35d46c75f9d41d08903958a07a95969247110c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d35d46c75f9d41d08903958a… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Mar 21 16:11:32 2019 +0200 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 258 ++++++++++++++++++--------------------------------------------- 1 file changed, 71 insertions(+), 187 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d35d46c75f9d41d08903…

1 0

Derek Lesho : ntoskrnl.exe: Implement ObGetObjectType.
by Alexandre Julliard 21 Mar '19

21 Mar '19

Module: wine Branch: master Commit: da060af24227f0fc295e2057de67cdb073748530 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da060af24227f0fc295e2057… Author: Derek Lesho <dereklesho52(a)gmail.com> Date: Thu Mar 21 18:51:44 2019 +0100 ntoskrnl.exe: Implement ObGetObjectType. Signed-off-by: Derek Lesho <dereklesho52(a)Gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 19 +++++++++---------- dlls/ntoskrnl.exe/tests/driver.c | 12 ++++++++++++ 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 2e78e45..27c7d00 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -397,6 +397,15 @@ NTSTATUS WINAPI ObReferenceObjectByHandle( HANDLE handle, ACCESS_MASK access, return status; } +/*********************************************************************** + * ObGetObjectType (NTOSKRNL.EXE.@) + */ +POBJECT_TYPE WINAPI ObGetObjectType( void *object ) +{ + struct object_header *header = (struct object_header *)object - 1; + return header->type; +} + static void *create_file_object( HANDLE handle ); @@ -2793,16 +2802,6 @@ USHORT WINAPI ObGetFilterVersion(void) } /*********************************************************************** - * ObGetObjectType (NTOSKRNL.EXE.@) - */ -POBJECT_TYPE WINAPI ObGetObjectType(void *object) -{ - FIXME("stub: %p\n", object); - - return NULL; -} - -/*********************************************************************** * IoGetAttachedDeviceReference (NTOSKRNL.EXE.@) */ DEVICE_OBJECT* WINAPI IoGetAttachedDeviceReference( DEVICE_OBJECT *device ) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index ae15df3..64abca4 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -662,10 +662,12 @@ static void WINAPI thread_proc(void *arg) static void test_ob_reference(const WCHAR *test_path) { + POBJECT_TYPE (WINAPI *pObGetObjectType)(void*); OBJECT_ATTRIBUTES attr = { sizeof(attr) }; HANDLE event_handle, file_handle, file_handle2, thread_handle; FILE_OBJECT *file; void *obj1, *obj2; + POBJECT_TYPE obj1_type; UNICODE_STRING pathU; IO_STATUS_BLOCK io; WCHAR *tmp_path; @@ -674,6 +676,10 @@ static void test_ob_reference(const WCHAR *test_path) static const WCHAR tmpW[] = {'.','t','m','p',0}; + pObGetObjectType = get_proc_address("ObGetObjectType"); + if (!pObGetObjectType) + win_skip("ObGetObjectType not found\n"); + InitializeObjectAttributes(&attr, NULL, OBJ_KERNEL_HANDLE, NULL, NULL); status = ZwCreateEvent(&event_handle, SYNCHRONIZE, &attr, NotificationEvent, TRUE); ok(!status, "ZwCreateEvent failed: %#x\n", status); @@ -708,6 +714,12 @@ static void test_ob_reference(const WCHAR *test_path) status = ObReferenceObjectByHandle(event_handle, SYNCHRONIZE, NULL, KernelMode, &obj1, NULL); ok(!status, "ObReferenceObjectByHandle failed: %#x\n", status); + if (pObGetObjectType) + { + obj1_type = pObGetObjectType(obj1); + ok(obj1_type == *pExEventObjectType, "ObGetObjectType returned %p\n", obj1_type); + } + if (sizeof(void *) != 4) /* avoid dealing with fastcall */ { ObfReferenceObject(obj1);

1 0

Matteo Bruni : d3dx9: Simplify effect init.
by Alexandre Julliard 21 Mar '19

21 Mar '19

Module: wine Branch: master Commit: 9a121f511533abb801ce49011e2a089b15265a44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a121f511533abb801ce4901… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 21 18:27:20 2019 +0100 d3dx9: Simplify effect init. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 76 +++++++++++++++++++------------------------------- 1 file changed, 29 insertions(+), 47 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index d89c5d7..7635caa 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -6142,32 +6142,46 @@ static const char **parse_skip_constants_string(char *skip_constants_string, uns return new_alloc; } -static HRESULT d3dx9_base_effect_init(struct d3dx_effect *effect, const char *data, SIZE_T data_size, - const D3D_SHADER_MACRO *defines, ID3DInclude *include, unsigned int eflags, ID3DBlob **errors, - struct d3dx_effect_pool *pool, const char *skip_constants_string) +static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDevice9 *device, + const char *data, SIZE_T data_size, const D3D_SHADER_MACRO *defines, ID3DInclude *include, + UINT eflags, ID3DBlob **errors, struct ID3DXEffectPool *pool, const char *skip_constants_string) { - struct d3dx9_base_effect *base = &effect->base_effect; - DWORD tag, offset; - const char *ptr = data; - HRESULT hr; - ID3DBlob *bytecode = NULL, *temp_errors = NULL; - char *skip_constants_buffer = NULL; - const char **skip_constants = NULL; - unsigned int skip_constants_count = 0; #if D3DX_SDK_VERSION <= 36 UINT compile_flags = D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY; #else UINT compile_flags = 0; #endif + struct d3dx9_base_effect *base = &effect->base_effect; + ID3DBlob *bytecode = NULL, *temp_errors = NULL; + struct d3dx_effect_pool *pool_impl = NULL; + unsigned int skip_constants_count = 0; + char *skip_constants_buffer = NULL; + const char **skip_constants = NULL; + const char *ptr = data; + DWORD tag, offset; unsigned int i, j; + HRESULT hr; - TRACE("effect %p, data %p, data_size %lu, defines %p, include %p, eflags %#x, errors %p, " + TRACE("effect %p, device %p, data %p, data_size %lu, defines %p, include %p, eflags %#x, errors %p, " "pool %p, skip_constants %s.\n", - effect, data, data_size, defines, include, eflags, errors, pool, + effect, device, data, data_size, defines, include, eflags, errors, pool, debugstr_a(skip_constants_string)); + effect->ID3DXEffect_iface.lpVtbl = &ID3DXEffect_Vtbl; + effect->ref = 1; + + if (pool) + { + pool->lpVtbl->AddRef(pool); + pool_impl = impl_from_ID3DXEffectPool(pool); + } + effect->pool = pool; + + IDirect3DDevice9_AddRef(device); + effect->device = device; + base->effect = effect; - base->pool = pool; + base->pool = pool_impl; base->flags = eflags; read_dword(&ptr, &tag); @@ -6283,38 +6297,6 @@ static HRESULT d3dx9_base_effect_init(struct d3dx_effect *effect, const char *da HeapFree(GetProcessHeap(), 0, skip_constants_buffer); HeapFree(GetProcessHeap(), 0, skip_constants); - return D3D_OK; -} - -static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDevice9 *device, - const char *data, SIZE_T data_size, const D3D_SHADER_MACRO *defines, ID3DInclude *include, - UINT eflags, ID3DBlob **error_messages, struct ID3DXEffectPool *pool, const char *skip_constants) -{ - HRESULT hr; - struct d3dx_effect_pool *pool_impl = NULL; - - TRACE("effect %p, device %p, data %p, data_size %lu, pool %p\n", effect, device, data, data_size, pool); - - effect->ID3DXEffect_iface.lpVtbl = &ID3DXEffect_Vtbl; - effect->ref = 1; - - if (pool) - { - pool->lpVtbl->AddRef(pool); - pool_impl = impl_from_ID3DXEffectPool(pool); - } - effect->pool = pool; - - IDirect3DDevice9_AddRef(device); - effect->device = device; - - if (FAILED(hr = d3dx9_base_effect_init(effect, data, data_size, defines, include, eflags, - error_messages, pool_impl, skip_constants))) - { - FIXME("Failed to parse effect, hr %#x.\n", hr); - return hr; - } - /* initialize defaults - check because of unsupported ascii effects */ if (effect->techniques) { @@ -6358,7 +6340,7 @@ HRESULT WINAPI D3DXCreateEffectEx(struct IDirect3DDevice9 *device, const void *s (ID3DInclude *)include, flags, (ID3DBlob **)compilation_errors, pool, skip_constants); if (FAILED(hr)) { - WARN("Failed to create effect object.\n"); + WARN("Failed to create effect object, hr %#x.\n", hr); d3dx_effect_cleanup(object); return hr; }

1 0

Matteo Bruni : d3dx9: Simplify effect cleanup.
by Alexandre Julliard 21 Mar '19

21 Mar '19

Module: wine Branch: master Commit: 009279845d9503468d5d3d39e393ad2ffa00181d URL: https://source.winehq.org/git/wine.git/?a=commit;h=009279845d9503468d5d3d39… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 21 18:27:19 2019 +0100 d3dx9: Simplify effect cleanup. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 39 ++++++++++----------------------------- 1 file changed, 10 insertions(+), 29 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 0c28fae..d89c5d7 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -677,11 +677,11 @@ static void free_technique(struct d3dx_technique *technique) technique->name = NULL; } -static void d3dx9_base_effect_cleanup(struct d3dx_effect *effect) +static void d3dx_effect_cleanup(struct d3dx_effect *effect) { unsigned int i; - TRACE("Effect %p.\n", effect); + TRACE("effect %p.\n", effect); heap_free(effect->full_name_tmp); @@ -690,7 +690,6 @@ static void d3dx9_base_effect_cleanup(struct d3dx_effect *effect) for (i = 0; i < effect->parameter_count; ++i) free_top_level_parameter(&effect->parameters[i]); heap_free(effect->parameters); - effect->parameters = NULL; } if (effect->techniques) @@ -698,37 +697,23 @@ static void d3dx9_base_effect_cleanup(struct d3dx_effect *effect) for (i = 0; i < effect->technique_count; ++i) free_technique(&effect->techniques[i]); heap_free(effect->techniques); - effect->techniques = NULL; } if (effect->objects) { for (i = 0; i < effect->object_count; ++i) - { free_object(&effect->objects[i]); - } heap_free(effect->objects); - effect->objects = NULL; } -} - -static void free_effect(struct d3dx_effect *effect) -{ - TRACE("Free effect %p\n", effect); - - d3dx9_base_effect_cleanup(effect); if (effect->pool) - { effect->pool->lpVtbl->Release(effect->pool); - } if (effect->manager) - { IUnknown_Release(effect->manager); - } IDirect3DDevice9_Release(effect->device); + heap_free(effect); } static void get_vector(struct d3dx_parameter *param, D3DXVECTOR4 *vector) @@ -1822,18 +1807,15 @@ static ULONG WINAPI d3dx_effect_AddRef(ID3DXEffect *iface) static ULONG WINAPI d3dx_effect_Release(ID3DXEffect *iface) { - struct d3dx_effect *This = impl_from_ID3DXEffect(iface); - ULONG ref = InterlockedDecrement(&This->ref); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + ULONG refcount = InterlockedDecrement(&effect->ref); - TRACE("(%p)->(): Release from %u\n", This, ref + 1); + TRACE("%p decreasing refcount to %u.\n", effect, refcount); - if (!ref) - { - free_effect(This); - HeapFree(GetProcessHeap(), 0, This); - } + if (!refcount) + d3dx_effect_cleanup(effect); - return ref; + return refcount; } /*** ID3DXBaseEffect methods ***/ @@ -6330,7 +6312,6 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev error_messages, pool_impl, skip_constants))) { FIXME("Failed to parse effect, hr %#x.\n", hr); - free_effect(effect); return hr; } @@ -6378,7 +6359,7 @@ HRESULT WINAPI D3DXCreateEffectEx(struct IDirect3DDevice9 *device, const void *s if (FAILED(hr)) { WARN("Failed to create effect object.\n"); - HeapFree(GetProcessHeap(), 0, object); + d3dx_effect_cleanup(object); return hr; }

1 0

Gijs Vermeulen : wintrust: Add CryptCATAdminAcquireContext2 stub.
by Alexandre Julliard 21 Mar '19

21 Mar '19

Module: wine Branch: master Commit: 479c30072884c6342bc08faae17f0342a107edea URL: https://source.winehq.org/git/wine.git/?a=commit;h=479c30072884c6342bc08faa… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Thu Mar 21 17:21:32 2019 +0100 wintrust: Add CryptCATAdminAcquireContext2 stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45998 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintrust/crypt.c | 11 +++++++++++ dlls/wintrust/wintrust.spec | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c index 84188f8..1a36965 100644 --- a/dlls/wintrust/crypt.c +++ b/dlls/wintrust/crypt.c @@ -147,6 +147,17 @@ BOOL WINAPI CryptCATAdminAcquireContext(HCATADMIN *catAdmin, } /*********************************************************************** + * CryptCATAdminAcquireContext2 (WINTRUST.@) + */ +BOOL WINAPI CryptCATAdminAcquireContext2(HCATADMIN *catAdmin, const GUID *sys, const WCHAR *algorithm, + const CERT_STRONG_SIGN_PARA *policy, DWORD flags) +{ + FIXME("%p %s %s %p %x stub\n", catAdmin, debugstr_guid(sys), debugstr_w(algorithm), policy, flags); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** * CryptCATAdminAddCatalog (WINTRUST.@) */ HCATINFO WINAPI CryptCATAdminAddCatalog(HCATADMIN catAdmin, PWSTR catalogFile, diff --git a/dlls/wintrust/wintrust.spec b/dlls/wintrust/wintrust.spec index 055ba0b..7ebd53f 100644 --- a/dlls/wintrust/wintrust.spec +++ b/dlls/wintrust/wintrust.spec @@ -4,7 +4,7 @@ #@ stub ConfigCiFinalPolicy #@ stub ConfigCiPackageFamilyNameCheck @ stdcall CryptCATAdminAcquireContext(ptr ptr long) -#@ stub CryptCATAdminAcquireContext2 +@ stdcall CryptCATAdminAcquireContext2(ptr ptr wstr ptr long) @ stdcall CryptCATAdminAddCatalog(long wstr wstr long) @ stdcall CryptCATAdminCalcHashFromFileHandle(long ptr ptr long) #@ stub CryptCATAdminCalcHashFromFileHandle2

1 0

Gijs Vermeulen : mscat32: Update spec file.
by Alexandre Julliard 21 Mar '19

21 Mar '19

Module: wine Branch: master Commit: d9863b7e70c156149fe8388b67111fad3858d9d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9863b7e70c156149fe8388b… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Thu Mar 21 17:21:31 2019 +0100 mscat32: Update spec file. File version: 10.0.17763.1 (Windows 10). Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscat32/mscat32.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/mscat32/mscat32.spec b/dlls/mscat32/mscat32.spec index 3c3c9d8..b0b1788 100644 --- a/dlls/mscat32/mscat32.spec +++ b/dlls/mscat32/mscat32.spec @@ -1,4 +1,5 @@ -@ stub CryptCATVerifyMember +1 stub CryptCATVerifyMember +#@ stub CatalogCompactHashDatabase @ stdcall CryptCATAdminAcquireContext(long ptr long) wintrust.CryptCATAdminAcquireContext @ stdcall CryptCATAdminAddCatalog(long wstr wstr long) wintrust.CryptCATAdminAddCatalog @ stdcall CryptCATAdminCalcHashFromFileHandle(long ptr ptr long) wintrust.CryptCATAdminCalcHashFromFileHandle @@ -11,6 +12,7 @@ @ stdcall CryptCATCDFEnumCatAttributes(ptr ptr ptr) wintrust.CryptCATCDFEnumCatAttributes @ stub CryptCATCDFEnumMembers @ stdcall CryptCATCDFEnumMembersByCDFTag(ptr wstr ptr ptr long) wintrust.CryptCATCDFEnumMembersByCDFTag +@ stdcall CryptCATCDFEnumMembersByCDFTagEx(ptr wstr ptr ptr long ptr) wintrust.CryptCATCDFEnumMembersByCDFTagEx @ stdcall CryptCATCDFOpen(wstr ptr) wintrust.CryptCATCDFOpen @ stdcall CryptCATCatalogInfoFromContext(ptr ptr long) wintrust.CryptCATCatalogInfoFromContext @ stdcall CryptCATClose(long) wintrust.CryptCATClose

1 0

Gijs Vermeulen : wintrust: Update spec file.
by Alexandre Julliard 21 Mar '19

21 Mar '19

Module: wine Branch: master Commit: 1c97c9637379a5c747dd2791e628a2a8a1a4f482 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c97c9637379a5c747dd2791… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Thu Mar 21 17:21:30 2019 +0100 wintrust: Update spec file. File version: 10.0.17763.348 (Windows 10). Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintrust/wintrust.spec | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/wintrust/wintrust.spec b/dlls/wintrust/wintrust.spec index b8c70ad..055ba0b 100644 --- a/dlls/wintrust/wintrust.spec +++ b/dlls/wintrust/wintrust.spec @@ -1,14 +1,20 @@ @ stub AddPersonalTrustDBPages @ stub CatalogCompactHashDatabase +#@ stub ComputeFirstPageHash +#@ stub ConfigCiFinalPolicy +#@ stub ConfigCiPackageFamilyNameCheck @ stdcall CryptCATAdminAcquireContext(ptr ptr long) +#@ stub CryptCATAdminAcquireContext2 @ stdcall CryptCATAdminAddCatalog(long wstr wstr long) @ stdcall CryptCATAdminCalcHashFromFileHandle(long ptr ptr long) +#@ stub CryptCATAdminCalcHashFromFileHandle2 @ stdcall CryptCATAdminEnumCatalogFromHash(long ptr long long ptr) @ stub CryptCATAdminPauseServiceForBackup @ stdcall CryptCATAdminReleaseCatalogContext(long long long) @ stdcall CryptCATAdminReleaseContext(long long) @ stdcall CryptCATAdminRemoveCatalog(ptr wstr long) @ stdcall CryptCATAdminResolveCatalogPath(ptr wstr ptr long) +#@ stub CryptCATAllocSortedMemberInfo @ stdcall CryptCATCDFClose(ptr) @ stub CryptCATCDFEnumAttributes @ stub CryptCATCDFEnumAttributesWithCDFTag @@ -22,6 +28,7 @@ @ stdcall CryptCATEnumerateAttr(ptr ptr ptr) @ stdcall CryptCATEnumerateCatAttr(ptr ptr) @ stdcall CryptCATEnumerateMember(long ptr) +#@ stub CryptCATFreeSortedMemberInfo @ stdcall CryptCATGetAttrInfo(ptr ptr wstr) @ stdcall CryptCATGetCatAttrInfo(ptr wstr ) @ stdcall CryptCATGetMemberInfo(ptr wstr) @@ -34,8 +41,10 @@ @ stub CryptCATStoreFromHandle @ stub CryptCATVerifyMember @ stdcall CryptSIPCreateIndirectData(ptr ptr ptr) +#@ stub CryptSIPGetCaps @ stub CryptSIPGetInfo @ stub CryptSIPGetRegWorkingFlags +#@ stub CryptSIPGetSealedDigest @ stdcall CryptSIPGetSignedDataMsg(ptr ptr long ptr ptr) @ stdcall CryptSIPPutSignedDataMsg(ptr long ptr long ptr) @ stdcall CryptSIPRemoveSignedDataMsg(ptr long) @@ -48,6 +57,7 @@ @ stdcall FindCertsByIssuer(ptr ptr ptr ptr long wstr long) @ stdcall GenericChainCertificateTrust(ptr) @ stdcall GenericChainFinalProv(ptr) +#@ stub GetAuthenticodeSha256Hash @ stdcall HTTPSCertificateTrust(ptr) @ stdcall HTTPSFinalProv(ptr) @ stdcall IsCatalogFile(ptr wstr) @@ -56,6 +66,7 @@ @ stub OfficeCleanupPolicy @ stub OfficeInitializePolicy @ stdcall OpenPersonalTrustDBDialog(ptr) +#@ stub OpenPersonalTrustDBDialogEx @ stdcall SoftpubAuthenticode(ptr) @ stdcall SoftpubCheckCert(ptr long long long) @ stdcall SoftpubCleanup(ptr) @@ -68,29 +79,48 @@ @ stub SoftpubLoadDefUsageCallData @ stdcall SoftpubLoadMessage(ptr) @ stdcall SoftpubLoadSignature(ptr) +#@ stub SrpCheckSmartlockerEAandProcessToken @ stub TrustDecode @ stub TrustFindIssuerCertificate @ stub TrustFreeDecode @ stdcall TrustIsCertificateSelfSigned(ptr) @ stub TrustOpenStores +#@ stub WTGetBioSignatureInfo +#@ stub WTGetPluginSignatureInfo +#@ stub WTGetSignatureInfo @ stdcall WTHelperCertCheckValidSignature(ptr) @ stub WTHelperCertFindIssuerCertificate @ stub WTHelperCertIsSelfSigned @ stub WTHelperCheckCertUsage @ stub WTHelperGetAgencyInfo @ stdcall WTHelperGetFileHandle(ptr) +#@ stub WTHelperGetFileHash @ stdcall WTHelperGetFileName(ptr) @ stdcall WTHelperGetKnownUsages(long ptr) @ stdcall WTHelperGetProvCertFromChain(ptr long) @ stdcall WTHelperGetProvPrivateDataFromChain(ptr ptr) @ stdcall WTHelperGetProvSignerFromChain(ptr long long long) +#@ stub WTHelperIsChainedToMicrosoft +#@ stub WTHelperIsChainedToMicrosoftFromStateData @ stub WTHelperIsInRootStore @ stub WTHelperOpenKnownStores @ stdcall WTHelperProvDataFromStateData(ptr) +#@ stub WTIsFirstConfigCiResultPreferred +#@ stub WTLogConfigCiScriptEvent +#@ stub WTLogConfigCiSignerEvent +#@ stub WTValidateBioSignaturePolicy +#@ stub WVTAsn1CatMemberInfo2Decode +#@ stub WVTAsn1CatMemberInfo2Encode @ stdcall WVTAsn1CatMemberInfoDecode(long str ptr long long ptr ptr) @ stdcall WVTAsn1CatMemberInfoEncode(long str ptr ptr ptr) @ stdcall WVTAsn1CatNameValueDecode(long str ptr long long ptr ptr) @ stdcall WVTAsn1CatNameValueEncode(long str ptr ptr ptr) +#@ stub WVTAsn1IntentToSealAttributeDecode +#@ stub WVTAsn1IntentToSealAttributeEncode +#@ stub WVTAsn1SealingSignatureAttributeDecode +#@ stub WVTAsn1SealingSignatureAttributeEncode +#@ stub WVTAsn1SealingTimestampAttributeDecode +#@ stub WVTAsn1SealingTimestampAttributeEncode @ stdcall WVTAsn1SpcFinancialCriteriaInfoDecode(long str ptr long long ptr ptr) @ stdcall WVTAsn1SpcFinancialCriteriaInfoEncode(long str ptr ptr ptr) @ stdcall WVTAsn1SpcIndirectDataContentDecode(long str ptr long long ptr ptr) @@ -118,6 +148,7 @@ @ stdcall WintrustGetRegPolicyFlags(ptr) @ stdcall WintrustLoadFunctionPointers(ptr ptr) @ stdcall WintrustRemoveActionID(ptr) +#@ stub WintrustSetDefaultIncludePEPageHashes @ stdcall WintrustSetRegPolicyFlags(long) @ stdcall mscat32DllRegisterServer() @ stdcall mscat32DllUnregisterServer()

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2019