wine-commits November 2021

wine-commits@winehq.org

2 participants
951 discussions

Michael Stefaniuc : vbscript: Avoid negating SUCCEEDED().
by Alexandre Julliard 01 Nov '21

01 Nov '21

Module: wine Branch: master Commit: 34884b83ada12274699e0e1177fa2b23707af960 URL: https://source.winehq.org/git/wine.git/?a=commit;h=34884b83ada12274699e0e11… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Oct 19 22:54:34 2021 +0200 vbscript: Avoid negating SUCCEEDED(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/lex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index 09b073fb773..5e81deab6ca 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -237,7 +237,7 @@ static int parse_date_literal(parser_ctx_t *ctx, DATE *ret) rptr[len] = 0; res = VarDateFromStr(rptr, ctx->lcid, 0, ret); heap_free(rptr); - if (!SUCCEEDED(res)) { + if (FAILED(res)) { FIXME("Invalid date literal\n"); return 0; }

1 0

Jan Sikorski : wined3d: Reduce locking of device context operations.
by Alexandre Julliard 01 Nov '21

01 Nov '21

Module: wine Branch: master Commit: 803274ac14067c4f60363ac8e953db9281dbe46a URL: https://source.winehq.org/git/wine.git/?a=commit;h=803274ac14067c4f60363ac8… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Mon Nov 1 09:07:18 2021 +0100 wined3d: Reduce locking of device context operations. Only actually take the lock for the immediate context. According to the d3d11 documentation, operations on device contexts are not thread safe, and testing on Windows confirms this. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 18 ++--- dlls/wined3d/device.c | 152 ++++++++++++++++++++--------------------- dlls/wined3d/wined3d_private.h | 12 ++++ 3 files changed, 97 insertions(+), 85 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=803274ac14067c4f6036…

1 0

Jan Sikorski : d3d9: Don't grab wined3d lock for surface AddRef/Release().
by Alexandre Julliard 01 Nov '21

01 Nov '21

Module: wine Branch: master Commit: ce93526f4829d8033ee79b4f74b9171cfb6831bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce93526f4829d8033ee79b4f… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Oct 15 14:26:31 2021 +0200 d3d9: Don't grab wined3d lock for surface AddRef/Release(). Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/surface.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index 2ff5134781e..175fa6269cc 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -67,11 +67,9 @@ static ULONG WINAPI d3d9_surface_AddRef(IDirect3DSurface9 *iface) { if (surface->parent_device) IDirect3DDevice9Ex_AddRef(surface->parent_device); - wined3d_mutex_lock(); if (surface->wined3d_rtv) wined3d_rendertarget_view_incref(surface->wined3d_rtv); wined3d_texture_incref(surface->wined3d_texture); - wined3d_mutex_unlock(); } return refcount; @@ -103,11 +101,9 @@ static ULONG WINAPI d3d9_surface_Release(IDirect3DSurface9 *iface) { IDirect3DDevice9Ex *parent_device = surface->parent_device; - wined3d_mutex_lock(); if (surface->wined3d_rtv) wined3d_rendertarget_view_decref(surface->wined3d_rtv); wined3d_texture_decref(surface->wined3d_texture); - wined3d_mutex_unlock(); /* Release the device last, as it may cause the device to be destroyed. */ if (parent_device)

1 0

Jan Sikorski : d3d9: Don't grab wined3d lock for wined3d_query_issue().
by Alexandre Julliard 01 Nov '21

01 Nov '21

Module: wine Branch: master Commit: 64b7ba3d653f2ed2d51b55c1909724ae63134c01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=64b7ba3d653f2ed2d51b55c1… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Oct 15 14:26:30 2021 +0200 d3d9: Don't grab wined3d lock for wined3d_query_issue(). Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/query.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/dlls/d3d9/query.c b/dlls/d3d9/query.c index 450a58091fa..b539e22b957 100644 --- a/dlls/d3d9/query.c +++ b/dlls/d3d9/query.c @@ -123,15 +123,8 @@ static DWORD WINAPI d3d9_query_GetDataSize(IDirect3DQuery9 *iface) static HRESULT WINAPI d3d9_query_Issue(IDirect3DQuery9 *iface, DWORD flags) { struct d3d9_query *query = impl_from_IDirect3DQuery9(iface); - HRESULT hr; - TRACE("iface %p, flags %#x.\n", iface, flags); - - wined3d_mutex_lock(); - hr = wined3d_query_issue(query->wined3d_query, flags); - wined3d_mutex_unlock(); - - return hr; + return wined3d_query_issue(query->wined3d_query, flags); } static HRESULT WINAPI d3d9_query_GetData(IDirect3DQuery9 *iface, void *data, DWORD size, DWORD flags)

