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

Jinoh Kang : server: Use check_fd_events() instead of calling poll() directly.
by Alexandre Julliard 25 Aug '22

25 Aug '22

Module: wine Branch: master Commit: 13fb500cbbbeae06503d1d1598030ead0cf49a9b URL: https://gitlab.winehq.org/wine/wine/-/commit/13fb500cbbbeae06503d1d1598030e… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Tue Aug 9 22:24:44 2022 +0900 server: Use check_fd_events() instead of calling poll() directly. --- server/sock.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/server/sock.c b/server/sock.c index caa3724eb59..7b5bb187aa0 100644 --- a/server/sock.c +++ b/server/sock.c @@ -3468,11 +3468,7 @@ DECL_HANDLER(recv_socket) * asyncs will not consume all available data; if there's no data * available, the current request won't be immediately satiable. */ - struct pollfd pollfd; - pollfd.fd = get_unix_fd( sock->fd ); - pollfd.events = req->oob && !is_oobinline( sock ) ? POLLPRI : POLLIN; - pollfd.revents = 0; - if (poll(&pollfd, 1, 0) >= 0 && pollfd.revents) + if (check_fd_events( sock->fd, req->oob && !is_oobinline( sock ) ? POLLPRI : POLLIN )) { /* Give the client opportunity to complete synchronously. * If it turns out that the I/O request is not actually immediately satiable, @@ -3568,11 +3564,7 @@ DECL_HANDLER(send_socket) * asyncs will not consume all available space; if there's no space * available, the current request won't be immediately satiable. */ - struct pollfd pollfd; - pollfd.fd = get_unix_fd( sock->fd ); - pollfd.events = POLLOUT; - pollfd.revents = 0; - if (poll(&pollfd, 1, 0) >= 0 && pollfd.revents) + if (check_fd_events( sock->fd, POLLOUT )) { /* Give the client opportunity to complete synchronously. * If it turns out that the I/O request is not actually immediately satiable,

1 0

Jinoh Kang : server: Always prefer synchronous I/O in nonblocking mode.
by Alexandre Julliard 25 Aug '22

25 Aug '22

