wine-commits January 2021

wine-commits@winehq.org

2 participants
472 discussions

Jacek Caban : jscript: Support VT_DATE to string conversion.
by Alexandre Julliard 19 Jan '21

19 Jan '21

Module: wine Branch: master Commit: 42c044ae7170ea5f3bb92c47f62d28378cf8cee7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42c044ae7170ea5f3bb92c47… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 19 14:33:52 2021 +0100 jscript: Support VT_DATE to string conversion. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/date.c | 25 +++++++++++++++++++++++++ dlls/jscript/jscript.h | 1 + dlls/jscript/jsutils.c | 14 +++++++++++--- dlls/jscript/tests/lang.js | 3 +++ 4 files changed, 40 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index c0264c26bb8..96d366c6245 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -2483,3 +2483,28 @@ HRESULT variant_date_to_number(double date, double *ret) make_time(st.wHour, st.wMinute, st.wSecond, st.wMilliseconds)); return S_OK; } + +HRESULT variant_date_to_string(script_ctx_t *ctx, double date, jsstr_t **r) +{ + DateInstance *date_obj; + jsval_t val; + double time; + HRESULT hres; + + hres = variant_date_to_number(date, &time); + if(FAILED(hres)) + return hres; + + hres = create_date(ctx, NULL, time, &date_obj); + if(FAILED(hres)) + return hres; + + hres = dateobj_to_string(date_obj, &val); + jsdisp_release(&date_obj->dispex); + if(FAILED(hres)) + return hres; + + assert(is_string(val)); + *r = get_string(val); + return hres; +} diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 7cc194b84b9..b590e1a7441 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -361,6 +361,7 @@ HRESULT jsval_strict_equal(jsval_t,jsval_t,BOOL*) DECLSPEC_HIDDEN; HRESULT variant_change_type(script_ctx_t*,VARIANT*,VARIANT*,VARTYPE) DECLSPEC_HIDDEN; HRESULT variant_date_to_number(double,double*) DECLSPEC_HIDDEN; +HRESULT variant_date_to_string(script_ctx_t*,double,jsstr_t**) DECLSPEC_HIDDEN; HRESULT decode_source(WCHAR*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index a77c70ad01d..bfecdc75c4a 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -773,9 +773,17 @@ HRESULT to_string(script_ctx_t *ctx, jsval_t val, jsstr_t **str) case JSV_BOOL: *str = jsstr_alloc(get_bool(val) ? L"true" : L"false"); break; - default: - FIXME("unsupported %s\n", debugstr_jsval(val)); - return E_NOTIMPL; + default: { + const VARIANT *v = get_variant(val); + switch(V_VT(v)) + { + case VT_DATE: + return variant_date_to_string(ctx, V_DATE(v), str); + default: + FIXME("unsupported %s\n", debugstr_variant(v)); + return E_NOTIMPL; + } + } } return *str ? S_OK : E_OUTOFMEMORY; diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index d6973099b7c..7bcb121131e 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -200,14 +200,17 @@ ok(tmp === 3, "tmp = " + tmp); ok(getVT(+d) === "VT_R8", "vt +v_date(0) = " + getVT(d)); ok(getVT(d / d) === "VT_I4", "vt v_date(0) / v_date(0) = " + getVT(d / d)); ok((+d) === e, "+v_date(0) = " + (+d) + " expected " + e); + ok(("" + d).match(/^Sat Dec 30 00:00:00 .* 1899$/) != null, "+v_date(0) = " + d); d = v_date(2.5); e = Date.parse("Mon Jan 1 12:00:00 1900"); ok((+d) === e, "+v_date(2.5) = " + (+d)); + ok(("" + d).match(/^Mon Jan 1 12:00:00 .* 1900$/) != null, "+v_date(2.5) = " + d); d = v_date(42091); e = Date.parse("Sat Mar 28 00:00:00 2015"); ok((+d) === e, "+v_date(2015y) = " + (+d) + " expected " + e); + ok(("" + d).match(/^Sat Mar 28 00:00:00 .* 2015$/) != null, "+v_date(2015y) = " + d); })(); function testRecFunc(x) {

1 0

Jacek Caban : jscript: Support VT_DATE to number conversion.
by Alexandre Julliard 19 Jan '21

19 Jan '21

Module: wine Branch: master Commit: 3fb0e893b1ae72a2748e2b51ae75d6a053a52ccc URL: https://source.winehq.org/git/wine.git/?a=commit;h=3fb0e893b1ae72a2748e2b51… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 19 14:33:39 2021 +0100 jscript: Support VT_DATE to number conversion. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/date.c | 21 +++++++++++++++++++++ dlls/jscript/jscript.h | 1 + dlls/jscript/jsutils.c | 13 ++++++++++--- dlls/jscript/tests/lang.js | 11 +++++++++++ 4 files changed, 43 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index ffd8e212693..c0264c26bb8 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -2462,3 +2462,24 @@ HRESULT create_date_constr(script_ctx_t *ctx, jsdisp_t *object_prototype, jsdisp jsdisp_release(&date->dispex); return hres; } + +HRESULT variant_date_to_number(double date, double *ret) +{ + SYSTEMTIME st; + UDATE udate; + HRESULT hres; + + hres = VarUdateFromDate(date, 0, &udate); + if(FAILED(hres)) + return hres; + + if(!TzSpecificLocalTimeToSystemTime(NULL, &udate.st, &st)) + return E_FAIL; + + TRACE("%uy %um %u %ud %uh %um %u.%us\n", st.wYear, st.wMonth, st.wDayOfWeek, st.wDay, st.wHour, st.wMinute, + st.wSecond, st.wMilliseconds); + + *ret = make_date(make_day(st.wYear, st.wMonth - 1, st.wDay), + make_time(st.wHour, st.wMinute, st.wSecond, st.wMilliseconds)); + return S_OK; +} diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index dfe087521db..7cc194b84b9 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -360,6 +360,7 @@ HRESULT to_object(script_ctx_t*,jsval_t,IDispatch**) DECLSPEC_HIDDEN; HRESULT jsval_strict_equal(jsval_t,jsval_t,BOOL*) DECLSPEC_HIDDEN; HRESULT variant_change_type(script_ctx_t*,VARIANT*,VARIANT*,VARTYPE) DECLSPEC_HIDDEN; +HRESULT variant_date_to_number(double,double*) DECLSPEC_HIDDEN; HRESULT decode_source(WCHAR*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index a2ac53f64b9..a77c70ad01d 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -611,9 +611,16 @@ HRESULT to_number(script_ctx_t *ctx, jsval_t val, double *ret) case JSV_BOOL: *ret = get_bool(val) ? 1 : 0; return S_OK; - case JSV_VARIANT: - FIXME("unimplemented for variant %s\n", debugstr_variant(get_variant(val))); - return E_NOTIMPL; + case JSV_VARIANT: { + const VARIANT *v = get_variant(val); + switch(V_VT(v)) { + case VT_DATE: + return variant_date_to_number(V_DATE(v), ret); + default: + FIXME("unimplemented for variant %s\n", debugstr_variant(v)); + return E_NOTIMPL; + } + } }; assert(0); diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index dfe33f2f615..d6973099b7c 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -197,6 +197,17 @@ ok(tmp === 3, "tmp = " + tmp); d = v_date(0); e = Date.parse("Sat Dec 30 00:00:00 1899"); ok(getVT(d) === "VT_DATE", "vt v_date(0) = " + getVT(d)); + ok(getVT(+d) === "VT_R8", "vt +v_date(0) = " + getVT(d)); + ok(getVT(d / d) === "VT_I4", "vt v_date(0) / v_date(0) = " + getVT(d / d)); + ok((+d) === e, "+v_date(0) = " + (+d) + " expected " + e); + + d = v_date(2.5); + e = Date.parse("Mon Jan 1 12:00:00 1900"); + ok((+d) === e, "+v_date(2.5) = " + (+d)); + + d = v_date(42091); + e = Date.parse("Sat Mar 28 00:00:00 2015"); + ok((+d) === e, "+v_date(2015y) = " + (+d) + " expected " + e); })(); function testRecFunc(x) {

1 0

Jacek Caban : jscript/tests: Add VT_DATE handling tests.
by Alexandre Julliard 19 Jan '21

19 Jan '21

Module: wine Branch: master Commit: 859783e83b8c70e397b72594e0ce59c96803c3e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=859783e83b8c70e397b72594… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 19 14:33:29 2021 +0100 jscript/tests: Add VT_DATE handling tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/tests/lang.js | 9 +++++++++ dlls/jscript/tests/run.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index be0d0d2fa10..dfe33f2f615 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -190,6 +190,15 @@ ok(testFunc1.arguments === null, "testFunc1.arguments = " + testFunc1.arguments) (tmp) = 3; ok(tmp === 3, "tmp = " + tmp); +(function() { + /* VT_DATE handling */ + var d, e; + ok(getVT(v_date(0)) === "VT_DATE", "vt v_date(0) = " + getVT(v_date(0))); + d = v_date(0); + e = Date.parse("Sat Dec 30 00:00:00 1899"); + ok(getVT(d) === "VT_DATE", "vt v_date(0) = " + getVT(d)); +})(); + function testRecFunc(x) { ok(testRecFunc.arguments === arguments, "testRecFunc.arguments = " + testRecFunc.arguments); if(x) { diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 1deb460f715..7837d5fee4d 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -166,6 +166,7 @@ DEFINE_EXPECT(BindHandler); #define DISPID_GLOBAL_PROPARGPUTOP 0x1020 #define DISPID_GLOBAL_THROWINT 0x1021 #define DISPID_GLOBAL_THROWEI 0x1022 +#define DISPID_GLOBAL_VDATE 0x1023 #define DISPID_GLOBAL_TESTPROPDELETE 0x2000 #define DISPID_GLOBAL_TESTNOPROPDELETE 0x2001 @@ -966,6 +967,11 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD return S_OK; } + if(!lstrcmpW(bstrName, L"v_date")) { + *pid = DISPID_GLOBAL_VDATE; + return S_OK; + } + if(!lstrcmpW(bstrName, L"testArgTypes")) { *pid = DISPID_GLOBAL_TESTARGTYPES; return S_OK; @@ -1161,6 +1167,9 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, case VT_ARRAY|VT_VARIANT: V_BSTR(pvarRes) = SysAllocString(L"VT_ARRAY|VT_VARIANT"); break; + case VT_DATE: + V_BSTR(pvarRes) = SysAllocString(L"VT_DATE"); + break; default: ok(0, "unknown vt %d\n", V_VT(pdp->rgvarg)); return E_FAIL; @@ -1507,6 +1516,26 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, V_I2(pvarRes) = 10; return S_OK; + case DISPID_GLOBAL_VDATE: + ok(wFlags == (DISPATCH_METHOD|DISPATCH_PROPERTYGET), "wFlags = %x\n", wFlags); + ok(pdp != NULL, "pdp == NULL\n"); + ok(pdp->cArgs == 1, "cArgs = %d\n", pdp->cArgs); + ok(pvarRes != NULL, "pvarRes != NULL\n"); + V_VT(pvarRes) = VT_DATE; + switch(V_VT(pdp->rgvarg)) + { + case VT_I4: + V_DATE(pvarRes) = V_I4(pdp->rgvarg); + break; + case VT_R8: + V_DATE(pvarRes) = V_R8(pdp->rgvarg); + break; + default: + ok(0, "vt = %u\n", V_VT(pdp->rgvarg)); + return E_INVALIDARG; + } + return S_OK; + case DISPID_GLOBAL_INTPROP: V_VT(pvarRes) = VT_INT; V_INT(pvarRes) = 22;

1 0

Jacek Caban : jscript: Return DateInstance from create_date.
by Alexandre Julliard 19 Jan '21

19 Jan '21

Module: wine Branch: master Commit: 5f8e6137b405134f4665ddb6049bca41d6f0ebab URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f8e6137b405134f4665ddb6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 19 14:33:16 2021 +0100 jscript: Return DateInstance from create_date. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/date.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index efb97aa632e..ffd8e212693 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -1918,7 +1918,7 @@ static const builtin_info_t DateInst_info = { NULL }; -static HRESULT create_date(script_ctx_t *ctx, jsdisp_t *object_prototype, DOUBLE time, jsdisp_t **ret) +static HRESULT create_date(script_ctx_t *ctx, jsdisp_t *object_prototype, DOUBLE time, DateInstance **ret) { DateInstance *date; HRESULT hres; @@ -1946,7 +1946,7 @@ static HRESULT create_date(script_ctx_t *ctx, jsdisp_t *object_prototype, DOUBLE date->daylightDate = tzi.DaylightDate; date->daylightBias = tzi.DaylightBias; - *ret = &date->dispex; + *ret = date; return S_OK; } @@ -2354,7 +2354,7 @@ static HRESULT DateConstr_now(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un static HRESULT DateConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - jsdisp_t *date; + DateInstance *date; HRESULT hres; TRACE("\n"); @@ -2396,7 +2396,6 @@ static HRESULT DateConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, /* ECMA-262 3rd Edition 15.9.3.1 */ default: { double ret_date; - DateInstance *di; hres = date_utc(ctx, argc, argv, &ret_date); if(FAILED(hres)) @@ -2406,12 +2405,11 @@ static HRESULT DateConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, if(FAILED(hres)) return hres; - di = date_from_jsdisp(date); - di->time = utc(di->time, di); + date->time = utc(date->time, date); } } - *r = jsval_obj(date); + *r = jsval_obj(&date->dispex); return S_OK; case INVOKE_FUNC: { @@ -2451,7 +2449,7 @@ static const builtin_info_t DateConstr_info = { HRESULT create_date_constr(script_ctx_t *ctx, jsdisp_t *object_prototype, jsdisp_t **ret) { - jsdisp_t *date; + DateInstance *date; HRESULT hres; hres = create_date(ctx, object_prototype, 0.0, &date); @@ -2459,8 +2457,8 @@ HRESULT create_date_constr(script_ctx_t *ctx, jsdisp_t *object_prototype, jsdisp return hres; hres = create_builtin_constructor(ctx, DateConstr_value, L"Date", &DateConstr_info, - PROPF_CONSTR|7, date, ret); + PROPF_CONSTR|7, &date->dispex, ret); - jsdisp_release(date); + jsdisp_release(&date->dispex); return hres; }

1 0

Nikolay Sivov : d2d1: Pass zeros as text layout size for inverted rectangles in DrawText().
by Alexandre Julliard 19 Jan '21

19 Jan '21

Module: wine Branch: master Commit: 9521c6a1eb781ff7cb75a83544bf9b78f889a9e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9521c6a1eb781ff7cb75a835… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 19 15:48:16 2021 +0300 d2d1: Pass zeros as text layout size for inverted rectangles in DrawText(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/device.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index bd3af3d16ff..23ce03dce5e 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1161,6 +1161,7 @@ static void STDMETHODCALLTYPE d2d_device_context_DrawText(ID2D1DeviceContext *if IDWriteTextLayout *text_layout; IDWriteFactory *dwrite_factory; D2D1_POINT_2F origin; + float width, height; HRESULT hr; TRACE("iface %p, string %s, string_len %u, text_format %p, layout_rect %s, " @@ -1175,13 +1176,15 @@ static void STDMETHODCALLTYPE d2d_device_context_DrawText(ID2D1DeviceContext *if return; } + width = max(0.0f, layout_rect->right - layout_rect->left); + height = max(0.0f, layout_rect->bottom - layout_rect->top); if (measuring_mode == DWRITE_MEASURING_MODE_NATURAL) hr = IDWriteFactory_CreateTextLayout(dwrite_factory, string, string_len, text_format, - layout_rect->right - layout_rect->left, layout_rect->bottom - layout_rect->top, &text_layout); + width, height, &text_layout); else hr = IDWriteFactory_CreateGdiCompatibleTextLayout(dwrite_factory, string, string_len, text_format, - layout_rect->right - layout_rect->left, layout_rect->bottom - layout_rect->top, render_target->desc.dpiX / 96.0f, - (DWRITE_MATRIX*)&render_target->drawing_state.transform, measuring_mode == DWRITE_MEASURING_MODE_GDI_NATURAL, &text_layout); + width, height, render_target->desc.dpiX / 96.0f, (DWRITE_MATRIX *)&render_target->drawing_state.transform, + measuring_mode == DWRITE_MEASURING_MODE_GDI_NATURAL, &text_layout); IDWriteFactory_Release(dwrite_factory); if (FAILED(hr)) {

1 0

Haoyang Chen : d2d1: Fix text position in DrawText().
by Alexandre Julliard 19 Jan '21

19 Jan '21

Module: wine Branch: master Commit: f37c83452ebd909275b896bdc37f36155e1800ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=f37c83452ebd909275b896bd… Author: Haoyang Chen <chenhaoyang(a)uniontech.com> Date: Tue Jan 19 15:48:15 2021 +0300 d2d1: Fix text position in DrawText(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 5f04c3aa833..bd3af3d16ff 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1189,7 +1189,7 @@ static void STDMETHODCALLTYPE d2d_device_context_DrawText(ID2D1DeviceContext *if return; } - d2d_point_set(&origin, layout_rect->left, layout_rect->top); + d2d_point_set(&origin, min(layout_rect->left, layout_rect->right), min(layout_rect->top, layout_rect->bottom)); ID2D1DeviceContext_DrawTextLayout(iface, origin, text_layout, brush, options); IDWriteTextLayout_Release(text_layout); }

1 0

Derek Lesho : winegstreamer: Reformat type-setting functions to prevent the need for a conditionally initialized variable.
by Alexandre Julliard 19 Jan '21

19 Jan '21

Module: wine Branch: master Commit: 41e49d4596d293e18fce131a188a3d371942eb55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=41e49d4596d293e18fce131a… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Mon Jan 18 14:30:44 2021 -0500 winegstreamer: Reformat type-setting functions to prevent the need for a conditionally initialized variable. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/audioconvert.c | 153 ++++++++++++++++++++------------------ 1 file changed, 82 insertions(+), 71 deletions(-) diff --git a/dlls/winegstreamer/audioconvert.c b/dlls/winegstreamer/audioconvert.c index 82467b2f4e2..85f44dd8856 100644 --- a/dlls/winegstreamer/audioconvert.c +++ b/dlls/winegstreamer/audioconvert.c @@ -276,7 +276,9 @@ fail: static HRESULT WINAPI audio_converter_SetInputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags) { + GUID major_type, subtype; GstCaps *input_caps; + DWORD unused; HRESULT hr; struct audio_converter *converter = impl_audio_converter_from_IMFTransform(iface); @@ -286,34 +288,46 @@ static HRESULT WINAPI audio_converter_SetInputType(IMFTransform *iface, DWORD id if (id != 0) return MF_E_INVALIDSTREAMNUMBER; - if (type) + if (!type) { - GUID major_type, subtype; - DWORD unused; - - if (FAILED(IMFMediaType_GetGUID(type, &MF_MT_MAJOR_TYPE, &major_type))) - return MF_E_INVALIDTYPE; - if (FAILED(IMFMediaType_GetGUID(type, &MF_MT_SUBTYPE, &subtype))) - return MF_E_INVALIDTYPE; - if (FAILED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, &unused))) - return MF_E_INVALIDTYPE; - if (FAILED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_NUM_CHANNELS, &unused))) - return MF_E_INVALIDTYPE; - if (IsEqualGUID(&subtype, &MFAudioFormat_PCM) && FAILED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_BITS_PER_SAMPLE, &unused))) - return MF_E_INVALIDTYPE; - - if (!(IsEqualGUID(&major_type, &MFMediaType_Audio))) - return MF_E_INVALIDTYPE; - - if (!IsEqualGUID(&subtype, &MFAudioFormat_PCM) && !IsEqualGUID(&subtype, &MFAudioFormat_Float)) - return MF_E_INVALIDTYPE; - - if (!(input_caps = caps_from_mf_media_type(type))) - return MF_E_INVALIDTYPE; - - gst_caps_unref(input_caps); + if (flags & MFT_SET_TYPE_TEST_ONLY) + return S_OK; + + EnterCriticalSection(&converter->cs); + + if (converter->input_type) + { + IMFMediaType_Release(converter->input_type); + converter->input_type = NULL; + } + + LeaveCriticalSection(&converter->cs); + + return S_OK; } + if (FAILED(IMFMediaType_GetGUID(type, &MF_MT_MAJOR_TYPE, &major_type))) + return MF_E_INVALIDTYPE; + if (FAILED(IMFMediaType_GetGUID(type, &MF_MT_SUBTYPE, &subtype))) + return MF_E_INVALIDTYPE; + if (FAILED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, &unused))) + return MF_E_INVALIDTYPE; + if (FAILED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_NUM_CHANNELS, &unused))) + return MF_E_INVALIDTYPE; + if (IsEqualGUID(&subtype, &MFAudioFormat_PCM) && FAILED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_BITS_PER_SAMPLE, &unused))) + return MF_E_INVALIDTYPE; + + if (!(IsEqualGUID(&major_type, &MFMediaType_Audio))) + return MF_E_INVALIDTYPE; + + if (!IsEqualGUID(&subtype, &MFAudioFormat_PCM) && !IsEqualGUID(&subtype, &MFAudioFormat_Float)) + return MF_E_INVALIDTYPE; + + if (!(input_caps = caps_from_mf_media_type(type))) + return MF_E_INVALIDTYPE; + + gst_caps_unref(input_caps); + if (flags & MFT_SET_TYPE_TEST_ONLY) return S_OK; @@ -321,21 +335,13 @@ static HRESULT WINAPI audio_converter_SetInputType(IMFTransform *iface, DWORD id hr = S_OK; - if (type) - { - if (!converter->input_type) - hr = MFCreateMediaType(&converter->input_type); + if (!converter->input_type) + hr = MFCreateMediaType(&converter->input_type); - if (SUCCEEDED(hr)) - hr = IMFMediaType_CopyAllItems(type, (IMFAttributes *) converter->input_type); + if (SUCCEEDED(hr)) + hr = IMFMediaType_CopyAllItems(type, (IMFAttributes *) converter->input_type); - if (FAILED(hr)) - { - IMFMediaType_Release(converter->input_type); - converter->input_type = NULL; - } - } - else if (converter->input_type) + if (FAILED(hr)) { IMFMediaType_Release(converter->input_type); converter->input_type = NULL; @@ -362,33 +368,46 @@ static HRESULT WINAPI audio_converter_SetOutputType(IMFTransform *iface, DWORD i if (!converter->input_type) return MF_E_TRANSFORM_TYPE_NOT_SET; - if (type) + if (!type) { - /* validate the type */ - - if (FAILED(IMFMediaType_GetGUID(type, &MF_MT_MAJOR_TYPE, &major_type))) - return MF_E_INVALIDTYPE; - if (FAILED(IMFMediaType_GetGUID(type, &MF_MT_SUBTYPE, &subtype))) - return MF_E_INVALIDTYPE; - if (FAILED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_NUM_CHANNELS, &unused))) - return MF_E_INVALIDTYPE; - if (IsEqualGUID(&subtype, &MFAudioFormat_PCM) && FAILED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_BITS_PER_SAMPLE, &unused))) - return MF_E_INVALIDTYPE; - if (FAILED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, &unused))) - return MF_E_INVALIDTYPE; + if (flags & MFT_SET_TYPE_TEST_ONLY) + return S_OK; - if (!(IsEqualGUID(&major_type, &MFMediaType_Audio))) - return MF_E_INVALIDTYPE; + EnterCriticalSection(&converter->cs); - if (!IsEqualGUID(&subtype, &MFAudioFormat_PCM) && !IsEqualGUID(&subtype, &MFAudioFormat_Float)) - return MF_E_INVALIDTYPE; + if (converter->output_type) + { + IMFMediaType_Release(converter->output_type); + converter->output_type = NULL; + } - if (!(output_caps = caps_from_mf_media_type(type))) - return MF_E_INVALIDTYPE; + LeaveCriticalSection(&converter->cs); - gst_caps_unref(output_caps); + return S_OK; } + if (FAILED(IMFMediaType_GetGUID(type, &MF_MT_MAJOR_TYPE, &major_type))) + return MF_E_INVALIDTYPE; + if (FAILED(IMFMediaType_GetGUID(type, &MF_MT_SUBTYPE, &subtype))) + return MF_E_INVALIDTYPE; + if (FAILED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_NUM_CHANNELS, &unused))) + return MF_E_INVALIDTYPE; + if (IsEqualGUID(&subtype, &MFAudioFormat_PCM) && FAILED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_BITS_PER_SAMPLE, &unused))) + return MF_E_INVALIDTYPE; + if (FAILED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, &unused))) + return MF_E_INVALIDTYPE; + + if (!(IsEqualGUID(&major_type, &MFMediaType_Audio))) + return MF_E_INVALIDTYPE; + + if (!IsEqualGUID(&subtype, &MFAudioFormat_PCM) && !IsEqualGUID(&subtype, &MFAudioFormat_Float)) + return MF_E_INVALIDTYPE; + + if (!(output_caps = caps_from_mf_media_type(type))) + return MF_E_INVALIDTYPE; + + gst_caps_unref(output_caps); + if (flags & MFT_SET_TYPE_TEST_ONLY) return S_OK; @@ -396,21 +415,13 @@ static HRESULT WINAPI audio_converter_SetOutputType(IMFTransform *iface, DWORD i hr = S_OK; - if (type) - { - if (!converter->output_type) - hr = MFCreateMediaType(&converter->output_type); + if (!converter->output_type) + hr = MFCreateMediaType(&converter->output_type); - if (SUCCEEDED(hr)) - hr = IMFMediaType_CopyAllItems(type, (IMFAttributes *) converter->output_type); + if (SUCCEEDED(hr)) + hr = IMFMediaType_CopyAllItems(type, (IMFAttributes *) converter->output_type); - if (FAILED(hr)) - { - IMFMediaType_Release(converter->output_type); - converter->output_type = NULL; - } - } - else if (converter->output_type) + if (FAILED(hr)) { IMFMediaType_Release(converter->output_type); converter->output_type = NULL;

1 0

Derek Lesho : winegstreamer: Correct mistaken enum value in ProcessMessage.
by Alexandre Julliard 19 Jan '21

19 Jan '21

Module: wine Branch: master Commit: aae9333cd2f3640f47ffb9e3714a7b5f38e98eb0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aae9333cd2f3640f47ffb9e3… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Mon Jan 18 14:30:43 2021 -0500 winegstreamer: Correct mistaken enum value in ProcessMessage. This is the message session relies on succeeding. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/audioconvert.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/audioconvert.c b/dlls/winegstreamer/audioconvert.c index c5762bfdc60..82467b2f4e2 100644 --- a/dlls/winegstreamer/audioconvert.c +++ b/dlls/winegstreamer/audioconvert.c @@ -517,7 +517,7 @@ static HRESULT WINAPI audio_converter_ProcessMessage(IMFTransform *iface, MFT_ME switch(message) { - case MFT_MESSAGE_NOTIFY_START_OF_STREAM: + case MFT_MESSAGE_NOTIFY_BEGIN_STREAMING: return S_OK; default: FIXME("Unhandled message type %x.\n", message);

1 0

Giovanni Mascellani : winegstreamer: Wait on error conditions when initializing GStreamer.
by Alexandre Julliard 19 Jan '21

19 Jan '21

Module: wine Branch: master Commit: cc116548fd006951943e60cddb7d79ec8c363213 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc116548fd006951943e60cd… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Jan 19 10:02:07 2021 +0100 winegstreamer: Wait on error conditions when initializing GStreamer. GStreamer doesn't necessarily signal all error when setting the PLAYING or PAUSED state. If Wine just waits on no-more-pads, it risks a deadlock if an error is signaled after gst_element_get_state was called. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 54691a0318a..4a0a95c68f3 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1648,6 +1648,7 @@ static BOOL decodebin_parser_init_gst(struct parser *filter) { GstElement *element = gst_element_factory_make("decodebin", NULL); unsigned int i; + HANDLE events[2]; int ret; if (!element) @@ -1681,15 +1682,19 @@ static BOOL decodebin_parser_init_gst(struct parser *filter) return FALSE; } - WaitForSingleObject(filter->no_more_pads_event, INFINITE); + events[0] = filter->no_more_pads_event; + events[1] = filter->error_event; + if (WaitForMultipleObjects(2, events, FALSE, INFINITE)) + return FALSE; for (i = 0; i < filter->source_count; ++i) { struct parser_source *pin = filter->sources[i]; - const HANDLE events[2] = {pin->caps_event, filter->error_event}; pin->seek.llDuration = pin->seek.llStop = query_duration(pin->their_src); pin->seek.llCurrent = 0; + events[0] = pin->caps_event; + events[1] = filter->error_event; if (WaitForMultipleObjects(2, events, FALSE, INFINITE)) return FALSE; } @@ -2470,6 +2475,7 @@ static BOOL avi_splitter_init_gst(struct parser *filter) { GstElement *element = gst_element_factory_make("avidemux", NULL); unsigned int i; + HANDLE events[2]; int ret; if (!element) @@ -2502,15 +2508,19 @@ static BOOL avi_splitter_init_gst(struct parser *filter) return FALSE; } - WaitForSingleObject(filter->no_more_pads_event, INFINITE); + events[0] = filter->no_more_pads_event; + events[1] = filter->error_event; + if (WaitForMultipleObjects(2, events, FALSE, INFINITE)) + return FALSE; for (i = 0; i < filter->source_count; ++i) { struct parser_source *pin = filter->sources[i]; - const HANDLE events[2] = {pin->caps_event, filter->error_event}; pin->seek.llDuration = pin->seek.llStop = query_duration(pin->their_src); pin->seek.llCurrent = 0; + events[0] = pin->caps_event; + events[1] = filter->error_event; if (WaitForMultipleObjects(2, events, FALSE, INFINITE)) return FALSE; }

1 0

Paul Gofman : ws2_32: Use if_nameindex() instead of SIOCGIFNAME.
by Alexandre Julliard 19 Jan '21

19 Jan '21

Module: wine Branch: master Commit: e0238b6c767ada383522792be90247b6453ec506 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0238b6c767ada383522792b… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Jan 19 13:11:58 2021 +0300 ws2_32: Use if_nameindex() instead of SIOCGIFNAME. Fixes Mac build broken by 03fcb54c0e852b93b94bd11225237af84cdc3697 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50525 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 6a5697608c5..d865a5dd05f 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4494,6 +4494,7 @@ static DWORD get_interface_list(SOCKET s, void *out_buff, DWORD out_size, DWORD DWORD size, interface_count = 0, ret; INTERFACE_INFO *info = out_buff; PMIB_IPADDRTABLE table = NULL; + struct if_nameindex *if_ni; DWORD status = 0; int fd; @@ -4520,7 +4521,7 @@ static DWORD get_interface_list(SOCKET s, void *out_buff, DWORD out_size, DWORD } if (GetIpAddrTable(table, &size, TRUE) != NO_ERROR) { - ERR("Unable to get interface table./\n"); + ERR("Unable to get interface table.\n"); status = WSAEINVAL; goto done; } @@ -4532,24 +4533,36 @@ static DWORD get_interface_list(SOCKET s, void *out_buff, DWORD out_size, DWORD goto done; } + if (!(if_ni = if_nameindex())) + { + ERR("Unable to get interface name index.\n"); + status = WSAEINVAL; + goto done; + } + for (; interface_count < table->dwNumEntries; ++interface_count, ++info) { unsigned int addr, mask; struct ifreq if_info; + unsigned int i; memset(info, 0, sizeof(*info)); - if_info.ifr_ifindex = table->table[interface_count].dwIndex; - if (ioctl(fd, SIOCGIFNAME, &if_info) < 0) + for (i = 0; if_ni[i].if_index || if_ni[i].if_name; ++i) + if (if_ni[i].if_index == table->table[interface_count].dwIndex) + break; + + if (!if_ni[i].if_name) { - ERR("Error obtaining interface name for ifindex %d.\n", if_info.ifr_ifindex); + ERR("Error obtaining interface name for ifindex %u.\n", table->table[interface_count].dwIndex); status = WSAEINVAL; break; } + lstrcpynA(if_info.ifr_name, if_ni[i].if_name, IFNAMSIZ); if (ioctl(fd, SIOCGIFFLAGS, &if_info) < 0) { - ERR("Error obtaining status flags for socket!\n"); + ERR("Error obtaining status flags for socket.\n"); status = WSAEINVAL; break; } @@ -4585,7 +4598,7 @@ static DWORD get_interface_list(SOCKET s, void *out_buff, DWORD out_size, DWORD info->iiBroadcastAddress.AddressIn.sin_addr.WS_s_addr = addr | ~mask; } } - + if_freenameindex(if_ni); done: heap_free(table); *total_bytes = sizeof(INTERFACE_INFO) * interface_count;

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
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