1 0

Jan Sikorski : d3d9: Don't grab wined3d lock in index/vertexbuffer AddRef/Release().
by Alexandre Julliard 01 Nov '21

01 Nov '21

Module: wine Branch: master Commit: 6b866b93e0fe528eef13f2d1937f3fa66790ec34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b866b93e0fe528eef13f2d1… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Oct 15 14:26:29 2021 +0200 d3d9: Don't grab wined3d lock in index/vertexbuffer AddRef/Release(). Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/buffer.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index 901557c288f..bcb97011fe5 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -56,12 +56,10 @@ static ULONG WINAPI d3d9_vertexbuffer_AddRef(IDirect3DVertexBuffer9 *iface) if (refcount == 1) { IDirect3DDevice9Ex_AddRef(buffer->parent_device); - wined3d_mutex_lock(); if (buffer->draw_buffer) wined3d_buffer_incref(buffer->draw_buffer); else wined3d_buffer_incref(buffer->wined3d_buffer); - wined3d_mutex_unlock(); } return refcount; @@ -79,12 +77,10 @@ static ULONG WINAPI d3d9_vertexbuffer_Release(IDirect3DVertexBuffer9 *iface) struct wined3d_buffer *draw_buffer = buffer->draw_buffer; IDirect3DDevice9Ex *device = buffer->parent_device; - wined3d_mutex_lock(); if (draw_buffer) wined3d_buffer_decref(draw_buffer); else wined3d_buffer_decref(buffer->wined3d_buffer); - wined3d_mutex_unlock(); /* Release the device last, as it may cause the device to be destroyed. */ IDirect3DDevice9Ex_Release(device); @@ -388,12 +384,10 @@ static ULONG WINAPI d3d9_indexbuffer_AddRef(IDirect3DIndexBuffer9 *iface) if (refcount == 1) { IDirect3DDevice9Ex_AddRef(buffer->parent_device); - wined3d_mutex_lock(); if (buffer->draw_buffer) wined3d_buffer_incref(buffer->draw_buffer); else wined3d_buffer_incref(buffer->wined3d_buffer); - wined3d_mutex_unlock(); } return refcount; @@ -411,12 +405,10 @@ static ULONG WINAPI d3d9_indexbuffer_Release(IDirect3DIndexBuffer9 *iface) struct wined3d_buffer *draw_buffer = buffer->draw_buffer; IDirect3DDevice9Ex *device = buffer->parent_device; - wined3d_mutex_lock(); if (draw_buffer) wined3d_buffer_decref(draw_buffer); else wined3d_buffer_decref(buffer->wined3d_buffer); - wined3d_mutex_unlock(); /* Release the device last, as it may cause the device to be destroyed. */ IDirect3DDevice9Ex_Release(device);

1 0

Jan Sikorski : d3d9: Don't grab wined3d lock for wined3d incref/decref functions.
by Alexandre Julliard 01 Nov '21

01 Nov '21

