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

Józef Kucia : winevulkan: Use blacklist also for instance extensions.
by Alexandre Julliard 19 Mar '19

19 Mar '19

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: Enable VK_EXT_swapchain_colorspace.
by Alexandre Julliard 19 Mar '19

19 Mar '19

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

Józef Kucia : winevulkan: Implement VK_EXT_host_query_reset.
by Alexandre Julliard 19 Mar '19

19 Mar '19

Module: wine Branch: master Commit: d71532df22a32d8fb64d534afdabf27d34dd3718 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d71532df22a32d8fb64d534a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 19 15:59:34 2019 +0100 winevulkan: Implement VK_EXT_host_query_reset. 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.c | 62 +++++++++++++++++++++++++++++++---------- dlls/winevulkan/vulkan_thunks.c | 8 ++++++ dlls/winevulkan/vulkan_thunks.h | 2 ++ include/wine/vulkan.h | 12 ++++++++ 5 files changed, 69 insertions(+), 16 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d71532df22a32d8fb64d…

1 0

Jacek Caban : mshtml: Add IHTMLCSSStyleDeclaration:: setProperty implementation.
by Alexandre Julliard 19 Mar '19

19 Mar '19

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

Jacek Caban : mshtml: Add IHTMLAnchorElement::get_protocol implementation.
by Alexandre Julliard 19 Mar '19

19 Mar '19

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 IHTMLAnchorElement::get_host implementation.
by Alexandre Julliard 19 Mar '19

19 Mar '19

