wine-commits April 2017

wine-commits@winehq.org

2 participants
757 discussions

Jeremy Newman : Merge branch 'master' of winehq.org:/home/winehq/opt/ source/git/website
by Jeremy Newman 28 Apr '17

28 Apr '17

Module: website Branch: master Commit: 2e66ba32208a59e70bb7b68161dbfe4c9c679672 URL: http://source.winehq.org/git/website.git/?a=commit;h=2e66ba32208a59e70bb7b6… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Apr 28 13:37:19 2017 -0500 Merge branch 'master' of winehq.org:/home/winehq/opt/source/git/website ---

1 0

Julian Rüger : Update German translation of the main page
by Jeremy Newman 28 Apr '17

28 Apr '17

Module: website Branch: master Commit: 10d580435d88111789090e0e94b49bf55048c0f4 URL: http://source.winehq.org/git/website.git/?a=commit;h=10d580435d88111789090e… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Apr 28 19:01:14 2017 +0200 Update German translation of the main page Signed-off-by: Julian Rüger <jr98(a)gmx.net> Again, any comments appreciated! Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- templates/de/home.template | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/templates/de/home.template b/templates/de/home.template index d78412c..92a42d3 100644 --- a/templates/de/home.template +++ b/templates/de/home.template @@ -1,14 +1,14 @@  - +  - +  <div class="row"> <div class="col-sm-7"> <div class="whq-page-container margin-bottom-md"> - <h3 class="title">Aktuellste Versionen</h3> + <h3 class="title">Aktuelle Versionen</h3> <div class="row"> <div class="col-sm-4 col-md-3">Stabile Version:</div> <div class="col-sm-8"> @@ -35,12 +35,12 @@ <a class="winehq_menu_item info nomargin" href="{$root}/about"> <span class="icon"></span> <span class="title">Über</span> - <span class="subtitle">Erfahre mehr über das Wine-Projekt.</span> + <span class="subtitle">Erfahren Sie mehr über das Wine-Projekt.</span> </a> <div class="clear"></div> </div> - <p>Wine ermöglicht es, Windows-Programme unter anderen Betriebssystemen laufen zu lassen. Mit Wine kannst Du diese Programme genauso installieren und laufen lassen, wie unter Windows.</p> + <p>Wine (ursprünglich ein Akronym für "Wine Is Not an Emulator") ist eine Kompatibilitätsschicht, die es ermöglicht, Windows-Anwendungen unter POSIX-konformen Betriebssystemen auszuführen, wie z.B. Linux, macOS und BSD. Statt interne Windows-Logik zu simulieren, wie eine virtuelle Maschine oder ein Emulator, übersetzt Wine die Windows-API-Aufrufe in Echtzeit zu entsprechenden POSIX-Aufrufen und eliminiert somit die Performance- und Speichereinbußen, die andere Methoden nach sich ziehen. Wine erlaubt es auf diese Weise, Windows-Anwendungen sauber in Ihre Desktopumgebung zu integrieren.</p> </div> @@ -52,7 +52,7 @@ <a class="winehq_menu_item dl" href="{$root}/download"> <span class="icon"></span> <span class="title">Download</span> - <span class="subtitle">Installiere die aktuellste Wine-Version.</span> + <span class="subtitle">Installieren Sie die neueste Wine-Version.</span> </a> <div class="clear"></div> @@ -65,15 +65,15 @@ <a class="winehq_menu_item devel" href="{$root}/getinvolved"> <span class="icon"></span> - <span class="title">Entwicklung</span> - <span class="subtitle">Werde ein Wine-Entwickler.</span> + <span class="title">Helfen Sie mit</span> + <span class="subtitle">Werden Sie ein Teil unserer Gemeinschaft.</span> </a> <div class="clear"></div> <a class="winehq_menu_item donate" href="{$root}/donate"> <span class="icon"></span> <span class="title">Spenden</span> - <span class="subtitle">Spende dem Wine-Projekt.</span> + <span class="subtitle">An das Wine-Projekt spenden.</span> </a> <div class="clear"></div>

1 0

