August 2022 - Wine-commits - list.winehq.org

Gabriel Ivăncescu : mshtml: Implement getItem() for sessionStorage.
by Alexandre Julliard 28 Aug '22

28 Aug '22

Module: wine Branch: master Commit: 1a5cddc1da52a95deca7383d5ced1e443352f7b0 URL: https://gitlab.winehq.org/wine/wine/-/commit/1a5cddc1da52a95deca7383d5ced1e… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Aug 26 16:38:37 2022 +0300 mshtml: Implement getItem() for sessionStorage. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlstorage.c | 15 ++++-- dlls/mshtml/tests/misc.c | 126 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 136 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlstorage.c b/dlls/mshtml/htmlstorage.c index 6e8b2190b1a..d25f8fef6a1 100644 --- a/dlls/mshtml/htmlstorage.c +++ b/dlls/mshtml/htmlstorage.c @@ -443,6 +443,7 @@ done: static HRESULT WINAPI HTMLStorage_getItem(IHTMLStorage *iface, BSTR bstrKey, VARIANT *value) { HTMLStorage *This = impl_from_IHTMLStorage(iface); + struct session_entry *session_entry; HRESULT hres; TRACE("(%p)->(%s %p)\n", This, debugstr_w(bstrKey), value); @@ -451,9 +452,17 @@ static HRESULT WINAPI HTMLStorage_getItem(IHTMLStorage *iface, BSTR bstrKey, VAR return E_POINTER; if(!This->filename) { - FIXME("session storage not supported\n"); - V_VT(value) = VT_NULL; - return S_OK; + hres = get_session_entry(This->session_storage, bstrKey, FALSE, &session_entry); + if(SUCCEEDED(hres)) { + if(!session_entry || !session_entry->value) + V_VT(value) = VT_NULL; + else { + V_VT(value) = VT_BSTR; + V_BSTR(value) = SysAllocStringLen(session_entry->value, SysStringLen(session_entry->value)); + hres = V_BSTR(value) ? S_OK : E_OUTOFMEMORY; + } + } + return hres; } WaitForSingleObject(This->mutex, INFINITE); diff --git a/dlls/mshtml/tests/misc.c b/dlls/mshtml/tests/misc.c index 045e93a9cf6..02ef7451b88 100644 --- a/dlls/mshtml/tests/misc.c +++ b/dlls/mshtml/tests/misc.c @@ -324,11 +324,32 @@ static void test_HTMLStorage(void) hres = get_sessionstorage(doc2, &storage2); ok(hres == S_OK, "got %08lx\n", hres); + key = SysAllocString(L""); + V_VT(&var) = 0xdead; + hres = IHTMLStorage_getItem(storage, key, &var); + ok(hres == S_OK, "getItem failed: %08lx\n", hres); + ok(V_VT(&var) == VT_NULL, "got %d\n", V_VT(&var)); + SysFreeString(key); + key = SysAllocString(L"undefined"); value = SysAllocString(L"null"); hres = IHTMLStorage_setItem(storage, key, value); ok(hres == S_OK, "setItem failed: %08lx\n", hres); SysFreeString(value); + + V_VT(&var) = 0xdead; + hres = IHTMLStorage_getItem(storage, key, &var); + ok(hres == S_OK, "getItem failed: %08lx\n", hres); + ok(V_VT(&var) == VT_BSTR, "got %d\n", V_VT(&var)); + ok(!wcscmp(V_BSTR(&var), L"null"), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); + VariantClear(&var); + + V_VT(&var) = 0xdead; + hres = IHTMLStorage_getItem(storage2, key, &var); + ok(hres == S_OK, "getItem failed: %08lx\n", hres); + ok(V_VT(&var) == VT_BSTR, "got %d\n", V_VT(&var)); + ok(!wcscmp(V_BSTR(&var), L"null"), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); + VariantClear(&var); SysFreeString(key); value = SysAllocString(L"asdf"); @@ -336,9 +357,32 @@ static void test_HTMLStorage(void) ok(hres == S_OK, "setItem failed: %08lx\n", hres); SysFreeString(value); + V_VT(&var) = 0xdead; + hres = IHTMLStorage_getItem(storage2, NULL, &var); + ok(hres == S_OK, "getItem failed: %08lx\n", hres); + ok(V_VT(&var) == VT_BSTR, "got %d\n", V_VT(&var)); + ok(!wcscmp(V_BSTR(&var), L"asdf"), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); + VariantClear(&var); + + V_VT(&var) = 0xdead; + key = SysAllocString(L""); + hres = IHTMLStorage_getItem(storage2, key, &var); + ok(hres == S_OK, "getItem failed: %08lx\n", hres); + ok(V_VT(&var) == VT_BSTR, "got %d\n", V_VT(&var)); + ok(!wcscmp(V_BSTR(&var), L"asdf"), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); + VariantClear(&var); + SysFreeString(key); + key = SysAllocString(L"null-value"); hres = IHTMLStorage_setItem(storage, key, NULL); ok(hres == S_OK, "setItem failed: %08lx\n", hres); + + V_VT(&var) = 0xdead; + hres = IHTMLStorage_getItem(storage2, key, &var); + ok(hres == S_OK, "getItem failed: %08lx\n", hres); + ok(V_VT(&var) == VT_BSTR, "got %d\n", V_VT(&var)); + ok(!wcscmp(V_BSTR(&var), L""), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); + VariantClear(&var); SysFreeString(key); key = SysAllocString(L"aaaa"); @@ -346,19 +390,97 @@ static void test_HTMLStorage(void) hres = IHTMLStorage_setItem(storage2, key, value); ok(hres == S_OK, "setItem failed: %08lx\n", hres); SysFreeString(value); + + V_VT(&var) = 0xdead; + hres = IHTMLStorage_getItem(storage, key, &var); + ok(hres == S_OK, "getItem failed: %08lx\n", hres); + ok(V_VT(&var) == VT_BSTR, "got %d\n", V_VT(&var)); + ok(!wcscmp(V_BSTR(&var), L"bbbb"), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); + VariantClear(&var); SysFreeString(key); key = SysAllocString(L"foo"); value = SysAllocString(L"bar"); hres = IHTMLStorage_setItem(storage, key, value); ok(hres == S_OK, "setItem failed: %08lx\n", hres); - SysFreeString(value); - SysFreeString(key); + + IHTMLStorage_Release(storage2); + IHTMLDocument2_Release(doc2); + + /* Case insensitive domain */ + doc2 = create_doc_from_url(L"htTp://www.CodeWeavers.com/"); + hres = get_sessionstorage(doc2, &storage2); + ok(hres == S_OK, "got %08lx\n", hres); + + V_VT(&var) = 0xdead; + hres = IHTMLStorage_getItem(storage2, key, &var); + ok(hres == S_OK, "getItem failed: %08lx\n", hres); + ok(V_VT(&var) == VT_BSTR, "got %d\n", V_VT(&var)); + ok(!wcscmp(V_BSTR(&var), L"bar"), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); + VariantClear(&var); + + IHTMLStorage_Release(storage2); + IHTMLDocument2_Release(doc2); + + /* Different schemes */ + doc2 = create_doc_from_url(L"https://www.codeweavers.com/"); + hres = get_sessionstorage(doc2, &storage2); + ok(hres == S_OK, "got %08lx\n", hres); + + V_VT(&var) = 0xdead; + hres = IHTMLStorage_getItem(storage2, key, &var); + ok(hres == S_OK, "getItem failed: %08lx\n", hres); + ok(V_VT(&var) == VT_BSTR, "got %d\n", V_VT(&var)); + ok(!wcscmp(V_BSTR(&var), L"bar"), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); + VariantClear(&var); + + IHTMLStorage_Release(storage2); + IHTMLDocument2_Release(doc2); + + doc2 = create_doc_from_url(L"ftp://www.codeweavers.com/"); + hres = get_sessionstorage(doc2, &storage2); + ok(hres == S_OK, "got %08lx\n", hres); + + V_VT(&var) = 0xdead; + hres = IHTMLStorage_getItem(storage2, key, &var); + ok(hres == S_OK, "getItem failed: %08lx\n", hres); + ok(V_VT(&var) == VT_NULL, "got %d\n", V_VT(&var)); + + hres = IHTMLStorage_setItem(storage2, key, value); + ok(hres == S_OK, "setItem failed: %08lx\n", hres); + + V_VT(&var) = 0xdead; + hres = IHTMLStorage_getItem(storage2, key, &var); + ok(hres == S_OK, "getItem failed: %08lx\n", hres); + ok(V_VT(&var) == VT_BSTR, "got %d\n", V_VT(&var)); + ok(!wcscmp(V_BSTR(&var), L"bar"), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); + VariantClear(&var); + + IHTMLStorage_Release(storage2); + IHTMLDocument2_Release(doc2); + + /* Different domain */ + doc2 = create_doc_from_url(L"https://www.winehq.org/"); + hres = get_sessionstorage(doc2, &storage2); + ok(hres == S_OK, "got %08lx\n", hres); + + V_VT(&var) = 0xdead; + hres = IHTMLStorage_getItem(storage, key, &var); + ok(hres == S_OK, "getItem failed: %08lx\n", hres); + ok(V_VT(&var) == VT_BSTR, "got %d\n", V_VT(&var)); + ok(!wcscmp(V_BSTR(&var), L"bar"), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); + VariantClear(&var); + V_VT(&var) = 0xdead; + hres = IHTMLStorage_getItem(storage2, key, &var); + ok(hres == S_OK, "getItem failed: %08lx\n", hres); + ok(V_VT(&var) == VT_NULL, "got %d\n", V_VT(&var)); IHTMLStorage_Release(storage2); IHTMLStorage_Release(storage); IHTMLDocument2_Release(doc2); IHTMLDocument2_Release(doc); + SysFreeString(value); + SysFreeString(key); } START_TEST(misc)

