January 2008 - Wine-commits

Francois Gouget : advapi32: RegGetValueW() must return the required buffer size in bytes, not WCHARs.
by Alexandre Julliard 11 Jan '08

11 Jan '08

Module: wine Branch: master Commit: d9a06b236aa1f1dd20105128b0ba98013c8abc2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9a06b236aa1f1dd20105128b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jan 11 09:52:05 2008 +0100 advapi32: RegGetValueW() must return the required buffer size in bytes, not WCHARs. --- dlls/advapi32/registry.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index dec2e4a..dda68e2 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -1504,7 +1504,7 @@ LSTATUS WINAPI RegGetValueW( HKEY hKey, LPCWSTR pszSubKey, LPCWSTR pszValue, if (dwType == REG_EXPAND_SZ) { cbData = ExpandEnvironmentStringsW(pvBuf, pvData, - pcbData ? *pcbData : 0); + pcbData ? *pcbData : 0) * sizeof(WCHAR); dwType = REG_SZ; if(pvData && pcbData && cbData > *pcbData) ret = ERROR_MORE_DATA;

1 0

Alistair Leslie-Hughes : msxml3: Fix memory leak in test.
by Alexandre Julliard 11 Jan '08

11 Jan '08

Module: wine Branch: master Commit: 8e1e3e5c51a476758726f79676ad7b34ec0eb9e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e1e3e5c51a476758726f7967… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jan 11 13:51:03 2008 +1100 msxml3: Fix memory leak in test. --- dlls/msxml3/tests/domdoc.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 3038858..8ba8609 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1988,6 +1988,8 @@ static void test_xmlTypes(void) } IXMLDOMDocument_Release(doc); + + free_bstrs(); } START_TEST(domdoc)

1 0

Marcus Meissner : msxml3: Move potential NULL ptr derefs into their if () case.
by Alexandre Julliard 11 Jan '08

11 Jan '08

Module: wine Branch: master Commit: 9bccd06bf91544f7137271f7973b69b5d01ea0c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bccd06bf91544f7137271f79… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Jan 11 09:15:41 2008 +0100 msxml3: Move potential NULL ptr derefs into their if () case. --- dlls/msxml3/tests/domdoc.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 8ba8609..19a3dc1 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -531,8 +531,8 @@ static void test_domdoc( void ) r = IXMLDOMText_get_attributes( nodetext, &pAttribs); ok(r == S_FALSE, "ret %08x\n", r ); ok( pAttribs == NULL, "pAttribs not NULL\n"); + IXMLDOMText_Release( nodetext ); } - IXMLDOMText_Release( nodetext ); SysFreeString( str ); /* test Create Comment */ @@ -550,8 +550,8 @@ static void test_domdoc( void ) r = IXMLDOMComment_get_lastChild(node_comment, &nodeChild); ok(r == S_FALSE, "ret %08x\n", r ); ok(nodeChild == NULL, "pLastChild not NULL\n"); + IXMLDOMText_Release( node_comment ); } - IXMLDOMText_Release( node_comment ); /* test Create Attribute */ r = IXMLDOMDocument_createAttribute(doc, NULL, NULL); @@ -582,8 +582,8 @@ static void test_domdoc( void ) r = IXMLDOMProcessingInstruction_get_lastChild(nodePI, &nodeChild); ok(r == S_FALSE, "ret %08x\n", r ); ok(nodeChild == NULL, "nodeChild not NULL\n"); + IXMLDOMProcessingInstruction_Release(nodePI); } - IXMLDOMProcessingInstruction_Release(nodePI); r = IXMLDOMDocument_Release( doc ); ok( r == 0, "document ref count incorrect\n");

1 0

Francois Gouget : advapi32: RegGetValue() should not return an error when expanding a string and given a NULL buffer and a zero size .
by Alexandre Julliard 11 Jan '08

11 Jan '08

