May 2022 - Wine-Devel - list.winehq.org

[v2 PATCH 1/4] kernel32/tests: Run process information tests over defined test data.
by Nikolay Sivov May 25, 2022

May 25, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kernel32/tests/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index c1312bd8916..4a6451a23fe 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -3773,7 +3773,7 @@ static void test_process_info(HANDLE hproc) return; } - for (i = 0; i < MaxProcessInfoClass; i++) + for (i = 0; i < ARRAY_SIZE(info_size); i++) { ret_len = 0; status = pNtQueryInformationProcess(hproc, i, buf, info_size[i], &ret_len); -- 2.35.1

2 4

[PATCH v4 0/8] MR61: winegstreamer: Dynamic transform stream format change support.
by Rémi Bernon May 25, 2022

May 25, 2022

Compared to last attempt, I moved the format pointer to a dedicated `wg_transform_read_data` parameter instead of a property of the sample. Most of the transforms use `NULL` there as they don't expect or support format change. H264 decoder passes a transform format member where it tracks the current stream format. -- v4: winegstreamer: Expose output media type attributes from the stream format. winegstreamer: Support wg_transform output format change events. winegstreamer: Track caps changes and keep them with the output buffers. winegstreamer: Only filter video caps attributes when format uses 0. winegstreamer: Avoid leaking buffer list in wg_transform_read_data. winegstreamer: Return early if output buffer is too small. winegstreamer: Set wg_transform output sample size on gst_buffer_map failure. winegstreamer: Append a videoconvert element to wg_transform video output. https://gitlab.winehq.org/wine/wine/-/merge_requests/61

3 13

[PATCH v2 1/4] mshtml: Implement timeout for XMLHttpRequest.
by Gabriel Ivăncescu May 25, 2022

May 25, 2022

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/documentmode.js | 2 + dlls/mshtml/tests/xmlhttprequest.c | 36 +++++++++ dlls/mshtml/xmlhttprequest.c | 116 +++++++++++++++++++++++++++++ 4 files changed, 155 insertions(+) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 930ab3b..5574272 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -265,6 +265,7 @@ typedef struct EventTarget EventTarget; XIID(IHTMLWindow6) \ XIID(IHTMLWindow7) \ XIID(IHTMLXMLHttpRequest) \ + XIID(IHTMLXMLHttpRequest2) \ XIID(IHTMLXMLHttpRequestFactory) \ XIID(IOmHistory) \ XIID(IOmNavigator) \ diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 5f10447..8503523 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -397,6 +397,8 @@ sync_test("xhr_props", function() { test_exposed("addEventListener", v >= 9); test_exposed("removeEventListener", v >= 9); test_exposed("dispatchEvent", v >= 9); + test_exposed("ontimeout", true); + test_exposed("timeout", true); }); sync_test("stylesheet_props", function() { diff --git a/dlls/mshtml/tests/xmlhttprequest.c b/dlls/mshtml/tests/xmlhttprequest.c index 868035d..6aef9f5 100644 --- a/dlls/mshtml/tests/xmlhttprequest.c +++ b/dlls/mshtml/tests/xmlhttprequest.c @@ -1007,6 +1007,41 @@ static void test_xhr_post(IHTMLDocument2 *doc) xhr = NULL; } +static void test_timeout(IHTMLDocument2 *doc) +{ + IHTMLXMLHttpRequest2 *xhr2; + LONG timeout; + HRESULT hres; + + create_xmlhttprequest(doc); + if(!xhr) + return; + + hres = IHTMLXMLHttpRequest_QueryInterface(xhr, &IID_IHTMLXMLHttpRequest2, (void**)&xhr2); + ok(hres == S_OK, "QueryInterface(IHTMLXMLHttpRequest2) failed: %08lx\n", hres); + + hres = IHTMLXMLHttpRequest2_get_timeout(xhr2, NULL); + ok(hres == E_POINTER, "get_timeout returned %08lx\n", hres); + hres = IHTMLXMLHttpRequest2_get_timeout(xhr2, &timeout); + ok(hres == S_OK, "get_timeout returned %08lx\n", hres); + ok(timeout == 0, "timeout = %ld\n", timeout); + + /* Some Windows versions only allow setting timeout after open() */ + xhr_open(L"http://test.winehq.org/tests/post.php", L"POST", TRUE); + IHTMLXMLHttpRequest_Release(xhr); + xhr = NULL; + + hres = IHTMLXMLHttpRequest2_put_timeout(xhr2, -1); + ok(hres == E_INVALIDARG || broken(hres == E_FAIL), "put_timeout returned %08lx\n", hres); + hres = IHTMLXMLHttpRequest2_put_timeout(xhr2, 1337); + ok(hres == S_OK, "put_timeout returned %08lx\n", hres); + hres = IHTMLXMLHttpRequest2_get_timeout(xhr2, &timeout); + ok(hres == S_OK, "get_timeout returned %08lx\n", hres); + ok(timeout == 1337, "timeout = %ld\n", timeout); + + IHTMLXMLHttpRequest2_Release(xhr2); +} + static IHTMLDocument2 *create_doc_from_url(const WCHAR *start_url) { BSTR url; @@ -1071,6 +1106,7 @@ START_TEST(xmlhttprequest) test_async_xhr(doc, large_page_url, NULL); test_async_xhr_abort(doc, large_page_url); test_xhr_post(doc); + test_timeout(doc); IHTMLDocument2_Release(doc); } SysFreeString(content_type); diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index 1721959..066b94b 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -105,6 +105,7 @@ typedef struct { struct HTMLXMLHttpRequest { EventTarget event_target; IHTMLXMLHttpRequest IHTMLXMLHttpRequest_iface; + IHTMLXMLHttpRequest2 IHTMLXMLHttpRequest2_iface; IProvideClassInfo2 IProvideClassInfo2_iface; LONG ref; nsIXMLHttpRequest *nsxhr; @@ -236,6 +237,8 @@ static HRESULT WINAPI HTMLXMLHttpRequest_QueryInterface(IHTMLXMLHttpRequest *ifa *ppv = &This->IHTMLXMLHttpRequest_iface; }else if(IsEqualGUID(&IID_IHTMLXMLHttpRequest, riid)) { *ppv = &This->IHTMLXMLHttpRequest_iface; + }else if(IsEqualGUID(&IID_IHTMLXMLHttpRequest2, riid)) { + *ppv = &This->IHTMLXMLHttpRequest2_iface; }else if(IsEqualGUID(&IID_IProvideClassInfo, riid)) { *ppv = &This->IProvideClassInfo2_iface; }else if(IsEqualGUID(&IID_IProvideClassInfo2, riid)) { @@ -726,6 +729,117 @@ static const IHTMLXMLHttpRequestVtbl HTMLXMLHttpRequestVtbl = { HTMLXMLHttpRequest_setRequestHeader }; +static inline HTMLXMLHttpRequest *impl_from_IHTMLXMLHttpRequest2(IHTMLXMLHttpRequest2 *iface) +{ + return CONTAINING_RECORD(iface, HTMLXMLHttpRequest, IHTMLXMLHttpRequest2_iface); +} + +static HRESULT WINAPI HTMLXMLHttpRequest2_QueryInterface(IHTMLXMLHttpRequest2 *iface, REFIID riid, void **ppv) +{ + HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest2(iface); + return IHTMLXMLHttpRequest_QueryInterface(&This->IHTMLXMLHttpRequest_iface, riid, ppv); +} + +static ULONG WINAPI HTMLXMLHttpRequest2_AddRef(IHTMLXMLHttpRequest2 *iface) +{ + HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest2(iface); + return IHTMLXMLHttpRequest_AddRef(&This->IHTMLXMLHttpRequest_iface); +} + +static ULONG WINAPI HTMLXMLHttpRequest2_Release(IHTMLXMLHttpRequest2 *iface) +{ + HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest2(iface); + return IHTMLXMLHttpRequest_Release(&This->IHTMLXMLHttpRequest_iface); +} + +static HRESULT WINAPI HTMLXMLHttpRequest2_GetTypeInfoCount(IHTMLXMLHttpRequest2 *iface, UINT *pctinfo) +{ + HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest2(iface); + return IDispatchEx_GetTypeInfoCount(&This->event_target.dispex.IDispatchEx_iface, pctinfo); +} + +static HRESULT WINAPI HTMLXMLHttpRequest2_GetTypeInfo(IHTMLXMLHttpRequest2 *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest2(iface); + return IDispatchEx_GetTypeInfo(&This->event_target.dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI HTMLXMLHttpRequest2_GetIDsOfNames(IHTMLXMLHttpRequest2 *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, + LCID lcid, DISPID *rgDispId) +{ + HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest2(iface); + return IDispatchEx_GetIDsOfNames(&This->event_target.dispex.IDispatchEx_iface, riid, rgszNames, cNames, + lcid, rgDispId); +} + +static HRESULT WINAPI HTMLXMLHttpRequest2_Invoke(IHTMLXMLHttpRequest2 *iface, DISPID dispIdMember, REFIID riid, LCID lcid, + WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest2(iface); + return IDispatchEx_Invoke(&This->event_target.dispex.IDispatchEx_iface, dispIdMember, riid, lcid, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI HTMLXMLHttpRequest2_put_timeout(IHTMLXMLHttpRequest2 *iface, LONG v) +{ + HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest2(iface); + + TRACE("(%p)->(%ld)\n", This, v); + + if(v < 0) + return E_INVALIDARG; + return map_nsresult(nsIXMLHttpRequest_SetTimeout(This->nsxhr, v)); +} + +static HRESULT WINAPI HTMLXMLHttpRequest2_get_timeout(IHTMLXMLHttpRequest2 *iface, LONG *p) +{ + HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest2(iface); + nsresult nsres; + UINT32 timeout; + + TRACE("(%p)->(%p)\n", This, p); + + if(!p) + return E_POINTER; + + nsres = nsIXMLHttpRequest_GetTimeout(This->nsxhr, &timeout); + *p = timeout; + return map_nsresult(nsres); +} + +static HRESULT WINAPI HTMLXMLHttpRequest2_put_ontimeout(IHTMLXMLHttpRequest2 *iface, VARIANT v) +{ + HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest2(iface); + + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLXMLHttpRequest2_get_ontimeout(IHTMLXMLHttpRequest2 *iface, VARIANT *p) +{ + HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest2(iface); + + FIXME("(%p)->(%p)\n", This, p); + + return E_NOTIMPL; +} + +static const IHTMLXMLHttpRequest2Vtbl HTMLXMLHttpRequest2Vtbl = { + HTMLXMLHttpRequest2_QueryInterface, + HTMLXMLHttpRequest2_AddRef, + HTMLXMLHttpRequest2_Release, + HTMLXMLHttpRequest2_GetTypeInfoCount, + HTMLXMLHttpRequest2_GetTypeInfo, + HTMLXMLHttpRequest2_GetIDsOfNames, + HTMLXMLHttpRequest2_Invoke, + HTMLXMLHttpRequest2_put_timeout, + HTMLXMLHttpRequest2_get_timeout, + HTMLXMLHttpRequest2_put_ontimeout, + HTMLXMLHttpRequest2_get_ontimeout +}; + static inline HTMLXMLHttpRequest *impl_from_IProvideClassInfo2(IProvideClassInfo2 *iface) { return CONTAINING_RECORD(iface, HTMLXMLHttpRequest, IProvideClassInfo2_iface); @@ -895,6 +1009,7 @@ static event_target_vtbl_t HTMLXMLHttpRequest_event_target_vtbl = { }; static const tid_t HTMLXMLHttpRequest_iface_tids[] = { + IHTMLXMLHttpRequest2_tid, 0 }; static dispex_static_data_t HTMLXMLHttpRequest_dispex = { @@ -1013,6 +1128,7 @@ static HRESULT WINAPI HTMLXMLHttpRequestFactory_create(IHTMLXMLHttpRequestFactor ret->nsxhr = nsxhr; ret->IHTMLXMLHttpRequest_iface.lpVtbl = &HTMLXMLHttpRequestVtbl; + ret->IHTMLXMLHttpRequest2_iface.lpVtbl = &HTMLXMLHttpRequest2Vtbl; ret->IProvideClassInfo2_iface.lpVtbl = &ProvideClassInfo2Vtbl; EventTarget_Init(&ret->event_target, (IUnknown*)&ret->IHTMLXMLHttpRequest_iface, &HTMLXMLHttpRequest_dispex, This->window->doc->document_mode); -- 2.34.1

3 9

[PATCH v2 1/3] user32: Retrieve the usage page and usage directly from the hid_preparsed_data structure.
by Zebediah Figura May 25, 2022

May 25, 2022

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/user32/rawinput.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index a014066f988..961efecd075 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -177,7 +177,6 @@ void rawinput_update_device_list(void) SP_DEVICE_INTERFACE_DATA iface = { sizeof(iface) }; struct device *device; HIDD_ATTRIBUTES attr; - HIDP_CAPS caps; GUID hid_guid; HDEVINFO set; DWORD idx; @@ -201,6 +200,8 @@ void rawinput_update_device_list(void) for (idx = 0; SetupDiEnumDeviceInterfaces(set, NULL, &hid_guid, idx, &iface); ++idx) { + const struct hid_preparsed_data *preparsed; + if (!(device = add_device(set, &iface))) continue; @@ -215,12 +216,10 @@ void rawinput_update_device_list(void) if (!HidD_GetPreparsedData(device->file, &device->data)) WARN("Failed to get preparsed data.\n"); + preparsed = (struct hid_preparsed_data *)device->data; - if (!HidP_GetCaps(device->data, &caps)) - WARN("Failed to get caps.\n"); - - device->info.hid.usUsagePage = caps.UsagePage; - device->info.hid.usUsage = caps.Usage; + device->info.hid.usUsagePage = preparsed->usage_page; + device->info.hid.usUsage = preparsed->usage; } SetupDiDestroyDeviceInfoList(set); -- 2.35.1

2 5

[PATCH v2 1/4] mshtml: Implement HTMLStorage_getItem().
by Hans Leidekker May 25, 2022

May 25, 2022

v2: Store filename. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/mshtml/htmlstorage.c | 276 ++++++++++++++++++++++++++++++++++- dlls/mshtml/htmlwindow.c | 4 +- dlls/mshtml/mshtml_private.h | 2 +- 3 files changed, 274 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlstorage.c b/dlls/mshtml/htmlstorage.c index 95f7ae5cd16..8f154291e36 100644 --- a/dlls/mshtml/htmlstorage.c +++ b/dlls/mshtml/htmlstorage.c @@ -24,6 +24,7 @@ #include "winbase.h" #include "winuser.h" #include "ole2.h" +#include "shlobj.h" #include "wine/debug.h" @@ -35,6 +36,7 @@ typedef struct { DispatchEx dispex; IHTMLStorage IHTMLStorage_iface; LONG ref; + WCHAR *filename; } HTMLStorage; static inline HTMLStorage *impl_from_IHTMLStorage(IHTMLStorage *iface) @@ -83,6 +85,7 @@ static ULONG WINAPI HTMLStorage_Release(IHTMLStorage *iface) if(!ref) { release_dispex(&This->dispex); + heap_free(This->filename); heap_free(This); } @@ -121,6 +124,144 @@ static HRESULT WINAPI HTMLStorage_Invoke(IHTMLStorage *iface, DISPID dispIdMembe pDispParams, pVarResult, pExcepInfo, puArgErr); } +static BOOL create_path(const WCHAR *path) +{ + BOOL ret = TRUE; + WCHAR *new_path; + int len; + + new_path = heap_alloc((wcslen(path) + 1) * sizeof(WCHAR)); + if(!new_path) + return FALSE; + wcscpy(new_path, path); + + while((len = wcslen(new_path)) && new_path[len - 1] == '\\') + new_path[len - 1] = 0; + + while(!CreateDirectoryW(new_path, NULL)) { + WCHAR *slash; + DWORD error = GetLastError(); + if(error == ERROR_ALREADY_EXISTS) break; + if(error != ERROR_PATH_NOT_FOUND) { + ret = FALSE; + break; + } + slash = wcsrchr(new_path, '\\'); + if(!slash) { + ret = FALSE; + break; + } + len = slash - new_path; + new_path[len] = 0; + if(!create_path(new_path)) { + ret = FALSE; + break; + } + new_path[len] = '\\'; + } + heap_free(new_path); + return ret; +} + +static WCHAR *build_mutexname(const WCHAR *filename) +{ + WCHAR *ret, *ptr; + ret = heap_strdupW(filename); + if(!ret) + return NULL; + for(ptr = ret; *ptr; ptr++) + if(*ptr == '\\') *ptr = '_'; + return ret; +} + +struct storage { + IXMLDOMDocument *doc; + HANDLE mutex; +}; + +static void close_storage(struct storage *storage) +{ + if(storage->doc) + IXMLDOMDocument_Release(storage->doc); + ReleaseMutex(storage->mutex); + CloseHandle(storage->mutex); + heap_free(storage); +} + +static HRESULT open_storage(const WCHAR *filename, struct storage **ret) +{ + struct storage *storage; + HRESULT hres = E_OUTOFMEMORY; + VARIANT var; + VARIANT_BOOL success; + WCHAR *mutexname, *ptr, *path = NULL; + + storage = heap_alloc_zero(sizeof(*storage)); + if(!storage) + return E_OUTOFMEMORY; + + mutexname = build_mutexname(filename); + if(!mutexname) + goto done; + + storage->mutex = CreateMutexW(NULL, FALSE, mutexname); + heap_free(mutexname); + if(!storage->mutex) { + hres = HRESULT_FROM_WIN32(GetLastError()); + goto done; + } + WaitForSingleObject(storage->mutex, INFINITE); + + path = heap_strdupW(filename); + if(!path) + goto done; + + *(ptr = wcsrchr(path, '\\')) = 0; + if(!create_path(path)) + goto done; + + if(GetFileAttributesW(filename) == INVALID_FILE_ATTRIBUTES) { + DWORD count; + HANDLE file = CreateFileW(filename, GENERIC_WRITE, 0, NULL, CREATE_NEW, 0, NULL); + if(file == INVALID_HANDLE_VALUE) { + hres = HRESULT_FROM_WIN32(GetLastError()); + goto done; + } + if(!WriteFile(file, "<root/>", sizeof("<root/>") - 1, &count, NULL)) { + CloseHandle(file); + hres = HRESULT_FROM_WIN32(GetLastError()); + goto done; + } + CloseHandle(file); + } + + hres = CoCreateInstance(&CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (void**)&storage->doc); + if(hres != S_OK) + goto done; + + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(filename); + if(!V_BSTR(&var)) { + hres = E_OUTOFMEMORY; + goto done; + } + + hres = IXMLDOMDocument_load(storage->doc, var, &success); + if(hres == S_FALSE || success == VARIANT_FALSE) + hres = E_FAIL; + + SysFreeString(V_BSTR(&var)); + +done: + if(hres != S_OK) + close_storage(storage); + else + *ret = storage; + + heap_free(path); + return hres; +} + static HRESULT WINAPI HTMLStorage_get_length(IHTMLStorage *iface, LONG *p) { HTMLStorage *This = impl_from_IHTMLStorage(iface); @@ -142,14 +283,93 @@ static HRESULT WINAPI HTMLStorage_key(IHTMLStorage *iface, LONG lIndex, BSTR *p) return E_NOTIMPL; } -static HRESULT WINAPI HTMLStorage_getItem(IHTMLStorage *iface, BSTR bstrKey, VARIANT *p) +static BSTR build_query(const WCHAR *key) +{ + static const WCHAR fmt[] = L"item[@name='%s']"; + const WCHAR *str = key ? key : L""; + UINT len = ARRAY_SIZE(fmt) + wcslen(str); + BSTR ret = SysAllocStringLen(NULL, len); + + if(ret) swprintf(ret, len, fmt, str); + return ret; +} + +static HRESULT get_root_node(IXMLDOMDocument *doc, IXMLDOMNode **root) +{ + HRESULT hres; + BSTR str; + + str = SysAllocString(L"root"); + if(!str) + return E_OUTOFMEMORY; + + hres = IXMLDOMDocument_selectSingleNode(doc, str, root); + SysFreeString(str); + return hres; +} + +static HRESULT get_item(const WCHAR *filename, BSTR key, VARIANT *value) +{ + struct storage *storage; + BSTR query = NULL; + IXMLDOMNode *root = NULL, *node = NULL; + IXMLDOMElement *elem = NULL; + HRESULT hres; + + hres = open_storage(filename, &storage); + if(hres != S_OK) + return hres; + + hres = get_root_node(storage->doc, &root); + if(hres != S_OK) + goto done; + + query = build_query(key); + if(!query) { + hres = E_OUTOFMEMORY; + goto done; + } + + hres = IXMLDOMNode_selectSingleNode(root, query, &node); + if(hres == S_OK) { + hres = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMElement, (void**)&elem); + if(hres != S_OK) + goto done; + + hres = IXMLDOMElement_getAttribute(elem, (BSTR)L"value", value); + }else { + V_VT(value) = VT_NULL; + hres = S_OK; + } + +done: + SysFreeString(query); + if(root) + IXMLDOMNode_Release(root); + if(node) + IXMLDOMNode_Release(node); + if(elem) + IXMLDOMElement_Release(elem); + close_storage(storage); + return hres; +} + +static HRESULT WINAPI HTMLStorage_getItem(IHTMLStorage *iface, BSTR bstrKey, VARIANT *value) { HTMLStorage *This = impl_from_IHTMLStorage(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_w(bstrKey), p); + TRACE("(%p)->(%s %p)\n", This, debugstr_w(bstrKey), value); - V_VT(p) = VT_NULL; - return S_OK; + if(!value) + return E_POINTER; + + if(!This->filename) { + FIXME("session storage not supported\n"); + V_VT(value) = VT_NULL; + return S_OK; + } + + return get_item(This->filename, bstrKey, value); } static HRESULT WINAPI HTMLStorage_setItem(IHTMLStorage *iface, BSTR bstrKey, BSTR bstrValue) @@ -201,7 +421,48 @@ static dispex_static_data_t HTMLStorage_dispex = { HTMLStorage_iface_tids }; -HRESULT create_html_storage(compat_mode_t compat_mode, IHTMLStorage **p) +static WCHAR *build_filename(IUri *uri) +{ + static const WCHAR store[] = L"\\Microsoft\\Internet Explorer\\DOMStore\\"; + WCHAR path[MAX_PATH], *ret; + BSTR hostname; + HRESULT hres; + int len; + + hres = IUri_GetHost(uri, &hostname); + if(hres != S_OK) + return NULL; + + if(!SHGetSpecialFolderPathW(NULL, path, CSIDL_LOCAL_APPDATA, TRUE)) { + ERR("Can't get folder path %lu\n", GetLastError()); + SysFreeString(hostname); + return NULL; + } + + len = wcslen(path); + if(len + ARRAY_SIZE(store) > ARRAY_SIZE(path)) { + ERR("Path too long\n"); + SysFreeString(hostname); + return NULL; + } + memcpy(path + len, store, sizeof(store)); + + len += ARRAY_SIZE(store); + ret = heap_alloc((len + wcslen(hostname) + ARRAY_SIZE(L".xml")) * sizeof(WCHAR)); + if(!ret) { + SysFreeString(hostname); + return NULL; + } + + wcscpy(ret, path); + wcscat(ret, hostname); + wcscat(ret, L".xml"); + + SysFreeString(hostname); + return ret; +} + +HRESULT create_html_storage(compat_mode_t compat_mode, IUri *uri, IHTMLStorage **p) { HTMLStorage *storage; @@ -209,6 +470,11 @@ HRESULT create_html_storage(compat_mode_t compat_mode, IHTMLStorage **p) if(!storage) return E_OUTOFMEMORY; + if(uri && !(storage->filename = build_filename(uri))) { + heap_free(storage); + return E_OUTOFMEMORY; + } + storage->IHTMLStorage_iface.lpVtbl = &HTMLStorageVtbl; storage->ref = 1; init_dispatch(&storage->dispex, (IUnknown*)&storage->IHTMLStorage_iface, &HTMLStorage_dispex, compat_mode); diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 235e29a3070..ef5d80ff512 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2143,7 +2143,7 @@ static HRESULT WINAPI HTMLWindow6_get_sessionStorage(IHTMLWindow6 *iface, IHTMLS HRESULT hres; hres = create_html_storage(dispex_compat_mode(&This->inner_window->event_target.dispex), - &This->inner_window->session_storage); + NULL, &This->inner_window->session_storage); if(FAILED(hres)) return hres; } @@ -2163,7 +2163,7 @@ static HRESULT WINAPI HTMLWindow6_get_localStorage(IHTMLWindow6 *iface, IHTMLSto HRESULT hres; hres = create_html_storage(dispex_compat_mode(&This->inner_window->event_target.dispex), - &This->inner_window->local_storage); + This->inner_window->base.outer_window->uri, &This->inner_window->local_storage); if(FAILED(hres)) return hres; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 930ab3bbe19..4ad5d3dbe9a 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -941,7 +941,7 @@ HRESULT create_namespace_collection(compat_mode_t,IHTMLNamespaceCollection**) DE HRESULT create_dom_implementation(HTMLDocumentNode*,IHTMLDOMImplementation**) DECLSPEC_HIDDEN; void detach_dom_implementation(IHTMLDOMImplementation*) DECLSPEC_HIDDEN; -HRESULT create_html_storage(compat_mode_t,IHTMLStorage**) DECLSPEC_HIDDEN; +HRESULT create_html_storage(compat_mode_t,IUri*,IHTMLStorage**) DECLSPEC_HIDDEN; void HTMLDocument_Persist_Init(HTMLDocument*) DECLSPEC_HIDDEN; void HTMLDocument_OleCmd_Init(HTMLDocument*) DECLSPEC_HIDDEN; -- 2.30.2

2 1

[PATCH 1/6] include: Add IDOMProgressEvent interface and dispinterface.
by Gabriel Ivăncescu May 25, 2022

May 25, 2022

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- include/mshtmdid.h | 12 +++++++++ include/mshtml.idl | 62 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index 31e7570..f56fc4d 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -141,6 +141,12 @@ #define DISPID_DOMSTORAGEEVENT (DISPID_DOMMESSAGEEVENT+25) #define DISPID_DOMBEFOREUNLOADEVENT (DISPID_DOMSTORAGEEVENT+25) #define DISPID_DOMDRAGEVENT (DISPID_DOMBEFOREUNLOADEVENT+25) +#define DISPID_DOMMSPOINTEREVENT (DISPID_DOMDRAGEVENT+25) +#define DISPID_DOMMSGESTUREEVENT (DISPID_DOMMSPOINTEREVENT+25) +#define DISPID_DOMMSTRANSITIONEVENT (DISPID_DOMMSGESTUREEVENT+25) +#define DISPID_DOMMSANIMATIONEVENT (DISPID_DOMMSTRANSITIONEVENT+25) +#define DISPID_DOMMSMANIPULATIONEVENT (DISPID_DOMMSANIMATIONEVENT+25) +#define DISPID_DOMPROGRESSEVENT (DISPID_DOMMSMANIPULATIONEVENT+25) #define DISPID_DOMIMPLEMENTATION DISPID_NORMAL_FIRST #define DISPID_DOCUMENTCOMPATIBLEINFO DISPID_NORMAL_FIRST @@ -4704,6 +4710,12 @@ #define DISPID_IDOMMESSAGEEVENT_SOURCE DISPID_DOMMESSAGEEVENT+3 #define DISPID_IDOMMESSAGEEVENT_INITMESSAGEEVENT DISPID_DOMMESSAGEEVENT+4 +/* IDOMProgressEvent */ +#define DISPID_IDOMPROGRESSEVENT_LENGTHCOMPUTABLE DISPID_DOMPROGRESSEVENT+1 +#define DISPID_IDOMPROGRESSEVENT_LOADED DISPID_DOMPROGRESSEVENT+2 +#define DISPID_IDOMPROGRESSEVENT_TOTAL DISPID_DOMPROGRESSEVENT+3 +#define DISPID_IDOMPROGRESSEVENT_INITPROGRESSEVENT DISPID_DOMPROGRESSEVENT+4 + /* IHTMLControlElement */ #define DISPID_IHTMLCONTROLELEMENT_TABINDEX STDPROPID_XOBJ_TABINDEX #define DISPID_IHTMLCONTROLELEMENT_FOCUS (DISPID_SITE+0) diff --git a/include/mshtml.idl b/include/mshtml.idl index 162a969..afeb442 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -28495,6 +28495,68 @@ methods: [in] IHTMLWindow2 *source); } +/***************************************************************************** + * IDOMProgressEvent interface + */ +[ + odl, + oleautomation, + dual, + uuid(3051071e-98b5-11cf-bb82-00aa00bdce0b) +] +interface IDOMProgressEvent : IDispatch +{ + [propget, id(DISPID_IDOMPROGRESSEVENT_LENGTHCOMPUTABLE)] + HRESULT lengthComputable([out, retval] VARIANT_BOOL *p); + + [propget, id(DISPID_IDOMPROGRESSEVENT_LOADED)] + HRESULT loaded([out, retval] ULONGLONG *p); + + [propget, id(DISPID_IDOMPROGRESSEVENT_TOTAL)] + HRESULT total([out, retval] ULONGLONG *p); + + [id(DISPID_IDOMPROGRESSEVENT_INITPROGRESSEVENT)] + HRESULT initProgressEvent( + [in] BSTR eventType, + [in] VARIANT_BOOL canBubble, + [in] VARIANT_BOOL cancelable, + [in] VARIANT_BOOL lengthComputableArg, + [in] ULONGLONG loadedArg, + [in] ULONGLONG totalArg); +}; + +/***************************************************************************** + * DispDOMProgressEvent dispinterface + */ +[ + hidden, + uuid(30590091-98b5-11cf-bb82-00aa00bdce0b) +] +dispinterface DispDOMProgressEvent +{ +properties: +methods: + WINE_IDOMEVENT_DISPINTERFACE_DECL; + + [propget, id(DISPID_IDOMPROGRESSEVENT_LENGTHCOMPUTABLE)] + VARIANT_BOOL lengthComputable(); + + [propget, id(DISPID_IDOMPROGRESSEVENT_LOADED)] + ULONGLONG loaded(); + + [propget, id(DISPID_IDOMPROGRESSEVENT_TOTAL)] + ULONGLONG total(); + + [id(DISPID_IDOMPROGRESSEVENT_INITPROGRESSEVENT)] + void initProgressEvent( + [in] BSTR eventType, + [in] VARIANT_BOOL canBubble, + [in] VARIANT_BOOL cancelable, + [in] VARIANT_BOOL lengthComputableArg, + [in] ULONGLONG loadedArg, + [in] ULONGLONG totalArg); +}; + /***************************************************************************** * IHTMLNamespaceCollection interface */ -- 2.34.1

3 16

[PATCH 0/2] MR127: ws2_32: Make wait in select alertable
by Paul Gofman (＠gofman) May 25, 2022

May 25, 2022

Fixes V Rising hang on exit. During exit the main thread wants to terminate the other thread by queuing APC which APC is supposed to raise an exception and abort the thread. That is basically how Unity / Mono aborts threads. The thread being terminated is calling select() in a loop and the wait in select() is currently not alertable (while they should be, as the test suggests). But with the first patch the things may get more interesting. ws2_32.select() passes on stack io status block to NtDeviceIoControlFile(), then it is killed from APC while waiting for event to be signaled by ioctl async processing. Then, wineserver wants to complete the async. The async owner thread is already terminated and it delivers SIGUSR1 to process the system APC to the main thread. When the APC is processed from USR1 handler it segfaults trying to put the IO status to iosb pointing to already deallocated thread stack. This is segfault on signal stack and as such is unrecoverable. The process is left hanging. Thus the second patch. In the ideal case we'd probably want to avoid crashing or handle segfault in system APC processing somehow, but I don't yet see a feasible way to do it. In theory the same may happen without ws2_32 if the app does the same, but I don't know that anything hits that case while ws2_32 queues those on stack iosbs, so avoiding that may probably avoid the practical issues. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/127

7 12

[PATCH 0/5] MR125: qasf: Beginnings of an ASF reader implementation.
by Zebediah Figura (＠zfigura) May 25, 2022

May 25, 2022

This supersedes merge request 116. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/125

3 8

[PATCH] server: clear area when file size is not full page.
by chen May 25, 2022

May 25, 2022

2 1

[PATCH 2/2] scrrun: Add MoveFolder implementation.
by Robert Wilhelm May 25, 2022

May 25, 2022

This implements folder rename which is sufficient for installer used in the bug report. No wildcard handling yet. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52128 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- dlls/scrrun/filesystem.c | 16 ++++++++--- dlls/scrrun/tests/filesystem.c | 51 ++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 4 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 35b43e2f124..6d534bc4413 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -3764,12 +3764,20 @@ static HRESULT WINAPI filesys_MoveFile(IFileSystem3 *iface, BSTR source, BSTR de return MoveFileW(source, destination) ? S_OK : create_error(GetLastError()); } -static HRESULT WINAPI filesys_MoveFolder(IFileSystem3 *iface,BSTR Source, - BSTR Destination) +static HRESULT WINAPI filesys_MoveFolder(IFileSystem3 *iface, BSTR source, BSTR destination) { - FIXME("%p %s %s\n", iface, debugstr_w(Source), debugstr_w(Destination)); + DWORD attrs; - return E_NOTIMPL; + TRACE("%p %s %s\n", iface, debugstr_w(source), debugstr_w(destination)); + + if(!source || !destination) + return E_INVALIDARG; + + attrs = GetFileAttributesW(source); + if((attrs == INVALID_FILE_ATTRIBUTES) || !(attrs & FILE_ATTRIBUTE_DIRECTORY)) + return CTL_E_PATHNOTFOUND; + + return MoveFileW(source, destination) ? S_OK : create_error(GetLastError()); } static inline HRESULT copy_file(const WCHAR *source, DWORD source_len, diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 1ba0e81a2d1..aa0927ff4b7 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -2600,6 +2600,56 @@ static void test_MoveFile(void) SysFreeString(str); } +static void test_MoveFolder(void) +{ + BSTR src, dst; + WCHAR buffW1[MAX_PATH],buffW2[MAX_PATH]; + HANDLE file; + HRESULT hr; + + get_temp_path(L"foo", buffW1); + get_temp_path(L"bar", buffW2); + + ok(CreateDirectoryW(buffW1, NULL), "CreateDirectory(%s) failed\n", wine_dbgstr_w(buffW1)); + src = SysAllocString(buffW1); + dst = SysAllocString(buffW2); + hr = IFileSystem3_MoveFolder(fs3, src, dst); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + SysFreeString(src); + SysFreeString(dst); + + ok(CreateDirectoryW(buffW1, NULL), "CreateDirectory(%s) failed\n", wine_dbgstr_w(buffW1)); + src = SysAllocString(buffW1); + dst = SysAllocString(buffW2); + hr = IFileSystem3_MoveFolder(fs3, src, dst); /* dst already exists */ + ok(hr == CTL_E_FILEALREADYEXISTS, "Unexpected hr %#lx.\n", hr); + SysFreeString(src); + SysFreeString(dst); + + ok(RemoveDirectoryW(buffW1), "can't remove %s directory\n", wine_dbgstr_w(buffW1)); + ok(RemoveDirectoryW(buffW2), "can't remove %s directory\n", wine_dbgstr_w(buffW2)); + + src = SysAllocString(buffW1); + dst = SysAllocString(buffW2); + hr = IFileSystem3_MoveFolder(fs3, src, dst); /* src nonexistant */ + ok(hr == CTL_E_PATHNOTFOUND, "Unexpected hr %#lx.\n", hr); + SysFreeString(src); + SysFreeString(dst); + + file = CreateFileW(buffW1, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFile failed\n"); + CloseHandle(file); + + src = SysAllocString(buffW1); + dst = SysAllocString(buffW2); + hr = IFileSystem3_MoveFolder(fs3, src, dst); + ok(hr == CTL_E_PATHNOTFOUND, "Unexpected hr %#lx.\n", hr); + SysFreeString(src); + SysFreeString(dst); + DeleteFileW(buffW1); +} + static void test_DoOpenPipeStream(void) { static const char testdata[] = "test"; @@ -2733,6 +2783,7 @@ START_TEST(filesystem) test_GetExtensionName(); test_GetSpecialFolder(); test_MoveFile(); + test_MoveFolder(); test_DoOpenPipeStream(); IFileSystem3_Release(fs3); -- 2.36.1

1 0