September 2019 - Wine-Commits

Jacek Caban : scrobj: Add IActiveScriptSiteWindow stub implementation.
by Alexandre Julliard Sept. 20, 2019

Sept. 20, 2019

Module: wine Branch: master Commit: 98b63dc868ef924e5ec9131744acb75d08e3f81b URL: https://source.winehq.org/git/wine.git/?a=commit;h=98b63dc868ef924e5ec91317… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 20 16:23:36 2019 +0200 scrobj: Add IActiveScriptSiteWindow stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrobj/scrobj.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/dlls/scrobj/scrobj.c b/dlls/scrobj/scrobj.c index 8fc95827a7..14ca1bce4c 100644 --- a/dlls/scrobj/scrobj.c +++ b/dlls/scrobj/scrobj.c @@ -85,6 +85,7 @@ struct scriptlet_factory struct script_host { IActiveScriptSite IActiveScriptSite_iface; + IActiveScriptSiteWindow IActiveScriptSiteWindow_iface; LONG ref; struct list entry; WCHAR *language; @@ -193,6 +194,11 @@ static HRESULT WINAPI ActiveScriptSite_QueryInterface(IActiveScriptSite *iface, TRACE("(%p)->(IID_IActiveScriptSite %p)\n", This, ppv); *ppv = &This->IActiveScriptSite_iface; } + else if (IsEqualGUID(&IID_IActiveScriptSiteWindow, riid)) + { + TRACE("(%p)->(IID_IActiveScriptSiteWindow %p)\n", This, ppv); + *ppv = &This->IActiveScriptSiteWindow_iface; + } else { FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); @@ -304,6 +310,51 @@ static const IActiveScriptSiteVtbl ActiveScriptSiteVtbl = { ActiveScriptSite_OnLeaveScript }; +static inline struct script_host *impl_from_IActiveScriptSiteWindow(IActiveScriptSiteWindow *iface) +{ + return CONTAINING_RECORD(iface, struct script_host, IActiveScriptSiteWindow_iface); +} + +static HRESULT WINAPI ActiveScriptSiteWindow_QueryInterface(IActiveScriptSiteWindow *iface, REFIID riid, void **obj) +{ + struct script_host *This = impl_from_IActiveScriptSiteWindow(iface); + return IActiveScriptSite_QueryInterface(&This->IActiveScriptSite_iface, riid, obj); +} + +static ULONG WINAPI ActiveScriptSiteWindow_AddRef(IActiveScriptSiteWindow *iface) +{ + struct script_host *This = impl_from_IActiveScriptSiteWindow(iface); + return IActiveScriptSite_AddRef(&This->IActiveScriptSite_iface); +} + +static ULONG WINAPI ActiveScriptSiteWindow_Release(IActiveScriptSiteWindow *iface) +{ + struct script_host *This = impl_from_IActiveScriptSiteWindow(iface); + return IActiveScriptSite_Release(&This->IActiveScriptSite_iface); +} + +static HRESULT WINAPI ActiveScriptSiteWindow_GetWindow(IActiveScriptSiteWindow *iface, HWND *hwnd) +{ + struct script_host *This = impl_from_IActiveScriptSiteWindow(iface); + FIXME("(%p, %p)\n", This, hwnd); + return E_NOTIMPL; +} + +static HRESULT WINAPI ActiveScriptSiteWindow_EnableModeless(IActiveScriptSiteWindow *iface, BOOL enable) +{ + struct script_host *This = impl_from_IActiveScriptSiteWindow(iface); + FIXME("(%p, %d)\n", This, enable); + return E_NOTIMPL; +} + +static const IActiveScriptSiteWindowVtbl ActiveScriptSiteWindowVtbl = { + ActiveScriptSiteWindow_QueryInterface, + ActiveScriptSiteWindow_AddRef, + ActiveScriptSiteWindow_Release, + ActiveScriptSiteWindow_GetWindow, + ActiveScriptSiteWindow_EnableModeless +}; + static struct script_host *find_script_host(struct list *hosts, const WCHAR *language) { struct script_host *host; @@ -321,6 +372,7 @@ static HRESULT create_script_host(const WCHAR *language, struct list *hosts) if (!(host = heap_alloc_zero(sizeof(*host)))) return E_OUTOFMEMORY; host->IActiveScriptSite_iface.lpVtbl = &ActiveScriptSiteVtbl; + host->IActiveScriptSiteWindow_iface.lpVtbl = &ActiveScriptSiteWindowVtbl; host->ref = 1; if (!(host->language = heap_strdupW(language)))

1 0

Jacek Caban : scrobj: Add IServiceProvider stub implementation.
by Alexandre Julliard Sept. 20, 2019

Sept. 20, 2019

