January 2022 - Wine-Commits

Georg Lehmann : winevulkan: Update to VK spec version 1.2.203.
by Alexandre Julliard Jan. 19, 2022

Jan. 19, 2022

Module: wine Branch: master Commit: b59335af2afe54bb2684d1b12c8e3606d7449346 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b59335af2afe54bb2684d1b1… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Tue Jan 18 22:19:36 2022 +0100 winevulkan: Update to VK spec version 1.2.203. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 3 ++- dlls/winevulkan/vulkan_thunks.c | 34 +++++++++++++++++++++++++++++++++ dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 42 ++++++++++++++++++++++++++++++++++++++++- 4 files changed, 78 insertions(+), 3 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index e9b1b456584..e548025a6ad 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -64,7 +64,7 @@ from enum import Enum LOGGER = logging.Logger("vulkan") LOGGER.addHandler(logging.StreamHandler()) -VK_XML_VERSION = "1.2.201" +VK_XML_VERSION = "1.2.203" WINE_VK_VERSION = (1, 2) # Filenames to create. @@ -109,6 +109,7 @@ UNSUPPORTED_EXTENSIONS = [ "VK_EXT_external_memory_dma_buf", "VK_EXT_image_drm_format_modifier", "VK_EXT_physical_device_drm", + "VK_GOOGLE_surfaceless_query", "VK_KHR_external_fence_fd", "VK_KHR_external_memory_fd", "VK_KHR_external_semaphore_fd", diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index 968699c2204..f41493381db 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -3632,6 +3632,22 @@ VkResult convert_VkDeviceCreateInfo_struct_chain(const void *pNext, VkDeviceCrea break; } + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_OFFSET_FEATURES_QCOM: + { + const VkPhysicalDeviceFragmentDensityMapOffsetFeaturesQCOM *in = (const VkPhysicalDeviceFragmentDensityMapOffsetFeaturesQCOM *)in_header; + VkPhysicalDeviceFragmentDensityMapOffsetFeaturesQCOM *out; + + if (!(out = malloc(sizeof(*out)))) goto out_of_memory; + + out->sType = in->sType; + out->pNext = NULL; + out->fragmentDensityMapOffset = in->fragmentDensityMapOffset; + + out_header->pNext = (VkBaseOutStructure *)out; + out_header = out_header->pNext; + break; + } + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SCALAR_BLOCK_LAYOUT_FEATURES: { const VkPhysicalDeviceScalarBlockLayoutFeatures *in = (const VkPhysicalDeviceScalarBlockLayoutFeatures *)in_header; @@ -4684,6 +4700,22 @@ VkResult convert_VkDeviceCreateInfo_struct_chain(const void *pNext, VkDeviceCrea break; } + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINEAR_COLOR_ATTACHMENT_FEATURES_NV: + { + const VkPhysicalDeviceLinearColorAttachmentFeaturesNV *in = (const VkPhysicalDeviceLinearColorAttachmentFeaturesNV *)in_header; + VkPhysicalDeviceLinearColorAttachmentFeaturesNV *out; + + if (!(out = malloc(sizeof(*out)))) goto out_of_memory; + + out->sType = in->sType; + out->pNext = NULL; + out->linearColorAttachment = in->linearColorAttachment; + + out_header->pNext = (VkBaseOutStructure *)out; + out_header = out_header->pNext; + break; + } + default: FIXME("Application requested a linked structure of type %u.\n", in_header->sType); } @@ -9240,6 +9272,7 @@ static const char * const vk_device_extensions[] = "VK_NV_geometry_shader_passthrough", "VK_NV_glsl_shader", "VK_NV_inherited_viewport_scissor", + "VK_NV_linear_color_attachment", "VK_NV_mesh_shader", "VK_NV_ray_tracing", "VK_NV_ray_tracing_motion_blur", @@ -9252,6 +9285,7 @@ static const char * const vk_device_extensions[] = "VK_NV_shading_rate_image", "VK_NV_viewport_array2", "VK_NV_viewport_swizzle", + "VK_QCOM_fragment_density_map_offset", "VK_QCOM_render_pass_shader_resolve", "VK_QCOM_render_pass_store_ops", "VK_QCOM_render_pass_transform", diff --git a/dlls/winevulkan/winevulkan.json b/dlls/winevulkan/winevulkan.json index 0ef3a8057ad..d8cf4b3415e 100644 --- a/dlls/winevulkan/winevulkan.json +++ b/dlls/winevulkan/winevulkan.json @@ -2,6 +2,6 @@ "file_format_version": "1.0.0", "ICD": { "library_path": ".\\winevulkan.dll", - "api_version": "1.2.201" + "api_version": "1.2.203" } } diff --git a/include/wine/vulkan.h b/include/wine/vulkan.h index 674f5b417ad..6e9d8e73727 100644 --- a/include/wine/vulkan.h +++ b/include/wine/vulkan.h @@ -486,6 +486,10 @@ #define VK_EXT_PAGEABLE_DEVICE_LOCAL_MEMORY_EXTENSION_NAME "VK_EXT_pageable_device_local_memory" #define VK_KHR_MAINTENANCE_4_SPEC_VERSION 2 #define VK_KHR_MAINTENANCE_4_EXTENSION_NAME "VK_KHR_maintenance4" +#define VK_QCOM_FRAGMENT_DENSITY_MAP_OFFSET_SPEC_VERSION 1 +#define VK_QCOM_FRAGMENT_DENSITY_MAP_OFFSET_EXTENSION_NAME "VK_QCOM_fragment_density_map_offset" +#define VK_NV_LINEAR_COLOR_ATTACHMENT_SPEC_VERSION 1 +#define VK_NV_LINEAR_COLOR_ATTACHMENT_EXTENSION_NAME "VK_NV_linear_color_attachment" #define VK_KHR_ACCELERATION_STRUCTURE_SPEC_VERSION 13 #define VK_KHR_ACCELERATION_STRUCTURE_EXTENSION_NAME "VK_KHR_acceleration_structure" #define VK_KHR_RAY_TRACING_PIPELINE_SPEC_VERSION 1 @@ -507,7 +511,7 @@ #define VK_API_VERSION_1_0 VK_MAKE_API_VERSION(0, 1, 0, 0) #define VK_API_VERSION_1_1 VK_MAKE_API_VERSION(0, 1, 1, 0) #define VK_API_VERSION_1_2 VK_MAKE_API_VERSION(0, 1, 2, 0) -#define VK_HEADER_VERSION 201 +#define VK_HEADER_VERSION 203 #define VK_HEADER_VERSION_COMPLETE VK_MAKE_API_VERSION(0, 1, 2, VK_HEADER_VERSION) #define VK_DEFINE_HANDLE(object) typedef struct object##_T* object; #define VK_USE_64_BIT_PTR_DEFINES 0 @@ -2005,6 +2009,7 @@ static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_FRAGMENT_SHADING_RA static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_STORAGE_READ_WITHOUT_FORMAT_BIT_KHR = 0x80000000ull; static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_STORAGE_WRITE_WITHOUT_FORMAT_BIT_KHR = 0x100000000ull; static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_DEPTH_COMPARISON_BIT_KHR = 0x200000000ull; +static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_LINEAR_COLOR_ATTACHMENT_BIT_NV = 0x4000000000ull; typedef enum VkFragmentShadingRateCombinerOpKHR { @@ -2092,6 +2097,7 @@ typedef VkGeometryTypeKHR VkGeometryTypeNV; typedef enum VkImageAspectFlagBits { + VK_IMAGE_ASPECT_NONE_KHR = 0, VK_IMAGE_ASPECT_COLOR_BIT = 0x00000001, VK_IMAGE_ASPECT_DEPTH_BIT = 0x00000002, VK_IMAGE_ASPECT_STENCIL_BIT = 0x00000004, @@ -2122,6 +2128,7 @@ typedef enum VkImageCreateFlagBits VK_IMAGE_CREATE_SAMPLE_LOCATIONS_COMPATIBLE_DEPTH_BIT_EXT = 0x00001000, VK_IMAGE_CREATE_CORNER_SAMPLED_BIT_NV = 0x00002000, VK_IMAGE_CREATE_SUBSAMPLED_BIT_EXT = 0x00004000, + VK_IMAGE_CREATE_FRAGMENT_DENSITY_MAP_OFFSET_BIT_QCOM = 0x00008000, VK_IMAGE_CREATE_SPLIT_INSTANCE_BIND_REGIONS_BIT_KHR = VK_IMAGE_CREATE_SPLIT_INSTANCE_BIND_REGIONS_BIT, VK_IMAGE_CREATE_2D_ARRAY_COMPATIBLE_BIT_KHR = VK_IMAGE_CREATE_2D_ARRAY_COMPATIBLE_BIT, VK_IMAGE_CREATE_BLOCK_TEXEL_VIEW_COMPATIBLE_BIT_KHR = VK_IMAGE_CREATE_BLOCK_TEXEL_VIEW_COMPATIBLE_BIT, @@ -3566,6 +3573,10 @@ typedef enum VkStructureType VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_PROPERTIES_KHR = 1000413001, VK_STRUCTURE_TYPE_DEVICE_BUFFER_MEMORY_REQUIREMENTS_KHR = 1000413002, VK_STRUCTURE_TYPE_DEVICE_IMAGE_MEMORY_REQUIREMENTS_KHR = 1000413003, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_OFFSET_FEATURES_QCOM = 1000425000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_OFFSET_PROPERTIES_QCOM = 1000425001, + VK_STRUCTURE_TYPE_SUBPASS_FRAGMENT_DENSITY_MAP_OFFSET_END_INFO_QCOM = 1000425002, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINEAR_COLOR_ATTACHMENT_FEATURES_NV = 1000430000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTER_FEATURES = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTERS_FEATURES, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DRAW_PARAMETER_FEATURES = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DRAW_PARAMETERS_FEATURES, VK_STRUCTURE_TYPE_DEBUG_REPORT_CREATE_INFO_EXT = VK_STRUCTURE_TYPE_DEBUG_REPORT_CALLBACK_CREATE_INFO_EXT, @@ -6097,6 +6108,20 @@ typedef struct VkPhysicalDeviceFragmentDensityMapFeaturesEXT VkBool32 fragmentDensityMapNonSubsampledImages; } VkPhysicalDeviceFragmentDensityMapFeaturesEXT; +typedef struct VkPhysicalDeviceFragmentDensityMapOffsetFeaturesQCOM +{ + VkStructureType sType; + void *pNext; + VkBool32 fragmentDensityMapOffset; +} VkPhysicalDeviceFragmentDensityMapOffsetFeaturesQCOM; + +typedef struct VkPhysicalDeviceFragmentDensityMapOffsetPropertiesQCOM +{ + VkStructureType sType; + void *pNext; + VkExtent2D fragmentDensityOffsetGranularity; +} VkPhysicalDeviceFragmentDensityMapOffsetPropertiesQCOM; + typedef struct VkPhysicalDeviceFragmentDensityMapPropertiesEXT { VkStructureType sType; @@ -6425,6 +6450,13 @@ typedef struct VkPhysicalDeviceLineRasterizationPropertiesEXT uint32_t lineSubPixelPrecisionBits; } VkPhysicalDeviceLineRasterizationPropertiesEXT; +typedef struct VkPhysicalDeviceLinearColorAttachmentFeaturesNV +{ + VkStructureType sType; + void *pNext; + VkBool32 linearColorAttachment; +} VkPhysicalDeviceLinearColorAttachmentFeaturesNV; + typedef struct VkPhysicalDeviceMaintenance3Properties { VkStructureType sType; @@ -8381,6 +8413,14 @@ typedef struct VkSubpassEndInfo } VkSubpassEndInfo; typedef VkSubpassEndInfo VkSubpassEndInfoKHR; +typedef struct VkSubpassFragmentDensityMapOffsetEndInfoQCOM +{ + VkStructureType sType; + const void *pNext; + uint32_t fragmentDensityOffsetCount; + const VkOffset2D *pFragmentDensityOffsets; +} VkSubpassFragmentDensityMapOffsetEndInfoQCOM; + typedef struct VkSubpassSampleLocationsEXT { uint32_t subpassIndex;

