wine-commits May 2016

wine-commits@winehq.org

4 participants
542 discussions

Józef Kucia : wined3d: Clean up SM1 frontend.
by Alexandre Julliard 25 May '16

25 May '16

Module: wine Branch: master Commit: 8d48454a363946270699dc90d79af92bba7bbc75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d48454a363946270699dc90d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 25 10:51:19 2016 +0200 wined3d: Clean up SM1 frontend. 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/shader_sm1.c | 56 ++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 30 deletions(-) diff --git a/dlls/wined3d/shader_sm1.c b/dlls/wined3d/shader_sm1.c index 2a1f4a4..fc79f6b 100644 --- a/dlls/wined3d/shader_sm1.c +++ b/dlls/wined3d/shader_sm1.c @@ -202,8 +202,8 @@ enum wined3d_sm1_opcode struct wined3d_sm1_opcode_info { enum wined3d_sm1_opcode opcode; - UINT dst_count; - UINT param_count; + unsigned int dst_count; + unsigned int param_count; enum WINED3D_SHADER_INSTRUCTION_HANDLER handler_idx; DWORD min_version; DWORD max_version; @@ -398,9 +398,10 @@ static const enum wined3d_shader_resource_type resource_type_table[] = /* Read a parameter opcode from the input stream, * and possibly a relative addressing token. * Return the number of tokens read */ -static int shader_get_param(const struct wined3d_sm1_data *priv, const DWORD *ptr, DWORD *token, DWORD *addr_token) +static unsigned int shader_get_param(const struct wined3d_sm1_data *priv, const DWORD *ptr, + DWORD *token, DWORD *addr_token) { - UINT count = 1; + unsigned int count = 1; *token = *ptr; @@ -427,15 +428,15 @@ static int shader_get_param(const struct wined3d_sm1_data *priv, const DWORD *pt return count; } -static const struct wined3d_sm1_opcode_info *shader_get_opcode(const struct wined3d_sm1_data *priv, DWORD code) +static const struct wined3d_sm1_opcode_info *shader_get_opcode(const struct wined3d_sm1_data *priv, DWORD token) { DWORD shader_version = WINED3D_SHADER_VERSION(priv->shader_version.major, priv->shader_version.minor); const struct wined3d_sm1_opcode_info *opcode_table = priv->opcode_table; - DWORD i = 0; + unsigned int i = 0; while (opcode_table[i].handler_idx != WINED3DSIH_TABLE_SIZE) { - if ((code & WINED3D_SM1_OPCODE_MASK) == opcode_table[i].opcode + if ((token & WINED3D_SM1_OPCODE_MASK) == opcode_table[i].opcode && shader_version >= opcode_table[i].min_version && (!opcode_table[i].max_version || shader_version <= opcode_table[i].max_version)) { @@ -444,19 +445,20 @@ static const struct wined3d_sm1_opcode_info *shader_get_opcode(const struct wine ++i; } - FIXME("Unsupported opcode %#x(%d) masked %#x, shader version %#x\n", - code, code, code & WINED3D_SM1_OPCODE_MASK, shader_version); + FIXME("Unsupported opcode %#x, token 0x%08x, shader version %#x.\n", + token & WINED3D_SM1_OPCODE_MASK, token, shader_version); return NULL; } /* Return the number of parameters to skip for an opcode */ -static int shader_skip_opcode(const struct wined3d_sm1_data *priv, +static unsigned int shader_skip_opcode(const struct wined3d_sm1_data *priv, const struct wined3d_sm1_opcode_info *opcode_info, DWORD opcode_token) { + unsigned int length; /* Shaders >= 2.0 may contain address tokens, but fortunately they * have a useful length mask - use it here. Shaders 1.0 contain no such tokens */ - DWORD length = (opcode_token & WINED3D_SM1_INSTRUCTION_LENGTH_MASK) >> WINED3D_SM1_INSTRUCTION_LENGTH_SHIFT; + length = (opcode_token & WINED3D_SM1_INSTRUCTION_LENGTH_MASK) >> WINED3D_SM1_INSTRUCTION_LENGTH_SHIFT; return (priv->shader_version.major >= 2) ? length : opcode_info->param_count; } @@ -495,10 +497,9 @@ static void shader_parse_dst_param(DWORD param, const struct wined3d_shader_src_ * Note: This function assumes source or destination token format. * It will not work with specially-formatted tokens like DEF or DCL, * but hopefully those would be recognized */ -static int shader_skip_unrecognized(const struct wined3d_sm1_data *priv, const DWORD *ptr) +static unsigned int shader_skip_unrecognized(const struct wined3d_sm1_data *priv, const DWORD *ptr) { - int tokens_read = 0; - int i = 0; + unsigned int tokens_read = 0, i = 0; /* TODO: Think of a good name for 0x80000000 and replace it with a constant */ while (*ptr & 0x80000000) @@ -509,9 +510,10 @@ static int shader_skip_unrecognized(const struct wined3d_sm1_data *priv, const D tokens_read += shader_get_param(priv, ptr, &token, &addr_token); ptr += tokens_read; - FIXME("Unrecognized opcode param: token=0x%08x addr_token=0x%08x name=", token, addr_token); + FIXME("Unrecognized opcode param: token=0x%08x addr_token=0x%08x.\n", token, addr_token); - if (token & WINED3D_SM1_ADDRESS_MODE_RELATIVE) shader_parse_src_param(addr_token, NULL, &rel_addr); + if (token & WINED3D_SM1_ADDRESS_MODE_RELATIVE) + shader_parse_src_param(addr_token, NULL, &rel_addr); if (!i) { @@ -525,7 +527,6 @@ static int shader_skip_unrecognized(const struct wined3d_sm1_data *priv, const D shader_parse_src_param(token, token & WINED3D_SM1_ADDRESS_MODE_RELATIVE ? &rel_addr : NULL, &src); } - FIXME("\n"); ++i; } return tokens_read; @@ -544,14 +545,11 @@ static void *shader_sm1_init(const DWORD *byte_code, const struct wined3d_shader return NULL; } - priv = HeapAlloc(GetProcessHeap(), 0, sizeof(*priv)); - if (!priv) + if (!(priv = HeapAlloc(GetProcessHeap(), 0, sizeof(*priv)))) return NULL; if (output_signature->element_count) - { FIXME("SM 1-3 shader shouldn't have output signatures.\n"); - } switch (*byte_code >> 16) { @@ -566,7 +564,7 @@ static void *shader_sm1_init(const DWORD *byte_code, const struct wined3d_shader break; default: - FIXME("Unrecognized shader type %#x\n", *byte_code >> 16); + FIXME("Unrecognized shader type %#x.\n", *byte_code >> 16); HeapFree(GetProcessHeap(), 0, priv); return NULL; } @@ -585,7 +583,7 @@ static void shader_sm1_read_header(void *data, const DWORD **ptr, struct wined3d DWORD version_token; version_token = *(*ptr)++; - TRACE("version: 0x%08x\n", version_token); + TRACE("Version: 0x%08x.\n", version_token); priv->shader_version.major = WINED3D_SM1_VERSION_MAJOR(version_token); priv->shader_version.minor = WINED3D_SM1_VERSION_MINOR(version_token); @@ -651,7 +649,7 @@ static void shader_sm1_read_semantic(const DWORD **ptr, struct wined3d_shader_se static void shader_sm1_read_immconst(const DWORD **ptr, struct wined3d_shader_src_param *src_param, enum wined3d_immconst_type type, enum wined3d_data_type data_type) { - UINT count = type == WINED3D_IMMCONST_VEC4 ? 4 : 1; + unsigned int count = type == WINED3D_IMMCONST_VEC4 ? 4 : 1; src_param->reg.type = WINED3DSPR_IMMCONST; src_param->reg.data_type = data_type; src_param->reg.idx[0].offset = ~0U; @@ -762,15 +760,15 @@ static void shader_sm1_read_instruction(void *data, const DWORD **ptr, struct wi shader_sm1_read_dst_param(priv, &p, &priv->dst_param, &priv->dst_rel_addr); shader_sm1_read_immconst(&p, &priv->src_param[0], WINED3D_IMMCONST_VEC4, WINED3D_DATA_FLOAT); } - else if (ins->handler_idx == WINED3DSIH_DEFI) + else if (ins->handler_idx == WINED3DSIH_DEFB) { shader_sm1_read_dst_param(priv, &p, &priv->dst_param, &priv->dst_rel_addr); - shader_sm1_read_immconst(&p, &priv->src_param[0], WINED3D_IMMCONST_VEC4, WINED3D_DATA_INT); + shader_sm1_read_immconst(&p, &priv->src_param[0], WINED3D_IMMCONST_SCALAR, WINED3D_DATA_UINT); } - else if (ins->handler_idx == WINED3DSIH_DEFB) + else if (ins->handler_idx == WINED3DSIH_DEFI) { shader_sm1_read_dst_param(priv, &p, &priv->dst_param, &priv->dst_rel_addr); - shader_sm1_read_immconst(&p, &priv->src_param[0], WINED3D_IMMCONST_SCALAR, WINED3D_DATA_UINT); + shader_sm1_read_immconst(&p, &priv->src_param[0], WINED3D_IMMCONST_VEC4, WINED3D_DATA_INT); } else { @@ -784,9 +782,7 @@ static void shader_sm1_read_instruction(void *data, const DWORD **ptr, struct wi /* Other source tokens */ for (i = 0; i < ins->src_count; ++i) - { shader_sm1_read_src_param(priv, &p, &priv->src_param[i], &priv->src_rel_addr[i]); - } } shader_sm1_validate_instruction(ins);

1 0

Józef Kucia : wined3d: Ignore flags for conditional SM 1-3 instructions explicitly.
by Alexandre Julliard 25 May '16

25 May '16

Module: wine Branch: master Commit: 3ab205ef949a99a275e37b1c5b47d181c8040fb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ab205ef949a99a275e37b1c5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 25 10:51:18 2016 +0200 wined3d: Ignore flags for conditional SM 1-3 instructions explicitly. This is to make sure that a regression is not introduced when the SM4+ _nz/_z modifiers are implemented for these instructions. 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/shader_sm1.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/wined3d/shader_sm1.c b/dlls/wined3d/shader_sm1.c index 54312d4..2a1f4a4 100644 --- a/dlls/wined3d/shader_sm1.c +++ b/dlls/wined3d/shader_sm1.c @@ -708,6 +708,19 @@ static void shader_sm1_read_comment(const DWORD **ptr) } } +static void shader_sm1_validate_instruction(struct wined3d_shader_instruction *ins) +{ + if (ins->handler_idx == WINED3DSIH_BREAKP || ins->handler_idx == WINED3DSIH_IF) + { + if (ins->flags) + { + FIXME("Ignoring unexpected instruction flags %#x for %s.\n", + ins->flags, debug_d3dshaderinstructionhandler(ins->handler_idx)); + ins->flags = 0; + } + } +} + static void shader_sm1_read_instruction(void *data, const DWORD **ptr, struct wined3d_shader_instruction *ins) { const struct wined3d_sm1_opcode_info *opcode_info; @@ -775,6 +788,8 @@ static void shader_sm1_read_instruction(void *data, const DWORD **ptr, struct wi shader_sm1_read_src_param(priv, &p, &priv->src_param[i], &priv->src_rel_addr[i]); } } + + shader_sm1_validate_instruction(ins); } static BOOL shader_sm1_is_end(void *data, const DWORD **ptr)

1 0

Alistair Leslie-Hughes : d3d10core/tests: Added DXGI_FORMAT_R16_TYPELESS D3D11_BIND_DEPTH_STENCIL test.
by Alexandre Julliard 25 May '16

25 May '16

Module: wine Branch: master Commit: 73d0328be76cf86a4e339bc4ad26eaab6eacf7af URL: http://source.winehq.org/git/wine.git/?a=commit;h=73d0328be76cf86a4e339bc4a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed May 25 06:06:57 2016 +0000 d3d10core/tests: Added DXGI_FORMAT_R16_TYPELESS D3D11_BIND_DEPTH_STENCIL test. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index f768773..f4ad5fd 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -712,6 +712,7 @@ static void test_create_texture2d(void) {DXGI_FORMAT_R24G8_TYPELESS, 1, D3D10_BIND_DEPTH_STENCIL, 0, TRUE, FALSE}, {DXGI_FORMAT_R8G8_TYPELESS, 1, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, {DXGI_FORMAT_R16_TYPELESS, 1, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, + {DXGI_FORMAT_R16_TYPELESS, 1, D3D10_BIND_DEPTH_STENCIL, 0, TRUE, TRUE}, {DXGI_FORMAT_R8_TYPELESS, 1, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, {DXGI_FORMAT_R8G8B8A8_UNORM, 1, D3D10_BIND_DEPTH_STENCIL, 0, FALSE, FALSE}, {DXGI_FORMAT_D24_UNORM_S8_UINT, 1, D3D10_BIND_RENDER_TARGET, 0, FALSE, FALSE},

1 0

Alistair Leslie-Hughes : d3d11/tests: Added DXGI_FORMAT_R16_TYPELESS D3D11_BIND_DEPTH_STENCIL test.
by Alexandre Julliard 25 May '16

25 May '16

Module: wine Branch: master Commit: ce0837964d10ea844f7db89c8a13acaa35120622 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce0837964d10ea844f7db89c8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed May 25 06:06:45 2016 +0000 d3d11/tests: Added DXGI_FORMAT_R16_TYPELESS D3D11_BIND_DEPTH_STENCIL test. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 85ec201..73d411c 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -1001,6 +1001,7 @@ static void test_create_texture2d(void) {DXGI_FORMAT_R24G8_TYPELESS, 1, D3D11_BIND_DEPTH_STENCIL, 0, TRUE, FALSE}, {DXGI_FORMAT_R8G8_TYPELESS, 1, D3D11_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, {DXGI_FORMAT_R16_TYPELESS, 1, D3D11_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, + {DXGI_FORMAT_R16_TYPELESS, 1, D3D11_BIND_DEPTH_STENCIL, 0, TRUE, TRUE}, {DXGI_FORMAT_R8_TYPELESS, 1, D3D11_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, {DXGI_FORMAT_R8G8B8A8_UNORM, 1, D3D11_BIND_DEPTH_STENCIL, 0, FALSE, FALSE}, {DXGI_FORMAT_D24_UNORM_S8_UINT, 1, D3D11_BIND_RENDER_TARGET, 0, FALSE, FALSE},

1 0

Alistair Leslie-Hughes : wined3d: Support missing WINED3DUSAGE flags to debug_d3dusage.
by Alexandre Julliard 25 May '16

25 May '16

Module: wine Branch: master Commit: 77e1037e003c32b789263d852bdd7ecee8af77a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77e1037e003c32b789263d852… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed May 25 06:06:08 2016 +0000 wined3d: Support missing WINED3DUSAGE flags to debug_d3dusage. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 5c781cd..f85fcc9 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3603,7 +3603,7 @@ const char *debug_d3ddevicetype(enum wined3d_device_type device_type) const char *debug_d3dusage(DWORD usage) { - char buf[333]; + char buf[552]; buf[0] = '\0'; #define WINED3DUSAGE_TO_STR(u) if (usage & u) { strcat(buf, " | "#u); usage &= ~u; } @@ -3617,7 +3617,14 @@ const char *debug_d3dusage(DWORD usage) WINED3DUSAGE_TO_STR(WINED3DUSAGE_NPATCHES); WINED3DUSAGE_TO_STR(WINED3DUSAGE_DYNAMIC); WINED3DUSAGE_TO_STR(WINED3DUSAGE_AUTOGENMIPMAP); + WINED3DUSAGE_TO_STR(WINED3DUSAGE_RESTRICTED_CONTENT); + WINED3DUSAGE_TO_STR(WINED3DUSAGE_RESTRICT_SHARED_RESOURCE_DRIVER); + WINED3DUSAGE_TO_STR(WINED3DUSAGE_RESTRICT_SHARED_RESOURCE); WINED3DUSAGE_TO_STR(WINED3DUSAGE_DMAP); + WINED3DUSAGE_TO_STR(WINED3DUSAGE_TEXTAPI); + WINED3DUSAGE_TO_STR(WINED3DUSAGE_LEGACY_CUBEMAP); + WINED3DUSAGE_TO_STR(WINED3DUSAGE_TEXTURE); + WINED3DUSAGE_TO_STR(WINED3DUSAGE_OWNDC); WINED3DUSAGE_TO_STR(WINED3DUSAGE_STATICDECL); WINED3DUSAGE_TO_STR(WINED3DUSAGE_OVERLAY); #undef WINED3DUSAGE_TO_STR

1 0

Hadrien Boizard : mshtml/tests: Use todo_wine_if() in tests.
by Alexandre Julliard 25 May '16

25 May '16

Module: wine Branch: master Commit: c0505097f9fe71e8e78ba0c4f989acfff330d768 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0505097f9fe71e8e78ba0c4f… Author: Hadrien Boizard <h.boizard(a)laposte.net> Date: Fri May 20 19:15:06 2016 +0200 mshtml/tests: Use todo_wine_if() in tests. Signed-off-by: Hadrien Boizard <h.boizard(a)laposte.net> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/htmldoc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 904322e..5079dc9 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -5830,9 +5830,7 @@ static void test_download(DWORD flags) if(!(flags & DWL_FROM_HISTORY)) todo_wine CHECK_CALLED(OnChanged_1012); todo_wine CHECK_CALLED(Exec_HTTPEQUIV); - if(!(flags & DWL_REFRESH)) - todo_wine CHECK_CALLED(Exec_SETTITLE); - else + todo_wine_if(!(flags & DWL_REFRESH)) CHECK_CALLED(Exec_SETTITLE); } if(!is_js) {

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 25 May '16

25 May '16

Module: wine Branch: master Commit: 1a182b5901589db06803d2d6f8ad6d820b80e19b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a182b5901589db06803d2d6f… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Tue May 24 22:40:04 2016 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/po/lt.po b/po/lt.po index edf277c..8ac99b6 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2016-05-03 21:19+0300\n" +"PO-Revision-Date: 2016-05-24 22:38+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -7629,7 +7629,7 @@ msgstr "Kopijuoti failus iš:" #: setupapi.rc:34 msgid "Type the path where the file is located, and then click OK." -msgstr "Įveskite kelią iki failo, o tada spauskite Gerai." +msgstr "Įrašykite kelią iki failo, o tada spauskite Gerai." #: shdoclc.rc:42 msgid "F&orward" @@ -11557,6 +11557,15 @@ msgid "" " REG [operation] /?\n" "\n" msgstr "" +"Naudojimas:\n" +" REG [operacija] [parametrai]\n" +"\n" +"Palaikomos operacijos:\n" +" ADD | DELETE | QUERY\n" +"\n" +"Pagalbai apie specifinę operaciją, įrašykite:\n" +" REG [operacija] /?\n" +"\n" #: reg.rc:36 msgid "" @@ -11657,24 +11666,20 @@ msgid "Search complete. Number of matches found: %1!d!\n" msgstr "Paieška baigta. Rasta atitikimų: %1!d!\n" #: reg.rc:61 -#, fuzzy -#| msgid "reg: Invalid key name\n" msgid "reg: Invalid syntax. " -msgstr "reg: Netinkamas rakto vardas\n" +msgstr "reg: Netinkama sintaksė. " #: reg.rc:62 -#, fuzzy -#| msgid "uninstaller: Invalid option [%1]\n" msgid "reg: Invalid option [%1]. " -msgstr "šalinimo programa: Netinkamas parametras [%1]\n" +msgstr "reg: Netinkamas parametras [%1]. " #: reg.rc:63 msgid "Type \"REG /?\" for help.\n" -msgstr "" +msgstr "Pagalbai įrašykite „REG /?“.\n" #: reg.rc:64 msgid "Type \"REG %1 /?\" for help.\n" -msgstr "" +msgstr "Pagalbai įrašykite „REG %1 /?“.\n" #: regedit.rc:34 msgid "&Registry"

1 0

Henri Verbeet : d3d11: Introduce a helper function to allocate arrays.
by Alexandre Julliard 25 May '16

25 May '16

Module: wine Branch: master Commit: c27b83ec07b9cb82438404a20342ed45c744b20a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c27b83ec07b9cb82438404a20… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 24 19:46:45 2016 +0200 d3d11: Introduce a helper function to allocate arrays. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_private.h | 7 +++++++ dlls/d3d11/inputlayout.c | 3 +-- dlls/d3d11/shader.c | 3 +-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index b3638c3..77079bd 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -79,6 +79,13 @@ HRESULT d3d_set_private_data(struct wined3d_private_store *store, HRESULT d3d_set_private_data_interface(struct wined3d_private_store *store, REFGUID guid, const IUnknown *object) DECLSPEC_HIDDEN; +static inline void *d3d11_calloc(SIZE_T count, SIZE_T size) +{ + if (count > ~(SIZE_T)0 / size) + return NULL; + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, count * size); +} + static inline void read_dword(const char **ptr, DWORD *d) { memcpy(d, *ptr, sizeof(*d)); diff --git a/dlls/d3d11/inputlayout.c b/dlls/d3d11/inputlayout.c index d481dd2..69ef985 100644 --- a/dlls/d3d11/inputlayout.c +++ b/dlls/d3d11/inputlayout.c @@ -54,8 +54,7 @@ static HRESULT d3d11_input_layout_to_wined3d_declaration(const D3D11_INPUT_ELEME return E_FAIL; } - *wined3d_elements = HeapAlloc(GetProcessHeap(), 0, element_count * sizeof(**wined3d_elements)); - if (!*wined3d_elements) + if (!(*wined3d_elements = d3d11_calloc(element_count, sizeof(**wined3d_elements)))) { ERR("Failed to allocate wined3d vertex element array memory.\n"); HeapFree(GetProcessHeap(), 0, is.elements); diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index a88c8ce..b1c4f28 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -121,8 +121,7 @@ HRESULT shader_parse_signature(const char *data, DWORD data_size, struct wined3d return E_INVALIDARG; } - e = HeapAlloc(GetProcessHeap(), 0, count * sizeof(*e)); - if (!e) + if (!(e = d3d11_calloc(count, sizeof(*e)))) { ERR("Failed to allocate input signature memory.\n"); return E_OUTOFMEMORY;

1 0

Henri Verbeet : d3d10: Validate offsets and sizes in shader_parse_signature() (AFL).
by Alexandre Julliard 25 May '16

25 May '16

Module: wine Branch: master Commit: 22d52ed59d28340f595660d7cbacca10c6ce8858 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22d52ed59d28340f595660d7c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 24 19:46:44 2016 +0200 d3d10: Validate offsets and sizes in shader_parse_signature() (AFL). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/d3d10_private.h | 4 ++-- dlls/d3d10/effect.c | 38 +++++++++++++++++++++++++++++++++++++- dlls/d3d10/utils.c | 4 ++-- 3 files changed, 41 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 0e27dfe..dc41224 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -294,9 +294,9 @@ static inline void write_dword(char **ptr, DWORD d) *ptr += sizeof(d); } -static inline BOOL require_space(size_t offset, size_t size, size_t data_size) +static inline BOOL require_space(size_t offset, size_t count, size_t size, size_t data_size) { - return data_size - offset >= size; + return !count || (data_size - offset) / count >= size; } void skip_dword_unknown(const char *location, const char **ptr, unsigned int count) DECLSPEC_HIDDEN; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index c7eed1a..df35640 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -267,6 +267,25 @@ static BOOL copy_name(const char *ptr, char **name) return TRUE; } +static const char *shader_get_string(const char *data, size_t data_size, DWORD offset) +{ + size_t len, max_len; + + if (offset >= data_size) + { + WARN("Invalid offset %#x (data size %#lx).\n", offset, (long)data_size); + return NULL; + } + + max_len = data_size - offset; + len = strnlen(data + offset, max_len); + + if (len == max_len) + return NULL; + + return data + offset; +} + static HRESULT shader_parse_signature(const char *data, DWORD data_size, struct d3d10_effect_shader_signature *s) { D3D10_SIGNATURE_PARAMETER_DESC *e; @@ -274,11 +293,23 @@ static HRESULT shader_parse_signature(const char *data, DWORD data_size, struct unsigned int i; DWORD count; + if (!require_space(0, 2, sizeof(DWORD), data_size)) + { + WARN("Invalid data size %#x.\n", data_size); + return E_INVALIDARG; + } + read_dword(&ptr, &count); TRACE("%u elements\n", count); skip_dword_unknown("shader signature", &ptr, 1); + if (!require_space(ptr - data, count, 6 * sizeof(DWORD), data_size)) + { + WARN("Invalid count %#x (data size %#x).\n", count, data_size); + return E_INVALIDARG; + } + e = HeapAlloc(GetProcessHeap(), 0, count * sizeof(*e)); if (!e) { @@ -292,7 +323,12 @@ static HRESULT shader_parse_signature(const char *data, DWORD data_size, struct UINT mask; read_dword(&ptr, &name_offset); - e[i].SemanticName = data + name_offset; + if (!(e[i].SemanticName = shader_get_string(data, data_size, name_offset))) + { + WARN("Invalid name offset %#x (data size %#x).\n", name_offset, data_size); + HeapFree(GetProcessHeap(), 0, e); + return E_INVALIDARG; + } read_dword(&ptr, &e[i].SemanticIndex); read_dword(&ptr, &e[i].SystemValueType); read_dword(&ptr, &e[i].ComponentType); diff --git a/dlls/d3d10/utils.c b/dlls/d3d10/utils.c index 618fdee..be88d5a 100644 --- a/dlls/d3d10/utils.c +++ b/dlls/d3d10/utils.c @@ -217,7 +217,7 @@ HRESULT parse_dxbc(const char *data, SIZE_T data_size, read_dword(&ptr, &chunk_offset); TRACE("chunk %u at offset %#x\n", i, chunk_offset); - if (chunk_offset >= data_size || !require_space(chunk_offset, 2 * sizeof(DWORD), data_size)) + if (chunk_offset >= data_size || !require_space(chunk_offset, 2, sizeof(DWORD), data_size)) { WARN("Invalid chunk offset %#x (data size %#lx).\n", chunk_offset, data_size); return E_FAIL; @@ -228,7 +228,7 @@ HRESULT parse_dxbc(const char *data, SIZE_T data_size, read_dword(&chunk_ptr, &chunk_tag); read_dword(&chunk_ptr, &chunk_size); - if (!require_space(chunk_ptr - data, chunk_size, data_size)) + if (!require_space(chunk_ptr - data, 1, chunk_size, data_size)) { WARN("Invalid chunk size %#x (data size %#lx, chunk offset %#x).\n", chunk_size, data_size, chunk_offset); return E_FAIL;

1 0

Henri Verbeet : d3d11: Validate offsets and sizes in shader_parse_signature() (AFL).
by Alexandre Julliard 25 May '16

25 May '16

Module: wine Branch: master Commit: b1665527af5d7b7c402597412cf14b59fbcddd61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1665527af5d7b7c402597412… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 24 19:46:43 2016 +0200 d3d11: Validate offsets and sizes in shader_parse_signature() (AFL). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_private.h | 4 ++-- dlls/d3d11/shader.c | 38 +++++++++++++++++++++++++++++++++++++- dlls/d3d11/utils.c | 4 ++-- 3 files changed, 41 insertions(+), 5 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 41fd89d..b3638c3 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -85,9 +85,9 @@ static inline void read_dword(const char **ptr, DWORD *d) *ptr += sizeof(*d); } -static inline BOOL require_space(size_t offset, size_t size, size_t data_size) +static inline BOOL require_space(size_t offset, size_t count, size_t size, size_t data_size) { - return data_size - offset >= size; + return !count || (data_size - offset) / count >= size; } void skip_dword_unknown(const char **ptr, unsigned int count) DECLSPEC_HIDDEN; diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index f8647ff..a88c8ce 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -78,6 +78,25 @@ static HRESULT shader_extract_from_dxbc(const void *dxbc, SIZE_T dxbc_length, st return hr; } +static const char *shader_get_string(const char *data, size_t data_size, DWORD offset) +{ + size_t len, max_len; + + if (offset >= data_size) + { + WARN("Invalid offset %#x (data size %#lx).\n", offset, (long)data_size); + return NULL; + } + + max_len = data_size - offset; + len = strnlen(data + offset, max_len); + + if (len == max_len) + return NULL; + + return data + offset; +} + HRESULT shader_parse_signature(const char *data, DWORD data_size, struct wined3d_shader_signature *s) { struct wined3d_shader_signature_element *e; @@ -85,11 +104,23 @@ HRESULT shader_parse_signature(const char *data, DWORD data_size, struct wined3d unsigned int i; DWORD count; + if (!require_space(0, 2, sizeof(DWORD), data_size)) + { + WARN("Invalid data size %#x.\n", data_size); + return E_INVALIDARG; + } + read_dword(&ptr, &count); TRACE("%u elements\n", count); skip_dword_unknown(&ptr, 1); + if (!require_space(ptr - data, count, 6 * sizeof(DWORD), data_size)) + { + WARN("Invalid count %#x (data size %#x).\n", count, data_size); + return E_INVALIDARG; + } + e = HeapAlloc(GetProcessHeap(), 0, count * sizeof(*e)); if (!e) { @@ -102,7 +133,12 @@ HRESULT shader_parse_signature(const char *data, DWORD data_size, struct wined3d UINT name_offset; read_dword(&ptr, &name_offset); - e[i].semantic_name = data + name_offset; + if (!(e[i].semantic_name = shader_get_string(data, data_size, name_offset))) + { + WARN("Invalid name offset %#x (data size %#x).\n", name_offset, data_size); + HeapFree(GetProcessHeap(), 0, e); + return E_INVALIDARG; + } read_dword(&ptr, &e[i].semantic_idx); read_dword(&ptr, &e[i].sysval_semantic); read_dword(&ptr, &e[i].component_type); diff --git a/dlls/d3d11/utils.c b/dlls/d3d11/utils.c index 25e22f9..7b08d13 100644 --- a/dlls/d3d11/utils.c +++ b/dlls/d3d11/utils.c @@ -751,7 +751,7 @@ HRESULT parse_dxbc(const char *data, SIZE_T data_size, read_dword(&ptr, &chunk_offset); TRACE("chunk %u at offset %#x\n", i, chunk_offset); - if (chunk_offset >= data_size || !require_space(chunk_offset, 2 * sizeof(DWORD), data_size)) + if (chunk_offset >= data_size || !require_space(chunk_offset, 2, sizeof(DWORD), data_size)) { WARN("Invalid chunk offset %#x (data size %#lx).\n", chunk_offset, data_size); return E_FAIL; @@ -762,7 +762,7 @@ HRESULT parse_dxbc(const char *data, SIZE_T data_size, read_dword(&chunk_ptr, &chunk_tag); read_dword(&chunk_ptr, &chunk_size); - if (!require_space(chunk_ptr - data, chunk_size, data_size)) + if (!require_space(chunk_ptr - data, 1, chunk_size, data_size)) { WARN("Invalid chunk size %#x (data size %#lx, chunk offset %#x).\n", chunk_size, data_size, chunk_offset); return E_FAIL;

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
55
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2016