wine-commits February 2017

wine-commits@winehq.org

2 participants
838 discussions

Hans Leidekker : winhttp: Parse cookie attributes.
by Alexandre Julliard 21 Feb '17

21 Feb '17

Module: wine Branch: master Commit: 8595cc538603d9d6acb66893d9daf0db2ba8e778 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8595cc538603d9d6acb66893d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 21 09:24:36 2017 +0100 winhttp: Parse cookie attributes. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/cookie.c | 118 +++++++++++++++++++++++++++++++++++++------------- 1 file changed, 88 insertions(+), 30 deletions(-) diff --git a/dlls/winhttp/cookie.c b/dlls/winhttp/cookie.c index 769055b..ec5dbc4 100644 --- a/dlls/winhttp/cookie.c +++ b/dlls/winhttp/cookie.c @@ -167,17 +167,79 @@ static cookie_t *parse_cookie( const WCHAR *string ) return cookie; } +struct attr +{ + WCHAR *name; + WCHAR *value; +}; + +static void free_attr( struct attr *attr ) +{ + if (!attr) return; + heap_free( attr->name ); + heap_free( attr->value ); + heap_free( attr ); +} + +static struct attr *parse_attr( const WCHAR *str, int *used ) +{ + const WCHAR *p = str, *q; + struct attr *attr; + int len; + + while (*p == ' ') p++; + q = p; + while (*q && *q != ' ' && *q != '=' && *q != ';') q++; + len = q - p; + if (!len) return NULL; + + if (!(attr = heap_alloc( sizeof(struct attr) ))) return NULL; + if (!(attr->name = heap_alloc( (len + 1) * sizeof(WCHAR) ))) + { + heap_free( attr ); + return NULL; + } + memcpy( attr->name, p, len * sizeof(WCHAR) ); + attr->name[len] = 0; + attr->value = NULL; + + p = q; + while (*p == ' ') p++; + if (*p++ == '=') + { + while (*p == ' ') p++; + q = p; + while (*q && *q != ';') q++; + len = q - p; + while (len && p[len - 1] == ' ') len--; + + if (!(attr->value = heap_alloc( (len + 1) * sizeof(WCHAR) ))) + { + free_attr( attr ); + return NULL; + } + memcpy( attr->value, p, len * sizeof(WCHAR) ); + attr->value[len] = 0; + } + + while (*q == ' ') q++; + if (*q == ';') q++; + *used = q - str; + + return attr; +} + BOOL set_cookies( request_t *request, const WCHAR *cookies ) { static const WCHAR pathW[] = {'p','a','t','h',0}; static const WCHAR domainW[] = {'d','o','m','a','i','n',0}; - BOOL ret = FALSE; - WCHAR *buffer, *p, *q, *r; + WCHAR *buffer, *p; WCHAR *cookie_domain = NULL, *cookie_path = NULL; + struct attr *attr, *domain = NULL, *path = NULL; session_t *session = request->connect->session; cookie_t *cookie; - int len; + int len, used; len = strlenW( cookies ); if (!(buffer = heap_alloc( (len + 1) * sizeof(WCHAR) ))) return FALSE; @@ -191,32 +253,26 @@ BOOL set_cookies( request_t *request, const WCHAR *cookies ) heap_free( buffer ); return FALSE; } - if ((q = strstrW( p, domainW ))) /* FIXME: do real attribute parsing */ - { - while (*q && *q != '=') q++; - if (!*q) goto end; - - r = ++q; - while (*r && *r != ';') r++; - len = r - q; - - if (!(cookie_domain = heap_alloc( (len + 1) * sizeof(WCHAR) ))) goto end; - memcpy( cookie_domain, q, len * sizeof(WCHAR) ); - cookie_domain[len] = 0; - - } - if ((q = strstrW( p, pathW ))) + len = strlenW( p ); + while (len && (attr = parse_attr( p, &used ))) { - while (*q && *q != '=') q++; - if (!*q) goto end; - - r = ++q; - while (*r && *r != ';') r++; - len = r - q; - - if (!(cookie_path = heap_alloc( (len + 1) * sizeof(WCHAR) ))) goto end; - memcpy( cookie_path, q, len * sizeof(WCHAR) ); - cookie_path[len] = 0; + if (!strcmpW( attr->name, domainW )) + { + domain = attr; + cookie_domain = attr->value; + } + else if (!strcmpW( attr->name, pathW )) + { + path = attr; + cookie_path = attr->value; + } + else + { + FIXME( "unhandled attribute %s\n", debugstr_w(attr->name) ); + free_attr( attr ); + } + len -= used; + p += used; } if (!cookie_domain && !(cookie_domain = strdupW( request->connect->servername ))) goto end; if (!cookie_path && !(cookie_path = strdupW( request->path ))) goto end; @@ -226,8 +282,10 @@ BOOL set_cookies( request_t *request, const WCHAR *cookies ) end: if (!ret) free_cookie( cookie ); - heap_free( cookie_domain ); - heap_free( cookie_path ); + if (domain) free_attr( domain ); + else heap_free( cookie_domain ); + if (path) free_attr( path ); + else heap_free( cookie_path ); heap_free( buffer ); return ret; }