1 0

Gabriel Ivăncescu : mshtml: Implement removeItem() for sessionStorage.
by Alexandre Julliard 28 Aug '22

28 Aug '22

Module: wine Branch: master Commit: adc5bcba57e9a498de9c0fe7c544842bacc62457 URL: https://gitlab.winehq.org/wine/wine/-/commit/adc5bcba57e9a498de9c0fe7c54484… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Aug 26 16:38:37 2022 +0300 mshtml: Implement removeItem() for sessionStorage. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlstorage.c | 11 +++++++++-- dlls/mshtml/tests/misc.c | 16 ++++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlstorage.c b/dlls/mshtml/htmlstorage.c index d25f8fef6a1..a7feba6ce69 100644 --- a/dlls/mshtml/htmlstorage.c +++ b/dlls/mshtml/htmlstorage.c @@ -642,13 +642,20 @@ done: static HRESULT WINAPI HTMLStorage_removeItem(IHTMLStorage *iface, BSTR bstrKey) { HTMLStorage *This = impl_from_IHTMLStorage(iface); + struct session_entry *session_entry; HRESULT hres; TRACE("(%p)->(%s)\n", This, debugstr_w(bstrKey)); if(!This->filename) { - FIXME("session storage not supported\n"); - return E_NOTIMPL; + hres = get_session_entry(This->session_storage, bstrKey, FALSE, &session_entry); + if(SUCCEEDED(hres) && session_entry) { + This->session_storage->num_keys--; + wine_rb_remove(&This->session_storage->data_map, &session_entry->entry); + SysFreeString(session_entry->value); + heap_free(session_entry); + } + return hres; } WaitForSingleObject(This->mutex, INFINITE); diff --git a/dlls/mshtml/tests/misc.c b/dlls/mshtml/tests/misc.c index 02ef7451b88..1a60ce4f70d 100644 --- a/dlls/mshtml/tests/misc.c +++ b/dlls/mshtml/tests/misc.c @@ -332,6 +332,9 @@ static void test_HTMLStorage(void) SysFreeString(key); key = SysAllocString(L"undefined"); + hres = IHTMLStorage_removeItem(storage, key); + ok(hres == S_OK, "removeItem failed: %08lx\n", hres); + value = SysAllocString(L"null"); hres = IHTMLStorage_setItem(storage, key, value); ok(hres == S_OK, "setItem failed: %08lx\n", hres); @@ -383,6 +386,11 @@ static void test_HTMLStorage(void) ok(V_VT(&var) == VT_BSTR, "got %d\n", V_VT(&var)); ok(!wcscmp(V_BSTR(&var), L""), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); VariantClear(&var); + + hres = IHTMLStorage_removeItem(storage, NULL); + ok(hres == S_OK, "removeItem failed: %08lx\n", hres); + hres = IHTMLStorage_removeItem(storage2, key); + ok(hres == S_OK, "removeItem failed: %08lx\n", hres); SysFreeString(key); key = SysAllocString(L"aaaa"); @@ -397,6 +405,14 @@ static void test_HTMLStorage(void) ok(V_VT(&var) == VT_BSTR, "got %d\n", V_VT(&var)); ok(!wcscmp(V_BSTR(&var), L"bbbb"), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); VariantClear(&var); + + hres = IHTMLStorage_removeItem(storage2, key); + ok(hres == S_OK, "removeItem failed: %08lx\n", hres); + + V_VT(&var) = 0xdead; + hres = IHTMLStorage_getItem(storage, key, &var); + ok(hres == S_OK, "getItem failed: %08lx\n", hres); + ok(V_VT(&var) == VT_NULL, "got %d\n", V_VT(&var)); SysFreeString(key); key = SysAllocString(L"foo");

