January 2016 - Wine-Commits

Frédéric Delanoy : French translation for release 1.9.1
by Jeremy Newman Jan. 11, 2016

Jan. 11, 2016

Module: website Branch: master Commit: 99db3d24fc2566a3087198cf4bca6b24d23fbd80 URL: http://source.winehq.org/git/website.git/?a=commit;h=99db3d24fc2566a3087198… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 9 13:14:39 2016 +0100 French translation for release 1.9.1 Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/fr/2016010901.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/fr/2016010901.xml b/news/fr/2016010901.xml new file mode 100644 index 0000000..26a7907 --- /dev/null +++ b/news/fr/2016010901.xml @@ -0,0 +1,15 @@ +<news> +<date>9 janvier 2016</date> +<title>Sortie de Wine 1.9.1</title> +<body> +La version de développement 1.9.1 de Wine est disponible. +<a href="{$root}/announce/1.9.1">Nouveautés</a> de cette version : +<ul> + <li>Quelques correctifs différés supplémentaires.</li> + <li>Prise en charge des registres de débogage sous x86-64.</li> + <li>Instructions Shader Model 4 additionnelles.</li> + <li>Prise en charge de la chaîne de compilation Mingw ARM.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.1.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

Nikolay Sivov : dwrite: Consistently use explicit float literals.
by Alexandre Julliard Jan. 11, 2016

Jan. 11, 2016

Module: wine Branch: master Commit: 74f00fa17d33c181a67202ce3d0495ac65dca826 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74f00fa17d33c181a67202ce3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 11 16:15:53 2016 +0300 dwrite: Consistently use explicit float literals. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 60 +++++++++++++-------------- dlls/dwrite/font.c | 16 ++++---- dlls/dwrite/freetype.c | 4 +- dlls/dwrite/gdiinterop.c | 2 +- dlls/dwrite/layout.c | 104 +++++++++++++++++++++++------------------------ dlls/dwrite/main.c | 4 +- 6 files changed, 95 insertions(+), 95 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=74f00fa17d33c181a6720…

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard Jan. 11, 2016

Jan. 11, 2016

Module: wine Branch: master Commit: 3a653fb84a3b2f745d023fc83083e1137de90d59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a653fb84a3b2f745d023fc83… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Jan 11 12:42:06 2016 +0100 po: Update German translation. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/de.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/de.po b/po/de.po index e5e2827..015c770 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2015-12-07 00:44+0100\n" +"PO-Revision-Date: 2016-01-11 12:42+0100\n" "Last-Translator: Julian Rüger\n" "Language-Team: German\n" "Language: de\n" @@ -1042,7 +1042,7 @@ msgstr "Ordner auswählen" #: comdlg32.rc:148 msgid "Font size has to be a number." -msgstr "" +msgstr "Die Schriftgröße muss eine Zahl sein." #: comdlg32.rc:83 oleview.rc:98 msgid "Ready"

1 0

Nikolay Sivov : dwrite: Fix a leak on error path.
by Alexandre Julliard Jan. 11, 2016

Jan. 11, 2016

Module: wine Branch: master Commit: 0f67df657db77ea8aef9c2b9498fb5fa1f514a55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f67df657db77ea8aef9c2b94… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 11 16:15:55 2016 +0300 dwrite: Fix a leak on error path. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 2f75fba..02772ff 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -4054,6 +4054,7 @@ static HRESULT init_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFormat * free_layout_range(strike); free_layout_range(effect); free_layout_range(spacing); + free_layout_range(typography); hr = E_OUTOFMEMORY; goto fail; }

1 0

Nikolay Sivov : dwrite: Make position snapping more compact.
by Alexandre Julliard Jan. 11, 2016

Jan. 11, 2016

