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

Henri Verbeet : d3d8/tests: Use a separate device for fog_test().
by Alexandre Julliard 21 Apr '14

21 Apr '14

Module: wine Branch: master Commit: 322e6dd5879984d3e14b2f55c8d99b87b34bb5b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=322e6dd5879984d3e14b2f55c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 21 08:10:34 2014 +0200 d3d8/tests: Use a separate device for fog_test(). --- dlls/d3d8/tests/visual.c | 158 ++++++++++++++++++++++++++-------------------- 1 file changed, 89 insertions(+), 69 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 61acad2..47c2d59 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -372,56 +372,77 @@ static void clear_test(IDirect3DDevice8 *device) IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); } -struct sVertex { - float x, y, z; - DWORD diffuse; - DWORD specular; -}; - -struct sVertexT { - float x, y, z, rhw; - DWORD diffuse; - DWORD specular; -}; - -static void fog_test(IDirect3DDevice8 *device) +static void fog_test(void) { + float start = 0.0f, end = 1.0f; + IDirect3DDevice8 *device; + IDirect3D8 *d3d; + D3DCOLOR color; + ULONG refcount; + D3DCAPS8 caps; + HWND window; HRESULT hr; - DWORD color; - float start = 0.0, end = 1.0; - - /* Gets full z based fog with linear fog, no fog with specular color */ - struct sVertex untransformed_1[] = { - {-1, -1, 0.1f, 0xFFFF0000, 0xFF000000 }, - {-1, 0, 0.1f, 0xFFFF0000, 0xFF000000 }, - { 0, 0, 0.1f, 0xFFFF0000, 0xFF000000 }, - { 0, -1, 0.1f, 0xFFFF0000, 0xFF000000 }, - }; - /* Ok, I am too lazy to deal with transform matrices */ - struct sVertex untransformed_2[] = { - {-1, 0, 1.0f, 0xFFFF0000, 0xFF000000 }, - {-1, 1, 1.0f, 0xFFFF0000, 0xFF000000 }, - { 0, 1, 1.0f, 0xFFFF0000, 0xFF000000 }, - { 0, 0, 1.0f, 0xFFFF0000, 0xFF000000 }, - }; - /* Untransformed ones. Give them a different diffuse color to make the test look - * nicer. It also makes making sure that they are drawn correctly easier. - */ - struct sVertexT transformed_1[] = { - {320, 0, 1.0f, 1.0f, 0xFFFFFF00, 0xFF000000 }, - {640, 0, 1.0f, 1.0f, 0xFFFFFF00, 0xFF000000 }, - {640, 240, 1.0f, 1.0f, 0xFFFFFF00, 0xFF000000 }, - {320, 240, 1.0f, 1.0f, 0xFFFFFF00, 0xFF000000 }, - }; - struct sVertexT transformed_2[] = { - {320, 240, 1.0f, 1.0f, 0xFFFFFF00, 0xFF000000 }, - {640, 240, 1.0f, 1.0f, 0xFFFFFF00, 0xFF000000 }, - {640, 480, 1.0f, 1.0f, 0xFFFFFF00, 0xFF000000 }, - {320, 480, 1.0f, 1.0f, 0xFFFFFF00, 0xFF000000 }, + + /* Gets full z based fog with linear fog, no fog with specular color. */ + static const struct + { + float x, y, z; + D3DCOLOR diffuse; + D3DCOLOR specular; + } + untransformed_1[] = + { + {-1.0f, -1.0f, 0.1f, 0xffff0000, 0xff000000}, + {-1.0f, 0.0f, 0.1f, 0xffff0000, 0xff000000}, + { 0.0f, 0.0f, 0.1f, 0xffff0000, 0xff000000}, + { 0.0f, -1.0f, 0.1f, 0xffff0000, 0xff000000}, + }, + /* Ok, I am too lazy to deal with transform matrices. */ + untransformed_2[] = + { + {-1.0f, 0.0f, 1.0f, 0xffff0000, 0xff000000}, + {-1.0f, 1.0f, 1.0f, 0xffff0000, 0xff000000}, + { 0.0f, 1.0f, 1.0f, 0xffff0000, 0xff000000}, + { 0.0f, 0.0f, 1.0f, 0xffff0000, 0xff000000}, + }, + far_quad1[] = + { + {-1.0f, -1.0f, 0.5f, 0xffff0000, 0xff000000}, + {-1.0f, 0.0f, 0.5f, 0xffff0000, 0xff000000}, + { 0.0f, 0.0f, 0.5f, 0xffff0000, 0xff000000}, + { 0.0f, -1.0f, 0.5f, 0xffff0000, 0xff000000}, + }, + far_quad2[] = + { + {-1.0f, 0.0f, 1.5f, 0xffff0000, 0xff000000}, + {-1.0f, 1.0f, 1.5f, 0xffff0000, 0xff000000}, + { 0.0f, 1.0f, 1.5f, 0xffff0000, 0xff000000}, + { 0.0f, 0.0f, 1.5f, 0xffff0000, 0xff000000}, }; - WORD Indices[] = {0, 1, 2, 2, 3, 0}; - D3DCAPS8 caps; + /* Untransformed ones. Give them a different diffuse color to make the + * test look nicer. It also makes making sure that they are drawn + * correctly easier. */ + static const struct + { + float x, y, z, rhw; + D3DCOLOR diffuse; + D3DCOLOR specular; + } + transformed_1[] = + { + {320.0f, 0.0f, 1.0f, 1.0f, 0xffffff00, 0xff000000}, + {640.0f, 0.0f, 1.0f, 1.0f, 0xffffff00, 0xff000000}, + {640.0f, 240.0f, 1.0f, 1.0f, 0xffffff00, 0xff000000}, + {320.0f, 240.0f, 1.0f, 1.0f, 0xffffff00, 0xff000000}, + }, + transformed_2[] = + { + {320.0f, 240.0f, 1.0f, 1.0f, 0xffffff00, 0xff000000}, + {640.0f, 240.0f, 1.0f, 1.0f, 0xffffff00, 0xff000000}, + {640.0f, 480.0f, 1.0f, 1.0f, 0xffffff00, 0xff000000}, + {320.0f, 480.0f, 1.0f, 1.0f, 0xffffff00, 0xff000000}, + }; static const D3DMATRIX ident_mat = {{{ 1.0f, 0.0f, 0.0f, 0.0f, @@ -450,36 +471,38 @@ static void fog_test(IDirect3DDevice8 *device) 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, -1.0f, 1.0f, }}}; + static const WORD Indices[] = {0, 1, 2, 2, 3, 0}; - struct sVertex far_quad1[] = - { - {-1.0f, -1.0f, 0.5f, 0xffff0000, 0xff000000}, - {-1.0f, 0.0f, 0.5f, 0xffff0000, 0xff000000}, - { 0.0f, 0.0f, 0.5f, 0xffff0000, 0xff000000}, - { 0.0f, -1.0f, 0.5f, 0xffff0000, 0xff000000}, - }; - struct sVertex far_quad2[] = + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) { - {-1.0f, 0.0f, 1.5f, 0xffff0000, 0xff000000}, - {-1.0f, 1.0f, 1.5f, 0xffff0000, 0xff000000}, - { 0.0f, 1.0f, 1.5f, 0xffff0000, 0xff000000}, - { 0.0f, 0.0f, 1.5f, 0xffff0000, 0xff000000}, - }; + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } memset(&caps, 0, sizeof(caps)); hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); ok(hr == D3D_OK, "IDirect3DDevice8_GetDeviceCaps returned %08x\n", hr); - hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff00ff, 0.0, 0); ok(hr == D3D_OK, "IDirect3DDevice8_Clear returned %#08x\n", hr); /* Setup initial states: No lighting, fog on, fog color */ + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ZENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable D3DRS_ZENABLE, hr %#x.\n", hr); hr = IDirect3DDevice8_SetRenderState(device, D3DRS_LIGHTING, FALSE); ok(hr == D3D_OK, "Turning off lighting returned %#08x\n", hr); hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGENABLE, TRUE); ok(hr == D3D_OK, "Turning on fog calculations returned %#08x\n", hr); hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGCOLOR, 0xFF00FF00 /* A nice green */); ok(hr == D3D_OK, "Setting fog color returned %#08x\n", hr); + /* Some of the tests seem to depend on the projection matrix explicitly + * being set to an identity matrix, even though that's the default. + * (AMD Radeon HD 6310, Windows 7) */ + hr = IDirect3DDevice8_SetTransform(device, D3DTS_PROJECTION, &ident_mat); + ok(SUCCEEDED(hr), "Failed to set projection transform, hr %#x.\n", hr); /* First test: Both table fog and vertex fog off */ hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGTABLEMODE, D3DFOG_NONE); @@ -612,20 +635,17 @@ static void fog_test(IDirect3DDevice8 *device) "Fogged out quad has color %08x\n", color); IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); - - hr = IDirect3DDevice8_SetTransform(device, D3DTS_WORLDMATRIX(0), &ident_mat); - ok(hr == D3D_OK, "SetTransform returned %#08x\n", hr); - hr = IDirect3DDevice8_SetTransform(device, D3DTS_PROJECTION, &ident_mat); - ok(hr == D3D_OK, "SetTransform returned %#08x\n", hr); } else { skip("D3DPRASTERCAPS_FOGTABLE not supported, skipping some fog tests\n"); } - /* Turn off the fog master switch to avoid confusing other tests */ - hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGENABLE, FALSE); - ok(hr == D3D_OK, "Turning off fog calculations returned %#08x\n", hr); + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D8_Release(d3d); + DestroyWindow(window); } /* This tests fog in combination with shaders. @@ -4961,7 +4981,6 @@ START_TEST(visual) depth_clamp_test(device_ptr); lighting_test(device_ptr); clear_test(device_ptr); - fog_test(device_ptr); refcount = IDirect3DDevice8_Release(device_ptr); ok(!refcount, "Device has %u references left.\n", refcount); @@ -4969,6 +4988,7 @@ cleanup: IDirect3D8_Release(d3d); DestroyWindow(window); + fog_test(); z_range_test(); offscreen_test(); alpha_test();