1 0

Gabriel Ivăncescu : mshtml: Implement clear() for Storage.
by Alexandre Julliard 28 Aug '22

28 Aug '22

Module: wine Branch: master Commit: 102e62332a3c93fe4bc2bbb7636ae04cb189cca7 URL: https://gitlab.winehq.org/wine/wine/-/commit/102e62332a3c93fe4bc2bbb7636ae0… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Aug 26 16:38:37 2022 +0300 mshtml: Implement clear() for Storage. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlstorage.c | 17 +++++++++++++++-- dlls/mshtml/tests/misc.c | 9 +++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlstorage.c b/dlls/mshtml/htmlstorage.c index a7feba6ce69..e9498306a81 100644 --- a/dlls/mshtml/htmlstorage.c +++ b/dlls/mshtml/htmlstorage.c @@ -668,8 +668,21 @@ static HRESULT WINAPI HTMLStorage_removeItem(IHTMLStorage *iface, BSTR bstrKey) static HRESULT WINAPI HTMLStorage_clear(IHTMLStorage *iface) { HTMLStorage *This = impl_from_IHTMLStorage(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + HRESULT hres = S_OK; + + if(!This->filename) { + clear_session_storage(This->session_storage); + return S_OK; + } + + WaitForSingleObject(This->mutex, INFINITE); + if(!DeleteFileW(This->filename)) { + DWORD error = GetLastError(); + if(error != ERROR_FILE_NOT_FOUND && error != ERROR_PATH_NOT_FOUND) + hres = HRESULT_FROM_WIN32(error); + } + ReleaseMutex(This->mutex); + return hres; } static const IHTMLStorageVtbl HTMLStorageVtbl = { diff --git a/dlls/mshtml/tests/misc.c b/dlls/mshtml/tests/misc.c index 1a60ce4f70d..c2a8c87f473 100644 --- a/dlls/mshtml/tests/misc.c +++ b/dlls/mshtml/tests/misc.c @@ -415,6 +415,9 @@ static void test_HTMLStorage(void) ok(V_VT(&var) == VT_NULL, "got %d\n", V_VT(&var)); SysFreeString(key); + hres = IHTMLStorage_clear(storage2); + ok(hres == S_OK, "clear failed %08lx\n", hres); + key = SysAllocString(L"foo"); value = SysAllocString(L"bar"); hres = IHTMLStorage_setItem(storage, key, value); @@ -472,6 +475,9 @@ static void test_HTMLStorage(void) ok(!wcscmp(V_BSTR(&var), L"bar"), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); VariantClear(&var); + hres = IHTMLStorage_clear(storage2); + ok(hres == S_OK, "clear failed %08lx\n", hres); + IHTMLStorage_Release(storage2); IHTMLDocument2_Release(doc2); @@ -491,6 +497,9 @@ static void test_HTMLStorage(void) ok(hres == S_OK, "getItem failed: %08lx\n", hres); ok(V_VT(&var) == VT_NULL, "got %d\n", V_VT(&var)); + hres = IHTMLStorage_clear(storage); + ok(hres == S_OK, "clear failed %08lx\n", hres); + IHTMLStorage_Release(storage2); IHTMLStorage_Release(storage); IHTMLDocument2_Release(doc2);

1 0

Gabriel Ivăncescu : mshtml: Implement key() for sessionStorage.
by Alexandre Julliard 28 Aug '22

28 Aug '22

