wine-commits January 2021

wine-commits@winehq.org

2 participants
472 discussions

Jacek Caban : mshtml: Implement IHTMLCSSStyleDeclaration2::animation property.
by Alexandre Julliard 27 Jan '21

27 Jan '21

Module: wine Branch: master Commit: ee611b198d8de1251486b505cffb9cac96f5cacf URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee611b198d8de1251486b505… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 27 19:36:38 2021 +0100 mshtml: Implement IHTMLCSSStyleDeclaration2::animation property. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 14 ++++++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/style.c | 30 ++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 43a71d6286c..0ae2dfe863e 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -120,6 +120,12 @@ typedef struct { } style_tbl_entry_t; static const style_tbl_entry_t style_tbl[] = { + { + L"animation", + DISPID_IHTMLCSSSTYLEDECLARATION2_ANIMATION, + DISPID_UNKNOWN, + ATTR_COMPAT_IE10 + }, { L"animation-name", DISPID_IHTMLCSSSTYLEDECLARATION2_ANIMATIONNAME, @@ -9689,15 +9695,15 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration2_get_animationIterationCount(IHTML static HRESULT WINAPI HTMLCSSStyleDeclaration2_put_animation(IHTMLCSSStyleDeclaration2 *iface, BSTR v) { CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + return set_style_property(This, STYLEID_ANIMATION, v); } static HRESULT WINAPI HTMLCSSStyleDeclaration2_get_animation(IHTMLCSSStyleDeclaration2 *iface, BSTR *p) { CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_style_property(This, STYLEID_ANIMATION, p); } static HRESULT WINAPI HTMLCSSStyleDeclaration2_put_animationFillMode(IHTMLCSSStyleDeclaration2 *iface, BSTR v) diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index a21dfe88d38..25f87c802b2 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -44,6 +44,7 @@ struct HTMLStyle { /* NOTE: Make sure to keep in sync with style_tbl in htmlstyle.c */ typedef enum { + STYLEID_ANIMATION, STYLEID_ANIMATION_NAME, STYLEID_BACKGROUND, STYLEID_BACKGROUND_ATTACHMENT, diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 69f1e61cac1..255dc7f7900 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -1106,6 +1106,36 @@ static void test_css_style_declaration2(IHTMLCSSStyleDeclaration2 *css_style) ok(hres == S_OK, "get_perspective failed: %08x\n", hres); ok(V_VT(&v) == VT_BSTR && V_BSTR(&v) && !lstrcmpW(V_BSTR(&v), L"100px"), "perspective = %s\n", wine_dbgstr_variant(&v)); VariantClear(&v); + + /* animation property */ + hres = IHTMLCSSStyleDeclaration2_put_animation(css_style, NULL); + ok(hres == S_OK, "put_animation failed: %08x\n", hres); + + str = (void*)0xdeadbeef; + hres = IHTMLCSSStyleDeclaration2_get_animation(css_style, &str); + ok(hres == S_OK, "get_animation failed: %08x\n", hres); + ok(!str, "animation = %s\n", wine_dbgstr_w(str)); + + str = SysAllocString(L"test"); + hres = IHTMLCSSStyleDeclaration2_put_animation(css_style, str); + ok(hres == S_OK, "put_animation failed: %08x\n", hres); + SysFreeString(str); + + str = (void*)0xdeadbeef; + hres = IHTMLCSSStyleDeclaration2_get_animation(css_style, &str); + ok(hres == S_OK, "get_animation failed: %08x\n", hres); + todo_wine + ok(!lstrcmpW(str, L"test"), "animation = %s\n", wine_dbgstr_w(str)); + + str = (void*)0xdeadbeef; + hres = IHTMLCSSStyleDeclaration2_get_animationName(css_style, &str); + ok(hres == S_OK, "get_animationName failed: %08x\n", hres); + ok(!lstrcmpW(str, L"test"), "animationName = %s\n", wine_dbgstr_w(str)); + + str = SysAllocString(L"test"); + hres = IHTMLCSSStyleDeclaration2_put_animation(css_style, NULL); + ok(hres == S_OK, "put_animation failed: %08x\n", hres); + SysFreeString(str); } static void test_body_style(IHTMLStyle *style)

1 0

Jacek Caban : mshtml/tests: Use more winetest.js helpers in documentmode.js.
by Alexandre Julliard 27 Jan '21

27 Jan '21

Module: wine Branch: master Commit: 44d58d35d19f3b9887f474e3528fcd874c63c7ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=44d58d35d19f3b9887f474e3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 27 19:36:21 2021 +0100 mshtml/tests: Use more winetest.js helpers in documentmode.js. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/documentmode.js | 79 ++++++++++++--------------------------- dlls/mshtml/tests/winetest.js | 8 ++++ 2 files changed, 31 insertions(+), 56 deletions(-) diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 4b788c970b9..d6589343dff 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -17,8 +17,9 @@ */ var compat_version; +var tests = []; -function test_elem_props() { +sync_test("elem_props", function() { var elem = document.documentElement; function test_exposed(prop, expect) { @@ -41,11 +42,9 @@ function test_elem_props() { test_exposed("addEventListener", v >= 9); test_exposed("removeEventListener", v >= 9); test_exposed("dispatchEvent", v >= 9); +}); - next_test(); -} - -function test_doc_props() { +sync_test("doc_props", function() { function test_exposed(prop, expect) { if(expect) ok(prop in document, prop + " not found in document."); @@ -66,11 +65,9 @@ function test_doc_props() { test_exposed("parentWindow", true); if(v >= 9) ok(document.defaultView === document.parentWindow, "defaultView != parentWindow"); +}); - next_test(); -} - -function test_docfrag_props() { +sync_test("docfrag_props", function() { var docfrag = document.createDocumentFragment(); function test_exposed(prop, expect) { @@ -83,11 +80,9 @@ function test_docfrag_props() { var v = document.documentMode; test_exposed("compareDocumentPosition", v >= 9); +}); - next_test(); -} - -function test_window_props() { +sync_test("window_props", function() { function test_exposed(prop, expect) { if(expect) ok(prop in window, prop + " not found in window."); @@ -108,11 +103,9 @@ function test_window_props() { test_exposed("getComputedStyle", v >= 9); if(v >= 9) /* FIXME: native exposes it in all compat modes */ test_exposed("performance", true); +}); - next_test(); -} - -function test_xhr_props() { +sync_test("xhr_props", function() { var xhr = new XMLHttpRequest(); function test_exposed(prop, expect) { @@ -127,11 +120,9 @@ function test_xhr_props() { test_exposed("addEventListener", v >= 9); test_exposed("removeEventListener", v >= 9); test_exposed("dispatchEvent", v >= 9); +}); - next_test(); -} - -function test_style_props() { +sync_test("style_props", function() { var style = document.body.style; function test_exposed(prop, expect) { @@ -186,11 +177,9 @@ function test_style_props() { test_exposed("background-clip", v >= 9); test_exposed("transform", v >= 10); } +}); - next_test(); -} - -function test_javascript() { +sync_test("JS objs", function() { var g = window; function test_exposed(func, obj, expect) { @@ -239,11 +228,9 @@ function test_javascript() { test_parses("if(false) { o.default; }", v >= 9); test_parses("if(false) { o.with; }", v >= 9); test_parses("if(false) { o.if; }", v >= 9); +}); - next_test(); -} - -function test_elem_by_id() { +sync_test("elem_by_id", function() { document.body.innerHTML = '<form id="testid" name="testname"></form>'; var id_elem = document.getElementById("testid"); @@ -254,11 +241,9 @@ function test_elem_by_id() { ok(id_elem === name_elem, "id_elem != id_elem"); else ok(name_elem === null, "name_elem != null"); +}); - next_test(); -} - -function test_doc_mode() { +sync_test("doc_mode", function() { compat_version = parseInt(document.location.search.substring(1)); trace("Testing compatibility mode " + compat_version); @@ -275,11 +260,9 @@ function test_doc_mode() { ok(document.compatMode === "CSS1Compat", "document.compatMode = " + document.compatMode); else ok(document.compatMode === "BackCompat", "document.compatMode = " + document.compatMode); +}); - next_test(); -} - -function test_iframe_doc_mode() { +async_test("iframe_doc_mode", function() { var iframe = document.createElement("iframe"); iframe.onload = function() { @@ -293,9 +276,9 @@ function test_iframe_doc_mode() { iframe.src = "about:blank"; document.body.appendChild(iframe); -} +}); -function test_conditional_comments() { +sync_test("conditional_comments", function() { var div = document.createElement("div"); document.body.appendChild(div); @@ -323,20 +306,4 @@ function test_conditional_comments() { test_version(6); test_version(7); test_version(8); - - next_test(); -} - -var tests = [ - test_doc_mode, - test_iframe_doc_mode, - test_elem_props, - test_doc_props, - test_docfrag_props, - test_window_props, - test_javascript, - test_xhr_props, - test_style_props, - test_elem_by_id, - test_conditional_comments -]; +}); diff --git a/dlls/mshtml/tests/winetest.js b/dlls/mshtml/tests/winetest.js index 6d99adf12b2..ca7f2aab4c2 100644 --- a/dlls/mshtml/tests/winetest.js +++ b/dlls/mshtml/tests/winetest.js @@ -90,3 +90,11 @@ function sync_test(name, f) next_test(); }); } + +function async_test(name, f) +{ + tests.push(function() { + test_name = name; + f(); + }); +}

1 0

Martin Storsjo : msvcrt: Fix reading BOM-less files opened with ccs=unicode.
by Alexandre Julliard 27 Jan '21

27 Jan '21

Module: wine Branch: master Commit: fb0fa9aacf0d58b3fd5f26255858a744b29ee000 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb0fa9aacf0d58b3fd5f2625… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Jan 27 19:07:26 2021 +0100 msvcrt: Fix reading BOM-less files opened with ccs=unicode. This fixes a regression in running MSVC 2010 in wine, when reading .def files (regressed in b0ab1b76029eaface724a28483fe8b0ea36029dc). Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/file.c | 6 ++++-- dlls/msvcrt/tests/file.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index ba534568119..73e1a82476f 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2329,6 +2329,7 @@ int CDECL _wsopen_dispatch( const wchar_t* path, int oflags, int shflags, int pm msvcrt_set_errno(GetLastError()); return *_errno(); } + oflags |= _O_U16TEXT; } } else if (access & GENERIC_READ) @@ -2346,8 +2347,9 @@ int CDECL _wsopen_dispatch( const wchar_t* path, int oflags, int shflags, int pm return *_errno(); if (oflags & _O_WTEXT) - get_ioinfo_nolock(*fd)->exflag |= EF_UTF16|EF_UNK_UNICODE; - else if (oflags & _O_U16TEXT) + get_ioinfo_nolock(*fd)->exflag |= EF_UNK_UNICODE; + + if (oflags & _O_U16TEXT) get_ioinfo_nolock(*fd)->exflag |= EF_UTF16; else if (oflags & _O_U8TEXT) get_ioinfo_nolock(*fd)->exflag |= EF_UTF8; diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index ecf99e38b0e..0cf8bad124f 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -1039,6 +1039,40 @@ static void test_fgetwc_unicode(void) ch = fgetwc(tempfh); ok(ch == WEOF, "got %04hx, expected WEOF (unicode)\n", ch); fclose(tempfh); + + tempfh = fopen(tempfile, "wb"); + ok(tempfh != NULL, "can't open tempfile\n"); + ret = WideCharToMultiByte(CP_UTF8, 0, wchar_text + 1, ARRAY_SIZE(wchar_text) - 1, + utf8_text, sizeof(utf8_text), NULL, NULL); + ok(ret > 0, "utf-8 conversion failed\n"); + utf8_text[ret] = 0; + fwrite(utf8_text, sizeof(char), ret, tempfh); + fclose(tempfh); + + tempfh = fopen(tempfile, "rt, ccs=UTF-8"); + ok(tempfh != NULL, "can't open tempfile\n"); + for (i = 1; i < ARRAY_SIZE(wchar_text); i++) + { + ch = fgetwc(tempfh); + ok(ch == wchar_text[i], + "got %04hx, expected %04x (utf8[%d])\n", ch, wchar_text[i], i-1); + } + ch = fgetwc(tempfh); + ok(ch == WEOF, "got %04hx, expected WEOF (utf8)\n", ch); + fclose(tempfh); + + tempfh = fopen(tempfile, "rt, ccs=unicode"); + ok(tempfh != NULL, "can't open tempfile\n"); + for (i = 0; utf8_text[i]; i++) + { + ch = fgetwc(tempfh); + ok(ch == (unsigned char) utf8_text[i], + "got %04hx, expected %04x (unicode[%d])\n", ch, (unsigned char)utf8_text[i], i); + } + ch = fgetwc(tempfh); + ok(ch == WEOF, "got %04hx, expected WEOF (unicode)\n", ch); + fclose(tempfh); + unlink(temppath); }

1 0

Alexandre Julliard : ntdll: Implement NtCreateDebugObject().
by Alexandre Julliard 27 Jan '21

27 Jan '21

Module: wine Branch: master Commit: 5ebc20c65609cc1b8643b427104ed386094a65c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ebc20c65609cc1b8643b427… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 27 10:43:30 2021 +0100 ntdll: Implement NtCreateDebugObject(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/tests/om.c | 14 +++++++++ dlls/ntdll/unix/sync.c | 25 ++++++++++++++++ include/wine/server_protocol.h | 20 ++++++++++++- include/winternl.h | 7 +++++ server/debugger.c | 66 ++++++++++++++++++++++++++++++++++++++---- server/protocol.def | 9 ++++++ server/request.h | 6 ++++ server/trace.c | 14 +++++++++ 9 files changed, 156 insertions(+), 7 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5ebc20c65609cc1b8643…

1 0

Alexandre Julliard : server: Rename debug_ctx to debug_obj.
by Alexandre Julliard 27 Jan '21

27 Jan '21

Module: wine Branch: master Commit: c1a042cefbc38eae6e0824a460a0657148e6745a URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1a042cefbc38eae6e0824a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 27 10:36:43 2021 +0100 server: Rename debug_ctx to debug_obj. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/debugger.c | 134 +++++++++++++++++++++++++++--------------------------- server/thread.c | 4 +- server/thread.h | 4 +- 3 files changed, 71 insertions(+), 71 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c1a042cefbc38eae6e08…

1 0

Piotr Caban : msvcrt: Improve memmove performance on i386 and x86_64 architectures.
by Alexandre Julliard 27 Jan '21

27 Jan '21

Module: wine Branch: master Commit: 38c490496000c5852f14e9c022868c5107d9ff03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=38c490496000c5852f14e9c0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 26 19:42:03 2021 +0100 msvcrt: Improve memmove performance on i386 and x86_64 architectures. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49663 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 2 +- dlls/msvcrt/msvcrt.h | 2 + dlls/msvcrt/string.c | 263 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 266 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=38c490496000c5852f14…

1 0

Zebediah Figura : winegstreamer: Don't force request_buffer_src() onto a Wine thread.
by Alexandre Julliard 27 Jan '21

27 Jan '21

Module: wine Branch: master Commit: ad6a3e753467a1b2006d927ede6709a5ccc41b96 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad6a3e753467a1b2006d927e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 26 17:45:32 2021 -0600 winegstreamer: Don't force request_buffer_src() onto a Wine thread. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_cbs.c | 16 ---------------- dlls/winegstreamer/gst_cbs.h | 2 -- dlls/winegstreamer/gstdemux.c | 9 +-------- 3 files changed, 1 insertion(+), 26 deletions(-) diff --git a/dlls/winegstreamer/gst_cbs.c b/dlls/winegstreamer/gst_cbs.c index ee2452987d9..5267091c5e1 100644 --- a/dlls/winegstreamer/gst_cbs.c +++ b/dlls/winegstreamer/gst_cbs.c @@ -161,22 +161,6 @@ gboolean activate_mode_wrapper(GstPad *pad, GstObject *parent, GstPadMode mode, return cbdata.u.activate_mode_data.ret; } -GstFlowReturn request_buffer_src_wrapper(GstPad *pad, GstObject *parent, guint64 ofs, guint len, - GstBuffer **buf) -{ - struct cb_data cbdata = { REQUEST_BUFFER_SRC }; - - cbdata.u.getrange_data.pad = pad; - cbdata.u.getrange_data.parent = parent; - cbdata.u.getrange_data.ofs = ofs; - cbdata.u.getrange_data.len = len; - cbdata.u.getrange_data.buf = buf; - - call_cb(&cbdata); - - return cbdata.u.getrange_data.ret; -} - gboolean query_sink_wrapper(GstPad *pad, GstObject *parent, GstQuery *query) { struct cb_data cbdata = { QUERY_SINK }; diff --git a/dlls/winegstreamer/gst_cbs.h b/dlls/winegstreamer/gst_cbs.h index e80fcd41e4a..4afde78ba7d 100644 --- a/dlls/winegstreamer/gst_cbs.h +++ b/dlls/winegstreamer/gst_cbs.h @@ -32,7 +32,6 @@ typedef enum { enum CB_TYPE { EXISTING_NEW_PAD, ACTIVATE_MODE, - REQUEST_BUFFER_SRC, QUERY_SINK, GSTDEMUX_MAX, BYTESTREAM_WRAPPER_PULL, @@ -116,7 +115,6 @@ void perform_cb_media_source(struct cb_data *data) DECLSPEC_HIDDEN; void existing_new_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) DECLSPEC_HIDDEN; gboolean activate_mode_wrapper(GstPad *pad, GstObject *parent, GstPadMode mode, gboolean activate) DECLSPEC_HIDDEN; -GstFlowReturn request_buffer_src_wrapper(GstPad *pad, GstObject *parent, guint64 ofs, guint len, GstBuffer **buf) DECLSPEC_HIDDEN; GstFlowReturn got_data_wrapper(GstPad *pad, GstObject *parent, GstBuffer *buf) DECLSPEC_HIDDEN; void Gstreamer_transform_pad_added_wrapper(GstElement *filter, GstPad *pad, gpointer user) DECLSPEC_HIDDEN; gboolean query_sink_wrapper(GstPad *pad, GstObject *parent, GstQuery *query) DECLSPEC_HIDDEN; diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index fc861735cd7..5c6266f4bd0 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1598,7 +1598,7 @@ static HRESULT GST_Connect(struct parser *This, IPin *pConnectPin) gst_element_set_bus(This->container, This->bus); This->my_src = gst_pad_new_from_static_template(&src_template, "quartz-src"); - gst_pad_set_getrange_function(This->my_src, request_buffer_src_wrapper); + gst_pad_set_getrange_function(This->my_src, request_buffer_src); gst_pad_set_query_function(This->my_src, query_function); gst_pad_set_activatemode_function(This->my_src, activate_mode_wrapper); gst_pad_set_event_function(This->my_src, event_src); @@ -2536,13 +2536,6 @@ void perform_cb_gstdemux(struct cb_data *cbdata) cbdata->u.activate_mode_data.ret = activate_mode(data->pad, data->parent, data->mode, data->activate); break; } - case REQUEST_BUFFER_SRC: - { - struct getrange_data *data = &cbdata->u.getrange_data; - cbdata->u.getrange_data.ret = request_buffer_src(data->pad, data->parent, - data->ofs, data->len, data->buf); - break; - } case QUERY_SINK: { struct query_sink_data *data = &cbdata->u.query_sink_data;

1 0

Zebediah Figura : winegstreamer: Manage our own thread for read requests.
by Alexandre Julliard 27 Jan '21

27 Jan '21

Module: wine Branch: master Commit: 3b885fb5f309f93bef2c4b4626d751dc9c0a6b61 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b885fb5f309f93bef2c4b46… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 26 17:45:31 2021 -0600 winegstreamer: Manage our own thread for read requests. Synchronization around flushing (on both sides) is tricky here, and the solution used by this patch means that a "kernel" thread can be blocked on a "user" thread. However, since it's not a real kernel thread and can't bring down the rest of the "kernel", I don't think this is a concern. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 116 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 106 insertions(+), 10 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index b2d102b528e..fc861735cd7 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -63,7 +63,7 @@ struct parser /* FIXME: It would be nice to avoid duplicating these with strmbase. * However, synchronization is tricky; we need access to be protected by a * separate lock. */ - bool streaming, flushing; + bool streaming, flushing, sink_connected; GstElement *container; GstPad *my_src, *their_sink; @@ -76,6 +76,17 @@ struct parser HANDLE push_thread; + HANDLE read_thread; + pthread_cond_t read_cond, read_done_cond; + struct + { + GstBuffer *buffer; + uint64_t offset; + uint32_t size; + bool done; + GstFlowReturn ret; + } read_request; + BOOL (*init_gst)(struct parser *filter); HRESULT (*source_query_accept)(struct parser_source *pin, const AM_MEDIA_TYPE *mt); HRESULT (*source_get_media_type)(struct parser_source *pin, unsigned int index, AM_MEDIA_TYPE *mt); @@ -684,6 +695,12 @@ static GstFlowReturn queue_stream_event(struct parser_source *pin, const struct { struct parser *filter = impl_from_strmbase_filter(pin->pin.pin.filter); + /* Unlike request_buffer_src() [q.v.], we need to watch for GStreamer + * flushes here. The difference is that we can be blocked by the streaming + * thread not running (or itself flushing on the DirectShow side). + * request_buffer_src() can only be blocked by the upstream source, and that + * is solved by flushing the upstream source. */ + pthread_mutex_lock(&filter->mutex); while (!pin->flushing && pin->event.type != PARSER_EVENT_NONE) pthread_cond_wait(&pin->event_empty_cond, &filter->mutex); @@ -1095,14 +1112,51 @@ static DWORD CALLBACK stream_thread(void *arg) return 0; } -static GstFlowReturn request_buffer_src(GstPad *pad, GstObject *parent, guint64 ofs, guint len, GstBuffer **buffer) +static GstFlowReturn request_buffer_src(GstPad *pad, GstObject *parent, guint64 offset, guint size, GstBuffer **buffer) { - struct parser *This = gst_pad_get_element_private(pad); + struct parser *filter = gst_pad_get_element_private(pad); GstBuffer *new_buffer = NULL; + GstFlowReturn ret; + + GST_LOG("pad %p, offset %" G_GINT64_MODIFIER "u, length %u, buffer %p.", pad, offset, size, *buffer); + + if (!*buffer) + *buffer = new_buffer = gst_buffer_new_and_alloc(size); + + pthread_mutex_lock(&filter->mutex); + + assert(!filter->read_request.buffer); + filter->read_request.buffer = *buffer; + filter->read_request.offset = offset; + filter->read_request.size = size; + filter->read_request.done = false; + pthread_cond_signal(&filter->read_cond); + + /* Note that we don't unblock this wait on GST_EVENT_FLUSH_START. We expect + * the upstream pin to flush if necessary. We should never be blocked on + * read_thread() not running. */ + + while (!filter->read_request.done) + pthread_cond_wait(&filter->read_done_cond, &filter->mutex); + + ret = filter->read_request.ret; + + pthread_mutex_unlock(&filter->mutex); + + GST_LOG("Request returned %s.", gst_flow_get_name(ret)); + + if (ret != GST_FLOW_OK && new_buffer) + gst_buffer_unref(new_buffer); + + return ret; +} + +static GstFlowReturn read_buffer(struct parser *This, guint64 ofs, guint len, GstBuffer *buffer) +{ HRESULT hr; GstMapInfo info; - TRACE("pad %p, offset %s, length %u, buffer %p.\n", pad, wine_dbgstr_longlong(ofs), len, *buffer); + TRACE("filter %p, offset %s, length %u, buffer %p.\n", This, wine_dbgstr_longlong(ofs), len, buffer); if (ofs == GST_BUFFER_OFFSET_NONE) ofs = This->nextpullofs; @@ -1114,22 +1168,47 @@ static GstFlowReturn request_buffer_src(GstPad *pad, GstObject *parent, guint64 len = This->filesize - ofs; This->nextpullofs = ofs + len; - if (!*buffer) - *buffer = new_buffer = gst_buffer_new_and_alloc(len); - gst_buffer_map(*buffer, &info, GST_MAP_WRITE); + gst_buffer_map(buffer, &info, GST_MAP_WRITE); hr = IAsyncReader_SyncRead(This->reader, ofs, len, info.data); - gst_buffer_unmap(*buffer, &info); + gst_buffer_unmap(buffer, &info); if (FAILED(hr)) { ERR("Failed to read data, hr %#x.\n", hr); - if (new_buffer) - gst_buffer_unref(new_buffer); return GST_FLOW_ERROR; } return GST_FLOW_OK; } +static DWORD CALLBACK read_thread(void *arg) +{ + struct parser *filter = arg; + + TRACE("Starting read thread for filter %p.\n", filter); + + pthread_mutex_lock(&filter->mutex); + + for (;;) + { + while (filter->sink_connected && !filter->read_request.buffer) + pthread_cond_wait(&filter->read_cond, &filter->mutex); + + if (!filter->sink_connected) + break; + + filter->read_request.done = true; + filter->read_request.ret = read_buffer(filter, filter->read_request.offset, + filter->read_request.size, filter->read_request.buffer); + filter->read_request.buffer = NULL; + pthread_cond_signal(&filter->read_done_cond); + } + + pthread_mutex_unlock(&filter->mutex); + + TRACE("Streaming stopped; exiting.\n"); + return 0; +} + static void removed_decoded_pad(GstElement *bin, GstPad *pad, gpointer user) { struct parser *filter = user; @@ -1506,6 +1585,10 @@ static HRESULT GST_Connect(struct parser *This, IPin *pConnectPin) IAsyncReader_Length(This->reader, &This->filesize, &avail); + This->sink_connected = true; + + This->read_thread = CreateThread(NULL, 0, read_thread, This, 0, NULL); + if (!This->bus) { This->bus = gst_bus_new(); gst_bus_set_sync_handler(This->bus, watch_bus, This, NULL); @@ -1599,6 +1682,8 @@ static void parser_destroy(struct strmbase_filter *iface) gst_object_unref(filter->bus); } + pthread_cond_destroy(&filter->read_cond); + pthread_cond_destroy(&filter->read_done_cond); pthread_cond_destroy(&filter->init_cond); pthread_mutex_destroy(&filter->mutex); @@ -1895,6 +1980,8 @@ static void parser_init_common(struct parser *object) { pthread_mutex_init(&object->mutex, NULL); pthread_cond_init(&object->init_cond, NULL); + pthread_cond_init(&object->read_cond, NULL); + pthread_cond_init(&object->read_done_cond, NULL); object->flushing = true; } @@ -2411,6 +2498,15 @@ static HRESULT GST_RemoveOutputPins(struct parser *This) gst_object_unref(This->their_sink); This->my_src = This->their_sink = NULL; + /* read_thread() needs to stay alive to service any read requests GStreamer + * sends, so we can only shut it down after GStreamer stops. */ + pthread_mutex_lock(&This->mutex); + This->sink_connected = false; + pthread_mutex_unlock(&This->mutex); + pthread_cond_signal(&This->read_cond); + WaitForSingleObject(This->read_thread, INFINITE); + CloseHandle(This->read_thread); + for (i = 0; i < This->source_count; ++i) free_source_pin(This->sources[i]);

1 0

Zebediah Figura : winegstreamer: Don't force removed_decoded_pad() onto a Wine thread.
by Alexandre Julliard 27 Jan '21

27 Jan '21

Module: wine Branch: master Commit: 2e41e3be571d5be2e4d9df24208cb3d027eb9a12 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e41e3be571d5be2e4d9df24… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 26 17:45:30 2021 -0600 winegstreamer: Don't force removed_decoded_pad() onto a Wine thread. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_cbs.c | 11 ----------- dlls/winegstreamer/gst_cbs.h | 2 -- dlls/winegstreamer/gstdemux.c | 10 ++-------- 3 files changed, 2 insertions(+), 21 deletions(-) diff --git a/dlls/winegstreamer/gst_cbs.c b/dlls/winegstreamer/gst_cbs.c index 6c5877ce785..ee2452987d9 100644 --- a/dlls/winegstreamer/gst_cbs.c +++ b/dlls/winegstreamer/gst_cbs.c @@ -177,17 +177,6 @@ GstFlowReturn request_buffer_src_wrapper(GstPad *pad, GstObject *parent, guint64 return cbdata.u.getrange_data.ret; } -void removed_decoded_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) -{ - struct cb_data cbdata = { REMOVED_DECODED_PAD }; - - cbdata.u.pad_removed_data.element = bin; - cbdata.u.pad_removed_data.pad = pad; - cbdata.u.pad_removed_data.user = user; - - call_cb(&cbdata); -} - gboolean query_sink_wrapper(GstPad *pad, GstObject *parent, GstQuery *query) { struct cb_data cbdata = { QUERY_SINK }; diff --git a/dlls/winegstreamer/gst_cbs.h b/dlls/winegstreamer/gst_cbs.h index f063a0a2a7b..e80fcd41e4a 100644 --- a/dlls/winegstreamer/gst_cbs.h +++ b/dlls/winegstreamer/gst_cbs.h @@ -33,7 +33,6 @@ enum CB_TYPE { EXISTING_NEW_PAD, ACTIVATE_MODE, REQUEST_BUFFER_SRC, - REMOVED_DECODED_PAD, QUERY_SINK, GSTDEMUX_MAX, BYTESTREAM_WRAPPER_PULL, @@ -119,7 +118,6 @@ void existing_new_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) DECLS gboolean activate_mode_wrapper(GstPad *pad, GstObject *parent, GstPadMode mode, gboolean activate) DECLSPEC_HIDDEN; GstFlowReturn request_buffer_src_wrapper(GstPad *pad, GstObject *parent, guint64 ofs, guint len, GstBuffer **buf) DECLSPEC_HIDDEN; GstFlowReturn got_data_wrapper(GstPad *pad, GstObject *parent, GstBuffer *buf) DECLSPEC_HIDDEN; -void removed_decoded_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) DECLSPEC_HIDDEN; void Gstreamer_transform_pad_added_wrapper(GstElement *filter, GstPad *pad, gpointer user) DECLSPEC_HIDDEN; gboolean query_sink_wrapper(GstPad *pad, GstObject *parent, GstQuery *query) DECLSPEC_HIDDEN; GstFlowReturn bytestream_wrapper_pull_wrapper(GstPad *pad, GstObject *parent, guint64 ofs, guint len, GstBuffer **buf) DECLSPEC_HIDDEN; diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 5c13d5e06f3..b2d102b528e 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1765,7 +1765,7 @@ static BOOL decodebin_parser_init_gst(struct parser *filter) gst_bin_add(GST_BIN(filter->container), element); g_signal_connect(element, "pad-added", G_CALLBACK(existing_new_pad_wrapper), filter); - g_signal_connect(element, "pad-removed", G_CALLBACK(removed_decoded_pad_wrapper), filter); + g_signal_connect(element, "pad-removed", G_CALLBACK(removed_decoded_pad), filter); g_signal_connect(element, "autoplug-select", G_CALLBACK(autoplug_blacklist), filter); g_signal_connect(element, "no-more-pads", G_CALLBACK(no_more_pads), filter); @@ -2447,12 +2447,6 @@ void perform_cb_gstdemux(struct cb_data *cbdata) data->ofs, data->len, data->buf); break; } - case REMOVED_DECODED_PAD: - { - struct pad_removed_data *data = &cbdata->u.pad_removed_data; - removed_decoded_pad(data->element, data->pad, data->user); - break; - } case QUERY_SINK: { struct query_sink_data *data = &cbdata->u.query_sink_data; @@ -2617,7 +2611,7 @@ static BOOL avi_splitter_init_gst(struct parser *filter) gst_bin_add(GST_BIN(filter->container), element); g_signal_connect(element, "pad-added", G_CALLBACK(existing_new_pad_wrapper), filter); - g_signal_connect(element, "pad-removed", G_CALLBACK(removed_decoded_pad_wrapper), filter); + g_signal_connect(element, "pad-removed", G_CALLBACK(removed_decoded_pad), filter); g_signal_connect(element, "no-more-pads", G_CALLBACK(no_more_pads), filter); filter->their_sink = gst_element_get_static_pad(element, "sink");

1 0

Zebediah Figura : winegstreamer: Avoid using Wine debug functions in removed_decoded_pad().
by Alexandre Julliard 27 Jan '21

27 Jan '21

Module: wine Branch: master Commit: cfce5054ac2a412d0be6ce9cd359f467f8ec0cfc URL: https://source.winehq.org/git/wine.git/?a=commit;h=cfce5054ac2a412d0be6ce9c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 26 17:45:29 2021 -0600 winegstreamer: Avoid using Wine debug functions in removed_decoded_pad(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 5181d0951d5..5c13d5e06f3 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1136,7 +1136,7 @@ static void removed_decoded_pad(GstElement *bin, GstPad *pad, gpointer user) unsigned int i; char *name; - TRACE("filter %p, bin %p, pad %p.\n", filter, bin, pad); + GST_LOG("filter %p, bin %p, pad %p.", filter, bin, pad); for (i = 0; i < filter->source_count; ++i) { @@ -1155,7 +1155,7 @@ static void removed_decoded_pad(GstElement *bin, GstPad *pad, gpointer user) } name = gst_pad_get_name(pad); - WARN("No pin matching pad %s found.\n", debugstr_a(name)); + GST_LOG("No pin matching pad \"%s\" found.", name); g_free(name); }

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
48
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 January 2021