Julian Rüger : Update German translation of the About page
by Jeremy Newman 28 Apr '17

28 Apr '17

Module: website Branch: master Commit: 59d85792ac4290c1d9d82421682e08f4063c41c2 URL: http://source.winehq.org/git/website.git/?a=commit;h=59d85792ac4290c1d9d824… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Apr 28 18:29:53 2017 +0200 Update German translation of the About page Signed-off-by: Julian Rüger <jr98(a)gmx.net> Proofreading is welcome! Please report any typos or comments to me. :) Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- templates/de/about.template | 76 ++++++++++++++++++++++++++++++++++++++------- 1 file changed, 65 insertions(+), 11 deletions(-) diff --git a/templates/de/about.template b/templates/de/about.template index be369dc..a70cc54 100644 --- a/templates/de/about.template +++ b/templates/de/about.template @@ -1,22 +1,76 @@  - <h1 class="title">Über Wine</h1> -<p>Wine ermöglicht es, Windows-Programme unter anderen Betriebssystemen laufen zu lassen. Mit Wine kannst Du diese Programme genauso installieren und laufen lassen, wie unter Windows.</p> +<p>Wine (ursprünglich ein Akronym für "Wine Is Not an Emulator") ist eine +Kompatibilitätsschicht, die es ermöglicht, Windows-Anwendungen unter +einigen POSIX-konformen Betriebssystemen auszuführen, wie z.B. Linux, +macOS und BSD. Statt interne Windows-Logik zu simulieren, wie eine virtuelle +Maschine oder ein Emulator, übersetzt Wine die Windows-API-Aufrufe in +Echtzeit zu entsprechenden POSIX-Aufrufen und eliminiert somit die +Performance- und Speichereinbußen, die andere Methoden nach sich ziehen. +Wine erlaubt es auf diese Weise, Windows-Anwendung sauber in Ihre +Desktopumgebung zu integrieren.</p> -<p>Wine wird aktiv weiterentwickelt. Noch läuft nicht jedes Programm, aber <a href="https://wiki.winehq.org/UsageStatistics" title="Statistik zur Wine-Benutzung">mehrere Millionen Anwender (en)</a> nutzen Wine, um ihre Programme zu verwenden.</p> +<p>Das Projekt begann 1993, unter der anfänglichen Koordinierung durch Bob Amstadt, +eine Möglichkeit zu entwickeln, Windows 3.1-Programme unter Linux auszuführen. +Schon recht früh übernahm Alexandre Julliard die Projektleitung, welcher die +Wine-Entwicklung bis heute anführt. Über die Jahre haben sich die Windows-API +und Anwendungen weiterentwickelt, um Möglichkeiten neuer Hard- und Software +zu nutzen. Wine wurde fortwährend angepasst, um neue Funktionen zu unterstützen, +auf anderen Betriebsystemen lauffähig zu sein, stabiler zu werden und ein besseres +Nutzungserlebnis zu bieten.</p> -<h3>Durch Open Source und Benutzer getrieben</h3> +<p>Obgleich es per Definition bereits ein sehr ambitioniertes Projekt war, +schritt die Entwicklung von Wine im Laufe von 15 Jahren stetig voran, um im Jahre 2008 +endlich Version 1.0 zu erreichen, das erste stabile Release. Einige Jahre später +befindet sich Wine heute weiterhin unter aktiver Entwicklung. Auch wenn es noch einiges +zu tun gibt, benutzen schätzungsweise bereits +<a href="https://wiki.winehq.org/UsageStatistics" title="Wine Usage +Statistics">Millionen von Menschen</a> Wine, um Windows-Software auf dem Betriebsystem +ihrer Wahl auszuführen.</p> -<p>Wine wird immer <a href="https://wiki.winehq.org/Licensing" title="Wine-Lizensierung">Freie Software (en)</a> sein. Ungefähr die Hälfte des Quellcodes von Wine wird von Freiwilligen geschrieben. Der Rest wird von Firmen gesponsort, insbesondere <a href="http://www.codeweavers.com/products/" title="Codeweavers Crossover Office">Codeweavers (en)</a>, die eine eigene Version von Wine mit Support verkaufen.</p> +<h3>Open-Source und gelenkt durch seine Benutzer</h3> -<p>Wine ist stark von seinen Anwendern abhängig. Tests von Anwendern füllen unsere <a href="//appdb.winehq.org/" title="Wine Anwendungsdatenbank">Anwendungsdatenbank (en)</a> um verfolgen zu können, wie gut einzelne Programme funktionieren, und sämtliche Antworten in den <a href="//forums.winehq.org/" title="WineHQ Foren">Foren (en)</a> kommen von Freiwilligen.</p> +<p>Wine wird immer <a href="//www.winehq.org/license" +title="Wine licensing">freie Software</a> sein. Ungefähr die Hälfte des +Quelltextes stammt von freiwilligen Entwicklern, während die übrige Arbeit durch +kommerzielle Interessen erbracht wird, insbesondere von +<a href="http://www.codeweavers.com/products/" title="CodeWeavers +CrossOver Office">CodeWeavers</a>, welche eine bezahlte Version von Wine mit +professionellem Support anbieten.</p> + +<p>Wine ist sehr auf seine Nutzergemeinschaft angewiesen. Anwender verbringen ihre +Freizeit damit, Tipps und Testergebnisse zu teilen, um in unserer +<a href="//appdb.winehq.org/" title="Wine Application +Database">Applikations-Datenbank</a> zu dokumentieren, wie gut ihre Software läuft, +Fehlerberichte in unserem <a href="//bugs.winehq.org/"title="Bugzilla">Bugtracker</a> +zu erstellen, um Entwickler auf Probleme hinzuweisen und Fragen in unseren +<a href="//forums.winehq.org/" title="WineHQ Forums">Foren</a> zu beantworten. +</p> + +<h3>Erfahren Sie mehr:</h3> + +<p><i>(Etliche der folgenden Seiten werden momentan überarbeitet und +sind daher unter Umständen nicht aktuell)</i></p> -<h3>Erfahre mehr:</h3> <ul> - <li><a href="https://wiki.winehq.org/ImportanceOfWine">Warum Wine so wichtig ist (en)</a></li> - <li><a href="https://wiki.winehq.org/Debunking_Wine_Myths">Wine-Mythen aufgedeckt (en)</a></li> - <li><a href="https://wiki.winehq.org/WineHistory">Geschichte des Wine-Projekts (en)</a></li> - <li><a href="https://wiki.winehq.org/ProjectOrganization">Organisation und Leitung (en)</a></li> + <li><a href="https://wiki.winehq.org/ImportanceOfWine">Warum Wine so + wichtig ist (en)</a> + </li> + <li><a href="https://wiki.winehq.org/Debunking_Wine_Myths">Häufige + Mythen über Wine aufgedeckt (en)</a> + </li> + <li><a href="https://wiki.winehq.org/WineHistory">Geschichte des + Wine-Projekts (en)</a> + </li> + <li><a href="https://wiki.winehq.org/ProjectOrganization"> + Organisation und Leitung (en)</a> + </li> + <li><a href="https://wiki.winehq.org/WhosWho">Kurzbiografien einiger + Beitragenden (en)</a> + </li> + <li><a href="https://wiki.winehq.org/Acknowledgements">Andere + Anerkennungen (en)</a> + </li> </ul>