Module: wine Branch: master Commit: 4c4006d3402b5b57efdf40dbfbe0cd424e1d446e URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c4006d3402b5b57efdf40db… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 20 16:23:46 2019 +0200 scrobj: Add IServiceProvider stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrobj/scrobj.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/dlls/scrobj/scrobj.c b/dlls/scrobj/scrobj.c index 14ca1bce4c..4424359d15 100644 --- a/dlls/scrobj/scrobj.c +++ b/dlls/scrobj/scrobj.c @@ -86,6 +86,7 @@ struct script_host { IActiveScriptSite IActiveScriptSite_iface; IActiveScriptSiteWindow IActiveScriptSiteWindow_iface; + IServiceProvider IServiceProvider_iface; LONG ref; struct list entry; WCHAR *language; @@ -199,6 +200,11 @@ static HRESULT WINAPI ActiveScriptSite_QueryInterface(IActiveScriptSite *iface, TRACE("(%p)->(IID_IActiveScriptSiteWindow %p)\n", This, ppv); *ppv = &This->IActiveScriptSiteWindow_iface; } + else if(IsEqualGUID(&IID_IServiceProvider, riid)) + { + TRACE("(%p)->(IID_IServiceProvider %p)\n", This, ppv); + *ppv = &This->IServiceProvider_iface; + } else { FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); @@ -355,6 +361,44 @@ static const IActiveScriptSiteWindowVtbl ActiveScriptSiteWindowVtbl = { ActiveScriptSiteWindow_EnableModeless }; +static inline struct script_host *impl_from_IServiceProvider(IServiceProvider *iface) +{ + return CONTAINING_RECORD(iface, struct script_host, IServiceProvider_iface); +} + +static HRESULT WINAPI ServiceProvider_QueryInterface(IServiceProvider *iface, REFIID riid, void **obj) +{ + struct script_host *This = impl_from_IServiceProvider(iface); + return IActiveScriptSite_QueryInterface(&This->IActiveScriptSite_iface, riid, obj); +} + +static ULONG WINAPI ServiceProvider_AddRef(IServiceProvider *iface) +{ + struct script_host *This = impl_from_IServiceProvider(iface); + return IActiveScriptSite_AddRef(&This->IActiveScriptSite_iface); +} + +static ULONG WINAPI ServiceProvider_Release(IServiceProvider *iface) +{ + struct script_host *This = impl_from_IServiceProvider(iface); + return IActiveScriptSite_Release(&This->IActiveScriptSite_iface); +} + +static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface, REFGUID service, + REFIID riid, void **obj) +{ + struct script_host *This = impl_from_IServiceProvider(iface); + FIXME("(%p)->(%s %s %p)\n", This, debugstr_guid(service), debugstr_guid(riid), obj); + return E_NOTIMPL; +} + +static const IServiceProviderVtbl ServiceProviderVtbl = { + ServiceProvider_QueryInterface, + ServiceProvider_AddRef, + ServiceProvider_Release, + ServiceProvider_QueryService +}; + static struct script_host *find_script_host(struct list *hosts, const WCHAR *language) { struct script_host *host; @@ -373,6 +417,7 @@ static HRESULT create_script_host(const WCHAR *language, struct list *hosts) host->IActiveScriptSite_iface.lpVtbl = &ActiveScriptSiteVtbl; host->IActiveScriptSiteWindow_iface.lpVtbl = &ActiveScriptSiteWindowVtbl; + host->IServiceProvider_iface.lpVtbl = &ServiceProviderVtbl; host->ref = 1; if (!(host->language = heap_strdupW(language)))

1 0

Henri Verbeet : wined3d: Add GPU information for AMD VEGA12.
by Alexandre Julliard Sept. 20, 2019

Sept. 20, 2019

Module: wine Branch: master Commit: d00477e5ea45faae7f087646bdb6784be4b368a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d00477e5ea45faae7f087646… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 20 18:26:26 2019 +0430 wined3d: Add GPU information for AMD VEGA12. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index fd03ce6349..8cb83ee884 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -398,6 +398,7 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_460, "Radeon(TM) RX 460 Graphics", DRIVER_AMD_RX, 4096}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_480, "Radeon (TM) RX 480 Graphics", DRIVER_AMD_RX, 4096}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA_10, "Radeon RX Vega", DRIVER_AMD_RX, 8192}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA_12, "Radeon Pro Vega 20", DRIVER_AMD_RX, 4096}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA_20, "Radeon RX Vega 20", DRIVER_AMD_RX, 4096}, /* Red Hat */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 10d076edcc..1d30cb315c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2413,6 +2413,7 @@ enum wined3d_pci_device CARD_AMD_RADEON_RX_460 = 0x67ef, CARD_AMD_RADEON_RX_480 = 0x67df, CARD_AMD_RADEON_RX_VEGA_10 = 0x687f, + CARD_AMD_RADEON_RX_VEGA_12 = 0x69af, CARD_AMD_RADEON_RX_VEGA_20 = 0x66af, CARD_NVIDIA_RIVA_128 = 0x0018,