1 0

Henri Verbeet : d3d8/tests: Use a separate device for clear_test().
by Alexandre Julliard 21 Apr '14

21 Apr '14

Module: wine Branch: master Commit: 00630f67a44e7a63f010a0cad04284c38bbdc2ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=00630f67a44e7a63f010a0cad… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 21 08:10:35 2014 +0200 d3d8/tests: Use a separate device for clear_test(). --- dlls/d3d8/tests/visual.c | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 47c2d59..1238398 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -297,13 +297,26 @@ static void lighting_test(IDirect3DDevice8 *device) ok(hr == D3D_OK, "IDirect3DDevice8_SetRenderState returned %#08x\n", hr); } -static void clear_test(IDirect3DDevice8 *device) +static void clear_test(void) { /* Tests the correctness of clearing parameters */ + D3DRECT rect_negneg, rect[2]; + IDirect3DDevice8 *device; + IDirect3D8 *d3d; + D3DCOLOR color; + ULONG refcount; + HWND window; HRESULT hr; - D3DRECT rect[2]; - D3DRECT rect_negneg; - DWORD color; + + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); ok(hr == D3D_OK, "IDirect3DDevice8_Clear failed with %#08x\n", hr); @@ -370,6 +383,12 @@ static void clear_test(IDirect3DDevice8 *device) "Clear with count = 1, rect = NULL has color %#08x\n", color); IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D8_Release(d3d); + DestroyWindow(window); } static void fog_test(void) @@ -4980,7 +4999,6 @@ START_TEST(visual) test_sanity(device_ptr); depth_clamp_test(device_ptr); lighting_test(device_ptr); - clear_test(device_ptr); refcount = IDirect3DDevice8_Release(device_ptr); ok(!refcount, "Device has %u references left.\n", refcount); @@ -4988,6 +5006,7 @@ cleanup: IDirect3D8_Release(d3d); DestroyWindow(window); + clear_test(); fog_test(); z_range_test(); offscreen_test();

1 0

Andrey Gusev : Ukrainian translation for release 1.7.17
by Jeremy Newman 21 Apr '14

21 Apr '14

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

Frédéric Delanoy : French translation for release 1.7.17
by Jeremy Newman 21 Apr '14

21 Apr '14

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

Scott Ritchie : Update download page to refer to new Ubuntu release
by Jeremy Newman 21 Apr '14

21 Apr '14

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

Andrey Gusev : Update download page to Ubuntu 14.04 LTS in Ukrainian
by Jeremy Newman 21 Apr '14

21 Apr '14

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

Alexandre Julliard : Import of upstream bugzilla release 4.4.4.
by Alexandre Julliard 19 Apr '14

19 Apr '14

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 19 Apr '14

19 Apr '14

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 : Import of upstream bugzilla release 4.4.4.
by Alexandre Julliard 19 Apr '14

19 Apr '14

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 : Wine release 1.7.17
by Alexandre Julliard 18 Apr '14

18 Apr '14

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