September 2019 - Wine-commits

Jacek Caban : scrobj: Add script element parser partial implementation.
by Alexandre Julliard 20 Sep '19

20 Sep '19

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: Suport scriptlet registration.
by Alexandre Julliard 20 Sep '19

20 Sep '19

Module: wine Branch: master Commit: 2974c8e574929ccc371d75a1cb58bbe021a653b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2974c8e574929ccc371d75a1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 20 16:23:15 2019 +0200 scrobj: Suport scriptlet registration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrobj/scrobj.c | 168 ++++++++++++++++++++++++++++++++++++++++++++- dlls/scrobj/tests/scrobj.c | 18 +++-- 2 files changed, 180 insertions(+), 6 deletions(-) diff --git a/dlls/scrobj/scrobj.c b/dlls/scrobj/scrobj.c index 6de0e8ce01..e1dc6182f3 100644 --- a/dlls/scrobj/scrobj.c +++ b/dlls/scrobj/scrobj.c @@ -1,5 +1,6 @@ /* * Copyright 2017 Nikolay Sivov + * Copyright 2019 Jacek Caban for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -679,6 +680,151 @@ static HRESULT create_scriptlet_factory(const WCHAR *url, struct scriptlet_facto return S_OK; } +static HRESULT register_scriptlet(struct scriptlet_factory *factory) +{ + HKEY key, clsid_key, obj_key; + LSTATUS status; + HRESULT hres; + + if (factory->classid_str) + { + WCHAR *url; + + status = RegCreateKeyW(HKEY_CLASSES_ROOT, L"CLSID", &clsid_key); + if (status) return E_ACCESSDENIED; + + status = RegCreateKeyW(clsid_key, factory->classid_str, &obj_key); + RegCloseKey(clsid_key); + if (status) return E_ACCESSDENIED; + + hres = IMoniker_GetDisplayName(factory->moniker, NULL, NULL, &url); + if (FAILED(hres)) + { + RegCloseKey(obj_key); + return hres; + } + status = RegCreateKeyW(obj_key, L"ScriptletURL", &key); + if (!status) + { + status = RegSetValueExW(key, NULL, 0, REG_SZ, (BYTE*)url, + (wcslen(url) + 1) * sizeof(WCHAR)); + RegCloseKey(key); + } + CoTaskMemFree(url); + + if (factory->description) + status = RegSetValueExW(obj_key, NULL, 0, REG_SZ, (BYTE*)factory->description, + (wcslen(factory->description) + 1) * sizeof(WCHAR)); + + if (!status) + { + status = RegCreateKeyW(obj_key, L"InprocServer32", &key); + if (!status) + { + WCHAR str[MAX_PATH]; + GetModuleFileNameW(scrobj_instance, str, MAX_PATH); + status = RegSetValueExW(key, NULL, 0, REG_SZ, (BYTE*)str, (wcslen(str) + 1) * sizeof(WCHAR)); + RegCloseKey(key); + } + } + + if (!status && factory->versioned_progid) + { + status = RegCreateKeyW(obj_key, L"ProgID", &key); + if (!status) + { + status = RegSetValueExW(key, NULL, 0, REG_SZ, (BYTE*)factory->versioned_progid, + (wcslen(factory->versioned_progid) + 1) * sizeof(WCHAR)); + RegCloseKey(key); + } + } + + if (!status && factory->progid) + { + status = RegCreateKeyW(obj_key, L"VersionIndependentProgID", &key); + if (!status) + { + status = RegSetValueExW(key, NULL, 0, REG_SZ, (BYTE*)factory->progid, + (wcslen(factory->progid) + 1) * sizeof(WCHAR)); + RegCloseKey(key); + } + } + + RegCloseKey(obj_key); + if (status) return E_ACCESSDENIED; + } + + if (factory->progid) + { + status = RegCreateKeyW(HKEY_CLASSES_ROOT, factory->progid, &key); + if (status) return E_ACCESSDENIED; + + if (factory->description) + status = RegSetValueExW(key, NULL, 0, REG_SZ, (BYTE*)factory->description, + (wcslen(factory->description) + 1) * sizeof(WCHAR)); + + if (!status && factory->classid_str) + { + status = RegCreateKeyW(key, L"CLSID", &clsid_key); + if (!status) + { + status = RegSetValueExW(clsid_key, NULL, 0, REG_SZ, (BYTE*)factory->classid_str, + (wcslen(factory->classid_str) + 1) * sizeof(WCHAR)); + RegCloseKey(clsid_key); + } + } + + RegCloseKey(key); + if (status) return E_ACCESSDENIED; + } + + if (factory->versioned_progid) + { + status = RegCreateKeyW(HKEY_CLASSES_ROOT, factory->versioned_progid, &key); + if (status) return E_ACCESSDENIED; + + if (factory->description) + status = RegSetValueExW(key, NULL, 0, REG_SZ, (BYTE*)factory->description, + (wcslen(factory->description) + 1) * sizeof(WCHAR)); + + if (!status && factory->classid_str) + { + status = RegCreateKeyW(key, L"CLSID", &clsid_key); + if (!status) + { + status = RegSetValueExW(clsid_key, NULL, 0, REG_SZ, (BYTE*)factory->classid_str, + (wcslen(factory->classid_str) + 1) * sizeof(WCHAR)); + RegCloseKey(clsid_key); + } + } + + RegCloseKey(key); + if (status) return E_ACCESSDENIED; + } + + return S_OK; +} + +static HRESULT unregister_scriptlet(struct scriptlet_factory *factory) +{ + LSTATUS status; + + if (factory->classid_str) + { + HKEY clsid_key; + status = RegCreateKeyW(HKEY_CLASSES_ROOT, L"CLSID", &clsid_key); + if (!status) + { + RegDeleteTreeW(clsid_key, factory->classid_str); + RegCloseKey(clsid_key); + } + } + + if (factory->progid) RegDeleteTreeW(HKEY_CLASSES_ROOT, factory->progid); + if (factory->versioned_progid) RegDeleteTreeW(HKEY_CLASSES_ROOT, factory->versioned_progid); + return S_OK; +} + struct scriptlet_typelib { IGenScriptletTLib IGenScriptletTLib_iface; @@ -1020,6 +1166,7 @@ HRESULT WINAPI DllUnregisterServer(void) */ HRESULT WINAPI DllInstall(BOOL install, const WCHAR *arg) { + struct scriptlet_factory *factory; HRESULT hres; if (install) @@ -1030,8 +1177,25 @@ HRESULT WINAPI DllInstall(BOOL install, const WCHAR *arg) else if (!arg) return DllUnregisterServer(); - FIXME("argument %s not supported\n", debugstr_w(arg)); - return E_NOTIMPL; + hres = create_scriptlet_factory(arg, &factory); + if (SUCCEEDED(hres)) + { + if (factory->have_registration) + { + if (install) + hres = register_scriptlet(factory); + else + hres = unregister_scriptlet(factory); + } + else + { + FIXME("No registration info\n"); + hres = E_FAIL; + } + IClassFactory_Release(&factory->IClassFactory_iface); + } + + return hres; } static HRESULT WINAPI scriptlet_typelib_CreateInstance(IClassFactory *factory, IUnknown *outer, REFIID riid, void **obj) diff --git a/dlls/scrobj/tests/scrobj.c b/dlls/scrobj/tests/scrobj.c index bfd864dbee..259417e60e 100644 --- a/dlls/scrobj/tests/scrobj.c +++ b/dlls/scrobj/tests/scrobj.c @@ -730,7 +730,6 @@ static void register_script_object(BOOL do_register, const WCHAR *file_name) CHECK_CALLED(SetScriptState_UNINITIALIZED); todo_wine CHECK_CALLED(Close); - todo_wine ok(hres == S_OK, "DllInstall failed: %08x\n", hres); if (FAILED(hres)) return; @@ -769,10 +768,7 @@ static void test_create_object(void) hres = CoGetClassObject(&CLSID_WineTest, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, NULL, &IID_IClassFactory, (void**)&cf); - todo_wine ok(hres == S_OK, "Could not get class factory: %08x\n", hres); - if (FAILED(hres)) - return; parse_flags = SCRIPTTEXT_ISPERSISTENT | SCRIPTTEXT_ISVISIBLE; @@ -790,20 +786,34 @@ static void test_create_object(void) SET_EXPECT(SetScriptState_UNINITIALIZED); SET_EXPECT(Clone); hres = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (void**)&unk); + todo_wine ok(hres == S_OK, "Could not create scriptlet instance: %08x\n", hres); + todo_wine CHECK_CALLED(Clone); + todo_wine CHECK_CALLED(CreateInstance); + todo_wine CHECK_CALLED(QI_IActiveScriptParse); + todo_wine CHECK_CALLED(InitNew); + todo_wine CHECK_CALLED(SetScriptSite); + todo_wine CHECK_CALLED(AddNamedItem_scriptlet); + todo_wine CHECK_CALLED(AddNamedItem_globals); + todo_wine CHECK_CALLED(GetScriptDispatch); todo_wine CHECK_CALLED(GetDispID_vbAddOne); + todo_wine CHECK_CALLED(GetDispID_wtTest); + todo_wine CHECK_CALLED(SetScriptState_STARTED); + todo_wine CHECK_CALLED(ParseScriptText); + if (FAILED(hres)) + return; hres = IUnknown_QueryInterface(unk, &IID_IDispatch, (void**)&disp); ok(hres == S_OK, "Could not get IDispatch iface: %08x\n", hres);

