June 2022 - Wine-Devel - list.winehq.org

[PATCH 2/3] dlls/xmllite: Handle possible memory allocation failures

by David Kahurani

From: David Kahurani <k.kahurani(a)gmail.com> Signed-off-by: David Kahurani <k.kahurani(a)gmail.com> --- dlls/xmllite/writer.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index 58d9edea059..c2766a21ed5 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -180,6 +180,13 @@ static struct element *alloc_element(xmlwriter *writer, const WCHAR *prefix, con len += lstrlenW(local); ret->qname = writer_alloc(writer, (len + 1)*sizeof(WCHAR)); + + if (!ret->qname) + { + writer_free(writer, ret); + return NULL; + } + ret->len = len; if (prefix) { @@ -249,7 +256,8 @@ static WCHAR *writer_strndupW(const xmlwriter *writer, const WCHAR *str, int len size = (len + 1) * sizeof(WCHAR); ret = writer_alloc(writer, size); - memcpy(ret, str, size); + if (ret) memcpy(ret, str, size); + return ret; } @@ -941,6 +949,7 @@ static HRESULT WINAPI xmlwriter_WriteAttributeString(IXmlWriter *iface, LPCWSTR return S_OK; } + //TODO /* Ignore prefix is URI wasn't specified. */ if (is_xmlns_local && is_empty_string(uri)) { -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/281

June 20, 2022

[PATCH 1/3] dlls/xmllite: Avoid memory leak on error path

by David Kahurani

From: David Kahurani <k.kahurani(a)gmail.com> attr->value should not be freed as it was not allocated attr->localname should instead having just being previously allocated and not freed anywhere else Signed-off-by: David Kahurani <k.kahurani(a)gmail.com> --- dlls/xmllite/reader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 4045b4dfcca..d99f121e0cb 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -424,7 +424,7 @@ static HRESULT reader_add_attr(xmlreader *reader, strval *prefix, strval *localn { hr = reader_strvaldup(reader, value, &attr->value); if (hr != S_OK) - reader_free_strvalued(reader, &attr->value); + reader_free_strvalued(reader, &attr->localname); } if (hr != S_OK) { -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/281

June 20, 2022

[PATCH 0/3] MR281: A few fixes in xmllite

by David Kahurani (＠kahurani)

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/281

June 20, 2022

Re: [PATCH 0/1] MR280: include: Add definition of ScriptPlaceOpenType(). - approved

by Nikolay Sivov (＠nsivov)

This merge request was approved by Nikolay Sivov. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/280

June 20, 2022

Re: [PATCH 0/2] MR269: ntdll: Respect zero_bits when mapping a builtin or native PE file.

by Alexandre Julliard (＠julliard)

For native dlls you should create a dummy dll with a 64-bit base address. I'd suggest adding it to kernel32:loader which already has the necessary infrastructure. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/269#note_2336

June 20, 2022

[PATCH 1/1] include: Add definition of ScriptPlaceOpenType().

by Jactry Zeng

From: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- include/usp10.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/usp10.h b/include/usp10.h index db18a5b409e..00f2fc2f2d4 100644 --- a/include/usp10.h +++ b/include/usp10.h @@ -285,6 +285,11 @@ HRESULT WINAPI ScriptShapeOpenType(HDC hdc, SCRIPT_CACHE *psc, SCRIPT_ANALYSIS * int *pcGlyphs); HRESULT WINAPI ScriptPlace(HDC hdc, SCRIPT_CACHE *psc, const WORD *pwGlyphs, int cGlyphs, const SCRIPT_VISATTR *psva, SCRIPT_ANALYSIS *psa, int *piAdvance, GOFFSET *pGoffset, ABC *pABC ); +HRESULT WINAPI ScriptPlaceOpenType(HDC hdc, SCRIPT_CACHE *psc, SCRIPT_ANALYSIS *psa, OPENTYPE_TAG tagScript, + OPENTYPE_TAG tagLangSys, int *rcRangeChars, TEXTRANGE_PROPERTIES **rpRangeProperties, + int cRanges, const WCHAR *pwcChars, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProps, + int cChars, const WORD *pwGlyphs, const SCRIPT_GLYPHPROP *pGlyphProps, int cGlyphs, + int *piAdvance, GOFFSET *pGoffset, ABC *pABC); HRESULT WINAPI ScriptBreak(const WCHAR *pwcChars, int cChars, const SCRIPT_ANALYSIS *psa, SCRIPT_LOGATTR *psla); HRESULT WINAPI ScriptCacheGetHeight(HDC hdc, SCRIPT_CACHE *psc, LONG *tmHeight); HRESULT WINAPI ScriptCPtoX(int iCP, BOOL fTrailing, int cChars, int cGlyphs, const WORD *pwLogClust, const SCRIPT_VISATTR *psva, -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/280

June 20, 2022

[PATCH 0/1] MR280: include: Add definition of ScriptPlaceOpenType().

by Jactry Zeng (＠jactry)

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/280

June 20, 2022

Re: [PATCH 0/1] MR277: cmd: Handle lines with just spaces in bracket blocks.

by eric pouech (＠epo)

On Mon Jun 20 07:36:40 2022 +0000, Bernhard Übelacker wrote: > Hello Eric, thanks for looking at it and sorry, I was not aware that > there was already a patch submitted for this issue. > Could you please give some more details about this EOF handling? When > WCMD_fgets returns NULL for EOF the loop is left by the break in line [2309](https://gitlab.winehq.org/wine/wine/-/blob/master/programs/cmd/wcmdma… > About the consecutive lines, those testbot runs > [117281](https://testbot.winehq.org/JobDetails.pl?Key=117281) > [117271](https://testbot.winehq.org/JobDetails.pl?Key=117271) have them, > so I currently do not see an issue there, with both of our attempts to > solve it? Hello Bernhard, When WCMD_fgets() hits EOF, the break line 2309 exists from 'do' loop starting at 2305, but continues at line 2323 by using extraSpace (which should have been read through extraData line 2308, thus in case of EOF, will reuse previously successful line read from WCMD_fgets...). IMO the EOF info should we propagated somehow (perhaps by setting an empty string in output buffer before the break) For the consecutive lines, I was suggesting extending the test with several lines made of blank data (instead of a single one), to extend the coverage of the tests . Your first patch already handles it (as testbot shows). Sorry if I haven't been clear. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/277#note_2334

June 20, 2022

Re: [PATCH v2 0/1] MR267: riched20: Commit and repaint after changing TextFont properties. (#53170)

by Huw Davies (＠huw)

`ME_UpdateRepaint()` is supposed to be called when contents changes, not the formatting. Something like this: ```c ME_WrapMarkedParagraphs( services->editor ); ME_UpdateScrollBar( services->editor ); ``` is more appropriate here. (Yes, the repaint logic is a mess). This also applies to MR 268. FWIW, it would be easier from a reviewer standpoint if these two MRs were merged into one MR containing two commits. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/267#note_2333

June 20, 2022

[PATCH 1/1] d3drm: IDirect3DRMMeshBuilder3 Optimize fake success

by Alistair Leslie-Hughes

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/d3drm/meshbuilder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 2867ea14ebe..a897941c81e 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -2134,7 +2134,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_Optimize(IDirect3DRMMeshBuilder3 *ifac { FIXME("iface %p, flags %#lx stub!\n", iface, flags); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI d3drm_mesh_builder3_AddFacesIndexed(IDirect3DRMMeshBuilder3 *iface, -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/279

June 20, 2022