May 2017 - Wine-Commits - list.winehq.org

Józef Kucia : wined3d: Use ARRAY_SIZE() in wined3d_format_get_color_key_conversion().
by Alexandre Julliard May 30, 2017

May 30, 2017

Module: wine Branch: master Commit: 0d9ce15ff6559f3595de8f5c0024821d9097ef6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d9ce15ff6559f3595de8f5c0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 29 10:53:36 2017 +0200 wined3d: Use ARRAY_SIZE() in wined3d_format_get_color_key_conversion(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 5c03c79..afe35fa 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1032,7 +1032,7 @@ const struct wined3d_color_key_conversion * wined3d_format_get_color_key_convers if (need_alpha_ck && (texture->async.flags & WINED3D_TEXTURE_ASYNC_COLOR_KEY)) { - for (i = 0; i < sizeof(color_key_info) / sizeof(*color_key_info); ++i) + for (i = 0; i < ARRAY_SIZE(color_key_info); ++i) { if (color_key_info[i].src_format == format->id) return &color_key_info[i].conversion;

1 0

Józef Kucia : wined3d: Bind frag data location for core context draw quad shader.
by Alexandre Julliard May 30, 2017

May 30, 2017

Module: wine Branch: master Commit: 0d3dc7c971dd6ab77eda266f41048caca07300b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d3dc7c971dd6ab77eda266f4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 29 10:53:33 2017 +0200 wined3d: Bind frag data location for core context draw quad shader. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index cc58042..4694195 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2155,6 +2155,9 @@ static void draw_test_quad(struct wined3d_caps_gl_ctx *ctx, const struct wined3d GL_EXTCALL(glBindAttribLocation(ctx->test_program_id, 0, "pos")); GL_EXTCALL(glBindAttribLocation(ctx->test_program_id, 1, "color")); + if (!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) + GL_EXTCALL(glBindFragDataLocation(ctx->test_program_id, 0, "fragment_color")); + GL_EXTCALL(glCompileShader(vs_id)); print_glsl_info_log(gl_info, vs_id, FALSE); GL_EXTCALL(glCompileShader(fs_id));

1 0

Rosanne DiMesio : Allow Extra Comments text to wrap
by Jeremy Newman May 30, 2017

May 30, 2017

Module: appdb Branch: master Commit: 1a4adc1cc21ffb878bf5b9b8d92833bdc591e669 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=1a4adc1cc21ffb878bf5b9b8… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Tue May 30 13:56:58 2017 -0500 Allow Extra Comments text to wrap Wraps text in the Extra Comments field to the window so users don't have to scroll horizontally. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/testData.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/testData.php b/include/testData.php index 8ba45c1..07918bb 100644 --- a/include/testData.php +++ b/include/testData.php @@ -524,7 +524,7 @@ class testData{ return "What works\n{$this->shWhatWorks}\n". "What does not\n{$this->shWhatDoesnt}\n". "What was not tested\n{$this->shWhatNotTested}\n". - "Additional Comments\n<pre>{$this->sComments}</pre>\n"; + "Additional Comments\n<pre style='white-space: pre-wrap;'>{$this->sComments}</pre>\n"; } function CreateTestTable()

1 0

Rosanne DiMesio : admin.php: add functions to delete orphan versions and comments
by Jeremy Newman May 30, 2017

May 30, 2017

Module: appdb Branch: master Commit: 37f72a60b0231e0478aba1f4574f9dcc326959b6 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=37f72a60b0231e0478aba1f4… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Tue May 30 10:20:12 2017 -0500 admin.php: add functions to delete orphan versions and comments The cron cleanup script identifies orphan versions but does not delete them, and admins have had no way to delete them. Bug 26958 stayed open for 6 years because admins had no way to delete orphan comments. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- admin.php | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/admin.php b/admin.php index 90d1fc8..f38924d 100644 --- a/admin.php +++ b/admin.php @@ -203,11 +203,30 @@ function fixNoteLinks() } +function deleteOrphanComments() +{ + $sQuery = "DELETE FROM appComments WHERE NOT EXISTS( SELECT appVersion.versionId FROM appVersion"; + $sQuery.= " WHERE appVersion.versionId = appComments.versionId )"; + $hResult = query_parameters($sQuery); + + echo "Deleted ".query_affected_rows()." orphan comments. "; +} + +function deleteOrphanVersions() +{ + $sQuery = "DELETE FROM appVersion WHERE appId = 0 and state != 'deleted'"; + $hResult = query_parameters($sQuery); + + echo "Deleted ".query_affected_rows()." orphan versions. "; +} + function showChoices() { echo '<a href="admin.php?sAction=fixNoteLinks">Fix/Show note links</a> '; echo '<a href="admin.php?sAction=updateAppMaintainerStates">Update application maintainer states</a> '; echo '<a href="admin.php?sAction=updateVersionMaintainerStates">Update version maintainer states</a> '; + echo '<a href="admin.php?sAction=deleteOrphanComments">Delete Orphan Comments</a> '; + echo '<a href="admin.php?sAction=deleteOrphanVersions">Delete Orphan Versions</a> '; } switch(getInput('sAction', $aClean)) @@ -223,7 +242,15 @@ switch(getInput('sAction', $aClean)) case 'fixNoteLinks': fixNoteLinks(); break; - + + case 'deleteOrphanComments': + deleteOrphanComments(); + break; + + case 'deleteOrphanVersions': + deleteOrphanVersions(); + break; + default: showChoices(); break;

1 0

Rosanne DiMesio : Allow admins to view comments in unmaintained entries
by Jeremy Newman May 30, 2017

May 30, 2017

Module: appdb Branch: master Commit: 1868edfb61cda174f9c3a364ab1071d8ebf6a081 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=1868edfb61cda174f9c3a364… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Tue May 30 12:00:50 2017 -0500 Allow admins to view comments in unmaintained entries Needed for comment cleanup in unmaintained entries. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/version.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/version.php b/include/version.php index 45459fd..2c09be7 100644 --- a/include/version.php +++ b/include/version.php @@ -1164,7 +1164,7 @@ EOT; // Comments Section echo "<h2 id=\"viewComments\" class=\"whq-app-title\">Comments</h2>\n"; - if(sizeof($aMaintainers)>0) + if((sizeof($aMaintainers)>0) || ($_SESSION['current']->hasPriv("admin"))) { if($this->iVersionId) Comment::view_app_comments($this->iVersionId);

1 0

Alexandre Julliard : Wine release 2.9
by Alexandre Julliard May 26, 2017

May 26, 2017

Module: website Branch: master Commit: bd3a62fc62b9ab583938e8b6525b74bcf2c72f4a URL: http://source.winehq.org/git/website.git/?a=commit;h=bd3a62fc62b9ab583938e8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 26 09:40:35 2017 +0200 Wine release 2.9 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2017052601.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2017052601.xml b/news/en/2017052601.xml new file mode 100644 index 0000000..9374dca --- /dev/null +++ b/news/en/2017052601.xml @@ -0,0 +1,16 @@ +<news> +<date>May 26, 2017</date> +<title>Wine 2.9 Released</title> +<body> + The Wine development release 2.9 is now available. + <a href="{$root}/announce/2.9">What's new</a> in this release: +<ul> + <li>Support for tesselation shaders in Direct3D.</li> + <li>Binary mode support in WebServices.</li> + <li>Clipboard changes detected through Xfixes.</li> + <li>User interface improvements in RegEdit.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/2.x/wine-2.9.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

André Hentschel : wsdapi: Fix WSDXMLBuildAnyForSingleElement spec file entry.
by Alexandre Julliard May 26, 2017

May 26, 2017

Module: wine Branch: master Commit: d50b3b3e5bb4fe5f40c36dcb522287698c171f0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d50b3b3e5bb4fe5f40c36dcb5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu May 25 20:51:32 2017 +0200 wsdapi: Fix WSDXMLBuildAnyForSingleElement spec file entry. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/wsdapi.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wsdapi/wsdapi.spec b/dlls/wsdapi/wsdapi.spec index fd89be7..7954ede 100644 --- a/dlls/wsdapi/wsdapi.spec +++ b/dlls/wsdapi/wsdapi.spec @@ -38,7 +38,7 @@ @ stub WSDUriEncode @ stdcall WSDXMLAddChild(ptr ptr) @ stdcall WSDXMLAddSibling(ptr ptr) -@ stdcall WSDXMLBuildAnyForSingleElement(ptr ptr ptr) +@ stdcall WSDXMLBuildAnyForSingleElement(ptr wstr ptr) @ stdcall WSDXMLCleanupElement(ptr) @ stdcall WSDXMLCreateContext(ptr) @ stub WSDXMLGetNameFromBuiltinNamespace

1 0

Tag wine-2.9 : Alexandre Julliard : Release 2.9
by Alexandre Julliard May 26, 2017

May 26, 2017

Module: wine Branch: refs/tags/wine-2.9 Tag: a4a4385d9f47dc2d71060a54439434be4ed2e67e URL: http://source.winehq.org/git/wine.git/?a=tag;h=a4a4385d9f47dc2d71060a544394… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 26 09:38:04 2017 +0200 Release 2.9

1 0

Alexandre Julliard : Release 2.9.
by Alexandre Julliard May 26, 2017

May 26, 2017

Module: wine Branch: master Commit: 7d2ce5cbe7c84dd193e982d4cfe882265867f998 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d2ce5cbe7c84dd193e982d4c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 26 09:38:04 2017 +0200 Release 2.9. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 713 +++++++++++++++++++++++++++++++++----------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 393 insertions(+), 341 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7d2ce5cbe7c84dd193e98…

1 0

Hugh McMaster : regedit/tests: Add tests for importing Windows 3.1 registry data.
by Alexandre Julliard May 26, 2017

May 26, 2017

Module: wine Branch: master Commit: 51743827c97929933f1b1062265059a728de5636 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51743827c97929933f1b10622… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri May 26 05:32:25 2017 +0000 regedit/tests: Add tests for importing Windows 3.1 registry data. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 50 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 0bb10b7..d145f0b 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -759,6 +759,55 @@ static void test_invalid_import(void) ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: %d\n", lr); } +static void test_invalid_import_31(void) +{ + HKEY hkey; + LONG lr; + + lr = RegCreateKeyExA(HKEY_CLASSES_ROOT, KEY_BASE, 0, NULL, REG_OPTION_NON_VOLATILE, + KEY_READ, NULL, &hkey, NULL); + ok(lr == ERROR_SUCCESS, "RegCreateKeyExA failed: %d\n", lr); + + /* Test character validity at the start of the line */ + exec_import_str("REGEDIT\r\n" + " HKEY_CLASSES_ROOT\\" KEY_BASE " = Value1a\r\n"); + todo_wine verify_reg_nonexist(hkey, ""); + + exec_import_str("REGEDIT\r\n" + " HKEY_CLASSES_ROOT\\" KEY_BASE " = Value1b\r\n"); + todo_wine verify_reg_nonexist(hkey, ""); + + exec_import_str("REGEDIT\r\n" + "\tHKEY_CLASSES_ROOT\\" KEY_BASE " = Value1c\r\n"); + todo_wine verify_reg_nonexist(hkey, ""); + + exec_import_str("REGEDIT\r\n" + ";HKEY_CLASSES_ROOT\\" KEY_BASE " = Value2a\r\n"); + todo_wine verify_reg_nonexist(hkey, ""); + + exec_import_str("REGEDIT\r\n" + "#HKEY_CLASSES_ROOT\\" KEY_BASE " = Value2b\r\n"); + todo_wine verify_reg_nonexist(hkey, ""); + + /* Test case sensitivity */ + exec_import_str("REGEDIT\r\n" + "hkey_classes_root\\" KEY_BASE " = Value3a\r\n"); + todo_wine verify_reg_nonexist(hkey, ""); + + exec_import_str("REGEDIT\r\n" + "hKEY_CLASSES_ROOT\\" KEY_BASE " = Value3b\r\n"); + todo_wine verify_reg_nonexist(hkey, ""); + + exec_import_str("REGEDIT\r\n" + "Hkey_Classes_Root\\" KEY_BASE " = Value3c\r\n"); + todo_wine verify_reg_nonexist(hkey, ""); + + RegCloseKey(hkey); + + lr = RegDeleteKeyA(HKEY_CLASSES_ROOT, KEY_BASE); + ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: %d\n", lr); +} + static void test_comments(void) { LONG lr; @@ -1077,6 +1126,7 @@ START_TEST(regedit) test_basic_import(); test_basic_import_31(); test_invalid_import(); + test_invalid_import_31(); test_comments(); test_import_with_whitespace(); }

1 0