Module: wine Branch: master Commit: 08c9b7c9ce5de5a38181d2e3a7c7587b57eb7f49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08c9b7c9ce5de5a38181d2e3… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Oct 15 14:26:28 2021 +0200 d3d9: Don't grab wined3d lock for wined3d incref/decref functions. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 4 ---- dlls/d3d9/directx.c | 2 -- dlls/d3d9/query.c | 3 --- dlls/d3d9/shader.c | 12 ------------ dlls/d3d9/stateblock.c | 2 -- dlls/d3d9/vertexdeclaration.c | 4 ---- 6 files changed, 27 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 1a1bc5ddb6c..ac6a7054838 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2553,9 +2553,7 @@ static HRESULT WINAPI d3d9_device_EndStateBlock(IDirect3DDevice9Ex *iface, IDire if (!(object = heap_alloc_zero(sizeof(*object)))) { - wined3d_mutex_lock(); wined3d_stateblock_decref(wined3d_stateblock); - wined3d_mutex_unlock(); return E_OUTOFMEMORY; } @@ -2563,9 +2561,7 @@ static HRESULT WINAPI d3d9_device_EndStateBlock(IDirect3DDevice9Ex *iface, IDire if (FAILED(hr)) { WARN("Failed to initialize stateblock, hr %#x.\n", hr); - wined3d_mutex_lock(); wined3d_stateblock_decref(wined3d_stateblock); - wined3d_mutex_unlock(); heap_free(object); return hr; } diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index e176483f43e..a1ebc986226 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -81,9 +81,7 @@ static ULONG WINAPI d3d9_Release(IDirect3D9Ex *iface) if (!refcount) { - wined3d_mutex_lock(); wined3d_decref(d3d9->wined3d); - wined3d_mutex_unlock(); heap_free(d3d9->wined3d_outputs); heap_free(d3d9); diff --git a/dlls/d3d9/query.c b/dlls/d3d9/query.c index 207ad55e5a1..450a58091fa 100644 --- a/dlls/d3d9/query.c +++ b/dlls/d3d9/query.c @@ -76,10 +76,7 @@ static ULONG WINAPI d3d9_query_Release(IDirect3DQuery9 *iface) if (!refcount) { - wined3d_mutex_lock(); wined3d_query_decref(query->wined3d_query); - wined3d_mutex_unlock(); - IDirect3DDevice9Ex_Release(query->parent_device); heap_free(query); } diff --git a/dlls/d3d9/shader.c b/dlls/d3d9/shader.c index 838c7de2cf0..042f8498321 100644 --- a/dlls/d3d9/shader.c +++ b/dlls/d3d9/shader.c @@ -54,9 +54,7 @@ static ULONG WINAPI d3d9_vertexshader_AddRef(IDirect3DVertexShader9 *iface) if (refcount == 1) { IDirect3DDevice9Ex_AddRef(shader->parent_device); - wined3d_mutex_lock(); wined3d_shader_incref(shader->wined3d_shader); - wined3d_mutex_unlock(); } return refcount; @@ -72,11 +70,7 @@ static ULONG WINAPI d3d9_vertexshader_Release(IDirect3DVertexShader9 *iface) if (!refcount) { IDirect3DDevice9Ex *device = shader->parent_device; - - wined3d_mutex_lock(); wined3d_shader_decref(shader->wined3d_shader); - wined3d_mutex_unlock(); - /* Release the device last, as it may cause the device to be destroyed. */ IDirect3DDevice9Ex_Release(device); } @@ -203,9 +197,7 @@ static ULONG WINAPI d3d9_pixelshader_AddRef(IDirect3DPixelShader9 *iface) if (refcount == 1) { IDirect3DDevice9Ex_AddRef(shader->parent_device); - wined3d_mutex_lock(); wined3d_shader_incref(shader->wined3d_shader); - wined3d_mutex_unlock(); } return refcount; @@ -221,11 +213,7 @@ static ULONG WINAPI d3d9_pixelshader_Release(IDirect3DPixelShader9 *iface) if (!refcount) { IDirect3DDevice9Ex *device = shader->parent_device; - - wined3d_mutex_lock(); wined3d_shader_decref(shader->wined3d_shader); - wined3d_mutex_unlock(); - /* Release the device last, as it may cause the device to be destroyed. */ IDirect3DDevice9Ex_Release(device); } diff --git a/dlls/d3d9/stateblock.c b/dlls/d3d9/stateblock.c index 3c1e3230095..c797ce54b49 100644 --- a/dlls/d3d9/stateblock.c +++ b/dlls/d3d9/stateblock.c @@ -66,9 +66,7 @@ static ULONG WINAPI d3d9_stateblock_Release(IDirect3DStateBlock9 *iface) if (!refcount) { - wined3d_mutex_lock(); wined3d_stateblock_decref(stateblock->wined3d_stateblock); - wined3d_mutex_unlock(); IDirect3DDevice9Ex_Release(stateblock->parent_device); heap_free(stateblock); diff --git a/dlls/d3d9/vertexdeclaration.c b/dlls/d3d9/vertexdeclaration.c index 60701a9a910..1ddc0cbc1ca 100644 --- a/dlls/d3d9/vertexdeclaration.c +++ b/dlls/d3d9/vertexdeclaration.c @@ -225,9 +225,7 @@ static ULONG WINAPI d3d9_vertex_declaration_AddRef(IDirect3DVertexDeclaration9 * if (refcount == 1) { IDirect3DDevice9Ex_AddRef(declaration->parent_device); - wined3d_mutex_lock(); wined3d_vertex_declaration_incref(declaration->wined3d_declaration); - wined3d_mutex_unlock(); } return refcount; @@ -243,9 +241,7 @@ static ULONG WINAPI d3d9_vertex_declaration_Release(IDirect3DVertexDeclaration9 if (!refcount) { IDirect3DDevice9Ex *parent_device = declaration->parent_device; - wined3d_mutex_lock(); wined3d_vertex_declaration_decref(declaration->wined3d_declaration); - wined3d_mutex_unlock(); /* Release the device last, as it may cause the device to be destroyed. */ IDirect3DDevice9Ex_Release(parent_device);