Module: wine Branch: master Commit: f6862b13b7c4c4dd540e4023e8fa31ebc57bcf1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6862b13b7c4c4dd540e4023e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 11 16:15:54 2016 +0300 dwrite: Make position snapping more compact. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 3909511..2f75fba 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -2904,7 +2904,7 @@ static HRESULT WINAPI dwritetextlayout_Draw(IDWriteTextLayout2 *iface, skiptransform = should_skip_transform(&m, &det); } -#define SNAP_COORD(x) renderer_apply_snapping((x), skiptransform, ppdip, det, &m) +#define SNAP_COORD(x) (disabled ? (x) : renderer_apply_snapping((x), skiptransform, ppdip, det, &m)) /* 1. Regular runs */ LIST_FOR_EACH_ENTRY(run, &This->eruns, struct layout_effective_run, entry) { const struct regular_layout_run *regular = &run->run->u.regular; @@ -2934,7 +2934,7 @@ static HRESULT WINAPI dwritetextlayout_Draw(IDWriteTextLayout2 *iface, IDWriteTextRenderer_DrawGlyphRun(renderer, context, run->origin_x + run->align_dx + origin_x, - disabled ? run->origin_y + origin_y : SNAP_COORD(run->origin_y + origin_y), + SNAP_COORD(run->origin_y + origin_y), This->measuringmode, &glyph_run, &descr, @@ -2946,7 +2946,7 @@ static HRESULT WINAPI dwritetextlayout_Draw(IDWriteTextLayout2 *iface, IDWriteTextRenderer_DrawInlineObject(renderer, context, inlineobject->origin_x + inlineobject->align_dx + origin_x, - disabled ? inlineobject->origin_y + origin_y : SNAP_COORD(inlineobject->origin_y + origin_y), + SNAP_COORD(inlineobject->origin_y + origin_y), inlineobject->object, inlineobject->is_sideways, inlineobject->is_rtl, @@ -2960,7 +2960,7 @@ static HRESULT WINAPI dwritetextlayout_Draw(IDWriteTextLayout2 *iface, IDWriteTextRenderer_DrawStrikethrough(renderer, context, s->run->origin_x, - disabled ? s->run->origin_y : SNAP_COORD(s->run->origin_y), + SNAP_COORD(s->run->origin_y), &s->s, NULL); }

1 0

Jacek Caban : mshtml: Added IHTMLUniqueName interface stub implementation.
by Alexandre Julliard Jan. 11, 2016

Jan. 11, 2016