1 0

Michael Stefaniuc : dmsynth: Drop "synth" from the synth_sink field.
by Alexandre Julliard Jan. 19, 2022

Jan. 19, 2022

Module: wine Branch: master Commit: 3292bc29657af0a2c7bb06617426fab4a43a8cdd URL: https://source.winehq.org/git/wine.git/?a=commit;h=3292bc29657af0a2c7bb0661… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Jan 19 18:48:47 2022 +0100 dmsynth: Drop "synth" from the synth_sink field. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmsynth/dmsynth_private.h | 2 +- dlls/dmsynth/synth.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/dmsynth/dmsynth_private.h b/dlls/dmsynth/dmsynth_private.h index bcc866e879e..32a79f65dd3 100644 --- a/dlls/dmsynth/dmsynth_private.h +++ b/dlls/dmsynth/dmsynth_private.h @@ -65,7 +65,7 @@ struct IDirectMusicSynth8Impl { DMUS_PORTCAPS pCaps; BOOL fActive; IReferenceClock* pLatencyClock; - IDirectMusicSynthSink *synth_sink; + IDirectMusicSynthSink *sink; }; /***************************************************************************** diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index 19789b5a256..4d71bc738c1 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -320,7 +320,7 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_GetLatencyClock(IDirectMusicSynth8 if (!clock) return E_POINTER; - if (!This->synth_sink) + if (!This->sink) return DMUS_E_NOSYNTHSINK; *clock = This->pLatencyClock; @@ -341,16 +341,16 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_Activate(IDirectMusicSynth8 *iface, } static HRESULT WINAPI IDirectMusicSynth8Impl_SetSynthSink(IDirectMusicSynth8 *iface, - IDirectMusicSynthSink *synth_sink) + IDirectMusicSynthSink *sink) { IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); - TRACE("(%p)->(%p)\n", iface, synth_sink); + TRACE("(%p)->(%p)\n", iface, sink); - This->synth_sink = synth_sink; + This->sink = sink; - if (synth_sink) - return IDirectMusicSynthSink_GetLatencyClock(synth_sink, &This->pLatencyClock); + if (sink) + return IDirectMusicSynthSink_GetLatencyClock(sink, &This->pLatencyClock); return S_OK; }