Module: wine Branch: master Commit: c47c6483aa680b94ec0d9c4acc9b50b26c0b771c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c47c6483aa680b94ec0d9c4ac… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jan 11 09:49:48 2008 +0100 advapi32: RegGetValue() should not return an error when expanding a string and given a NULL buffer and a zero size. Adjust the tests to cover this case for REG_EXPAND_SZ registry values. Improve the documentation a bit. --- dlls/advapi32/registry.c | 17 +++++++++-------- dlls/advapi32/tests/registry.c | 2 +- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index d7f6dc4..dec2e4a 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -1417,8 +1417,8 @@ static VOID ADVAPI_ApplyRestrictions( DWORD dwFlags, DWORD dwType, /****************************************************************************** * RegGetValueW [ADVAPI32.@] * - * Retrieves the type and data for a value name associated with a key - * optionally expanding it's content and restricting it's type. + * Retrieves the type and data for a value name associated with a key, + * optionally expanding its content and restricting its type. * * PARAMS * hKey [I] Handle to an open key. @@ -1427,16 +1427,17 @@ static VOID ADVAPI_ApplyRestrictions( DWORD dwFlags, DWORD dwType, * dwFlags [I] Flags restricting the value type to retrieve. * pdwType [O] Destination for the values type, may be NULL. * pvData [O] Destination for the values content, may be NULL. - * pcbData [I/O] Size of pvData, updated with the size required to - * retrieve the whole content. + * pcbData [I/O] Size of pvData, updated with the size in bytes required to + * retrieve the whole content, including the trailing '\0' + * for strings. * * RETURNS * Success: ERROR_SUCCESS * Failure: nonzero error code from Winerror.h * * NOTES - * - Unless RRF_NOEXPAND is specified REG_EXPAND_SZ is automatically expanded - * and REG_SZ is retrieved instead. + * - Unless RRF_NOEXPAND is specified, REG_EXPAND_SZ values are automatically + * expanded and pdwType is set to REG_SZ instead. * - Restrictions are applied after expanding, using RRF_RT_REG_EXPAND_SZ * without RRF_NOEXPAND is thus not allowed. */ @@ -1505,7 +1506,7 @@ LSTATUS WINAPI RegGetValueW( HKEY hKey, LPCWSTR pszSubKey, LPCWSTR pszValue, cbData = ExpandEnvironmentStringsW(pvBuf, pvData, pcbData ? *pcbData : 0); dwType = REG_SZ; - if(pcbData && cbData > *pcbData) + if(pvData && pcbData && cbData > *pcbData) ret = ERROR_MORE_DATA; } else if (pvData) @@ -1600,7 +1601,7 @@ LSTATUS WINAPI RegGetValueA( HKEY hKey, LPCSTR pszSubKey, LPCSTR pszValue, cbData = ExpandEnvironmentStringsA(pvBuf, pvData, pcbData ? *pcbData : 0); dwType = REG_SZ; - if(pcbData && cbData > *pcbData) + if(pvData && pcbData && cbData > *pcbData) ret = ERROR_MORE_DATA; } else if (pvData) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 2ca2424..11ec71d 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -710,7 +710,7 @@ static void test_get_value(void) ok(!strcmp(sTestpath1, buf), "sTestpath=\"%s\" buf=\"%s\"\n", sTestpath1, buf); /* Query REG_EXPAND_SZ using RRF_RT_REG_SZ and no buffer (ok, expands) */ - size = 0xbadbeef; + size = 0; ret = pRegGetValueA(hkey_main, NULL, "TP1_EXP_SZ", RRF_RT_REG_SZ, NULL, NULL, &size); ok(ret == ERROR_SUCCESS, "ret=%d\n", ret); /* At least v5.2.3790.1830 (2003 SP1) returns the unexpanded sTestpath1 length + 1 here. */

1 0

Andrew Talbot : mapi32: Remove unneeded cast.
by Alexandre Julliard 11 Jan '08

11 Jan '08

Module: wine Branch: master Commit: d6a3ee17ad5eb546b38861ed3600bf5d45bd61bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6a3ee17ad5eb546b38861ed3… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Jan 10 22:11:20 2008 +0000 mapi32: Remove unneeded cast. --- dlls/mapi32/prop.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mapi32/prop.c b/dlls/mapi32/prop.c index e58df4d..18e8013 100644 --- a/dlls/mapi32/prop.c +++ b/dlls/mapi32/prop.c @@ -1331,7 +1331,7 @@ ULONG WINAPI FBadProp(LPSPropValue lpProp) return FBadRglpszW(lpProp->Value.MVszW.lppszW, lpProp->Value.MVszW.cValues); case PT_MV_BINARY: - return FBadEntryList((LPENTRYLIST)&lpProp->Value.MVbin); + return FBadEntryList(&lpProp->Value.MVbin); } return FALSE; }

1 0

