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

Paul Gofman : d3dx9: Set reg_component_count to 4 for immediate constants.
by Alexandre Julliard April 28, 2017

April 28, 2017

Module: wine Branch: master Commit: b4cac62546ab9bc170eda1b065e143704f53c2c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4cac62546ab9bc170eda1b06… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Apr 28 00:53:46 2017 +0200 d3dx9: Set reg_component_count to 4 for immediate constants. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index a5a8bb7..b17d0b5 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -155,7 +155,7 @@ static const struct } table_info[] = { - {sizeof(double), 1, PRES_VT_DOUBLE}, /* PRES_REGTAB_IMMED */ + {sizeof(double), 4, PRES_VT_DOUBLE}, /* PRES_REGTAB_IMMED */ {sizeof(float), 4, PRES_VT_FLOAT }, /* PRES_REGTAB_CONST */ {sizeof(float), 4, PRES_VT_FLOAT }, /* PRES_REGTAB_OCONST */ {sizeof(BOOL), 1, PRES_VT_BOOL }, /* PRES_REGTAB_OBCONST */ @@ -653,7 +653,7 @@ static void dump_ins(struct d3dx_regstore *rs, const struct d3dx_pres_ins *ins) static void dump_preshader(struct d3dx_preshader *pres) { - unsigned int i, immediate_count = pres->regs.table_sizes[PRES_REGTAB_IMMED]; + unsigned int i, immediate_count = pres->regs.table_sizes[PRES_REGTAB_IMMED] * 4; const double *immediates = pres->regs.tables[PRES_REGTAB_IMMED]; if (immediate_count) @@ -747,7 +747,14 @@ static HRESULT parse_preshader(struct d3dx_preshader *pres, unsigned int *ptr, u if (FAILED(hr)) return hr; - pres->regs.table_sizes[PRES_REGTAB_IMMED] = const_count; + if (const_count % table_info[PRES_REGTAB_IMMED].reg_component_count) + { + FIXME("const_count %u is not a multiple of %u.\n", const_count, + table_info[PRES_REGTAB_IMMED].reg_component_count); + return D3DXERR_INVALIDDATA; + } + pres->regs.table_sizes[PRES_REGTAB_IMMED] = const_count + / table_info[PRES_REGTAB_IMMED].reg_component_count; update_table_sizes_consts(pres->regs.table_sizes, &pres->inputs); for (i = 0; i < pres->ins_count; ++i) @@ -1183,9 +1190,7 @@ static double exec_get_arg(struct d3dx_regstore *rs, const struct d3dx_pres_oper else base_index = lrint(exec_get_reg_value(rs, opr->index_reg.table, opr->index_reg.offset)); - /* '4' is used instead of reg_component_count, as immediate constants (which have - * reg_component_count of 1) are still indexed as 4 values according to the tests. */ - offset = base_index * 4 + opr->reg.offset + comp; + offset = base_index * table_info[table].reg_component_count + opr->reg.offset + comp; reg_index = offset / table_info[table].reg_component_count; if (reg_index >= rs->table_sizes[table])

1 0

Henri Verbeet : d3dx9/tests: Cleanup compare_vectors.
by Alexandre Julliard April 28, 2017

April 28, 2017

Module: wine Branch: master Commit: a16cd73186361c1b6e70b5fabd1664af10ff9af7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a16cd73186361c1b6e70b5fab… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 27 23:52:43 2017 +0200 d3dx9/tests: Cleanup compare_vectors. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 111 +++++++++++++++++++++++++-------------------- 1 file changed, 63 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a16cd73186361c1b6e70b…

1 0

Kim Malmo : po: Update Norwegian translation.
by Alexandre Julliard April 28, 2017

April 28, 2017

Module: wine Branch: master Commit: 61d4ea17cb55c84bb624577d1fd7b72a02e71064 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61d4ea17cb55c84bb624577d1… Author: Kim Malmo <berencamlost(a)msn.com> Date: Thu Apr 27 20:55:37 2017 +0000 po: Update Norwegian translation. Signed-off-by: Kim Malmo <berencamlost(a)msn.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nb_NO.po | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index b9679f7..0e83766 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -12101,10 +12101,8 @@ msgid "regedit: Unable to delete the registry class '%1'.\n" msgstr "regedit: Kan ikke slette registerklassen \"%1\".\n" #: regedit.rc:398 -#, fuzzy -#| msgid "regedit: The line '%1' was not recognized.\n" msgid "regedit: The line contains invalid syntax.\n" -msgstr "regedit: Linjen \"%1\" ble ikke gjenkjent.\n" +msgstr "regedit: Linjen inneholder ugyldig syntaks.\n" #: regedit.rc:163 msgid "Quits the registry editor"

1 0

Henri Verbeet : d3dx9/tests: Get rid of compare_planes.
by Alexandre Julliard April 28, 2017

April 28, 2017

Module: wine Branch: master Commit: 733823c890f802c63bf97b5449d0ca658cd68f9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=733823c890f802c63bf97b544… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 27 23:52:44 2017 +0200 d3dx9/tests: Get rid of compare_planes. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 763454d..c0f6bee 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -199,18 +199,6 @@ static void expect_vec4_array_(unsigned int line, SIZE_T count, const D3DXVECTOR } } -#define compare_planes(exp, out) \ - for (i = 0; i < ARRAY_SIZE + 2; ++i) { \ - ok(relative_error(exp[i].a, out[i].a) < admitted_error && \ - relative_error(exp[i].b, out[i].b) < admitted_error && \ - relative_error(exp[i].c, out[i].c) < admitted_error && \ - relative_error(exp[i].d, out[i].d) < admitted_error, \ - "Got (%f, %f, %f, %f), expected (%f, %f, %f, %f) for index %d.\n", \ - out[i].a, out[i].b, out[i].c, out[i].d, \ - exp[i].a, exp[i].b, exp[i].c, exp[i].d, \ - i); \ - } - static void D3DXColorTest(void) { D3DXCOLOR color, color1, color2, expected, got; @@ -2449,8 +2437,16 @@ static void test_D3DXVec_Array(void) exp_plane[3].a = 74.0f; exp_plane[3].b = 84.0f; exp_plane[3].c = 94.0f; exp_plane[3].d = 104.0f; exp_plane[4].a = 66.0f; exp_plane[4].b = 76.0f; exp_plane[4].c = 86.0f; exp_plane[4].d = 96.0f; exp_plane[5].a = 58.0f; exp_plane[5].b = 68.0f; exp_plane[5].c = 78.0f; exp_plane[5].d = 88.0f; - D3DXPlaneTransformArray(out_plane + 1, sizeof(D3DXPLANE), inp_plane, sizeof(D3DXPLANE), &mat, ARRAY_SIZE); - compare_planes(exp_plane, out_plane); + D3DXPlaneTransformArray(&out_plane[1], sizeof(*out_plane), inp_plane, sizeof(*inp_plane), &mat, ARRAY_SIZE); + for (i = 0; i < ARRAY_SIZE + 2; ++i) + { + BOOL equal = compare_plane(&exp_plane[i], &out_plane[i], 0); + ok(equal, "Got unexpected plane {%.8e, %.8e, %.8e, %.8e} at index %u, expected {%.8e, %.8e, %.8e, %.8e}.\n", + out_plane[i].a, out_plane[i].b, out_plane[i].c, out_plane[i].d, i, + exp_plane[i].a, exp_plane[i].b, exp_plane[i].c, exp_plane[i].d); + if (!equal) + break; + } } static void test_D3DXFloat_Array(void)

1 0

Henri Verbeet : d3dx9/tests: Get rid of compare_rotation.
by Alexandre Julliard April 28, 2017

April 28, 2017

Module: wine Branch: master Commit: 8c81500daa264f11547c28152474c892087eb271 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c81500daa264f11547c28152… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 27 23:52:40 2017 +0200 d3dx9/tests: Get rid of compare_rotation. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 222 ++++++++++++++++++++++----------------------- 1 file changed, 109 insertions(+), 113 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8c81500daa264f11547c2…

1 0

Julian Rüger : Update German translation of the Downloads page
by Jeremy Newman April 28, 2017

April 28, 2017

Module: website Branch: master Commit: b6d110f8231ea693f50ceb0a1460aa4d78223855 URL: http://source.winehq.org/git/website.git/?a=commit;h=b6d110f8231ea693f50ceb… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Apr 28 17:18:57 2017 +0200 Update German translation of the Downloads page Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- templates/de/download.template | 330 ++++++++++++++++++++--------------------- 1 file changed, 164 insertions(+), 166 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=b6d110f8231ea693f5…

1 0

Jeremy Newman : change one more incorrect call to query_real_escape_string
by Jeremy Newman April 28, 2017

April 28, 2017

Module: appdb Branch: master Commit: f67bcdc72e77b2783efa04a94a1a6ccdb48c2983 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=f67bcdc72e77b2783efa04a9… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Apr 28 10:02:40 2017 -0500 change one more incorrect call to query_real_escape_string --- include/db_filter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/db_filter.php b/include/db_filter.php index aa3fbc9..694eb19 100644 --- a/include/db_filter.php +++ b/include/db_filter.php @@ -210,7 +210,7 @@ class FilterSet $sWhere = $this->getFilterCount() ? 'WHERE '.$this->getWhereClause() : ''; $sQuery = "SELECT * FROM $sTable $sWhere"; - $iLimit = query_real_escape_string($iLimit); + $iLimit = query_escape_string($iLimit); if($iLimit) $sQuery .= " LIMIT 0,$iLimit";

1 0

Rosanne DiMesio : Correct function name
by Jeremy Newman April 28, 2017

April 28, 2017

Module: appdb Branch: master Commit: f70d54d8a0ea4dee0fa4b5367986091ed7ef5b72 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=f70d54d8a0ea4dee0fa4b536… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Fri Apr 28 08:16:49 2017 -0500 Correct function name The function is defined in query.php as query_escape_string, not query_real_escape_string. Fixes bug 41785 and a similar issue with the Comments Management admin page. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/comment.php | 6 +++--- include/objectManager.php | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/comment.php b/include/comment.php index f682ecc..c2c425d 100644 --- a/include/comment.php +++ b/include/comment.php @@ -327,13 +327,13 @@ class Comment { if($iNumRows) { - $iStart = query_real_escape_string($iStart); - $iNumRows = query_real_escape_string($iNumRows); + $iStart = query_escape_string($iStart); + $iNumRows = query_escape_string($iNumRows); $sLimit = " LIMIT $iStart,$iNumRows"; } if($sOrderBy) - $sOrderBy = " ORDER BY ".query_real_escape_string($sOrderBy); + $sOrderBy = " ORDER BY ".query_escape_string($sOrderBy); $hResult = query_parameters("SELECT * FROM appComments$sExtraTables$sWhereFilter$sOrderBy$sLimit"); diff --git a/include/objectManager.php b/include/objectManager.php index 182a8b9..10c52d3 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -1749,10 +1749,10 @@ class ObjectManager $iRows = $oObject->objectGetEntriesCount($sState); } else { - $iRows = query_real_escape_string($iRows); + $iRows = query_escape_string($iRows); } - $iStart = query_real_escape_string($iStart); + $iStart = query_escape_string($iStart); $sLimit = " LIMIT $iStart,$iRows"; }

1 0

Julian Rüger : German translation for release 2.6
by Jeremy Newman April 28, 2017

April 28, 2017

Module: website Branch: master Commit: 228dad56c199b762e76532164113d9e48e484bc2 URL: http://source.winehq.org/git/website.git/?a=commit;h=228dad56c199b762e76532… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Apr 28 16:02:50 2017 +0200 German translation for release 2.6 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2017041301.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2017041301.xml b/news/de/2017041301.xml new file mode 100644 index 0000000..2238a3b --- /dev/null +++ b/news/de/2017041301.xml @@ -0,0 +1,16 @@ +<news> +<date>13. April 2017</date> +<title>Wine 2.6 freigegeben</title> +<body> + Die Entwicklungsversion 2.6 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/2.6">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Multi-threaded Command-Stream in Direct3D.</li> + <li>Zusätzliche Shader-Model-5-Befehle.</li> + <li>Mehr Unterstützung von 3D-Texturen.</li> + <li>Bessere Font-Transformationen in DirectWrite.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/2.x/wine-2.6.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 2.4
by Jeremy Newman April 28, 2017

April 28, 2017

Module: website Branch: master Commit: 5d90b9b4a6938b91e0834048d242cde709d8aba5 URL: http://source.winehq.org/git/website.git/?a=commit;h=5d90b9b4a6938b91e08340… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Apr 28 15:55:30 2017 +0200 German translation for release 2.4 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2017031701.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2017031701.xml b/news/de/2017031701.xml new file mode 100644 index 0000000..aa705af --- /dev/null +++ b/news/de/2017031701.xml @@ -0,0 +1,17 @@ +<news> +<date>17. März 2017</date> +<title>Wine 2.4 freigegeben</title> +<body> + Die Entwicklungsversion 2.4 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/2.4">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Eigene Implementierung kryptografischer Hashes.</li> + <li>Mono-Engine aktualisiert mit Korrekturen des Upstream-Projektes.</li> + <li>Weitere Arbeit am Direct3D-Command-Stream.</li> + <li>Simulierte Kursiv- und Fettschrift in DirectWrite.</li> + <li>Verbesserungen am XML-Reader.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/2.x/wine-2.4.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0