1 0

Nikolay Sivov : dwrite/tests: Use CRT memory allocation functions.
by Alexandre Julliard Jan. 19, 2022

Jan. 19, 2022

Module: wine Branch: master Commit: 6dbaba7cb3d128b86ec2a6b633ecf67961c61910 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6dbaba7cb3d128b86ec2a6b6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 19 13:46:23 2022 +0300 dwrite/tests: Use CRT memory allocation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/analyzer.c | 5 ++--- dlls/dwrite/tests/font.c | 35 +++++++++++++++++------------------ 2 files changed, 19 insertions(+), 21 deletions(-) diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index dd3207c7933..875503ed5a3 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -30,7 +30,6 @@ #include "winternl.h" #include "dwrite_3.h" -#include "wine/heap.h" #include "wine/test.h" static IDWriteFactory *factory; @@ -1551,7 +1550,7 @@ static void test_glyph_props(IDWriteTextAnalyzer *analyzer, const WCHAR *family, hr = IDWriteFontFace1_GetUnicodeRanges(fontface1, 0, NULL, &count); ok(hr == E_NOT_SUFFICIENT_BUFFER, "Unexpected hr %#x.\n", hr); - ranges = heap_alloc(count * sizeof(*ranges)); + ranges = malloc(count * sizeof(*ranges)); hr = IDWriteFontFace1_GetUnicodeRanges(fontface1, count, ranges, &count); ok(hr == S_OK, "Failed to get ranges, hr %#x.\n", hr); @@ -1608,7 +1607,7 @@ static void test_glyph_props(IDWriteTextAnalyzer *analyzer, const WCHAR *family, } } - heap_free(ranges); + free(ranges); IDWriteFontFace_ReleaseFontTable(fontface, gdef.context); IDWriteFontFace1_Release(fontface1); diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index ba4a2793372..b185db49c13 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -30,7 +30,6 @@ #include "initguid.h" #include "d2d1.h" -#include "wine/heap.h" #include "wine/test.h" #define MS_CMAP_TAG DWRITE_MAKE_OPENTYPE_TAG('c','m','a','p') @@ -634,11 +633,12 @@ static ULONG WINAPI singlefontfileenumerator_AddRef(IDWriteFontFileEnumerator *i static ULONG WINAPI singlefontfileenumerator_Release(IDWriteFontFileEnumerator *iface) { - struct test_fontenumerator *This = impl_from_IDWriteFontFileEnumerator(iface); - ULONG ref = InterlockedDecrement(&This->ref); - if (!ref) { - IDWriteFontFile_Release(This->font_file); - heap_free(This); + struct test_fontenumerator *enumerator = impl_from_IDWriteFontFileEnumerator(iface); + ULONG ref = InterlockedDecrement(&enumerator->ref); + if (!ref) + { + IDWriteFontFile_Release(enumerator->font_file); + free(enumerator); } return ref; } @@ -678,8 +678,7 @@ static HRESULT create_enumerator(IDWriteFontFile *font_file, IDWriteFontFileEnum { struct test_fontenumerator *enumerator; - enumerator = heap_alloc(sizeof(struct test_fontenumerator)); - if (!enumerator) + if (!(enumerator = calloc(1, sizeof(*enumerator)))) return E_OUTOFMEMORY; enumerator->IDWriteFontFileEnumerator_iface.lpVtbl = &singlefontfileenumeratorvtbl; @@ -2989,7 +2988,7 @@ static ULONG WINAPI fontcollectionloader_Release(IDWriteFontCollectionLoader *if ULONG ref = InterlockedDecrement(&loader->ref); if (!ref) - heap_free(loader); + free(loader); return ref; } @@ -3011,7 +3010,7 @@ static const struct IDWriteFontCollectionLoaderVtbl dwritefontcollectionloadervt static IDWriteFontCollectionLoader *create_collection_loader(void) { - struct collection_loader *loader = heap_alloc(sizeof(*loader)); + struct collection_loader *loader = malloc(sizeof(*loader)); loader->IDWriteFontCollectionLoader_iface.lpVtbl = &dwritefontcollectionloadervtbl; loader->ref = 1; @@ -3573,7 +3572,7 @@ static void array_reserve(void **elements, size_t *capacity, size_t count, size_ if (new_capacity < count) new_capacity = max_capacity; - if (!(new_elements = heap_realloc(*elements, new_capacity * size))) + if (!(new_elements = realloc(*elements, new_capacity * size))) return; *elements = new_elements; @@ -3705,7 +3704,7 @@ static UINT32 fontface_get_expected_unicode_ranges(IDWriteFontFace1 *fontface, D count = opentype_cmap_get_unicode_ranges(&cmap, &ranges); IDWriteFontFace1_ReleaseFontTable(fontface, cmap.context); - *out = heap_alloc(count * sizeof(**out)); + *out = malloc(count * sizeof(**out)); /* Eliminate duplicates and merge ranges together. */ for (i = 0, j = 0; i < count; ++i) { @@ -3720,7 +3719,7 @@ static UINT32 fontface_get_expected_unicode_ranges(IDWriteFontFace1 *fontface, D (*out)[j++] = ranges[i]; } - heap_free(ranges); + free(ranges); return j; } @@ -3776,7 +3775,7 @@ static void test_GetUnicodeRanges(void) ok(hr == E_NOT_SUFFICIENT_BUFFER, "got 0x%08x\n", hr); ok(count > 1, "got %u\n", count); - ranges = heap_alloc(count*sizeof(DWRITE_UNICODE_RANGE)); + ranges = malloc(count*sizeof(DWRITE_UNICODE_RANGE)); hr = IDWriteFontFace1_GetUnicodeRanges(fontface1, count, ranges, &count); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -3785,7 +3784,7 @@ static void test_GetUnicodeRanges(void) ok(hr == E_NOT_SUFFICIENT_BUFFER, "got 0x%08x\n", hr); ok(ranges[0].first != 0 && ranges[0].last != 0, "got 0x%x-0x%0x\n", ranges[0].first, ranges[0].last); - heap_free(ranges); + free(ranges); hr = IDWriteFactory_UnregisterFontFileLoader(factory, &rloader); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -3848,7 +3847,7 @@ if (strcmp(winetest_platform, "wine")) { hr = IDWriteFontFace1_GetUnicodeRanges(fontface1, 0, NULL, &range_count); ok(hr == E_NOT_SUFFICIENT_BUFFER, "Unexpected hr %#x.\n", hr); - ranges = heap_alloc(range_count * sizeof(*ranges)); + ranges = malloc(range_count * sizeof(*ranges)); hr = IDWriteFontFace1_GetUnicodeRanges(fontface1, range_count, ranges, &range_count); ok(hr == S_OK, "Failed to get ranges, hr %#x.\n", hr); @@ -3870,8 +3869,8 @@ if (strcmp(winetest_platform, "wine")) { } } - heap_free(expected_ranges); - heap_free(ranges); + free(expected_ranges); + free(ranges); IDWriteFontFace1_Release(fontface1); IDWriteFontFace_Release(fontface);

