wine-commits August 2016

wine-commits@winehq.org

2 participants
777 discussions

Nikolay Sivov : mshtml: Remove dead assignment (Coverity).
by Alexandre Julliard 04 Aug '16

04 Aug '16

Module: wine Branch: master Commit: 0b0a63b4336935b631d0deb20f5ce49ad078834c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b0a63b4336935b631d0deb20… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 4 09:06:17 2016 +0300 mshtml: Remove dead assignment (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsembed.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 958b619..e343dde 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -959,7 +959,7 @@ static HRESULT nsnode_to_nsstring_rec(nsIContentSerializer *serializer, nsIDOMNo nsIContentSerializer_AppendText(serializer, nscontent, 0, -1, str); break; case COMMENT_NODE: - nsres = nsIContentSerializer_AppendComment(serializer, nscontent, 0, -1, str); + nsIContentSerializer_AppendComment(serializer, nscontent, 0, -1, str); break; case DOCUMENT_NODE: { nsIDocument *nsdoc;

1 0

Nikolay Sivov : hlink: Handle failure better (Coverity).
by Alexandre Julliard 04 Aug '16

04 Aug '16

Module: wine Branch: master Commit: 0e486b789d52e4cdb0f861b3eff495e1a5edbd48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e486b789d52e4cdb0f861b3e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 4 11:08:26 2016 +0300 hlink: Handle failure better (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hlink/browse_ctx.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/hlink/browse_ctx.c b/dlls/hlink/browse_ctx.c index d90aad9..ee8509d 100644 --- a/dlls/hlink/browse_ctx.c +++ b/dlls/hlink/browse_ctx.c @@ -106,10 +106,13 @@ static HRESULT WINAPI IHlinkBC_Register(IHlinkBrowseContext* iface, IMoniker *mon; IMoniker *composite; IRunningObjectTable *ROT; + HRESULT hr; FIXME("(%p)->(%i %p %p %p)\n", This, dwReserved, piunk, pimk, pdwRegister); - CreateItemMoniker(NULL, szIdent, &mon); + hr = CreateItemMoniker(NULL, szIdent, &mon); + if (FAILED(hr)) + return hr; CreateGenericComposite(mon, pimk, &composite); GetRunningObjectTable(0, &ROT);

1 0

Nikolay Sivov : comctl32/listview: Return earlier on allocation failure ( Coverity).
by Alexandre Julliard 04 Aug '16

04 Aug '16

Module: wine Branch: master Commit: 622a24046f9c06078e1e7b27726f90b6fa9b1e0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=622a24046f9c06078e1e7b277… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 4 10:57:47 2016 +0300 comctl32/listview: Return earlier on allocation failure (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 6ab360b..cc1721b 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -5863,13 +5863,15 @@ static BOOL LISTVIEW_EndEditLabelT(LISTVIEW_INFO *infoPtr, BOOL storeText, BOOL { DWORD len = isW ? GetWindowTextLengthW(infoPtr->hwndEdit) : GetWindowTextLengthA(infoPtr->hwndEdit); - if (len) + if (len++) { - if ((pszText = Alloc((len+1) * (isW ? sizeof(WCHAR) : sizeof(CHAR))))) - { - if (isW) GetWindowTextW(infoPtr->hwndEdit, pszText, len+1); - else GetWindowTextA(infoPtr->hwndEdit, (CHAR*)pszText, len+1); - } + if (!(pszText = Alloc(len * (isW ? sizeof(WCHAR) : sizeof(CHAR))))) + return FALSE; + + if (isW) + GetWindowTextW(infoPtr->hwndEdit, pszText, len); + else + GetWindowTextA(infoPtr->hwndEdit, (CHAR*)pszText, len); } }

1 0

Nikolay Sivov : wined3d: Fix its vs it's typos.
by Alexandre Julliard 04 Aug '16

04 Aug '16

Module: wine Branch: master Commit: 42cc080f8c2cf472b18a172aae3349f016419b41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42cc080f8c2cf472b18a172aa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 4 10:57:44 2016 +0300 wined3d: Fix its vs it's typos. 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/wined3d/arb_program_shader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 945abe5..c206745 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1374,7 +1374,7 @@ static const char *shader_arb_get_modifier(const struct wined3d_shader_instructi mod = ins->dst[0].modifiers; - /* Silently ignore PARTIALPRECISION if its not supported */ + /* Silently ignore PARTIALPRECISION if it's not supported */ if(priv->target_version == ARB) mod &= ~WINED3DSPDM_PARTIALPRECISION; if(mod & WINED3DSPDM_MSAMPCENTROID) @@ -7237,7 +7237,7 @@ static BOOL gen_yv12_read(struct wined3d_string_buffer *buffer, const struct arb * | 0.5 | 0.5 | * * So it appears as if there are 4 chroma images, but in fact the odd rows - * in the chroma images are in the same row as the even ones. So its is + * in the chroma images are in the same row as the even ones. So it is * kinda tricky to read * * When reading from rectangle textures, keep in mind that the input y coordinates

1 0

Nikolay Sivov : shlwapi: Fix its vs it's typo.
by Alexandre Julliard 04 Aug '16

04 Aug '16

Module: wine Branch: master Commit: 817302b5686a4abf92e65c5443c022110e748f96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=817302b5686a4abf92e65c544… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 4 10:57:46 2016 +0300 shlwapi: Fix its vs it's typo. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/url.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index ee93818..fe97fae 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -923,7 +923,7 @@ HRESULT WINAPI UrlCombineW(LPCWSTR pszBase, LPCWSTR pszRelative, } if (ret == S_OK) { - /* Reuse mrelative as temp storage as its already allocated and not needed anymore */ + /* Reuse mrelative as temp storage as it's already allocated and not needed anymore */ if(*pcchCombined == 0) *pcchCombined = 1; ret = UrlCanonicalizeW(preliminary, mrelative, pcchCombined, (dwFlags & ~URL_FILE_USE_PATHURL));

1 0

Nikolay Sivov : quartz: Fix its vs it's typo.
by Alexandre Julliard 04 Aug '16

04 Aug '16

Module: wine Branch: master Commit: efe94aea182abe3cfdb0756bbc48fe0994c757b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efe94aea182abe3cfdb0756bb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 4 10:57:45 2016 +0300 quartz: Fix its vs it's typo. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/avidec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index 7e29318..c9ca760 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -172,7 +172,7 @@ static HRESULT WINAPI AVIDec_Receive(TransformFilter *tf, IMediaSample *pSample) if (res != ICERR_OK) ERR("Error occurred during the decompression (%x)\n", res); - /* Drop sample if its intended to be dropped */ + /* Drop sample if it's intended to be dropped */ if (flags & ICDECOMPRESS_HURRYUP) { hr = S_OK; goto error;

1 0

Nikolay Sivov : cabinet: Fix its vs it's typos.
by Alexandre Julliard 04 Aug '16

04 Aug '16

Module: wine Branch: master Commit: a6c47d73239fa96cd42f1d222933172730191279 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6c47d73239fa96cd42f1d222… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 4 10:57:42 2016 +0300 cabinet: Fix its vs it's typos. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cabinet/fdi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index ae6aec8..fdff0bf 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -2582,7 +2582,7 @@ BOOL __cdecl FDICopy( * where all the cabinet files needed for decryption are simultaneously * available. But presumably, the API is supposed to support cabinets which * are split across multiple CDROMS; we may need to change our implementation - * to strictly serialize it's file usage so that it opens only one cabinet + * to strictly serialize its file usage so that it opens only one cabinet * at a time. Some experimentation with Windows is needed to figure out the * precise semantics required. The relevant code is here and in fdi_decomp(). */ @@ -2613,8 +2613,8 @@ BOOL __cdecl FDICopy( * if we imagine parallelized access to the FDICopy API. * * The current implementation punts -- it just returns the previous cabinet and - * it's info from the header of this cabinet. This provides the right answer in - * 95% of the cases; its worth checking if Microsoft cuts the same corner before + * its info from the header of this cabinet. This provides the right answer in + * 95% of the cases; it's worth checking if Microsoft cuts the same corner before * we "fix" it. */ ZeroMemory(&fdin, sizeof(FDINOTIFICATION));

1 0

Nikolay Sivov : dwrite: Add missing return value check (Coverity).
by Alexandre Julliard 04 Aug '16

04 Aug '16

Module: wine Branch: master Commit: ff6f31de7625b0fb3d8e73f85fdf3e81a8f3093b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff6f31de7625b0fb3d8e73f85… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 4 10:56:38 2016 +0300 dwrite: Add missing return value check (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index d1a04db..d354eaf 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1596,12 +1596,13 @@ static HRESULT WINAPI dwritefont3_GetFontFaceReference(IDWriteFont3 *iface, IDWr static BOOL WINAPI dwritefont3_HasCharacter(IDWriteFont3 *iface, UINT32 ch) { struct dwrite_font *This = impl_from_IDWriteFont3(iface); + HRESULT hr; BOOL ret; TRACE("(%p)->(0x%x)\n", This, ch); - IDWriteFont_HasCharacter((IDWriteFont*)iface, ch, &ret); - return ret; + hr = IDWriteFont_HasCharacter((IDWriteFont*)iface, ch, &ret); + return hr == S_OK && ret; } static DWRITE_LOCALITY WINAPI dwritefont3_GetLocality(IDWriteFont3 *iface)

1 0

Frédéric Delanoy : French translation for release 1.9.15
by Jeremy Newman 04 Aug '16

04 Aug '16

Module: website Branch: master Commit: fd2f3aa4e099afa6e57efb41c44b08bde1e3303a URL: http://source.winehq.org/git/website.git/?a=commit;h=fd2f3aa4e099afa6e57efb… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Aug 4 09:03:13 2016 +0200 French translation for release 1.9.15 Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/fr/2016072201.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/fr/2016072201.xml b/news/fr/2016072201.xml new file mode 100644 index 0000000..c0ba25f --- /dev/null +++ b/news/fr/2016072201.xml @@ -0,0 +1,16 @@ +<news> +<date>22 juillet 2016</date> +<title>Sortie de Wine 1.9.15</title> +<body> +La version de développement 1.9.15 de Wine est disponible. +<a href="{$root}/announce/1.9.15">Nouveautés</a> de cette version : +<ul> + <li>Plus d'instructions de shaders dans Direct3D.</li> + <li>Améliorations de performances dans GDI.</li> + <li>Meilleure prise en charge multi-joysticks sous MacOS.</li> + <li>Améliorations dans Active Scripting.</li> + <li>Prise en charge additionnelle des flux dans le moteur d'exécution C++.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.15.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Vincent Povirk : gdiplus: Implement ResetWorldTransform metafile playback/ recording.
by Alexandre Julliard 03 Aug '16

03 Aug '16

Module: wine Branch: master Commit: a65718a3e7b95443a82dafd5d2c9cded961404a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a65718a3e7b95443a82dafd5d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Aug 3 16:19:38 2016 -0500 gdiplus: Implement ResetWorldTransform metafile playback/recording. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/graphics.c | 9 +++++++++ dlls/gdiplus/metafile.c | 28 ++++++++++++++++++++++++++++ dlls/gdiplus/tests/metafile.c | 26 ++++++++++++++++++++++++++ 4 files changed, 64 insertions(+) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index e4056b4..3eebaed 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -91,6 +91,7 @@ extern GpStatus METAFILE_FillRectangles(GpMetafile* metafile, GpBrush* brush, GDIPCONST GpRectF* rects, INT count) DECLSPEC_HIDDEN; extern GpStatus METAFILE_SetPageTransform(GpMetafile* metafile, GpUnit unit, REAL scale) DECLSPEC_HIDDEN; extern GpStatus METAFILE_ScaleWorldTransform(GpMetafile* metafile, REAL sx, REAL sy, MatrixOrder order) DECLSPEC_HIDDEN; +extern GpStatus METAFILE_ResetWorldTransform(GpMetafile* metafile) DECLSPEC_HIDDEN; extern GpStatus METAFILE_GraphicsDeleted(GpMetafile* metafile) DECLSPEC_HIDDEN; extern void calc_curve_bezier(const GpPointF *pts, REAL tension, REAL *x1, diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index febb60d..6003a19 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5128,6 +5128,8 @@ GpStatus WINGDIPAPI GdipResetClip(GpGraphics *graphics) GpStatus WINGDIPAPI GdipResetWorldTransform(GpGraphics *graphics) { + GpStatus stat; + TRACE("(%p)\n", graphics); if(!graphics) @@ -5136,6 +5138,13 @@ GpStatus WINGDIPAPI GdipResetWorldTransform(GpGraphics *graphics) if(graphics->busy) return ObjectBusy; + if (graphics->image && graphics->image->type == ImageTypeMetafile) { + stat = METAFILE_ResetWorldTransform((GpMetafile*)graphics->image); + + if (stat != Ok) + return stat; + } + return GdipSetMatrixElements(&graphics->worldtrans, 1.0, 0.0, 0.0, 1.0, 0.0, 0.0); } diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 09ecd39..f0c0bd1 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -586,6 +586,28 @@ GpStatus METAFILE_ScaleWorldTransform(GpMetafile* metafile, REAL sx, REAL sy, Ma return Ok; } +GpStatus METAFILE_ResetWorldTransform(GpMetafile* metafile) +{ + if (metafile->metafile_type == MetafileTypeEmfPlusOnly || metafile->metafile_type == MetafileTypeEmfPlusDual) + { + EmfPlusRecordHeader *record; + GpStatus stat; + + stat = METAFILE_AllocateRecord(metafile, + sizeof(EmfPlusRecordHeader), + (void**)&record); + if (stat != Ok) + return stat; + + record->Type = EmfPlusRecordTypeResetWorldTransform; + record->Flags = 0; + + METAFILE_WriteRecords(metafile); + } + + return Ok; +} + GpStatus METAFILE_ReleaseDC(GpMetafile* metafile, HDC hdc) { if (hdc != metafile->record_dc) @@ -935,6 +957,12 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, return METAFILE_PlaybackUpdateWorldTransform(real_metafile); } + case EmfPlusRecordTypeResetWorldTransform: + { + GdipSetMatrixElements(real_metafile->world_transform, 1.0, 0.0, 0.0, 1.0, 0.0, 0.0); + + return METAFILE_PlaybackUpdateWorldTransform(real_metafile); + } default: FIXME("Not implemented for record type %x\n", recordType); return NotImplemented; diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 354e880..e514eb5 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -1273,6 +1273,8 @@ static const emfplus_record worldtransform_records[] = { {0, EmfPlusRecordTypeFillRects}, {0, EmfPlusRecordTypeScaleWorldTransform}, {0, EmfPlusRecordTypeFillRects}, + {0, EmfPlusRecordTypeResetWorldTransform}, + {0, EmfPlusRecordTypeFillRects}, {0, EmfPlusRecordTypeEndOfFile}, {0, EMR_EOF}, {0} @@ -1352,6 +1354,26 @@ static void test_worldtransform(void) stat = GdipDeleteBrush(brush); expect(Ok, stat); + /* reset transform */ + stat = GdipResetWorldTransform(graphics); + expect(Ok, stat); + + stat = GdipGetWorldTransform(graphics, transform); + expect(Ok, stat); + + stat = GdipIsMatrixIdentity(transform, &identity); + expect(Ok, stat); + expect(TRUE, identity); + + stat = GdipCreateSolidFill((ARGB)0xff00ffff, (GpSolidFill**)&brush); + expect(Ok, stat); + + stat = GdipFillRectangle(graphics, brush, 1.0, 0.0, 1.0, 1.0); + expect(Ok, stat); + + stat = GdipDeleteBrush(brush); + expect(Ok, stat); + stat = GdipDeleteMatrix(transform); expect(Ok, stat); @@ -1382,6 +1404,10 @@ static void test_worldtransform(void) expect(Ok, stat); expect(0xff00ff00, color); + stat = GdipBitmapGetPixel(bitmap, 30, 10, &color); + expect(Ok, stat); + expect(0xff00ffff, color); + stat = GdipDeleteGraphics(graphics); expect(Ok, stat);

1 0

← Newer
1
...
64
65
66
67
68
69
70
...
78
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 August 2016