1 0

Piotr Caban : msvcrt: Don't use GetDaylightFlag function in _ftime64.
by Alexandre Julliard 01 Nov '21

01 Nov '21

Module: wine Branch: master Commit: 00824a94f02340c2725f494f04f7f1f8ca311033 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00824a94f02340c2725f494f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 1 15:07:17 2021 +0100 msvcrt: Don't use GetDaylightFlag function in _ftime64. The function is not available on current Windows releases. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51959 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/time.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 327d8e086e0..9abd1f5555b 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -44,8 +44,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); #undef _time32 #undef _wctime32 -BOOL WINAPI GetDaylightFlag(void); - static LONGLONG init_time; void msvcrt_init_clock(void) @@ -691,6 +689,7 @@ double CDECL _difftime32(__time32_t time1, __time32_t time2) */ void CDECL _ftime64(struct __timeb64 *buf) { + TIME_ZONE_INFORMATION tzinfo; FILETIME ft; ULONGLONG time; @@ -703,7 +702,7 @@ void CDECL _ftime64(struct __timeb64 *buf) buf->time = time / TICKSPERSEC - SECS_1601_TO_1970; buf->millitm = (time % TICKSPERSEC) / TICKSPERMSEC; buf->timezone = MSVCRT___timezone / 60; - buf->dstflag = GetDaylightFlag(); + buf->dstflag = GetTimeZoneInformation( &tzinfo) == TIME_ZONE_ID_DAYLIGHT; } /*********************************************************************

1 0

Paul Gofman : winhttp: Handle TLS close notify in netconn_is_alive().
by Alexandre Julliard 01 Nov '21

01 Nov '21

