February 2017 - Wine-Commits

Henri Verbeet : wined3d: Explicitly pass the byte-code format to shader creation functions (AFL).
by Alexandre Julliard Feb. 21, 2017

Feb. 21, 2017

Module: wine Branch: master Commit: 7ad37a64b143548f4c741183794e3f7dd61f9b3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ad37a64b143548f4c7411837… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 21 00:40:05 2017 +0100 wined3d: Explicitly pass the byte-code format to shader creation functions (AFL). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/shader.c | 2 ++ dlls/d3d8/shader.c | 2 ++ dlls/d3d9/shader.c | 2 ++ dlls/wined3d/shader.c | 31 +++++++++++++------------------ include/wine/wined3d.h | 7 +++++++ 5 files changed, 26 insertions(+), 18 deletions(-) diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index 0e0c607..ae19eba 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -77,6 +77,7 @@ static HRESULT shdr_handler(const char *data, DWORD data_size, DWORD tag, void * FIXME("Multiple shader code chunks.\n"); desc->byte_code = (const DWORD *)data; desc->byte_code_size = data_size; + desc->format = WINED3D_SHADER_BYTE_CODE_FORMAT_SM4; break; case TAG_AON9: @@ -105,6 +106,7 @@ static HRESULT shdr_handler(const char *data, DWORD data_size, DWORD tag, void * FIXME("Multiple shader code chunks.\n"); desc->byte_code = (const DWORD *)byte_code; desc->byte_code_size = data_size - header->byte_code_offset; + desc->format = WINED3D_SHADER_BYTE_CODE_FORMAT_SM1; TRACE("Feature level 9 shader version 0%08x, 0%08x.\n", header->shader_version, *desc->byte_code); } else diff --git a/dlls/d3d8/shader.c b/dlls/d3d8/shader.c index 3d6ffa8..ee78b7c 100644 --- a/dlls/d3d8/shader.c +++ b/dlls/d3d8/shader.c @@ -118,6 +118,7 @@ HRESULT d3d8_vertex_shader_init(struct d3d8_vertex_shader *shader, struct d3d8_d desc.byte_code = byte_code; desc.byte_code_size = ~(size_t)0; + desc.format = WINED3D_SHADER_BYTE_CODE_FORMAT_SM1; desc.input_signature.element_count = 0; desc.output_signature.element_count = 0; desc.max_version = 1; @@ -168,6 +169,7 @@ HRESULT d3d8_pixel_shader_init(struct d3d8_pixel_shader *shader, struct d3d8_dev desc.byte_code = byte_code; desc.byte_code_size = ~(size_t)0; + desc.format = WINED3D_SHADER_BYTE_CODE_FORMAT_SM1; desc.input_signature.element_count = 0; desc.output_signature.element_count = 0; desc.max_version = 1; diff --git a/dlls/d3d9/shader.c b/dlls/d3d9/shader.c index 9bb8642..05f21e4 100644 --- a/dlls/d3d9/shader.c +++ b/dlls/d3d9/shader.c @@ -144,6 +144,7 @@ HRESULT vertexshader_init(struct d3d9_vertexshader *shader, struct d3d9_device * desc.byte_code = byte_code; desc.byte_code_size = ~(size_t)0; + desc.format = WINED3D_SHADER_BYTE_CODE_FORMAT_SM1; desc.input_signature.element_count = 0; desc.output_signature.element_count = 0; desc.max_version = 3; @@ -296,6 +297,7 @@ HRESULT pixelshader_init(struct d3d9_pixelshader *shader, struct d3d9_device *de desc.byte_code = byte_code; desc.byte_code_size = ~(size_t)0; + desc.format = WINED3D_SHADER_BYTE_CODE_FORMAT_SM1; desc.input_signature.element_count = 0; desc.output_signature.element_count = 0; desc.max_version = 3; diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 181cebd..a3b3c3d 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -392,24 +392,18 @@ static void shader_signature_from_usage(struct wined3d_shader_signature_element e->mask = write_mask; } -static const struct wined3d_shader_frontend *shader_select_frontend(DWORD version_token) +static const struct wined3d_shader_frontend *shader_select_frontend(enum wined3d_shader_byte_code_format format) { - switch (version_token >> 16) + switch (format) { - case WINED3D_SM1_VS: - case WINED3D_SM1_PS: + case WINED3D_SHADER_BYTE_CODE_FORMAT_SM1: return &sm1_shader_frontend; - case WINED3D_SM4_PS: - case WINED3D_SM4_VS: - case WINED3D_SM4_GS: - case WINED3D_SM5_HS: - case WINED3D_SM5_DS: - case WINED3D_SM5_CS: + case WINED3D_SHADER_BYTE_CODE_FORMAT_SM4: return &sm4_shader_frontend; default: - FIXME("Unrecognised version token %#x.\n", version_token); + WARN("Invalid byte code format %#x specified.\n", format); return NULL; } } @@ -2854,7 +2848,8 @@ const struct wined3d_shader_backend_ops none_shader_backend = }; static HRESULT shader_set_function(struct wined3d_shader *shader, const DWORD *byte_code, - size_t byte_code_size, DWORD float_const_count, enum wined3d_shader_type type, unsigned int max_version) + size_t byte_code_size, enum wined3d_shader_byte_code_format format, + DWORD float_const_count, enum wined3d_shader_type type, unsigned int max_version) { struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; const struct wined3d_shader_frontend *fe; @@ -2862,8 +2857,9 @@ static HRESULT shader_set_function(struct wined3d_shader *shader, const DWORD *b unsigned int backend_version; const struct wined3d_d3d_info *d3d_info = &shader->device->adapter->d3d_info; - TRACE("shader %p, byte_code %p, byte_code_size %#lx, float_const_count %u, type %#x, max_version %u.\n", - shader, byte_code, (long)byte_code_size, float_const_count, type, max_version); + TRACE("shader %p, byte_code %p, byte_code_size %#lx, format %#x, " + "float_const_count %u, type %#x, max_version %u.\n", + shader, byte_code, (long)byte_code_size, format, float_const_count, type, max_version); list_init(&shader->constantsF); list_init(&shader->constantsB); @@ -2871,8 +2867,7 @@ static HRESULT shader_set_function(struct wined3d_shader *shader, const DWORD *b shader->lconst_inf_or_nan = FALSE; list_init(&reg_maps->indexable_temps); - fe = shader_select_frontend(*byte_code); - if (!fe) + if (!(fe = shader_select_frontend(format))) { FIXME("Unable to find frontend for shader.\n"); return WINED3DERR_INVALIDCALL; @@ -3192,8 +3187,8 @@ static HRESULT shader_init(struct wined3d_shader *shader, struct wined3d_device list_init(&shader->linked_programs); list_add_head(&device->shaders, &shader->shader_list_entry); - if (FAILED(hr = shader_set_function(shader, desc->byte_code, - desc->byte_code_size, float_const_count, type, desc->max_version))) + if (FAILED(hr = shader_set_function(shader, desc->byte_code, desc->byte_code_size, + desc->format, float_const_count, type, desc->max_version))) { WARN("Failed to set function, hr %#x.\n", hr); shader_cleanup(shader); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 834cf11..b511955 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -800,6 +800,12 @@ enum wined3d_display_rotation WINED3D_DISPLAY_ROTATION_270 = 4, }; +enum wined3d_shader_byte_code_format +{ + WINED3D_SHADER_BYTE_CODE_FORMAT_SM1 = 0, + WINED3D_SHADER_BYTE_CODE_FORMAT_SM4 = 1, +}; + #define WINED3DCOLORWRITEENABLE_RED (1u << 0) #define WINED3DCOLORWRITEENABLE_GREEN (1u << 1) #define WINED3DCOLORWRITEENABLE_BLUE (1u << 2) @@ -1960,6 +1966,7 @@ struct wined3d_shader_desc { const DWORD *byte_code; size_t byte_code_size; + enum wined3d_shader_byte_code_format format; struct wined3d_shader_signature input_signature; struct wined3d_shader_signature output_signature; unsigned int max_version;

1 0

Henri Verbeet : wined3d: Validate the SM4 token count (AFL).
by Alexandre Julliard Feb. 21, 2017

Feb. 21, 2017

Module: wine Branch: master Commit: 7840485ac21f6eea26e9c29f5f14322ab9214985 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7840485ac21f6eea26e9c29f5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 21 00:40:04 2017 +0100 wined3d: Validate the SM4 token count (AFL). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/shader.c | 3 +++ dlls/d3d8/shader.c | 2 ++ dlls/d3d9/shader.c | 2 ++ dlls/wined3d/shader.c | 10 +++++----- dlls/wined3d/shader_sm1.c | 3 ++- dlls/wined3d/shader_sm4.c | 15 ++++++++++++++- dlls/wined3d/wined3d_private.h | 3 ++- include/wine/wined3d.h | 1 + 8 files changed, 31 insertions(+), 8 deletions(-) diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index 99af31b..0e0c607 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -76,6 +76,7 @@ static HRESULT shdr_handler(const char *data, DWORD data_size, DWORD tag, void * if (desc->byte_code) FIXME("Multiple shader code chunks.\n"); desc->byte_code = (const DWORD *)data; + desc->byte_code_size = data_size; break; case TAG_AON9: @@ -103,6 +104,7 @@ static HRESULT shdr_handler(const char *data, DWORD data_size, DWORD tag, void * if (desc->byte_code) FIXME("Multiple shader code chunks.\n"); desc->byte_code = (const DWORD *)byte_code; + desc->byte_code_size = data_size - header->byte_code_offset; TRACE("Feature level 9 shader version 0%08x, 0%08x.\n", header->shader_version, *desc->byte_code); } else @@ -126,6 +128,7 @@ static HRESULT shader_extract_from_dxbc(const void *dxbc, SIZE_T dxbc_length, st HRESULT hr; desc->byte_code = NULL; + desc->byte_code_size = 0; memset(&desc->input_signature, 0, sizeof(desc->input_signature)); memset(&desc->output_signature, 0, sizeof(desc->output_signature)); diff --git a/dlls/d3d8/shader.c b/dlls/d3d8/shader.c index f920fed..3d6ffa8 100644 --- a/dlls/d3d8/shader.c +++ b/dlls/d3d8/shader.c @@ -117,6 +117,7 @@ HRESULT d3d8_vertex_shader_init(struct d3d8_vertex_shader *shader, struct d3d8_d FIXME("Usage %#x not implemented.\n", usage); desc.byte_code = byte_code; + desc.byte_code_size = ~(size_t)0; desc.input_signature.element_count = 0; desc.output_signature.element_count = 0; desc.max_version = 1; @@ -166,6 +167,7 @@ HRESULT d3d8_pixel_shader_init(struct d3d8_pixel_shader *shader, struct d3d8_dev shader->handle = shader_handle; desc.byte_code = byte_code; + desc.byte_code_size = ~(size_t)0; desc.input_signature.element_count = 0; desc.output_signature.element_count = 0; desc.max_version = 1; diff --git a/dlls/d3d9/shader.c b/dlls/d3d9/shader.c index b66762d..9bb8642 100644 --- a/dlls/d3d9/shader.c +++ b/dlls/d3d9/shader.c @@ -143,6 +143,7 @@ HRESULT vertexshader_init(struct d3d9_vertexshader *shader, struct d3d9_device * shader->IDirect3DVertexShader9_iface.lpVtbl = &d3d9_vertexshader_vtbl; desc.byte_code = byte_code; + desc.byte_code_size = ~(size_t)0; desc.input_signature.element_count = 0; desc.output_signature.element_count = 0; desc.max_version = 3; @@ -294,6 +295,7 @@ HRESULT pixelshader_init(struct d3d9_pixelshader *shader, struct d3d9_device *de shader->IDirect3DPixelShader9_iface.lpVtbl = &d3d9_pixelshader_vtbl; desc.byte_code = byte_code; + desc.byte_code_size = ~(size_t)0; desc.input_signature.element_count = 0; desc.output_signature.element_count = 0; desc.max_version = 3; diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 9688b30..181cebd 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2854,7 +2854,7 @@ const struct wined3d_shader_backend_ops none_shader_backend = }; static HRESULT shader_set_function(struct wined3d_shader *shader, const DWORD *byte_code, - DWORD float_const_count, enum wined3d_shader_type type, unsigned int max_version) + size_t byte_code_size, DWORD float_const_count, enum wined3d_shader_type type, unsigned int max_version) { struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; const struct wined3d_shader_frontend *fe; @@ -2862,8 +2862,8 @@ static HRESULT shader_set_function(struct wined3d_shader *shader, const DWORD *b unsigned int backend_version; const struct wined3d_d3d_info *d3d_info = &shader->device->adapter->d3d_info; - TRACE("shader %p, byte_code %p, float_const_count %u, type %#x, max_version %u.\n", - shader, byte_code, float_const_count, type, max_version); + TRACE("shader %p, byte_code %p, byte_code_size %#lx, float_const_count %u, type %#x, max_version %u.\n", + shader, byte_code, (long)byte_code_size, float_const_count, type, max_version); list_init(&shader->constantsF); list_init(&shader->constantsB); @@ -2878,7 +2878,7 @@ static HRESULT shader_set_function(struct wined3d_shader *shader, const DWORD *b return WINED3DERR_INVALIDCALL; } shader->frontend = fe; - shader->frontend_data = fe->shader_init(byte_code, &shader->output_signature); + shader->frontend_data = fe->shader_init(byte_code, byte_code_size, &shader->output_signature); if (!shader->frontend_data) { FIXME("Failed to initialize frontend.\n"); @@ -3193,7 +3193,7 @@ static HRESULT shader_init(struct wined3d_shader *shader, struct wined3d_device list_add_head(&device->shaders, &shader->shader_list_entry); if (FAILED(hr = shader_set_function(shader, desc->byte_code, - float_const_count, type, desc->max_version))) + desc->byte_code_size, float_const_count, type, desc->max_version))) { WARN("Failed to set function, hr %#x.\n", hr); shader_cleanup(shader); diff --git a/dlls/wined3d/shader_sm1.c b/dlls/wined3d/shader_sm1.c index 2437608..40c9e79 100644 --- a/dlls/wined3d/shader_sm1.c +++ b/dlls/wined3d/shader_sm1.c @@ -533,7 +533,8 @@ static unsigned int shader_skip_unrecognized(const struct wined3d_sm1_data *priv return tokens_read; } -static void *shader_sm1_init(const DWORD *byte_code, const struct wined3d_shader_signature *output_signature) +static void *shader_sm1_init(const DWORD *byte_code, size_t byte_code_size, + const struct wined3d_shader_signature *output_signature) { struct wined3d_sm1_data *priv; BYTE major, minor; diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index a9d731f..baffe2d 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -1121,17 +1121,30 @@ static enum wined3d_data_type map_data_type(char t) } } -static void *shader_sm4_init(const DWORD *byte_code, const struct wined3d_shader_signature *output_signature) +static void *shader_sm4_init(const DWORD *byte_code, size_t byte_code_size, + const struct wined3d_shader_signature *output_signature) { DWORD version_token, token_count; struct wined3d_sm4_data *priv; unsigned int i; + if (byte_code_size / sizeof(*byte_code) < 2) + { + WARN("Invalid byte code size %lu.\n", (long)byte_code_size); + return NULL; + } + version_token = byte_code[0]; TRACE("Version: 0x%08x.\n", version_token); token_count = byte_code[1]; TRACE("Token count: %u.\n", token_count); + if (token_count < 2 || byte_code_size / sizeof(*byte_code) < token_count) + { + WARN("Invalid token count %u.\n", token_count); + return NULL; + } + if (!(priv = HeapAlloc(GetProcessHeap(), 0, sizeof(*priv)))) { ERR("Failed to allocate private data\n"); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d4380a5..485bc38 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1083,7 +1083,8 @@ struct wined3d_shader_loop_control struct wined3d_shader_frontend { - void *(*shader_init)(const DWORD *ptr, const struct wined3d_shader_signature *output_signature); + void *(*shader_init)(const DWORD *byte_code, size_t byte_code_size, + const struct wined3d_shader_signature *output_signature); void (*shader_free)(void *data); void (*shader_read_header)(void *data, const DWORD **ptr, struct wined3d_shader_version *shader_version); void (*shader_read_instruction)(void *data, const DWORD **ptr, struct wined3d_shader_instruction *ins); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index e216520..834cf11 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1959,6 +1959,7 @@ struct wined3d_shader_signature struct wined3d_shader_desc { const DWORD *byte_code; + size_t byte_code_size; struct wined3d_shader_signature input_signature; struct wined3d_shader_signature output_signature; unsigned int max_version;

1 0

Henri Verbeet : wined3d: Parse the shader version in shader_sm4_init().
by Alexandre Julliard Feb. 21, 2017

Feb. 21, 2017

Module: wine Branch: master Commit: 12f5887a2358b4f91a882eeac57c9f1dd28c50ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=12f5887a2358b4f91a882eeac… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 21 00:40:03 2017 +0100 wined3d: Parse the shader version in shader_sm4_init(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 6 +-- dlls/wined3d/glsl_shader.c | 12 ++---- dlls/wined3d/shader.c | 16 ++++---- dlls/wined3d/shader_sm1.c | 14 ++++--- dlls/wined3d/shader_sm4.c | 85 ++++++++++++++++++++------------------- dlls/wined3d/wined3d_private.h | 2 +- 6 files changed, 66 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=12f5887a2358b4f91a882…

1 0

Henri Verbeet : wined3d: Validate WINED3DSPR_TEXCRDOUT indices in shader_get_registers_used() (AFL ).
by Alexandre Julliard Feb. 21, 2017

Feb. 21, 2017

Module: wine Branch: master Commit: e27f31d18c47e53c5cb6117f733a623d0e5f55eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e27f31d18c47e53c5cb6117f7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 21 00:40:07 2017 +0100 wined3d: Validate WINED3DSPR_TEXCRDOUT indices in shader_get_registers_used() (AFL). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 6278392..0bf8e26 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1195,9 +1195,19 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st case WINED3DSPR_TEXCRDOUT: if (shader_version.major >= 3) { + if (idx >= ARRAY_SIZE(reg_maps->u.output_registers_mask)) + { + WARN("Invalid output register index %u.\n", idx); + break; + } reg_maps->u.output_registers_mask[idx] |= ins.dst[i].write_mask; break; } + if (idx >= ARRAY_SIZE(reg_maps->u.texcoord_mask)) + { + WARN("Invalid texcoord index %u.\n", idx); + break; + } reg_maps->u.texcoord_mask[idx] |= ins.dst[i].write_mask; if (reg_maps->output_registers & (1u << idx)) {

1 0

Henri Verbeet : wined3d: Store used pixel shader input registers as a bitmap (AFL).
by Alexandre Julliard Feb. 21, 2017

Feb. 21, 2017

Module: wine Branch: master Commit: 3a7df733c451e690a8b8ba257595a9c7f53920d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a7df733c451e690a8b8ba257… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 21 00:40:06 2017 +0100 wined3d: Store used pixel shader input registers as a bitmap (AFL). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 11 +++-------- dlls/wined3d/shader.c | 23 ++++++++--------------- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 12 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f312f15..7bfd52f 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1856,11 +1856,11 @@ static BOOL glsl_is_color_reg_read(const struct wined3d_shader *shader, unsigned { const struct wined3d_shader_signature *input_signature = &shader->input_signature; const struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; - const BOOL *input_reg_used = shader->u.ps.input_reg_used; + DWORD input_reg_used = shader->u.ps.input_reg_used; unsigned int i; if (reg_maps->shader_version.major < 3) - return input_reg_used[idx]; + return input_reg_used & (1u << idx); for (i = 0; i < input_signature->element_count; ++i) { @@ -1871,12 +1871,7 @@ static BOOL glsl_is_color_reg_read(const struct wined3d_shader *shader, unsigned if (shader_match_semantic(input->semantic_name, WINED3D_DECL_USAGE_COLOR) && input->semantic_idx == idx) - { - if (input_reg_used[input->register_idx]) - return TRUE; - else - return FALSE; - } + return input_reg_used & (1u << input->register_idx); } return FALSE; } diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index a3b3c3d..6278392 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -709,21 +709,14 @@ static BOOL shader_record_register_usage(struct wined3d_shader *shader, struct w case WINED3DSPR_INPUT: if (shader_type == WINED3D_SHADER_TYPE_PIXEL) { + /* If relative addressing is used, we must assume that all + * registers are used. Even if it is a construct like v3[aL], + * we can't assume that v0, v1 and v2 aren't read because aL + * can be negative. */ if (reg->idx[0].rel_addr) - { - /* If relative addressing is used, we must assume that all registers - * are used. Even if it is a construct like v3[aL], we can't assume - * that v0, v1 and v2 aren't read because aL can be negative */ - unsigned int i; - for (i = 0; i < MAX_REG_INPUT; ++i) - { - shader->u.ps.input_reg_used[i] = TRUE; - } - } + shader->u.ps.input_reg_used = ~0u; else - { - shader->u.ps.input_reg_used[reg->idx[0].offset] = TRUE; - } + shader->u.ps.input_reg_used |= 1u << reg->idx[0].offset; } else reg_maps->input_registers |= 1u << reg->idx[0].offset; @@ -3493,7 +3486,7 @@ static HRESULT pixel_shader_init(struct wined3d_shader *shader, struct wined3d_d for (i = 0; i < MAX_REG_INPUT; ++i) { - if (shader->u.ps.input_reg_used[i]) + if (shader->u.ps.input_reg_used & (1u << i)) { ++num_regs_used; highest_reg_used = i; @@ -3526,7 +3519,7 @@ static HRESULT pixel_shader_init(struct wined3d_shader *shader, struct wined3d_d shader->u.ps.declared_in_count = 0; for (i = 0; i < MAX_REG_INPUT; ++i) { - if (shader->u.ps.input_reg_used[i]) + if (shader->u.ps.input_reg_used & (1u << i)) shader->u.ps.input_reg_map[i] = shader->u.ps.declared_in_count++; else shader->u.ps.input_reg_map[i] = ~0U; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 485bc38..fd03674 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3572,7 +3572,7 @@ struct wined3d_pixel_shader { /* Pixel shader input semantics */ DWORD input_reg_map[MAX_REG_INPUT]; - BOOL input_reg_used[MAX_REG_INPUT]; + DWORD input_reg_used; /* MAX_REG_INPUT, 32 */ unsigned int declared_in_count; /* Some information about the shader behavior */

1 0

Francois Gouget : dwrite: Add __WINE_ALLOC_SIZE attributes to heap_xxx() functions.
by Alexandre Julliard Feb. 21, 2017

Feb. 21, 2017

Module: wine Branch: master Commit: e99d22fdcc055be700f844a95aa4c924ecfa4c67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e99d22fdcc055be700f844a95… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Feb 18 11:22:06 2017 +0100 dwrite: Add __WINE_ALLOC_SIZE attributes to heap_xxx() functions. And standardize their parameter names. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index d91735d..36df1aa 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -30,24 +30,24 @@ static const DWRITE_MATRIX identity = 0.0f, 0.0f }; -static inline void *heap_alloc(size_t len) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) { - return HeapAlloc(GetProcessHeap(), 0, len); + return HeapAlloc(GetProcessHeap(), 0, size); } -static inline void *heap_alloc_zero(size_t len) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) { - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); } -static inline void *heap_realloc(void *mem, size_t len) +static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) { - return HeapReAlloc(GetProcessHeap(), 0, mem, len); + return HeapReAlloc(GetProcessHeap(), 0, mem, size); } -static inline void *heap_realloc_zero(void *mem, size_t len) +static inline void* __WINE_ALLOC_SIZE(2) heap_realloc_zero(void *mem, size_t size) { - return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, len); + return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, size); } static inline BOOL heap_free(void *mem)

1 0

Francois Gouget : ieframe: Add __WINE_ALLOC_SIZE attributes to heap_xxx() functions.
by Alexandre Julliard Feb. 21, 2017

Feb. 21, 2017

Module: wine Branch: master Commit: f4993955c8ec20941bdf5103f4fe733023c78663 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4993955c8ec20941bdf5103f… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Feb 18 11:21:55 2017 +0100 ieframe: Add __WINE_ALLOC_SIZE attributes to heap_xxx() functions. And standardize their formatting and parameter names. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/ieframe.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index b586cc9..d1f1c5d 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -331,19 +331,19 @@ static inline void unlock_module(void) { InterlockedDecrement(&module_ref); } -static inline void *heap_alloc(size_t len) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) { - return HeapAlloc(GetProcessHeap(), 0, len); + return HeapAlloc(GetProcessHeap(), 0, size); } -static inline void *heap_alloc_zero(size_t len) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) { - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); } -static inline void *heap_realloc(void *mem, size_t len) +static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) { - return HeapReAlloc(GetProcessHeap(), 0, mem, len); + return HeapReAlloc(GetProcessHeap(), 0, mem, size); } static inline BOOL heap_free(void *mem)

1 0

Francois Gouget : testbot/WineRunTask: TestLauncher' s fake test result lines are wrong.
by Alexandre Julliard Feb. 21, 2017

Feb. 21, 2017

Module: tools Branch: master Commit: d4f2487b1c185f2b866c906482db97ce05080468 URL: http://source.winehq.org/git/tools.git/?a=commit;h=d4f2487b1c185f2b866c9064… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Feb 21 18:02:31 2017 +0100 testbot/WineRunTask: TestLauncher's fake test result lines are wrong. TestLauncher uses the dll name instead of the test unit name on the fake 'tests skipped' and test summary lines it generates when a dll is missing. Accept the latter to avoid a 'missing test summary line' error. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunTask.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 21ad8e2..0b686f6 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -509,7 +509,8 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) { my ($Pid, $Unit, $Todo, $Failures) = ($1, $2, $3, $4); - if ($Unit eq $CurrentUnit) + # TestLauncher uses the wrong name in its test summary line + if ($Unit eq $CurrentUnit or $Unit eq $CurrentDll) { $CurrentPids{$Pid || 0} = 1; $SummaryFailures += $Failures;

1 0

Francois Gouget : testbot/WineRunTask: Add the $TimedOut flag.
by Alexandre Julliard Feb. 21, 2017

Feb. 21, 2017

Module: tools Branch: master Commit: 5e631749e52953b520f4d4bfac88a9b938c9af0e URL: http://source.winehq.org/git/tools.git/?a=commit;h=5e631749e52953b520f4d4bf… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Feb 21 10:29:11 2017 +0100 testbot/WineRunTask: Add the $TimedOut flag. The log analysis code depends on it to not issue redundant errors when the task timed out. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunTask.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index c21aec0..21ad8e2 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -436,7 +436,7 @@ if (!$Pid) # my $NewStatus = 'completed'; -my ($TestFailures, $TAError, $PossibleCrash); +my ($TestFailures, $TimedOut, $TAError, $PossibleCrash); Debug(Elapsed($Start), " Waiting for the script (", $Task->Timeout, "s timeout)\n"); if (!defined $TA->Wait($Pid, $Timeout, $Keepalive)) { @@ -445,6 +445,7 @@ if (!defined $TA->Wait($Pid, $Timeout, $Keepalive)) { LogTaskError("The test timed out\n"); $TestFailures = 1; + $TimedOut = 1; } else {

1 0

Thomas Faber : winex11: Avoid unused variable warning when building without LIBGL.
by Alexandre Julliard Feb. 20, 2017

Feb. 20, 2017

Module: wine Branch: master Commit: 3be9f9d03635942db03dff37dcf8775cab26ef9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3be9f9d03635942db03dff37d… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Mon Feb 20 15:28:25 2017 +0100 winex11: Avoid unused variable warning when building without LIBGL. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/opengl.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index d89a193..76cc3cc 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -43,10 +43,9 @@ #include "wine/library.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(wgl); - #ifdef SONAME_LIBGL +WINE_DEFAULT_DEBUG_CHANNEL(wgl); WINE_DECLARE_DEBUG_CHANNEL(winediag); #include "wine/wgl.h"

1 0