Module: wine Branch: master Commit: a115feab9ca8af9689a4ee13cd88ee6e93f902bd URL: https://gitlab.winehq.org/wine/wine/-/commit/a115feab9ca8af9689a4ee13cd88ee… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Tue Aug 9 23:07:56 2022 +0900 server: Always prefer synchronous I/O in nonblocking mode. foobar2000.exe's UPnP Media Renderer component (foo_out_upnp.dll) expects that, if a select() call completes successfully with a non-empty writefds set, any immediately following send() call on a socket in the writefds set never fails with WSAEWOULDBLOCK. On Wine, the Winsock select() and send() implementations both call the Unix poll(2) under the hood to test if I/O is possible on the socket. As it turns out, it's entirely possible that Linux poll() may yield POLLOUT on the first call (by select) but *not* the second (by send), even if no send() call has been made in the meanwhile. On Linux (as of v5.19), a connected (ESTABLISHED) TCP socket that has not been shut down indicates (E)POLLOUT only if the ratio of sk_wmem_queued (the amount of bytes queued in the send buffer) to sk_sndbuf (the size of send buffer size itself, which can be retrieved via SO_SNDBUF) is below a certain threshold. Therefore, a falling edge in POLLOUT can be triggered due to a number of reasons: 1. TCP fragmentation. Once a TCP packet is split out from a larger sk_buff, it incurs extra bookkeeping overhead (e.g. sk_buff header) that is counted in sk_wmem_queued alongside application data. See also: tcp_fragment(), tso_fragment() (Linux 5.19). 2. Control packets (e.g. MTU probing). Such packets share the same buffer with application-initiated packets, and thus counted in sk_wmem_queued. See also: sk_wmem_queued_add() callers (Linux 5.19). 3. Memory pressure. This causes sk_sndbuf to shrink. See also: sk_stream_moderate_sndbuf() callers (Linux 5.19). Fix this by always attempting synchronous I/O first if req->force_async is unset and the nonblocking flag is set. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53486 --- server/sock.c | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/server/sock.c b/server/sock.c index 7b5bb187aa0..4e57d6774a6 100644 --- a/server/sock.c +++ b/server/sock.c @@ -3468,11 +3468,19 @@ DECL_HANDLER(recv_socket) * asyncs will not consume all available data; if there's no data * available, the current request won't be immediately satiable. */ - if (check_fd_events( sock->fd, req->oob && !is_oobinline( sock ) ? POLLPRI : POLLIN )) + if ((!req->force_async && sock->nonblocking) || + check_fd_events( sock->fd, req->oob && !is_oobinline( sock ) ? POLLPRI : POLLIN )) { /* Give the client opportunity to complete synchronously. * If it turns out that the I/O request is not actually immediately satiable, - * the client may then choose to re-queue the async (with STATUS_PENDING). */ + * the client may then choose to re-queue the async (with STATUS_PENDING). + * + * Note: If the nonblocking flag is set, we don't poll the socket + * here and always opt for synchronous completion first. This is + * because the application has probably seen POLLIN already from a + * preceding select()/poll() call before it requested to receive + * data. + */ status = STATUS_ALERTED; } } @@ -3564,11 +3572,27 @@ DECL_HANDLER(send_socket) * asyncs will not consume all available space; if there's no space * available, the current request won't be immediately satiable. */ - if (check_fd_events( sock->fd, POLLOUT )) + if ((!req->force_async && sock->nonblocking) || check_fd_events( sock->fd, POLLOUT )) { /* Give the client opportunity to complete synchronously. * If it turns out that the I/O request is not actually immediately satiable, - * the client may then choose to re-queue the async (with STATUS_PENDING). */ + * the client may then choose to re-queue the async (with STATUS_PENDING). + * + * Note: If the nonblocking flag is set, we don't poll the socket + * here and always opt for synchronous completion first. This is + * because the application has probably seen POLLOUT already from a + * preceding select()/poll() call before it requested to send data. + * + * Furthermore, some applications expect that any send() call on a + * socket that has indicated POLLOUT beforehand never fails with + * WSAEWOULDBLOCK. It's possible that Linux poll() may yield + * POLLOUT on the first call but not the second, even if no send() + * call has been made in the meanwhile. This can happen for a + * number of reasons; for example, TCP fragmentation may consume + * extra buffer space for each packet that has been split out, or + * the TCP/IP networking stack may decide to shrink the send buffer + * due to memory pressure. + */ status = STATUS_ALERTED; } }

1 0

Torge Matthies : msvcr100: Factor out the mapping of a context to a scheduler.
by Alexandre Julliard 25 Aug '22

25 Aug '22

Module: wine Branch: master Commit: e704c445429391ab2d0874ff6cfe8f708a69f8fd URL: https://gitlab.winehq.org/wine/wine/-/commit/e704c445429391ab2d0874ff6cfe8f… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Wed Aug 17 15:19:10 2022 +0200 msvcr100: Factor out the mapping of a context to a scheduler. Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> --- dlls/msvcrt/concurrency.c | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index d0c9924c631..f8abdff9f5d 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -697,29 +697,38 @@ static Context* get_current_context(void) return ret; } +static Scheduler* get_scheduler_from_context(Context *ctx) +{ + ExternalContextBase *context = (ExternalContextBase*)ctx; + + if (context->context.vtable != &ExternalContextBase_vtable) + return NULL; + return context->scheduler.scheduler; +} + static Scheduler* try_get_current_scheduler(void) { - ExternalContextBase *context = (ExternalContextBase*)try_get_current_context(); + Context *context = try_get_current_context(); + Scheduler *ret; if (!context) return NULL; - if (context->context.vtable != &ExternalContextBase_vtable) { + ret = get_scheduler_from_context(context); + if (!ret) ERR("unknown context set\n"); - return NULL; - } - return context->scheduler.scheduler; + return ret; } static Scheduler* get_current_scheduler(void) { - ExternalContextBase *context = (ExternalContextBase*)get_current_context(); + Context *context = get_current_context(); + Scheduler *ret; - if (context->context.vtable != &ExternalContextBase_vtable) { + ret = get_scheduler_from_context(context); + if (!ret) ERR("unknown context set\n"); - return NULL; - } - return context->scheduler.scheduler; + return ret; } /* ?CurrentContext(a)Context@Concurrency@@SAPAV12(a)XZ */

1 0

Zhiyi Zhang : ddraw/tests: Add a comment to note that tests in d3d.c are deprecated.
by Alexandre Julliard 25 Aug '22

