July 2021 - Wine-Commits - list.winehq.org

Jacek Caban : gdi32: Use NtGdiArcInternal for Arc implementation.
by Alexandre Julliard July 19, 2021

July 19, 2021

Module: wine Branch: master Commit: c16bf295ccaef7ab75d2ef2d4e482b540a6fe9dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=c16bf295ccaef7ab75d2ef2d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 17 16:56:54 2021 +0200 gdi32: Use NtGdiArcInternal for Arc implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/gdidc.c | 12 ++++++++++++ dlls/gdi32/painting.c | 27 +++++++++++++++++---------- include/ntgdi.h | 8 ++++++++ 3 files changed, 37 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 33adb8ccf82..2fc74d7685b 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -42,3 +42,15 @@ BOOL WINAPI MoveToEx( HDC hdc, INT x, INT y, POINT *pt ) TRACE( "%p, (%d, %d), %p\n", hdc, x, y, pt ); return NtGdiMoveTo( hdc, x, y, pt ); } + +/*********************************************************************** + * Arc (GDI32.@) + */ +BOOL WINAPI Arc( HDC hdc, INT left, INT top, INT right, INT bottom, + INT xstart, INT ystart, INT xend, INT yend ) +{ + TRACE( "%p, (%d, %d)-(%d, %d), (%d, %d), (%d, %d)\n", hdc, left, top, + right, bottom, xstart, ystart, xend, yend ); + return NtGdiArcInternal( NtGdiArc, hdc, left, top, right, bottom, + xstart, ystart, xend, yend ); +} diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index 85c940c7f3d..b235480dacb 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -275,22 +275,29 @@ BOOL WINAPI NtGdiMoveTo( HDC hdc, INT x, INT y, POINT *pt ) /*********************************************************************** - * Arc (GDI32.@) + * NtGdiArcInternal (win32u.@) */ -BOOL WINAPI Arc( HDC hdc, INT left, INT top, INT right, - INT bottom, INT xstart, INT ystart, - INT xend, INT yend ) +BOOL WINAPI NtGdiArcInternal( UINT type, HDC hdc, INT left, INT top, INT right, + INT bottom, INT xstart, INT ystart, INT xend, INT yend ) { PHYSDEV physdev; BOOL ret; - DC * dc = get_dc_ptr( hdc ); - - TRACE( "%p, (%d, %d)-(%d, %d), (%d, %d), (%d, %d)\n", hdc, left, top, right, bottom, xstart, ystart, xend, yend ); + DC *dc; - if (!dc) return FALSE; + if (!(dc = get_dc_ptr( hdc ))) return FALSE; update_dc( dc ); - physdev = GET_DC_PHYSDEV( dc, pArc ); - ret = physdev->funcs->pArc( physdev, left, top, right, bottom, xstart, ystart, xend, yend ); + + switch (type) + { + case NtGdiArc: + physdev = GET_DC_PHYSDEV( dc, pArc ); + ret = physdev->funcs->pArc( physdev, left, top, right, bottom, xstart, ystart, xend, yend ); + break; + default: + WARN( "invalid arc type %u\n", type ); + ret = FALSE; + } + release_dc_ptr( dc ); return ret; } diff --git a/include/ntgdi.h b/include/ntgdi.h index d8adc327548..d90529392d5 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -72,6 +72,14 @@ typedef struct _GDI_SHARED_MEMORY GDI_HANDLE_ENTRY Handles[GDI_MAX_HANDLE_COUNT]; } GDI_SHARED_MEMORY, *PGDI_SHARED_MEMORY; +enum +{ + NtGdiArc, + NtGdiArcTo, + NtGdiChord, + NtGdiPie, +}; + INT WINAPI NtGdiAbortDoc( HDC hdc ); BOOL WINAPI NtGdiAbortPath( HDC hdc ); BOOL WINAPI NtGdiAngleArc( HDC hdc, INT x, INT y, DWORD radius, FLOAT start_angle,

1 0

Francois Gouget : user32/tests: Fix the keyboard layout id in an ok() message.
by Alexandre Julliard July 19, 2021

July 19, 2021

Module: wine Branch: master Commit: 623f9569fdb5647c68cfcb9ba1e938edad534869 URL: https://source.winehq.org/git/wine.git/?a=commit;h=623f9569fdb5647c68cfcb9b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jul 16 16:00:40 2021 +0200 user32/tests: Fix the keyboard layout id in an ok() message. The keyboard layout being tested is not the thread's default keyboard layout. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/input.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 654cabb76d9..08323c4f40e 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -3166,7 +3166,7 @@ static void test_keyboard_layout_name(void) swprintf( tmpklid, KL_NAMELENGTH, L"%08X", layouts_preload[j] ); if (!wcscmp( tmpklid, klid )) break; } - ok(j < len, "Could not find keyboard layout %p in preload list\n", layout); + ok(j < len, "Could not find keyboard layout %s in preload list\n", wine_dbgstr_w(klid)); if (id & 0x80000000) {

1 0

Francois Gouget : oleaut32: Fix the Var*FromStr() prototypes.
by Alexandre Julliard July 19, 2021

July 19, 2021

Module: wine Branch: master Commit: 1e627d11875d00045ecb761b32220fbafb4807e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e627d11875d00045ecb761b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jul 16 17:15:09 2021 +0200 oleaut32: Fix the Var*FromStr() prototypes. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/variant.c | 2 +- dlls/oleaut32/vartype.c | 35 ++++++++++++++++++----------------- include/oleauto.h | 30 +++++++++++++++--------------- 3 files changed, 34 insertions(+), 33 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1e627d11875d00045ecb…

1 0

Francois Gouget : oleaut32/tests: Add more VarParseNumFromStr() tests.
by Alexandre Julliard July 19, 2021

July 19, 2021

Module: wine Branch: master Commit: 54ee0e9bfd70072f00ac2c330ddf853b3439cde8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54ee0e9bfd70072f00ac2c33… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jul 16 17:16:08 2021 +0200 oleaut32/tests: Add more VarParseNumFromStr() tests. Check how it handles currency signs and spaces before and after the digits. Check the combination of thousands separators, spaces and commas. Check handling of regular vs. non-breaking spaces since the latter are often used in some locales. And check what happens in the French locale where spaces and thousands separators are identical and the currency sign comes after the digits and, quite often, a space. Check handling of multi-character currency symbols. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/vartest.c | 480 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 460 insertions(+), 20 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=54ee0e9bfd70072f00ac…

1 0

Francois Gouget : oleaut32/tests: Allow testing VarParseNumFromStr() using Unicode strings.
by Alexandre Julliard July 19, 2021

July 19, 2021

Module: wine Branch: master Commit: 627988565b0d77d88d5c2ba0b1419569274afa2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=627988565b0d77d88d5c2ba0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jul 16 17:16:06 2021 +0200 oleaut32/tests: Allow testing VarParseNumFromStr() using Unicode strings. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/vartest.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 8492a720855..1fec6c33134 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1262,21 +1262,27 @@ static void test_VariantCopyInd(void) "CopyInd(ref->ref): expected E_INVALIDARG, got 0x%08x\n", hres); } -static HRESULT (WINAPI *pVarParseNumFromStr)(OLECHAR*,LCID,ULONG,NUMPARSE*,BYTE*); +static HRESULT (WINAPI *pVarParseNumFromStr)(const OLECHAR*,LCID,ULONG,NUMPARSE*,BYTE*); /* Macros for converting and testing the result of VarParseNumFromStr */ #define FAILDIG 255 -static HRESULT convert_str( const char *str, INT dig, ULONG flags, +static HRESULT wconvert_str( const OLECHAR *str, INT dig, ULONG flags, NUMPARSE *np, BYTE rgb[128], LCID lcid ) { - OLECHAR buff[128]; - MultiByteToWideChar( CP_ACP,0, str, -1, buff, ARRAY_SIZE( buff )); memset( rgb, FAILDIG, 128 ); memset( np, 255, sizeof(*np) ); np->cDig = dig; np->dwInFlags = flags; - return pVarParseNumFromStr( buff, lcid, LOCALE_NOUSEROVERRIDE, np, rgb); + return pVarParseNumFromStr( str, lcid, LOCALE_NOUSEROVERRIDE, np, rgb); +} + +static HRESULT convert_str( const char *str, INT dig, ULONG flags, + NUMPARSE *np, BYTE rgb[128], LCID lcid ) +{ + OLECHAR buff[128]; + MultiByteToWideChar( CP_ACP,0, str, -1, buff, ARRAY_SIZE( buff )); + return wconvert_str(buff, dig, flags, np, rgb, lcid); } static void expect_NumFromStr( int line, HRESULT hres, NUMPARSE *np, INT a, ULONG b, ULONG c, @@ -1293,6 +1299,8 @@ static void expect_NumFromStr( int line, HRESULT hres, NUMPARSE *np, INT a, ULON } } +#define WCONVERTN(str,dig,flags) hres = wconvert_str( str, dig, flags, &np, rgb, lcid ) +#define WCONVERT(str,flags) WCONVERTN(str,sizeof(rgb),flags) #define CONVERTN(str,dig,flags) hres = convert_str( str, dig, flags, &np, rgb, lcid ) #define CONVERT(str,flags) CONVERTN(str,sizeof(rgb),flags) #define EXPECT(a,b,c,d,e,f) expect_NumFromStr( __LINE__, hres, &np, a, b, c, d, e, f ) @@ -1307,7 +1315,6 @@ static void test_VarParseNumFromStr(void) LCID lcid = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT); NUMPARSE np; BYTE rgb[128]; - WCHAR str[128]; /** No flags **/ @@ -1731,10 +1738,9 @@ static void test_VarParseNumFromStr(void) EXPECT(1,NUMPRS_STD,NUMPRS_DECIMAL,4,0,-1); EXPECT2(1,0); - str[0] = 0x0660; - str[1] = 0; - hres = pVarParseNumFromStr(str, lcid, LOCALE_NOUSEROVERRIDE, &np, rgb); - ok(hres == DISP_E_TYPEMISMATCH, "VarParseNumFromStr returned %08x\n", hres); + /* Arabic numerals are not allowed "0" */ + WCONVERT(L"\x660", NUMPRS_STD); + EXPECTFAIL; } static HRESULT (WINAPI *pVarNumFromParseNum)(NUMPARSE*,BYTE*,ULONG,VARIANT*);