1 0

Stefan Dösinger : d3d11/tests: Disable cross-device ContextState tests.
by Alexandre Julliard Jan. 19, 2022

Jan. 19, 2022

Module: wine Branch: master Commit: 36d206008cc0631a6f8e58aa2c9463a4ede54f93 URL: https://source.winehq.org/git/wine.git/?a=commit;h=36d206008cc0631a6f8e58aa… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jan 17 23:22:00 2022 +0300 d3d11/tests: Disable cross-device ContextState tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51103 Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 151 ++++++++++++++++++++++++++--------------------- 1 file changed, 83 insertions(+), 68 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 298a2389555..4b06ba2c4d8 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -7422,74 +7422,88 @@ static void test_device_context_state(void) refcount = ID3D11VertexShader_Release(tmp_vs); ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); - /* context states may be used with other devices instances too */ - d3d11_device2 = create_device(NULL); - ok(!!d3d11_device2, "Failed to create device.\n"); - hr = ID3D11Device_QueryInterface(d3d11_device2, &IID_ID3D11Device1, (void **)&device2); - ok(SUCCEEDED(hr), "Failed to query device interface, hr %#x.\n", hr); - ID3D11Device_Release(d3d11_device2); - ID3D11Device1_GetImmediateContext1(device2, &context2); - ok(!!context2, "Failed to get immediate context.\n"); - - /* but they track a distinct state on each context */ - ID3D11DeviceContext1_SwapDeviceContextState(context2, context_state, &tmp_context_state); - ok(!!tmp_context_state, "Failed to get context state.\n"); - tmp_vs = (ID3D11VertexShader *)0xdeadbeef; - ID3D11DeviceContext1_VSGetShader(context2, &tmp_vs, NULL, NULL); - ok(!tmp_vs, "Got unexpected shader %p.\n", tmp_vs); - - /* updating context2 vertex shader doesn't update other contexts using the same state */ - ID3D11DeviceContext1_VSSetShader(context2, vs, NULL, 0); - ID3D11DeviceContext1_VSGetShader(context, &tmp_vs, NULL, NULL); - ok(tmp_vs == vs2, "Got shader %p, expected %p.\n", tmp_vs, vs2); - refcount = ID3D11VertexShader_Release(tmp_vs); - ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); - - ID3D11DeviceContext1_SwapDeviceContextState(context2, tmp_context_state, &context_state2); - refcount = ID3DDeviceContextState_Release(tmp_context_state); - ok(refcount == 0, "Got refcount %u, expected 1.\n", refcount); - refcount = ID3DDeviceContextState_Release(context_state2); - ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); - ok(context_state2 == context_state, "Got unexpected state pointer.\n"); - - /* swapping the default state on context2 effectively clears the vertex shader */ - tmp_vs = (ID3D11VertexShader *)0xdeadbeef; - ID3D11DeviceContext1_VSGetShader(context2, &tmp_vs, NULL, NULL); - ok(!tmp_vs, "Got unexpected shader %p.\n", tmp_vs); - - ID3D11DeviceContext1_SwapDeviceContextState(context2, context_state, &tmp_context_state); - ok(!!tmp_context_state, "Failed to get context state.\n"); - refcount = ID3DDeviceContextState_Release(tmp_context_state); - ok(refcount == 0, "Got refcount %u, expected 1.\n", refcount); - - /* clearing the vertex shader on context doesn't have side effect on context2 */ - ID3D11DeviceContext1_VSSetShader(context, NULL, NULL, 0); - refcount = ID3D11VertexShader_Release(vs2); - ok(refcount == 0, "Got refcount %u, expected 0.\n", refcount); - tmp_vs = (ID3D11VertexShader *)0xdeadbeef; - ID3D11DeviceContext1_VSGetShader(context2, &tmp_vs, NULL, NULL); - ok(tmp_vs == vs, "Got shader %p, expected %p.\n", tmp_vs, vs); - refcount = ID3D11VertexShader_Release(tmp_vs); - ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); - - /* even after swapping it again */ - ID3D11DeviceContext1_SwapDeviceContextState(context2, context_state, NULL); - tmp_vs = (ID3D11VertexShader *)0xdeadbeef; - ID3D11DeviceContext1_VSGetShader(context2, &tmp_vs, NULL, NULL); - ok(tmp_vs == vs, "Got shader %p, expected %p.\n", tmp_vs, vs); - refcount = ID3D11VertexShader_Release(tmp_vs); - ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); - - /* swapping the initial state on context2 doesn't have side effect on context either */ - ID3D11DeviceContext1_SwapDeviceContextState(context2, previous_context_state, NULL); - tmp_vs = (ID3D11VertexShader *)0xdeadbeef; - ID3D11DeviceContext1_VSGetShader(context, &tmp_vs, NULL, NULL); - ok(!tmp_vs, "Got unexpected shader %p.\n", tmp_vs); - - refcount = ID3D11DeviceContext1_Release(context2); - ok(refcount == 0, "Got refcount %u, expected 0.\n", refcount); - refcount = ID3D11Device1_Release(device2); - ok(refcount == 0, "Got refcount %u, expected 0.\n", refcount); + /* context states may be used with other devices instances too + * + * Or at least, no error is returned right away. Using objects like shaders + * from other device instances causes a segfault later on Nvidia Windows + * drivers. This suggests the feature tested below is more a bug than a + * feature. + * + * The tests below suggest that a ContextState object stores its own state + * for every device it is used with. This isn't entirely true, e.g. the + * primitive topology can be transfered between devices, but will cause odd + * refcounting behavior afterwards (IAGetPrimitiveTopology will leak 54 + * references on the context's device for example). */ + if (0) + { + d3d11_device2 = create_device(NULL); + ok(!!d3d11_device2, "Failed to create device.\n"); + hr = ID3D11Device_QueryInterface(d3d11_device2, &IID_ID3D11Device1, (void **)&device2); + ok(SUCCEEDED(hr), "Failed to query device interface, hr %#x.\n", hr); + ID3D11Device_Release(d3d11_device2); + ID3D11Device1_GetImmediateContext1(device2, &context2); + ok(!!context2, "Failed to get immediate context.\n"); + + /* but they track a distinct state on each context */ + ID3D11DeviceContext1_SwapDeviceContextState(context2, context_state, &tmp_context_state); + ok(!!tmp_context_state, "Failed to get context state.\n"); + tmp_vs = (ID3D11VertexShader *)0xdeadbeef; + ID3D11DeviceContext1_VSGetShader(context2, &tmp_vs, NULL, NULL); + ok(!tmp_vs, "Got unexpected shader %p.\n", tmp_vs); + + /* updating context2 vertex shader doesn't update other contexts using the same state */ + ID3D11DeviceContext1_VSSetShader(context2, vs, NULL, 0); + ID3D11DeviceContext1_VSGetShader(context, &tmp_vs, NULL, NULL); + ok(tmp_vs == vs2, "Got shader %p, expected %p.\n", tmp_vs, vs2); + refcount = ID3D11VertexShader_Release(tmp_vs); + ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + + ID3D11DeviceContext1_SwapDeviceContextState(context2, tmp_context_state, &context_state2); + refcount = ID3DDeviceContextState_Release(tmp_context_state); + ok(refcount == 0, "Got refcount %u, expected 1.\n", refcount); + refcount = ID3DDeviceContextState_Release(context_state2); + ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + ok(context_state2 == context_state, "Got unexpected state pointer.\n"); + + /* swapping the default state on context2 effectively clears the vertex shader */ + tmp_vs = (ID3D11VertexShader *)0xdeadbeef; + ID3D11DeviceContext1_VSGetShader(context2, &tmp_vs, NULL, NULL); + ok(!tmp_vs, "Got unexpected shader %p.\n", tmp_vs); + + ID3D11DeviceContext1_SwapDeviceContextState(context2, context_state, &tmp_context_state); + ok(!!tmp_context_state, "Failed to get context state.\n"); + refcount = ID3DDeviceContextState_Release(tmp_context_state); + ok(refcount == 0, "Got refcount %u, expected 1.\n", refcount); + + /* clearing the vertex shader on context doesn't have side effect on context2 */ + ID3D11DeviceContext1_VSSetShader(context, NULL, NULL, 0); + refcount = get_refcount(vs2); + ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + tmp_vs = (ID3D11VertexShader *)0xdeadbeef; + ID3D11DeviceContext1_VSGetShader(context2, &tmp_vs, NULL, NULL); + ok(tmp_vs == vs, "Got shader %p, expected %p.\n", tmp_vs, vs); + refcount = ID3D11VertexShader_Release(tmp_vs); + ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + + /* even after swapping it again */ + ID3D11DeviceContext1_SwapDeviceContextState(context2, context_state, NULL); + tmp_vs = (ID3D11VertexShader *)0xdeadbeef; + ID3D11DeviceContext1_VSGetShader(context2, &tmp_vs, NULL, NULL); + ok(tmp_vs == vs, "Got shader %p, expected %p.\n", tmp_vs, vs); + refcount = ID3D11VertexShader_Release(tmp_vs); + ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + + /* swapping the initial state on context2 doesn't have side effect on context either */ + ID3D11DeviceContext1_SwapDeviceContextState(context2, previous_context_state, NULL); + tmp_vs = (ID3D11VertexShader *)0xdeadbeef; + ID3D11DeviceContext1_VSGetShader(context, &tmp_vs, NULL, NULL); + ok(!tmp_vs, "Got unexpected shader %p.\n", tmp_vs); + + refcount = ID3D11DeviceContext1_Release(context2); + ok(refcount == 0, "Got refcount %u, expected 0.\n", refcount); + refcount = ID3D11Device1_Release(device2); + ok(refcount == 0, "Got refcount %u, expected 0.\n", refcount); + } ID3D11DeviceContext1_SwapDeviceContextState(context, previous_context_state, &tmp_context_state); refcount = ID3DDeviceContextState_Release(previous_context_state); @@ -8158,6 +8172,7 @@ static void test_device_context_state(void) if (hs) ID3D11HullShader_Release(hs); ID3D11PixelShader_Release(ps); ID3D11GeometryShader_Release(gs); + ID3D11VertexShader_Release(vs2); ID3D11VertexShader_Release(vs); ID3D11Buffer_Release(cb); ID3D11ShaderResourceView_Release(srv);