1 0

Jacek Caban : scrobj: Add stub IActiveScriptSite implementation.
by Alexandre Julliard 20 Sep '19

20 Sep '19

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

Jacek Caban : scrobj: Add IActiveScriptSiteWindow stub implementation.
by Alexandre Julliard 20 Sep '19

20 Sep '19

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 20 Sep '19

20 Sep '19

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

Jacek Caban : scrobj: Create script engine instances for script hosts.
by Alexandre Julliard 20 Sep '19

20 Sep '19

Module: wine Branch: master Commit: c052f29c9645eb05bf9c499016c64b94b3d63942 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c052f29c9645eb05bf9c4990… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 20 16:24:04 2019 +0200 scrobj: Create script engine instances for script hosts. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrobj/scrobj.c | 108 +++++++++++++++++++++++++++++++++++++++++++-- dlls/scrobj/tests/scrobj.c | 5 --- 2 files changed, 105 insertions(+), 8 deletions(-) diff --git a/dlls/scrobj/scrobj.c b/dlls/scrobj/scrobj.c index 4424359d15..710cdfa738 100644 --- a/dlls/scrobj/scrobj.c +++ b/dlls/scrobj/scrobj.c @@ -26,6 +26,7 @@ #include "olectl.h" #include "rpcproxy.h" #include "activscp.h" +#include "mshtmhst.h" #include "initguid.h" #include "scrobj.h" @@ -37,6 +38,20 @@ WINE_DEFAULT_DEBUG_CHANNEL(scrobj); +#ifdef _WIN64 + +#define IActiveScriptParse_Release IActiveScriptParse64_Release +#define IActiveScriptParse_InitNew IActiveScriptParse64_InitNew +#define IActiveScriptParse_ParseScriptText IActiveScriptParse64_ParseScriptText + +#else + +#define IActiveScriptParse_Release IActiveScriptParse32_Release +#define IActiveScriptParse_InitNew IActiveScriptParse32_InitNew +#define IActiveScriptParse_ParseScriptText IActiveScriptParse32_ParseScriptText + +#endif + static HINSTANCE scrobj_instance; struct scriptlet_member @@ -87,9 +102,15 @@ struct script_host IActiveScriptSite IActiveScriptSite_iface; IActiveScriptSiteWindow IActiveScriptSiteWindow_iface; IServiceProvider IServiceProvider_iface; + LONG ref; struct list entry; + WCHAR *language; + + IActiveScript *active_script; + IActiveScriptParse *parser; + BOOL cloned; }; typedef enum tid_t @@ -409,9 +430,71 @@ static struct script_host *find_script_host(struct list *hosts, const WCHAR *lan return NULL; } -static HRESULT create_script_host(const WCHAR *language, struct list *hosts) +static HRESULT init_script_host(struct script_host *host, IActiveScript *clone) +{ + HRESULT hres; + + if (!clone) + { + IClassFactoryEx *factory_ex; + IClassFactory *factory; + IUnknown *unk; + CLSID clsid; + + if (FAILED(hres = CLSIDFromProgID(host->language, &clsid))) + { + WARN("Could not find script engine for %s\n", debugstr_w(host->language)); + return hres; + } + + hres = CoGetClassObject(&clsid, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, NULL, + &IID_IClassFactory, (void**)&factory); + if (FAILED(hres)) return hres; + + hres = IClassFactory_QueryInterface(factory, &IID_IClassFactoryEx, (void**)&factory_ex); + if (SUCCEEDED(hres)) + { + FIXME("Use IClassFactoryEx\n"); + IClassFactoryEx_Release(factory_ex); + } + + hres = IClassFactory_CreateInstance(factory, NULL, &IID_IUnknown, (void**)&unk); + IClassFactory_Release(factory); + if (FAILED(hres)) return hres; + + hres = IUnknown_QueryInterface(unk, &IID_IActiveScript, (void**)&host->active_script); + IUnknown_Release(unk); + if (FAILED(hres)) return hres; + } + else + { + IActiveScript_AddRef(clone); + host->active_script = clone; + host->cloned = TRUE; + } + + hres = IActiveScript_QueryInterface(host->active_script, &IID_IActiveScriptParse, (void**)&host->parser); + if (FAILED(hres)) return hres; + + if (!clone) + { + hres = IActiveScriptParse_InitNew(host->parser); + if (FAILED(hres)) + { + IActiveScriptParse_Release(host->parser); + host->parser = NULL; + return hres; + } + } + + return IActiveScript_SetScriptSite(host->active_script, &host->IActiveScriptSite_iface); +} + +static HRESULT create_script_host(const WCHAR *language, IActiveScript *origin_script, struct list *hosts) { + IActiveScript *clone = NULL; struct script_host *host; + HRESULT hres; if (!(host = heap_alloc_zero(sizeof(*host)))) return E_OUTOFMEMORY; @@ -426,8 +509,16 @@ static HRESULT create_script_host(const WCHAR *language, struct list *hosts) return E_OUTOFMEMORY; } + if (origin_script) + { + hres = IActiveScript_Clone(origin_script, &clone); + if (FAILED(hres)) clone = NULL; + } + list_add_tail(hosts, &host->entry); - return S_OK; + hres = init_script_host(host, clone); + if (clone) IActiveScript_Release(clone); + return hres; } static void detach_script_hosts(struct list *hosts) @@ -436,6 +527,17 @@ static void detach_script_hosts(struct list *hosts) { struct script_host *host = LIST_ENTRY(list_head(hosts), struct script_host, entry); list_remove(&host->entry); + if (host->parser) + { + IActiveScript_Close(host->active_script); + IActiveScriptParse_Release(host->parser); + host->parser = NULL; + } + if (host->active_script) + { + IActiveScript_Release(host->active_script); + host->active_script = NULL; + } IActiveScriptSite_Release(&host->IActiveScriptSite_iface); } } @@ -448,7 +550,7 @@ static HRESULT create_scriptlet_hosts(struct scriptlet_factory *factory, struct 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); + hres = create_script_host(script->language, NULL, hosts); if (FAILED(hres)) { detach_script_hosts(hosts); diff --git a/dlls/scrobj/tests/scrobj.c b/dlls/scrobj/tests/scrobj.c index 259417e60e..d3e5631d05 100644 --- a/dlls/scrobj/tests/scrobj.c +++ b/dlls/scrobj/tests/scrobj.c @@ -716,19 +716,14 @@ static void register_script_object(BOOL do_register, const WCHAR *file_name) SET_EXPECT(SetScriptState_UNINITIALIZED); SET_EXPECT(Close); hres = pDllInstall(do_register, file_name); - todo_wine CHECK_CALLED(CreateInstance); - todo_wine CHECK_CALLED(QI_IActiveScriptParse); - todo_wine CHECK_CALLED(InitNew); - todo_wine CHECK_CALLED(SetScriptSite); todo_wine CHECK_CALLED(ParseScriptText); todo_wine CHECK_CALLED(SetScriptState_UNINITIALIZED); - todo_wine CHECK_CALLED(Close); ok(hres == S_OK, "DllInstall failed: %08x\n", hres); if (FAILED(hres))