1 0

Zebediah Figura : ntdll: Use a separate +unwind debug channel for unwinding on x86-64.
by Alexandre Julliard July 19, 2021

July 19, 2021

Module: wine Branch: master Commit: dae60a374ed7122052a4a18837cf12a81dd75c1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=dae60a374ed7122052a4a188… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jul 16 12:37:18 2021 -0500 ntdll: Use a separate +unwind debug channel for unwinding on x86-64. Constant spam from unwinding routines makes +seh logs hard to read, especially for programs that throw a lot of exceptions as part of normal execution. Since unwind information is rarely useful, don't display it unless specifically requested. Make +unwind the default channel in these files, though, since there are more unwind messages than exception messages. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 74 +++++++++++++++++++++-------------------- dlls/ntdll/unix/signal_x86_64.c | 41 ++++++++++++----------- 2 files changed, 59 insertions(+), 56 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dae60a374ed7122052a4…

1 0

Hugh McMaster : reg/tests: Use correct file and line arguments with delete_file().
by Alexandre Julliard July 19, 2021

July 19, 2021

Module: wine Branch: master Commit: 0b5ba1d0be04f7c6bc0e53e9a28984cf2941b4bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b5ba1d0be04f7c6bc0e53e9… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jul 15 23:36:11 2021 +1000 reg/tests: Use correct file and line arguments with delete_file(). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/export.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/reg/tests/export.c b/programs/reg/tests/export.c index 31a75566fae..0a460e08bcb 100644 --- a/programs/reg/tests/export.c +++ b/programs/reg/tests/export.c @@ -50,7 +50,7 @@ BOOL compare_export_(const char *file, unsigned line, const char *filename, todo_wine_if (todo & TODO_REG_COMPARE) lok(!lstrcmpW(fbuf, wstr), "export data does not match expected data\n"); - ret = delete_file(filename); + ret = delete_file_(file, line, filename); exit: HeapFree(GetProcessHeap(), 0, fbuf);

1 0

Nikolay Sivov : mf/session: Forward MR_POLICY_VOLUME_SERVICE service requests to the SAR node.
by Alexandre Julliard July 19, 2021

July 19, 2021

Module: wine Branch: master Commit: 8b6f2762907b907034ce2f4ebc5f66706beb54d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b6f2762907b907034ce2f4e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 12 15:21:19 2021 +0300 mf/session: Forward MR_POLICY_VOLUME_SERVICE service requests to the SAR node. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/mf_private.h | 1 + dlls/mf/sar.c | 5 +++++ dlls/mf/session.c | 51 +++++++++++++++++++++++++++++++++++++++++++-------- 3 files changed, 49 insertions(+), 8 deletions(-) diff --git a/dlls/mf/mf_private.h b/dlls/mf/mf_private.h index 2f81eaa13b0..db6f101cd6d 100644 --- a/dlls/mf/mf_private.h +++ b/dlls/mf/mf_private.h @@ -80,4 +80,5 @@ static inline const char *debugstr_time(LONGLONG time) } extern BOOL mf_is_sample_copier_transform(IMFTransform *transform) DECLSPEC_HIDDEN; +extern BOOL mf_is_sar_sink(IMFMediaSink *sink) DECLSPEC_HIDDEN; extern HRESULT topology_node_get_object(IMFTopologyNode *node, REFIID riid, void **obj) DECLSPEC_HIDDEN; diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index e35531acb71..f6f2b32dd2d 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -1915,6 +1915,11 @@ failed: return hr; } +BOOL mf_is_sar_sink(IMFMediaSink *sink) +{ + return sink->lpVtbl == &audio_renderer_sink_vtbl; +} + static void sar_shutdown_object(void *user_context, IUnknown *obj) { IMFMediaSink *sink; diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 9e8429fa8ac..df7a987bc55 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -1952,18 +1952,36 @@ static ULONG WINAPI session_get_service_Release(IMFGetService *iface) return IMFMediaSession_Release(&session->IMFMediaSession_iface); } -static HRESULT session_get_video_render_service(struct media_session *session, REFGUID service, - REFIID riid, void **obj) +typedef BOOL (*p_renderer_node_test_func)(IMFMediaSink *sink); + +static BOOL session_video_renderer_test_func(IMFMediaSink *sink) +{ + IUnknown *obj; + HRESULT hr; + + /* Use first sink to support IMFVideoRenderer. */ + hr = IMFMediaSink_QueryInterface(sink, &IID_IMFVideoRenderer, (void **)&obj); + if (obj) + IUnknown_Release(obj); + + return hr == S_OK; +} + +static BOOL session_audio_renderer_test_func(IMFMediaSink *sink) +{ + return mf_is_sar_sink(sink); +} + +static HRESULT session_get_renderer_node_service(struct media_session *session, + p_renderer_node_test_func node_test_func, REFGUID service, REFIID riid, void **obj) { IMFStreamSink *stream_sink; IMFTopologyNode *node; IMFCollection *nodes; IMFMediaSink *sink; unsigned int i = 0; - IUnknown *vr; HRESULT hr = E_FAIL; - /* Use first sink to support IMFVideoRenderer. */ if (session->presentation.current_topology) { if (SUCCEEDED(IMFTopology_GetOutputNodeCollection(session->presentation.current_topology, @@ -1975,11 +1993,10 @@ static HRESULT session_get_video_render_service(struct media_session *session, R { if (SUCCEEDED(IMFStreamSink_GetMediaSink(stream_sink, &sink))) { - if (SUCCEEDED(IMFMediaSink_QueryInterface(sink, &IID_IMFVideoRenderer, (void **)&vr))) + if (node_test_func(sink)) { - if (FAILED(hr = MFGetService(vr, service, riid, obj))) - WARN("Failed to get service from video renderer %#x.\n", hr); - IUnknown_Release(vr); + if (FAILED(hr = MFGetService((IUnknown *)sink, service, riid, obj))) + WARN("Failed to get service from renderer node, %#x.\n", hr); } } IMFStreamSink_Release(stream_sink); @@ -1998,6 +2015,20 @@ static HRESULT session_get_video_render_service(struct media_session *session, R return hr; } +static HRESULT session_get_audio_render_service(struct media_session *session, REFGUID service, + REFIID riid, void **obj) +{ + return session_get_renderer_node_service(session, session_audio_renderer_test_func, + service, riid, obj); +} + +static HRESULT session_get_video_render_service(struct media_session *session, REFGUID service, + REFIID riid, void **obj) +{ + return session_get_renderer_node_service(session, session_video_renderer_test_func, + service, riid, obj); +} + static HRESULT WINAPI session_get_service_GetService(IMFGetService *iface, REFGUID service, REFIID riid, void **obj) { struct media_session *session = impl_from_IMFGetService(iface); @@ -2040,6 +2071,10 @@ static HRESULT WINAPI session_get_service_GetService(IMFGetService *iface, REFGU { hr = session_get_video_render_service(session, service, riid, obj); } + else if (IsEqualGUID(service, &MR_POLICY_VOLUME_SERVICE)) + { + hr = session_get_audio_render_service(session, service, riid, obj); + } else FIXME("Unsupported service %s.\n", debugstr_guid(service));

1 0

Jactry Zeng : gdi32: Fix a typo in unix_face_create().
by Alexandre Julliard July 19, 2021

July 19, 2021

Module: wine Branch: master Commit: aee7d560ae1834cb1a66c9057a230c6d56d9a943 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aee7d560ae1834cb1a66c905… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Jul 12 20:55:32 2021 +0800 gdi32: Fix a typo in unix_face_create(). This also fixes test failures in test_lang_names() when on Japanese system. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51382 Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 490e4c501aa..ee14bd25119 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1245,7 +1245,7 @@ static struct unix_face *unix_face_create( const char *unix_name, void *data_ptr This->style_name = decode_opentype_name( &style_name.face_name ); memset( &full_name, 0, sizeof(full_name) ); - style_name.primary_langid = primary_langid; + full_name.primary_langid = primary_langid; opentype_enum_full_names( tt_name_v0, search_face_name_callback, &full_name ); This->full_name = decode_opentype_name( &full_name.face_name );

1 0

Zebediah Figura : d3d11: Fail OMSetRenderTargets() if any of the views have the wrong binding flags.
by Alexandre Julliard July 19, 2021

July 19, 2021

Module: wine Branch: master Commit: 1124edd281a6b38b355481174ca8656244facae6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1124edd281a6b38b35548117… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jul 15 00:18:33 2021 -0500 d3d11: Fail OMSetRenderTargets() if any of the views have the wrong binding flags. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 53 ++++++++++++++++------------- dlls/d3d8/device.c | 3 +- dlls/d3d9/device.c | 2 +- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/device.c | 13 ++++--- dlls/ddraw/surface.c | 7 ++-- dlls/wined3d/device.c | 86 +++++++++++++++++++++++++---------------------- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 4 +-- 9 files changed, 94 insertions(+), 78 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1124edd281a6b38b3554…

1 0