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

Jacek Caban : mshtml: Add IHTMLAnchorElement::get_protocol implementation.
by Alexandre Julliard March 19, 2019

March 19, 2019

Module: wine Branch: master Commit: 971ee04c7f079d69ddf5c4686891b45974c5be19 URL: https://source.winehq.org/git/wine.git/?a=commit;h=971ee04c7f079d69ddf5c468… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 19 18:12:54 2019 +0100 mshtml: Add IHTMLAnchorElement::get_protocol implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlanchor.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 52 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index 2f53a3b..a4f8606 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -174,6 +174,27 @@ HRESULT handle_link_click_event(HTMLElement *element, nsAString *href_str, nsASt return hres; } +static IUri *get_anchor_uri(HTMLAnchorElement *anchor) +{ + nsAString href_str; + IUri *uri = NULL; + nsresult nsres; + + nsAString_Init(&href_str, NULL); + nsres = nsIDOMHTMLAnchorElement_GetHref(anchor->nsanchor, &href_str); + if(NS_SUCCEEDED(nsres)) { + const PRUnichar *href; + + nsAString_GetData(&href_str, &href); + create_uri(href, 0, &uri); + }else { + ERR("GetHref failed: %08x\n", nsres); + } + + nsAString_Finish(&href_str); + return uri; +} + static inline HTMLAnchorElement *impl_from_IHTMLAnchorElement(IHTMLAnchorElement *iface) { return CONTAINING_RECORD(iface, HTMLAnchorElement, IHTMLAnchorElement_iface); @@ -481,8 +502,37 @@ static HRESULT WINAPI HTMLAnchorElement_put_protocol(IHTMLAnchorElement *iface, static HRESULT WINAPI HTMLAnchorElement_get_protocol(IHTMLAnchorElement *iface, BSTR *p) { HTMLAnchorElement *This = impl_from_IHTMLAnchorElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + BSTR scheme; + size_t len; + IUri *uri; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, p); + + uri = get_anchor_uri(This); + if(!uri) { + WARN("Could not create IUri\n"); + *p = NULL; + return S_OK; + } + + hres = IUri_GetSchemeName(uri, &scheme); + IUri_Release(uri); + if(FAILED(hres)) + return hres; + + len = SysStringLen(scheme); + if(len) { + *p = SysAllocStringLen(scheme, len + 1); + if(*p) + (*p)[len] = ':'; + else + hres = E_OUTOFMEMORY; + }else { + *p = NULL; + } + SysFreeString(scheme); + return hres; } static HRESULT WINAPI HTMLAnchorElement_put_search(IHTMLAnchorElement *iface, BSTR v)

1 0

Jacek Caban : mshtml: Add IHTMLCSSStyleDeclaration:: setProperty implementation.
by Alexandre Julliard March 19, 2019

March 19, 2019

