January 2021 - Wine-Commits

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

Jan. 19, 2021

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

Jacek Caban : jscript: Return DateInstance from create_date.
by Alexandre Julliard Jan. 19, 2021

Jan. 19, 2021

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

Jacek Caban : jscript/tests: Add VT_DATE handling tests.
by Alexandre Julliard Jan. 19, 2021

Jan. 19, 2021

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: Support VT_DATE to number conversion.
by Alexandre Julliard Jan. 19, 2021

Jan. 19, 2021

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: Support VT_DATE to string conversion.
by Alexandre Julliard Jan. 19, 2021

Jan. 19, 2021

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

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

Jan. 19, 2021

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

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

Jan. 19, 2021

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

Alexandre Julliard : configure: Default to Thumb-2 mode for ARM.
by Alexandre Julliard Jan. 19, 2021

Jan. 19, 2021

Module: wine Branch: master Commit: 405e128b0b3a9661bd3db59608cd9a44f4ff9810 URL: https://source.winehq.org/git/wine.git/?a=commit;h=405e128b0b3a9661bd3db596… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 18 11:44:46 2021 +0100 configure: Default to Thumb-2 mode for ARM. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 39 ++++++++++++++++++++++----------------- configure.ac | 28 ++++++++++++++++++---------- 2 files changed, 40 insertions(+), 27 deletions(-) diff --git a/configure b/configure index 6a0f0ad92c2..ef09f65f11e 100755 --- a/configure +++ b/configure @@ -5623,6 +5623,8 @@ case $host in ;; esac +TARGETFLAGS="" + case $host in x86_64*|amd64*) if test "x$enable_win64" != "xyes" -a "$cross_compiling" != "yes" @@ -5660,7 +5662,6 @@ $as_echo "$wine_cv_cc_m32" >&6; } host_cpu="i386" notice_platform="32-bit " TARGETFLAGS="-m32" - PKG_CONFIG_PATH=${PKG_CONFIG_PATH:-/usr/lib/i386-linux-gnu/pkgconfig:/usr/lib32/pkgconfig:/usr/lib/pkgconfig} export PKG_CONFIG_PATH enable_win16=${enable_win16:-yes} @@ -5700,37 +5701,43 @@ $as_echo "$wine_cv_builtin_ms_va_list" >&6; } host_cpu="x86_64" notice_platform="64-bit " TARGETFLAGS="-m64" - fi ;; arm*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports Thumb" >&5 -$as_echo_n "checking whether $CC supports Thumb... " >&6; } -if ${wine_cv_thumb+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports Thumb-2" >&5 +$as_echo_n "checking whether $CC supports Thumb-2... " >&6; } +if ${wine_cv_thumb2+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -int ac_test(int i) { return i; } + int main () { -asm(".thumb\nblx ac_test\n.arm"); if (ac_test(1)) return 1 +asm(".syntax unified\n\t.thumb\n\tldm r0,{r0-r8}"); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - wine_cv_thumb=yes + wine_cv_thumb2=yes else - wine_cv_thumb=no + wine_cv_thumb2=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wine_cv_thumb" >&5 -$as_echo "$wine_cv_thumb" >&6; } - test $wine_cv_thumb != no || as_fn_error $? "You need a target with Thumb support to build Wine for ARM." "$LINENO" 5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wine_cv_thumb2" >&5 +$as_echo "$wine_cv_thumb2" >&6; } + if test x"$wine_cv_thumb2" = xyes + then + CFLAGS="$CFLAGS -mthumb" + TARGETFLAGS="-mthumb" + else + CFLAGS="$CFLAGS -marm" + TARGETFLAGS="-marm" + fi case $with_float_abi in soft|softfp|hard) float_abi=$with_float_abi ;; @@ -5741,7 +5748,7 @@ $as_echo "$wine_cv_thumb" >&6; } *) float_abi=softfp saved_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS -marm -mfloat-abi=$float_abi" + CFLAGS="$CFLAGS -mfloat-abi=$float_abi" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -mfloat-abi=$float_abi" >&5 $as_echo_n "checking whether $CC supports -mfloat-abi=$float_abi... " >&6; } if ${wine_cv_float_abi+:} false; then : @@ -5777,9 +5784,8 @@ $as_echo "$wine_cv_float_abi" >&6; } esac ;; esac - CFLAGS="$CFLAGS -marm -mfloat-abi=$float_abi" - TARGETFLAGS="-marm -mfloat-abi=$float_abi" - + CFLAGS="$CFLAGS -mfloat-abi=$float_abi" + TARGETFLAGS="$TARGETFLAGS -mfloat-abi=$float_abi" ;; aarch64*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports __builtin_ms_va_list" >&5 @@ -5859,7 +5865,6 @@ fi if test -n "$host_alias" -a "$host_alias" != "$build_alias" then TARGETFLAGS="-b $host_alias $TARGETFLAGS" - fi for ac_prog in flex diff --git a/configure.ac b/configure.ac index 2c4bd667e8f..1921307da31 100644 --- a/configure.ac +++ b/configure.ac @@ -138,6 +138,7 @@ case $host in ;; esac +AC_SUBST(TARGETFLAGS,"") case $host in x86_64*|amd64*) if test "x$enable_win64" != "xyes" -a "$cross_compiling" != "yes" @@ -149,7 +150,7 @@ case $host in test $wine_cv_cc_m32 != no || AC_MSG_ERROR([Cannot build a 32-bit program, you need to install 32-bit development libraries.]) host_cpu="i386" notice_platform="32-bit " - AC_SUBST(TARGETFLAGS,"-m32") + TARGETFLAGS="-m32" PKG_CONFIG_PATH=${PKG_CONFIG_PATH:-/usr/lib/i386-linux-gnu/pkgconfig:/usr/lib32/pkgconfig:/usr/lib/pkgconfig} export PKG_CONFIG_PATH enable_win16=${enable_win16:-yes} @@ -166,14 +167,21 @@ case $host in CXX="$CXX -m64" host_cpu="x86_64" notice_platform="64-bit " - AC_SUBST(TARGETFLAGS,"-m64") + TARGETFLAGS="-m64" fi ;; arm*) - AC_CACHE_CHECK([whether $CC supports Thumb],wine_cv_thumb, - [WINE_TRY_ASM_LINK([".thumb\nblx ac_test\n.arm"],[int ac_test(int i) { return i; }], [if (ac_test(1)) return 1], - [wine_cv_thumb=yes],[wine_cv_thumb=no])]) - test $wine_cv_thumb != no || AC_MSG_ERROR([You need a target with Thumb support to build Wine for ARM.]) + AC_CACHE_CHECK([whether $CC supports Thumb-2],wine_cv_thumb2, + [WINE_TRY_ASM_LINK([".syntax unified\n\t.thumb\n\tldm r0,{r0-r8}"],,, + [wine_cv_thumb2=yes],[wine_cv_thumb2=no])]) + if test x"$wine_cv_thumb2" = xyes + then + CFLAGS="$CFLAGS -mthumb" + TARGETFLAGS="-mthumb" + else + CFLAGS="$CFLAGS -marm" + TARGETFLAGS="-marm" + fi case $with_float_abi in soft|softfp|hard) float_abi=$with_float_abi ;; @@ -184,7 +192,7 @@ case $host in *) float_abi=softfp saved_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS -marm -mfloat-abi=$float_abi" + CFLAGS="$CFLAGS -mfloat-abi=$float_abi" AC_CACHE_CHECK([whether $CC supports -mfloat-abi=$float_abi],wine_cv_float_abi, [WINE_TRY_ASM_LINK(["vmrs r2,fpscr"],,,[wine_cv_float_abi=yes],[wine_cv_float_abi=no])]) if test $wine_cv_float_abi = no @@ -196,8 +204,8 @@ case $host in esac ;; esac - CFLAGS="$CFLAGS -marm -mfloat-abi=$float_abi" - AC_SUBST(TARGETFLAGS,"-marm -mfloat-abi=$float_abi") + CFLAGS="$CFLAGS -mfloat-abi=$float_abi" + TARGETFLAGS="$TARGETFLAGS -mfloat-abi=$float_abi" ;; aarch64*) AC_CACHE_CHECK([whether $CC supports __builtin_ms_va_list],wine_cv_builtin_ms_va_list, @@ -248,7 +256,7 @@ else fi if test -n "$host_alias" -a "$host_alias" != "$build_alias" then - AC_SUBST(TARGETFLAGS,"-b $host_alias $TARGETFLAGS") + TARGETFLAGS="-b $host_alias $TARGETFLAGS" fi dnl Check for flex