1 0

Jacek Caban : kernel32/tests: Enable debug break exception race tests on i386 Wine.
by Alexandre Julliard 20 Sep '19

20 Sep '19

Module: wine Branch: master Commit: 27da4fa4498c3b6e0e46c72a9cdd13b620726e92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=27da4fa4498c3b6e0e46c72a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 20 16:33:53 2019 +0200 kernel32/tests: Enable debug break exception race tests on i386 Wine. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/debugger.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 6b4e68f29f..93d12a56eb 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -1357,7 +1357,7 @@ static void test_debugger(const char *argv0) } else win_skip("call_debug_service_code not supported on this architecture\n"); - if (sizeof(loop_code) > 1 && (sizeof(void*) == 8 || broken(1) /* FIXME: broken in Wine */)) + if (sizeof(loop_code) > 1) { memset(buf, OP_BP, sizeof(buf)); memcpy(proc_code, &loop_code, sizeof(loop_code));

1 0

Zebediah Figura : winegstreamer: Reimplement the AVI splitter on top of the avidemux plugin.
by Alexandre Julliard 20 Sep '19

20 Sep '19

Module: wine Branch: master Commit: 5de712b5d8b8865c35b1907520c17dddf49b623d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5de712b5d8b8865c35b19075… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 19 18:59:38 2019 -0500 winegstreamer: Reimplement the AVI splitter on top of the avidemux plugin. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/Makefile.in | 1 - dlls/quartz/avisplit.c | 1444 -------------------------------------- dlls/quartz/main.c | 1 - dlls/quartz/quartz_private.h | 1 - dlls/quartz/quartz_strmif.idl | 7 - dlls/quartz/regsvr.c | 17 - dlls/quartz/tests/avisplit.c | 13 +- dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/gstdemux.c | 112 ++- dlls/winegstreamer/main.c | 43 ++ 10 files changed, 166 insertions(+), 1474 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5de712b5d8b8865c35b1…

1 0

Rémi Bernon : ntoskrnl.exe: Update the interface if it is already in the tree.
by Alexandre Julliard 20 Sep '19

20 Sep '19

Module: wine Branch: master Commit: 8db70e92a899fea6711c4f4fa3fa45adf1574fe8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8db70e92a899fea6711c4f4f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 20 10:31:40 2019 +0200 ntoskrnl.exe: Update the interface if it is already in the tree. As we are going to reuse the same device id when re-plugging a previously plugged SDL controller, the device interfaces are still present in the tree and IoRegisterDeviceInterface was not updating the device pointer. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/pnp.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 03c4c401f9..17d61a096a 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -622,7 +622,9 @@ NTSTATUS WINAPI IoRegisterDeviceInterface(DEVICE_OBJECT *device, const GUID *cla WCHAR device_instance_id[MAX_DEVICE_ID_LEN]; SP_DEVICE_INTERFACE_DETAIL_DATA_W *data; NTSTATUS status = STATUS_SUCCESS; + UNICODE_STRING device_path; struct device_interface *iface; + struct wine_rb_entry *entry; DWORD required; HDEVINFO set; @@ -660,19 +662,32 @@ NTSTATUS WINAPI IoRegisterDeviceInterface(DEVICE_OBJECT *device, const GUID *cla data->DevicePath[1] = '?'; TRACE("Returning path %s.\n", debugstr_w(data->DevicePath)); + RtlCreateUnicodeString( &device_path, data->DevicePath); + + entry = wine_rb_get( &device_interfaces, &device_path ); + if (entry) + { + iface = WINE_RB_ENTRY_VALUE( entry, struct device_interface, entry ); + if (iface->enabled) + ERR("Device interface %s is still enabled.\n", debugstr_us(&iface->symbolic_link)); + } + else + { + iface = heap_alloc_zero( sizeof(struct device_interface) ); + RtlCreateUnicodeString(&iface->symbolic_link, data->DevicePath); + if (wine_rb_put( &device_interfaces, &iface->symbolic_link, &iface->entry )) + ERR("Failed to insert interface %s into tree.\n", debugstr_us(&iface->symbolic_link)); + } - iface = heap_alloc_zero( sizeof(struct device_interface) ); iface->device = device; iface->interface_class = *class_guid; - RtlCreateUnicodeString(&iface->symbolic_link, data->DevicePath); if (symbolic_link) RtlCreateUnicodeString( symbolic_link, data->DevicePath); - if (wine_rb_put( &device_interfaces, &iface->symbolic_link, &iface->entry )) - ERR("Failed to insert interface %s into tree.\n", debugstr_us(&iface->symbolic_link)); - HeapFree( GetProcessHeap(), 0, data ); + RtlFreeUnicodeString( &device_path ); + return status; }

1 0

Rémi Bernon : winebus.sys: Use the SDL joystick index as device id instead of instance id.
by Alexandre Julliard 20 Sep '19

20 Sep '19

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