25 Aug '22

Module: wine Branch: master Commit: 21beb2a8c7a9dbd3632fb5562b6c54b30eb291e3 URL: https://gitlab.winehq.org/wine/wine/-/commit/21beb2a8c7a9dbd3632fb5562b6c54… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Aug 19 15:38:10 2022 +0800 ddraw/tests: Add a comment to note that tests in d3d.c are deprecated. And new tests should be added to tests/ddraw{1,2,4,7}.c. --- dlls/ddraw/tests/d3d.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 87d0648b699..7005908fc3a 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -2227,6 +2227,8 @@ START_TEST(d3d) }; unsigned int i; + /* These tests are deprecated. New tests should be added to tests/ddraw{1,2,4,7}.c */ + init_function_pointers(); if(!pDirectDrawCreateEx) { win_skip("function DirectDrawCreateEx not available\n");

1 0

Zhiyi Zhang : ddraw/tests: Move the capability tests for enumerated devices.
by Alexandre Julliard 25 Aug '22

25 Aug '22

Module: wine Branch: master Commit: 3c899df3b5a76cfa91e48ee816305f7c8828fc78 URL: https://gitlab.winehq.org/wine/wine/-/commit/3c899df3b5a76cfa91e48ee816305f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Aug 19 16:50:09 2022 +0800 ddraw/tests: Move the capability tests for enumerated devices. Move the capability tests for enumerated devices from d3d.c to ddraw{1,2,4}.c. --- dlls/ddraw/tests/d3d.c | 165 ---------------------------------------------- dlls/ddraw/tests/ddraw1.c | 164 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 164 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 164 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 492 insertions(+), 165 deletions(-)

1 0

Martin Storsjö : bcrypt: Fix the non-PE build after ECDH_P384 was added.
by Alexandre Julliard 25 Aug '22

25 Aug '22

Module: wine Branch: master Commit: fcb553ffc2caec728381fc577f1774432d3a969e URL: https://gitlab.winehq.org/wine/wine/-/commit/fcb553ffc2caec728381fc577f1774… Author: Martin Storsjö <martin(a)martin.st> Date: Wed Aug 24 10:58:48 2022 +0300 bcrypt: Fix the non-PE build after ECDH_P384 was added. This fixes non-PE builds after 5253c8d77e8e7dc5770981e97e67348f393b99b9. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- include/bcrypt.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/bcrypt.h b/include/bcrypt.h index ba44c01bbc9..c9c4cb7b1fd 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -159,6 +159,7 @@ static const WCHAR BCRYPT_AES_ALGORITHM[] = {'A','E','S',0}; static const WCHAR BCRYPT_DES_ALGORITHM[] = {'D','E','S',0}; static const WCHAR BCRYPT_DSA_ALGORITHM[] = {'D','S','A',0}; static const WCHAR BCRYPT_ECDH_P256_ALGORITHM[] = {'E','C','D','H','_','P','2','5','6',0}; +static const WCHAR BCRYPT_ECDH_P384_ALGORITHM[] = {'E','C','D','H','_','P','3','8','4',0}; static const WCHAR BCRYPT_ECDSA_P256_ALGORITHM[] = {'E','C','D','S','A','_','P','2','5','6',0}; static const WCHAR BCRYPT_ECDSA_P384_ALGORITHM[] = {'E','C','D','S','A','_','P','3','8','4',0}; static const WCHAR BCRYPT_ECDSA_P521_ALGORITHM[] = {'E','C','D','S','A','_','P','5','2','1',0};

1 0

Gabriel Ivăncescu : mshtml: Handle S_FALSE from IUri methods when navigating.
by Alexandre Julliard 23 Aug '22

23 Aug '22