1 0

Henri Verbeet : wined3d: Validate ps 1.x sampler indices in shader_get_registers_used().
by Alexandre Julliard 21 Feb '17

21 Feb '17

Module: wine Branch: master Commit: ef15e09d3d15f9c2109ced819ee27396b56c1676 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef15e09d3d15f9c2109ced819… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 21 00:40:08 2017 +0100 wined3d: Validate ps 1.x sampler indices in shader_get_registers_used(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 0bf8e26..519d029 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1271,6 +1271,12 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st { unsigned int reg_idx = ins.dst[i].reg.idx[0].offset; + if (reg_idx >= ARRAY_SIZE(reg_maps->resource_info)) + { + WARN("Invalid 1.x sampler index %u.\n", reg_idx); + continue; + } + TRACE("Setting fake 2D resource for 1.x pixelshader.\n"); reg_maps->resource_info[reg_idx].type = WINED3D_SHADER_RESOURCE_TEXTURE_2D; reg_maps->resource_info[reg_idx].data_type = WINED3D_DATA_FLOAT;

1 0

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

21 Feb '17

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 21 Feb '17

21 Feb '17

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

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

21 Feb '17

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 21 Feb '17

21 Feb '17

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 21 Feb '17

21 Feb '17

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

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

21 Feb '17

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 21 Feb '17

21 Feb '17

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

Jacek Caban : msvcrt: Added lldiv implementation.
by Alexandre Julliard 20 Feb '17

20 Feb '17

Module: wine Branch: master Commit: 60c98caa94465799d0868b69149bce29cf767de4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60c98caa94465799d0868b691… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 20 17:43:32 2017 +0100 msvcrt: Added lldiv implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-utility-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/math.c | 13 +++++++++++++ dlls/msvcrt/msvcrt.h | 5 +++++ dlls/ucrtbase/tests/misc.c | 17 +++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 9 files changed, 41 insertions(+), 6 deletions(-) diff --git a/dlls/api-ms-win-crt-utility-l1-1-0/api-ms-win-crt-utility-l1-1-0.spec b/dlls/api-ms-win-crt-utility-l1-1-0/api-ms-win-crt-utility-l1-1-0.spec index 12586d8..fe3d04d 100644 --- a/dlls/api-ms-win-crt-utility-l1-1-0/api-ms-win-crt-utility-l1-1-0.spec +++ b/dlls/api-ms-win-crt-utility-l1-1-0/api-ms-win-crt-utility-l1-1-0.spec @@ -22,7 +22,7 @@ @ cdecl labs(long) ucrtbase.labs @ cdecl ldiv(long long) ucrtbase.ldiv @ cdecl -ret64 llabs(int64) ucrtbase.llabs -@ stub lldiv +@ cdecl lldiv(int64 int64) ucrtbase.lldiv @ cdecl qsort(ptr long long ptr) ucrtbase.qsort @ cdecl qsort_s(ptr long long ptr ptr) ucrtbase.qsort_s @ cdecl rand() ucrtbase.rand diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 258463d..8604767 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1733,7 +1733,7 @@ @ cdecl ldexp(double long) MSVCRT_ldexp @ cdecl ldiv(long long) MSVCRT_ldiv @ cdecl -ret64 llabs(int64) MSVCRT_llabs -@ stub lldiv +@ cdecl lldiv(int64 int64) MSVCRT_lldiv @ cdecl localeconv() MSVCRT_localeconv @ cdecl log(double) MSVCRT_log @ cdecl -arch=arm,x86_64 logf(float) MSVCRT_logf diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index a95b39c..143eccc 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -2091,7 +2091,7 @@ @ cdecl ldexp(double long) MSVCRT_ldexp @ cdecl ldiv(long long) MSVCRT_ldiv @ cdecl -ret64 llabs(int64) MSVCRT_llabs -@ stub lldiv +@ cdecl lldiv(int64 int64) MSVCRT_lldiv @ cdecl localeconv() MSVCRT_localeconv @ cdecl log(double) MSVCRT_log @ cdecl -arch=arm,x86_64 logf(float) MSVCRT_logf diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index db2ae9c..cc38421 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2247,7 +2247,7 @@ @ cdecl lgammaf(float) MSVCR120_lgammaf @ cdecl lgammal(double) MSVCR120_lgammal @ cdecl -ret64 llabs(int64) MSVCRT_llabs -@ stub lldiv +@ cdecl lldiv(int64 int64) MSVCRT_lldiv @ cdecl -ret64 llrint(double) MSVCR120_llrint @ cdecl -ret64 llrintf(float) MSVCR120_llrintf @ cdecl -ret64 llrintl(double) MSVCR120_llrintl diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 849e135..90fdd97 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1910,7 +1910,7 @@ @ cdecl lgammaf(float) msvcr120.lgammaf @ cdecl lgammal(double) msvcr120.lgammal @ cdecl -ret64 llabs(int64) msvcr120.llabs -@ stub lldiv +@ cdecl lldiv(int64 int64) msvcr120.lldiv @ cdecl -ret64 llrint(double) msvcr120.llrint @ cdecl -ret64 llrintf(float) msvcr120.llrintf @ cdecl -ret64 llrintl(double) msvcr120.llrintl diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 857561b..af3aa2a 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1844,6 +1844,19 @@ MSVCRT_ldiv_t CDECL MSVCRT_ldiv(MSVCRT_long num, MSVCRT_long denom) } #endif /* ifdef __i386__ */ +/********************************************************************* + * lldiv (MSVCRT.@) + */ +MSVCRT_lldiv_t CDECL MSVCRT_lldiv(MSVCRT_longlong num, MSVCRT_longlong denom) +{ + MSVCRT_lldiv_t ret; + + ret.quot = num / denom; + ret.rem = num % denom; + + return ret; +} + #ifdef __i386__ /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 71d80c9..1a2c750 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -448,6 +448,11 @@ typedef struct MSVCRT__ldiv_t { MSVCRT_long rem; /* remainder */ } MSVCRT_ldiv_t; +typedef struct MSVCRT__lldiv_t { + MSVCRT_longlong quot; /* quotient */ + MSVCRT_longlong rem; /* remainder */ +} MSVCRT_lldiv_t; + struct MSVCRT__heapinfo { int* _pentry; MSVCRT_size_t _size; diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index d8075cc..5f1d2a1 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -67,6 +67,11 @@ typedef struct MSVCRT__onexit_table_t MSVCRT__onexit_t *_end; } MSVCRT__onexit_table_t; +typedef struct MSVCRT__lldiv_t { + LONGLONG quot; /* quotient */ + LONGLONG rem; /* remainder */ +} MSVCRT_lldiv_t; + static int (CDECL *p_initialize_onexit_table)(MSVCRT__onexit_table_t *table); static int (CDECL *p_register_onexit_function)(MSVCRT__onexit_table_t *table, MSVCRT__onexit_t func); static int (CDECL *p_execute_onexit_table)(MSVCRT__onexit_table_t *table); @@ -80,6 +85,7 @@ static int (CDECL *p__ltoa_s)(LONG, char*, size_t, int); static char* (CDECL *p__get_narrow_winmain_command_line)(void); static int (CDECL *p_sopen_dispatch)(const char *, int, int, int, int *, int); static int (CDECL *p_sopen_s)(int *, const char *, int, int, int); +static MSVCRT_lldiv_t (CDECL *p_lldiv)(LONGLONG,LONGLONG); static void test__initialize_onexit_table(void) { @@ -373,6 +379,7 @@ static BOOL init(void) p__get_narrow_winmain_command_line = (void*)GetProcAddress(GetModuleHandleA("ucrtbase.dll"), "_get_narrow_winmain_command_line"); p_sopen_dispatch = (void*)GetProcAddress(module, "_sopen_dispatch"); p_sopen_s = (void*)GetProcAddress(module, "_sopen_s"); + p_lldiv = (void*)GetProcAddress(module, "lldiv"); return TRUE; } @@ -444,6 +451,15 @@ static void test__sopen_s(void) free(tempf); } +static void test_lldiv(void) +{ + MSVCRT_lldiv_t r; + + r = p_lldiv((LONGLONG)0x111 << 32 | 0x222, (LONGLONG)1 << 32); + ok(r.quot == 0x111, "quot = %x%08x\n", (INT32)(r.quot >> 32), (UINT32)r.quot); + ok(r.rem == 0x222, "rem = %x%08x\n", (INT32)(r.rem >> 32), (UINT32)r.rem); +} + START_TEST(misc) { int arg_c; @@ -466,4 +482,5 @@ START_TEST(misc) test__get_narrow_winmain_command_line(arg_v[0]); test__sopen_dispatch(); test__sopen_s(); + test_lldiv(); } diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 5c97d8b..2f733c3 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2381,7 +2381,7 @@ @ cdecl lgammaf(float) MSVCR120_lgammaf @ cdecl lgammal(double) MSVCR120_lgammal @ cdecl -ret64 llabs(int64) MSVCRT_llabs -@ stub lldiv +@ cdecl lldiv(int64 int64) MSVCRT_lldiv @ cdecl -ret64 llrint(double) MSVCR120_llrint @ cdecl -ret64 llrintf(float) MSVCR120_llrintf @ cdecl -ret64 llrintl(double) MSVCR120_llrintl

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
84
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 February 2017