1 0

Arkadiusz Hiler : include: Add HID_USAGE_SIMULATION_CLUTCH.
by Alexandre Julliard Jan. 19, 2022

Jan. 19, 2022

Module: wine Branch: master Commit: 87331939a2c7b5f4a164e77c2f2d3e6c13d3c5a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=87331939a2c7b5f4a164e77c… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Wed Jan 19 15:04:21 2022 +0200 include: Add HID_USAGE_SIMULATION_CLUTCH. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/hidusage.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/hidusage.h b/include/hidusage.h index da7274b5945..3e2ee77f8c8 100644 --- a/include/hidusage.h +++ b/include/hidusage.h @@ -207,6 +207,7 @@ typedef USHORT USAGE, *PUSAGE; #define HID_USAGE_SIMULATION_THROTTLE ((USAGE) 0xBB) #define HID_USAGE_SIMULATION_ACCELERATOR ((USAGE) 0xC4) #define HID_USAGE_SIMULATION_BRAKE ((USAGE) 0xC5) +#define HID_USAGE_SIMULATION_CLUTCH ((USAGE) 0xC6) #define HID_USAGE_SIMULATION_STEERING ((USAGE) 0xC8) #define HID_USAGE_TELEPHONY_PHONE ((USAGE) 0x01)

1 0