Module: wine Branch: master Commit: e5fe3bc0773fc218f0d4329a9aa47c7ccc6a626a URL: https://gitlab.winehq.org/wine/wine/-/commit/e5fe3bc0773fc218f0d4329a9aa47c… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Aug 23 17:31:21 2022 +0300 mshtml: Handle S_FALSE from IUri methods when navigating. Mostly by ignoring it, since no such Uri component exists. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/navigate.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 4cafa083b08..7b46065b9a1 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -2033,15 +2033,17 @@ static void navigate_javascript_proc(task_t *_task) { navigate_javascript_task_t *task = (navigate_javascript_task_t*)_task; HTMLOuterWindow *window = task->window; + BSTR code = NULL; VARIANT v; - BSTR code; HRESULT hres; task->window->readystate = READYSTATE_COMPLETE; hres = IUri_GetPath(task->uri, &code); - if(FAILED(hres)) + if(hres != S_OK) { + SysFreeString(code); return; + } hres = UrlUnescapeW(code, NULL, NULL, URL_UNESCAPE_INPLACE); if(FAILED(hres)) { @@ -2109,8 +2111,8 @@ static HRESULT navigate_fragment(HTMLOuterWindow *window, IUri *uri) { nsIDOMLocation *nslocation; nsAString nsfrag_str; + BSTR frag = NULL; WCHAR *selector; - BSTR frag; nsresult nsres; HRESULT hres; static const WCHAR selector_formatW[] = L"a[id=\"%s\"]"; @@ -2122,9 +2124,10 @@ static HRESULT navigate_fragment(HTMLOuterWindow *window, IUri *uri) return E_FAIL; hres = IUri_GetFragment(uri, &frag); - if(FAILED(hres)) { + if(hres != S_OK) { + SysFreeString(frag); nsIDOMLocation_Release(nslocation); - return hres; + return FAILED(hres) ? hres : S_OK; } nsAString_InitDepend(&nsfrag_str, frag); @@ -2236,7 +2239,7 @@ HRESULT super_navigate(HTMLOuterWindow *window, IUri *uri, DWORD flags, const WC prepare_for_binding(&window->browser->doc->basedoc, mon, flags); hres = IUri_GetScheme(uri, &scheme); - if(SUCCEEDED(hres) && scheme == URL_SCHEME_JAVASCRIPT) { + if(hres == S_OK && scheme == URL_SCHEME_JAVASCRIPT) { navigate_javascript_task_t *task; IBindStatusCallback_Release(&bsc->bsc.IBindStatusCallback_iface);

1 0

Gabriel Ivăncescu : mshtml: Handle S_FALSE from IUri methods in the NSAPI interfaces.
by Alexandre Julliard 23 Aug '22

23 Aug '22