Module: wine Branch: master Commit: 119b1a69224c507f27d8c21f5bb1173013f1a272 URL: https://source.winehq.org/git/wine.git/?a=commit;h=119b1a69224c507f27d8c21f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 19 18:12:38 2019 +0100 mshtml: Add IHTMLCSSStyleDeclaration::setProperty implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 50 ++++++++++++++++++++++++++++++++++++------- dlls/mshtml/tests/elements.js | 24 +++++++++++++++++++++ 2 files changed, 66 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index ea435d1..76fbe11 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -933,7 +933,7 @@ static HRESULT set_nsstyle_property(nsIDOMCSSStyleDeclaration *nsstyle, styleid_ return S_OK; } -static HRESULT var_to_styleval(HTMLStyle *style, const VARIANT *v, styleid_t sid, WCHAR *buf, const WCHAR **ret) +static HRESULT var_to_styleval(HTMLStyle *style, const VARIANT *v, const style_tbl_entry_t *entry, WCHAR *buf, const WCHAR **ret) { switch(V_VT(v)) { case VT_NULL: @@ -949,7 +949,7 @@ static HRESULT var_to_styleval(HTMLStyle *style, const VARIANT *v, styleid_t sid return S_OK; case VT_I4: { - unsigned flags = dispex_compat_mode(&style->dispex) < COMPAT_MODE_IE9 ? style_tbl[sid].flags : 0; + unsigned flags = entry && dispex_compat_mode(&style->dispex) < COMPAT_MODE_IE9 ? entry->flags : 0; static const WCHAR formatW[] = {'%','d',0}; static const WCHAR hex_formatW[] = {'#','%','0','6','x',0}; @@ -1008,7 +1008,7 @@ static HRESULT set_style_property_var(HTMLStyle *style, styleid_t sid, VARIANT * WCHAR buf[14]; HRESULT hres; - hres = var_to_styleval(style, value, sid, buf, &val); + hres = var_to_styleval(style, value, &style_tbl[sid], buf, &val); if(FAILED(hres)) return hres; @@ -1615,7 +1615,7 @@ static HRESULT WINAPI HTMLStyle_put_backgroundPositionX(IHTMLStyle *iface, VARIA TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); - hres = var_to_styleval(This, &v, STYLEID_BACKGROUND_POSITION_X, buf, &val); + hres = var_to_styleval(This, &v, &style_tbl[STYLEID_BACKGROUND_POSITION_X], buf, &val); if(FAILED(hres)) return hres; @@ -1708,7 +1708,7 @@ static HRESULT WINAPI HTMLStyle_put_backgroundPositionY(IHTMLStyle *iface, VARIA TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); - hres = var_to_styleval(This, &v, STYLEID_BACKGROUND_POSITION, buf, &val); + hres = var_to_styleval(This, &v, &style_tbl[STYLEID_BACKGROUND_POSITION], buf, &val); if(FAILED(hres)) return hres; @@ -5194,11 +5194,45 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration_removeProperty(IHTMLCSSStyleDeclar return return_nsstr(nsres, &ret_str, pbstrPropertyValue); } -static HRESULT WINAPI HTMLCSSStyleDeclaration_setProperty(IHTMLCSSStyleDeclaration *iface, BSTR bstrPropertyName, VARIANT *pvarPropertyValue, VARIANT *pvarPropertyPriority) +static HRESULT WINAPI HTMLCSSStyleDeclaration_setProperty(IHTMLCSSStyleDeclaration *iface, BSTR name, VARIANT *value, VARIANT *priority) { HTMLStyle *This = impl_from_IHTMLCSSStyleDeclaration(iface); - FIXME("(%p)->(%s %p %p)\n", This, debugstr_w(bstrPropertyName), pvarPropertyValue, pvarPropertyPriority); - return E_NOTIMPL; + nsAString priority_str, name_str, value_str; + const style_tbl_entry_t *style_entry; + const WCHAR *val; + WCHAR buf[14]; + nsresult nsres; + HRESULT hres; + + TRACE("(%p)->(%s %s %s)\n", This, debugstr_w(name), debugstr_variant(value), debugstr_variant(priority)); + + style_entry = lookup_style_tbl(name); + hres = var_to_styleval(This, value, style_entry, buf, &val); + if(FAILED(hres)) + return hres; + + if(priority) { + if(V_VT(priority) != VT_BSTR) { + WARN("invalid priority type %s\n", debugstr_variant(priority)); + return S_OK; + } + nsAString_InitDepend(&priority_str, V_BSTR(priority)); + }else { + nsAString_InitDepend(&priority_str, NULL); + } + + nsAString_InitDepend(&name_str, style_entry ? style_entry->name : name); + nsAString_InitDepend(&value_str, val); + nsres = nsIDOMCSSStyleDeclaration_SetProperty(This->nsstyle, &name_str, &value_str, &priority_str); + nsAString_Finish(&name_str); + nsAString_Finish(&value_str); + nsAString_Finish(&priority_str); + if(NS_FAILED(nsres)) { + FIXME("SetProperty failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLCSSStyleDeclaration_item(IHTMLCSSStyleDeclaration *iface, LONG index, BSTR *pbstrPropertyName) diff --git a/dlls/mshtml/tests/elements.js b/dlls/mshtml/tests/elements.js index 50f19e5..2652c6b 100644 --- a/dlls/mshtml/tests/elements.js +++ b/dlls/mshtml/tests/elements.js @@ -239,6 +239,30 @@ function test_style_properties() { ok(style.zIndex === 1, "zIndex = " + style.zIndex); ok(style["z-index"] === 1, "z-index = " + style["z-index"]); + style.setProperty("border-width", "5px"); + ok(style.borderWidth === "5px", "style.borderWidth = " + style.borderWidth); + + try { + style.setProperty("border-width", 6); + ok(style.borderWidth === "5px", "style.borderWidth = " + style.borderWidth); + }catch(e) { + win_skip("skipping setProperty tests on too old IE version"); + next_test(); + return; + } + + style.setProperty("border-width", "7px", "test"); + ok(style.borderWidth === "5px", "style.borderWidth = " + style.borderWidth); + + style.setProperty("border-width", "6px", ""); + ok(style.borderWidth === "6px", "style.borderWidth = " + style.borderWidth); + + style.setProperty("border-width", "7px", "important"); + ok(style.borderWidth === "7px", "style.borderWidth = " + style.borderWidth); + + style.setProperty("border-width", "8px", undefined); + ok(style.borderWidth === "7px", "style.borderWidth = " + style.borderWidth); + next_test(); }

