August 2016 - Wine-Commits - list.winehq.org

Piotr Caban : ucrtbase: Add __std_type_info_destroy_list implementation.
by Alexandre Julliard Aug. 4, 2016

Aug. 4, 2016

Module: wine Branch: master Commit: 4ba09e11a891ee120d6a6602f3a4ecb5aaaaa86a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ba09e11a891ee120d6a6602f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 4 16:28:55 2016 +0200 ucrtbase: Add __std_type_info_destroy_list implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/msvcrt/cpp.c | 16 ++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- dlls/vcruntime140/vcruntime140.spec | 2 +- 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index d8f4c52..a007823 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -45,7 +45,7 @@ @ cdecl __std_exception_copy(ptr ptr) ucrtbase.__std_exception_copy @ cdecl __std_exception_destroy(ptr) ucrtbase.__std_exception_destroy @ cdecl __std_type_info_compare(ptr ptr) ucrtbase.__std_type_info_compare -@ stub __std_type_info_destroy_list +@ cdecl __std_type_info_destroy_list(ptr) ucrtbase.__std_type_info_destroy_list @ stub __std_type_info_hash @ cdecl __std_type_info_name(ptr ptr) ucrtbase.__std_type_info_name @ cdecl __unDName(ptr str long ptr ptr long) ucrtbase.__unDName diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index ee27fc7..3621f12 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -1572,4 +1572,20 @@ const char* CDECL MSVCRT_type_info_name_list(type_info140 *ti, SLIST_HEADER *hea TRACE("(%p) returning %s\n", ti, ti->name); return ti->name; } + +/****************************************************************** + * __std_type_info_destroy_list (UCRTBASE.@) + */ +void CDECL MSVCRT_type_info_destroy_list(SLIST_HEADER *header) +{ + SLIST_ENTRY *cur, *next; + + TRACE("(%p)\n", header); + + for(cur = InterlockedFlushSList(header); cur; cur = next) + { + next = cur->Next; + MSVCRT_free(cur); + } +} #endif diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index d1c1553..bb549d1 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -143,7 +143,7 @@ @ cdecl __std_exception_copy(ptr ptr) MSVCRT___std_exception_copy @ cdecl __std_exception_destroy(ptr) MSVCRT___std_exception_destroy @ cdecl __std_type_info_compare(ptr ptr) MSVCRT_type_info_compare -@ stub __std_type_info_destroy_list +@ cdecl __std_type_info_destroy_list(ptr) MSVCRT_type_info_destroy_list @ stub __std_type_info_hash @ cdecl __std_type_info_name(ptr ptr) MSVCRT_type_info_name_list @ cdecl __stdio_common_vfprintf(int64 ptr str ptr ptr) MSVCRT__stdio_common_vfprintf diff --git a/dlls/vcruntime140/vcruntime140.spec b/dlls/vcruntime140/vcruntime140.spec index 525a998..8d6c060 100644 --- a/dlls/vcruntime140/vcruntime140.spec +++ b/dlls/vcruntime140/vcruntime140.spec @@ -40,7 +40,7 @@ @ cdecl __std_exception_destroy(ptr) ucrtbase.__std_exception_destroy @ stub __std_terminate @ cdecl __std_type_info_compare(ptr ptr) ucrtbase.__std_type_info_compare -@ stub __std_type_info_destroy_list +@ cdecl __std_type_info_destroy_list(ptr) ucrtbase.__std_type_info_destroy_list @ stub __std_type_info_hash @ cdecl __std_type_info_name(ptr ptr) ucrtbase.__std_type_info_name @ cdecl __telemetry_main_invoke_trigger(ptr)

1 0

Piotr Caban : ucrtbase: Fix __std_type_info_compare implementation.
by Alexandre Julliard Aug. 4, 2016

Aug. 4, 2016

Module: wine Branch: master Commit: 0707164543ada140db13952c6af26c98a6d4946c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0707164543ada140db13952c6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 4 16:28:18 2016 +0200 ucrtbase: Fix __std_type_info_compare implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/cpp.c | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index b470478..8e44969 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -575,16 +575,6 @@ int __thiscall MSVCRT_type_info_before(type_info * _this, const type_info * rhs) } /****************************************************************** - * __std_type_info_compare (MSVCRT.@) - */ -int CDECL MSVCRT_type_info_compare(type_info * _this, const type_info * rhs) -{ - int ret = strcmp(_this->mangled + 1, rhs->mangled + 1); - TRACE("(%p %p) returning %d\n", _this, rhs, ret); - return ret; -} - -/****************************************************************** * ??1type_info@@UAE(a)XZ (MSVCRT.@) */ DEFINE_THISCALL_WRAPPER(MSVCRT_type_info_dtor,4) @@ -1513,3 +1503,24 @@ void* __cdecl __AdjustPointer(void *obj, const this_ptr_offsets *off) { return get_this_pointer(off, obj); } + +#if _MSVCR_VER >= 140 +typedef struct +{ + char *name; + char mangled[1]; +} type_info140; + +/****************************************************************** + * __std_type_info_compare (UCRTBASE.@) + */ +int CDECL MSVCRT_type_info_compare(const type_info140 *l, const type_info140 *r) +{ + int ret; + + if (l == r) ret = 0; + else ret = strcmp(l->mangled + 1, r->mangled + 1); + TRACE("(%p %p) returning %d\n", l, r, ret); + return ret; +} +#endif

1 0

Nikolay Sivov : hlink: Handle failure better (Coverity).
by Alexandre Julliard Aug. 4, 2016

Aug. 4, 2016

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 : quartz: Fix its vs it's typo.
by Alexandre Julliard Aug. 4, 2016

Aug. 4, 2016

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 : shlwapi: Fix its vs it's typo.
by Alexandre Julliard Aug. 4, 2016

Aug. 4, 2016

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 : dwrite: Add missing return value check (Coverity).
by Alexandre Julliard Aug. 4, 2016

Aug. 4, 2016

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

Nikolay Sivov : wined3d: Fix its vs it's typos.
by Alexandre Julliard Aug. 4, 2016

Aug. 4, 2016

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 : cabinet: Fix its vs it's typos.
by Alexandre Julliard Aug. 4, 2016

Aug. 4, 2016

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

Frédéric Delanoy : French translation for release 1.9.15
by Jeremy Newman Aug. 4, 2016

Aug. 4, 2016

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 metafile playback for ScaleWorldTransform.
by Alexandre Julliard Aug. 3, 2016

Aug. 3, 2016

Module: wine Branch: master Commit: 136d9e8c184bb7cb7de7416e51d6276edfdddac5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=136d9e8c184bb7cb7de7416e5… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Aug 3 16:19:36 2016 -0500 gdiplus: Implement metafile playback for ScaleWorldTransform. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 0f03041..09ecd39 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -923,6 +923,18 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, return METAFILE_PlaybackUpdateWorldTransform(real_metafile); } + case EmfPlusRecordTypeScaleWorldTransform: + { + EmfPlusScaleWorldTransform *record = (EmfPlusScaleWorldTransform*)header; + MatrixOrder order = (flags & 0x4) ? MatrixOrderAppend : MatrixOrderPrepend; + + if (dataSize + sizeof(EmfPlusRecordHeader) < sizeof(EmfPlusScaleWorldTransform)) + return InvalidParameter; + + GdipScaleMatrix(real_metafile->world_transform, record->Sx, record->Sy, order); + + return METAFILE_PlaybackUpdateWorldTransform(real_metafile); + } default: FIXME("Not implemented for record type %x\n", recordType); return NotImplemented;

1 0