Module: wine Branch: master Commit: b75ed0395dcc776261e1ba7753b903818bae75da URL: https://gitlab.winehq.org/wine/wine/-/commit/b75ed0395dcc776261e1ba7753b903… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Aug 23 17:31:21 2022 +0300 mshtml: Handle S_FALSE from IUri methods in the NSAPI interfaces. Mostly by setting such strings to NULL, because the component does not exist. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/nsio.c | 41 ++++++++++++++++++++++++++++------------- 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index f1859e2a383..1a48925ff77 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -168,6 +168,11 @@ static nsresult return_wstr_nsacstr(nsACString *ret_str, const WCHAR *str, int l TRACE("returning %s\n", debugstr_wn(str, len)); + if(!str) { + nsACString_SetData(ret_str, NULL); + return NS_OK; + } + if(!*str) { nsACString_SetData(ret_str, ""); return NS_OK; @@ -1255,10 +1260,10 @@ static nsresult NSAPI nsChannel_SetReferrerWithPolicy(nsIHttpChannel *iface, nsI return NS_ERROR_UNEXPECTED; } - if(!ensure_uri(This->uri) || FAILED(IUri_GetScheme(This->uri->uri, &channel_scheme))) + if(!ensure_uri(This->uri) || IUri_GetScheme(This->uri->uri, &channel_scheme) != S_OK) channel_scheme = INTERNET_SCHEME_UNKNOWN; - if(FAILED(IUri_GetScheme(referrer->uri, &referrer_scheme))) + if(IUri_GetScheme(referrer->uri, &referrer_scheme) != S_OK) referrer_scheme = INTERNET_SCHEME_UNKNOWN; if(referrer_scheme == INTERNET_SCHEME_HTTPS && channel_scheme != INTERNET_SCHEME_HTTPS) { @@ -2291,9 +2296,9 @@ static nsresult get_uri_string(nsWineURI *This, Uri_PROPERTY prop, nsACString *r return NS_ERROR_UNEXPECTED; } - vala = heap_strdupWtoU(val); + vala = heap_strdupWtoU(hres == S_OK ? val : NULL); SysFreeString(val); - if(!vala) + if(hres == S_OK && !vala) return NS_ERROR_OUT_OF_MEMORY; TRACE("ret %s\n", debugstr_a(vala)); @@ -2652,7 +2657,7 @@ static nsresult NSAPI nsURI_SetPassword(nsIFileURL *iface, const nsACString *aPa static nsresult NSAPI nsURI_GetHostPort(nsIFileURL *iface, nsACString *aHostPort) { nsWineURI *This = impl_from_nsIFileURL(iface); - const WCHAR *ptr; + const WCHAR *ptr = NULL; char *vala; BSTR val; HRESULT hres; @@ -2668,13 +2673,14 @@ static nsresult NSAPI nsURI_GetHostPort(nsIFileURL *iface, nsACString *aHostPort return NS_ERROR_UNEXPECTED; } - ptr = wcschr(val, '@'); - if(!ptr) - ptr = val; - + if(hres == S_OK) { + ptr = wcschr(val, '@'); + if(!ptr) + ptr = val; + } vala = heap_strdupWtoU(ptr); SysFreeString(val); - if(!vala) + if(hres == S_OK && !vala) return NS_ERROR_OUT_OF_MEMORY; TRACE("ret %s\n", debugstr_a(vala)); @@ -2846,8 +2852,12 @@ static nsresult NSAPI nsURI_SchemeIs(nsIFileURL *iface, const char *scheme, cpp_ if(FAILED(hres)) return NS_ERROR_UNEXPECTED; - MultiByteToWideChar(CP_UTF8, 0, scheme, -1, buf, ARRAY_SIZE(buf)); - *_retval = !wcscmp(scheme_name, buf); + if(hres != S_OK) + *_retval = FALSE; + else { + MultiByteToWideChar(CP_UTF8, 0, scheme, -1, buf, ARRAY_SIZE(buf)); + *_retval = !wcscmp(scheme_name, buf); + } SysFreeString(scheme_name); return NS_OK; } @@ -3167,6 +3177,11 @@ static nsresult get_uri_path(nsWineURI *This, BSTR *path, const WCHAR **file, co hres = IUri_GetPath(This->uri, path); if(FAILED(hres)) return NS_ERROR_FAILURE; + if(hres != S_OK) { + SysFreeString(*path); + *ext = *file = *path = NULL; + return NS_OK; + } for(ptr = *path + SysStringLen(*path)-1; ptr > *path && *ptr != '/' && *ptr != '\\'; ptr--); if(*ptr == '/' || *ptr == '\\') @@ -3458,7 +3473,7 @@ static nsresult create_nsuri(IUri *iuri, nsWineURI **_retval) ret->uri = iuri; hres = IUri_GetScheme(iuri, &ret->scheme); - if(FAILED(hres)) + if(hres != S_OK) ret->scheme = URL_SCHEME_UNKNOWN; TRACE("retval=%p\n", ret);

1 0

Gabriel Ivăncescu : mshtml: Handle S_FALSE return values from IUri methods.
by Alexandre Julliard 23 Aug '22

23 Aug '22

Module: wine Branch: master Commit: 9f47704f1ae72d3e5d806709e2682da029f2a794 URL: https://gitlab.winehq.org/wine/wine/-/commit/9f47704f1ae72d3e5d806709e2682d… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Aug 23 17:31:21 2022 +0300 mshtml: Handle S_FALSE return values from IUri methods. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/main.c | 6 ++++-- dlls/mshtml/persist.c | 3 ++- dlls/mshtml/script.c | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 1a64bdb9b7d..26c689ea016 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -215,7 +215,7 @@ compat_mode_t get_max_compat_mode(IUri *uri) { compat_config_t *iter; size_t len, iter_len; - BSTR host; + BSTR host = NULL; HRESULT hres; static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; @@ -224,8 +224,10 @@ compat_mode_t get_max_compat_mode(IUri *uri) if(!uri) return global_max_compat_mode; hres = IUri_GetHost(uri, &host); - if(FAILED(hres)) + if(hres != S_OK) { + SysFreeString(host); return global_max_compat_mode; + } len = SysStringLen(host); LIST_FOR_EACH_ENTRY(iter, &compat_config, compat_config_t, entry) { diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 73f255e753d..49e78ecfbc2 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -1176,7 +1176,8 @@ static HRESULT WINAPI HlinkTarget_Navigate(IHlinkTarget *iface, DWORD grfHLNF, L if (FAILED(hres)) return hres; - ShellExecuteW(NULL, L"open", uri, NULL, NULL, SW_SHOW); + if(hres == S_OK) + ShellExecuteW(NULL, L"open", uri, NULL, NULL, SW_SHOW); SysFreeString(uri); return S_OK; } diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 769ca72db6f..44211a6e0f2 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -1123,7 +1123,7 @@ HRESULT load_script(HTMLScriptElement *script_elem, const WCHAR *src, BOOL async hres = IUri_GetScheme(uri, &bsc->scheme); IUri_Release(uri); - if(FAILED(hres)) + if(hres != S_OK) bsc->scheme = URL_SCHEME_UNKNOWN; IHTMLScriptElement_AddRef(&script_elem->IHTMLScriptElement_iface);