Andrew Talbot : mscms: Remove unneeded casts.
by Alexandre Julliard 11 Jan '08

11 Jan '08

Module: wine Branch: master Commit: aa5905b1db1a39070596e9c64c4fc516c6c6a435 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa5905b1db1a39070596e9c64… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Jan 10 22:11:24 2008 +0000 mscms: Remove unneeded casts. --- dlls/mscms/icc.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mscms/icc.c b/dlls/mscms/icc.c index ffdd3e5..3b0ec22 100644 --- a/dlls/mscms/icc.c +++ b/dlls/mscms/icc.c @@ -80,8 +80,8 @@ void MSCMS_get_tag_by_index( icProfile *iccprofile, DWORD index, icTag *tag ) tag->size = tmp->size; MSCMS_adjust_endianess32( (ULONG *)&tag->sig ); - MSCMS_adjust_endianess32( (ULONG *)&tag->offset ); - MSCMS_adjust_endianess32( (ULONG *)&tag->size ); + MSCMS_adjust_endianess32( &tag->offset ); + MSCMS_adjust_endianess32( &tag->size ); } void MSCMS_get_tag_data( const icProfile *iccprofile, const icTag *tag, DWORD offset, void *buffer ) @@ -98,7 +98,7 @@ DWORD MSCMS_get_profile_size( const icProfile *iccprofile ) { DWORD size = ((const icHeader *)iccprofile)->size; - MSCMS_adjust_endianess32( (ULONG *)&size ); + MSCMS_adjust_endianess32( &size ); return size; }

1 0

Dmitry Timoshkov : gdi32: Fix a GdiFont leak.
by Alexandre Julliard 11 Jan '08

11 Jan '08