Michael Stefaniuc : dmsynth: Avoid hungarian notation in the synth object.
by Alexandre Julliard Jan. 19, 2022

Jan. 19, 2022

Module: wine Branch: master Commit: 00eaccda845468b658cf558daffa8812306ee5c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00eaccda845468b658cf558d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Jan 19 18:48:49 2022 +0100 dmsynth: Avoid hungarian notation in the synth object. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmsynth/dmsynth_private.h | 4 ++-- dlls/dmsynth/synth.c | 34 +++++++++++++++++----------------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/dmsynth/dmsynth_private.h b/dlls/dmsynth/dmsynth_private.h index 9ad06dff5dd..22d020992b8 100644 --- a/dlls/dmsynth/dmsynth_private.h +++ b/dlls/dmsynth/dmsynth_private.h @@ -62,9 +62,9 @@ struct IDirectMusicSynth8Impl { LONG ref; /* IDirectMusicSynth8 fields */ - DMUS_PORTCAPS pCaps; + DMUS_PORTCAPS caps; BOOL active; - IReferenceClock* pLatencyClock; + IReferenceClock *latency_clock; IDirectMusicSynthSink *sink; }; diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index bd1ee201165..7c573ca708c 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -84,8 +84,8 @@ static ULONG WINAPI IDirectMusicSynth8Impl_Release(IDirectMusicSynth8 *iface) TRACE("(%p)->(): new ref = %u\n", This, ref); if (!ref) { - if (This->pLatencyClock) - IReferenceClock_Release(This->pLatencyClock); + if (This->latency_clock) + IReferenceClock_Release(This->latency_clock); HeapFree(GetProcessHeap(), 0, This); DMSYNTH_UnlockModule(); } @@ -295,7 +295,7 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_GetPortCaps(IDirectMusicSynth8 *ifa TRACE("(%p)->(%p)\n", This, caps); - *caps = This->pCaps; + *caps = This->caps; return S_OK; } @@ -323,8 +323,8 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_GetLatencyClock(IDirectMusicSynth8 if (!This->sink) return DMUS_E_NOSYNTHSINK; - *clock = This->pLatencyClock; - IReferenceClock_AddRef(This->pLatencyClock); + *clock = This->latency_clock; + IReferenceClock_AddRef(This->latency_clock); return S_OK; } @@ -368,7 +368,7 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_SetSynthSink(IDirectMusicSynth8 *if This->sink = sink; if (sink) - return IDirectMusicSynthSink_GetLatencyClock(sink, &This->pLatencyClock); + return IDirectMusicSynthSink_GetLatencyClock(sink, &This->latency_clock); return S_OK; } @@ -627,17 +627,17 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicSynthImpl(REFIID riid, void **ppobj) obj->IKsControl_iface.lpVtbl = &DMSynthImpl_IKsControl_Vtbl; obj->ref = 1; /* fill in caps */ - obj->pCaps.dwSize = sizeof(DMUS_PORTCAPS); - obj->pCaps.dwFlags = DMUS_PC_DLS | DMUS_PC_SOFTWARESYNTH | DMUS_PC_DIRECTSOUND | DMUS_PC_DLS2 | DMUS_PC_AUDIOPATH | DMUS_PC_WAVE; - obj->pCaps.guidPort = CLSID_DirectMusicSynth; - obj->pCaps.dwClass = DMUS_PC_OUTPUTCLASS; - obj->pCaps.dwType = DMUS_PORT_USER_MODE_SYNTH; - obj->pCaps.dwMemorySize = DMUS_PC_SYSTEMMEMORY; - obj->pCaps.dwMaxChannelGroups = 1000; - obj->pCaps.dwMaxVoices = 1000; - obj->pCaps.dwMaxAudioChannels = 2; - obj->pCaps.dwEffectFlags = DMUS_EFFECT_REVERB; - lstrcpyW(obj->pCaps.wszDescription, L"Microsoft Synthesizer"); + obj->caps.dwSize = sizeof(DMUS_PORTCAPS); + obj->caps.dwFlags = DMUS_PC_DLS | DMUS_PC_SOFTWARESYNTH | DMUS_PC_DIRECTSOUND | DMUS_PC_DLS2 | DMUS_PC_AUDIOPATH | DMUS_PC_WAVE; + obj->caps.guidPort = CLSID_DirectMusicSynth; + obj->caps.dwClass = DMUS_PC_OUTPUTCLASS; + obj->caps.dwType = DMUS_PORT_USER_MODE_SYNTH; + obj->caps.dwMemorySize = DMUS_PC_SYSTEMMEMORY; + obj->caps.dwMaxChannelGroups = 1000; + obj->caps.dwMaxVoices = 1000; + obj->caps.dwMaxAudioChannels = 2; + obj->caps.dwEffectFlags = DMUS_EFFECT_REVERB; + lstrcpyW(obj->caps.wszDescription, L"Microsoft Synthesizer"); DMSYNTH_LockModule(); hr = IDirectMusicSynth8_QueryInterface(&obj->IDirectMusicSynth8_iface, riid, ppobj);