Module: wine Branch: master Commit: 2834119a43d448ed98be47acbc9648817b3fb1e9 URL: https://gitlab.winehq.org/wine/wine/-/commit/2834119a43d448ed98be47acbc9648… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Aug 26 16:38:37 2022 +0300 mshtml: Implement key() for sessionStorage. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlstorage.c | 28 ++++++++++++++++++++++++++-- dlls/mshtml/tests/misc.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlstorage.c b/dlls/mshtml/htmlstorage.c index e9498306a81..24b696bd373 100644 --- a/dlls/mshtml/htmlstorage.c +++ b/dlls/mshtml/htmlstorage.c @@ -44,6 +44,7 @@ typedef struct { struct session_map_entry { struct wine_rb_entry entry; struct wine_rb_tree data_map; + struct list data_list; /* for key() */ UINT ref; UINT num_keys; UINT origin_len; @@ -61,6 +62,7 @@ int session_storage_map_cmp(const void *key, const struct wine_rb_entry *entry) struct session_entry { struct wine_rb_entry entry; + struct list list_entry; BSTR value; WCHAR key[1]; }; @@ -94,6 +96,7 @@ static struct session_map_entry *grab_session_map_entry(BSTR origin) if(!entry) return NULL; wine_rb_init(&entry->data_map, session_entry_cmp); + list_init(&entry->data_list); entry->ref = 1; entry->num_keys = 0; entry->origin_len = origin_len; @@ -137,6 +140,7 @@ static HRESULT get_session_entry(struct session_map_entry *entry, const WCHAR *n memcpy(data->key, key, (key_len + 1) * sizeof(WCHAR)); entry->num_keys++; + list_add_tail(&entry->data_list, &data->list_entry); wine_rb_put(&entry->data_map, key, &data->entry); *ret = data; return S_OK; @@ -146,11 +150,12 @@ static void clear_session_storage(struct session_map_entry *entry) { struct session_entry *iter, *iter2; - WINE_RB_FOR_EACH_ENTRY_DESTRUCTOR(iter, iter2, &entry->data_map, struct session_entry, entry) { + LIST_FOR_EACH_ENTRY_SAFE(iter, iter2, &entry->data_list, struct session_entry, list_entry) { SysFreeString(iter->value); heap_free(iter); } wine_rb_destroy(&entry->data_map, NULL, NULL); + list_init(&entry->data_list); entry->num_keys = 0; } @@ -365,7 +370,25 @@ static HRESULT WINAPI HTMLStorage_get_remainingSpace(IHTMLStorage *iface, LONG * static HRESULT WINAPI HTMLStorage_key(IHTMLStorage *iface, LONG lIndex, BSTR *p) { HTMLStorage *This = impl_from_IHTMLStorage(iface); - FIXME("(%p)->(%ld %p)\n", This, lIndex, p); + struct session_entry *session_entry; + + TRACE("(%p)->(%ld %p)\n", This, lIndex, p); + + if(!This->filename) { + struct list *entry = &This->session_storage->data_list; + unsigned i = 0; + + if(lIndex >= This->session_storage->num_keys) + return E_INVALIDARG; + + do entry = entry->next; while(i++ < lIndex); + session_entry = LIST_ENTRY(entry, struct session_entry, list_entry); + + *p = SysAllocString(session_entry->key); + return *p ? S_OK : E_OUTOFMEMORY; + } + + FIXME("local storage not supported\n"); return E_NOTIMPL; } @@ -651,6 +674,7 @@ static HRESULT WINAPI HTMLStorage_removeItem(IHTMLStorage *iface, BSTR bstrKey) hres = get_session_entry(This->session_storage, bstrKey, FALSE, &session_entry); if(SUCCEEDED(hres) && session_entry) { This->session_storage->num_keys--; + list_remove(&session_entry->list_entry); wine_rb_remove(&This->session_storage->data_map, &session_entry->entry); SysFreeString(session_entry->value); heap_free(session_entry); diff --git a/dlls/mshtml/tests/misc.c b/dlls/mshtml/tests/misc.c index c2a8c87f473..660c191ac99 100644 --- a/dlls/mshtml/tests/misc.c +++ b/dlls/mshtml/tests/misc.c @@ -405,11 +405,38 @@ static void test_HTMLStorage(void) ok(V_VT(&var) == VT_BSTR, "got %d\n", V_VT(&var)); ok(!wcscmp(V_BSTR(&var), L"bbbb"), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); VariantClear(&var); + SysFreeString(key); + + hres = IHTMLStorage_key(storage, 0, &key); + ok(hres == S_OK, "key failed %08lx\n", hres); + ok(!wcscmp(key, L"undefined"), "key(0) = %s\n", wine_dbgstr_w(key)); + SysFreeString(key); + hres = IHTMLStorage_key(storage, 1, &key); + ok(hres == S_OK, "key failed %08lx\n", hres); + ok(!wcscmp(key, L"aaaa"), "key(0) = %s\n", wine_dbgstr_w(key)); + SysFreeString(key); + + hres = IHTMLStorage_key(storage, 2, &key); + ok(hres == E_INVALIDARG, "key failed %08lx\n", hres); + hres = IHTMLStorage_key(storage, -1, &key); + ok(hres == E_INVALIDARG, "key failed %08lx\n", hres); + + key = SysAllocString(L"undefined"); hres = IHTMLStorage_removeItem(storage2, key); ok(hres == S_OK, "removeItem failed: %08lx\n", hres); + SysFreeString(key); + + hres = IHTMLStorage_key(storage, 0, &key); + ok(hres == S_OK, "key failed %08lx\n", hres); + ok(!wcscmp(key, L"aaaa"), "key(0) = %s\n", wine_dbgstr_w(key)); + SysFreeString(key); + + hres = IHTMLStorage_key(storage, 1, &key); + ok(hres == E_INVALIDARG, "key failed %08lx\n", hres); V_VT(&var) = 0xdead; + key = SysAllocString(L"undefined"); hres = IHTMLStorage_getItem(storage, key, &var); ok(hres == S_OK, "getItem failed: %08lx\n", hres); ok(V_VT(&var) == VT_NULL, "got %d\n", V_VT(&var)); @@ -418,6 +445,9 @@ static void test_HTMLStorage(void) hres = IHTMLStorage_clear(storage2); ok(hres == S_OK, "clear failed %08lx\n", hres); + hres = IHTMLStorage_key(storage, 0, &key); + ok(hres == E_INVALIDARG, "key failed %08lx\n", hres); + key = SysAllocString(L"foo"); value = SysAllocString(L"bar"); hres = IHTMLStorage_setItem(storage, key, value);

1 0

Gabriel Ivăncescu : mshtml: Implement key() for localStorage.
by Alexandre Julliard 28 Aug '22

28 Aug '22

