September 2019 - Wine-commits

Zebediah Figura : winegstreamer: Store the pin media type directly.
by Alexandre Julliard 16 Sep '19

16 Sep '19

Module: wine Branch: master Commit: 7782b8ea4c97b2b7c9c7a37772290d026f822247 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7782b8ea4c97b2b7c9c7a377… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Sep 14 12:43:25 2019 -0500 winegstreamer: Store the pin media type directly. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index e15072f6aa..adffee3d24 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -79,7 +79,7 @@ struct gstdemux_source GstPad *flip_sink, *flip_src; GstPad *their_src; GstPad *my_sink; - AM_MEDIA_TYPE * pmt; + AM_MEDIA_TYPE mt; HANDLE caps_event; GstSegment *segment; SourceSeeking seek; @@ -104,7 +104,7 @@ static const IPinVtbl GST_InputPin_Vtbl; static const IBaseFilterVtbl GST_Vtbl; static const IQualityControlVtbl GSTOutPin_QualityControl_Vtbl; -static BOOL create_pin(struct gstdemux *filter, const WCHAR *name, const AM_MEDIA_TYPE *mt); +static BOOL create_pin(struct gstdemux *filter, const WCHAR *name); static HRESULT GST_RemoveOutputPins(struct gstdemux *This); static HRESULT WINAPI GST_ChangeCurrent(IMediaSeeking *iface); static HRESULT WINAPI GST_ChangeStop(IMediaSeeking *iface); @@ -285,21 +285,25 @@ static gboolean setcaps_sink(GstPad *pad, GstCaps *caps) { struct gstdemux_source *pin = gst_pad_get_element_private(pad); struct gstdemux *This = impl_from_strmbase_filter(pin->pin.pin.filter); - AM_MEDIA_TYPE amt; GstStructure *arg; const char *typename; gboolean ret; TRACE("%p %p\n", pad, caps); + FreeMediaType(&pin->mt); + arg = gst_caps_get_structure(caps, 0); typename = gst_structure_get_name(arg); if (!strcmp(typename, "audio/x-raw")) { - ret = amt_from_gst_caps_audio(caps, &amt); + ret = amt_from_gst_caps_audio(caps, &pin->mt); } else if (!strcmp(typename, "video/x-raw")) { - ret = amt_from_gst_caps_video(caps, &amt); + ret = amt_from_gst_caps_video(caps, &pin->mt); if (ret) - This->props.cbBuffer = max(This->props.cbBuffer, ((VIDEOINFOHEADER*)amt.pbFormat)->bmiHeader.biSizeImage); + { + VIDEOINFOHEADER *vih = (VIDEOINFOHEADER *)pin->mt.pbFormat; + This->props.cbBuffer = max(This->props.cbBuffer, vih->bmiHeader.biSizeImage); + } } else { FIXME("Unhandled type \"%s\"\n", typename); return FALSE; @@ -307,8 +311,6 @@ static gboolean setcaps_sink(GstPad *pad, GstCaps *caps) TRACE("Linking returned %i for %s\n", ret, typename); if (!ret) return FALSE; - FreeMediaType(pin->pmt); - *pin->pmt = amt; SetEvent(pin->caps_event); return TRUE; } @@ -762,7 +764,6 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct gstdemux * { const char *typename; char *name; - AM_MEDIA_TYPE amt = {{0}}; GstCaps *caps; GstStructure *arg; GstPad *mypad; @@ -797,7 +798,7 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct gstdemux * return; } - if (!create_pin(This, nameW, &amt)) + if (!create_pin(This, nameW)) { ERR("Failed to allocate memory.\n"); return; @@ -1666,7 +1667,7 @@ static HRESULT WINAPI GSTOutPin_GetMediaType(BasePin *iface, int iPosition, AM_M if (iPosition > 0) return VFW_S_NO_MORE_ITEMS; - CopyMediaType(pmt, This->pmt); + CopyMediaType(pmt, &This->mt); return S_OK; } @@ -1731,7 +1732,7 @@ static void free_source_pin(struct gstdemux_source *pin) } gst_object_unref(pin->my_sink); CloseHandle(pin->caps_event); - DeleteMediaType(pin->pmt); + FreeMediaType(&pin->mt); gst_segment_free(pin->segment); strmbase_source_cleanup(&pin->pin); @@ -1770,7 +1771,7 @@ static const struct strmbase_source_ops source_ops = GSTOutPin_DecideAllocator, }; -static BOOL create_pin(struct gstdemux *filter, const WCHAR *name, const AM_MEDIA_TYPE *mt) +static BOOL create_pin(struct gstdemux *filter, const WCHAR *name) { struct gstdemux_source *pin, **new_array; @@ -1783,8 +1784,6 @@ static BOOL create_pin(struct gstdemux *filter, const WCHAR *name, const AM_MEDI strmbase_source_init(&pin->pin, &GST_OutputPin_Vtbl, &filter->filter, name, &source_ops); - pin->pmt = heap_alloc(sizeof(AM_MEDIA_TYPE)); - CopyMediaType(pin->pmt, mt); pin->caps_event = CreateEventW(NULL, FALSE, FALSE, NULL); pin->segment = gst_segment_new(); pin->IQualityControl_iface.lpVtbl = &GSTOutPin_QualityControl_Vtbl;

1 0

Francois Gouget : testbot/LibvirtTool: Fix FatalError() when the VM status is not as expected.
by Alexandre Julliard 16 Sep '19

16 Sep '19

Module: tools Branch: master Commit: 3c9cd9cb11a328d5125f4b922208df91e1976f20 URL: https://source.winehq.org/git/tools.git/?a=commit;h=3c9cd9cb11a328d5125f4b9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Sep 16 15:31:24 2019 +0200 testbot/LibvirtTool: Fix FatalError() when the VM status is not as expected. If the VM Status is not in the expected state then it no longer belongs to this process. So don't even try to save it as that could cause interference. Also don't notify the administrator about putting it offline since that will not be happening. However if the VM is merely in maintenance mode that means the tool is being debugged so proceed normally except for the VM Status which must not be modified to avoid inteference from the scheduler. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index f031c78..5c39065 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -166,23 +166,31 @@ sub FatalError($) my ($ErrMessage) = @_; Error $ErrMessage; + # Get the up-to-date VM status + $VM = CreateVMs()->GetItem($VMKey); + # Put the VM offline or mark it for maintenance my $Errors = ($VM->Errors || 0) + 1; my $NewStatus = $Errors < $MaxVMErrors ? "offline" : "maintenance"; - $VM = CreateVMs()->GetItem($VMKey); - # Put the VM offline if nobody else modified its status before us - if ($VM->Status eq $CurrentStatus) + if ($VM->Status eq "maintenance") { - $VM->Status($NewStatus); - $VM->ChildDeadline(undef); - $VM->ChildPid(undef); - $VM->Errors($Errors); + # Still proceed with changing the non-Status fields and notifying the + # administrator to allow for error handling debugging. + } + elsif ($VM->Status ne $CurrentStatus) + { + LogMsg "Not updating the VM because its status changed: ". $VM->Status ." != $CurrentStatus\n"; + exit 1; } else { - $NewStatus = ""; + $VM->Status($NewStatus); } + $VM->ChildDeadline(undef); + $VM->ChildPid(undef); + $VM->Errors($Errors); + my ($ErrProperty, $SaveErrMessage) = $VM->Save(); if (defined $SaveErrMessage) { @@ -198,7 +206,7 @@ sub FatalError($) elsif ($NewStatus eq "maintenance") { NotifyAdministrator("The $VMKey VM needs maintenance", - "Got ". $VM->Errors ." consecutive errors working on the $VMKey VM:\n". + "Got $Errors consecutive errors working on the $VMKey VM:\n". "\n$ErrMessage\n". "An administrator needs to look at it and to put it back online."); }

1 0

Francois Gouget : testbot/SetWinLocale: Better match the TestBot naming conventions.
by Alexandre Julliard 16 Sep '19

16 Sep '19

Module: tools Branch: master Commit: d5ad691da2c35d418d52573b2468af5efab76f01 URL: https://source.winehq.org/git/tools.git/?a=commit;h=d5ad691da2c35d418d52573… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Sep 16 15:31:47 2019 +0200 testbot/SetWinLocale: Better match the TestBot naming conventions. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/scripts/SetWinLocale | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/testbot/scripts/SetWinLocale b/testbot/scripts/SetWinLocale index 7477c5d..4b7510b 100755 --- a/testbot/scripts/SetWinLocale +++ b/testbot/scripts/SetWinLocale @@ -251,7 +251,7 @@ my %Keyboards = ( # my $Usage; -sub check_opt_val($$) +sub CheckValue($$) { my ($Option, $Value) = @_; @@ -269,10 +269,10 @@ sub check_opt_val($$) return shift @ARGV; } -sub check_opt_locale($$) +sub CheckLocale($$) { my ($Option, $Value) = @_; - $Value = check_opt_val($Option, $Value); + $Value = CheckValue($Option, $Value); if ($Value !~ /^(?:[a-z]{2})-(?:Latn-)?(?:[A-Z]{2})$/) { Error("'$Value' is not a valid $Option locale\n"); @@ -294,7 +294,7 @@ while (@ARGV) } elsif ($Arg eq "--vm") { - $OptVM = check_opt_val($Arg, $OptVM); + $OptVM = CheckValue($Arg, $OptVM); } elsif ($Arg eq "--refresh") { @@ -310,7 +310,7 @@ while (@ARGV) } elsif ($Arg eq "--add-locales") { - $OptAddLocales = check_opt_val($Arg, $OptAddLocales); + $OptAddLocales = CheckValue($Arg, $OptAddLocales); } elsif ($Arg eq "--reboot") { @@ -332,27 +332,27 @@ while (@ARGV) } elsif ($Arg eq "--default") { - $OptDefault = check_opt_locale($Arg, $OptDefault); + $OptDefault = CheckLocale($Arg, $OptDefault); } elsif ($Arg eq "--locale") { - $OptLocale = check_opt_locale($Arg, $OptLocale); + $OptLocale = CheckLocale($Arg, $OptLocale); } elsif ($Arg eq "--system") { - $OptSystem = check_opt_locale($Arg, $OptSystem); + $OptSystem = CheckLocale($Arg, $OptSystem); } elsif ($Arg eq "--mui") { - $OptMUI = check_opt_locale($Arg, $OptMUI); + $OptMUI = CheckLocale($Arg, $OptMUI); } elsif ($Arg eq "--keyboard") { - $OptKeyboard = check_opt_locale($Arg, $OptKeyboard); + $OptKeyboard = CheckLocale($Arg, $OptKeyboard); } elsif ($Arg eq "--country") { - $OptCountry = check_opt_val($Arg, $OptCountry); + $OptCountry = CheckValue($Arg, $OptCountry); } elsif ($Arg eq "--debug") {

1 0

Francois Gouget : testbot/SetWinLocale: Activate tainting.
by Alexandre Julliard 16 Sep '19

16 Sep '19

Module: tools Branch: master Commit: 60afe1c24c601800c7336c5e812454e957783431 URL: https://source.winehq.org/git/tools.git/?a=commit;h=60afe1c24c601800c7336c5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Sep 16 15:31:53 2019 +0200 testbot/SetWinLocale: Activate tainting. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/scripts/SetWinLocale | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/scripts/SetWinLocale b/testbot/scripts/SetWinLocale index 4b7510b..2690dbb 100755 --- a/testbot/scripts/SetWinLocale +++ b/testbot/scripts/SetWinLocale @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl -Tw # -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- # # Sets the locale of the specified Windows machine and, optionally,

1 0

Francois Gouget : testbot/Reconfig: Clone the Wine source repository if it is missing.
by Alexandre Julliard 16 Sep '19

16 Sep '19

Module: tools Branch: master Commit: c30f9cb730189d8a1ba07e77973bd173d401a888 URL: https://source.winehq.org/git/tools.git/?a=commit;h=c30f9cb730189d8a1ba07e7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Sep 16 15:32:13 2019 +0200 testbot/Reconfig: Clone the Wine source repository if it is missing. This simplifies setting up a new build VM. Also trace the git commands. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/Build/Utils.pm | 14 +++++++++++--- testbot/lib/WineTestBot/Config.pm | 8 ++++++-- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index 0225392..57a5f4b 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -79,11 +79,19 @@ sub GitPull($) { my ($Dir) = @_; - InfoMsg "\nUpdating the $Dir source\n"; - system("cd '$DataDir/$Dir' && git pull"); + if (!-d "$DataDir/$Dir") + { + InfoMsg "\nRetrieving the $Dir source\n"; + system("set -x && git clone $RepoURLs{$Dir}"); + } + else + { + InfoMsg "\nUpdating the $Dir source\n"; + system("cd '$DataDir/$Dir' && set -x && git pull"); + } if ($? != 0) { - LogMsg "Git pull failed\n"; + LogMsg "Git clone/pull failed\n"; return !1; } diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index b68c4f5..38ab999 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -26,7 +26,7 @@ WineTestBot::Config - Site-independent configuration settings =cut use vars qw (@ISA @EXPORT @EXPORT_OK $UseSSL $LogDir $DataDir $BinDir - $DbDataSource $DbUsername $DbPassword $MaxRevertingVMs + %RepoURLs $DbDataSource $DbUsername $DbPassword $MaxRevertingVMs $MaxRevertsWhileRunningVMs $MaxActiveVMs $MaxRunningVMs $MaxVMsWhenIdle $SleepAfterRevert $WaitForToolsInVM $VMToolTimeout $MaxVMErrors $MaxTaskTries $AdminEMail $RobotEMail @@ -42,7 +42,7 @@ use vars qw (@ISA @EXPORT @EXPORT_OK $UseSSL $LogDir $DataDir $BinDir require Exporter; @ISA = qw(Exporter); -(a)EXPORT = qw($UseSSL $LogDir $DataDir $BinDir +(a)EXPORT = qw($UseSSL $LogDir $DataDir $BinDir %RepoURLs $MaxRevertingVMs $MaxRevertsWhileRunningVMs $MaxActiveVMs $MaxRunningVMs $MaxVMsWhenIdle $SleepAfterRevert $WaitForToolsInVM $VMToolTimeout $MaxVMErrors $MaxTaskTries $AdminEMail @@ -79,6 +79,10 @@ sub PrependPaths(@) } +%RepoURLs = ( + "wine" => "git://source.winehq.org/git/wine.git", +); + # See the ScheduleOnHost() documentation in lib/WineTestBot/Jobs.pm $MaxRevertingVMs = 1; $MaxRevertsWhileRunningVMs = 0;

1 0

Alexandre Julliard : Fix Józef's age.
by Alexandre Julliard 16 Sep '19

16 Sep '19

Module: website Branch: master Commit: 4b90dcb7fb6e656167021c016cf53316600c7805 URL: https://source.winehq.org/git/website.git/?a=commit;h=4b90dcb7fb6e656167021… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 16 10:23:04 2019 +0200 Fix Józef's age. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2019091101.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/news/en/2019091101.xml b/news/en/2019091101.xml index 71861001..4e0b1775 100644 --- a/news/en/2019091101.xml +++ b/news/en/2019091101.xml @@ -16,7 +16,7 @@ attracted the interest of CodeWeavers and Józef <a href="https://www.codeweavers.com/about/blogs/jwhite/2019/09/08/a-tragic-loss">joined their team</a> in 2015. That allowed him to dedicate more of his time to Wine. - Józef died last month at the young age of 28 in an accident in the Jaskinia + Józef died last month at the young age of 30 in an accident in the Jaskinia Wielka Śnieżna ("great snowy cave") in the Tatra Mountains in Poland. Caving was his passion.

1 0

Francois Gouget : testbot: Export BatchQuote() from the Utils module.
by Alexandre Julliard 14 Sep '19

14 Sep '19

Module: tools Branch: master Commit: 94c8e97ea3f77705b988faada660b315a6f79e21 URL: https://source.winehq.org/git/tools.git/?a=commit;h=94c8e97ea3f77705b988faa… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Sep 14 04:48:50 2019 +0200 testbot: Export BatchQuote() from the Utils module. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Utils.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Utils.pm b/testbot/lib/WineTestBot/Utils.pm index 97fb129..711917c 100644 --- a/testbot/lib/WineTestBot/Utils.pm +++ b/testbot/lib/WineTestBot/Utils.pm @@ -31,7 +31,7 @@ our @EXPORT = qw(MakeSecureURL SecureConnection GenerateRandomString OpenNewFile CreateNewFile CreateNewLink CreateNewDir DurationToString BuildEMailRecipient IsValidFileName BuildTag SanitizeTag LocaleName NotifyAdministrator - ShQuote ShArgv2Cmd); + BatchQuote ShQuote ShArgv2Cmd); use Fcntl;

1 0

Jeremy Newman : update urlify and emailify
by Jeremy Newman 13 Sep '19

13 Sep '19

Module: website Branch: master Commit: 27c0867ad582e2c12601a8eba0c0bf50433311fb URL: https://source.winehq.org/git/website.git/?a=commit;h=27c0867ad582e2c12601a… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Sep 13 16:01:51 2019 -0500 update urlify and emailify --- css/styles.css | 11 ++++++-- include/html.php | 81 ++++++++++++++++++++++++++++++++++++-------------------- 2 files changed, 62 insertions(+), 30 deletions(-) diff --git a/css/styles.css b/css/styles.css index b06db889..825604ab 100644 --- a/css/styles.css +++ b/css/styles.css @@ -18,7 +18,7 @@ PRE { } /* remove background from carousel nav */ -.carousel-control.left, +.carousel-control.left, .carousel-control.right { background-image: none } @@ -217,6 +217,13 @@ DIV.clear { clear: both; margin: 0px; padding: 0px; } /* disable wrapping */ .nowrap { white-space:nowrap; } +/* force wrap */ +.force-wrap { + overflow-wrap: break-word !important; + word-wrap: break-word !important; + word-break: break-word !important; +} + /* text styles */ .bold { font-weight: bold; } .bolder { font-weight: bolder; } @@ -419,7 +426,7 @@ DIV.newsblock { margin: 0 5px 25px 10px; padding: 0; } /* winehq badge (uses font-awesome) */ .winehq_menu_item .winehq_badge { display:inline-block; - float:left; + float:left; clear:left; } .winehq_menu_item .winehq_badge .winehq_badge_inner { diff --git a/include/html.php b/include/html.php index 0e33ac4a..eb65ed4f 100644 --- a/include/html.php +++ b/include/html.php @@ -629,41 +629,51 @@ class html return $str; } - // URLIFY (search text and make urls linkable, also wrap URL at 100 chars) + // URLIFY (make urls hyperlinks) public function urlify ($text) { + // the regular expression used to match URLs + $url_regex = '/((http|https|ftp|rss):\/\/'. // protocol + '(([a-z0-9$_\.\+!\*\',;\?&\=\-]|%[0-9a-f]{2})+'. // username + '(:([a-z0-9$_\.\+!\*\',;\?&\=\-]|%[0-9a-f]{2})+)'. // password + '@)?(?#'. // auth requires @ + ')((([a-z0-9]\.|[a-z0-9][a-z0-9-]*[a-z0-9]\.)*'. // domain segments AND + '[a-z][a-z0-9-]*[a-z0-9]'. // top level domain OR + '|((\d|[1-9]\d|1\d{2}|2[0-4][0-9]|25[0-5])\.){3}'. + '(\d|[1-9]\d|1\d{2}|2[0-4][0-9]|25[0-5])'. // IP address + ')(:\d+)?'. // port + ')(((\/+([a-z0-9$_\.\+!\*\'\,\;\:@&\=\-\~]|%[0-9a-f]{2})*)*'. // path + '(\?([a-z0-9$_\.\+!\*\',;:@&\=\-\/]|%[0-9a-f]{2})*)'. // query string + '?)?)?'. // path and query string optional + '(#([a-z0-9$_\.\+!\*\',;:@&\=\-]|%[0-9a-f]{2})*)?'. // fragment + ')/i'; + // only use if text has links in it - if (preg_match('%(http|https|ftp|rss)(://)([-\w\.]+)%', $text)) + if (preg_match($url_regex, $text)) { // extract existing HTML so it is left unprocessed (for example, bbcode is pre-converted) $html_matches = array(); - preg_match_all("/(<a href=.*>.*<\/a>)/Us", $text, $matches, PREG_PATTERN_ORDER); + preg_match_all("/((<a href=.*>.*<\/a>)|(<img .*src=.*>)|<iframe .*src=.*>.*<\/iframe>)/Us", $text, $matches, PREG_PATTERN_ORDER); foreach ($matches[0] as $c => $match) { $html_matches[$c] = $matches[1][$c]; $text = str_replace("$match", "__HTMLMATCH_{$c}__", $text); } - // fix URL converted vars temporarily - $text = preg_replace('/>/', '<-RPLME->', $text); - $text = preg_replace('/"/', '"-RPLME-"', $text); - - // add a space to the beginning text so regex will work - $text = " $text"; - - // perform regular expression - $text = preg_replace( - '%((http|https|ftp|rss)(://)([-\w\.]+)(:\d+)?(/)?([\w/_\-\.\*\~]+)?(\?)?([\w_\-\.\;\&\=\%]+)?(\#)?([-\w\.]+)?)%e', - "'<a href=\"\\1\">'.wordwrap('\\1', 100, '\n', 1).'</a>'", - $text - ); - - // remove our temp conversion - $text = preg_replace('/<-RPLME->/', '>', $text); - $text = preg_replace('/"-RPLME-"/', '"', $text); - - // remove our temp space - $text = preg_replace('%^ %', '', $text); + // perform regular expression and wrap (with special handling for <URL>) + $text = preg_replace_callback( + $url_regex, + function ($m) { + $newend = ''; + $end = preg_replace('/^(.*)(\>|&gt\;)([\.\?\!\;\:\,])?$/', '\\2\\3', $m[1]); + if ($end and $end != $m[1]) { + $m[1] = preg_replace('/(.*)'.preg_quote($end).'$/', '\\1', $m[1]); + $newend = $end; + } + return "<a href=\"{$m[1]}\" class=\"force-wrap\">{$m[1]}</a>{$newend}"; + }, + $text + ); // re-insert HTML preg_match_all("/(__HTMLMATCH_(\d+)__)/", $text, $matches, PREG_PATTERN_ORDER); @@ -677,7 +687,7 @@ class html } // EMAILIFY (convert email addresses to links) - public function emailify ($text, $convert = 0) + public function emailify ($text, $convert = 0, $shorten = 0) { // fix quoted printable if (preg_match('/^\=/', $text)) @@ -686,11 +696,17 @@ class html $text = mb_convert_encoding($text, 'UTF-8'); $text = preg_replace('/^\=\?[a-z0-9\-]+\?Q\?(.*)\?\=/', "\\1", $text); } - $emreg = '/(.*) (\<|\&lt\;)([a-zA-Z0-9_\.\+\/-]+)(a)([a-zA-Z0-9_\.-]+\.[a-zA-Z0-9]+)(\>|\&gt\;)(.*)/'; - if ($convert and preg_match($emreg, $text)) + $emailreg = '/(.*) (\<|\&lt\;)([a-zA-Z0-9_\.\+\/-]+)(a)([a-zA-Z0-9_\.-]+\.[a-zA-Z0-9]+)(\>|\&gt\;)(.*)/'; + if ($convert and preg_match($emailreg, $text)) { // long format puts the name in and hides the email in the href - $text = preg_replace($emreg."e", "'<a href=\"mailto:\\3@\\4\">'.wordwrap('\\1', 25, ' ', 1).'</a>'", $text); + $text = preg_replace_callback( + "{$emailreg}", + function ($m) { + return "<a href=\"mailto:{$m[3]}@{$m[4]}\">{$m[1]}</a>"; + }, + $text + ); } else { @@ -698,7 +714,16 @@ class html $emailreg = '/([a-zA-Z0-9_\.\+\/-]+)(a)([a-zA-Z0-9_\.-]+\.[a-zA-Z0-9]+)/'; if (preg_match($emailreg, $text)) { - $text = preg_replace($emailreg, "<a href=\"mailto:\\1@\\2\">\\1@\\2</a>", $text); + $text = preg_replace_callback( + "{$emailreg}", + function ($m) use ($shorten) { + if ($shorten) + return "<a href=\"mailto:{$m[1]}@{$m[2]}\" class=\"force-wrap\">{$m[1]}</a>"; + else + return "<a href=\"mailto:{$m[1]}@{$m[2]}\" class=\"force-wrap\">{$m[1]}@{$m[2]}</a>"; + }, + $text + ); } } return $text;

1 0

Alexandre Julliard : Wine release 4.16
by Alexandre Julliard 13 Sep '19

13 Sep '19

Module: website Branch: master Commit: 79070a2fa4080884c5a1fcd27399d122259683f0 URL: https://source.winehq.org/git/website.git/?a=commit;h=79070a2fa4080884c5a1f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 13 22:34:32 2019 +0200 Wine release 4.16 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2019091301.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/en/2019091301.xml b/news/en/2019091301.xml new file mode 100644 index 00000000..46021a27 --- /dev/null +++ b/news/en/2019091301.xml @@ -0,0 +1,15 @@ +<news> +<date>September 13, 2019</date> +<title>Wine 4.16 Released</title> +<body> + The Wine development release 4.16 is now available. + <a href="{$root}/announce/4.16">What's new</a> in this release: +<ul> + <li>More reliable mouse grabbing in games.</li> + <li>Better cross-compilation support in WineGCC.</li> + <li>Improved compatibility with Windows debuggers.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/4.x/wine-4.16.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>. +</body></news>

1 0

Huw Davies : configure: Fix argument type of unw_step().
by Alexandre Julliard 13 Sep '19

13 Sep '19

Module: wine Branch: master Commit: 89773807f2b61fcaef88e11578a3adb6c602d3ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=89773807f2b61fcaef88e115… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Sep 13 09:04:41 2019 +0100 configure: Fix argument type of unw_step(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 4 ++-- configure.ac | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 109d2423a2..b54b2252a7 100755 --- a/configure +++ b/configure @@ -14905,7 +14905,7 @@ else int main () { -unw_context_t context; unw_step( &context ); +unw_cursor_t cursor; unw_step( &cursor ); ; return 0; } @@ -14936,7 +14936,7 @@ else int main () { -unw_context_t context; unw_step( &context ); +unw_cursor_t cursor; unw_step( &cursor ); ; return 0; } diff --git a/configure.ac b/configure.ac index dfa6b6ac9c..49676f073b 100644 --- a/configure.ac +++ b/configure.ac @@ -1697,7 +1697,7 @@ then [AC_CACHE_CHECK([for unw_step],wine_cv_have_unw_step, [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define UNW_LOCAL_ONLY #include <libunwind.h>]], - [[unw_context_t context; unw_step( &context );]])], + [[unw_cursor_t cursor; unw_step( &cursor );]])], [wine_cv_have_unw_step="yes"],[wine_cv_have_unw_step="no"])]) if test "$wine_cv_have_unw_step" = no -a -n "$UNWIND_LIBS" then @@ -1706,7 +1706,7 @@ then AC_CACHE_CHECK([for unw_step in libunwind],wine_cv_have_libunwind_unw_step, [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define UNW_LOCAL_ONLY #include <libunwind.h>]], - [[unw_context_t context; unw_step( &context );]])], + [[unw_cursor_t cursor; unw_step( &cursor );]])], [wine_cv_have_libunwind_unw_step="yes"], [wine_cv_have_libunwind_unw_step="no"])]) LIBS=$save_libs

1 0