1 0

Nikolay Sivov : mfreadwrite: Implement GetNativeMediaType() for source reader.
by Alexandre Julliard March 19, 2019

March 19, 2019

Module: wine Branch: master Commit: 04c8a756d69734bcb68fcae369c7d056a5f68225 URL: https://source.winehq.org/git/wine.git/?a=commit;h=04c8a756d69734bcb68fcae3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 19 11:17:36 2019 +0300 mfreadwrite: Implement GetNativeMediaType() for source reader. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 40 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 36 insertions(+), 4 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index 14c9dfa..cbaad16 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -297,12 +297,44 @@ static HRESULT WINAPI src_reader_SetStreamSelection(IMFSourceReader *iface, DWOR return S_OK; } -static HRESULT WINAPI src_reader_GetNativeMediaType(IMFSourceReader *iface, DWORD index, DWORD typeindex, +static HRESULT WINAPI src_reader_GetNativeMediaType(IMFSourceReader *iface, DWORD index, DWORD type_index, IMFMediaType **type) { - srcreader *This = impl_from_IMFSourceReader(iface); - FIXME("%p, 0x%08x, %d, %p\n", This, index, typeindex, type); - return E_NOTIMPL; + struct source_reader *reader = impl_from_IMFSourceReader(iface); + IMFMediaTypeHandler *handler; + IMFStreamDescriptor *sd; + BOOL selected; + HRESULT hr; + + TRACE("%p, %#x, %#x, %p.\n", iface, index, type_index, type); + + switch (index) + { + case MF_SOURCE_READER_FIRST_VIDEO_STREAM: + index = reader->first_video_stream_index; + break; + case MF_SOURCE_READER_FIRST_AUDIO_STREAM: + index = reader->first_audio_stream_index; + break; + default: + ; + } + + if (FAILED(IMFPresentationDescriptor_GetStreamDescriptorByIndex(reader->descriptor, index, &selected, &sd))) + return MF_E_INVALIDSTREAMNUMBER; + + hr = IMFStreamDescriptor_GetMediaTypeHandler(sd, &handler); + IMFStreamDescriptor_Release(sd); + if (FAILED(hr)) + return hr; + + if (type_index == MF_SOURCE_READER_CURRENT_TYPE_INDEX) + hr = IMFMediaTypeHandler_GetCurrentMediaType(handler, type); + else + hr = IMFMediaTypeHandler_GetMediaTypeByIndex(handler, type_index, type); + IMFMediaTypeHandler_Release(handler); + + return hr; } static HRESULT WINAPI src_reader_GetCurrentMediaType(IMFSourceReader *iface, DWORD index, IMFMediaType **type)

1 0

Nikolay Sivov : mfreadwrite: Implement stream selection methods for source reader.
by Alexandre Julliard March 19, 2019

March 19, 2019