Module: wine Branch: master Commit: 31b6138db4471886d6a2810ac7a8c60ab4eee56b URL: https://gitlab.winehq.org/wine/wine/-/commit/31b6138db4471886d6a2810ac7a8c6… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Aug 26 16:38:37 2022 +0300 mshtml: Implement key() for localStorage. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlstorage.c | 99 +++++++++++++++++++++++++++++++++++++++-------- dlls/mshtml/tests/misc.c | 13 +++++++ 2 files changed, 96 insertions(+), 16 deletions(-) diff --git a/dlls/mshtml/htmlstorage.c b/dlls/mshtml/htmlstorage.c index 24b696bd373..e0459c42497 100644 --- a/dlls/mshtml/htmlstorage.c +++ b/dlls/mshtml/htmlstorage.c @@ -353,6 +353,46 @@ done: return hres; } +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_node_list(const WCHAR *filename, IXMLDOMNodeList **node_list) +{ + IXMLDOMDocument *doc; + IXMLDOMNode *root; + HRESULT hres; + BSTR query; + + hres = open_document(filename, &doc); + if(hres != S_OK) + return hres; + + hres = get_root_node(doc, &root); + IXMLDOMDocument_Release(doc); + if(hres != S_OK) + return hres; + + if(!(query = SysAllocString(L"item"))) + hres = E_OUTOFMEMORY; + else { + hres = IXMLDOMNode_selectNodes(root, query, node_list); + SysFreeString(query); + } + IXMLDOMNode_Release(root); + return hres; +} + static HRESULT WINAPI HTMLStorage_get_length(IHTMLStorage *iface, LONG *p) { HTMLStorage *This = impl_from_IHTMLStorage(iface); @@ -367,10 +407,48 @@ static HRESULT WINAPI HTMLStorage_get_remainingSpace(IHTMLStorage *iface, LONG * return E_NOTIMPL; } +static HRESULT get_key(const WCHAR *filename, LONG index, BSTR *ret) +{ + IXMLDOMNodeList *node_list; + IXMLDOMElement *elem; + IXMLDOMNode *node; + HRESULT hres; + VARIANT key; + + hres = get_node_list(filename, &node_list); + if(FAILED(hres)) + return hres; + + hres = IXMLDOMNodeList_get_item(node_list, index, &node); + IXMLDOMNodeList_Release(node_list); + if(hres != S_OK) + return FAILED(hres) ? hres : E_INVALIDARG; + + hres = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMElement, (void**)&elem); + IXMLDOMNode_Release(node); + if(hres != S_OK) + return E_INVALIDARG; + + hres = IXMLDOMElement_getAttribute(elem, (BSTR)L"name", &key); + IXMLDOMElement_Release(elem); + if(FAILED(hres)) + return hres; + + if(V_VT(&key) != VT_BSTR) { + FIXME("non-string key %s\n", debugstr_variant(&key)); + VariantClear(&key); + return E_NOTIMPL; + } + + *ret = V_BSTR(&key); + return S_OK; +} + static HRESULT WINAPI HTMLStorage_key(IHTMLStorage *iface, LONG lIndex, BSTR *p) { HTMLStorage *This = impl_from_IHTMLStorage(iface); struct session_entry *session_entry; + HRESULT hres; TRACE("(%p)->(%ld %p)\n", This, lIndex, p); @@ -388,8 +466,11 @@ static HRESULT WINAPI HTMLStorage_key(IHTMLStorage *iface, LONG lIndex, BSTR *p) return *p ? S_OK : E_OUTOFMEMORY; } - FIXME("local storage not supported\n"); - return E_NOTIMPL; + WaitForSingleObject(This->mutex, INFINITE); + hres = get_key(This->filename, lIndex, p); + ReleaseMutex(This->mutex); + + return hres; } static BSTR build_query(const WCHAR *key) @@ -403,20 +484,6 @@ static BSTR build_query(const WCHAR *key) 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) { IXMLDOMDocument *doc; diff --git a/dlls/mshtml/tests/misc.c b/dlls/mshtml/tests/misc.c index 660c191ac99..d898b04fffa 100644 --- a/dlls/mshtml/tests/misc.c +++ b/dlls/mshtml/tests/misc.c @@ -229,6 +229,19 @@ static void test_HTMLStorage(void) ok(hres == S_OK, "getItem failed: %08lx\n", hres); ok(V_VT(&var) == VT_BSTR, "got %d\n", V_VT(&var)); if (V_VT(&var) == VT_BSTR) ok(!wcscmp(V_BSTR(&var), L"null"), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); + SysFreeString(key); + + hres = IHTMLStorage_key(storage, 0, &key); + ok(hres == S_OK, "key failed %08lx\n", hres); + ok(!wcscmp(key, L"undefined"), "key(0) = %s\n", wine_dbgstr_w(key)); + SysFreeString(key); + + hres = IHTMLStorage_key(storage, 1, &key); + ok(hres == E_INVALIDARG, "key failed %08lx\n", hres); + hres = IHTMLStorage_key(storage, -1, &key); + ok(hres == E_INVALIDARG, "key failed %08lx\n", hres); + + key = SysAllocString(L"undefined"); hres = IHTMLStorage_removeItem(storage, key); ok(hres == S_OK, "removeItem failed: %08lx\n", hres); SysFreeString(key);

1 0

Gabriel Ivăncescu : mshtml: Implement length prop for Storage.
by Alexandre Julliard 28 Aug '22

28 Aug '22

Module: wine Branch: master Commit: a35462679a7f4e0ee51d89cc3e5ec9a29315eed4 URL: https://gitlab.winehq.org/wine/wine/-/commit/a35462679a7f4e0ee51d89cc3e5ec9… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Aug 26 16:38:37 2022 +0300 mshtml: Implement length prop for Storage. `length` for localStorage is not updated immediately on native, which suggests some caching is involved for a period of time (probably for performance reasons to avoid reading the file everytime the prop is read), or it doesn't block like the rest since the write is asynchronous, making it unreliable to test, which is why the tests for it are basic. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlstorage.c | 21 +++++++++++++++++++-- dlls/mshtml/tests/misc.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlstorage.c b/dlls/mshtml/htmlstorage.c index e0459c42497..f1ebb29a1fa 100644 --- a/dlls/mshtml/htmlstorage.c +++ b/dlls/mshtml/htmlstorage.c @@ -396,8 +396,25 @@ static HRESULT get_node_list(const WCHAR *filename, IXMLDOMNodeList **node_list) static HRESULT WINAPI HTMLStorage_get_length(IHTMLStorage *iface, LONG *p) { HTMLStorage *This = impl_from_IHTMLStorage(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + IXMLDOMNodeList *node_list; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, p); + + if(!This->filename) { + *p = This->session_storage->num_keys; + return S_OK; + } + + WaitForSingleObject(This->mutex, INFINITE); + hres = get_node_list(This->filename, &node_list); + if(SUCCEEDED(hres)) { + hres = IXMLDOMNodeList_get_length(node_list, p); + IXMLDOMNodeList_Release(node_list); + } + ReleaseMutex(This->mutex); + + return hres; } static HRESULT WINAPI HTMLStorage_get_remainingSpace(IHTMLStorage *iface, LONG *p) diff --git a/dlls/mshtml/tests/misc.c b/dlls/mshtml/tests/misc.c index d898b04fffa..d1bdd2d544e 100644 --- a/dlls/mshtml/tests/misc.c +++ b/dlls/mshtml/tests/misc.c @@ -197,6 +197,7 @@ static void test_HTMLStorage(void) { IHTMLDocument2 *doc, *doc2; IHTMLStorage *storage, *storage2; + LONG length, lval; VARIANT var; BSTR key, value; HRESULT hres; @@ -220,6 +221,10 @@ static void test_HTMLStorage(void) hres = IHTMLStorage_removeItem(storage, key); ok(hres == S_OK, "removeItem failed: %08lx\n", hres); + hres = IHTMLStorage_get_length(storage, &length); + ok(hres == S_OK, "get_length failed %08lx\n", hres); + ok(length >= 0, "length = %ld\n", lval); + value = SysAllocString(L"null"); hres = IHTMLStorage_setItem(storage, key, value); ok(hres == S_OK, "setItem failed: %08lx\n", hres); @@ -337,6 +342,10 @@ static void test_HTMLStorage(void) hres = get_sessionstorage(doc2, &storage2); ok(hres == S_OK, "got %08lx\n", hres); + hres = IHTMLStorage_get_length(storage, &lval); + ok(hres == S_OK, "get_length failed %08lx\n", hres); + ok(lval == 0, "length = %ld\n", lval); + key = SysAllocString(L""); V_VT(&var) = 0xdead; hres = IHTMLStorage_getItem(storage, key, &var); @@ -353,6 +362,13 @@ static void test_HTMLStorage(void) ok(hres == S_OK, "setItem failed: %08lx\n", hres); SysFreeString(value); + hres = IHTMLStorage_get_length(storage, &lval); + ok(hres == S_OK, "get_length failed %08lx\n", hres); + ok(lval == 1, "length = %ld\n", lval); + hres = IHTMLStorage_get_length(storage2, &lval); + ok(hres == S_OK, "get_length failed %08lx\n", hres); + ok(lval == 1, "length = %ld\n", lval); + V_VT(&var) = 0xdead; hres = IHTMLStorage_getItem(storage, key, &var); ok(hres == S_OK, "getItem failed: %08lx\n", hres); @@ -420,6 +436,13 @@ static void test_HTMLStorage(void) VariantClear(&var); SysFreeString(key); + hres = IHTMLStorage_get_length(storage, &lval); + ok(hres == S_OK, "get_length failed %08lx\n", hres); + ok(lval == 2, "length = %ld\n", lval); + hres = IHTMLStorage_get_length(storage2, &lval); + ok(hres == S_OK, "get_length failed %08lx\n", hres); + ok(lval == 2, "length = %ld\n", lval); + hres = IHTMLStorage_key(storage, 0, &key); ok(hres == S_OK, "key failed %08lx\n", hres); ok(!wcscmp(key, L"undefined"), "key(0) = %s\n", wine_dbgstr_w(key)); @@ -458,6 +481,13 @@ static void test_HTMLStorage(void) hres = IHTMLStorage_clear(storage2); ok(hres == S_OK, "clear failed %08lx\n", hres); + hres = IHTMLStorage_get_length(storage, &lval); + ok(hres == S_OK, "get_length failed %08lx\n", hres); + ok(lval == 0, "length = %ld\n", lval); + hres = IHTMLStorage_get_length(storage2, &lval); + ok(hres == S_OK, "get_length failed %08lx\n", hres); + ok(lval == 0, "length = %ld\n", lval); + hres = IHTMLStorage_key(storage, 0, &key); ok(hres == E_INVALIDARG, "key failed %08lx\n", hres);

