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

Paul Gofman : d3dx9: Return an error for out of bounds input register in parse_preshader().
by Alexandre Julliard 28 Apr '17

28 Apr '17

Module: wine Branch: master Commit: 30bc3bab3090dce8e96880fb9f0026473dc18379 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30bc3bab3090dce8e96880fb9… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Apr 27 14:05:46 2017 +0300 d3dx9: Return an error for out of bounds input register in parse_preshader(). 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 | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 0f23488..a5a8bb7 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -749,6 +749,7 @@ static HRESULT parse_preshader(struct d3dx_preshader *pres, unsigned int *ptr, u pres->regs.table_sizes[PRES_REGTAB_IMMED] = const_count; + update_table_sizes_consts(pres->regs.table_sizes, &pres->inputs); for (i = 0; i < pres->ins_count; ++i) { for (j = 0; j < pres_op_info[pres->ins[i].op].input_count; ++j) @@ -770,13 +771,17 @@ static HRESULT parse_preshader(struct d3dx_preshader *pres, unsigned int *ptr, u table = pres->ins[i].inputs[j].index_reg.table; reg_idx = get_reg_offset(table, pres->ins[i].inputs[j].index_reg.offset); } - update_table_size(pres->regs.table_sizes, table, reg_idx); + if (reg_idx >= pres->regs.table_sizes[table]) + { + FIXME("Out of bounds register index, i %u, j %u, table %u, reg_idx %u.", + i, j, table, reg_idx); + return D3DXERR_INVALIDDATA; + } } update_table_size(pres->regs.table_sizes, pres->ins[i].output.reg.table, get_reg_offset(pres->ins[i].output.reg.table, pres->ins[i].output.reg.offset + pres->ins[i].component_count - 1)); } - update_table_sizes_consts(pres->regs.table_sizes, &pres->inputs); if (FAILED(regstore_alloc_table(&pres->regs, PRES_REGTAB_IMMED))) return E_OUTOFMEMORY; regstore_set_values(&pres->regs, PRES_REGTAB_IMMED, dconst, 0, const_count);

1 0

Paul Gofman : d3dx9: Set reg_component_count to 4 for immediate constants.
by Alexandre Julliard 28 Apr '17

28 Apr '17

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

Paul Gofman : d3dx9: Remove unused parameter 'effect' from d3dx9_get_param_value_ptr().
by Alexandre Julliard 28 Apr '17

28 Apr '17

Module: wine Branch: master Commit: f0e9dea59c320987124fa8ab8456ce27c5731e1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0e9dea59c320987124fa8ab8… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Apr 27 14:05:51 2017 +0300 d3dx9: Remove unused parameter 'effect' from d3dx9_get_param_value_ptr(). 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/effect.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index c2fb1d0..a55c20b 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -2578,8 +2578,8 @@ static HRESULT d3dx9_base_effect_set_array_range(struct d3dx9_base_effect *base, return E_NOTIMPL; } -static HRESULT d3dx9_get_param_value_ptr(struct ID3DXEffectImpl *effect, struct d3dx_pass *pass, - struct d3dx_state *state, void **param_value, struct d3dx_parameter **out_param, +static HRESULT d3dx9_get_param_value_ptr(struct d3dx_pass *pass, struct d3dx_state *state, + void **param_value, struct d3dx_parameter **out_param, BOOL update_all, BOOL *param_dirty) { struct d3dx_parameter *param = &state->parameter; @@ -2881,7 +2881,7 @@ static HRESULT d3dx9_apply_state(struct ID3DXEffectImpl *effect, struct d3dx_pas TRACE("operation %u, index %u, type %u.\n", state->operation, state->index, state->type); - if (FAILED(hr = d3dx9_get_param_value_ptr(effect, pass, state, &param_value, &param, + if (FAILED(hr = d3dx9_get_param_value_ptr(pass, state, &param_value, &param, update_all, &param_dirty))) { if (hr == E_FAIL)

1 0

Paul Gofman : d3dx9: Downgrade unknown DWORD FIXMEs() to WARN() messages.
by Alexandre Julliard 28 Apr '17

28 Apr '17

Module: wine Branch: master Commit: 0750e758cc46bcf9bd58c208a815e74729de85f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0750e758cc46bcf9bd58c208a… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Apr 27 14:05:52 2017 +0300 d3dx9: Downgrade unknown DWORD FIXMEs() to WARN() messages. 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/effect.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index a55c20b..6a5afff 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -425,11 +425,11 @@ static void skip_dword_unknown(const char **ptr, unsigned int count) unsigned int i; DWORD d; - FIXME("Skipping %u unknown DWORDs:\n", count); + WARN("Skipping %u unknown DWORDs:\n", count); for (i = 0; i < count; ++i) { read_dword(ptr, &d); - FIXME("\t0x%08x\n", d); + WARN("\t0x%08x\n", d); } }

1 0

Kim Malmo : po: Update Norwegian translation.
by Alexandre Julliard 28 Apr '17

28 Apr '17

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

Julian Rüger : Update German translation of the Downloads page
by Jeremy Newman 28 Apr '17

28 Apr '17

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

Rosanne DiMesio : Correct function name
by Jeremy Newman 28 Apr '17

28 Apr '17

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

Jeremy Newman : change one more incorrect call to query_real_escape_string
by Jeremy Newman 28 Apr '17

28 Apr '17

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

Julian Rüger : German translation for release 2.0.1
by Jeremy Newman 28 Apr '17

28 Apr '17

Module: website Branch: master Commit: 0be8916586b89db6ddf3edf777fbd6e76c58cf52 URL: http://source.winehq.org/git/website.git/?a=commit;h=0be8916586b89db6ddf3ed… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Apr 28 16:05:51 2017 +0200 German translation for release 2.0.1 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2017042001.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/de/2017042001.xml b/news/de/2017042001.xml new file mode 100644 index 0000000..a47df8d --- /dev/null +++ b/news/de/2017042001.xml @@ -0,0 +1,13 @@ +<news> +<date>20. April 2017</date> +<title>Wine 2.0.1 freigegeben</title> +<body> + Die Wartungsversion 2.0.1 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/2.0.1">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Diverse Fehlerkorrekturen.</li> + <li>tools/wineinstall gilt nun als veraltet.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/2.0/wine-2.0.1.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 28 Apr '17

28 Apr '17

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