Module: wine Branch: master Commit: f939fde87428f36750567d9f76352465620e06be URL: https://source.winehq.org/git/wine.git/?a=commit;h=f939fde87428f36750567d9f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 19 11:17:35 2019 +0300 mfreadwrite: Implement stream selection methods for source reader. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 68 ++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 62 insertions(+), 6 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index 2d6b7a0..14c9dfa 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -229,16 +229,72 @@ static ULONG WINAPI src_reader_Release(IMFSourceReader *iface) static HRESULT WINAPI src_reader_GetStreamSelection(IMFSourceReader *iface, DWORD index, BOOL *selected) { - srcreader *This = impl_from_IMFSourceReader(iface); - FIXME("%p, 0x%08x, %p\n", This, index, selected); - return E_NOTIMPL; + struct source_reader *reader = impl_from_IMFSourceReader(iface); + IMFStreamDescriptor *sd; + + TRACE("%p, %#x, %p.\n", iface, index, selected); + + switch (index) + { + case MF_SOURCE_READER_FIRST_VIDEO_STREAM: + index = reader->first_video_stream_index; + break; + case MF_SOURCE_READER_FIRST_AUDIO_STREAM: + index = reader->first_audio_stream_index; + break; + default: + ; + } + + if (FAILED(IMFPresentationDescriptor_GetStreamDescriptorByIndex(reader->descriptor, index, selected, &sd))) + return MF_E_INVALIDSTREAMNUMBER; + IMFStreamDescriptor_Release(sd); + + return S_OK; } static HRESULT WINAPI src_reader_SetStreamSelection(IMFSourceReader *iface, DWORD index, BOOL selected) { - srcreader *This = impl_from_IMFSourceReader(iface); - FIXME("%p, 0x%08x, %d\n", This, index, selected); - return E_NOTIMPL; + struct source_reader *reader = impl_from_IMFSourceReader(iface); + unsigned int count; + HRESULT hr; + + TRACE("%p, %#x, %d.\n", iface, index, selected); + + switch (index) + { + case MF_SOURCE_READER_FIRST_VIDEO_STREAM: + index = reader->first_video_stream_index; + break; + case MF_SOURCE_READER_FIRST_AUDIO_STREAM: + index = reader->first_audio_stream_index; + break; + case MF_SOURCE_READER_ALL_STREAMS: + if (FAILED(hr = IMFPresentationDescriptor_GetStreamDescriptorCount(reader->descriptor, &count))) + return hr; + + for (index = 0; index < count; ++index) + { + if (selected) + IMFPresentationDescriptor_SelectStream(reader->descriptor, index); + else + IMFPresentationDescriptor_DeselectStream(reader->descriptor, index); + } + + return S_OK; + default: + ; + } + + if (selected) + hr = IMFPresentationDescriptor_SelectStream(reader->descriptor, index); + else + hr = IMFPresentationDescriptor_DeselectStream(reader->descriptor, index); + + if (FAILED(hr)) + return MF_E_INVALIDSTREAMNUMBER; + + return S_OK; } static HRESULT WINAPI src_reader_GetNativeMediaType(IMFSourceReader *iface, DWORD index, DWORD typeindex,

1 0

Józef Kucia : winevulkan: Use blacklist also for instance extensions.
by Alexandre Julliard March 19, 2019

March 19, 2019