1 0

Michael Stefaniuc : dmsynth: Activate the sink from the synth Activate() method.
by Alexandre Julliard Jan. 19, 2022

Jan. 19, 2022

Module: wine Branch: master Commit: 5d687a23e43754715c5f0504f1369aa5c181b661 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d687a23e43754715c5f0504… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Jan 19 18:48:48 2022 +0100 dmsynth: Activate the sink from the synth Activate() method. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmsynth/dmsynth_private.h | 2 +- dlls/dmsynth/synth.c | 20 +++++++++++++++++++- dlls/dmsynth/tests/dmsynth.c | 2 +- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/dmsynth/dmsynth_private.h b/dlls/dmsynth/dmsynth_private.h index 32a79f65dd3..9ad06dff5dd 100644 --- a/dlls/dmsynth/dmsynth_private.h +++ b/dlls/dmsynth/dmsynth_private.h @@ -63,7 +63,7 @@ struct IDirectMusicSynth8Impl { /* IDirectMusicSynth8 fields */ DMUS_PORTCAPS pCaps; - BOOL fActive; + BOOL active; IReferenceClock* pLatencyClock; IDirectMusicSynthSink *sink; }; diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index 4d71bc738c1..bd1ee201165 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -332,10 +332,28 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_GetLatencyClock(IDirectMusicSynth8 static HRESULT WINAPI IDirectMusicSynth8Impl_Activate(IDirectMusicSynth8 *iface, BOOL enable) { IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); + HRESULT hr; TRACE("(%p)->(%d)\n", This, enable); - This->fActive = enable; + if (!This->sink) + return DMUS_E_NOSYNTHSINK; + + if (enable == This->active) { + if (enable) + return DMUS_E_SYNTHACTIVE; + else + return S_FALSE; + } + + if ((hr = IDirectMusicSynthSink_Activate(This->sink, enable)) != S_OK) { + if (hr == DMUS_E_SYNTHACTIVE || hr == S_FALSE) + WARN("Synth and sink active state out of sync. Fixing.\n"); + else + return hr; + } + + This->active = enable; return S_OK; } diff --git a/dlls/dmsynth/tests/dmsynth.c b/dlls/dmsynth/tests/dmsynth.c index 3970933cb6f..bb42553469b 100644 --- a/dlls/dmsynth/tests/dmsynth.c +++ b/dlls/dmsynth/tests/dmsynth.c @@ -114,7 +114,7 @@ static void test_dmsynth(void) /* Synth isn't fully initialized yet */ hr = IDirectMusicSynth_Activate(dmsynth, TRUE); - todo_wine ok(hr == DMUS_E_NOSYNTHSINK, "IDirectMusicSynth_Activate returned: %x\n", hr); + ok(hr == DMUS_E_NOSYNTHSINK, "IDirectMusicSynth_Activate returned: %x\n", hr); /* Synth has no default clock */ hr = IDirectMusicSynth_GetLatencyClock(dmsynth, &clock_synth);

1 0

Nikolay Sivov : mfplat: Implement MFTGetInfo().
by Alexandre Julliard Jan. 19, 2022

Jan. 19, 2022