Module: wine Branch: master Commit: 93b07c091b55cd0d62c538edae9cc9aa9f5aa916 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93b07c091b55cd0d62c538ed… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Nov 1 16:19:01 2021 +0300 winhttp: Handle TLS close notify in netconn_is_alive(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/net.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 8597179dc3e..3016608404a 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -616,11 +616,31 @@ DWORD netconn_set_timeout( struct netconn *netconn, BOOL send, int value ) BOOL netconn_is_alive( struct netconn *netconn ) { + SIZE_T size; int len; char b; DWORD err; + BOOL eof; set_blocking( netconn, FALSE ); + if (netconn->secure) + { + while (!netconn->peek_msg && !(err = read_ssl_chunk( netconn, NULL, 0, &size, &eof )) && !eof) + ; + + TRACE("Checking secure connection, err %d.\n", err); + + if (netconn->peek_msg || err == WSAEWOULDBLOCK) + { + set_blocking( netconn, TRUE ); + return TRUE; + } + if (err != SEC_E_OK && err != SEC_E_INCOMPLETE_MESSAGE) + { + set_blocking( netconn, TRUE ); + return FALSE; + } + } len = sock_recv( netconn->socket, &b, 1, MSG_PEEK ); err = WSAGetLastError(); set_blocking( netconn, TRUE );

1 0

Hans Leidekker : mshtml: Implement HTMLAnchorElement_get_port().
by Alexandre Julliard 01 Nov '21

01 Nov '21

Module: wine Branch: master Commit: 2bbb725bb04c9a7e66463530f3f6911906267200 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2bbb725bb04c9a7e66463530… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 29 15:15:23 2021 +0200 mshtml: Implement HTMLAnchorElement_get_port(). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlanchor.c | 31 +++++++++++++++++++++++++++++-- dlls/mshtml/tests/dom.c | 22 ++++++++++++++++++++-- 2 files changed, 49 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index 44166246139..a3608abbeb1 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -490,8 +490,35 @@ static HRESULT WINAPI HTMLAnchorElement_put_port(IHTMLAnchorElement *iface, BSTR static HRESULT WINAPI HTMLAnchorElement_get_port(IHTMLAnchorElement *iface, BSTR *p) { HTMLAnchorElement *This = impl_from_IHTMLAnchorElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + IUri *uri; + HRESULT hres; + DWORD port; + WCHAR buf[11]; + int len; + BSTR str; + + TRACE("(%p)->(%p)\n", This, p); + + uri = get_anchor_uri(This); + if(!uri) { + WARN("Could not create IUri\n"); + *p = NULL; + return S_OK; + } + + hres = IUri_GetPort(uri, &port); + IUri_Release(uri); + if(FAILED(hres)) + return hres; + + len = swprintf(buf, ARRAY_SIZE(buf), L"%u", port); + str = SysAllocStringLen(buf, len); + if (str) + *p = str; + else + hres = E_OUTOFMEMORY; + + return hres; } static HRESULT WINAPI HTMLAnchorElement_put_protocol(IHTMLAnchorElement *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 9daaf9de51d..03f5c0431ea 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1673,6 +1673,22 @@ static void _test_anchor_hostname(unsigned line, IUnknown *unk, const WCHAR *hos SysFreeString(str); } +#define test_anchor_port(a,p) _test_anchor_port(__LINE__,a,p) +static void _test_anchor_port(unsigned line, IUnknown *unk, const WCHAR *port) +{ + IHTMLAnchorElement *anchor = _get_anchor_iface(line, unk); + BSTR str; + HRESULT hres; + + hres = IHTMLAnchorElement_get_port(anchor, &str); + ok_(__FILE__,line)(hres == S_OK, "get_port failed: %08x\n", hres); + if(port) + ok_(__FILE__,line)(!lstrcmpW(str, port), "port = %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(port)); + else + ok_(__FILE__,line)(str == NULL, "port = %s, expected NULL\n", wine_dbgstr_w(str)); + SysFreeString(str); +} + #define test_anchor_search(a,h,n) _test_anchor_search(__LINE__,a,h,n) static void _test_anchor_search(unsigned line, IUnknown *elem, const WCHAR *search, BOOL allowbroken) { @@ -9203,11 +9219,13 @@ static void test_elems(IHTMLDocument2 *doc) elem = get_elem_by_id(doc, L"a", TRUE); if(elem) { test_anchor_href((IUnknown*)elem, L"http://test/"); + test_anchor_port((IUnknown*)elem, L"80"); /* Change the href */ - test_anchor_put_href((IUnknown*)elem, L"http://test1/"); - test_anchor_href((IUnknown*)elem, L"http://test1/"); + test_anchor_put_href((IUnknown*)elem, L"http://test1:8080/"); + test_anchor_href((IUnknown*)elem, L"http://test1:8080/"); test_anchor_hostname((IUnknown*)elem, L"test1"); + test_anchor_port((IUnknown*)elem, L"8080"); /* Restore the href */ test_anchor_put_href((IUnknown*)elem, L"http://test/");

1 0

Zebediah Figura : winegstreamer: Seek to the beginning of the range in wm_reader_set_output_props().
by Alexandre Julliard 01 Nov '21

01 Nov '21

Module: wine Branch: master Commit: 6f8d366b57e662981c68ba0bd29465f391167de9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f8d366b57e662981c68ba0b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Oct 31 19:03:37 2021 -0500 winegstreamer: Seek to the beginning of the range in wm_reader_set_output_props(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 2 ++ dlls/winegstreamer/wm_reader.c | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index d330716b8f9..109ce6ab28f 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -136,6 +136,8 @@ struct wm_reader LONG refcount; CRITICAL_SECTION cs; + QWORD start_time; + IStream *source_stream; HANDLE read_thread; bool read_thread_shutdown; diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 24fd11f652d..82f74318062 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -1543,6 +1543,22 @@ HRESULT wm_reader_set_output_props(struct wm_reader *reader, DWORD output, stream->format = format; wg_parser_stream_enable(stream->wg_stream, &format); + /* Re-decode any buffers that might have been generated with the old format. + * + * FIXME: Seeking in-place will cause some buffers to be dropped. + * Unfortunately, we can't really store the last received PTS and seek there + * either: since seeks are inexact and we aren't guaranteed to receive + * samples in order, some buffers might be duplicated or dropped anyway. + * In order to really seamlessly allow for format changes, we need + * cooperation from each individual GStreamer stream, to be able to tell + * upstream exactly which buffers they need resent... + * + * In all likelihood this function is being called not mid-stream but rather + * while setting the stream up, before consuming any events. Accordingly + * let's just seek back to the beginning. */ + wg_parser_stream_seek(reader->streams[0].wg_stream, 1.0, reader->start_time, 0, + AM_SEEKING_AbsolutePositioning, AM_SEEKING_NoPositioning); + LeaveCriticalSection(&reader->cs); return S_OK; } @@ -1643,6 +1659,8 @@ void wm_reader_seek(struct wm_reader *reader, QWORD start, LONGLONG duration) EnterCriticalSection(&reader->cs); + reader->start_time = start; + wg_parser_stream_seek(reader->streams[0].wg_stream, 1.0, start, start + duration, AM_SEEKING_AbsolutePositioning, duration ? AM_SEEKING_AbsolutePositioning : AM_SEEKING_NoPositioning);

1 0

← Newer
1
...
89
90
91
92
93
94
95
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2021