Module: wine Branch: master Commit: 0d20471a76b449ef58a9a84fe8e7b5d980a1792b URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d20471a76b449ef58a9a84f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 19 15:59:32 2019 +0100 winevulkan: Use blacklist also for instance extensions. Allows us to treat extensions in a uniform way. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 45 +++++++++++++++++++++++------------------ dlls/winevulkan/vulkan_thunks.c | 1 - include/wine/vulkan.h | 18 ----------------- 3 files changed, 25 insertions(+), 39 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 4d65f63..deb2e61 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -83,17 +83,20 @@ WINE_VULKAN_THUNKS_H = "vulkan_thunks.h" EXT_BASE = 1000000000 EXT_BLOCK_SIZE = 1000 -# In general instance extensions can't be automatically generated -# and need custom wrappers due to e.g. win32 / X11 specific code. -# List of supported instance extensions. -SUPPORTED_INSTANCE_EXTENSIONS = [ - "VK_KHR_device_group_creation", - "VK_KHR_get_physical_device_properties2", - "VK_KHR_surface", - "VK_KHR_win32_surface", -] - BLACKLISTED_EXTENSIONS = [ + # Instance extensions + "VK_EXT_debug_utils", + "VK_EXT_swapchain_colorspace", + "VK_EXT_validation_features", + "VK_EXT_validation_flags", + "VK_KHR_display", + "VK_KHR_external_fence_capabilities", + "VK_KHR_external_memory_capabilities", + "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 @@ -2401,6 +2404,11 @@ class VkRegistry(object): version = tuple(map(int, version.group('major', 'minor'))) return version <= WINE_VK_VERSION + def _is_extension_supported(self, extension): + # We disable some extensions as either we haven't implemented + # support yet or because they are for platforms other than win32. + return extension not in BLACKLISTED_EXTENSIONS + def _mark_command_required(self, command): """ Helper function to mark a certain command and the datatypes it needs as required.""" def mark_bitmask_dependencies(bitmask, types): @@ -2587,15 +2595,12 @@ class VkRegistry(object): LOGGER.debug("Skipping experimental extension: {0}".format(ext_name)) continue - # Instance extensions often require a custom implementation, so filter. - ext_type = ext.attrib["type"] - if ext_type == "instance" and not ext_name in SUPPORTED_INSTANCE_EXTENSIONS: - LOGGER.debug("Skipping instance extension: {0}".format(ext_name)) - continue + platform = ext.attrib.get("platform") + if platform and platform != "win32": + LOGGER.debug("Skipping extensions {0} for platform {1}".format(ext_name, platform)) + continue; - # We disable some extensions as either we haven't implemented - # support yet or because they are for platforms other than win32. - if ext_name in BLACKLISTED_EXTENSIONS: + if not self._is_extension_supported(ext_name): LOGGER.debug("Skipping blacklisted extension: {0}".format(ext_name)) continue elif "requires" in ext.attrib: @@ -2626,7 +2631,7 @@ class VkRegistry(object): continue required_extension = require.attrib.get("extension") - if required_extension and required_extension in BLACKLISTED_EXTENSIONS: + if required_extension and not self._is_extension_supported(required_extension): continue # Pull in any commands we need. We infer types to pull in from the command @@ -2636,7 +2641,7 @@ class VkRegistry(object): self._mark_command_required(cmd_name) # Store a list with extensions. - ext_info = {"name" : ext_name, "type" : ext_type} + ext_info = {"name" : ext_name, "type" : ext.attrib["type"]} extensions.append(ext_info) # Sort in alphabetical order. diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index c36b913..2e81284 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -3678,7 +3678,6 @@ static const char * const vk_device_extensions[] = "VK_NV_corner_sampled_image", "VK_NV_dedicated_allocation", "VK_NV_device_diagnostic_checkpoints", - "VK_NV_external_memory", "VK_NV_fill_rectangle", "VK_NV_fragment_coverage_to_color", "VK_NV_fragment_shader_barycentric", diff --git a/include/wine/vulkan.h b/include/wine/vulkan.h index fdd4743..f05de92 100644 --- a/include/wine/vulkan.h +++ b/include/wine/vulkan.h @@ -130,8 +130,6 @@ #define VK_KHR_MULTIVIEW_EXTENSION_NAME "VK_KHR_multiview" #define VK_IMG_FORMAT_PVRTC_SPEC_VERSION 1 #define VK_IMG_FORMAT_PVRTC_EXTENSION_NAME "VK_IMG_format_pvrtc" -#define VK_NV_EXTERNAL_MEMORY_SPEC_VERSION 1 -#define VK_NV_EXTERNAL_MEMORY_EXTENSION_NAME "VK_NV_external_memory" #define VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_SPEC_VERSION 1 #define VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME "VK_KHR_get_physical_device_properties2" #define VK_KHR_DEVICE_GROUP_SPEC_VERSION 3 @@ -1900,8 +1898,6 @@ typedef enum VkStructureType VK_STRUCTURE_TYPE_RENDER_PASS_MULTIVIEW_CREATE_INFO = 1000053000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_FEATURES = 1000053001, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PROPERTIES = 1000053002, - VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_IMAGE_CREATE_INFO_NV = 1000056000, - VK_STRUCTURE_TYPE_EXPORT_MEMORY_ALLOCATE_INFO_NV = 1000056001, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2 = 1000059000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2 = 1000059001, VK_STRUCTURE_TYPE_FORMAT_PROPERTIES_2 = 1000059002, @@ -2436,13 +2432,6 @@ typedef struct VkExportMemoryAllocateInfo VkExternalMemoryHandleTypeFlags handleTypes; } VkExportMemoryAllocateInfo; -typedef struct VkExportMemoryAllocateInfoNV -{ - VkStructureType sType; - const void *pNext; - VkExternalMemoryHandleTypeFlagsNV handleTypes; -} VkExportMemoryAllocateInfoNV; - typedef struct VkExtensionProperties { char extensionName[VK_MAX_EXTENSION_NAME_SIZE]; @@ -2470,13 +2459,6 @@ typedef struct VkExternalMemoryImageCreateInfo VkExternalMemoryHandleTypeFlags handleTypes; } VkExternalMemoryImageCreateInfo; -typedef struct VkExternalMemoryImageCreateInfoNV -{ - VkStructureType sType; - const void *pNext; - VkExternalMemoryHandleTypeFlagsNV handleTypes; -} VkExternalMemoryImageCreateInfoNV; - typedef struct VkFilterCubicImageViewImageFormatPropertiesEXT { VkStructureType sType;