Module: wine Branch: master Commit: 4bdd24292de298ef7a21b7d660da627b0207bc20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4bdd24292de298ef7a21b7d6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 19 18:13:11 2019 +0100 mshtml: Add IHTMLAnchorElement::get_host implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlanchor.c | 11 +++++++++-- dlls/mshtml/tests/elements.js | 25 +++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index a4f8606..2fa059c 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -440,8 +440,15 @@ static HRESULT WINAPI HTMLAnchorElement_put_host(IHTMLAnchorElement *iface, BSTR static HRESULT WINAPI HTMLAnchorElement_get_host(IHTMLAnchorElement *iface, BSTR *p) { HTMLAnchorElement *This = impl_from_IHTMLAnchorElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString str; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + /* FIXME: IE always appends port number, even if it's implicit default number */ + nsAString_InitDepend(&str, NULL); + nsres = nsIDOMHTMLAnchorElement_GetHost(This->nsanchor, &str); + return return_nsstr(nsres, &str, p); } static HRESULT WINAPI HTMLAnchorElement_put_hostname(IHTMLAnchorElement *iface, BSTR v) diff --git a/dlls/mshtml/tests/elements.js b/dlls/mshtml/tests/elements.js index 2652c6b..7213388 100644 --- a/dlls/mshtml/tests/elements.js +++ b/dlls/mshtml/tests/elements.js @@ -119,6 +119,30 @@ function test_iframe() { }); } +function test_anchor() { + var iframe = document.body.firstChild; + var anchor = document.createElement("a"); + + var anchor_tests = [ + { href: "http://www.winehq.org:123/about", protocol: "http:", host: "www.winehq.org:123" }, + { href: "https://www.winehq.org:123/about", protocol: "https:", host: "www.winehq.org:123" }, + { href: "about:blank", protocol: "about:", host: "" }, + { href: "file:///c:/dir/file.html", protocol: "file:", host: "" }, + { href: "http://www.winehq.org/about", protocol: "http:", host: "www.winehq.org:80", todo_host: true }, + { href: "https://www.winehq.org/about", protocol: "https:", host: "www.winehq.org:443", todo_host: true }, + ]; + + for(var i in anchor_tests) { + var t = anchor_tests[i]; + anchor.href = t.href; + ok(anchor.protocol === t.protocol, "anchor(" + t.href + ").protocol = " + anchor.protocol); + todo_wine_if("todo_host" in t). + ok(anchor.host === t.host, "anchor(" + t.href + ").host = " + anchor.host); + } + + next_test(); +} + function test_getElementsByClassName() { var elems; @@ -273,6 +297,7 @@ var tests = [ test_getElementsByClassName, test_head, test_iframe, + test_anchor, test_query_selector, test_compare_position, test_document_owner,

1 0

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

19 Mar '19

Module: wine Branch: master Commit: e2f4f038f4bb8cc04279a470ccbf7078fcaa38a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2f4f038f4bb8cc04279a470… Author: Isira Seneviratne <isirasen96(a)gmail.com> Date: Fri Mar 8 11:47:44 2019 +0530 po: Update Sinhala translation. Signed-off-by: Isira Seneviratne <isirasen96(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/si.po | 405 ++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 204 insertions(+), 201 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e2f4f038f4bb8cc04279…

1 0

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

19 Mar '19

Module: wine Branch: master Commit: ed408d8def05c608569800bfa80f3e0a04c62591 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed408d8def05c608569800bf… Author: Isira Seneviratne <isirasen96(a)gmail.com> Date: Sat Feb 23 08:11:54 2019 +0530 po: Update Tamil translation. Signed-off-by: Isira Seneviratne <isirasen96(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ta.po | 124 ++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 63 insertions(+), 61 deletions(-) diff --git a/po/ta.po b/po/ta.po index bb15a67..ab9b8bc 100644 --- a/po/ta.po +++ b/po/ta.po @@ -5,14 +5,14 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2019-02-19 03:44+0530\n" +"PO-Revision-Date: 2019-03-19 09:17+0530\n" "Last-Translator: Isira Seneviratne <isirasen96(a)gmail.com>\n" "Language-Team: Tamil\n" "Language: ta\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 18.12.2\n" +"X-Generator: Lokalize 18.12.3\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" #: appwiz.rc:58 @@ -38,20 +38,20 @@ msgstr "" #: appwiz.rc:67 msgid "&Support Information" -msgstr "" +msgstr "ஆதரவு தகவல் (&S)" #: appwiz.rc:68 regedit.rc:133 regedit.rc:232 msgid "&Modify..." -msgstr "" +msgstr "திருத்து... (&M)" #: appwiz.rc:69 appwiz.rc:45 cryptui.rc:351 msacm32.rc:40 winecfg.rc:200 #: winecfg.rc:237 wordpad.rc:256 msgid "&Remove" -msgstr "" +msgstr "அகற்று (&R)" #: appwiz.rc:75 msgid "Support Information" -msgstr "" +msgstr "ஆதரவு தகவல்" #: appwiz.rc:78 avifil32.rc:54 comctl32.rc:71 comctl32.rc:55 comdlg32.rc:232 #: comdlg32.rc:262 comdlg32.rc:305 comdlg32.rc:388 comdlg32.rc:422 @@ -77,19 +77,19 @@ msgstr "" #: appwiz.rc:80 msgid "Publisher:" -msgstr "" +msgstr "வெளியீட்டாளர்:" #: appwiz.rc:81 winefile.rc:166 msgid "Version:" -msgstr "" +msgstr "பதிப்பு:" #: appwiz.rc:82 msgid "Contact:" -msgstr "" +msgstr "தொடர்பு:" #: appwiz.rc:83 msgid "Support Information:" -msgstr "" +msgstr "ஆதரவு தகவல்:" #: appwiz.rc:84 msgid "Support Telephone:" @@ -97,7 +97,7 @@ msgstr "" #: appwiz.rc:85 msgid "Readme:" -msgstr "" +msgstr "பயனர் உதவி:" #: appwiz.rc:86 msgid "Product Updates:" @@ -192,11 +192,11 @@ msgstr "பெயர்" #: appwiz.rc:39 msgid "Publisher" -msgstr "" +msgstr "வெளியீட்டாளர்" #: appwiz.rc:40 cryptui.rc:54 msgid "Version" -msgstr "" +msgstr "பதிப்பு" #: appwiz.rc:41 msgid "Installation programs" @@ -204,7 +204,7 @@ msgstr "" #: appwiz.rc:42 msgid "Programs (*.exe)" -msgstr "" +msgstr "நிரல்கள் (*.exe)" #: appwiz.rc:43 avifil32.rc:33 cryptui.rc:83 shell32.rc:199 notepad.rc:76 #: oleview.rc:103 progman.rc:82 regedit.rc:225 winedbg.rc:43 winhlp32.rc:90 @@ -239,7 +239,7 @@ msgstr "" #: avifil32.rc:48 wordpad.rc:76 msgid "&Options..." -msgstr "" +msgstr "விருப்பங்கள்... (&O)" #: avifil32.rc:49 msgid "&Interleave every" @@ -255,11 +255,11 @@ msgstr "" #: avifil32.rc:30 msgid "Waveform: %s" -msgstr "" +msgstr "அலைவடிவம்: %s" #: avifil32.rc:31 msgid "Waveform" -msgstr "" +msgstr "அலைவடிவம்" #: avifil32.rc:32 msgid "All multimedia files" @@ -267,11 +267,11 @@ msgstr "" #: avifil32.rc:34 msgid "video" -msgstr "" +msgstr "காணொளி" #: avifil32.rc:35 msgid "audio" -msgstr "" +msgstr "ஆடியோ" #: avifil32.rc:36 msgid "Wine AVI-default-filehandler" @@ -295,15 +295,15 @@ msgstr "" #: browseui.rc:31 msgid "seconds" -msgstr "" +msgstr "விநாடிகள்" #: browseui.rc:32 msgid "minutes" -msgstr "" +msgstr "நிமிடங்கள்" #: browseui.rc:33 msgid "hours" -msgstr "" +msgstr "மணி" #: comctl32.rc:68 winefile.rc:157 msgid "Properties for %s" @@ -315,7 +315,7 @@ msgstr "" #: comctl32.rc:74 comctl32.rc:88 comdlg32.rc:307 user32.rc:88 msgid "Help" -msgstr "" +msgstr "உதவி" #: comctl32.rc:81 msgid "Wizard" @@ -354,7 +354,7 @@ msgstr "" #: progman.rc:160 progman.rc:184 progman.rc:202 progman.rc:219 regedit.rc:77 #: taskmgr.rc:87 winefile.rc:82 winemine.rc:53 winhlp32.rc:57 wordpad.rc:102 msgid "&Help" -msgstr "" +msgstr "உதவி (&H)" #: comctl32.rc:103 msgid "Move &Up" @@ -370,11 +370,11 @@ msgstr "" #: comctl32.rc:107 msgid "&Add ->" -msgstr "" +msgstr "சேர் (&A) ->" #: comctl32.rc:108 msgid "<- &Remove" -msgstr "" +msgstr "<- அகற்று (&R)" #: comctl32.rc:109 msgid "&Toolbar buttons:" @@ -391,11 +391,11 @@ msgstr "" #: comctl32.rc:52 shell32.rc:309 shlwapi.rc:46 user32.rc:79 msgid "&Yes" -msgstr "" +msgstr "ஆம் (&Y)" #: comctl32.rc:53 shell32.rc:311 shlwapi.rc:47 user32.rc:80 msgid "&No" -msgstr "" +msgstr "இல்லை (&N)" #: comctl32.rc:54 user32.rc:82 msgid "&Retry" @@ -591,7 +591,7 @@ msgstr "" #: comdlg32.rc:282 msgid "Color" -msgstr "" +msgstr "நிறம்" #: comdlg32.rc:285 msgid "&Basic Colors:" @@ -607,15 +607,15 @@ msgstr "" #: comdlg32.rc:288 msgid "&Red:" -msgstr "" +msgstr "சிவப்பு (&R):" #: comdlg32.rc:290 msgid "&Green:" -msgstr "" +msgstr "பச்சை (&G):" #: comdlg32.rc:292 msgid "&Blue:" -msgstr "" +msgstr "நீல (&B):" #: comdlg32.rc:294 msgid "&Hue:" @@ -900,67 +900,67 @@ msgstr "" #: comdlg32.rc:121 wordpad.rc:125 msgid "Black" -msgstr "" +msgstr "கருப்பு" #: comdlg32.rc:122 wordpad.rc:126 msgid "Maroon" -msgstr "" +msgstr "மெரூன்" #: comdlg32.rc:123 wordpad.rc:127 msgid "Green" -msgstr "" +msgstr "பச்சை" #: comdlg32.rc:124 wordpad.rc:128 msgid "Olive" -msgstr "" +msgstr "ஆலிவ்நிறம்" #: comdlg32.rc:125 wordpad.rc:129 msgid "Navy" -msgstr "" +msgstr "கடல் நீலம்" #: comdlg32.rc:126 wordpad.rc:130 msgid "Purple" -msgstr "" +msgstr "ஊதா" #: comdlg32.rc:127 wordpad.rc:131 msgid "Teal" -msgstr "" +msgstr "பசும்நீலம்" #: comdlg32.rc:128 wordpad.rc:132 msgid "Gray" -msgstr "" +msgstr "சாம்பல்" #: comdlg32.rc:129 wordpad.rc:133 msgid "Silver" -msgstr "" +msgstr "வெள்ளி" #: comdlg32.rc:130 wordpad.rc:134 msgid "Red" -msgstr "" +msgstr "சிவப்பு" #: comdlg32.rc:131 wordpad.rc:135 msgid "Lime" -msgstr "" +msgstr "எலுமிச்சை" #: comdlg32.rc:132 wordpad.rc:136 msgid "Yellow" -msgstr "" +msgstr "மஞ்சள்" #: comdlg32.rc:133 wordpad.rc:137 msgid "Blue" -msgstr "" +msgstr "நீல" #: comdlg32.rc:134 wordpad.rc:138 msgid "Fuchsia" -msgstr "" +msgstr "ஆழ்ந்த சிவப்பு" #: comdlg32.rc:135 wordpad.rc:139 msgid "Aqua" -msgstr "" +msgstr "நீர் வண்ணம்" #: comdlg32.rc:136 wordpad.rc:140 msgid "White" -msgstr "" +msgstr "வெள்ளை" #: comdlg32.rc:56 msgid "Unreadable Entry" @@ -1060,7 +1060,7 @@ msgstr "" #: comdlg32.rc:85 msgid "Error; " -msgstr "" +msgstr "பிழை; " #: comdlg32.rc:86 msgid "Pending deletion; " @@ -1436,7 +1436,7 @@ msgstr "" #: crypt32.rc:84 msgid "CA Version" -msgstr "" +msgstr "CA பதிப்பு" #: crypt32.rc:85 msgid "Cross CA Version" @@ -3166,7 +3166,7 @@ msgstr "" #: iccvid.rc:28 iccvid.rc:29 msgid "Cinepak Video codec" -msgstr "" +msgstr "Cinepak வீடியோ கோடெக்" #: ieframe.rc:28 shell32.rc:114 notepad.rc:29 oleview.rc:30 oleview.rc:80 #: progman.rc:32 taskmgr.rc:35 view.rc:31 winefile.rc:28 winhlp32.rc:31 @@ -3358,7 +3358,7 @@ msgstr "" #: inetcpl.rc:115 msgid "Publishers..." -msgstr "" +msgstr "வெளியீட்டாளர்கள்..." #: inetcpl.rc:123 msgid "Connections" @@ -7536,13 +7536,15 @@ msgstr "" #: msrle32.rc:31 msgid "Wine MS-RLE video codec" -msgstr "" +msgstr "Wine MS-RLE வீடியோ கோடெக்" #: msrle32.rc:32 msgid "" "Wine MS-RLE video codec\n" "Copyright 2002 by Michael Guennewig" msgstr "" +"Wine MS-RLE வீடியோ கோடெக்\n" +"Copyright 2002 by Michael Guennewig" #: msvfw32.rc:33 msgid "Video Compression" @@ -7582,7 +7584,7 @@ msgstr "" #: msvidc32.rc:29 msgid "Wine Video 1 video codec" -msgstr "" +msgstr "Wine வீடியோ 1 வீடியோ கோடெக்" #: oleacc.rc:31 msgid "unknown object" @@ -8865,7 +8867,7 @@ msgstr "" #: shell32.rc:215 msgid "Program Files" -msgstr "" +msgstr "நிரல் கோப்புகள்" #: shell32.rc:217 msgid "My Pictures" @@ -8897,7 +8899,7 @@ msgstr "" #: shell32.rc:216 msgid "Program Files (x86)" -msgstr "" +msgstr "நிரல் கோப்புகள் (x86)" #: shell32.rc:224 msgid "Contacts" @@ -14397,7 +14399,7 @@ msgstr "" #: winecfg.rc:161 msgid "&Windows Version:" -msgstr "" +msgstr "&Windows பதிப்பு:" #: winecfg.rc:169 msgid "Window settings" @@ -15308,7 +15310,7 @@ msgstr "" #: winefile.rc:168 msgid "Cop&yright:" -msgstr "" +msgstr "பதிப்புரிமை (&Y):" #: winefile.rc:176 msgid "&System" @@ -15461,7 +15463,7 @@ msgstr "" #: winemine.rc:30 msgid "WineMine" -msgstr "" +msgstr "WineMine" #: winemine.rc:31 msgid "Nobody" @@ -15469,7 +15471,7 @@ msgstr "" #: winemine.rc:32 msgid "Copyright 2000 Joshua Thielen" -msgstr "" +msgstr "Copyright 2000 Joshua Thielen" #: winhlp32.rc:35 msgid "Printer &setup..." @@ -15533,7 +15535,7 @@ msgstr "" #: winhlp32.rc:81 msgid "Wine Help" -msgstr "" +msgstr "Wine உதவி" #: winhlp32.rc:86 msgid "Error while reading the help file `%s'"

1 0

Louis Lenders : advapi32: Add AuditQuerySystemPolicy stub.
by Alexandre Julliard 19 Mar '19

19 Mar '19

Module: wine Branch: master Commit: 642d6c695a8d0a22abbfe7910c796b4591ad38ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=642d6c695a8d0a22abbfe791… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Fri Mar 15 09:26:45 2019 +0100 advapi32: Add AuditQuerySystemPolicy stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46643 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/lsa.c | 12 ++++++++++++ .../api-ms-win-security-audit-l1-1-1.spec | 2 +- include/ntsecapi.h | 9 +++++++++ 4 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index eb1f546..e996bd2 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -51,7 +51,7 @@ # @ stub AuditQueryGlobalSaclW # @ stub AuditQueryPerUserPolicy # @ stub AuditQuerySecurity -# @ stub AuditQuerySystemPolicy +@ stdcall AuditQuerySystemPolicy(ptr long ptr) # @ stub AuditSetGlobalSaclA # @ stub AuditSetGlobalSaclW # @ stub AuditSetPerUserPolicy diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c index 354db65..592876a 100644 --- a/dlls/advapi32/lsa.c +++ b/dlls/advapi32/lsa.c @@ -1072,3 +1072,15 @@ NTSTATUS WINAPI LsaLookupPrivilegeDisplayName(LSA_HANDLE handle, LSA_UNICODE_STR return STATUS_NO_SUCH_PRIVILEGE; } + +/****************************************************************************** + * AuditQuerySystemPolicy [ADVAPI32.@] + * + */ +BOOLEAN WINAPI AuditQuerySystemPolicy(const GUID* guids, ULONG count, AUDIT_POLICY_INFORMATION** policy) +{ + + FIXME("(%p, %d, %p)\n", guids, count, policy); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/dlls/api-ms-win-security-audit-l1-1-1/api-ms-win-security-audit-l1-1-1.spec b/dlls/api-ms-win-security-audit-l1-1-1/api-ms-win-security-audit-l1-1-1.spec index 1e677ed..2283eaf 100644 --- a/dlls/api-ms-win-security-audit-l1-1-1/api-ms-win-security-audit-l1-1-1.spec +++ b/dlls/api-ms-win-security-audit-l1-1-1/api-ms-win-security-audit-l1-1-1.spec @@ -8,7 +8,7 @@ @ stub AuditQueryGlobalSaclW @ stub AuditQueryPerUserPolicy @ stub AuditQuerySecurity -@ stub AuditQuerySystemPolicy +@ stdcall AuditQuerySystemPolicy(ptr long ptr) advapi32.AuditQuerySystemPolicy @ stub AuditSetGlobalSaclW @ stub AuditSetPerUserPolicy @ stub AuditSetSecurity diff --git a/include/ntsecapi.h b/include/ntsecapi.h index 6d5e01d..729a89c 100644 --- a/include/ntsecapi.h +++ b/include/ntsecapi.h @@ -349,6 +349,13 @@ typedef enum _POLICY_NOTIFICATION_INFORMATION_CLASS PolicyNotifyMachineAccountPasswordInformation } POLICY_NOTIFICATION_INFORMATION_CLASS, *PPOLICY_NOTIFICATION_INFORMATION_CLASS; +typedef struct _AUDIT_POLICY_INFORMATION +{ + GUID AuditSubCategoryGuid; + ULONG AuditingInformation; + GUID AuditCategoryGuid; +} AUDIT_POLICY_INFORMATION, *PAUDIT_POLICY_INFORMATION; + #define MICROSOFT_KERBEROS_NAME_A "Kerberos" #if defined(_MSC_VER) #define MICROSOFT_KERBEROS_NAME_W L"Kerberos" @@ -458,6 +465,8 @@ typedef struct _KERB_PURGE_TKT_CACHE_REQUEST #define RtlEncryptMemory SystemFunction040 #define RtlDecryptMemory SystemFunction041 +BOOLEAN WINAPI AuditQuerySystemPolicy(const GUID*,ULONG,AUDIT_POLICY_INFORMATION**); + BOOLEAN WINAPI RtlGenRandom(PVOID,ULONG); NTSTATUS WINAPI RtlEncryptMemory(PVOID,ULONG,ULONG); NTSTATUS WINAPI RtlDecryptMemory(PVOID,ULONG,ULONG);

1 0

Fabian Maurer : shell32: In SHRestricted add missing slash.
by Alexandre Julliard 19 Mar '19

19 Mar '19

Module: wine Branch: master Commit: dbbfa481539acd29de47ff6cd5cc2d24a2e01871 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dbbfa481539acd29de47ff6c… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Mar 12 23:05:07 2019 +0100 shell32: In SHRestricted add missing slash. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shpolicy.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/shell32/shpolicy.c b/dlls/shell32/shpolicy.c index 62e6ab5..a05c7e9 100644 --- a/dlls/shell32/shpolicy.c +++ b/dlls/shell32/shpolicy.c @@ -854,6 +854,7 @@ DWORD WINAPI SHRestricted (RESTRICTIONS policy) } lstrcpyA(regstr, strRegistryPolicyA); + lstrcatA(regstr, "\\"); lstrcatA(regstr, p->appstr); /* return 0 and don't set the cache if any registry errors occur */

1 0