1 0

Gabriel Ivăncescu : mshtml: Implement remainingSpace prop for sessionStorage.
by Alexandre Julliard 28 Aug '22

28 Aug '22

Module: wine Branch: master Commit: d9c1f5a41b1d57bcccb378881d28e617f8641847 URL: https://gitlab.winehq.org/wine/wine/-/commit/d9c1f5a41b1d57bcccb378881d28e6… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Aug 26 16:38:37 2022 +0300 mshtml: Implement remainingSpace prop for sessionStorage. And a character quota that matches native. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlstorage.c | 29 +++++++++++++++++++++++++++-- dlls/mshtml/tests/misc.c | 39 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 65 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlstorage.c b/dlls/mshtml/htmlstorage.c index f1ebb29a1fa..f4413ba2a3a 100644 --- a/dlls/mshtml/htmlstorage.c +++ b/dlls/mshtml/htmlstorage.c @@ -32,6 +32,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); +/* Native defaults to 5 million chars per origin */ +enum { MAX_QUOTA = 5000000 }; + typedef struct { DispatchEx dispex; IHTMLStorage IHTMLStorage_iface; @@ -46,6 +49,7 @@ struct session_map_entry { struct wine_rb_tree data_map; struct list data_list; /* for key() */ UINT ref; + UINT quota; UINT num_keys; UINT origin_len; WCHAR origin[1]; @@ -98,6 +102,7 @@ static struct session_map_entry *grab_session_map_entry(BSTR origin) wine_rb_init(&entry->data_map, session_entry_cmp); list_init(&entry->data_list); entry->ref = 1; + entry->quota = MAX_QUOTA; entry->num_keys = 0; entry->origin_len = origin_len; memcpy(entry->origin, origin, origin_len * sizeof(WCHAR)); @@ -134,11 +139,14 @@ static HRESULT get_session_entry(struct session_map_entry *entry, const WCHAR *n } key_len = wcslen(key); + if(entry->quota < key_len) + return E_OUTOFMEMORY; /* native returns this when quota is exceeded */ if(!(data = heap_alloc(FIELD_OFFSET(struct session_entry, key[key_len + 1])))) return E_OUTOFMEMORY; data->value = NULL; memcpy(data->key, key, (key_len + 1) * sizeof(WCHAR)); + entry->quota -= key_len; entry->num_keys++; list_add_tail(&entry->data_list, &data->list_entry); wine_rb_put(&entry->data_map, key, &data->entry); @@ -156,6 +164,7 @@ static void clear_session_storage(struct session_map_entry *entry) } wine_rb_destroy(&entry->data_map, NULL, NULL); list_init(&entry->data_list); + entry->quota = MAX_QUOTA; entry->num_keys = 0; } @@ -420,7 +429,15 @@ static HRESULT WINAPI HTMLStorage_get_length(IHTMLStorage *iface, LONG *p) static HRESULT WINAPI HTMLStorage_get_remainingSpace(IHTMLStorage *iface, LONG *p) { HTMLStorage *This = impl_from_IHTMLStorage(iface); - FIXME("(%p)->(%p)\n", This, p); + + TRACE("(%p)->(%p)\n", This, p); + + if(!This->filename) { + *p = This->session_storage->quota; + return S_OK; + } + + FIXME("local storage not supported\n"); return E_NOTIMPL; } @@ -685,7 +702,8 @@ static HRESULT WINAPI HTMLStorage_setItem(IHTMLStorage *iface, BSTR bstrKey, BST TRACE("(%p)->(%s %s)\n", This, debugstr_w(bstrKey), debugstr_w(bstrValue)); if(!This->filename) { - BSTR value = SysAllocString(bstrValue ? bstrValue : L""); + UINT value_len = bstrValue ? wcslen(bstrValue) : 0; + BSTR value = SysAllocStringLen(bstrValue, value_len); if(!value) return E_OUTOFMEMORY; @@ -693,6 +711,12 @@ static HRESULT WINAPI HTMLStorage_setItem(IHTMLStorage *iface, BSTR bstrKey, BST if(FAILED(hres)) SysFreeString(value); else { + UINT old_len = SysStringLen(session_entry->value); + if(old_len < value_len && This->session_storage->quota < value_len - old_len) { + SysFreeString(value); + return E_OUTOFMEMORY; /* native returns this when quota is exceeded */ + } + This->session_storage->quota -= value_len - old_len; SysFreeString(session_entry->value); session_entry->value = value; } @@ -757,6 +781,7 @@ static HRESULT WINAPI HTMLStorage_removeItem(IHTMLStorage *iface, BSTR bstrKey) if(!This->filename) { hres = get_session_entry(This->session_storage, bstrKey, FALSE, &session_entry); if(SUCCEEDED(hres) && session_entry) { + This->session_storage->quota += wcslen(session_entry->key) + SysStringLen(session_entry->value); This->session_storage->num_keys--; list_remove(&session_entry->list_entry); wine_rb_remove(&This->session_storage->data_map, &session_entry->entry); diff --git a/dlls/mshtml/tests/misc.c b/dlls/mshtml/tests/misc.c index d1bdd2d544e..c2c8370cc4b 100644 --- a/dlls/mshtml/tests/misc.c +++ b/dlls/mshtml/tests/misc.c @@ -197,7 +197,7 @@ static void test_HTMLStorage(void) { IHTMLDocument2 *doc, *doc2; IHTMLStorage *storage, *storage2; - LONG length, lval; + LONG space, length, lval; VARIANT var; BSTR key, value; HRESULT hres; @@ -346,6 +346,10 @@ static void test_HTMLStorage(void) ok(hres == S_OK, "get_length failed %08lx\n", hres); ok(lval == 0, "length = %ld\n", lval); + hres = IHTMLStorage_get_remainingSpace(storage, &space); + ok(hres == S_OK, "get_remainingSpace failed %08lx\n", hres); + ok(space >= 5000000, "remainingSpace = %ld\n", space); + key = SysAllocString(L""); V_VT(&var) = 0xdead; hres = IHTMLStorage_getItem(storage, key, &var); @@ -369,6 +373,13 @@ static void test_HTMLStorage(void) ok(hres == S_OK, "get_length failed %08lx\n", hres); ok(lval == 1, "length = %ld\n", lval); + hres = IHTMLStorage_get_remainingSpace(storage, &lval); + ok(hres == S_OK, "get_remainingSpace failed %08lx\n", hres); + ok(lval == space - 13, "remainingSpace = %ld\n", lval); + hres = IHTMLStorage_get_remainingSpace(storage2, &lval); + ok(hres == S_OK, "get_remainingSpace failed %08lx\n", hres); + ok(lval == space - 13, "remainingSpace = %ld\n", lval); + V_VT(&var) = 0xdead; hres = IHTMLStorage_getItem(storage, key, &var); ok(hres == S_OK, "getItem failed: %08lx\n", hres); @@ -443,6 +454,13 @@ static void test_HTMLStorage(void) ok(hres == S_OK, "get_length failed %08lx\n", hres); ok(lval == 2, "length = %ld\n", lval); + hres = IHTMLStorage_get_remainingSpace(storage, &lval); + ok(hres == S_OK, "get_remainingSpace failed %08lx\n", hres); + ok(lval == space - 21, "remainingSpace = %ld\n", lval); + hres = IHTMLStorage_get_remainingSpace(storage2, &lval); + ok(hres == S_OK, "get_remainingSpace failed %08lx\n", hres); + ok(lval == space - 21, "remainingSpace = %ld\n", lval); + hres = IHTMLStorage_key(storage, 0, &key); ok(hres == S_OK, "key failed %08lx\n", hres); ok(!wcscmp(key, L"undefined"), "key(0) = %s\n", wine_dbgstr_w(key)); @@ -488,6 +506,13 @@ static void test_HTMLStorage(void) ok(hres == S_OK, "get_length failed %08lx\n", hres); ok(lval == 0, "length = %ld\n", lval); + hres = IHTMLStorage_get_remainingSpace(storage, &lval); + ok(hres == S_OK, "get_remainingSpace failed %08lx\n", hres); + ok(lval == space, "remainingSpace = %ld\n", lval); + hres = IHTMLStorage_get_remainingSpace(storage2, &lval); + ok(hres == S_OK, "get_remainingSpace failed %08lx\n", hres); + ok(lval == space, "remainingSpace = %ld\n", lval); + hres = IHTMLStorage_key(storage, 0, &key); ok(hres == E_INVALIDARG, "key failed %08lx\n", hres); @@ -526,6 +551,10 @@ static void test_HTMLStorage(void) ok(!wcscmp(V_BSTR(&var), L"bar"), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); VariantClear(&var); + hres = IHTMLStorage_get_remainingSpace(storage, &lval); + ok(hres == S_OK, "get_remainingSpace failed %08lx\n", hres); + ok(lval == space - 6, "remainingSpace = %ld\n", lval); + IHTMLStorage_Release(storage2); IHTMLDocument2_Release(doc2); @@ -538,6 +567,10 @@ static void test_HTMLStorage(void) ok(hres == S_OK, "getItem failed: %08lx\n", hres); ok(V_VT(&var) == VT_NULL, "got %d\n", V_VT(&var)); + hres = IHTMLStorage_get_remainingSpace(storage2, &lval); + ok(hres == S_OK, "get_remainingSpace failed %08lx\n", hres); + ok(lval == space, "remainingSpace = %ld\n", lval); + hres = IHTMLStorage_setItem(storage2, key, value); ok(hres == S_OK, "setItem failed: %08lx\n", hres); @@ -570,6 +603,10 @@ static void test_HTMLStorage(void) ok(hres == S_OK, "getItem failed: %08lx\n", hres); ok(V_VT(&var) == VT_NULL, "got %d\n", V_VT(&var)); + hres = IHTMLStorage_get_remainingSpace(storage2, &lval); + ok(hres == S_OK, "get_remainingSpace failed %08lx\n", hres); + ok(lval == space, "remainingSpace = %ld\n", lval); + hres = IHTMLStorage_clear(storage); ok(hres == S_OK, "clear failed %08lx\n", hres);

