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

Alexandre Julliard : Wine release 7.16
by Alexandre Julliard Aug. 28, 2022

Aug. 28, 2022

Module: website Branch: master Commit: f8510ba9f6ad7b58d1f31632b24271ef294f3c1d URL: https://gitlab.winehq.org/winehq/winehq/-/commit/f8510ba9f6ad7b58d1f31632b2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Aug 28 14:29:47 2022 +0200 Wine release 7.16 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2022082801.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2022082801.xml b/news/en/2022082801.xml new file mode 100644 index 00000000..babe5fcd --- /dev/null +++ b/news/en/2022082801.xml @@ -0,0 +1,17 @@ +<news> +<date>August 28, 2022</date> +<title>Wine 7.16 Released</title> +<body> + The Wine development release 7.16 is now available. + <a href="{$root}/announce/7.16">What's new</a> in this release: +<ul> + <li>Wow64 support in X11 driver.</li> + <li>Session storage in MSHTML.</li> + <li>Unicode regexp fixes in MSXML.</li> + <li>IME improvements in Edit control.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/7.x/wine-7.16.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-7.16 : Alexandre Julliard : Release 7.16
by Alexandre Julliard Aug. 28, 2022

Aug. 28, 2022

Module: wine Branch: refs/tags/wine-7.16 Tag: 08738e1958332a5570a4fe4da690910ccbbe4b63 URL: https://gitlab.winehq.org/wine/wine/-/tags/08738e1958332a5570a4fe4da690910c… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Aug 28 14:24:50 2022 +0200 Release 7.16

1 0

Alexandre Julliard : Release 7.16.
by Alexandre Julliard Aug. 28, 2022

Aug. 28, 2022

Module: wine Branch: master Commit: a4930f003f45ab82c4c05746cbd29cbd4af09735 URL: https://gitlab.winehq.org/wine/wine/-/commit/a4930f003f45ab82c4c05746cbd29c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Aug 28 14:24:49 2022 +0200 Release 7.16. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 621 +++++++++++++++++++++++++++++++------------------------------- AUTHORS | 3 + VERSION | 2 +- configure | 18 +- 4 files changed, 327 insertions(+), 317 deletions(-)

1 0

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

Aug. 28, 2022

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 Aug. 28, 2022

Aug. 28, 2022

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 Aug. 28, 2022

Aug. 28, 2022

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

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

Aug. 28, 2022

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 removeItem() for sessionStorage.
by Alexandre Julliard Aug. 28, 2022

Aug. 28, 2022

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

Jacek Caban : user32: Merge win.h into user_private.h.
by Alexandre Julliard Aug. 28, 2022

Aug. 28, 2022

Module: wine Branch: master Commit: f2c55128c8e2e2b33e2536219d6a22a53c689d21 URL: https://gitlab.winehq.org/wine/wine/-/commit/f2c55128c8e2e2b33e2536219d6a22… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 26 12:23:34 2022 +0200 user32: Merge win.h into user_private.h. --- dlls/user32/button.c | 10 +--------- dlls/user32/class.c | 13 ------------- dlls/user32/clipboard.c | 18 +----------------- dlls/user32/combo.c | 8 -------- dlls/user32/cursoricon.c | 17 +++-------------- dlls/user32/dde_client.c | 13 ++----------- dlls/user32/dde_misc.c | 11 +---------- dlls/user32/dde_private.h | 3 +++ dlls/user32/dde_server.c | 13 ++----------- dlls/user32/defdlg.c | 10 +--------- dlls/user32/defwnd.c | 9 --------- dlls/user32/dialog.c | 17 +++-------------- dlls/user32/edit.c | 12 ++---------- dlls/user32/focus.c | 8 -------- dlls/user32/hook.c | 12 ------------ dlls/user32/icontitle.c | 10 +--------- dlls/user32/input.c | 17 ----------------- dlls/user32/mdi.c | 15 ++------------- dlls/user32/message.c | 19 +++---------------- dlls/user32/nonclient.c | 7 ------- dlls/user32/scroll.c | 8 +------- dlls/user32/user_main.c | 15 +++------------ dlls/user32/user_private.h | 21 +++++++++++++++++++++ dlls/user32/win.c | 10 +--------- dlls/user32/win.h | 45 --------------------------------------------- dlls/user32/winpos.c | 1 - dlls/user32/winproc.c | 11 +---------- 27 files changed, 52 insertions(+), 301 deletions(-)