1 0

Józef Kucia : winevulkan: Update vk.xml to 1.1.104.
by Alexandre Julliard March 19, 2019

March 19, 2019

Module: wine Branch: master Commit: 3e4189e3ada939ff3873c6d76b17fb4b858330a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e4189e3ada939ff3873c6d7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 19 15:59:31 2019 +0100 winevulkan: Update vk.xml to 1.1.104. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vulkan-1/vulkan-1.spec | 2 +- dlls/winevulkan/make_vulkan | 17 +- dlls/winevulkan/vulkan_thunks.c | 35 +- dlls/winevulkan/vulkan_thunks.h | 15 +- dlls/winevulkan/winevulkan.spec | 2 +- include/wine/vulkan.h | 2219 +++++++++++++++++++++------------------ include/wine/vulkan_driver.h | 2 +- 7 files changed, 1249 insertions(+), 1043 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3e4189e3ada939ff3873…

1 0

Nikolay Sivov : mfreadwrite: Forward GetPresentationAttribute() to descriptor when appropriate.
by Alexandre Julliard March 19, 2019

March 19, 2019

Module: wine Branch: master Commit: 9dd9602d8c77d2318ff9c8361b9443ea50ec1e33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9dd9602d8c77d2318ff9c836… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 19 11:17:32 2019 +0300 mfreadwrite: Forward GetPresentationAttribute() to descriptor when appropriate. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index eca6075..88482f7 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -317,8 +317,7 @@ static HRESULT WINAPI src_reader_GetPresentationAttribute(IMFSourceReader *iface } else { - FIXME("Unsupported source attribute %s.\n", debugstr_guid(guid)); - return E_NOTIMPL; + return IMFPresentationDescriptor_GetItem(reader->descriptor, guid, value); } break; default:

1 0

Nikolay Sivov : mfreadwrite: Implement GetServiceForStream() for media source.
by Alexandre Julliard March 19, 2019

March 19, 2019