Module: wine Branch: master Commit: 40b2deb843301987c89a912014226afcda280825 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40b2deb843301987c89a91201… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 11 14:01:24 2016 +0100 mshtml: Added IHTMLUniqueName interface stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 81 ++++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/dom.c | 1 + 3 files changed, 83 insertions(+) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index e5ae4e0..defa10a 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -3791,6 +3791,84 @@ static const IHTMLElement4Vtbl HTMLElement4Vtbl = { HTMLElement4_get_onfocusout }; +static inline HTMLElement *impl_from_IHTMLUniqueName(IHTMLUniqueName *iface) +{ + return CONTAINING_RECORD(iface, HTMLElement, IHTMLUniqueName_iface); +} + +static HRESULT WINAPI HTMLUniqueName_QueryInterface(IHTMLUniqueName *iface, REFIID riid, void **ppv) +{ + HTMLElement *This = impl_from_IHTMLUniqueName(iface); + return IHTMLElement_QueryInterface(&This->IHTMLElement_iface, riid, ppv); +} + +static ULONG WINAPI HTMLUniqueName_AddRef(IHTMLUniqueName *iface) +{ + HTMLElement *This = impl_from_IHTMLUniqueName(iface); + return IHTMLElement_AddRef(&This->IHTMLElement_iface); +} + +static ULONG WINAPI HTMLUniqueName_Release(IHTMLUniqueName *iface) +{ + HTMLElement *This = impl_from_IHTMLUniqueName(iface); + return IHTMLElement_Release(&This->IHTMLElement_iface); +} + +static HRESULT WINAPI HTMLUniqueName_GetTypeInfoCount(IHTMLUniqueName *iface, UINT *pctinfo) +{ + HTMLElement *This = impl_from_IHTMLUniqueName(iface); + return IDispatchEx_GetTypeInfoCount(&This->node.event_target.dispex.IDispatchEx_iface, pctinfo); +} + +static HRESULT WINAPI HTMLUniqueName_GetTypeInfo(IHTMLUniqueName *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLElement *This = impl_from_IHTMLUniqueName(iface); + return IDispatchEx_GetTypeInfo(&This->node.event_target.dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI HTMLUniqueName_GetIDsOfNames(IHTMLUniqueName *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + HTMLElement *This = impl_from_IHTMLUniqueName(iface); + return IDispatchEx_GetIDsOfNames(&This->node.event_target.dispex.IDispatchEx_iface, riid, rgszNames, cNames, + lcid, rgDispId); +} + +static HRESULT WINAPI HTMLUniqueName_Invoke(IHTMLUniqueName *iface, DISPID dispIdMember, REFIID riid, + LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLElement *This = impl_from_IHTMLUniqueName(iface); + return IDispatchEx_Invoke(&This->node.event_target.dispex.IDispatchEx_iface, dispIdMember, riid, lcid, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI HTMLUniqueName_get_uniqueNumber(IHTMLUniqueName *iface, LONG *p) +{ + HTMLElement *This = impl_from_IHTMLUniqueName(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLUniqueName_get_uniqueID(IHTMLUniqueName *iface, BSTR *p) +{ + HTMLElement *This = impl_from_IHTMLUniqueName(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static const IHTMLUniqueNameVtbl HTMLUniqueNameVtbl = { + HTMLUniqueName_QueryInterface, + HTMLUniqueName_AddRef, + HTMLUniqueName_Release, + HTMLUniqueName_GetTypeInfoCount, + HTMLUniqueName_GetTypeInfo, + HTMLUniqueName_GetIDsOfNames, + HTMLUniqueName_Invoke, + HTMLUniqueName_get_uniqueNumber, + HTMLUniqueName_get_uniqueID +}; + static inline HTMLElement *impl_from_HTMLDOMNode(HTMLDOMNode *iface) { return CONTAINING_RECORD(iface, HTMLElement, node); @@ -3812,6 +3890,8 @@ HRESULT HTMLElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) *ppv = &This->IHTMLElement3_iface; }else if(IsEqualGUID(&IID_IHTMLElement4, riid)) { *ppv = &This->IHTMLElement4_iface; + }else if(IsEqualGUID(&IID_IHTMLUniqueName, riid)) { + *ppv = &This->IHTMLUniqueName_iface; }else if(IsEqualGUID(&IID_IConnectionPointContainer, riid)) { *ppv = &This->cp_container.IConnectionPointContainer_iface; }else { @@ -4072,6 +4152,7 @@ void HTMLElement_Init(HTMLElement *This, HTMLDocumentNode *doc, nsIDOMHTMLElemen This->IHTMLElement2_iface.lpVtbl = &HTMLElement2Vtbl; This->IHTMLElement3_iface.lpVtbl = &HTMLElement3Vtbl; This->IHTMLElement4_iface.lpVtbl = &HTMLElement4Vtbl; + This->IHTMLUniqueName_iface.lpVtbl = &HTMLUniqueNameVtbl; if(dispex_data && !dispex_data->vtbl) dispex_data->vtbl = &HTMLElement_dispex_vtbl; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 2b8fa82..b613f70 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -706,6 +706,7 @@ typedef struct { IHTMLElement2 IHTMLElement2_iface; IHTMLElement3 IHTMLElement3_iface; IHTMLElement4 IHTMLElement4_iface; + IHTMLUniqueName IHTMLUniqueName_iface; nsIDOMHTMLElement *nselem; HTMLStyle *style; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index e90fc70..9a9cc85 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -179,6 +179,7 @@ static const IID * const doc_obj_iids[] = { &IID_IHTMLElement2, \ &IID_IHTMLElement3, \ &IID_IHTMLElement4, \ + &IID_IHTMLUniqueName, \ &IID_IDispatchEx static const IID * const elem_iids[] = {

1 0

Piotr Caban : msvcp120: Fix layout of classes with vtordisp field.
by Alexandre Julliard Jan. 11, 2016

Jan. 11, 2016

Module: wine Branch: master Commit: 6d22a3a4764d2e3247b26c875ff27ee2963e7220 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d22a3a4764d2e3247b26c875… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jan 11 10:36:47 2016 +0100 msvcp120: Fix layout of classes with vtordisp field. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 48 +++------ dlls/msvcp90/ios.c | 237 ++++++++++++++--------------------------- 2 files changed, 97 insertions(+), 188 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6d22a3a4764d2e3247b26…

1 0

Alexandre Julliard : makefiles: Generate makefile dependencies from makedep.
by Alexandre Julliard Jan. 11, 2016

Jan. 11, 2016

Module: wine Branch: master Commit: cd0af88591b31c1622cc6c7f46b2d3e3c1646ee6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd0af88591b31c1622cc6c7f4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 11 21:02:28 2016 +0900 makefiles: Generate makefile dependencies from makedep. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- aclocal.m4 | 2 -- configure | 2 -- tools/makedep.c | 7 +++++++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 7fa79ff..d09d91b 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -231,8 +231,6 @@ wine_fn_has_flag () wine_fn_depend_rules () { wine_fn_append_file SUBDIRS $ac_dir - wine_fn_append_rule \ -"Makefile: $srcdir/$ac_dir/Makefile.in" } wine_fn_pot_rules () diff --git a/configure b/configure index 7ed6963..c11b266 100755 --- a/configure +++ b/configure @@ -7426,8 +7426,6 @@ wine_fn_has_flag () wine_fn_depend_rules () { wine_fn_append_file SUBDIRS $ac_dir - wine_fn_append_rule \ -"Makefile: $srcdir/$ac_dir/Makefile.in" } wine_fn_pot_rules () diff --git a/tools/makedep.c b/tools/makedep.c index d46c715..e514cb3 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2845,15 +2845,22 @@ static struct strarray output_sources( const struct makefile *make ) if (make->subdirs.count) { + struct strarray makefile_deps = empty_strarray; struct strarray distclean_files = empty_strarray; + for (i = 0; i < make->subdirs.count; i++) { + strarray_add( &makefile_deps, top_dir_path( make, base_dir_path( make->submakes[i], + strmake ( "%s.in", output_makefile_name )))); strarray_add( &distclean_files, base_dir_path( make->submakes[i], output_makefile_name )); if (!make->src_dir) strarray_add( &distclean_files, base_dir_path( make->submakes[i], ".gitignore" )); if (make->submakes[i]->testdll) strarray_add( &distclean_files, base_dir_path( make->submakes[i], "testlist.c" )); } + output( "Makefile:" ); + output_filenames( makefile_deps ); + output( "\n" ); output( "distclean::\n"); output( "\trm -f" ); output_filenames( distclean_files );

1 0

Alexandre Julliard : makefiles: Generate all makefiles at once.
by Alexandre Julliard Jan. 11, 2016

Jan. 11, 2016

Module: wine Branch: master Commit: 8f57dfedf8a01351a8824eb57d39912d90fa768a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f57dfedf8a01351a8824eb57… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 11 16:05:51 2016 +0900 makefiles: Generate all makefiles at once. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 1 + aclocal.m4 | 57 +++++++++++++++++++++++++------------------------- configure | 65 ++++++++++++++++++++++++++++++--------------------------- configure.ac | 6 ++++-- tools/makedep.c | 62 +++++++++++++++++++++++++++++++++++------------------- 5 files changed, 107 insertions(+), 84 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8f57dfedf8a01351a8824…

1 0

André Hentschel : configure: Detect MinGW-w64 ARM toolchains.
by Alexandre Julliard Jan. 11, 2016

Jan. 11, 2016

Module: wine Branch: master Commit: fad6dc66df5eeca940e474b0fc0582a83c4982a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fad6dc66df5eeca940e474b0f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jan 9 15:15:15 2016 +0100 configure: Detect MinGW-w64 ARM toolchains. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- aclocal.m4 | 2 ++ configure | 2 ++ 2 files changed, 4 insertions(+) diff --git a/aclocal.m4 b/aclocal.m4 index 0769077..ded8ec6 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -175,6 +175,8 @@ dnl Usage: WINE_CHECK_MINGW_PROG(variable,[value-if-not-found],[path]) dnl AC_DEFUN([WINE_CHECK_MINGW_PROG], [case "$host_cpu" in + arm*) + ac_prefix_list="armv7-w64-mingw32-clang armv7-w64-mingw32-gcc" ;; i[[3456789]]86*) ac_prefix_list="m4_foreach([ac_wine_prefix],[w64-mingw32, pc-mingw32, mingw32msvc, mingw32], m4_foreach([ac_wine_cpu],[i686,i586,i486,i386],[ac_wine_cpu-ac_wine_prefix-gcc ])) diff --git a/configure b/configure index 55442e3..ed87ea5 100755 --- a/configure +++ b/configure @@ -8765,6 +8765,8 @@ CROSSTARGET="" if test "$cross_compiling" = "no" -a "x$enable_tests" != xno -a "$LIBEXT" != "dll" then case "$host_cpu" in + arm*) + ac_prefix_list="armv7-w64-mingw32-clang armv7-w64-mingw32-gcc" ;; i[3456789]86*) ac_prefix_list="i686-w64-mingw32-gcc i586-w64-mingw32-gcc i486-w64-mingw32-gcc i386-w64-mingw32-gcc i686-pc-mingw32-gcc i586-pc-mingw32-gcc i486-pc-mingw32-gcc i386-pc-mingw32-gcc i686-mingw32msvc-gcc i586-mingw32msvc-gcc i486-mingw32msvc-gcc i386-mingw32msvc-gcc i686-mingw32-gcc i586-mingw32-gcc i486-mingw32-gcc i386-mingw32-gcc i686-w64-mingw32-clang i586-w64-mingw32-clang i486-w64-mingw32-clang i386-w64-mingw32-clang

1 0