Module: wine Branch: master Commit: f542511209ae4d642c4cc4b350954e6bc9977f2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f542511209ae4d642c4cc4b35… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Jan 10 21:18:36 2008 +0800 gdi32: Fix a GdiFont leak. --- dlls/gdi32/freetype.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 2de49d4..067d41f 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3262,7 +3262,7 @@ static void GetEnumStructs(Face *face, LPENUMLOGFONTEXW pelf, OUTLINETEXTMETRICW *potm = NULL; UINT size; TEXTMETRICW tm, *ptm; - GdiFont *font = alloc_font(); + GdiFont *font; LONG width, height; if (face->cache_valid) @@ -3274,6 +3274,8 @@ static void GetEnumStructs(Face *face, LPENUMLOGFONTEXW pelf, return; } + font = alloc_font(); + if(face->scalable) { height = 100; width = 0;

1 0

Dmitry Timoshkov : gdi32: Simplify GetEnumStructs.
by Alexandre Julliard 11 Jan '08

11 Jan '08

Module: wine Branch: master Commit: 4a8f9347bdafeab3a900532a5d175a20fc214136 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a8f9347bdafeab3a900532a5… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Jan 11 17:04:26 2008 +0800 gdi32: Simplify GetEnumStructs. --- dlls/gdi32/freetype.c | 97 ++++++++++++++++++------------------------------- 1 files changed, 36 insertions(+), 61 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 067d41f..c7eb061 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3259,9 +3259,6 @@ BOOL WineEngDestroyFontInstance(HFONT handle) static void GetEnumStructs(Face *face, LPENUMLOGFONTEXW pelf, NEWTEXTMETRICEXW *pntm, LPDWORD ptype) { - OUTLINETEXTMETRICW *potm = NULL; - UINT size; - TEXTMETRICW tm, *ptm; GdiFont *font; LONG width, height; @@ -3295,73 +3292,26 @@ static void GetEnumStructs(Face *face, LPENUMLOGFONTEXW pelf, memset(&pelf->elfLogFont, 0, sizeof(LOGFONTW)); - size = WineEngGetOutlineTextMetrics(font, 0, NULL); - if(size) { - potm = HeapAlloc(GetProcessHeap(), 0, size); - WineEngGetOutlineTextMetrics(font, size, potm); - ptm = &potm->otmTextMetrics; - } else { - WineEngGetTextMetrics(font, &tm); - ptm = &tm; - } - - pntm->ntmTm.tmHeight = pelf->elfLogFont.lfHeight = ptm->tmHeight; - pntm->ntmTm.tmAscent = ptm->tmAscent; - pntm->ntmTm.tmDescent = ptm->tmDescent; - pntm->ntmTm.tmInternalLeading = ptm->tmInternalLeading; - pntm->ntmTm.tmExternalLeading = ptm->tmExternalLeading; - pntm->ntmTm.tmAveCharWidth = pelf->elfLogFont.lfWidth = ptm->tmAveCharWidth; - pntm->ntmTm.tmMaxCharWidth = ptm->tmMaxCharWidth; - pntm->ntmTm.tmWeight = pelf->elfLogFont.lfWeight = ptm->tmWeight; - pntm->ntmTm.tmOverhang = ptm->tmOverhang; - pntm->ntmTm.tmDigitizedAspectX = ptm->tmDigitizedAspectX; - pntm->ntmTm.tmDigitizedAspectY = ptm->tmDigitizedAspectY; - pntm->ntmTm.tmFirstChar = ptm->tmFirstChar; - pntm->ntmTm.tmLastChar = ptm->tmLastChar; - pntm->ntmTm.tmDefaultChar = ptm->tmDefaultChar; - pntm->ntmTm.tmBreakChar = ptm->tmBreakChar; - pntm->ntmTm.tmItalic = pelf->elfLogFont.lfItalic = ptm->tmItalic; - pntm->ntmTm.tmUnderlined = pelf->elfLogFont.lfUnderline = ptm->tmUnderlined; - pntm->ntmTm.tmStruckOut = pelf->elfLogFont.lfStrikeOut = ptm->tmStruckOut; - pntm->ntmTm.tmPitchAndFamily = ptm->tmPitchAndFamily; - pelf->elfLogFont.lfPitchAndFamily = (ptm->tmPitchAndFamily & 0xf1) + 1; - pntm->ntmTm.tmCharSet = pelf->elfLogFont.lfCharSet = ptm->tmCharSet; - pelf->elfLogFont.lfOutPrecision = OUT_STROKE_PRECIS; - pelf->elfLogFont.lfClipPrecision = CLIP_STROKE_PRECIS; - pelf->elfLogFont.lfQuality = DRAFT_QUALITY; - - *ptype = 0; - if (ptm->tmPitchAndFamily & TMPF_TRUETYPE) - *ptype |= TRUETYPE_FONTTYPE; - if (ptm->tmPitchAndFamily & TMPF_DEVICE) - *ptype |= DEVICE_FONTTYPE; - if(!(ptm->tmPitchAndFamily & TMPF_VECTOR)) - *ptype |= RASTER_FONTTYPE; - - pntm->ntmTm.ntmFlags = ptm->tmItalic ? NTM_ITALIC : 0; - if(ptm->tmWeight > 550) pntm->ntmTm.ntmFlags |= NTM_BOLD; - if(pntm->ntmTm.ntmFlags == 0) pntm->ntmTm.ntmFlags = NTM_REGULAR; - pntm->ntmTm.ntmFlags |= face->ntmFlags; - - pntm->ntmTm.ntmCellHeight = pntm->ntmTm.tmHeight; - pntm->ntmTm.ntmAvgWidth = pntm->ntmTm.tmAveCharWidth; - memset(&pntm->ntmFontSig, 0, sizeof(FONTSIGNATURE)); + if (WineEngGetOutlineTextMetrics(font, 0, NULL)) + { + memcpy(&pntm->ntmTm, &font->potm->otmTextMetrics, sizeof(TEXTMETRICW)); - if(potm) { - pntm->ntmTm.ntmSizeEM = potm->otmEMSquare; + pntm->ntmTm.ntmSizeEM = font->potm->otmEMSquare; lstrcpynW(pelf->elfLogFont.lfFaceName, - (WCHAR*)((char*)potm + (ptrdiff_t)potm->otmpFamilyName), + (WCHAR*)((char*)font->potm + (ULONG_PTR)font->potm->otmpFamilyName), LF_FACESIZE); lstrcpynW(pelf->elfFullName, - (WCHAR*)((char*)potm + (ptrdiff_t)potm->otmpFaceName), + (WCHAR*)((char*)font->potm + (ULONG_PTR)font->potm->otmpFaceName), LF_FULLFACESIZE); lstrcpynW(pelf->elfStyle, - (WCHAR*)((char*)potm + (ptrdiff_t)potm->otmpStyleName), + (WCHAR*)((char*)font->potm + (ULONG_PTR)font->potm->otmpStyleName), LF_FACESIZE); + } + else + { + WineEngGetTextMetrics(font, (TEXTMETRICW *)&pntm->ntmTm); - HeapFree(GetProcessHeap(), 0, potm); - } else { pntm->ntmTm.ntmSizeEM = pntm->ntmTm.tmHeight - pntm->ntmTm.tmInternalLeading; lstrcpynW(pelf->elfLogFont.lfFaceName, face->family->FamilyName, LF_FACESIZE); @@ -3369,8 +3319,33 @@ static void GetEnumStructs(Face *face, LPENUMLOGFONTEXW pelf, pelf->elfStyle[0] = '\0'; } + pntm->ntmTm.ntmFlags = face->ntmFlags; + pntm->ntmTm.ntmCellHeight = pntm->ntmTm.tmHeight; + pntm->ntmTm.ntmAvgWidth = pntm->ntmTm.tmAveCharWidth; + memset(&pntm->ntmFontSig, 0, sizeof(FONTSIGNATURE)); + pelf->elfScript[0] = '\0'; /* This will get set in WineEngEnumFonts */ + pelf->elfLogFont.lfHeight = pntm->ntmTm.tmHeight; + pelf->elfLogFont.lfWidth = pntm->ntmTm.tmAveCharWidth; + pelf->elfLogFont.lfWeight = pntm->ntmTm.tmWeight; + pelf->elfLogFont.lfItalic = pntm->ntmTm.tmItalic; + pelf->elfLogFont.lfUnderline = pntm->ntmTm.tmUnderlined; + pelf->elfLogFont.lfStrikeOut = pntm->ntmTm.tmStruckOut; + pelf->elfLogFont.lfCharSet = pntm->ntmTm.tmCharSet; + pelf->elfLogFont.lfOutPrecision = OUT_STROKE_PRECIS; + pelf->elfLogFont.lfClipPrecision = CLIP_STROKE_PRECIS; + pelf->elfLogFont.lfQuality = DRAFT_QUALITY; + pelf->elfLogFont.lfPitchAndFamily = (pntm->ntmTm.tmPitchAndFamily & 0xf1) + 1; + + *ptype = 0; + if (pntm->ntmTm.tmPitchAndFamily & TMPF_TRUETYPE) + *ptype |= TRUETYPE_FONTTYPE; + if (pntm->ntmTm.tmPitchAndFamily & TMPF_DEVICE) + *ptype |= DEVICE_FONTTYPE; + if(!(pntm->ntmTm.tmPitchAndFamily & TMPF_VECTOR)) + *ptype |= RASTER_FONTTYPE; + memcpy(&face->elf,pelf,sizeof(ENUMLOGFONTEXW)); memcpy(&face->ntm,pntm,sizeof(NEWTEXTMETRICEXW)); face->type = *ptype;

1 0

Louis Lenders : shdocvw: Change return value for PersistMemory_Load.
by Alexandre Julliard 11 Jan '08

11 Jan '08

Module: wine Branch: master Commit: 8e84f38178c1105cb682a745ccf32fe3bfda6d0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e84f38178c1105cb682a745c… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Thu Jan 10 13:25:23 2008 +0000 shdocvw: Change return value for PersistMemory_Load. --- dlls/shdocvw/persist.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/persist.c b/dlls/shdocvw/persist.c index 940dd16..6c4f1e5 100644 --- a/dlls/shdocvw/persist.c +++ b/dlls/shdocvw/persist.c @@ -155,7 +155,7 @@ static HRESULT WINAPI PersistMemory_Load(IPersistMemory *iface, LPVOID pMem, ULO { WebBrowser *This = PERMEMORY_THIS(iface); FIXME("(%p)->(%p %x)\n", This, pMem, cbSize); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI PersistMemory_Save(IPersistMemory *iface, LPVOID pMem,

1 0

Aric Stewart : fonts: Add Japanese small font.
by Alexandre Julliard 11 Jan '08

11 Jan '08

Module: wine Branch: master Commit: 0904e34906ccc3c76f8ea2e99faade9dd2feba20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0904e34906ccc3c76f8ea2e99… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jan 10 08:01:14 2008 -0600 fonts: Add Japanese small font. --- fonts/.gitignore | 1 + fonts/Makefile.in | 6 +- fonts/small_fonts_jp.sfd | 1637 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1641 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0904e34906ccc3c76f8ea…

1 0