1 0

Gabriel Ivăncescu : mshtml: Handle S_FALSE from IUri methods in localStorage and sessionStorage.
by Alexandre Julliard 23 Aug '22

23 Aug '22

Module: wine Branch: master Commit: 1e6c1851b0e758707bf387259f92d0d71734382a URL: https://gitlab.winehq.org/wine/wine/-/commit/1e6c1851b0e758707bf387259f92d0… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Aug 23 17:31:21 2022 +0300 mshtml: Handle S_FALSE from IUri methods in localStorage and sessionStorage. Also do not use the Uri itself as check for local vs session storage, because sessionStorage will rely on the Uri as well. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlstorage.c | 42 +++++++++++++++++++++++++----------------- dlls/mshtml/htmlwindow.c | 14 ++++++++------ dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/tests/dom.c | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 67 insertions(+), 24 deletions(-) diff --git a/dlls/mshtml/htmlstorage.c b/dlls/mshtml/htmlstorage.c index 1983d87a296..ae63c2b2f53 100644 --- a/dlls/mshtml/htmlstorage.c +++ b/dlls/mshtml/htmlstorage.c @@ -548,28 +548,20 @@ static dispex_static_data_t HTMLStorage_dispex = { HTMLStorage_iface_tids }; -static WCHAR *build_filename(IUri *uri) +static WCHAR *build_filename(BSTR hostname) { 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)); @@ -577,7 +569,6 @@ static WCHAR *build_filename(IUri *uri) len += ARRAY_SIZE(store); ret = heap_alloc((len + wcslen(hostname) + ARRAY_SIZE(L".xml")) * sizeof(WCHAR)); if(!ret) { - SysFreeString(hostname); return NULL; } @@ -585,7 +576,6 @@ static WCHAR *build_filename(IUri *uri) wcscat(ret, hostname); wcscat(ret, L".xml"); - SysFreeString(hostname); return ret; } @@ -600,17 +590,33 @@ static WCHAR *build_mutexname(const WCHAR *filename) return ret; } -HRESULT create_html_storage(compat_mode_t compat_mode, IUri *uri, IHTMLStorage **p) +HRESULT create_html_storage(HTMLInnerWindow *window, BOOL local, IHTMLStorage **p) { + IUri *uri = window->base.outer_window->uri; HTMLStorage *storage; + BSTR hostname = NULL; + HRESULT hres; + + if(!uri) + return S_FALSE; + + hres = IUri_GetHost(uri, &hostname); + if(hres != S_OK) { + SysFreeString(hostname); + return hres; + } storage = heap_alloc_zero(sizeof(*storage)); - if(!storage) + if(!storage) { + SysFreeString(hostname); return E_OUTOFMEMORY; + } - if(uri) { + if(local) { WCHAR *mutexname; - if(!(storage->filename = build_filename(uri))) { + storage->filename = build_filename(hostname); + SysFreeString(hostname); + if(!storage->filename) { heap_free(storage); return E_OUTOFMEMORY; } @@ -627,11 +633,13 @@ HRESULT create_html_storage(compat_mode_t compat_mode, IUri *uri, IHTMLStorage * heap_free(storage); return HRESULT_FROM_WIN32(GetLastError()); } - } + }else + SysFreeString(hostname); storage->IHTMLStorage_iface.lpVtbl = &HTMLStorageVtbl; storage->ref = 1; - init_dispatch(&storage->dispex, (IUnknown*)&storage->IHTMLStorage_iface, &HTMLStorage_dispex, compat_mode); + init_dispatch(&storage->dispex, (IUnknown*)&storage->IHTMLStorage_iface, &HTMLStorage_dispex, + dispex_compat_mode(&window->event_target.dispex)); *p = &storage->IHTMLStorage_iface; return S_OK; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 0043fb79731..7774e0fc92d 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2143,10 +2143,11 @@ static HRESULT WINAPI HTMLWindow6_get_sessionStorage(IHTMLWindow6 *iface, IHTMLS if(!This->inner_window->session_storage) { HRESULT hres; - hres = create_html_storage(dispex_compat_mode(&This->inner_window->event_target.dispex), - NULL, &This->inner_window->session_storage); - if(FAILED(hres)) + hres = create_html_storage(This->inner_window, FALSE, &This->inner_window->session_storage); + if(hres != S_OK) { + *p = NULL; return hres; + } } IHTMLStorage_AddRef(This->inner_window->session_storage); @@ -2163,10 +2164,11 @@ static HRESULT WINAPI HTMLWindow6_get_localStorage(IHTMLWindow6 *iface, IHTMLSto if(!This->inner_window->local_storage) { HRESULT hres; - hres = create_html_storage(dispex_compat_mode(&This->inner_window->event_target.dispex), - This->inner_window->base.outer_window->uri, &This->inner_window->local_storage); - if(FAILED(hres)) + hres = create_html_storage(This->inner_window, TRUE, &This->inner_window->local_storage); + if(hres != S_OK) { + *p = NULL; return hres; + } } IHTMLStorage_AddRef(This->inner_window->local_storage); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 05b37c6b9db..23217ea3308 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -950,7 +950,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,IUri*,IHTMLStorage**) DECLSPEC_HIDDEN; +HRESULT create_html_storage(HTMLInnerWindow*,BOOL,IHTMLStorage**) DECLSPEC_HIDDEN; void HTMLDocument_Persist_Init(HTMLDocument*) DECLSPEC_HIDDEN; void HTMLDocument_OleCmd_Init(HTMLDocument*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index e3ac177205c..5e135aa88ff 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -10891,6 +10891,37 @@ static void test_docfrag(IHTMLDocument2 *doc) IHTMLDocument2_Release(frag); } +static void test_about_blank_storage(IHTMLDocument2 *doc) +{ + IHTMLStorage *storage; + IHTMLWindow6 *window6; + IHTMLWindow2 *window; + HRESULT hres; + + hres = IHTMLDocument2_get_parentWindow(doc, &window); + ok(hres == S_OK, "get_parentWindow failed: %08lx\n", hres); + ok(window != NULL, "window == NULL\n"); + + hres = IHTMLWindow2_QueryInterface(window, &IID_IHTMLWindow6, (void**)&window6); + IHTMLWindow2_Release(window); + if(FAILED(hres)) { + win_skip("IHTMLWindow6 not supported\n"); + return; + } + + storage = (IHTMLStorage*)(INT_PTR)0xdeadbeef; + hres = IHTMLWindow6_get_sessionStorage(window6, &storage); + ok(hres == S_FALSE, "get_sessionStorage failed: %08lx\n", hres); + ok(storage == NULL, "session_storage != NULL\n"); + + storage = (IHTMLStorage*)(INT_PTR)0xdeadbeef; + hres = IHTMLWindow6_get_localStorage(window6, &storage); + ok(hres == S_FALSE, "get_localStorage failed: %08lx\n", hres); + ok(storage == NULL, "local_storage != NULL\n"); + + IHTMLWindow6_Release(window6); +} + static void check_quirks_mode(IHTMLDocument2 *doc) { test_compatmode(doc, L"BackCompat"); @@ -11626,9 +11657,11 @@ START_TEST(dom) run_domtest(elem_test_str, test_elems); run_domtest(elem_test2_str, test_elems2); run_domtest(doc_blank, test_dom_elements); + run_domtest(doc_blank, test_about_blank_storage); if(is_ie9plus) { compat_mode = COMPAT_IE9; run_domtest(doc_blank_ie9, test_dom_elements); + run_domtest(doc_blank_ie9, test_about_blank_storage); compat_mode = COMPAT_NONE; } run_domtest(noscript_str, test_noscript);

1 0