Module: wine Branch: master Commit: 160b4093cfb97d837d19bd8c2cdf826cfa4ffc09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=160b4093cfb97d837d19bd8c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 19 11:17:33 2019 +0300 mfreadwrite: Implement GetServiceForStream() for media source. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 37 +++++++++++++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 4 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index 88482f7..3dac3e4 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -25,7 +25,6 @@ #include "windef.h" #include "winbase.h" -#include "initguid.h" #include "ole2.h" #include "rpcproxy.h" @@ -288,9 +287,39 @@ static HRESULT WINAPI src_reader_Flush(IMFSourceReader *iface, DWORD index) static HRESULT WINAPI src_reader_GetServiceForStream(IMFSourceReader *iface, DWORD index, REFGUID service, REFIID riid, void **object) { - srcreader *This = impl_from_IMFSourceReader(iface); - FIXME("%p, 0x%08x, %s, %s, %p\n", This, index, debugstr_guid(service), debugstr_guid(riid), object); - return E_NOTIMPL; + struct source_reader *reader = impl_from_IMFSourceReader(iface); + IUnknown *obj = NULL; + HRESULT hr; + + TRACE("%p, %#x, %s, %s, %p\n", iface, index, debugstr_guid(service), debugstr_guid(riid), object); + + switch (index) + { + case MF_SOURCE_READER_MEDIASOURCE: + obj = (IUnknown *)reader->source; + break; + default: + FIXME("Unsupported index %#x.\n", index); + return E_NOTIMPL; + } + + if (IsEqualGUID(service, &GUID_NULL)) + { + hr = IUnknown_QueryInterface(obj, riid, object); + } + else + { + IMFGetService *gs; + + hr = IUnknown_QueryInterface(obj, &IID_IMFGetService, (void **)&gs); + if (SUCCEEDED(hr)) + { + hr = IMFGetService_GetService(gs, service, riid, object); + IMFGetService_Release(gs); + } + } + + return hr; } static HRESULT WINAPI src_reader_GetPresentationAttribute(IMFSourceReader *iface, DWORD index,

1 0

Nikolay Sivov : mfreadwrite: Determine first streams on reader creation.
by Alexandre Julliard March 19, 2019

March 19, 2019

Module: wine Branch: master Commit: 79b37c8aa0d1419794f565aeac8a492a708326bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=79b37c8aa0d1419794f565ae… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 19 11:17:34 2019 +0300 mfreadwrite: Determine first streams on reader creation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index 3dac3e4..2d6b7a0 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -30,6 +30,8 @@ #undef INITGUID #include <guiddef.h> +#include "mfapi.h" +#include "mferror.h" #include "mfidl.h" #include "mfreadwrite.h" @@ -77,6 +79,8 @@ typedef struct source_reader LONG refcount; IMFMediaSource *source; IMFPresentationDescriptor *descriptor; + DWORD first_audio_stream_index; + DWORD first_video_stream_index; } srcreader; struct sink_writer @@ -374,6 +378,40 @@ struct IMFSourceReaderVtbl srcreader_vtbl = src_reader_GetPresentationAttribute }; +static DWORD reader_get_first_stream_index(IMFPresentationDescriptor *descriptor, const GUID *major) +{ + unsigned int count, i; + BOOL selected; + HRESULT hr; + GUID guid; + + if (FAILED(IMFPresentationDescriptor_GetStreamDescriptorCount(descriptor, &count))) + return MF_SOURCE_READER_INVALID_STREAM_INDEX; + + for (i = 0; i < count; ++i) + { + IMFMediaTypeHandler *handler; + IMFStreamDescriptor *sd; + + if (SUCCEEDED(IMFPresentationDescriptor_GetStreamDescriptorByIndex(descriptor, i, &selected, &sd))) + { + hr = IMFStreamDescriptor_GetMediaTypeHandler(sd, &handler); + IMFStreamDescriptor_Release(sd); + if (SUCCEEDED(hr)) + { + hr = IMFMediaTypeHandler_GetMajorType(handler, &guid); + IMFMediaTypeHandler_Release(handler); + if (SUCCEEDED(hr) && IsEqualGUID(&guid, major)) + { + return i; + } + } + } + } + + return MF_SOURCE_READER_INVALID_STREAM_INDEX; +} + static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttributes *attributes, REFIID riid, void **out) { @@ -393,6 +431,16 @@ static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttri if (FAILED(hr = IMFMediaSource_CreatePresentationDescriptor(object->source, &object->descriptor))) goto failed; + /* At least one major type has to be set. */ + object->first_audio_stream_index = reader_get_first_stream_index(object->descriptor, &MFMediaType_Audio); + object->first_video_stream_index = reader_get_first_stream_index(object->descriptor, &MFMediaType_Video); + + if (object->first_audio_stream_index == MF_SOURCE_READER_INVALID_STREAM_INDEX && + object->first_video_stream_index == MF_SOURCE_READER_INVALID_STREAM_INDEX) + { + hr = MF_E_ATTRIBUTENOTFOUND; + } + if (FAILED(hr = IMFMediaSource_BeginGetEvent(object->source, &object->source_events_callback, (IUnknown *)object->source))) {

