April 2014 - Wine-Commits - list.winehq.org

Dmitry Timoshkov : user32: When converting from MF_ flags to MENUITEMINFO ignore MF_POPUP if id is not a menu.
by Alexandre Julliard April 21, 2014

April 21, 2014

Module: wine Branch: master Commit: c6dbb33e19b94d87b98fa20a2d3eb147d599f18a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6dbb33e19b94d87b98fa20a2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 21 14:16:42 2014 +0900 user32: When converting from MF_ flags to MENUITEMINFO ignore MF_POPUP if id is not a menu. --- dlls/user32/menu.c | 2 +- dlls/user32/tests/menu.c | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 6b0cf2f..ab3f73b 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -3859,7 +3859,7 @@ static void MENU_mnu2mnuii( UINT flags, UINT_PTR id, LPCWSTR str, pmii->fMask |= MIIM_DATA; pmii->dwItemData = (ULONG_PTR) str; } - if( flags & MF_POPUP) { + if( flags & MF_POPUP && MENU_GetMenu((HMENU)id)) { pmii->fMask |= MIIM_SUBMENU; pmii->hSubMenu = (HMENU)id; } diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 2f3c481..593292d 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -3639,18 +3639,14 @@ static void test_AppendMenu(void) hmenu = CreateMenu(); ok(hmenu != 0, "CreateMenu failed\n"); ret = AppendMenuA(hmenu, MF_POPUP, 202, "item 1"); -todo_wine ok(ret, "AppendMenu failed\n"); -if (ret) /* FIXME: uncomment once Wine is fixed */ check_menu_items(hmenu, 202, MF_STRING, 0); DestroyMenu(hmenu); hmenu = CreateMenu(); ok(hmenu != 0, "CreateMenu failed\n"); ret = AppendMenuA(hmenu, MF_OWNERDRAW | MF_POPUP, 203, "item 1"); -todo_wine ok(ret, "AppendMenu failed\n"); -if (ret) /* FIXME: uncomment once Wine is fixed */ check_menu_items(hmenu, 203, MF_OWNERDRAW, 0); DestroyMenu(hmenu); @@ -3720,9 +3716,7 @@ if (ret) /* FIXME: uncomment once Wine is fixed */ ok(ret, "AppendMenu failed\n"); check_menu_items(hmenu, 204, MF_STRING, 0); ret = ModifyMenuA(hmenu, 0, MF_POPUP | MF_BYPOSITION, 205, "item 2"); -todo_wine ok(ret, "ModifyMenu failed\n"); -if (ret) /* FIXME: uncomment once Wine is fixed */ check_menu_items(hmenu, 205, MF_STRING, 0); memset(&mii, 0, sizeof(mii)); mii.cbSize = sizeof(mii);

1 0

Nikolay Sivov : gdiplus: Properly delete a DC.
by Alexandre Julliard April 21, 2014

April 21, 2014

Module: wine Branch: master Commit: 62502d0670fcd5513f4cb0cfade08e319a9cf8d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62502d0670fcd5513f4cb0cfa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 19 13:54:59 2014 +0400 gdiplus: Properly delete a DC. --- dlls/gdiplus/font.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index a811a60..f485058 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -1521,7 +1521,7 @@ GpStatus WINGDIPAPI GdipPrivateAddMemoryFont(GpFontCollection* fontCollection, if (!EnumFontFamiliesExW(hdc, &lfw, add_font_proc, (LPARAM)fontCollection, 0)) { - ReleaseDC(0, hdc); + DeleteDC(hdc); return OutOfMemory; } @@ -1649,7 +1649,7 @@ GpStatus WINGDIPAPI GdipNewInstalledFontCollection( if (!EnumFontFamiliesExW(hdc, &lfw, add_font_proc, (LPARAM)&installedFontCollection, 0)) { free_installed_fonts(); - ReleaseDC(0, hdc); + DeleteDC(hdc); return OutOfMemory; }

1 0

Frédéric Delanoy : French translation for release 1.7.17
by Jeremy Newman April 21, 2014

April 21, 2014

Module: website Branch: master Commit: 24c843c01404d7f7e7dfbc88ed249212bea4ad46 URL: http://source.winehq.org/git/website.git/?a=commit;h=24c843c01404d7f7e7dfbc… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Apr 19 08:50:29 2014 +0200 French translation for release 1.7.17 --- news/fr/2014041801.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/news/fr/2014041801.xml b/news/fr/2014041801.xml new file mode 100644 index 0000000..ea5fc08 --- /dev/null +++ b/news/fr/2014041801.xml @@ -0,0 +1,14 @@ +<news> +<date>18 avril 2014</date> +<title>Sortie de Wine 1.7.17</title> +<body> +<p> La version de développement 1.7.17 de Wine est disponible.</p> +<p> <a href="{$root}/announce/1.7.17">Nouveautés</a> de cette version : +<ul> + <li>Implémentations de fonctions supplémentaires dans le planificateur de tâches.</li> + <li>Moteur d'exécution C rendu plus compatible en partageant les fichiers source.</li> + <li>Correctifs dans la prise en charge des joysticks dans Mac OS X.</li> + <li>Diverses corrections de bugs.</li> +</ul></p> +<p><p>Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.17.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. +</p></body></news>

1 0

Andrey Gusev : Ukrainian translation for release 1.7.17
by Jeremy Newman April 21, 2014

April 21, 2014

Module: website Branch: master Commit: 116cae91791239e6d252eab2048c597e22ed91e5 URL: http://source.winehq.org/git/website.git/?a=commit;h=116cae91791239e6d252ea… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Apr 18 23:05:48 2014 +0300 Ukrainian translation for release 1.7.17 --- news/uk/2014041801.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/uk/2014041801.xml b/news/uk/2014041801.xml new file mode 100644 index 0000000..0bad288 --- /dev/null +++ b/news/uk/2014041801.xml @@ -0,0 +1,15 @@ +<news> +<date>18 квітня 2014</date> +<title>Випущено Wine 1.7.17</title> +<body> +<p> Розробницький реліз Wine 1.7.17 наразі доступний.</p> +<p> <a href="{$root}/announce/1.7.17">Що нового</a> в цьому релізі: +<ul> + <li>Більше реалізацій для планувальника завдань.</li> + <li>C runtime більш сумісна з допомогою спільного використання вихідних файлів.</li> + <li>Виправлення підтримки джойстика в Mac OS X.</li> + <li>Виправлення різних помилок.</li> +</ul> +<p>Вихідний код <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.17.tar.bz2">вже доступний</a>. +Готові пакунки в процесі створення і в найближчий час будуть доступні у відповідних <a href="{$root}/download">місцях</a>. +</p></body></news>

1 0

Andrey Gusev : Update download page to Ubuntu 14.04 LTS in Ukrainian
by Jeremy Newman April 21, 2014

April 21, 2014

Module: website Branch: master Commit: 191836d07218f7bd01d1b3452161ef69e1ea1b39 URL: http://source.winehq.org/git/website.git/?a=commit;h=191836d07218f7bd01d1b3… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Apr 21 14:16:30 2014 +0300 Update download page to Ubuntu 14.04 LTS in Ukrainian --- templates/uk/download.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/uk/download.template b/templates/uk/download.template index ac727ff..42350c1 100644 --- a/templates/uk/download.template +++ b/templates/uk/download.template @@ -60,7 +60,7 @@ <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu linux" border="0"></a> </td> <td> <b><a href="{$root}/download/ubuntu">Завантажити пакунки Ubuntu</a></b> - - бінарні та вихідні .deb файли для Ubuntu Precise (12.04), Quantal (12.10), Raring (13.04) та Saucy (13.10) + - бінарні та вихідні .deb файли для Ubuntu Trusty (14.04 LTS) <td><a href="mailto:scottritchie(a)ubuntu.com">Scott Ritchie</a></td> </tr>

1 0

Scott Ritchie : Update download page to refer to new Ubuntu release
by Jeremy Newman April 21, 2014

April 21, 2014

Module: website Branch: master Commit: 1c6c97a1c7d1a8c9a822d37dc1282071a4c1b91c URL: http://source.winehq.org/git/website.git/?a=commit;h=1c6c97a1c7d1a8c9a822d3… Author: Scott Ritchie <scottritchie(a)ubuntu.com> Date: Sun Apr 20 10:44:54 2014 -0700 Update download page to refer to new Ubuntu release --- templates/en/download.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/en/download.template b/templates/en/download.template index 804691f..275fd05 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -61,7 +61,7 @@ requested in exchange for hosting the Wine web site.</p> <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu linux" border="0"></a> </td> <td> <b><a href="{$root}/download/ubuntu">Download Ubuntu packages</a></b> - - binary and source .debs for Ubuntu Precise (12.04), Quantal (12.10), Raring (13.04), and Saucy (13.10) + - binary and source .debs for Ubuntu Trusty (14.04 LTS) <td><a href="mailto:scottritchie(a)ubuntu.com">Scott Ritchie</a></td> </tr>

1 0

Alexandre Julliard : Import of upstream bugzilla release 4.4.4.
by Alexandre Julliard April 19, 2014

April 19, 2014

Module: bugzilla Branch: upstream Commit: 243d7ee5eeb145034f735c0c8c2e3b538f01dee6 URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=243d7ee5eeb145034f735… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Apr 19 15:50:39 2014 +0200 Import of upstream bugzilla release 4.4.4. --- Bugzilla/Constants.pm | 2 +- Bugzilla/Template.pm | 25 +++++++++------------ docs/bugzilla.ent | 12 +++++----- docs/bugzilla.ent.tmpl | 4 ++-- docs/en/xml/bugzilla.ent | 12 +++++----- template/en/default/pages/release-notes.html.tmpl | 7 ++++++ 6 files changed, 33 insertions(+), 29 deletions(-) diff --git a/Bugzilla/Constants.pm b/Bugzilla/Constants.pm index 230691c..33d4a56 100644 --- a/Bugzilla/Constants.pm +++ b/Bugzilla/Constants.pm @@ -182,7 +182,7 @@ use Memoize; # CONSTANTS # # Bugzilla version -use constant BUGZILLA_VERSION => "4.4.3"; +use constant BUGZILLA_VERSION => "4.4.4"; # Location of the remote and local XML files to track new releases. use constant REMOTE_FILE => 'http://updates.bugzilla.org/bugzilla-update.xml'; diff --git a/Bugzilla/Template.pm b/Bugzilla/Template.pm index ee610ff..c007283 100644 --- a/Bugzilla/Template.pm +++ b/Bugzilla/Template.pm @@ -151,13 +151,11 @@ sub quoteUrls { # (http://foo/bug#3 for example). Filtering that out filters valid # bug refs out, so we have to do replacements. # mailto can't contain space or #, so we don't have to bother for that - # Do this by escaping \0 to \1\0, and replacing matches with \0\0$count\0\0 - # \0 is used because it's unlikely to occur in the text, so the cost of - # doing this should be very small - - # escape the 2nd escape char we're using - my $chr1 = chr(1); - $text =~ s/\0/$chr1\0/g; + # Do this by replacing matches with \x{FDD2}$count\x{FDD3} + # \x{FDDx} is used because it's unlikely to occur in the text + # and are reserved unicode characters. We disable warnings for now + # until we require Perl 5.13.9 or newer. + no warnings 'utf8'; # However, note that adding the title (for buglinks) can affect things # In particular, attachment matches go before bug titles, so that titles @@ -184,11 +182,11 @@ sub quoteUrls { $1, $2, $3, $4, $5, $6, $7, $8, $9, $10]})) - && ("\0\0" . ($count-1) . "\0\0")/egx; + && ("\x{FDD2}" . ($count-1) . "\x{FDD3}")/egx; } else { $text =~ s/$match/($things[$count++] = $replace) - && ("\0\0" . ($count-1) . "\0\0")/egx; + && ("\x{FDD2}" . ($count-1) . "\x{FDD3}")/egx; } } @@ -198,7 +196,7 @@ sub quoteUrls { Bugzilla->params->{'sslbase'})) . ')'; $text =~ s~\b(${urlbase_re}\Qshow_bug.cgi?id=\E([0-9]+)(\#c([0-9]+))?)\b ~($things[$count++] = get_bug_link($3, $1, { comment_num => $5, user => $user })) && - ("\0\0" . ($count-1) . "\0\0") + ("\x{FDD2}" . ($count-1) . "\x{FDD3}") ~egox; # non-mailto protocols @@ -206,7 +204,7 @@ sub quoteUrls { $text =~ s~\b($safe_protocols) ~($tmp = html_quote($1)) && ($things[$count++] = "<a href=\"$tmp\">$tmp</a>") && - ("\0\0" . ($count-1) . "\0\0") + ("\x{FDD2}" . ($count-1) . "\x{FDD3}") ~egox; # We have to quote now, otherwise the html itself is escaped @@ -227,7 +225,7 @@ sub quoteUrls { # attachment links $text =~ s~\b(attachment\s*\#?\s*(\d+)(?:\s+\[details\])?) ~($things[$count++] = get_attachment_link($2, $1, $user)) && - ("\0\0" . ($count-1) . "\0\0") + ("\x{FDD2}" . ($count-1) . "\x{FDD3}") ~egmxi; # Current bug ID this comment belongs to @@ -257,9 +255,8 @@ sub quoteUrls { # Now remove the encoding hacks in reverse order for (my $i = $#things; $i >= 0; $i--) { - $text =~ s/\0\0($i)\0\0/$things[$i]/eg; + $text =~ s/\x{FDD2}($i)\x{FDD3}/$things[$i]/eg; } - $text =~ s/$chr1\0/\0/g; return $text; } diff --git a/docs/bugzilla.ent b/docs/bugzilla.ent index 1f6d5ba..30ba7cc 100644 --- a/docs/bugzilla.ent +++ b/docs/bugzilla.ent @@ -1,5 +1,5 @@ -<!ENTITY bz-ver "4.4.3"> -<!ENTITY bz-date "2014-04-17"> +<!ENTITY bz-ver "4.4.4"> +<!ENTITY bz-date "2014-04-18"> <!ENTITY current-year "2014"> <!ENTITY min-perl-ver "5.8.1"> @@ -12,7 +12,7 @@ <!ENTITY min-date-format-ver "2.23"> <!ENTITY min-datetime-ver "0.28"> <!ENTITY min-datetime-timezone-ver "0.71"> -<!ENTITY min-dbi-ver "1.614"> +<!ENTITY min-dbi-ver "1.54"> <!ENTITY min-template-ver "2.22"> <!ENTITY min-email-send-ver "2.04"> <!ENTITY min-email-mime-ver "1.904"> @@ -37,7 +37,7 @@ <!ENTITY min-json-rpc-ver "any"> <!ENTITY min-json-xs-ver "2.0"> <!ENTITY min-test-taint-ver "any"> -<!ENTITY min-html-parser-ver "3.67"> +<!ENTITY min-html-parser-ver "3.40"> <!ENTITY min-html-scrubber-ver "any"> <!ENTITY min-encode-ver "2.21"> <!ENTITY min-encode-detect-ver "any"> @@ -51,11 +51,11 @@ <!ENTITY min-io-scalar-ver "any">  +<!ENTITY min-dbd-pg-ver "2.7.0"> +<!ENTITY min-pg-ver "8.03.0000"> <!ENTITY min-dbd-mysql-ver "4.001"> <!ENTITY min-mysql-ver "5.0.15"> <!ENTITY min-dbd-sqlite-ver "1.29"> <!ENTITY min-sqlite-ver "3.6.22"> <!ENTITY min-dbd-oracle-ver "1.19"> <!ENTITY min-oracle-ver "10.02.0"> -<!ENTITY min-dbd-pg-ver "2.7.0"> -<!ENTITY min-pg-ver "8.03.0000"> diff --git a/docs/bugzilla.ent.tmpl b/docs/bugzilla.ent.tmpl index d2785d9..15cd475 100644 --- a/docs/bugzilla.ent.tmpl +++ b/docs/bugzilla.ent.tmpl @@ -1,5 +1,5 @@ -<!ENTITY bz-ver "4.4.3"> -<!ENTITY bz-date "2014-04-17"> +<!ENTITY bz-ver "4.4.4"> +<!ENTITY bz-date "2014-04-18"> <!ENTITY current-year "2014"> <!ENTITY min-perl-ver "5.8.1"> diff --git a/docs/en/xml/bugzilla.ent b/docs/en/xml/bugzilla.ent index 1f6d5ba..30ba7cc 100644 --- a/docs/en/xml/bugzilla.ent +++ b/docs/en/xml/bugzilla.ent @@ -1,5 +1,5 @@ -<!ENTITY bz-ver "4.4.3"> -<!ENTITY bz-date "2014-04-17"> +<!ENTITY bz-ver "4.4.4"> +<!ENTITY bz-date "2014-04-18"> <!ENTITY current-year "2014"> <!ENTITY min-perl-ver "5.8.1"> @@ -12,7 +12,7 @@ <!ENTITY min-date-format-ver "2.23"> <!ENTITY min-datetime-ver "0.28"> <!ENTITY min-datetime-timezone-ver "0.71"> -<!ENTITY min-dbi-ver "1.614"> +<!ENTITY min-dbi-ver "1.54"> <!ENTITY min-template-ver "2.22"> <!ENTITY min-email-send-ver "2.04"> <!ENTITY min-email-mime-ver "1.904"> @@ -37,7 +37,7 @@ <!ENTITY min-json-rpc-ver "any"> <!ENTITY min-json-xs-ver "2.0"> <!ENTITY min-test-taint-ver "any"> -<!ENTITY min-html-parser-ver "3.67"> +<!ENTITY min-html-parser-ver "3.40"> <!ENTITY min-html-scrubber-ver "any"> <!ENTITY min-encode-ver "2.21"> <!ENTITY min-encode-detect-ver "any"> @@ -51,11 +51,11 @@ <!ENTITY min-io-scalar-ver "any">  +<!ENTITY min-dbd-pg-ver "2.7.0"> +<!ENTITY min-pg-ver "8.03.0000"> <!ENTITY min-dbd-mysql-ver "4.001"> <!ENTITY min-mysql-ver "5.0.15"> <!ENTITY min-dbd-sqlite-ver "1.29"> <!ENTITY min-sqlite-ver "3.6.22"> <!ENTITY min-dbd-oracle-ver "1.19"> <!ENTITY min-oracle-ver "10.02.0"> -<!ENTITY min-dbd-pg-ver "2.7.0"> -<!ENTITY min-pg-ver "8.03.0000"> diff --git a/template/en/default/pages/release-notes.html.tmpl b/template/en/default/pages/release-notes.html.tmpl index 92d9ce6..dfd5c64 100644 --- a/template/en/default/pages/release-notes.html.tmpl +++ b/template/en/default/pages/release-notes.html.tmpl @@ -45,6 +45,13 @@ <h2 id="v44_point">Updates in this 4.4.x Release</h2> +<h3>4.4.4</h3> + +<p>This release fixes one regression introduced in [% terms.Bugzilla %] 4.4.3 by + <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=968576">security [% terms.bug %] 968576</a>: + URLs in [% terms.bug %] comments are displayed correctly again. + (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=998323">[% terms.Bug %] 998323</a>)</p> + <h3>4.4.3</h3> <p>This release fixes two security issues. See the

1 0

Alexandre Julliard : Import of upstream bugzilla release 4.4.4.
by Alexandre Julliard April 19, 2014

April 19, 2014

Module: bugzilla Branch: master Commit: 243d7ee5eeb145034f735c0c8c2e3b538f01dee6 URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=243d7ee5eeb145034f735… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Apr 19 15:50:39 2014 +0200 Import of upstream bugzilla release 4.4.4. --- Bugzilla/Constants.pm | 2 +- Bugzilla/Template.pm | 25 +++++++++------------ docs/bugzilla.ent | 12 +++++----- docs/bugzilla.ent.tmpl | 4 ++-- docs/en/xml/bugzilla.ent | 12 +++++----- template/en/default/pages/release-notes.html.tmpl | 7 ++++++ 6 files changed, 33 insertions(+), 29 deletions(-) diff --git a/Bugzilla/Constants.pm b/Bugzilla/Constants.pm index 230691c..33d4a56 100644 --- a/Bugzilla/Constants.pm +++ b/Bugzilla/Constants.pm @@ -182,7 +182,7 @@ use Memoize; # CONSTANTS # # Bugzilla version -use constant BUGZILLA_VERSION => "4.4.3"; +use constant BUGZILLA_VERSION => "4.4.4"; # Location of the remote and local XML files to track new releases. use constant REMOTE_FILE => 'http://updates.bugzilla.org/bugzilla-update.xml'; diff --git a/Bugzilla/Template.pm b/Bugzilla/Template.pm index ee610ff..c007283 100644 --- a/Bugzilla/Template.pm +++ b/Bugzilla/Template.pm @@ -151,13 +151,11 @@ sub quoteUrls { # (http://foo/bug#3 for example). Filtering that out filters valid # bug refs out, so we have to do replacements. # mailto can't contain space or #, so we don't have to bother for that - # Do this by escaping \0 to \1\0, and replacing matches with \0\0$count\0\0 - # \0 is used because it's unlikely to occur in the text, so the cost of - # doing this should be very small - - # escape the 2nd escape char we're using - my $chr1 = chr(1); - $text =~ s/\0/$chr1\0/g; + # Do this by replacing matches with \x{FDD2}$count\x{FDD3} + # \x{FDDx} is used because it's unlikely to occur in the text + # and are reserved unicode characters. We disable warnings for now + # until we require Perl 5.13.9 or newer. + no warnings 'utf8'; # However, note that adding the title (for buglinks) can affect things # In particular, attachment matches go before bug titles, so that titles @@ -184,11 +182,11 @@ sub quoteUrls { $1, $2, $3, $4, $5, $6, $7, $8, $9, $10]})) - && ("\0\0" . ($count-1) . "\0\0")/egx; + && ("\x{FDD2}" . ($count-1) . "\x{FDD3}")/egx; } else { $text =~ s/$match/($things[$count++] = $replace) - && ("\0\0" . ($count-1) . "\0\0")/egx; + && ("\x{FDD2}" . ($count-1) . "\x{FDD3}")/egx; } } @@ -198,7 +196,7 @@ sub quoteUrls { Bugzilla->params->{'sslbase'})) . ')'; $text =~ s~\b(${urlbase_re}\Qshow_bug.cgi?id=\E([0-9]+)(\#c([0-9]+))?)\b ~($things[$count++] = get_bug_link($3, $1, { comment_num => $5, user => $user })) && - ("\0\0" . ($count-1) . "\0\0") + ("\x{FDD2}" . ($count-1) . "\x{FDD3}") ~egox; # non-mailto protocols @@ -206,7 +204,7 @@ sub quoteUrls { $text =~ s~\b($safe_protocols) ~($tmp = html_quote($1)) && ($things[$count++] = "<a href=\"$tmp\">$tmp</a>") && - ("\0\0" . ($count-1) . "\0\0") + ("\x{FDD2}" . ($count-1) . "\x{FDD3}") ~egox; # We have to quote now, otherwise the html itself is escaped @@ -227,7 +225,7 @@ sub quoteUrls { # attachment links $text =~ s~\b(attachment\s*\#?\s*(\d+)(?:\s+\[details\])?) ~($things[$count++] = get_attachment_link($2, $1, $user)) && - ("\0\0" . ($count-1) . "\0\0") + ("\x{FDD2}" . ($count-1) . "\x{FDD3}") ~egmxi; # Current bug ID this comment belongs to @@ -257,9 +255,8 @@ sub quoteUrls { # Now remove the encoding hacks in reverse order for (my $i = $#things; $i >= 0; $i--) { - $text =~ s/\0\0($i)\0\0/$things[$i]/eg; + $text =~ s/\x{FDD2}($i)\x{FDD3}/$things[$i]/eg; } - $text =~ s/$chr1\0/\0/g; return $text; } diff --git a/docs/bugzilla.ent b/docs/bugzilla.ent index 1f6d5ba..30ba7cc 100644 --- a/docs/bugzilla.ent +++ b/docs/bugzilla.ent @@ -1,5 +1,5 @@ -<!ENTITY bz-ver "4.4.3"> -<!ENTITY bz-date "2014-04-17"> +<!ENTITY bz-ver "4.4.4"> +<!ENTITY bz-date "2014-04-18"> <!ENTITY current-year "2014"> <!ENTITY min-perl-ver "5.8.1"> @@ -12,7 +12,7 @@ <!ENTITY min-date-format-ver "2.23"> <!ENTITY min-datetime-ver "0.28"> <!ENTITY min-datetime-timezone-ver "0.71"> -<!ENTITY min-dbi-ver "1.614"> +<!ENTITY min-dbi-ver "1.54"> <!ENTITY min-template-ver "2.22"> <!ENTITY min-email-send-ver "2.04"> <!ENTITY min-email-mime-ver "1.904"> @@ -37,7 +37,7 @@ <!ENTITY min-json-rpc-ver "any"> <!ENTITY min-json-xs-ver "2.0"> <!ENTITY min-test-taint-ver "any"> -<!ENTITY min-html-parser-ver "3.67"> +<!ENTITY min-html-parser-ver "3.40"> <!ENTITY min-html-scrubber-ver "any"> <!ENTITY min-encode-ver "2.21"> <!ENTITY min-encode-detect-ver "any"> @@ -51,11 +51,11 @@ <!ENTITY min-io-scalar-ver "any">  +<!ENTITY min-dbd-pg-ver "2.7.0"> +<!ENTITY min-pg-ver "8.03.0000"> <!ENTITY min-dbd-mysql-ver "4.001"> <!ENTITY min-mysql-ver "5.0.15"> <!ENTITY min-dbd-sqlite-ver "1.29"> <!ENTITY min-sqlite-ver "3.6.22"> <!ENTITY min-dbd-oracle-ver "1.19"> <!ENTITY min-oracle-ver "10.02.0"> -<!ENTITY min-dbd-pg-ver "2.7.0"> -<!ENTITY min-pg-ver "8.03.0000"> diff --git a/docs/bugzilla.ent.tmpl b/docs/bugzilla.ent.tmpl index d2785d9..15cd475 100644 --- a/docs/bugzilla.ent.tmpl +++ b/docs/bugzilla.ent.tmpl @@ -1,5 +1,5 @@ -<!ENTITY bz-ver "4.4.3"> -<!ENTITY bz-date "2014-04-17"> +<!ENTITY bz-ver "4.4.4"> +<!ENTITY bz-date "2014-04-18"> <!ENTITY current-year "2014"> <!ENTITY min-perl-ver "5.8.1"> diff --git a/docs/en/xml/bugzilla.ent b/docs/en/xml/bugzilla.ent index 1f6d5ba..30ba7cc 100644 --- a/docs/en/xml/bugzilla.ent +++ b/docs/en/xml/bugzilla.ent @@ -1,5 +1,5 @@ -<!ENTITY bz-ver "4.4.3"> -<!ENTITY bz-date "2014-04-17"> +<!ENTITY bz-ver "4.4.4"> +<!ENTITY bz-date "2014-04-18"> <!ENTITY current-year "2014"> <!ENTITY min-perl-ver "5.8.1"> @@ -12,7 +12,7 @@ <!ENTITY min-date-format-ver "2.23"> <!ENTITY min-datetime-ver "0.28"> <!ENTITY min-datetime-timezone-ver "0.71"> -<!ENTITY min-dbi-ver "1.614"> +<!ENTITY min-dbi-ver "1.54"> <!ENTITY min-template-ver "2.22"> <!ENTITY min-email-send-ver "2.04"> <!ENTITY min-email-mime-ver "1.904"> @@ -37,7 +37,7 @@ <!ENTITY min-json-rpc-ver "any"> <!ENTITY min-json-xs-ver "2.0"> <!ENTITY min-test-taint-ver "any"> -<!ENTITY min-html-parser-ver "3.67"> +<!ENTITY min-html-parser-ver "3.40"> <!ENTITY min-html-scrubber-ver "any"> <!ENTITY min-encode-ver "2.21"> <!ENTITY min-encode-detect-ver "any"> @@ -51,11 +51,11 @@ <!ENTITY min-io-scalar-ver "any">  +<!ENTITY min-dbd-pg-ver "2.7.0"> +<!ENTITY min-pg-ver "8.03.0000"> <!ENTITY min-dbd-mysql-ver "4.001"> <!ENTITY min-mysql-ver "5.0.15"> <!ENTITY min-dbd-sqlite-ver "1.29"> <!ENTITY min-sqlite-ver "3.6.22"> <!ENTITY min-dbd-oracle-ver "1.19"> <!ENTITY min-oracle-ver "10.02.0"> -<!ENTITY min-dbd-pg-ver "2.7.0"> -<!ENTITY min-pg-ver "8.03.0000"> diff --git a/template/en/default/pages/release-notes.html.tmpl b/template/en/default/pages/release-notes.html.tmpl index 92d9ce6..dfd5c64 100644 --- a/template/en/default/pages/release-notes.html.tmpl +++ b/template/en/default/pages/release-notes.html.tmpl @@ -45,6 +45,13 @@ <h2 id="v44_point">Updates in this 4.4.x Release</h2> +<h3>4.4.4</h3> + +<p>This release fixes one regression introduced in [% terms.Bugzilla %] 4.4.3 by + <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=968576">security [% terms.bug %] 968576</a>: + URLs in [% terms.bug %] comments are displayed correctly again. + (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=998323">[% terms.Bug %] 998323</a>)</p> + <h3>4.4.3</h3> <p>This release fixes two security issues. See the

1 0

Alexandre Julliard : Merge branch 'upstream'.
by Alexandre Julliard April 19, 2014

April 19, 2014

Module: bugzilla Branch: master Commit: 821c704d40f72be109bf960bc3ec9325b082dcc4 URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=821c704d40f72be109bf9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Apr 19 15:51:45 2014 +0200 Merge branch 'upstream'. ---

1 0

Alexandre Julliard : Wine release 1.7.17
by Alexandre Julliard April 18, 2014

April 18, 2014

Module: website Branch: master Commit: 118dd11611ba4aa578755a2508eac16bb4c975cc URL: http://source.winehq.org/git/website.git/?a=commit;h=118dd11611ba4aa578755a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 18 21:02:14 2014 +0200 Wine release 1.7.17 --- news/en/2014041801.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/en/2014041801.xml b/news/en/2014041801.xml new file mode 100644 index 0000000..84dec3d --- /dev/null +++ b/news/en/2014041801.xml @@ -0,0 +1,15 @@ +<news> +<date>April 18, 2014</date> +<title>Wine 1.7.17 Released</title> +<body> +<p> The Wine development release 1.7.17 is now available.</p> +<p> <a href="{$root}/announce/1.7.17">What's new</a> in this release: +<ul> + <li>More implementations for the Task Scheduler.</li> + <li>C runtime made more compatible by sharing source files.</li> + <li>Fixes in the Mac OS X joystick support.</li> + <li>Various bug fixes.</li> +</ul> +<p>The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.17.tar.bz2">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