1 0

Alexandre Julliard : Wine release 2.7
by Alexandre Julliard 28 Apr '17

28 Apr '17

Module: website Branch: master Commit: 504e88f92190a16fdb6d9761f01b0990bba8c3de URL: http://source.winehq.org/git/website.git/?a=commit;h=504e88f92190a16fdb6d97… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 28 19:44:40 2017 +0200 Wine release 2.7 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2017042801.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/en/2017042801.xml b/news/en/2017042801.xml new file mode 100644 index 0000000..dff3b76 --- /dev/null +++ b/news/en/2017042801.xml @@ -0,0 +1,18 @@ +<news> +<date>April 28, 2017</date> +<title>Wine 2.7 Released</title> +<body> +<p> The Wine development release 2.7 is now available.</p> +<p> <a href="{$root}/announce/2.7">What's new</a> in this release: +<ul> + <li>TCP and UDP connection support in WebServices.</li> + <li>Various shader improvements for Direct3D 11.</li> + <li>Improved support for high DPI settings.</li> + <li>Partial reimplementation of the GLU library.</li> + <li>Support for recent versions of OSMesa.</li> + <li>Window management improvements on macOS.</li> + <li>Various bug fixes.</li> +</ul> +<p>The source is <a href="//dl.winehq.org/wine/source/2.x/wine-2.7.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</p></body></news>