1 0

Alexandre Julliard : winebuild: Generate Thumb2-compatible assembly code on ARM.
by Alexandre Julliard Jan. 19, 2021

Jan. 19, 2021

Module: wine Branch: master Commit: c1a700f018ae86b31c61b0ce4e932f335a6f5081 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1a700f018ae86b31c61b0ce… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 16 11:05:38 2021 +0100 winebuild: Generate Thumb2-compatible assembly code on ARM. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/import.c | 58 ++++++++++++++++++++++++------------------------ tools/winebuild/main.c | 2 ++ tools/winebuild/spec32.c | 8 ++++--- tools/winebuild/utils.c | 11 ++++++++- 4 files changed, 46 insertions(+), 33 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index e6dff564f79..00b6f19ec98 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -755,9 +755,10 @@ static void output_import_thunk( const char *name, const char *table, int pos ) output( "\tjmpq *%s+%d(%%rip)\n", table, pos ); break; case CPU_ARM: - output( "\tldr IP,1f\n"); - output( "\tldr PC,[PC,IP]\n" ); - output( "1:\t.long %s+%u-(1b+4)\n", table, pos ); + output( "\tldr ip, 2f\n"); + output( "1:\tadd ip, pc\n" ); + output( "\tldr pc, [ip]\n"); + output( "2:\t.long %s+%u-1b-%u\n", table, pos, thumb_mode ? 4 : 8 ); break; case CPU_ARM64: output( "\tadrp x16, %s\n", arm64_page( table ) ); @@ -956,7 +957,7 @@ static void output_delayed_imports( const DLLSPEC *spec ) struct import_func *func = &import->imports[j]; const char *name = func->name ? func->name : func->export_name; output( "__imp_%s:\n", asm_name( name )); - output( "\t%s .L__wine_delay_imp_%s_%s\n", + output( "\t%s __wine_delay_imp_%s_%s\n", get_asm_ptr_keyword(), import->c_name, name ); } } @@ -1066,13 +1067,10 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) case CPU_ARM: output( "\tpush {r0-r3,FP,LR}\n" ); output( "\tmov r0,IP\n" ); - output( "\tldr IP,2f\n"); - output( "\tadd IP,PC\n"); - output( "\tblx IP\n"); - output( "1:\tmov IP,r0\n"); + output( "\tbl %s\n", asm_name("__wine_spec_delay_load") ); + output( "\tmov IP,r0\n"); output( "\tpop {r0-r3,FP,LR}\n" ); output( "\tbx IP\n"); - output( "2:\t.long %s-1b\n", asm_name("__wine_spec_delay_load") ); break; case CPU_ARM64: output( "\tstp x29, x30, [sp,#-80]!\n" ); @@ -1153,7 +1151,8 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) struct import_func *func = &import->imports[j]; const char *name = func->name ? func->name : func->export_name; - output( ".L__wine_delay_imp_%s_%s:\n", import->c_name, name ); + if (thumb_mode) output( "\t.thumb_func\n" ); + output( "__wine_delay_imp_%s_%s:\n", import->c_name, name ); output_cfi( ".cfi_startproc" ); switch(target_cpu) { @@ -1349,14 +1348,13 @@ void output_stubs( DLLSPEC *spec ) output( "\tcall %s\n", asm_name("__wine_spec_unimplemented_stub") ); break; case CPU_ARM: - output( "\tldr r0,2f\n"); - output( "\tadd r0,PC\n"); - output( "\tldr r1,2f+4\n"); - output( "1:" ); - if (exp_name) output( "\tadd r1,PC\n"); + output( "\tldr r0,3f\n"); + output( "1:\tadd r0,PC\n"); + output( "\tldr r1,3f+4\n"); + if (exp_name) output( "2:\tadd r1,PC\n"); output( "\tbl %s\n", asm_name("__wine_spec_unimplemented_stub") ); - output( "2:\t.long .L__wine_spec_file_name-1b\n" ); - if (exp_name) output( "\t.long .L%s_string-2b\n", name ); + output( "3:\t.long .L__wine_spec_file_name-1b-%u\n", thumb_mode ? 4 : 8 ); + if (exp_name) output( "\t.long .L%s_string-2b-%u\n", name, thumb_mode ? 4 : 8 ); else output( "\t.long %u\n", odp->ordinal ); break; case CPU_ARM64: @@ -1566,28 +1564,30 @@ void output_syscalls( DLLSPEC *spec ) output( "\tstr ip, [sp, #4]\n" ); output( "\tstr sp, [r7]\n" ); /* syscall frame */ output( "\tldr r5, 7f\n"); - output( "\tadd r5, pc\n"); + output( "1:\tadd r5, pc\n"); output( "\tldrb r5, [r5, r4]\n" ); /* syscall args */ - output( "1:\tsubs r5, #16\n" ); /* first 4 args are in registers */ + output( "\tsubs r5, #16\n" ); /* first 4 args are in registers */ output( "\tble 3f\n" ); - output( "\tsub sp, r5\n" ); - output( "\tand sp, #~7\n" ); + output( "\tsub ip, sp, r5\n" ); + output( "\tand ip, #~7\n" ); + output( "\tmov sp, ip\n" ); output( "2:\tsubs r5, r5, #4\n" ); output( "\tldr ip, [r6, r5]\n" ); output( "\tstr ip, [sp, r5]\n" ); output( "\tbgt 2b\n" ); output( "3:\tldr r5, 6f\n"); - output( "\tadd r5, pc\n"); + output( "4:\tadd r5, pc\n"); output( "\tldr ip, [r5, r4, lsl #2]\n"); /* syscall table */ - output( "4:\tblx ip\n"); + output( "\tblx ip\n"); output( "\tmov ip, #0\n" ); output( "\tstr ip, [r7]\n" ); - output( "\tsub sp, r6, #40\n" ); + output( "\tsub ip, r6, #40\n" ); + output( "\tmov sp, ip\n" ); output( "\tpop {r5-r11,pc}\n" ); output( "5:\tldr r0, 9f\n" ); output( "\tpop {r5-r11,pc}\n" ); - output( "6:\t.long .Lsyscall_table-4b\n" ); - output( "7:\t.long .Lsyscall_args-1b\n" ); + output( "6:\t.long .Lsyscall_table-4b-%u\n", thumb_mode ? 4 : 8 ); + output( "7:\t.long .Lsyscall_args-1b-%u\n", thumb_mode ? 4 : 8 ); output( "8:\t.long %u\n", count ); output( "9:\t.long 0x%x\n", invalid_param ); break; @@ -1731,11 +1731,11 @@ void output_syscalls( DLLSPEC *spec ) output( "\tpush {r4,lr}\n" ); output( "\tldr r4, 3f\n"); output( "\tldr ip, 2f\n"); - output( "\tadd ip, pc\n"); + output( "1:\tadd ip, pc\n" ); output( "\tldr ip, [ip]\n"); - output( "1:\tblx ip\n"); + output( "\tblx ip\n"); output( "\tpop {r4,pc}\n" ); - output( "2:\t.long %s-1b\n", asm_name("__wine_syscall_dispatcher") ); + output( "2:\t.long %s-1b-%u\n", asm_name("__wine_syscall_dispatcher"), thumb_mode ? 4 : 8 ); output( "3:\t.long %u\n", i ); break; case CPU_ARM64: diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 572b4d74ae7..abb94e27c03 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -244,6 +244,8 @@ static void set_target( const char *target ) } free( spec ); + + if (target_cpu == CPU_ARM && target_platform == PLATFORM_WINDOWS) thumb_mode = 1; } /* cleanup on program exit */ diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index a12e7d38aac..6d56cc01b6e 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -249,6 +249,7 @@ static void output_relay_debug( DLLSPEC *spec ) /* then the relay thunks */ output( "\t.text\n" ); + if (thumb_mode) output( "\t.thumb_func\n" ); output( "__wine_spec_relay_entry_points:\n" ); output( "\tnop\n" ); /* to avoid 0 offset */ @@ -306,6 +307,7 @@ static void output_relay_debug( DLLSPEC *spec ) val = (odp->u.func.args_str_offset << 16) | (i - spec->base); output( "\t.align %d\n", get_alignment(4) ); + if (thumb_mode) output( "\t.thumb_func\n" ); output( ".L__wine_spec_relay_entry_point_%d:\n", i ); output_cfi( ".cfi_startproc" ); output( "\tpush {r0-r3}\n" ); @@ -317,13 +319,13 @@ static void output_relay_debug( DLLSPEC *spec ) if (val & mask) output( "\t%s r1,#%u\n", count++ ? "add" : "mov", val & mask ); if (!count) output( "\tmov r1,#0\n" ); output( "\tldr r0, 2f\n"); - output( "\tadd r0, PC\n"); + output( "1:\tadd r0, PC\n"); output( "\tldr IP, [r0, #4]\n"); - output( "1:\tblx IP\n"); + output( "\tblx IP\n"); output( "\tldr IP, [SP, #4]\n" ); output( "\tadd SP, #%u\n", 24 + (has_float ? 64 : 0) ); output( "\tbx IP\n"); - output( "2:\t.long .L__wine_spec_relay_descr-1b\n" ); + output( "2:\t.long .L__wine_spec_relay_descr-1b-%u\n", thumb_mode ? 4 : 8 ); output_cfi( ".cfi_endproc" ); break; } diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 5cffc74accd..1a11d275cb3 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -690,6 +690,11 @@ void output_standard_file_header(void) output( "\t.globl @feat.00\n" ); output( ".set @feat.00, 1\n" ); } + if (thumb_mode) + { + output( "\t.syntax unified\n" ); + output( "\t.thumb\n" ); + } } /* dump a byte stream into the assembly code */ @@ -1119,13 +1124,17 @@ const char *func_declaration( const char *func ) return ""; case PLATFORM_WINDOWS: free( buffer ); - buffer = strmake( ".def %s\n\t.scl 2\n\t.type 32\n\t.endef", asm_name(func) ); + buffer = strmake( ".def %s\n\t.scl 2\n\t.type 32\n\t.endef%s", asm_name(func), + thumb_mode ? "\n\t.thumb_func" : "" ); break; default: free( buffer ); switch(target_cpu) { case CPU_ARM: + buffer = strmake( ".type %s,%%function%s", func, + thumb_mode ? "\n\t.thumb_func" : "" ); + break; case CPU_ARM64: buffer = strmake( ".type %s,%%function", func ); break;

1 0

Zebediah Figura : winegstreamer: Do not call gst_pad_event_default().
by Alexandre Julliard Jan. 19, 2021

Jan. 19, 2021

Module: wine Branch: master Commit: 6fdfacb5bf4e9b2c9f918b957d3da9f903514b25 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6fdfacb5bf4e9b2c9f918b95… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 18 21:57:18 2021 -0600 winegstreamer: Do not call gst_pad_event_default(). This matches the behaviour of GstBaseSrc and GstBaseSink. In particular, we now return FALSE for unhandled source events. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index f45036ae946..a10be5c6e2f 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -645,11 +645,13 @@ static gboolean event_src(GstPad *pad, GstObject *parent, GstEvent *event) IAsyncReader_EndFlush(This->reader); LeaveCriticalSection(&This->filter.csFilter); break; - default: - WARN("Ignoring \"%s\" event.\n", GST_EVENT_TYPE_NAME(event)); case GST_EVENT_QOS: case GST_EVENT_RECONFIGURE: - return gst_pad_event_default(pad, parent, event); + break; + default: + WARN("Ignoring \"%s\" event.\n", GST_EVENT_TYPE_NAME(event)); + ret = FALSE; + break; } gst_event_unref(event); return ret; @@ -729,7 +731,6 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) } default: WARN("Ignoring \"%s\" event.\n", GST_EVENT_TYPE_NAME(event)); - return gst_pad_event_default(pad, parent, event); } gst_event_unref(event); return TRUE;

1 0