1 0

Jacek Caban : user32: Build with nameless structs and unions.
by Alexandre Julliard Aug. 28, 2022

Aug. 28, 2022

Module: wine Branch: master Commit: b34893054726e3e60a35101df88598f06599627a URL: https://gitlab.winehq.org/wine/wine/-/commit/b34893054726e3e60a35101df88598… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 26 12:28:26 2022 +0200 user32: Build with nameless structs and unions. --- dlls/user32/exticon.c | 25 +++++++------------------ dlls/user32/input.c | 24 +++++++++++------------- dlls/user32/message.c | 3 --- dlls/user32/sysparams.c | 29 +++++++++++++---------------- 4 files changed, 31 insertions(+), 50 deletions(-) diff --git a/dlls/user32/exticon.c b/dlls/user32/exticon.c index 80106a62edb..415bb9864b8 100644 --- a/dlls/user32/exticon.c +++ b/dlls/user32/exticon.c @@ -22,18 +22,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include <string.h> -#include <stdlib.h> /* abs() */ -#include <sys/types.h> - -#define NONAMELESSUNION -#define NONAMELESSSTRUCT -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" +#include <stdlib.h> #include "user_private.h" #include "wine/debug.h" @@ -115,9 +104,9 @@ static const IMAGE_RESOURCE_DIRECTORY *find_entry_by_id( const IMAGE_RESOURCE_DI while (min <= max) { pos = (min + max) / 2; - if (entry[pos].u.Id == id) - return (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + entry[pos].u2.s2.OffsetToDirectory); - if (entry[pos].u.Id > id) max = pos - 1; + if (entry[pos].Id == id) + return (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + entry[pos].OffsetToDirectory); + if (entry[pos].Id > id) max = pos - 1; else min = pos + 1; } return NULL; @@ -134,7 +123,7 @@ static const IMAGE_RESOURCE_DIRECTORY *find_entry_default( const IMAGE_RESOURCE_ { const IMAGE_RESOURCE_DIRECTORY_ENTRY *entry; entry = (const IMAGE_RESOURCE_DIRECTORY_ENTRY *)(dir + 1); - return (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + entry->u2.s2.OffsetToDirectory); + return (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + entry->OffsetToDirectory); } /************************************************************************* @@ -453,7 +442,7 @@ static UINT ICO_ExtractIconExW( while(n<iconDirCount && xprdeTmp) { - if(xprdeTmp->u.Id == iId) + if(xprdeTmp->Id == iId) { nIconIndex = n; break; @@ -489,7 +478,7 @@ static UINT ICO_ExtractIconExW( const IMAGE_RESOURCE_DIRECTORY *resdir; /* go down this resource entry, name */ - resdir = (const IMAGE_RESOURCE_DIRECTORY *)((const char *)rootresdir + xresent->u2.s2.OffsetToDirectory); + resdir = (const IMAGE_RESOURCE_DIRECTORY *)((const char *)rootresdir + xresent->OffsetToDirectory); /* default language (0) */ resdir = find_entry_default(resdir,rootresdir); diff --git a/dlls/user32/input.c b/dlls/user32/input.c index aa03a46a900..a329150f745 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -24,8 +24,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION - #include "user_private.h" #include "dbt.h" #include "wine/server.h" @@ -80,11 +78,11 @@ void WINAPI keybd_event( BYTE bVk, BYTE bScan, INPUT input; input.type = INPUT_KEYBOARD; - input.u.ki.wVk = bVk; - input.u.ki.wScan = bScan; - input.u.ki.dwFlags = dwFlags; - input.u.ki.time = 0; - input.u.ki.dwExtraInfo = dwExtraInfo; + input.ki.wVk = bVk; + input.ki.wScan = bScan; + input.ki.dwFlags = dwFlags; + input.ki.time = 0; + input.ki.dwExtraInfo = dwExtraInfo; NtUserSendInput( 1, &input, sizeof(input) ); } @@ -98,12 +96,12 @@ void WINAPI mouse_event( DWORD dwFlags, DWORD dx, DWORD dy, INPUT input; input.type = INPUT_MOUSE; - input.u.mi.dx = dx; - input.u.mi.dy = dy; - input.u.mi.mouseData = dwData; - input.u.mi.dwFlags = dwFlags; - input.u.mi.time = 0; - input.u.mi.dwExtraInfo = dwExtraInfo; + input.mi.dx = dx; + input.mi.dy = dy; + input.mi.mouseData = dwData; + input.mi.dwFlags = dwFlags; + input.mi.time = 0; + input.mi.dwExtraInfo = dwExtraInfo; NtUserSendInput( 1, &input, sizeof(input) ); } diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 744aa8cb9bd..92096e4a81d 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -19,9 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - #include "ntstatus.h" #define WIN32_NO_STATUS #include "user_private.h" diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 3f87702f32d..7ebe8099419 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -26,9 +26,6 @@ #include <string.h> #include <wchar.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - #include "windef.h" #include "winbase.h" #include "winnls.h" @@ -644,14 +641,14 @@ BOOL WINAPI EnumDisplaySettingsExA(LPCSTR lpszDeviceName, DWORD iModeNum, lpDevMode->dmBitsPerPel = devmodeW.dmBitsPerPel; lpDevMode->dmPelsHeight = devmodeW.dmPelsHeight; lpDevMode->dmPelsWidth = devmodeW.dmPelsWidth; - lpDevMode->u2.dmDisplayFlags = devmodeW.u2.dmDisplayFlags; + lpDevMode->dmDisplayFlags = devmodeW.dmDisplayFlags; lpDevMode->dmDisplayFrequency = devmodeW.dmDisplayFrequency; lpDevMode->dmFields = devmodeW.dmFields; - lpDevMode->u1.s2.dmPosition.x = devmodeW.u1.s2.dmPosition.x; - lpDevMode->u1.s2.dmPosition.y = devmodeW.u1.s2.dmPosition.y; - lpDevMode->u1.s2.dmDisplayOrientation = devmodeW.u1.s2.dmDisplayOrientation; - lpDevMode->u1.s2.dmDisplayFixedOutput = devmodeW.u1.s2.dmDisplayFixedOutput; + lpDevMode->dmPosition.x = devmodeW.dmPosition.x; + lpDevMode->dmPosition.y = devmodeW.dmPosition.y; + lpDevMode->dmDisplayOrientation = devmodeW.dmDisplayOrientation; + lpDevMode->dmDisplayFixedOutput = devmodeW.dmDisplayFixedOutput; } if (lpszDeviceName) RtlFreeUnicodeString(&nameW); return ret; @@ -1051,7 +1048,7 @@ BOOL WINAPI PhysicalToLogicalPoint( HWND hwnd, POINT *point ) static DISPLAYCONFIG_ROTATION get_dc_rotation(const DEVMODEW *devmode) { if (devmode->dmFields & DM_DISPLAYORIENTATION) - return devmode->u1.s2.dmDisplayOrientation + 1; + return devmode->dmDisplayOrientation + 1; else return DISPLAYCONFIG_ROTATION_IDENTITY; } @@ -1060,7 +1057,7 @@ static DISPLAYCONFIG_SCANLINE_ORDERING get_dc_scanline_ordering(const DEVMODEW * { if (!(devmode->dmFields & DM_DISPLAYFLAGS)) return DISPLAYCONFIG_SCANLINE_ORDERING_UNSPECIFIED; - else if (devmode->u2.dmDisplayFlags & DM_INTERLACED) + else if (devmode->dmDisplayFlags & DM_INTERLACED) return DISPLAYCONFIG_SCANLINE_ORDERING_INTERLACED; else return DISPLAYCONFIG_SCANLINE_ORDERING_PROGRESSIVE; @@ -1078,7 +1075,7 @@ static DISPLAYCONFIG_PIXELFORMAT get_dc_pixelformat(DWORD dmBitsPerPel) static void set_mode_target_info(DISPLAYCONFIG_MODE_INFO *info, const LUID *gpu_luid, UINT32 target_id, UINT32 flags, const DEVMODEW *devmode) { - DISPLAYCONFIG_TARGET_MODE *mode = &(info->u.targetMode); + DISPLAYCONFIG_TARGET_MODE *mode = &info->targetMode; info->infoType = DISPLAYCONFIG_MODE_INFO_TYPE_TARGET; info->adapterId = *gpu_luid; @@ -1102,7 +1099,7 @@ static void set_mode_target_info(DISPLAYCONFIG_MODE_INFO *info, const LUID *gpu_ mode->targetVideoSignalInfo.totalSize.cx = devmode->dmPelsWidth; mode->targetVideoSignalInfo.totalSize.cy = devmode->dmPelsHeight; } - mode->targetVideoSignalInfo.u.videoStandard = D3DKMDT_VSS_OTHER; + mode->targetVideoSignalInfo.videoStandard = D3DKMDT_VSS_OTHER; mode->targetVideoSignalInfo.scanLineOrdering = get_dc_scanline_ordering(devmode); } @@ -1111,7 +1108,7 @@ static void set_path_target_info(DISPLAYCONFIG_PATH_TARGET_INFO *info, const LUI { info->adapterId = *gpu_luid; info->id = target_id; - info->u.modeInfoIdx = mode_index; + info->modeInfoIdx = mode_index; info->outputTechnology = DISPLAYCONFIG_OUTPUT_TECHNOLOGY_DISPLAYPORT_EXTERNAL; info->rotation = get_dc_rotation(devmode); info->scaling = DISPLAYCONFIG_SCALING_IDENTITY; @@ -1125,7 +1122,7 @@ static void set_path_target_info(DISPLAYCONFIG_PATH_TARGET_INFO *info, const LUI static void set_mode_source_info(DISPLAYCONFIG_MODE_INFO *info, const LUID *gpu_luid, UINT32 source_id, const DEVMODEW *devmode) { - DISPLAYCONFIG_SOURCE_MODE *mode = &(info->u.sourceMode); + DISPLAYCONFIG_SOURCE_MODE *mode = &(info->sourceMode); info->infoType = DISPLAYCONFIG_MODE_INFO_TYPE_SOURCE; info->adapterId = *gpu_luid; @@ -1136,7 +1133,7 @@ static void set_mode_source_info(DISPLAYCONFIG_MODE_INFO *info, const LUID *gpu_ mode->pixelFormat = get_dc_pixelformat(devmode->dmBitsPerPel); if (devmode->dmFields & DM_POSITION) { - mode->position = devmode->u1.s2.dmPosition; + mode->position = devmode->dmPosition; } else { @@ -1150,7 +1147,7 @@ static void set_path_source_info(DISPLAYCONFIG_PATH_SOURCE_INFO *info, const LUI { info->adapterId = *gpu_luid; info->id = source_id; - info->u.modeInfoIdx = mode_index; + info->modeInfoIdx = mode_index; info->statusFlags = DISPLAYCONFIG_SOURCE_IN_USE; }

1 0