1 0

Tag wine-2.7 : Alexandre Julliard : Release 2.7
by Alexandre Julliard 28 Apr '17

28 Apr '17

Module: wine Branch: refs/tags/wine-2.7 Tag: fae68484d99312a10429881d20a7e79a5e39078d URL: http://source.winehq.org/git/wine.git/?a=tag;h=fae68484d99312a10429881d20a7… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 28 19:42:09 2017 +0200 Release 2.7

1 0

Alexandre Julliard : Release 2.7.
by Alexandre Julliard 28 Apr '17

28 Apr '17

Module: wine Branch: master Commit: 07cf14dc928a1a00baecbbc7ca5a6f3fe680238c URL: http://source.winehq.org/git/wine.git/?a=commit;h=07cf14dc928a1a00baecbbc7c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 28 19:42:09 2017 +0200 Release 2.7. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 811 ++++++++++++++++++++++++++++++++++---------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 452 insertions(+), 379 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=07cf14dc928a1a00baecb…

1 0

Nikolay Sivov : gdiplus: Use better naming for line alignment format field.
by Alexandre Julliard 28 Apr '17

28 Apr '17

Module: wine Branch: master Commit: c89de1dd08ca9d2dab7463780f62c8a0ea5fd4fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c89de1dd08ca9d2dab7463780… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 28 01:20:32 2017 +0300 gdiplus: Use better naming for line alignment format field. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus_private.h | 2 +- dlls/gdiplus/graphics.c | 8 ++++---- dlls/gdiplus/graphicspath.c | 4 ++-- dlls/gdiplus/stringformat.c | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 443370a..af7ef43 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -450,7 +450,7 @@ struct GpStringFormat{ StringAlignment align; StringTrimming trimming; HotkeyPrefix hkprefix; - StringAlignment vertalign; + StringAlignment line_align; StringDigitSubstitute digitsub; INT tabcount; REAL firsttab; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index beedb9e..4d8bdd7 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5417,19 +5417,19 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string /* Should be no need to explicitly test for StringAlignmentNear as * that is default behavior if no alignment is passed. */ - if(format->vertalign != StringAlignmentNear){ + if(format->line_align != StringAlignmentNear){ RectF bounds, in_rect = *rect; in_rect.Height = 0.0; /* avoid height clipping */ GdipMeasureString(graphics, string, length, font, &in_rect, format, &bounds, 0, 0); TRACE("bounds %s\n", debugstr_rectf(&bounds)); - if(format->vertalign == StringAlignmentCenter) + if(format->line_align == StringAlignmentCenter) offsety = (rect->Height - bounds.Height) / 2; - else if(format->vertalign == StringAlignmentFar) + else if(format->line_align == StringAlignmentFar) offsety = (rect->Height - bounds.Height); } - TRACE("vertical align %d, offsety %f\n", format->vertalign, offsety); + TRACE("line align %d, offsety %f\n", format->line_align, offsety); } save_state = SaveDC(hdc); diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 4d70796..3d33c29 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1028,13 +1028,13 @@ GpStatus WINGDIPAPI GdipAddPathString(GpPath* path, GDIPCONST WCHAR* string, INT heap_free(backup); return status; } - if (format && format->vertalign == StringAlignmentCenter && layoutRect->Y + args.maxY < layoutRect->Height) + if (format && format->line_align == StringAlignmentCenter && layoutRect->Y + args.maxY < layoutRect->Height) { float inc = layoutRect->Height + layoutRect->Y - args.maxY; inc /= 2; for (i = backup->pathdata.Count; i < path->pathdata.Count; ++i) path->pathdata.Points[i].Y += inc; - } else if (format && format->vertalign == StringAlignmentFar) { + } else if (format && format->line_align == StringAlignmentFar) { float inc = layoutRect->Height + layoutRect->Y - args.maxY; for (i = backup->pathdata.Count; i < path->pathdata.Count; ++i) path->pathdata.Points[i].Y += inc; diff --git a/dlls/gdiplus/stringformat.c b/dlls/gdiplus/stringformat.c index 660731d..e376e7b 100644 --- a/dlls/gdiplus/stringformat.c +++ b/dlls/gdiplus/stringformat.c @@ -178,7 +178,7 @@ GpStatus WINGDIPAPI GdipGetStringFormatLineAlign(GpStringFormat *format, if(!format || !align) return InvalidParameter; - *align = format->vertalign; + *align = format->line_align; return Ok; } @@ -282,7 +282,7 @@ GpStatus WINGDIPAPI GdipSetStringFormatLineAlign(GpStringFormat *format, if(!format) return InvalidParameter; - format->vertalign = align; + format->line_align = align; return Ok; }

1 0

Nikolay Sivov : gdiplus: Fix generic string formats behavior.
by Alexandre Julliard 28 Apr '17

28 Apr '17

Module: wine Branch: master Commit: 69b41e7cf3876f00048be036c00050f7bcd21e98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69b41e7cf3876f00048be036c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 28 01:20:31 2017 +0300 gdiplus: Fix generic string formats behavior. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus.c | 2 ++ dlls/gdiplus/gdiplus_private.h | 5 +++ dlls/gdiplus/graphics.c | 12 +------ dlls/gdiplus/stringformat.c | 69 ++++++++++++++++++++++++++------------- dlls/gdiplus/tests/stringformat.c | 52 +++++++++++++++++++++++++++-- 5 files changed, 104 insertions(+), 36 deletions(-) diff --git a/dlls/gdiplus/gdiplus.c b/dlls/gdiplus/gdiplus.c index 1281455..d114ff7 100644 --- a/dlls/gdiplus/gdiplus.c +++ b/dlls/gdiplus/gdiplus.c @@ -63,11 +63,13 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved) { case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls( hinst ); + init_generic_string_formats(); break; case DLL_PROCESS_DETACH: if (reserved) break; free_installed_fonts(); + free_generic_string_formats(); break; } return TRUE; diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 9b0151b..443370a 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -441,6 +441,8 @@ struct GpFont{ Unit unit; }; +extern const struct GpStringFormat default_drawstring_format DECLSPEC_HIDDEN; + struct GpStringFormat{ INT attr; LANGID lang; @@ -458,6 +460,9 @@ struct GpStringFormat{ BOOL generic_typographic; }; +extern void init_generic_string_formats(void) DECLSPEC_HIDDEN; +extern void free_generic_string_formats(void) DECLSPEC_HIDDEN; + struct GpFontCollection{ GpFontFamily **FontFamilies; INT count; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index bd37d92..beedb9e 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4909,7 +4909,6 @@ GpStatus gdip_format_string(HDC hdc, INT hotkeyprefix_count=0; INT hotkeyprefix_pos=0, hotkeyprefix_end_pos=0; BOOL seen_prefix = FALSE; - GpStringFormat *dyn_format=NULL; if(length == -1) length = lstrlenW(string); @@ -4917,15 +4916,7 @@ GpStatus gdip_format_string(HDC hdc, if(!stringdup) return OutOfMemory; if (!format) - { - stat = GdipStringFormatGetGenericDefault(&dyn_format); - if (stat != Ok) - { - heap_free(stringdup); - return stat; - } - format = dyn_format; - } + format = &default_drawstring_format; nwidth = rect->Width; nheight = rect->Height; @@ -5075,7 +5066,6 @@ GpStatus gdip_format_string(HDC hdc, heap_free(stringdup); heap_free(hotkeyprefix_offsets); - GdipDeleteStringFormat(dyn_format); return stat; } diff --git a/dlls/gdiplus/stringformat.c b/dlls/gdiplus/stringformat.c index b89458b..660731d 100644 --- a/dlls/gdiplus/stringformat.c +++ b/dlls/gdiplus/stringformat.c @@ -32,6 +32,47 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); +const GpStringFormat default_drawstring_format = +{ + 0, + LANG_NEUTRAL, + LANG_NEUTRAL, + StringAlignmentNear, + StringTrimmingCharacter, + HotkeyPrefixNone, + StringAlignmentNear, + StringDigitSubstituteUser, + 0, + 0.0, + NULL, + NULL, + 0, + FALSE +}; + +static GpStringFormat generic_default_format; +static GpStringFormat generic_typographic_format; + +void init_generic_string_formats(void) +{ + memcpy(&generic_default_format, &default_drawstring_format, sizeof(generic_default_format)); + + memcpy(&generic_typographic_format, &default_drawstring_format, sizeof(generic_typographic_format)); + generic_typographic_format.attr = StringFormatFlagsNoFitBlackBox | StringFormatFlagsLineLimit | + StringFormatFlagsNoClip; + generic_typographic_format.trimming = StringTrimmingNone; + generic_typographic_format.generic_typographic = TRUE; +} + +void free_generic_string_formats(void) +{ + heap_free(generic_default_format.character_ranges); + heap_free(generic_default_format.tabs); + + heap_free(generic_typographic_format.character_ranges); + heap_free(generic_typographic_format.tabs); +} + GpStatus WINGDIPAPI GdipCreateStringFormat(INT attr, LANGID lang, GpStringFormat **format) { @@ -66,6 +107,9 @@ GpStatus WINGDIPAPI GdipDeleteStringFormat(GpStringFormat *format) if(!format) return InvalidParameter; + if (format == &generic_default_format || format == &generic_typographic_format) + return Ok; + heap_free(format->character_ranges); heap_free(format->tabs); heap_free(format); @@ -75,17 +119,10 @@ GpStatus WINGDIPAPI GdipDeleteStringFormat(GpStringFormat *format) GpStatus WINGDIPAPI GdipStringFormatGetGenericDefault(GpStringFormat **format) { - GpStatus stat; - if (!format) return InvalidParameter; - stat = GdipCreateStringFormat(0, LANG_NEUTRAL, format); - if(stat != Ok) - return stat; - - (*format)->align = StringAlignmentNear; - (*format)->vertalign = StringAlignmentNear; + *format = &generic_default_format; return Ok; } @@ -370,24 +407,10 @@ GpStatus WINGDIPAPI GdipCloneStringFormat(GDIPCONST GpStringFormat *format, GpSt GpStatus WINGDIPAPI GdipStringFormatGetGenericTypographic(GpStringFormat **format) { - GpStatus stat; - if(!format) return InvalidParameter; - stat = GdipCreateStringFormat(StringFormatFlagsNoFitBlackBox | - StringFormatFlagsLineLimit | - StringFormatFlagsNoClip, LANG_NEUTRAL, format); - if(stat != Ok) - return stat; - - (*format)->digitlang = LANG_NEUTRAL; - (*format)->digitsub = StringDigitSubstituteUser; - (*format)->trimming = StringTrimmingNone; - (*format)->hkprefix = HotkeyPrefixNone; - (*format)->align = StringAlignmentNear; - (*format)->vertalign = StringAlignmentNear; - (*format)->generic_typographic = TRUE; + *format = &generic_typographic_format; TRACE("%p => %p\n", format, *format); diff --git a/dlls/gdiplus/tests/stringformat.c b/dlls/gdiplus/tests/stringformat.c index f7f7a8f..0774e1b 100644 --- a/dlls/gdiplus/tests/stringformat.c +++ b/dlls/gdiplus/tests/stringformat.c @@ -140,7 +140,7 @@ static void test_digitsubstitution(void) static void test_getgenerictypographic(void) { - GpStringFormat *format; + GpStringFormat *format, *format2; GpStatus stat; INT flags; INT n; @@ -157,6 +157,12 @@ static void test_getgenerictypographic(void) stat = GdipStringFormatGetGenericTypographic(&format); expect(Ok, stat); + stat = GdipStringFormatGetGenericTypographic(&format2); + expect(Ok, stat); + ok(format == format2, "expected same format object\n"); + stat = GdipDeleteStringFormat(format2); + expect(Ok, stat); + GdipGetStringFormatFlags(format, &flags); GdipGetStringFormatAlign(format, &align); GdipGetStringFormatLineAlign(format, &line_align); @@ -175,6 +181,24 @@ static void test_getgenerictypographic(void) expect(LANG_NEUTRAL, digitlang); expect(0, tabcount); + /* Change format parameters, release, get format object again. */ + stat = GdipSetStringFormatFlags(format, StringFormatFlagsNoWrap); + expect(Ok, stat); + + stat = GdipGetStringFormatFlags(format, &flags); + expect(Ok, stat); + expect(StringFormatFlagsNoWrap, flags); + + stat = GdipDeleteStringFormat(format); + expect(Ok, stat); + + stat = GdipStringFormatGetGenericTypographic(&format); + expect(Ok, stat); + + stat = GdipGetStringFormatFlags(format, &flags); + expect(Ok, stat); + expect(StringFormatFlagsNoWrap, flags); + stat = GdipDeleteStringFormat(format); expect(Ok, stat); } @@ -286,7 +310,7 @@ static void test_tabstops(void) static void test_getgenericdefault(void) { - GpStringFormat *format; + GpStringFormat *format, *format2; GpStatus stat; INT flags; @@ -304,6 +328,12 @@ static void test_getgenericdefault(void) stat = GdipStringFormatGetGenericDefault(&format); expect(Ok, stat); + stat = GdipStringFormatGetGenericDefault(&format2); + expect(Ok, stat); + ok(format == format2, "expected same format object\n"); + stat = GdipDeleteStringFormat(format2); + expect(Ok, stat); + GdipGetStringFormatFlags(format, &flags); GdipGetStringFormatAlign(format, &align); GdipGetStringFormatLineAlign(format, &line_align); @@ -321,6 +351,24 @@ static void test_getgenericdefault(void) expect(LANG_NEUTRAL, digitlang); expect(0, tabcount); + /* Change default format parameters, release, get format object again. */ + stat = GdipSetStringFormatFlags(format, StringFormatFlagsNoWrap); + expect(Ok, stat); + + stat = GdipGetStringFormatFlags(format, &flags); + expect(Ok, stat); + expect(StringFormatFlagsNoWrap, flags); + + stat = GdipDeleteStringFormat(format); + expect(Ok, stat); + + stat = GdipStringFormatGetGenericDefault(&format); + expect(Ok, stat); + + stat = GdipGetStringFormatFlags(format, &flags); + expect(Ok, stat); + expect(StringFormatFlagsNoWrap, flags); + stat = GdipDeleteStringFormat(format); expect(Ok, stat); }

1 0

Nikolay Sivov : gdiplus/tests: Fix copy/paste error in format tests.
by Alexandre Julliard 28 Apr '17

28 Apr '17

Module: wine Branch: master Commit: 8b649fe2f4ba9b5b5b1f5c016f70b67d3c8a0413 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b649fe2f4ba9b5b5b1f5c016… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 28 01:20:30 2017 +0300 gdiplus/tests: Fix copy/paste error in format tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/stringformat.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/gdiplus/tests/stringformat.c b/dlls/gdiplus/tests/stringformat.c index f0fcff9..f7f7a8f 100644 --- a/dlls/gdiplus/tests/stringformat.c +++ b/dlls/gdiplus/tests/stringformat.c @@ -30,7 +30,7 @@ static void test_constructor(void) GpStringFormat *format; GpStatus stat; INT n, count; - StringAlignment align, valign; + StringAlignment align, line_align; StringTrimming trimming; StringDigitSubstitute digitsub; LANGID digitlang; @@ -39,7 +39,7 @@ static void test_constructor(void) expect(Ok, stat); GdipGetStringFormatAlign(format, &align); - GdipGetStringFormatLineAlign(format, &valign); + GdipGetStringFormatLineAlign(format, &line_align); GdipGetStringFormatHotkeyPrefix(format, &n); GdipGetStringFormatTrimming(format, &trimming); GdipGetStringFormatDigitSubstitution(format, &digitlang, &digitsub); @@ -47,7 +47,7 @@ static void test_constructor(void) expect(HotkeyPrefixNone, n); expect(StringAlignmentNear, align); - expect(StringAlignmentNear, align); + expect(StringAlignmentNear, line_align); expect(StringTrimmingCharacter, trimming); expect(StringDigitSubstituteUser, digitsub); expect(LANG_NEUTRAL, digitlang); @@ -144,7 +144,7 @@ static void test_getgenerictypographic(void) GpStatus stat; INT flags; INT n; - StringAlignment align, valign; + StringAlignment align, line_align; StringTrimming trimming; StringDigitSubstitute digitsub; LANGID digitlang; @@ -159,7 +159,7 @@ static void test_getgenerictypographic(void) GdipGetStringFormatFlags(format, &flags); GdipGetStringFormatAlign(format, &align); - GdipGetStringFormatLineAlign(format, &valign); + GdipGetStringFormatLineAlign(format, &line_align); GdipGetStringFormatHotkeyPrefix(format, &n); GdipGetStringFormatTrimming(format, &trimming); GdipGetStringFormatDigitSubstitution(format, &digitlang, &digitsub); @@ -169,7 +169,7 @@ static void test_getgenerictypographic(void) flags); expect(HotkeyPrefixNone, n); expect(StringAlignmentNear, align); - expect(StringAlignmentNear, align); + expect(StringAlignmentNear, line_align); expect(StringTrimmingNone, trimming); expect(StringDigitSubstituteUser, digitsub); expect(LANG_NEUTRAL, digitlang); @@ -291,7 +291,7 @@ static void test_getgenericdefault(void) INT flags; INT n; - StringAlignment align, valign; + StringAlignment align, line_align; StringTrimming trimming; StringDigitSubstitute digitsub; LANGID digitlang; @@ -306,7 +306,7 @@ static void test_getgenericdefault(void) GdipGetStringFormatFlags(format, &flags); GdipGetStringFormatAlign(format, &align); - GdipGetStringFormatLineAlign(format, &valign); + GdipGetStringFormatLineAlign(format, &line_align); GdipGetStringFormatHotkeyPrefix(format, &n); GdipGetStringFormatTrimming(format, &trimming); GdipGetStringFormatDigitSubstitution(format, &digitlang, &digitsub); @@ -315,7 +315,7 @@ static void test_getgenericdefault(void) expect(0, flags); expect(HotkeyPrefixNone, n); expect(StringAlignmentNear, align); - expect(StringAlignmentNear, align); + expect(StringAlignmentNear, line_align); expect(StringTrimmingCharacter, trimming); expect(StringDigitSubstituteUser, digitsub); expect(LANG_NEUTRAL, digitlang);

1 0

Jacek Caban : secur32: Fixed compilation with prediluvian gnutls.
by Alexandre Julliard 28 Apr '17

28 Apr '17

Module: wine Branch: master Commit: 855d73e927a059573582850565c3b6357cd89657 URL: http://source.winehq.org/git/wine.git/?a=commit;h=855d73e927a05957358285056… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 28 14:50:51 2017 +0200 secur32: Fixed compilation with prediluvian gnutls. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel_gnutls.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index deefa8d..bc3bbaf 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -83,6 +83,8 @@ MAKE_FUNCPTR(gnutls_transport_set_push_function); #define GNUTLS_CIPHER_AES_128_GCM 93 #define GNUTLS_CIPHER_AES_256_GCM 94 +#define GNUTLS_MAC_AEAD 200 + #define GNUTLS_KX_ANON_ECDH 11 #define GNUTLS_KX_ECDHE_RSA 12 #define GNUTLS_KX_ECDHE_ECDSA 13

1 0

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 April 2017