March 2019 - Wine-commits - list.winehq.org

Józef Kucia : winevulkan: Enable a few extensions promoted to core in Vulkan 1.1.
by Alexandre Julliard 20 Mar '19

20 Mar '19

Module: wine Branch: master Commit: 44c2de5ba4df4aeb9848722b7f527dc3861c62fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=44c2de5ba4df4aeb9848722b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 20 13:11:36 2019 +0100 winevulkan: Enable a few extensions promoted to core in Vulkan 1.1. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 37 +++++++++++++++++++++---------------- dlls/winevulkan/vulkan_thunks.c | 4 ++++ include/wine/vulkan.h | 8 ++++++++ 3 files changed, 33 insertions(+), 16 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 8b0ed0c..d54cb06 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -85,45 +85,50 @@ EXT_BLOCK_SIZE = 1000 BLACKLISTED_EXTENSIONS = [ # Instance extensions + "VK_EXT_debug_report", + # Handling of VK_EXT_debug_report requires some consideration. The win32 + # loader already provides it for us and it is somewhat usable. If we add + # plumbing down to the native layer, we will get each message twice as we + # use 2 loaders (win32+native), but we may get output from the driver. + # In any case callback conversion is required. "VK_EXT_debug_utils", "VK_EXT_validation_features", "VK_EXT_validation_flags", - "VK_KHR_display", + "VK_KHR_display", # Needs WSI work. "VK_KHR_get_surface_capabilities2", "VK_KHR_surface_protected_capabilities", - "VK_NV_external_memory_capabilities", # Device extensions "VK_AMD_display_native_hdr", - "VK_AMD_memory_overallocation_behavior", - # Handling of VK_EXT_debug_report requires some consideration. The win32 - # loader already provides it for us and it is somewhat usable. If we add - # plumbing down to the native layer, we will get each message twice as we - # use 2 loaders (win32+native), but we may get output from the driver. - # In any case callback conversion is required. "VK_EXT_calibrated_timestamps", - "VK_EXT_debug_report", + "VK_AMD_memory_overallocation_behavior", "VK_EXT_display_control", # Requires VK_EXT_display_surface_counter - "VK_EXT_external_memory_dma_buf", # Linux specific + "VK_EXT_external_memory_host", "VK_EXT_full_screen_exclusive", "VK_EXT_hdr_metadata", # Needs WSI work. - "VK_EXT_image_drm_format_modifier", "VK_EXT_memory_priority", "VK_EXT_pipeline_creation_feedback", "VK_EXT_ycbcr_image_arrays", "VK_GOOGLE_display_timing", - "VK_KHR_display", # Needs WSI work. - "VK_KHR_external_fence", - "VK_KHR_external_fence_fd", "VK_KHR_external_fence_win32", - "VK_KHR_external_memory", - "VK_KHR_external_semaphore", + "VK_KHR_external_memory_win32", + "VK_KHR_external_semaphore_win32", "VK_KHR_shader_float16_int8", # Relates to external_semaphore and needs type conversions in bitflags. "VK_KHR_shared_presentable_image", # Needs WSI work. "VK_KHR_win32_keyed_mutex", "VK_NV_cooperative_matrix", "VK_NV_dedicated_allocation_image_aliasing", + + # Extensions for other platforms + "VK_EXT_external_memory_dma_buf", + "VK_EXT_image_drm_format_modifier", + "VK_KHR_external_fence_fd", + "VK_KHR_external_memory_fd", + "VK_KHR_external_semaphore_fd", + + # Deprecated extensions + "VK_NV_external_memory_capabilities", "VK_NV_external_memory_win32", ] diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index ae4bcb2..e1df2aa 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -3637,6 +3637,7 @@ static const char * const vk_device_extensions[] = "VK_EXT_memory_budget", "VK_EXT_pci_bus_info", "VK_EXT_post_depth_coverage", + "VK_EXT_queue_family_foreign", "VK_EXT_sample_locations", "VK_EXT_sampler_filter_minmax", "VK_EXT_scalar_block_layout", @@ -3662,6 +3663,9 @@ static const char * const vk_device_extensions[] = "VK_KHR_device_group", "VK_KHR_draw_indirect_count", "VK_KHR_driver_properties", + "VK_KHR_external_fence", + "VK_KHR_external_memory", + "VK_KHR_external_semaphore", "VK_KHR_get_memory_requirements2", "VK_KHR_image_format_list", "VK_KHR_incremental_present", diff --git a/include/wine/vulkan.h b/include/wine/vulkan.h index 0754b03..2a86277 100644 --- a/include/wine/vulkan.h +++ b/include/wine/vulkan.h @@ -148,8 +148,12 @@ #define VK_KHR_DEVICE_GROUP_CREATION_EXTENSION_NAME "VK_KHR_device_group_creation" #define VK_KHR_EXTERNAL_MEMORY_CAPABILITIES_SPEC_VERSION 1 #define VK_KHR_EXTERNAL_MEMORY_CAPABILITIES_EXTENSION_NAME "VK_KHR_external_memory_capabilities" +#define VK_KHR_EXTERNAL_MEMORY_SPEC_VERSION 1 +#define VK_KHR_EXTERNAL_MEMORY_EXTENSION_NAME "VK_KHR_external_memory" #define VK_KHR_EXTERNAL_SEMAPHORE_CAPABILITIES_SPEC_VERSION 1 #define VK_KHR_EXTERNAL_SEMAPHORE_CAPABILITIES_EXTENSION_NAME "VK_KHR_external_semaphore_capabilities" +#define VK_KHR_EXTERNAL_SEMAPHORE_SPEC_VERSION 1 +#define VK_KHR_EXTERNAL_SEMAPHORE_EXTENSION_NAME "VK_KHR_external_semaphore" #define VK_KHR_PUSH_DESCRIPTOR_SPEC_VERSION 2 #define VK_KHR_PUSH_DESCRIPTOR_EXTENSION_NAME "VK_KHR_push_descriptor" #define VK_EXT_CONDITIONAL_RENDERING_SPEC_VERSION 1 @@ -182,10 +186,14 @@ #define VK_KHR_CREATE_RENDERPASS_2_EXTENSION_NAME "VK_KHR_create_renderpass2" #define VK_KHR_EXTERNAL_FENCE_CAPABILITIES_SPEC_VERSION 1 #define VK_KHR_EXTERNAL_FENCE_CAPABILITIES_EXTENSION_NAME "VK_KHR_external_fence_capabilities" +#define VK_KHR_EXTERNAL_FENCE_SPEC_VERSION 1 +#define VK_KHR_EXTERNAL_FENCE_EXTENSION_NAME "VK_KHR_external_fence" #define VK_KHR_MAINTENANCE2_SPEC_VERSION 1 #define VK_KHR_MAINTENANCE2_EXTENSION_NAME "VK_KHR_maintenance2" #define VK_KHR_VARIABLE_POINTERS_SPEC_VERSION 1 #define VK_KHR_VARIABLE_POINTERS_EXTENSION_NAME "VK_KHR_variable_pointers" +#define VK_EXT_QUEUE_FAMILY_FOREIGN_SPEC_VERSION 1 +#define VK_EXT_QUEUE_FAMILY_FOREIGN_EXTENSION_NAME "VK_EXT_queue_family_foreign" #define VK_KHR_DEDICATED_ALLOCATION_SPEC_VERSION 3 #define VK_KHR_DEDICATED_ALLOCATION_EXTENSION_NAME "VK_KHR_dedicated_allocation" #define VK_EXT_SAMPLER_FILTER_MINMAX_SPEC_VERSION 1

1 0

Józef Kucia : winevulkan: Enable Vulkan 1.1.
by Alexandre Julliard 20 Mar '19

20 Mar '19

Module: wine Branch: master Commit: ccfdf651d1db43b1fa80fd3c47c64311687754a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ccfdf651d1db43b1fa80fd3c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 20 13:11:37 2019 +0100 winevulkan: Enable Vulkan 1.1. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index d54cb06..20643fa 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -65,7 +65,7 @@ LOGGER = logging.Logger("vulkan") LOGGER.addHandler(logging.StreamHandler()) VK_XML_VERSION = "1.1.104" -WINE_VK_VERSION = (1, 0) +WINE_VK_VERSION = (1, 1) # Filenames to create. WINE_VULKAN_H = "../../include/wine/vulkan.h" diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h index 4e14ac7..6d0ed45 100644 --- a/dlls/winevulkan/vulkan_thunks.h +++ b/dlls/winevulkan/vulkan_thunks.h @@ -38,7 +38,7 @@ #ifndef __WINE_VULKAN_THUNKS_H #define __WINE_VULKAN_THUNKS_H -#define WINE_VK_VERSION VK_API_VERSION_1_0 +#define WINE_VK_VERSION VK_API_VERSION_1_1 /* Functions for which we have custom implementations outside of the thunks. */ VkResult WINAPI wine_vkAllocateCommandBuffers(VkDevice device, const VkCommandBufferAllocateInfo *pAllocateInfo, VkCommandBuffer *pCommandBuffers);

1 0

Józef Kucia : winevulkan: Trace structure types as decimal numbers.
by Alexandre Julliard 20 Mar '19

20 Mar '19

Module: wine Branch: master Commit: f3f38eb8c74b320977986e02a59cb3bf8fe1b259 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3f38eb8c74b320977986e02… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 20 13:11:38 2019 +0100 winevulkan: Trace structure types as decimal numbers. In Vulkan headers, structure types are specified as decimal numbers. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 4387aa8..635c6a9 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -303,7 +303,7 @@ static VkResult wine_vk_device_convert_create_info(const VkDeviceCreateInfo *src break; default: - FIXME("Application requested a linked structure of type %#x.\n", header->sType); + FIXME("Application requested a linked structure of type %u.\n", header->sType); } } } @@ -408,7 +408,7 @@ static VkResult wine_vk_instance_convert_create_info(const VkInstanceCreateInfo break; default: - FIXME("Application requested a linked structure of type %#x.\n", header->sType); + FIXME("Application requested a linked structure of type %u.\n", header->sType); } } } @@ -1028,7 +1028,7 @@ void WINAPI wine_vkGetDeviceQueue2(VkDevice device, const VkDeviceQueueInfo2 *in TRACE("%p, %p, %p\n", device, info, queue); if ((chain = info->pNext)) - FIXME("Ignoring a linked structure of type %#x.\n", chain->sType); + FIXME("Ignoring a linked structure of type %u.\n", chain->sType); matching_queue = &device->queues[info->queueFamilyIndex][info->queueIndex]; if (matching_queue->flags != info->flags)

1 0

Józef Kucia : winevulkan: Convert VkPhysicalDeviceFeatures2 in VkDeviceCreateInfo chain.
by Alexandre Julliard 20 Mar '19

20 Mar '19

Module: wine Branch: master Commit: ec8a3a78b8219b167fffa9e0108eb67f56e8aec0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec8a3a78b8219b167fffa9e0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 20 13:11:39 2019 +0100 winevulkan: Convert VkPhysicalDeviceFeatures2 in VkDeviceCreateInfo chain. We should teach make_vulkan to handle pNext chains... Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 635c6a9..f86064c 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -207,6 +207,20 @@ static struct VkQueue_T *wine_vk_device_alloc_queues(struct VkDevice_T *device, return queues; } +static void *convert_VkPhysicalDeviceFeatures2(const void *src) +{ + const VkPhysicalDeviceFeatures2 *in = src; + VkPhysicalDeviceFeatures2 *out; + + if (!(out = heap_alloc(sizeof(*out)))) + return NULL; + + *out = *in; + out->pNext = NULL; + + return out; +} + static void *convert_VkDeviceGroupDeviceCreateInfo(const void *src) { const VkDeviceGroupDeviceCreateInfo *in = src; @@ -248,12 +262,15 @@ static void *convert_VkPhysicalDeviceHostQueryResetFeaturesEXT(const void *src) static void wine_vk_device_free_create_info(VkDeviceCreateInfo *create_info) { VkPhysicalDeviceHostQueryResetFeaturesEXT *host_query_reset_features; + VkPhysicalDeviceFeatures2 *device_features; VkDeviceGroupDeviceCreateInfo *group_info; + device_features = wine_vk_find_struct(create_info, PHYSICAL_DEVICE_FEATURES_2); group_info = wine_vk_find_struct(create_info, DEVICE_GROUP_DEVICE_CREATE_INFO); host_query_reset_features = wine_vk_find_struct(create_info, PHYSICAL_DEVICE_HOST_QUERY_RESET_FEATURES_EXT); create_info->pNext = NULL; + heap_free(device_features); if (group_info) { heap_free((void *)group_info->pPhysicalDevices); @@ -296,6 +313,12 @@ static VkResult wine_vk_device_convert_create_info(const VkDeviceCreateInfo *src dst_header = dst_header->pNext; break; + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2: + if (!(dst_header->pNext = convert_VkPhysicalDeviceFeatures2(header))) + goto err; + dst_header = dst_header->pNext; + break; + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_QUERY_RESET_FEATURES_EXT: if (!(dst_header->pNext = convert_VkPhysicalDeviceHostQueryResetFeaturesEXT(header))) goto err;

1 0

Jacek Caban : jscript: Support undefined context value in Array.prototype.forEach.
by Alexandre Julliard 20 Mar '19

20 Mar '19

Module: wine Branch: master Commit: 6d69c6db51495281b1e4064066937d78aa24817a URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d69c6db51495281b1e40640… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 20 17:41:18 2019 +0100 jscript: Support undefined context value in Array.prototype.forEach. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/array.c | 17 +++++++++++------ dlls/mshtml/tests/es5.js | 7 +++++++ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index a7b1f02..0c54fc0 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -959,16 +959,21 @@ static HRESULT Array_forEach(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsi TRACE("\n"); - /* FIXME: Check IsCallable */ - if(argc != 1 || !is_object_instance(argv[0])) { - FIXME("Unsupported arguments\n"); - return E_NOTIMPL; - } - hres = get_length(ctx, vthis, &jsthis, &length); if(FAILED(hres)) return hres; + /* Fixme check IsCallable */ + if(!argc || !is_object_instance(argv[0]) || !get_object(argv[0])) { + FIXME("Invalid arg %s\n", debugstr_jsval(argc ? argv[0] : jsval_undefined())); + return E_INVALIDARG; + } + + if(argc > 1 && !is_undefined(argv[1])) { + FIXME("Unsupported context this %s\n", debugstr_jsval(argv[1])); + return E_NOTIMPL; + } + for(i = 0; i < length; i++) { hres = jsdisp_get_idx(jsthis, i, &value); if(hres == DISP_E_UNKNOWNNAME) diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 0ee2eff..8e5b846 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -109,6 +109,13 @@ function test_array_forEach() { test(new String("abc"), [[0,"a"],[1,"b"],[2,"c"]]); test([], []); + [1,2].forEach(function() { + ok(this === window, "this != window"); + }); + [1,2].forEach(function() { + ok(this === window, "this != window"); + }, undefined); + next_test(); }

1 0

Jacek Caban : jscript: Support undefined context value in Array.prototype.map.
by Alexandre Julliard 20 Mar '19

20 Mar '19

Module: wine Branch: master Commit: 8be931623a36694fbc51280c322fa8434844a430 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8be931623a36694fbc51280c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 20 17:41:31 2019 +0100 jscript: Support undefined context value in Array.prototype.map. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/array.c | 5 +++-- dlls/mshtml/tests/es5.js | 7 +++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 0c54fc0..a5acfdf 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -1074,11 +1074,12 @@ static HRESULT Array_map(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned callback = get_object(argv[0]); if(argc > 1) { - if(!is_object_instance(argv[1]) || !get_object(argv[1])) { + if(is_object_instance(argv[1]) && get_object(argv[1])) { + context_this = get_object(argv[1]); + }else if(!is_undefined(argv[1])) { FIXME("Unsupported context this %s\n", debugstr_jsval(argv[1])); return E_NOTIMPL; } - context_this = get_object(argv[1]); } hres = create_array(ctx, length, &array); diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 8e5b846..7afdf97 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -178,6 +178,13 @@ function test_array_map() { ok(calls === "0:1,1:3,2:5,", "calls = " + calls); ok(m.join() === "0,2,4", "m = " + m); + [1,2].map(function() { + ok(this === window, "this != window"); + }); + [1,2].map(function() { + ok(this === window, "this != window"); + }, undefined); + next_test(); }

1 0

Jon Doron : kernel32: Make GetEnvironmentStringsW returns a copy of the environment.
by Alexandre Julliard 20 Mar '19

20 Mar '19

Module: wine Branch: master Commit: be25d225adc0771be35f67eb827a6a5da9fde20b URL: https://source.winehq.org/git/wine.git/?a=commit;h=be25d225adc0771be35f67eb… Author: Jon Doron <arilou(a)gmail.com> Date: Mon Mar 18 07:20:42 2019 +0200 kernel32: Make GetEnvironmentStringsW returns a copy of the environment. There are certain applications which try to traverse the environement being returned, but this is problematic since they cannot acquire the PEB Lock (i.e cl.exe on Visual Studio 14.15) . Signed-off-by: Jon Doron <arilou(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/environ.c | 18 ++++++++++++++++-- dlls/kernel32/tests/environ.c | 15 +++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/environ.c b/dlls/kernel32/environ.c index 99bf706..0fa7596 100644 --- a/dlls/kernel32/environ.c +++ b/dlls/kernel32/environ.c @@ -139,7 +139,21 @@ LPSTR WINAPI GetEnvironmentStringsA(void) */ LPWSTR WINAPI GetEnvironmentStringsW(void) { - return NtCurrentTeb()->Peb->ProcessParameters->Environment; + LPWSTR ret, ptrW; + unsigned len; + + RtlAcquirePebLock(); + + ptrW = NtCurrentTeb()->Peb->ProcessParameters->Environment; + while (*ptrW) ptrW += strlenW(ptrW) + 1; + ptrW++; + + len = (ptrW - NtCurrentTeb()->Peb->ProcessParameters->Environment) * sizeof(WCHAR); + ret = HeapAlloc(GetProcessHeap(), 0, len); + if (ret) memcpy(ret, NtCurrentTeb()->Peb->ProcessParameters->Environment, len); + + RtlReleasePebLock(); + return ret; } @@ -157,7 +171,7 @@ BOOL WINAPI FreeEnvironmentStringsA( LPSTR ptr ) */ BOOL WINAPI FreeEnvironmentStringsW( LPWSTR ptr ) { - return TRUE; + return HeapFree( GetProcessHeap(), 0, ptr ); } diff --git a/dlls/kernel32/tests/environ.c b/dlls/kernel32/tests/environ.c index f8452be..4249ea7 100644 --- a/dlls/kernel32/tests/environ.c +++ b/dlls/kernel32/tests/environ.c @@ -554,6 +554,20 @@ static void test_GetComputerNameExW(void) HeapFree(GetProcessHeap(), 0, nameW); } +static void test_GetEnvironmentStringsW(void) +{ + PWCHAR env1; + PWCHAR env2; + + env1 = GetEnvironmentStringsW(); + env2 = GetEnvironmentStringsW(); + ok(env1 != env2 || + broken(env1 == env2), /* NT <= 5.1 */ + "should return different copies\n"); + FreeEnvironmentStringsW(env1); + FreeEnvironmentStringsW(env2); +} + START_TEST(environ) { init_functionpointers(); @@ -565,4 +579,5 @@ START_TEST(environ) test_GetComputerName(); test_GetComputerNameExA(); test_GetComputerNameExW(); + test_GetEnvironmentStringsW(); }

1 0

Nikolay Sivov : mfplat: Add media source attribute guids.
by Alexandre Julliard 20 Mar '19

20 Mar '19

Module: wine Branch: master Commit: 999abe0f859fc6188b6c48a007c81ebbde2fdbf8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=999abe0f859fc6188b6c48a0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 20 08:35:37 2019 +0300 mfplat: Add media source attribute guids. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 11 +++++++++++ include/mfreadwrite.idl | 12 +++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index ccd0a03..c459e0a 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -556,9 +556,11 @@ static const char *debugstr_attr(const GUID *guid) #define X(g) { &(g), #g } X(MF_READWRITE_MMCSS_CLASS), X(MF_SINK_WRITER_ENCODER_CONFIG), + X(MF_SOURCE_READER_ENABLE_TRANSCODE_ONLY_TRANSFORMS), X(MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS), X(MF_MT_PIXEL_ASPECT_RATIO), X(MF_MT_AVG_BITRATE), + X(MF_SOURCE_READER_ENABLE_ADVANCED_VIDEO_PROCESSING), X(MF_PD_PMPHOST_CONTEXT), X(MF_PD_APP_CONTEXT), X(MF_PD_TOTAL_FILE_SIZE), @@ -570,12 +572,15 @@ static const char *debugstr_attr(const GUID *guid) X(MF_MT_ALL_SAMPLES_INDEPENDENT), X(MF_PD_PREFERRED_LANGUAGE), X(MF_PD_PLAYBACK_BOUNDARY_TIME), + X(MF_SOURCE_READER_ENABLE_VIDEO_PROCESSING), X(MF_MT_FRAME_SIZE), X(MF_SINK_WRITER_ASYNC_CALLBACK), X(MF_MT_FRAME_RATE_RANGE_MAX), X(MF_MT_USER_DATA), + X(MF_SOURCE_READER_DISCONNECT_MEDIASOURCE_ON_SHUTDOWN), X(MF_READWRITE_DISABLE_CONVERTERS), X(MFSampleExtension_Token), + X(MF_SOURCE_READER_D3D11_BIND_FLAGS), X(MF_PD_SAMI_STYLELIST), X(MF_SD_LANGUAGE), X(MF_SD_PROTECTED), @@ -595,14 +600,20 @@ static const char *debugstr_attr(const GUID *guid) X(MF_SD_MUTUALLY_EXCLUSIVE), X(MF_SD_STREAM_NAME), X(MF_SINK_WRITER_D3D_MANAGER), + X(MF_SOURCE_READER_D3D_MANAGER), + X(MF_SOURCE_READER_ASYNC_CALLBACK), X(MF_MT_INTERLACE_MODE), + X(MF_SOURCE_READER_MEDIASOURCE_CHARACTERISTICS), X(MF_READWRITE_MMCSS_PRIORITY), X(MFSampleExtension_DecodeTimestamp), X(MF_SINK_WRITER_DISABLE_THROTTLING), X(MF_READWRITE_D3D_OPTIONAL), X(MF_READWRITE_MMCSS_CLASS_AUDIO), + X(MF_SOURCE_READER_DISABLE_CAMERA_PLUGINS), X(MF_PD_AUDIO_ISVARIABLEBITRATE), X(MF_MT_FRAME_RATE), + X(MF_SOURCE_READER_MEDIASOURCE_CONFIG), + X(MF_SOURCE_READER_DISABLE_DXVA), #undef X }; struct guid_def *ret = NULL; diff --git a/include/mfreadwrite.idl b/include/mfreadwrite.idl index 9097b5a..86e6eea 100644 --- a/include/mfreadwrite.idl +++ b/include/mfreadwrite.idl @@ -78,7 +78,17 @@ cpp_quote("EXTERN_GUID(MF_READWRITE_MMCSS_CLASS_AUDIO, 0x430847da, 0x08 cpp_quote("EXTERN_GUID(MF_READWRITE_MMCSS_PRIORITY_AUDIO, 0x273db885, 0x2de2, 0x4db2, 0xa6, 0xa7, 0xfd, 0xb6, 0x6f, 0xb4, 0x0b, 0x61);") cpp_quote("EXTERN_GUID(MF_READWRITE_D3D_OPTIONAL, 0x216479d9, 0x3071, 0x42ca, 0xbb, 0x6c, 0x4c, 0x22, 0x10, 0x2e, 0x1d, 0x18);") -cpp_quote("EXTERN_GUID(MF_SOURCE_READER_MEDIASOURCE_CHARACTERISTICS, 0x6d23f5c8, 0xc5d7, 0x4a9b, 0x99, 0x71, 0x5d, 0x11, 0xf8, 0xbc, 0xa8, 0x80);") +cpp_quote("EXTERN_GUID(MF_SOURCE_READER_ASYNC_CALLBACK, 0x1e3dbeac, 0xbb43, 0x4c35, 0xb5, 0x07, 0xcd, 0x64, 0x44, 0x64, 0xc9, 0x65);") +cpp_quote("EXTERN_GUID(MF_SOURCE_READER_D3D_MANAGER, 0xec822da2, 0xe1e9, 0x4b29, 0xa0, 0xd8, 0x56, 0x3c, 0x71, 0x9f, 0x52, 0x69);") +cpp_quote("EXTERN_GUID(MF_SOURCE_READER_D3D11_BIND_FLAGS, 0x33f3197b, 0xf73a, 0x4e14, 0x8d, 0x85, 0x0e, 0x4c, 0x43, 0x68, 0x78, 0x8d);") +cpp_quote("EXTERN_GUID(MF_SOURCE_READER_DISABLE_CAMERA_PLUGINS, 0x9d3365dd, 0x058f, 0x4cfb, 0x9f, 0x97, 0xb3, 0x14, 0xcc, 0x99, 0xc8, 0xad);") +cpp_quote("EXTERN_GUID(MF_SOURCE_READER_DISABLE_DXVA, 0xaa456cfd, 0x3943, 0x4a1e, 0xa7, 0x7d, 0x18, 0x38, 0xc0, 0xea, 0x2e, 0x35);") +cpp_quote("EXTERN_GUID(MF_SOURCE_READER_DISCONNECT_MEDIASOURCE_ON_SHUTDOWN, 0x56b67165, 0x219e, 0x456d, 0xa2, 0x2e, 0x2d, 0x30, 0x04, 0xc7, 0xfe, 0x56);") +cpp_quote("EXTERN_GUID(MF_SOURCE_READER_ENABLE_ADVANCED_VIDEO_PROCESSING, 0x0f81da2c, 0xb537, 0x4672, 0xa8, 0xb2, 0xa6, 0x81, 0xb1, 0x73, 0x07, 0xa3);") +cpp_quote("EXTERN_GUID(MF_SOURCE_READER_ENABLE_TRANSCODE_ONLY_TRANSFORMS, 0xdfd4f008, 0xb5fd, 0x4e78, 0xae, 0x44, 0x62, 0xa1, 0xe6, 0x7b, 0xbe, 0x27);") +cpp_quote("EXTERN_GUID(MF_SOURCE_READER_ENABLE_VIDEO_PROCESSING, 0xfb394f3d, 0xccf1, 0x42ee, 0xbb, 0xb3, 0xf9, 0xb8, 0x45, 0xd5, 0x68, 0x1d);") +cpp_quote("EXTERN_GUID(MF_SOURCE_READER_MEDIASOURCE_CHARACTERISTICS, 0x6d23f5c8, 0xc5d7, 0x4a9b, 0x99, 0x71, 0x5d, 0x11, 0xf8, 0xbc, 0xa8, 0x80);") +cpp_quote("EXTERN_GUID(MF_SOURCE_READER_MEDIASOURCE_CONFIG, 0x9085abeb, 0x0354, 0x48f9, 0xab, 0xb5, 0x20, 0x0d, 0xf8, 0x38, 0xc6, 0x8e);") interface IMFMediaSource;

1 0

Nikolay Sivov : mfreadwrite: Support source configuration with MF_SOURCE_READER_MEDIASOURCE_CONFIG.
by Alexandre Julliard 20 Mar '19

20 Mar '19

Module: wine Branch: master Commit: a35ddb13b781ee4552b3428623687739651457ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=a35ddb13b781ee4552b34286… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 20 08:35:38 2019 +0300 mfreadwrite: Support source configuration with MF_SOURCE_READER_MEDIASOURCE_CONFIG. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index cbaad16..a6e0c10 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -545,6 +545,7 @@ failed: static HRESULT create_source_reader_from_stream(IMFByteStream *stream, IMFAttributes *attributes, REFIID riid, void **out) { + IPropertyStore *props = NULL; IMFSourceResolver *resolver; MF_OBJECT_TYPE obj_type; IMFMediaSource *source; @@ -553,9 +554,15 @@ static HRESULT create_source_reader_from_stream(IMFByteStream *stream, IMFAttrib if (FAILED(hr = MFCreateSourceResolver(&resolver))) return hr; - hr = IMFSourceResolver_CreateObjectFromByteStream(resolver, stream, NULL, MF_RESOLUTION_MEDIASOURCE, NULL, + if (attributes) + IMFAttributes_GetUnknown(attributes, &MF_SOURCE_READER_MEDIASOURCE_CONFIG, &IID_IPropertyStore, + (void **)&props); + + hr = IMFSourceResolver_CreateObjectFromByteStream(resolver, stream, NULL, MF_RESOLUTION_MEDIASOURCE, props, &obj_type, (IUnknown **)&source); IMFSourceResolver_Release(resolver); + if (props) + IPropertyStore_Release(props); if (FAILED(hr)) return hr; @@ -566,6 +573,7 @@ static HRESULT create_source_reader_from_stream(IMFByteStream *stream, IMFAttrib static HRESULT create_source_reader_from_url(const WCHAR *url, IMFAttributes *attributes, REFIID riid, void **out) { + IPropertyStore *props = NULL; IMFSourceResolver *resolver; IUnknown *object = NULL; MF_OBJECT_TYPE obj_type; @@ -575,7 +583,11 @@ static HRESULT create_source_reader_from_url(const WCHAR *url, IMFAttributes *at if (FAILED(hr = MFCreateSourceResolver(&resolver))) return hr; - hr = IMFSourceResolver_CreateObjectFromURL(resolver, url, MF_RESOLUTION_MEDIASOURCE, NULL, &obj_type, + if (attributes) + IMFAttributes_GetUnknown(attributes, &MF_SOURCE_READER_MEDIASOURCE_CONFIG, &IID_IPropertyStore, + (void **)&props); + + hr = IMFSourceResolver_CreateObjectFromURL(resolver, url, MF_RESOLUTION_MEDIASOURCE, props, &obj_type, &object); if (SUCCEEDED(hr)) { @@ -583,7 +595,7 @@ static HRESULT create_source_reader_from_url(const WCHAR *url, IMFAttributes *at { case MF_OBJECT_BYTESTREAM: hr = IMFSourceResolver_CreateObjectFromByteStream(resolver, (IMFByteStream *)object, NULL, - MF_RESOLUTION_MEDIASOURCE, NULL, &obj_type, (IUnknown **)&source); + MF_RESOLUTION_MEDIASOURCE, props, &obj_type, (IUnknown **)&source); break; case MF_OBJECT_MEDIASOURCE: source = (IMFMediaSource *)object; @@ -597,6 +609,8 @@ static HRESULT create_source_reader_from_url(const WCHAR *url, IMFAttributes *at } IMFSourceResolver_Release(resolver); + if (props) + IPropertyStore_Release(props); if (FAILED(hr)) return hr;

1 0

Nikolay Sivov : mfreadwrite: Keep async callback reference for the reader.
by Alexandre Julliard 20 Mar '19

20 Mar '19

Module: wine Branch: master Commit: 9e57659b7b9aa2f97c876eef435345725825b5d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e57659b7b9aa2f97c876eef… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 20 08:35:39 2019 +0300 mfreadwrite: Keep async callback reference for the reader. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 7 +++++++ include/mfreadwrite.idl | 21 +++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index a6e0c10..15c5dbf 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -81,6 +81,7 @@ typedef struct source_reader IMFPresentationDescriptor *descriptor; DWORD first_audio_stream_index; DWORD first_video_stream_index; + IMFSourceReaderCallback *async_callback; } srcreader; struct sink_writer @@ -217,6 +218,8 @@ static ULONG WINAPI src_reader_Release(IMFSourceReader *iface) if (!refcount) { + if (reader->async_callback) + IMFSourceReaderCallback_Release(reader->async_callback); IMFMediaSource_Shutdown(reader->source); if (reader->descriptor) IMFPresentationDescriptor_Release(reader->descriptor); @@ -535,6 +538,10 @@ static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttri goto failed; } + if (attributes) + IMFAttributes_GetUnknown(attributes, &MF_SOURCE_READER_ASYNC_CALLBACK, &IID_IMFSourceReaderCallback, + (void **)&object->async_callback); + hr = IMFSourceReader_QueryInterface(&object->IMFSourceReader_iface, riid, out); failed: diff --git a/include/mfreadwrite.idl b/include/mfreadwrite.idl index 86e6eea..0eea43b 100644 --- a/include/mfreadwrite.idl +++ b/include/mfreadwrite.idl @@ -90,6 +90,27 @@ cpp_quote("EXTERN_GUID(MF_SOURCE_READER_ENABLE_VIDEO_PROCESSING, 0xfb cpp_quote("EXTERN_GUID(MF_SOURCE_READER_MEDIASOURCE_CHARACTERISTICS, 0x6d23f5c8, 0xc5d7, 0x4a9b, 0x99, 0x71, 0x5d, 0x11, 0xf8, 0xbc, 0xa8, 0x80);") cpp_quote("EXTERN_GUID(MF_SOURCE_READER_MEDIASOURCE_CONFIG, 0x9085abeb, 0x0354, 0x48f9, 0xab, 0xb5, 0x20, 0x0d, 0xf8, 0x38, 0xc6, 0x8e);") +[ + object, + uuid(deec8d99-fa1d-4d82-84c2-2c8969944867), + local +] +interface IMFSourceReaderCallback : IUnknown +{ + HRESULT OnReadSample( + [in] HRESULT hr, + [in] DWORD stream_index, + [in] DWORD stream_flags, + [in] LONGLONG timestamp, + [in] IMFSample *sample); + + HRESULT OnFlush([in] DWORD stream_index); + + HRESULT OnEvent( + [in] DWORD stream_index, + [in] IMFMediaEvent *event); +} + interface IMFMediaSource; [

1 0