1 0

Józef Kucia : winevulkan: Enable VK_EXT_swapchain_colorspace.
by Alexandre Julliard March 19, 2019

March 19, 2019

Module: wine Branch: master Commit: bea86f01805b253567a2ee408cd03d6e445ba65d URL: https://source.winehq.org/git/wine.git/?a=commit;h=bea86f01805b253567a2ee40… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 19 15:59:33 2019 +0100 winevulkan: Enable VK_EXT_swapchain_colorspace. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 1 - dlls/winevulkan/vulkan_thunks.c | 1 + include/wine/vulkan.h | 16 ++++++++++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index deb2e61..cc8692a 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -86,7 +86,6 @@ EXT_BLOCK_SIZE = 1000 BLACKLISTED_EXTENSIONS = [ # Instance extensions "VK_EXT_debug_utils", - "VK_EXT_swapchain_colorspace", "VK_EXT_validation_features", "VK_EXT_validation_flags", "VK_KHR_display", diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index 2e81284..263e28a 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -3698,6 +3698,7 @@ static const char * const vk_device_extensions[] = static const char * const vk_instance_extensions[] = { + "VK_EXT_swapchain_colorspace", "VK_KHR_device_group_creation", "VK_KHR_get_physical_device_properties2", "VK_KHR_surface", diff --git a/include/wine/vulkan.h b/include/wine/vulkan.h index f05de92..e545fbc 100644 --- a/include/wine/vulkan.h +++ b/include/wine/vulkan.h @@ -172,6 +172,8 @@ #define VK_EXT_CONSERVATIVE_RASTERIZATION_EXTENSION_NAME "VK_EXT_conservative_rasterization" #define VK_EXT_DEPTH_CLIP_ENABLE_SPEC_VERSION 1 #define VK_EXT_DEPTH_CLIP_ENABLE_EXTENSION_NAME "VK_EXT_depth_clip_enable" +#define VK_EXT_SWAPCHAIN_COLOR_SPACE_SPEC_VERSION 3 +#define VK_EXT_SWAPCHAIN_COLOR_SPACE_EXTENSION_NAME "VK_EXT_swapchain_colorspace" #define VK_KHR_CREATE_RENDERPASS_2_SPEC_VERSION 1 #define VK_KHR_CREATE_RENDERPASS_2_EXTENSION_NAME "VK_KHR_create_renderpass2" #define VK_KHR_MAINTENANCE2_SPEC_VERSION 1 @@ -698,6 +700,20 @@ typedef enum VkColorSpaceKHR { VK_COLOR_SPACE_SRGB_NONLINEAR_KHR = 0, VK_COLORSPACE_SRGB_NONLINEAR_KHR = 0, + VK_COLOR_SPACE_DISPLAY_P3_NONLINEAR_EXT = 1000104001, + VK_COLOR_SPACE_EXTENDED_SRGB_LINEAR_EXT = 1000104002, + VK_COLOR_SPACE_DCI_P3_LINEAR_EXT = 1000104003, + VK_COLOR_SPACE_DCI_P3_NONLINEAR_EXT = 1000104004, + VK_COLOR_SPACE_BT709_LINEAR_EXT = 1000104005, + VK_COLOR_SPACE_BT709_NONLINEAR_EXT = 1000104006, + VK_COLOR_SPACE_BT2020_LINEAR_EXT = 1000104007, + VK_COLOR_SPACE_HDR10_ST2084_EXT = 1000104008, + VK_COLOR_SPACE_DOLBYVISION_EXT = 1000104009, + VK_COLOR_SPACE_HDR10_HLG_EXT = 1000104010, + VK_COLOR_SPACE_ADOBERGB_LINEAR_EXT = 1000104011, + VK_COLOR_SPACE_ADOBERGB_NONLINEAR_EXT = 1000104012, + VK_COLOR_SPACE_PASS_THROUGH_EXT = 1000104013, + VK_COLOR_SPACE_EXTENDED_SRGB_NONLINEAR_EXT = 1000104014, VK_COLOR_SPACE_KHR_MAX_ENUM = 0x7fffffff, } VkColorSpaceKHR;

1 0