1 0

Huw Davies : wow64: Fix another ARM32 machine type.
by Alexandre Julliard 28 Aug '22

28 Aug '22

Module: wine Branch: master Commit: d6dce27e4244e61b2e81c323003db63af045abdc URL: https://gitlab.winehq.org/wine/wine/-/commit/d6dce27e4244e61b2e81c323003db6… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Aug 26 07:24:24 2022 +0100 wow64: Fix another ARM32 machine type. --- dlls/wow64/syscall.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 0f9e64fd53b..eb48f066b92 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -391,7 +391,7 @@ static DWORD get_syscall_num( const BYTE *syscall ) id = *(DWORD *)(syscall + 1); break; - case IMAGE_FILE_MACHINE_ARM: + case IMAGE_FILE_MACHINE_ARMNT: if (*(WORD *)syscall == 0xb40f) { DWORD inst = *(DWORD *)((WORD *)syscall + 1);

1 0

Jacek Caban : user32: Remove no longer used DPI functions.
by Alexandre Julliard 28 Aug '22

28 Aug '22

Module: wine Branch: master Commit: fd382909181c8da98c59a64ffff715798fbc2fde URL: https://gitlab.winehq.org/wine/wine/-/commit/fd382909181c8da98c59a64ffff715… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 26 11:25:06 2022 +0200 user32: Remove no longer used DPI functions. --- dlls/user32/sysparams.c | 44 +++----------------------------------------- dlls/user32/win.h | 7 ------- 2 files changed, 3 insertions(+), 48 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 36b166c627c..46b85c0b102 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -672,29 +672,16 @@ BOOL WINAPI EnumDisplaySettingsExW( const WCHAR *device, DWORD mode, /********************************************************************** * get_win_monitor_dpi */ -UINT get_win_monitor_dpi( HWND hwnd ) +static UINT get_win_monitor_dpi( HWND hwnd ) { /* FIXME: use the monitor DPI instead */ return system_dpi; } -/********************************************************************** - * get_thread_dpi - */ -UINT get_thread_dpi(void) -{ - switch (GetAwarenessFromDpiAwarenessContext( GetThreadDpiAwarenessContext() )) - { - case DPI_AWARENESS_UNAWARE: return USER_DEFAULT_SCREEN_DPI; - case DPI_AWARENESS_SYSTEM_AWARE: return system_dpi; - default: return 0; /* no scaling */ - } -} - /********************************************************************** * map_dpi_point */ -POINT map_dpi_point( POINT pt, UINT dpi_from, UINT dpi_to ) +static POINT map_dpi_point( POINT pt, UINT dpi_from, UINT dpi_to ) { if (dpi_from && dpi_to && dpi_from != dpi_to) { @@ -707,7 +694,7 @@ POINT map_dpi_point( POINT pt, UINT dpi_from, UINT dpi_to ) /********************************************************************** * point_win_to_phys_dpi */ -POINT point_win_to_phys_dpi( HWND hwnd, POINT pt ) +static POINT point_win_to_phys_dpi( HWND hwnd, POINT pt ) { return map_dpi_point( pt, GetDpiForWindow( hwnd ), get_win_monitor_dpi( hwnd ) ); } @@ -720,31 +707,6 @@ static POINT point_phys_to_win_dpi( HWND hwnd, POINT pt ) return map_dpi_point( pt, get_win_monitor_dpi( hwnd ), GetDpiForWindow( hwnd )); } -/********************************************************************** - * map_dpi_rect - */ -RECT map_dpi_rect( RECT rect, UINT dpi_from, UINT dpi_to ) -{ - if (dpi_from && dpi_to && dpi_from != dpi_to) - { - rect.left = MulDiv( rect.left, dpi_to, dpi_from ); - rect.top = MulDiv( rect.top, dpi_to, dpi_from ); - rect.right = MulDiv( rect.right, dpi_to, dpi_from ); - rect.bottom = MulDiv( rect.bottom, dpi_to, dpi_from ); - } - return rect; -} - -/********************************************************************** - * rect_win_to_thread_dpi - */ -RECT rect_win_to_thread_dpi( HWND hwnd, RECT rect ) -{ - UINT dpi = get_thread_dpi(); - if (!dpi) dpi = get_win_monitor_dpi( hwnd ); - return map_dpi_rect( rect, GetDpiForWindow( hwnd ), dpi ); -} - /********************************************************************** * SetProcessDpiAwarenessContext (USER32.@) */ diff --git a/dlls/user32/win.h b/dlls/user32/win.h index ffd4f37d5f0..9c61d5ce0a3 100644 --- a/dlls/user32/win.h +++ b/dlls/user32/win.h @@ -37,13 +37,6 @@ extern HDESK open_winstation_desktop( HWINSTA hwinsta, LPCWSTR name, DWORD flags extern void WINPOS_ActivateOtherWindow( HWND hwnd ) DECLSPEC_HIDDEN; -extern UINT get_win_monitor_dpi( HWND hwnd ) DECLSPEC_HIDDEN; -extern UINT get_thread_dpi(void) DECLSPEC_HIDDEN; -extern POINT map_dpi_point( POINT pt, UINT dpi_from, UINT dpi_to ) DECLSPEC_HIDDEN; -extern POINT point_win_to_phys_dpi( HWND hwnd, POINT pt ) DECLSPEC_HIDDEN; -extern RECT map_dpi_rect( RECT rect, UINT dpi_from, UINT dpi_to ) DECLSPEC_HIDDEN; -extern RECT rect_win_to_thread_dpi( HWND hwnd, RECT rect ) DECLSPEC_HIDDEN; - static inline void mirror_rect( const RECT *window_rect, RECT *rect ) { int width = window_rect->right - window_rect->left;

1 0

Nikolay Sivov : mfplat/tests: Add some tests for legacy media type conersion functions.
by Alexandre Julliard 28 Aug '22

28 Aug '22

Module: wine Branch: master Commit: 43e70580f48c648e61e56dd88df66e93eda56452 URL: https://gitlab.winehq.org/wine/wine/-/commit/43e70580f48c648e61e56dd88df66e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 25 20:02:14 2022 +0300 mfplat/tests: Add some tests for legacy media type conersion functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/evr.spec | 2 +- dlls/mfplat/mediatype.c | 34 +++++ dlls/mfplat/mfplat.spec | 6 +- dlls/mfplat/tests/mfplat.c | 355 +++++++++++++++++++++++++++++++++++++++++++++ include/ksmedia.h | 25 ++++ include/mfapi.h | 20 +++ 6 files changed, 438 insertions(+), 4 deletions(-)

1 0