1 0

Henri Verbeet : wined3d: Retrieve the supported sample counts for Vulkan formats.
by Alexandre Julliard Sept. 20, 2019

Sept. 20, 2019

Module: wine Branch: master Commit: c84b48b770a33d9839094c5944f2a29363068110 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c84b48b770a33d9839094c59… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 20 18:26:29 2019 +0430 wined3d: Retrieve the supported sample counts for Vulkan formats. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 82027bf19c..cc217c7322 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4160,10 +4160,13 @@ static void init_vulkan_format_info(struct wined3d_format_vk *format, {WINED3DFMT_BC7_UNORM_SRGB, VK_FORMAT_BC7_SRGB_BLOCK, }, }; VkFormat vk_format = VK_FORMAT_UNDEFINED; + VkImageFormatProperties image_properties; VkFormatFeatureFlags texture_flags; VkFormatProperties properties; + VkImageUsageFlags vk_usage; unsigned int flags; unsigned int i; + VkResult vr; for (i = 0; i < ARRAY_SIZE(vulkan_formats); ++i) { @@ -4211,6 +4214,22 @@ static void init_vulkan_format_info(struct wined3d_format_vk *format, format->f.flags[WINED3D_GL_RES_TYPE_TEX_2D] |= flags; format->f.flags[WINED3D_GL_RES_TYPE_TEX_3D] |= flags; format->f.flags[WINED3D_GL_RES_TYPE_TEX_CUBE] |= flags; + + vk_usage = 0; + if (texture_flags & VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT) + vk_usage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; + else if (texture_flags & VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT) + vk_usage = VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT; + if (vk_usage) + { + if ((vr = VK_CALL(vkGetPhysicalDeviceImageFormatProperties(vk_physical_device, vk_format, + VK_IMAGE_TYPE_2D, VK_IMAGE_TILING_OPTIMAL, vk_usage, 0, &image_properties))) < 0) + { + ERR("Failed to get image format properties, vr %s.\n", wined3d_debug_vkresult(vr)); + return; + } + format->f.multisample_types = image_properties.sampleCounts; + } } BOOL wined3d_adapter_vk_init_format_info(struct wined3d_adapter_vk *adapter_vk,

1 0

Jacek Caban : scrobj: Add public element parser implementation.
by Alexandre Julliard Sept. 20, 2019

Sept. 20, 2019

Module: wine Branch: master Commit: cad4da44bfb560d75ce290187283b6fb5293b1f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cad4da44bfb560d75ce29018… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 20 16:22:39 2019 +0200 scrobj: Add public element parser implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrobj/scrobj.c | 121 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 119 insertions(+), 2 deletions(-) diff --git a/dlls/scrobj/scrobj.c b/dlls/scrobj/scrobj.c index 83a9b099d7..6997a76982 100644 --- a/dlls/scrobj/scrobj.c +++ b/dlls/scrobj/scrobj.c @@ -31,11 +31,25 @@ #include "wine/debug.h" #include "wine/heap.h" +#include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(scrobj); static HINSTANCE scrobj_instance; +struct scriptlet_member +{ + struct list entry; + WCHAR *name; + struct list parameters; +}; + +struct method_parameter +{ + struct list entry; + WCHAR *name; +}; + struct scriptlet_factory { IClassFactory IClassFactory_iface; @@ -46,12 +60,15 @@ struct scriptlet_factory IMoniker *moniker; BOOL have_registration; + BOOL have_public; WCHAR *description; WCHAR *progid; WCHAR *versioned_progid; WCHAR *version; WCHAR *classid_str; CLSID classid; + + struct list members; }; typedef enum tid_t @@ -300,8 +317,93 @@ static HRESULT parse_scriptlet_registration(struct scriptlet_factory *factory) static HRESULT parse_scriptlet_public(struct scriptlet_factory *factory) { - FIXME("\n"); - return E_NOTIMPL; + struct scriptlet_member *member; + XmlNodeType node_type; + HRESULT hres; + + if (factory->have_public) + { + FIXME("duplicated public element\n"); + return E_FAIL; + } + factory->have_public = TRUE; + + for (;;) + { + hres = next_xml_node(factory, &node_type); + if (FAILED(hres)) return hres; + if (node_type == XmlNodeType_EndElement) break; + if (node_type != XmlNodeType_Element) + { + FIXME("Unexpected node type %u\n", node_type); + return E_FAIL; + } + + if (is_xml_name(factory, L"method")) + { + hres = IXmlReader_MoveToAttributeByName(factory->xml_reader, L"name", NULL); + if (hres != S_OK) + { + FIXME("Missing method name\n"); + return E_FAIL; + } + + if (!(member = heap_alloc(sizeof(*member)))) return E_OUTOFMEMORY; + + hres = read_xml_value(factory, &member->name); + if (FAILED(hres)) + { + heap_free(member); + return hres; + } + list_init(&member->parameters); + list_add_tail(&factory->members, &member->entry); + + for (;;) + { + struct method_parameter *parameter; + BOOL empty; + + hres = next_xml_node(factory, &node_type); + if (FAILED(hres)) return hres; + if (node_type == XmlNodeType_EndElement) break; + if (node_type != XmlNodeType_Element) + { + FIXME("Unexpected node type %u\n", node_type); + return E_FAIL; + } + if (!is_case_xml_name(factory, L"parameter")) + { + FIXME("Unexpected method element\n"); + return E_FAIL; + } + + empty = IXmlReader_IsEmptyElement(factory->xml_reader); + + hres = IXmlReader_MoveToAttributeByName(factory->xml_reader, L"name", NULL); + if (hres != S_OK) + { + FIXME("Missing parameter name\n"); + return E_FAIL; + } + + if (!(parameter = heap_alloc(sizeof(*parameter)))) return E_OUTOFMEMORY; + + hres = read_xml_value(factory, &parameter->name); + if (FAILED(hres)) return hres; + list_add_tail(&member->parameters, &parameter->entry); + if (!empty && FAILED(hres = expect_end_element(factory))) return hres; + } + } + else + { + FIXME("Unexpected element %s\n", debugstr_xml_name(factory)); + return E_NOTIMPL; + } + if (FAILED(hres)) return hres; + } + + return S_OK; } static HRESULT parse_scriptlet_script(struct scriptlet_factory *factory) @@ -438,6 +540,20 @@ static ULONG WINAPI scriptlet_factory_Release(IClassFactory *iface) { if (This->moniker) IMoniker_Release(This->moniker); if (This->xml_reader) IXmlReader_Release(This->xml_reader); + while (!list_empty(&This->members)) + { + struct scriptlet_member *member = LIST_ENTRY(list_head(&This->members), struct scriptlet_member, entry); + list_remove(&member->entry); + heap_free(member->name); + while (!list_empty(&member->parameters)) + { + struct method_parameter *parameter = LIST_ENTRY(list_head(&member->parameters), struct method_parameter, entry); + list_remove(&parameter->entry); + heap_free(parameter->name); + heap_free(parameter); + } + heap_free(member); + } heap_free(This->classid_str); heap_free(This->description); heap_free(This->versioned_progid); @@ -486,6 +602,7 @@ static HRESULT create_scriptlet_factory(const WCHAR *url, struct scriptlet_facto factory->IClassFactory_iface.lpVtbl = &scriptlet_factory_vtbl; factory->ref = 1; + list_init(&factory->members); hres = parse_scriptlet_file(factory, url); if (FAILED(hres))

1 0

Jacek Caban : scrobj: Add script element parser partial implementation.
by Alexandre Julliard Sept. 20, 2019

Sept. 20, 2019

Module: wine Branch: master Commit: 2f965ed663e5fbe3fe1384a6648c62324a2efa0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f965ed663e5fbe3fe1384a6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 20 16:22:49 2019 +0200 scrobj: Add script element parser partial implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrobj/scrobj.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 68 insertions(+), 4 deletions(-) diff --git a/dlls/scrobj/scrobj.c b/dlls/scrobj/scrobj.c index 6997a76982..6de0e8ce01 100644 --- a/dlls/scrobj/scrobj.c +++ b/dlls/scrobj/scrobj.c @@ -50,6 +50,13 @@ struct method_parameter WCHAR *name; }; +struct scriptlet_script +{ + struct list entry; + WCHAR *language; + WCHAR *body; +}; + struct scriptlet_factory { IClassFactory IClassFactory_iface; @@ -69,6 +76,7 @@ struct scriptlet_factory CLSID classid; struct list members; + struct list scripts; }; typedef enum tid_t @@ -406,10 +414,51 @@ static HRESULT parse_scriptlet_public(struct scriptlet_factory *factory) return S_OK; } -static HRESULT parse_scriptlet_script(struct scriptlet_factory *factory) +static HRESULT parse_scriptlet_script(struct scriptlet_factory *factory, struct scriptlet_script *script) { - FIXME("\n"); - return E_NOTIMPL; + XmlNodeType node_type; + HRESULT hres; + + for (;;) + { + hres = IXmlReader_MoveToNextAttribute(factory->xml_reader); + if (hres != S_OK) break; + + if (is_xml_name(factory, L"language")) + { + if (script->language) + { + FIXME("Duplicated language\n"); + return E_FAIL; + } + hres = read_xml_value(factory, &script->language); + if (FAILED(hres)) return hres; + } + else + { + FIXME("Unexpected attribute\n"); + return E_NOTIMPL; + } + } + + if (!script->language) + { + FIXME("Language not specified\n"); + return E_FAIL; + } + + if (FAILED(hres = next_xml_node(factory, &node_type))) return hres; + + if (node_type != XmlNodeType_Text && node_type != XmlNodeType_CDATA) + { + FIXME("Unexpected node type %u\n", node_type); + return E_FAIL; + } + + hres = read_xml_value(factory, &script->body); + if (FAILED(hres)) return hres; + + return expect_end_element(factory); } static HRESULT parse_scriptlet_file(struct scriptlet_factory *factory, const WCHAR *url) @@ -471,7 +520,13 @@ static HRESULT parse_scriptlet_file(struct scriptlet_factory *factory, const WCH else if (is_xml_name(factory, L"public")) hres = parse_scriptlet_public(factory); else if (is_xml_name(factory, L"script")) - hres = parse_scriptlet_script(factory); + { + struct scriptlet_script *script; + if (!(script = heap_alloc_zero(sizeof(*script)))) return E_OUTOFMEMORY; + list_add_tail(&factory->scripts, &script->entry); + hres = parse_scriptlet_script(factory, script); + if (FAILED(hres)) return hres; + } else { FIXME("Unexpected element %s\n", debugstr_xml_name(factory)); @@ -554,6 +609,14 @@ static ULONG WINAPI scriptlet_factory_Release(IClassFactory *iface) } heap_free(member); } + while (!list_empty(&This->scripts)) + { + struct scriptlet_script *script = LIST_ENTRY(list_head(&This->scripts), struct scriptlet_script, entry); + list_remove(&script->entry); + heap_free(script->language); + heap_free(script->body); + heap_free(script); + } heap_free(This->classid_str); heap_free(This->description); heap_free(This->versioned_progid); @@ -603,6 +666,7 @@ static HRESULT create_scriptlet_factory(const WCHAR *url, struct scriptlet_facto factory->IClassFactory_iface.lpVtbl = &scriptlet_factory_vtbl; factory->ref = 1; list_init(&factory->members); + list_init(&factory->scripts); hres = parse_scriptlet_file(factory, url); if (FAILED(hres))

1 0

Jacek Caban : scrobj: Add stub IActiveScriptSite implementation.
by Alexandre Julliard Sept. 20, 2019

Sept. 20, 2019

Module: wine Branch: master Commit: 471c2f960ed7d3c65bba951ac865ade7ea81a11e URL: https://source.winehq.org/git/wine.git/?a=commit;h=471c2f960ed7d3c65bba951a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 20 16:23:29 2019 +0200 scrobj: Add stub IActiveScriptSite implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrobj/scrobj.c | 221 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 217 insertions(+), 4 deletions(-) diff --git a/dlls/scrobj/scrobj.c b/dlls/scrobj/scrobj.c index e1dc6182f3..8fc95827a7 100644 --- a/dlls/scrobj/scrobj.c +++ b/dlls/scrobj/scrobj.c @@ -25,6 +25,7 @@ #include "ole2.h" #include "olectl.h" #include "rpcproxy.h" +#include "activscp.h" #include "initguid.h" #include "scrobj.h" @@ -76,10 +77,19 @@ struct scriptlet_factory WCHAR *classid_str; CLSID classid; + struct list hosts; struct list members; struct list scripts; }; +struct script_host +{ + IActiveScriptSite IActiveScriptSite_iface; + LONG ref; + struct list entry; + WCHAR *language; +}; + typedef enum tid_t { NULL_tid, @@ -155,6 +165,202 @@ static void release_typelib(void) ITypeLib_Release(typelib); } +static WCHAR *heap_strdupW(const WCHAR *str) +{ + WCHAR *ret; + size_t size = (wcslen(str) + 1) * sizeof(WCHAR); + if (!(ret = heap_alloc(size))) return NULL; + memcpy(ret, str, size); + return ret; +} + +static inline struct script_host *impl_from_IActiveScriptSite(IActiveScriptSite *iface) +{ + return CONTAINING_RECORD(iface, struct script_host, IActiveScriptSite_iface); +} + +static HRESULT WINAPI ActiveScriptSite_QueryInterface(IActiveScriptSite *iface, REFIID riid, void **ppv) +{ + struct script_host *This = impl_from_IActiveScriptSite(iface); + + if (IsEqualGUID(&IID_IUnknown, riid)) + { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = &This->IActiveScriptSite_iface; + } + else if (IsEqualGUID(&IID_IActiveScriptSite, riid)) + { + TRACE("(%p)->(IID_IActiveScriptSite %p)\n", This, ppv); + *ppv = &This->IActiveScriptSite_iface; + } + else + { + FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI ActiveScriptSite_AddRef(IActiveScriptSite *iface) +{ + struct script_host *This = impl_from_IActiveScriptSite(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI ActiveScriptSite_Release(IActiveScriptSite *iface) +{ + struct script_host *This = impl_from_IActiveScriptSite(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) { + heap_free(This->language); + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI ActiveScriptSite_GetLCID(IActiveScriptSite *iface, LCID *lcid) +{ + struct script_host *This = impl_from_IActiveScriptSite(iface); + + TRACE("(%p, %p)\n", This, lcid); + + *lcid = GetUserDefaultLCID(); + return S_OK; +} + +static HRESULT WINAPI ActiveScriptSite_GetItemInfo(IActiveScriptSite *iface, LPCOLESTR name, DWORD mask, + IUnknown **unk, ITypeInfo **ti) +{ + struct script_host *This = impl_from_IActiveScriptSite(iface); + FIXME("(%p, %s, %#x, %p, %p)\n", This, debugstr_w(name), mask, unk, ti); + return E_NOTIMPL; +} + +static HRESULT WINAPI ActiveScriptSite_GetDocVersionString(IActiveScriptSite *iface, BSTR *version) +{ + struct script_host *This = impl_from_IActiveScriptSite(iface); + FIXME("(%p, %p)\n", This, version); + return E_NOTIMPL; +} + +static HRESULT WINAPI ActiveScriptSite_OnScriptTerminate(IActiveScriptSite *iface, const VARIANT *result, + const EXCEPINFO *ei) +{ + struct script_host *This = impl_from_IActiveScriptSite(iface); + FIXME("(%p, %s, %p)\n", This, debugstr_variant(result), ei); + return E_NOTIMPL; +} + +static HRESULT WINAPI ActiveScriptSite_OnStateChange(IActiveScriptSite *iface, SCRIPTSTATE state) +{ + struct script_host *This = impl_from_IActiveScriptSite(iface); + TRACE("(%p, %d)\n", This, state); + return E_NOTIMPL; +} + +static HRESULT WINAPI ActiveScriptSite_OnScriptError(IActiveScriptSite *iface, IActiveScriptError *script_error) +{ + struct script_host *This = impl_from_IActiveScriptSite(iface); + FIXME("(%p, %p)\n", This, script_error); + return E_NOTIMPL; +} + +static HRESULT WINAPI ActiveScriptSite_OnEnterScript(IActiveScriptSite *iface) +{ + struct script_host *This = impl_from_IActiveScriptSite(iface); + TRACE("(%p)\n", This); + return S_OK; +} + +static HRESULT WINAPI ActiveScriptSite_OnLeaveScript(IActiveScriptSite *iface) +{ + struct script_host *This = impl_from_IActiveScriptSite(iface); + TRACE("(%p)\n", This); + return S_OK; +} + +static const IActiveScriptSiteVtbl ActiveScriptSiteVtbl = { + ActiveScriptSite_QueryInterface, + ActiveScriptSite_AddRef, + ActiveScriptSite_Release, + ActiveScriptSite_GetLCID, + ActiveScriptSite_GetItemInfo, + ActiveScriptSite_GetDocVersionString, + ActiveScriptSite_OnScriptTerminate, + ActiveScriptSite_OnStateChange, + ActiveScriptSite_OnScriptError, + ActiveScriptSite_OnEnterScript, + ActiveScriptSite_OnLeaveScript +}; + +static struct script_host *find_script_host(struct list *hosts, const WCHAR *language) +{ + struct script_host *host; + LIST_FOR_EACH_ENTRY(host, hosts, struct script_host, entry) + { + if (!wcscmp(host->language, language)) return host; + } + return NULL; +} + +static HRESULT create_script_host(const WCHAR *language, struct list *hosts) +{ + struct script_host *host; + + if (!(host = heap_alloc_zero(sizeof(*host)))) return E_OUTOFMEMORY; + + host->IActiveScriptSite_iface.lpVtbl = &ActiveScriptSiteVtbl; + host->ref = 1; + + if (!(host->language = heap_strdupW(language))) + { + IActiveScriptSite_Release(&host->IActiveScriptSite_iface); + return E_OUTOFMEMORY; + } + + list_add_tail(hosts, &host->entry); + return S_OK; +} + +static void detach_script_hosts(struct list *hosts) +{ + while (!list_empty(hosts)) + { + struct script_host *host = LIST_ENTRY(list_head(hosts), struct script_host, entry); + list_remove(&host->entry); + IActiveScriptSite_Release(&host->IActiveScriptSite_iface); + } +} + +static HRESULT create_scriptlet_hosts(struct scriptlet_factory *factory, struct list *hosts) +{ + struct scriptlet_script *script; + HRESULT hres; + + LIST_FOR_EACH_ENTRY(script, &factory->scripts, struct scriptlet_script, entry) + { + if (find_script_host(hosts, script->language)) continue; + hres = create_script_host(script->language, hosts); + if (FAILED(hres)) + { + detach_script_hosts(hosts); + return hres; + } + } + return S_OK; +} + static const char *debugstr_xml_name(struct scriptlet_factory *factory) { const WCHAR *str; @@ -596,6 +802,7 @@ static ULONG WINAPI scriptlet_factory_Release(IClassFactory *iface) { if (This->moniker) IMoniker_Release(This->moniker); if (This->xml_reader) IXmlReader_Release(This->xml_reader); + detach_script_hosts(&This->hosts); while (!list_empty(&This->members)) { struct scriptlet_member *member = LIST_ENTRY(list_head(&This->members), struct scriptlet_member, entry); @@ -666,6 +873,7 @@ static HRESULT create_scriptlet_factory(const WCHAR *url, struct scriptlet_facto factory->IClassFactory_iface.lpVtbl = &scriptlet_factory_vtbl; factory->ref = 1; + list_init(&factory->hosts); list_init(&factory->members); list_init(&factory->scripts); @@ -1182,16 +1390,21 @@ HRESULT WINAPI DllInstall(BOOL install, const WCHAR *arg) { if (factory->have_registration) { - if (install) - hres = register_scriptlet(factory); - else - hres = unregister_scriptlet(factory); + /* validate scripts */ + hres = create_scriptlet_hosts(factory, &factory->hosts); } else { FIXME("No registration info\n"); hres = E_FAIL; } + if (SUCCEEDED(hres)) + { + if (install) + hres = register_scriptlet(factory); + else + hres = unregister_scriptlet(factory); + } IClassFactory_Release(&factory->IClassFactory_iface); }

1 0

Nikolay Sivov : d3d10_1/tests: Add a test for creating SRV for resource without D3D10_BIND_SHADER_RESOURCE.
by Alexandre Julliard Sept. 20, 2019

Sept. 20, 2019

Module: wine Branch: master Commit: dcba4ab5329de5140738f487dc16cc5ec7da3a5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=dcba4ab5329de5140738f487… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 20 11:39:33 2019 +0300 d3d10_1/tests: Add a test for creating SRV for resource without D3D10_BIND_SHADER_RESOURCE. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10_1/tests/d3d10_1.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/d3d10_1/tests/d3d10_1.c b/dlls/d3d10_1/tests/d3d10_1.c index f6abea0ced..9c468c13a2 100644 --- a/dlls/d3d10_1/tests/d3d10_1.c +++ b/dlls/d3d10_1/tests/d3d10_1.c @@ -399,6 +399,24 @@ static void test_create_shader_resource_view(void) ID3D10ShaderResourceView1_Release(srview); ID3D10Buffer_Release(buffer); + /* Without D3D10_BIND_SHADER_RESOURCE. */ + buffer_desc.ByteWidth = 1024; + buffer_desc.Usage = D3D10_USAGE_DEFAULT; + buffer_desc.BindFlags = 0; + buffer_desc.CPUAccessFlags = 0; + buffer_desc.MiscFlags = 0; + + hr = ID3D10Device1_CreateBuffer(device, &buffer_desc, NULL, &buffer); + ok(SUCCEEDED(hr), "Failed to create a buffer, hr %#x\n", hr); + + hr = ID3D10Device1_CreateShaderResourceView1(device, (ID3D10Resource *)buffer, &srv_desc, &srview); +todo_wine + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + ID3D10ShaderResourceView1_Release(srview); + + ID3D10Buffer_Release(buffer); + texture_desc.Width = 512; texture_desc.Height = 512; texture_desc.MipLevels = 0;

1 0

Zebediah Figura : winegstreamer: Don't set the source and target rects in amt_from_gst_caps_video().
by Alexandre Julliard Sept. 20, 2019

Sept. 20, 2019

Module: wine Branch: master Commit: bf46266099b49295a57d97533fdda0c67c2a4bca URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf46266099b49295a57d9753… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 19 18:59:37 2019 -0500 winegstreamer: Don't set the source and target rects in amt_from_gst_caps_video(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 2597a2cb4d..22fb8ef4c8 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -262,11 +262,6 @@ static gboolean amt_from_gst_caps_video(const GstCaps *caps, AM_MEDIA_TYPE *amt) bih->biSizeImage = width * height * bih->biBitCount / 8; if ((vih->AvgTimePerFrame = (REFERENCE_TIME)MulDiv(10000000, denom, nom)) == -1) vih->AvgTimePerFrame = 0; /* zero division or integer overflow */ - vih->rcSource.left = 0; - vih->rcSource.right = width; - vih->rcSource.top = height; - vih->rcSource.bottom = 0; - vih->rcTarget = vih->rcSource; bih->biSize = sizeof(*bih); bih->biWidth = width; bih->biHeight = height;

1 0

Rémi Bernon : winebus.sys: Use the SDL joystick index as device id instead of instance id.
by Alexandre Julliard Sept. 20, 2019

Sept. 20, 2019

Module: wine Branch: master Commit: 3d2f43a1daded5972a7f189ee7a66cec7b4563b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d2f43a1daded5972a7f189e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 20 10:31:41 2019 +0200 winebus.sys: Use the SDL joystick index as device id instead of instance id. Some games are using the HID device id as the gamepad index for xinput API. When hotplugging devices, SDL increases its instance id and it doesn't match anymore with xinput gamepad numbers. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index d3a1a19eeb..8fcec46d04 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -744,17 +744,21 @@ static const platform_vtbl sdl_vtbl = set_feature_report, }; +static int compare_joystick_id(DEVICE_OBJECT *device, void* context) +{ + return impl_from_DEVICE_OBJECT(device)->id - PtrToUlong(context); +} + static BOOL set_report_from_event(SDL_Event *event) { DEVICE_OBJECT *device; struct platform_private *private; /* All the events coming in will have 'which' as a 3rd field */ - SDL_JoystickID index = ((SDL_JoyButtonEvent*)event)->which; - - device = bus_find_hid_device(&sdl_vtbl, ULongToPtr(index)); + SDL_JoystickID id = ((SDL_JoyButtonEvent*)event)->which; + device = bus_enumerate_hid_devices(&sdl_vtbl, compare_joystick_id, ULongToPtr(id)); if (!device) { - ERR("Failed to find device at index %i\n",index); + ERR("Failed to find device at index %i\n",id); return FALSE; } private = impl_from_DEVICE_OBJECT(device); @@ -814,11 +818,11 @@ static BOOL set_mapped_report_from_event(SDL_Event *event) DEVICE_OBJECT *device; struct platform_private *private; /* All the events coming in will have 'which' as a 3rd field */ - int index = ((SDL_ControllerButtonEvent*)event)->which; - device = bus_find_hid_device(&sdl_vtbl, ULongToPtr(index)); + SDL_JoystickID id = ((SDL_ControllerButtonEvent*)event)->which; + device = bus_enumerate_hid_devices(&sdl_vtbl, compare_joystick_id, ULongToPtr(id)); if (!device) { - ERR("Failed to find device at index %i\n",index); + ERR("Failed to find device at index %i\n",id); return FALSE; } private = impl_from_DEVICE_OBJECT(device); @@ -878,7 +882,7 @@ static BOOL set_mapped_report_from_event(SDL_Event *event) return FALSE; } -static void try_remove_device(SDL_JoystickID index) +static void try_remove_device(SDL_JoystickID id) { DEVICE_OBJECT *device = NULL; struct platform_private *private; @@ -886,7 +890,7 @@ static void try_remove_device(SDL_JoystickID index) SDL_GameController *sdl_controller; SDL_Haptic *sdl_haptic; - device = bus_find_hid_device(&sdl_vtbl, ULongToPtr(index)); + device = bus_enumerate_hid_devices(&sdl_vtbl, compare_joystick_id, ULongToPtr(id)); if (!device) return; private = impl_from_DEVICE_OBJECT(device); @@ -905,7 +909,7 @@ static void try_remove_device(SDL_JoystickID index) pSDL_HapticClose(sdl_haptic); } -static void try_add_device(SDL_JoystickID index) +static void try_add_device(unsigned int index) { DWORD vid = 0, pid = 0, version = 0; DEVICE_OBJECT *device = NULL; @@ -967,7 +971,7 @@ static void try_add_device(SDL_JoystickID index) input = 0; device = bus_create_hid_device(sdl_busidW, vid, pid, - input, version, id, serial, is_xbox_gamepad, &GUID_DEVCLASS_SDL, + input, version, index, serial, is_xbox_gamepad, &GUID_DEVCLASS_SDL, &sdl_vtbl, sizeof(struct platform_private)); if (device)

1 0