Module: wine Branch: master Commit: 00544351784e53b06017af8d09bf6f002b937ac4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00544351784e53b06017af8d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 19 18:10:20 2022 +0300 mfplat: Implement MFTGetInfo(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 153 ++++++++++++++++++++++++++++++++++++++++++--- dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/tests/mfplat.c | 61 ++++++++++++++++-- include/mfapi.h | 2 + 4 files changed, 203 insertions(+), 15 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=00544351784e53b06017…

1 0

Arkadiusz Hiler : dinput/tests: Add static asserts for arrays that have to match in size.
by Alexandre Julliard Jan. 19, 2022

Jan. 19, 2022

Module: wine Branch: master Commit: 2420f7e188e04cb428211aabef8ec2f327b0416f URL: https://source.winehq.org/git/wine.git/?a=commit;h=2420f7e188e04cb428211aab… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Wed Jan 19 15:04:20 2022 +0200 dinput/tests: Add static asserts for arrays that have to match in size. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/joystick8.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index d06b56cbf8c..dd06b1b5185 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -2311,6 +2311,9 @@ static BOOL test_device_types( DWORD version ) }, }; + C_ASSERT(ARRAY_SIZE(expect_caps) == ARRAY_SIZE(device_desc)); + C_ASSERT(ARRAY_SIZE(expect_devinst) == ARRAY_SIZE(device_desc)); + DIDEVICEINSTANCEW devinst = {.dwSize = sizeof(DIDEVICEINSTANCEW)}; DIDEVCAPS caps = {.dwSize = sizeof(DIDEVCAPS)}; WCHAR cwd[MAX_PATH], tempdir[MAX_PATH];

1 0

Michael Stefaniuc : dmsynth: Disconnect old sink, addref and init new sink.
by Alexandre Julliard Jan. 19, 2022

Jan. 19, 2022

Module: wine Branch: master Commit: 6c73c3166bf7a982da276a893af32173bc96b0d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c73c3166bf7a982da276a89… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Jan 19 18:48:50 2022 +0100 dmsynth: Disconnect old sink, addref and init new sink. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmsynth/synth.c | 21 +++++++++++++++++---- dlls/dmsynth/tests/dmsynth.c | 12 ++++++++++-- 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index 7c573ca708c..3d3af80d005 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -362,15 +362,28 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_SetSynthSink(IDirectMusicSynth8 *if IDirectMusicSynthSink *sink) { IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); + HRESULT hr; TRACE("(%p)->(%p)\n", iface, sink); - This->sink = sink; + if (sink == This->sink) + return S_OK; + + if (!sink || This->sink) { + /* Disconnect the sink */ + if (This->latency_clock) + IReferenceClock_Release(This->latency_clock); + IDirectMusicSynthSink_Release(This->sink); + } - if (sink) - return IDirectMusicSynthSink_GetLatencyClock(sink, &This->latency_clock); + This->sink = sink; + if (!sink) + return S_OK; - return S_OK; + IDirectMusicSynthSink_AddRef(This->sink); + if (FAILED(hr = IDirectMusicSynthSink_Init(sink, (IDirectMusicSynth *)iface))) + return hr; + return IDirectMusicSynthSink_GetLatencyClock(sink, &This->latency_clock); } static HRESULT WINAPI IDirectMusicSynth8Impl_Render(IDirectMusicSynth8 *iface, short *buffer, diff --git a/dlls/dmsynth/tests/dmsynth.c b/dlls/dmsynth/tests/dmsynth.c index bb42553469b..1e3e20829b7 100644 --- a/dlls/dmsynth/tests/dmsynth.c +++ b/dlls/dmsynth/tests/dmsynth.c @@ -54,7 +54,7 @@ static ULONG get_refcount(void *iface) static void test_dmsynth(void) { IDirectMusicSynth *dmsynth = NULL; - IDirectMusicSynthSink *dmsynth_sink = NULL; + IDirectMusicSynthSink *dmsynth_sink = NULL, *dmsynth_sink2 = NULL; IReferenceClock* clock_synth = NULL; IReferenceClock* clock_sink = NULL; IKsControl* control_synth = NULL; @@ -68,7 +68,11 @@ static void test_dmsynth(void) hr = CoCreateInstance(&CLSID_DirectMusicSynth, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynth, (LPVOID*)&dmsynth); ok(hr == S_OK, "CoCreateInstance returned: %x\n", hr); - hr = CoCreateInstance(&CLSID_DirectMusicSynthSink, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynthSink, (LPVOID*)&dmsynth_sink); + hr = CoCreateInstance(&CLSID_DirectMusicSynthSink, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynthSink, + (void **)&dmsynth_sink); + ok(hr == S_OK, "CoCreateInstance returned: %x\n", hr); + hr = CoCreateInstance(&CLSID_DirectMusicSynthSink, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynthSink, + (void **)&dmsynth_sink2); ok(hr == S_OK, "CoCreateInstance returned: %x\n", hr); hr = IDirectMusicSynth_QueryInterface(dmsynth, &IID_IKsControl, (LPVOID*)&control_synth); @@ -127,6 +131,8 @@ static void test_dmsynth(void) ref_clock_sink = get_refcount(clock_sink); /* This will Init() the SynthSink and finish initializing the Synth */ + hr = IDirectMusicSynth_SetSynthSink(dmsynth, dmsynth_sink2); + ok(hr == S_OK, "IDirectMusicSynth_SetSynthSink returned: %x\n", hr); hr = IDirectMusicSynth_SetSynthSink(dmsynth, dmsynth_sink); ok(hr == S_OK, "IDirectMusicSynth_SetSynthSink returned: %x\n", hr); @@ -148,6 +154,8 @@ static void test_dmsynth(void) IReferenceClock_Release(clock_sink); if (dmsynth_sink) IDirectMusicSynthSink_Release(dmsynth_sink); + if (dmsynth_sink2) + IDirectMusicSynthSink_Release(dmsynth_sink2); IDirectMusicSynth_Release(dmsynth); }

1 0