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

Nikolay Sivov : xmllite/tests: Added missing return value check (Coverity) .
by Alexandre Julliard March 20, 2017

March 20, 2017

Module: wine Branch: master Commit: fc68269a5205afe4e48561390405d493d30312da URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc68269a5205afe4e48561390… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 20 08:30:48 2017 +0300 xmllite/tests: Added missing return value check (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/reader.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 82880ae..b2fa65b 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -2578,7 +2578,8 @@ static void test_reader_position(void) ok(type == XmlNodeType_EndElement, "got type %d\n", type); TEST_READER_POSITION2(reader, 2, 3, 2, 6); - IXmlReader_SetInput(reader, NULL); + hr = IXmlReader_SetInput(reader, NULL); + ok(hr == S_OK, "got %08x\n", hr); TEST_READER_STATE2(reader, XmlReadState_Initial, XmlReadState_Closed); TEST_READER_POSITION(reader, 0, 0);

1 0

Henri Verbeet : usp10: Pass const metrics to GPOS_convert_design_units_to_device().
by Alexandre Julliard March 20, 2017

March 20, 2017

Module: wine Branch: master Commit: cd9db34e51d727f0166c23b970fa5e7e579903b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd9db34e51d727f0166c23b97… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Mar 19 22:59:44 2017 +0100 usp10: Pass const metrics to GPOS_convert_design_units_to_device(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/opentype.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index e531f3a..a1c4485 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -1579,15 +1579,16 @@ static VOID GPOS_get_anchor_values(LPCVOID table, LPPOINT pt, WORD ppem) } } -static void GPOS_convert_design_units_to_device(LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, int desX, int desY, double *devX, double *devY) +static void GPOS_convert_design_units_to_device(const OUTLINETEXTMETRICW *otm, const LOGFONTW *logfont, + int desX, int desY, double *devX, double *devY) { - int emHeight = lpotm->otmTextMetrics.tmAscent + lpotm->otmTextMetrics.tmDescent - lpotm->otmTextMetrics.tmInternalLeading; + int emHeight = otm->otmTextMetrics.tmAscent + otm->otmTextMetrics.tmDescent - otm->otmTextMetrics.tmInternalLeading; - TRACE("emHeight %i lfWidth %i\n",emHeight, lplogfont->lfWidth); - *devX = (desX * emHeight) / (double)lpotm->otmEMSquare; - *devY = (desY * emHeight) / (double)lpotm->otmEMSquare; - if (lplogfont->lfWidth) - FIXME("Font with lfWidth set not handled properly\n"); + TRACE("emHeight %i lfWidth %i\n",emHeight, logfont->lfWidth); + *devX = (desX * emHeight) / (double)otm->otmEMSquare; + *devY = (desY * emHeight) / (double)otm->otmEMSquare; + if (logfont->lfWidth) + FIXME("Font with lfWidth set not handled properly.\n"); } static INT GPOS_get_value_record(WORD ValueFormat, const WORD data[], GPOS_ValueRecord *record)

1 0

Józef Kucia : wined3d: Make wined3d samplers responsible for setting texture base level.
by Alexandre Julliard March 20, 2017

March 20, 2017

Module: wine Branch: master Commit: ec1da699d947d077ce4fe22a8119a7528296a1da URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec1da699d947d077ce4fe22a8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Mar 20 12:13:08 2017 +0100 wined3d: Make wined3d samplers responsible for setting texture base level. 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/d3d11/state.c | 1 + dlls/wined3d/device.c | 1 + dlls/wined3d/sampler.c | 28 ++++++++++++++++++++++++++++ dlls/wined3d/state.c | 22 +--------------------- include/wine/wined3d.h | 1 + 5 files changed, 32 insertions(+), 21 deletions(-) diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 77c8e55..0a16e58 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -1205,6 +1205,7 @@ HRESULT d3d_sampler_state_init(struct d3d_sampler_state *state, struct d3d_devic wined3d_desc.lod_bias = desc->MipLODBias; wined3d_desc.min_lod = desc->MinLOD; wined3d_desc.max_lod = desc->MaxLOD; + wined3d_desc.mip_base_level = 0; wined3d_desc.max_anisotropy = D3D11_DECODE_IS_ANISOTROPIC_FILTER(desc->Filter) ? desc->MaxAnisotropy : 1; wined3d_desc.compare = wined3d_texture_compare_from_d3d11(desc->Filter); wined3d_desc.comparison_func = wined3d_cmp_func_from_d3d11(desc->ComparisonFunc); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a34cb97..9b0fcfb 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -788,6 +788,7 @@ static void create_default_samplers(struct wined3d_device *device, struct wined3 desc.lod_bias = 0.0f; desc.min_lod = -1000.0f; desc.max_lod = 1000.0f; + desc.mip_base_level = 0; desc.max_anisotropy = 1; desc.compare = FALSE; desc.comparison_func = WINED3D_CMP_NEVER; diff --git a/dlls/wined3d/sampler.c b/dlls/wined3d/sampler.c index c1364c2..294d766 100644 --- a/dlls/wined3d/sampler.c +++ b/dlls/wined3d/sampler.c @@ -151,6 +151,31 @@ HRESULT CDECL wined3d_sampler_create(struct wined3d_device *device, const struct return WINED3D_OK; } +static void texture_apply_base_level(struct wined3d_texture *texture, + const struct wined3d_sampler_desc *desc, const struct wined3d_gl_info *gl_info) +{ + struct gl_texture *gl_tex; + unsigned int base_level; + + if (texture->flags & WINED3D_TEXTURE_COND_NP2) + base_level = 0; + else if (desc->mip_filter == WINED3D_TEXF_NONE) + base_level = texture->lod; + else + base_level = min(max(desc->mip_base_level, texture->lod), texture->level_count - 1); + + gl_tex = wined3d_texture_get_gl_texture(texture, texture->flags & WINED3D_TEXTURE_IS_SRGB); + if (base_level != gl_tex->base_level) + { + /* Note that WINED3D_SAMP_MAX_MIP_LEVEL specifies the largest mipmap + * (default 0), while GL_TEXTURE_MAX_LEVEL specifies the smallest + * mipmap used (default 1000). So WINED3D_SAMP_MAX_MIP_LEVEL + * corresponds to GL_TEXTURE_BASE_LEVEL. */ + gl_info->gl_ops.gl.p_glTexParameteri(texture->target, GL_TEXTURE_BASE_LEVEL, base_level); + gl_tex->base_level = base_level; + } +} + /* This function relies on the correct texture being bound and loaded. */ void wined3d_sampler_bind(struct wined3d_sampler *sampler, unsigned int unit, struct wined3d_texture *texture, const struct wined3d_context *context) @@ -170,4 +195,7 @@ void wined3d_sampler_bind(struct wined3d_sampler *sampler, unsigned int unit, { ERR("Could not apply sampler state.\n"); } + + if (texture) + texture_apply_base_level(texture, &sampler->desc, gl_info); } diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 7fcd2b9..409c161 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3562,6 +3562,7 @@ static void wined3d_sampler_desc_from_sampler_states(struct wined3d_sampler_desc desc->lod_bias = lod_bias.f; desc->min_lod = -1000.0f; desc->max_lod = 1000.0f; + desc->mip_base_level = sampler_states[WINED3D_SAMP_MAX_MIP_LEVEL]; desc->max_anisotropy = sampler_states[WINED3D_SAMP_MAX_ANISOTROPY]; if ((sampler_states[WINED3D_SAMP_MAG_FILTER] != WINED3D_TEXF_ANISOTROPIC && sampler_states[WINED3D_SAMP_MIN_FILTER] != WINED3D_TEXF_ANISOTROPIC @@ -3618,8 +3619,6 @@ static void sampler(struct wined3d_context *context, const struct wined3d_state struct wined3d_sampler_desc desc; struct wined3d_sampler *sampler; struct wine_rb_entry *entry; - struct gl_texture *gl_tex; - unsigned int base_level; wined3d_sampler_desc_from_sampler_states(&desc, context, sampler_states, texture); @@ -3646,25 +3645,6 @@ static void sampler(struct wined3d_context *context, const struct wined3d_state if (sampler) wined3d_sampler_bind(sampler, mapped_stage, texture, context); - if (texture->flags & WINED3D_TEXTURE_COND_NP2) - base_level = 0; - else if (desc.mip_filter == WINED3D_TEXF_NONE) - base_level = texture->lod; - else - base_level = min(max(sampler_states[WINED3D_SAMP_MAX_MIP_LEVEL], - texture->lod), texture->level_count - 1); - - gl_tex = wined3d_texture_get_gl_texture(texture, texture->flags & WINED3D_TEXTURE_IS_SRGB); - if (base_level != gl_tex->base_level) - { - /* Note that WINED3D_SAMP_MAX_MIP_LEVEL specifies the largest mipmap - * (default 0), while GL_TEXTURE_MAX_LEVEL specifies the smallest - * mipmap used (default 1000). So WINED3D_SAMP_MAX_MIP_LEVEL - * corresponds to GL_TEXTURE_BASE_LEVEL. */ - gl_info->gl_ops.gl.p_glTexParameteri(texture->target, GL_TEXTURE_BASE_LEVEL, base_level); - gl_tex->base_level = base_level; - } - /* Trigger shader constant reloading (for NP2 texcoord fixup) */ if (!(texture->flags & WINED3D_TEXTURE_POW2_MAT_IDENT)) context->constant_update_mask |= WINED3D_SHADER_CONST_PS_NP2_FIXUP; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index acdb4f3..3b0f6db 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1942,6 +1942,7 @@ struct wined3d_sampler_desc float lod_bias; float min_lod; float max_lod; + unsigned int mip_base_level; unsigned int max_anisotropy; BOOL compare; enum wined3d_cmp_func comparison_func;

1 0

Józef Kucia : wined3d: Introduce wined3d_sampler_bind () helper function.
by Alexandre Julliard March 20, 2017

March 20, 2017

Module: wine Branch: master Commit: 584ec259b25bdde4b5ae0bb52cab438fbe76c84a URL: http://source.winehq.org/git/wine.git/?a=commit;h=584ec259b25bdde4b5ae0bb52… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Mar 20 12:13:06 2017 +0100 wined3d: Introduce wined3d_sampler_bind() helper function. 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/context.c | 16 ++++------------ dlls/wined3d/sampler.c | 21 +++++++++++++++++++++ dlls/wined3d/view.c | 7 ++++++- dlls/wined3d/wined3d_private.h | 7 +++++-- 4 files changed, 36 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index baba979..c1803a4 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3394,14 +3394,12 @@ static void context_bind_shader_resources(struct wined3d_context *context, const struct wined3d_state *state, enum wined3d_shader_type shader_type) { unsigned int bind_idx, shader_sampler_count, base, count, i; - const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_device *device = context->device; struct wined3d_shader_sampler_map_entry *entry; struct wined3d_shader_resource_view *view; const struct wined3d_shader *shader; struct wined3d_sampler *sampler; const DWORD *tex_unit_map; - GLuint sampler_name; if (!(shader = state->shader[shader_type])) return; @@ -3429,16 +3427,10 @@ static void context_bind_shader_resources(struct wined3d_context *context, } if (entry->sampler_idx == WINED3D_SAMPLER_DEFAULT) - sampler_name = device->default_sampler->name; - else if ((sampler = state->sampler[shader_type][entry->sampler_idx])) - sampler_name = sampler->name; - else - sampler_name = device->null_sampler->name; - - context_active_texture(context, gl_info, bind_idx); - GL_EXTCALL(glBindSampler(bind_idx, sampler_name)); - checkGLcall("glBindSampler"); - wined3d_shader_resource_view_bind(view, context); + sampler = device->default_sampler; + else if (!(sampler = state->sampler[shader_type][entry->sampler_idx])) + sampler = device->null_sampler; + wined3d_shader_resource_view_bind(view, bind_idx, sampler, context); } } diff --git a/dlls/wined3d/sampler.c b/dlls/wined3d/sampler.c index a987a35..c1364c2 100644 --- a/dlls/wined3d/sampler.c +++ b/dlls/wined3d/sampler.c @@ -150,3 +150,24 @@ HRESULT CDECL wined3d_sampler_create(struct wined3d_device *device, const struct return WINED3D_OK; } + +/* This function relies on the correct texture being bound and loaded. */ +void wined3d_sampler_bind(struct wined3d_sampler *sampler, unsigned int unit, + struct wined3d_texture *texture, const struct wined3d_context *context) +{ + const struct wined3d_gl_info *gl_info = context->gl_info; + + if (gl_info->supported[ARB_SAMPLER_OBJECTS]) + { + GL_EXTCALL(glBindSampler(unit, sampler->name)); + checkGLcall("bind sampler"); + } + else if (texture) + { + wined3d_texture_apply_sampler_desc(texture, &sampler->desc, context); + } + else + { + ERR("Could not apply sampler state.\n"); + } +} diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index ff31de2..ac558a4 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -638,13 +638,17 @@ HRESULT CDECL wined3d_shader_resource_view_create(const struct wined3d_view_desc } void wined3d_shader_resource_view_bind(struct wined3d_shader_resource_view *view, - struct wined3d_context *context) + unsigned int unit, struct wined3d_sampler *sampler, struct wined3d_context *context) { + const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_texture *texture; + context_active_texture(context, gl_info, unit); + if (view->gl_view.name) { context_bind_texture(context, view->gl_view.target, view->gl_view.name); + wined3d_sampler_bind(sampler, unit, NULL, context); return; } @@ -656,6 +660,7 @@ void wined3d_shader_resource_view_bind(struct wined3d_shader_resource_view *view texture = wined3d_texture_from_resource(view->resource); wined3d_texture_bind(texture, context, FALSE); + wined3d_sampler_bind(sampler, unit, texture, context); } ULONG CDECL wined3d_unordered_access_view_incref(struct wined3d_unordered_access_view *view) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3b342d8..21c5f1b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3087,6 +3087,9 @@ struct wined3d_sampler GLuint name; }; +void wined3d_sampler_bind(struct wined3d_sampler *sampler, unsigned int unit, + struct wined3d_texture *texture, const struct wined3d_context *context) DECLSPEC_HIDDEN; + struct wined3d_vertex_declaration_element { const struct wined3d_format *format; @@ -3415,8 +3418,8 @@ struct wined3d_shader_resource_view struct wined3d_gl_view gl_view; }; -void wined3d_shader_resource_view_bind(struct wined3d_shader_resource_view *view, - struct wined3d_context *context) DECLSPEC_HIDDEN; +void wined3d_shader_resource_view_bind(struct wined3d_shader_resource_view *view, unsigned int unit, + struct wined3d_sampler *sampler, struct wined3d_context *context) DECLSPEC_HIDDEN; struct wined3d_unordered_access_view {

1 0

Józef Kucia : wined3d: Create wined3d sampler for default sampler.
by Alexandre Julliard March 20, 2017

March 20, 2017

Module: wine Branch: master Commit: a7dadf2f95d0cc1e38f76a53b35c75d3075f3b2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7dadf2f95d0cc1e38f76a53b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Mar 20 12:13:04 2017 +0100 wined3d: Create wined3d sampler for default sampler. 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/context.c | 2 +- dlls/wined3d/device.c | 46 +++++++++++++++++++++++++++++------------- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 34 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 8029de0..b554b00 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3429,7 +3429,7 @@ static void context_bind_shader_resources(struct wined3d_context *context, } if (entry->sampler_idx == WINED3D_SAMPLER_DEFAULT) - sampler_name = device->default_sampler; + sampler_name = device->default_sampler->name; else if ((sampler = state->sampler[shader_type][entry->sampler_idx])) sampler_name = sampler->name; else diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index eef9818..ba30d20 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -776,20 +776,38 @@ static void destroy_dummy_textures(struct wined3d_device *device, struct wined3d static void create_default_samplers(struct wined3d_device *device, struct wined3d_context *context) { const struct wined3d_gl_info *gl_info = context->gl_info; + struct wined3d_sampler_desc desc; + HRESULT hr; - if (gl_info->supported[ARB_SAMPLER_OBJECTS]) + desc.address_u = WINED3D_TADDRESS_WRAP; + desc.address_v = WINED3D_TADDRESS_WRAP; + desc.address_w = WINED3D_TADDRESS_WRAP; + memset(desc.border_color, 0, sizeof(desc.border_color)); + desc.mag_filter = WINED3D_TEXF_POINT; + desc.min_filter = WINED3D_TEXF_POINT; + desc.mip_filter = WINED3D_TEXF_NONE; + desc.lod_bias = 0.0f; + desc.min_lod = -1000.0f; + desc.max_lod = 1000.0f; + desc.max_anisotropy = 1; + desc.compare = FALSE; + desc.comparison_func = WINED3D_CMP_NEVER; + desc.srgb_decode = TRUE; + + /* In SM4+ shaders there is a separation between resources and samplers. Some shader + * instructions allow access to resources without using samplers. + * In GLSL, resources are always accessed through sampler or image variables. The default + * sampler object is used to emulate the direct resource access when there is no sampler state + * to use. + */ + if (FAILED(hr = wined3d_sampler_create(device, &desc, NULL, &device->default_sampler))) { - /* In SM4+ shaders there is a separation between resources and samplers. Some shader - * instructions allow access to resources without using samplers. - * In GLSL, resources are always accessed through sampler or image variables. The default - * sampler object is used to emulate the direct resource access when there is no sampler state - * to use. - */ - GL_EXTCALL(glGenSamplers(1, &device->default_sampler)); - GL_EXTCALL(glSamplerParameteri(device->default_sampler, GL_TEXTURE_MAG_FILTER, GL_NEAREST)); - GL_EXTCALL(glSamplerParameteri(device->default_sampler, GL_TEXTURE_MIN_FILTER, GL_NEAREST)); - checkGLcall("Create default sampler"); + ERR("Failed to create default sampler, hr %#x.\n", hr); + device->default_sampler = NULL; + } + if (gl_info->supported[ARB_SAMPLER_OBJECTS]) + { /* In D3D10+, a NULL sampler maps to the default sampler state. */ GL_EXTCALL(glGenSamplers(1, &device->null_sampler)); GL_EXTCALL(glSamplerParameteri(device->null_sampler, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR)); @@ -800,7 +818,6 @@ static void create_default_samplers(struct wined3d_device *device, struct wined3 } else { - device->default_sampler = 0; device->null_sampler = 0; } } @@ -810,14 +827,15 @@ static void destroy_default_samplers(struct wined3d_device *device, struct wined { const struct wined3d_gl_info *gl_info = context->gl_info; + wined3d_sampler_decref(device->default_sampler); + device->default_sampler = NULL; + if (gl_info->supported[ARB_SAMPLER_OBJECTS]) { - GL_EXTCALL(glDeleteSamplers(1, &device->default_sampler)); GL_EXTCALL(glDeleteSamplers(1, &device->null_sampler)); checkGLcall("glDeleteSamplers"); } - device->default_sampler = 0; device->null_sampler = 0; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 64e669b..6b683aa 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2688,7 +2688,7 @@ struct wined3d_device } dummy_textures; /* Default sampler used to emulate the direct resource access without using wined3d_sampler */ - GLuint default_sampler; + struct wined3d_sampler *default_sampler; GLuint null_sampler; /* Command stream */

1 0

Henri Verbeet : usp10: Make the script cache parameter to get_opentype_script() const.
by Alexandre Julliard March 20, 2017

March 20, 2017

Module: wine Branch: master Commit: df212474917a0dd63b982791843a7afe841a2b59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df212474917a0dd63b9827918… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Mar 19 22:59:46 2017 +0100 usp10: Make the script cache parameter to get_opentype_script() const. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/shape.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index c37e0a0..f39c7ea 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -565,19 +565,21 @@ static INT GSUB_apply_feature_all_lookups(LPCVOID header, LoadedFeature *feature return out_index; } -static OPENTYPE_TAG get_opentype_script(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache *psc, BOOL tryNew) +static OPENTYPE_TAG get_opentype_script(HDC hdc, const SCRIPT_ANALYSIS *psa, + const ScriptCache *script_cache, BOOL try_new) { UINT charset; - if (psc->userScript != 0) + if (script_cache->userScript) { - if (tryNew && ShapingData[psa->eScript].newOtTag != 0 && psc->userScript == scriptInformation[psa->eScript].scriptTag) + if (try_new && ShapingData[psa->eScript].newOtTag + && script_cache->userScript == scriptInformation[psa->eScript].scriptTag) return ShapingData[psa->eScript].newOtTag; - else - return psc->userScript; + + return script_cache->userScript; } - if (tryNew && ShapingData[psa->eScript].newOtTag != 0) + if (try_new && ShapingData[psa->eScript].newOtTag) return ShapingData[psa->eScript].newOtTag; if (scriptInformation[psa->eScript].scriptTag)

1 0

Henri Verbeet : usp10: Make the script cache parameter to GPOS_apply_MarkToBase() const.
by Alexandre Julliard March 20, 2017

March 20, 2017

Module: wine Branch: master Commit: c8f87ad3ed8cebf4b2d4ea2f07d40ade23c10951 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8f87ad3ed8cebf4b2d4ea2f0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Mar 19 22:59:45 2017 +0100 usp10: Make the script cache parameter to GPOS_apply_MarkToBase() const. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/opentype.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index a1c4485..3eb3bf3 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -1838,19 +1838,21 @@ static VOID GPOS_apply_CursiveAttachment(const OT_LookupTable *look, const SCRIP return; } -static int GPOS_apply_MarkToBase(ScriptCache *psc, const OT_LookupTable *look, const SCRIPT_ANALYSIS *analysis, const WORD *glyphs, INT glyph_index, INT glyph_count, INT ppem, LPPOINT pt) +static int GPOS_apply_MarkToBase(const ScriptCache *script_cache, const OT_LookupTable *look, + const SCRIPT_ANALYSIS *analysis, const WORD *glyphs, unsigned int glyph_index, + unsigned int glyph_count, unsigned int ppem, POINT *pt) { int j; int write_dir = (analysis->fRTL && !analysis->fLogicalOrder) ? -1 : 1; - void *glyph_class_table = NULL; + const void *glyph_class_table = NULL; int rc = -1; - if (psc->GDEF_Table) + if (script_cache->GDEF_Table) { - const GDEF_Header *header = psc->GDEF_Table; + const GDEF_Header *header = script_cache->GDEF_Table; WORD offset = GET_BE_WORD( header->GlyphClassDef ); if (offset) - glyph_class_table = (BYTE *)psc->GDEF_Table + offset; + glyph_class_table = (const BYTE *)script_cache->GDEF_Table + offset; } TRACE("MarkToBase Attachment Positioning Subtable\n");

1 0

Daniel Lehman : msvcrt100/tests: Add tests for concurrency::event.
by Alexandre Julliard March 20, 2017

March 20, 2017

Module: wine Branch: master Commit: ee0337f800c353c4c3ff1640828fd2799f8bb217 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee0337f800c353c4c3ff16408… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu Mar 2 05:11:09 2017 -0800 msvcrt100/tests: Add tests for concurrency::event. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/tests/msvcr100.c | 132 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 132 insertions(+) diff --git a/dlls/msvcr100/tests/msvcr100.c b/dlls/msvcr100/tests/msvcr100.c index cdac1b9..ac167fc 100644 --- a/dlls/msvcr100/tests/msvcr100.c +++ b/dlls/msvcr100/tests/msvcr100.c @@ -138,6 +138,10 @@ typedef struct { CRITICAL_SECTION cs; } _ReentrantBlockingLock; +typedef struct { + char pad[64]; +} event; + static int* (__cdecl *p_errno)(void); static int (__cdecl *p_wmemcpy_s)(wchar_t *dest, size_t numberOfElements, const wchar_t *src, size_t count); static int (__cdecl *p_wmemmove_s)(wchar_t *dest, size_t numberOfElements, const wchar_t *src, size_t count); @@ -178,6 +182,13 @@ static void (__thiscall *p_NonReentrantBlockingLock__Acquire)(_ReentrantBlocking static void (__thiscall *p_NonReentrantBlockingLock__Release)(_ReentrantBlockingLock*); static MSVCRT_bool (__thiscall *p_NonReentrantBlockingLock__TryAcquire)(_ReentrantBlockingLock*); +static event* (__thiscall *p_event_ctor)(event*); +static void (__thiscall *p_event_dtor)(event*); +static void (__thiscall *p_event_reset)(event*); +static void (__thiscall *p_event_set)(event*); +static size_t (__thiscall *p_event_wait)(event*, unsigned int); +static int (__cdecl *p_event_wait_for_multiple)(event**, size_t, MSVCRT_bool, unsigned int); + /* make sure we use the correct errno */ #undef errno #define errno (*p_errno()) @@ -237,6 +248,13 @@ static BOOL init(void) SET(p_NonReentrantBlockingLock__Acquire, "?_Acquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QEAAXXZ"); SET(p_NonReentrantBlockingLock__Release, "?_Release(a)_NonReentrantBlockingLock@details(a)Concurrency@@QEAAXXZ"); SET(p_NonReentrantBlockingLock__TryAcquire, "?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QEAA_NXZ"); + + SET(p_event_ctor, "??0event(a)Concurrency@@QEAA(a)XZ"); + SET(p_event_dtor, "??1event(a)Concurrency@@QEAA(a)XZ"); + SET(p_event_reset, "?reset(a)event@Concurrency@@QEAAXXZ"); + SET(p_event_set, "?set(a)event@Concurrency@@QEAAXXZ"); + SET(p_event_wait, "?wait(a)event@Concurrency@@QEAA_KI(a)Z"); + SET(p_event_wait_for_multiple, "?wait_for_multiple(a)event@Concurrency@@SA_KPEAPEAV12(a)_K_NI@Z"); } else { SET(pSpinWait_ctor_yield, "??0?$_SpinWait@$00(a)details@Concurrency@@QAE(a)P6AXXZ@Z"); SET(pSpinWait_dtor, "??_F?$_SpinWait@$00(a)details@Concurrency@@QAEXXZ"); @@ -264,6 +282,13 @@ static BOOL init(void) SET(p_NonReentrantBlockingLock__Acquire, "?_Acquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QAEXXZ"); SET(p_NonReentrantBlockingLock__Release, "?_Release(a)_NonReentrantBlockingLock@details(a)Concurrency@@QAEXXZ"); SET(p_NonReentrantBlockingLock__TryAcquire, "?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QAE_NXZ"); + + SET(p_event_ctor, "??0event(a)Concurrency@@QAE(a)XZ"); + SET(p_event_dtor, "??1event(a)Concurrency@@QAE(a)XZ"); + SET(p_event_reset, "?reset(a)event@Concurrency@@QAEXXZ"); + SET(p_event_set, "?set(a)event@Concurrency@@QAEXXZ"); + SET(p_event_wait, "?wait(a)event@Concurrency@@QAEII(a)Z"); + SET(p_event_wait_for_multiple, "?wait_for_multiple(a)event@Concurrency@@SAIPAPAV12(a)I_NI@Z"); } init_thiscall_thunk(); @@ -705,6 +730,112 @@ static void test__ReentrantBlockingLock(void) call_func1(p_NonReentrantBlockingLock_dtor, &rbl); } +static DWORD WINAPI test_event_thread(void *arg) +{ + event *evt = arg; + call_func1(p_event_set, evt); + return 0; +} + +static DWORD WINAPI multiple_events_thread(void *arg) +{ + event **events = arg; + + Sleep(50); + call_func1(p_event_set, events[0]); + call_func1(p_event_reset, events[0]); + call_func1(p_event_set, events[1]); + call_func1(p_event_reset, events[1]); + return 0; +} + +static void test_event(void) +{ + int i; + int ret; + event evt; + event *evts[70]; + HANDLE thread; + HANDLE threads[NUMELMS(evts)]; + + call_func1(p_event_ctor, &evt); + + ret = call_func2(p_event_wait, &evt, 100); + ok(ret == -1, "expected -1, got %d\n", ret); + + call_func1(p_event_set, &evt); + ret = call_func2(p_event_wait, &evt, 100); + ok(!ret, "expected 0, got %d\n", ret); + + ret = call_func2(p_event_wait, &evt, 100); + ok(!ret, "expected 0, got %d\n", ret); + + call_func1(p_event_reset, &evt); + ret = call_func2(p_event_wait, &evt, 100); + ok(ret == -1, "expected -1, got %d\n", ret); + + thread = CreateThread(NULL, 0, test_event_thread, (void*)&evt, 0, NULL); + ret = call_func2(p_event_wait, &evt, 5000); + ok(!ret, "expected 0, got %d\n", ret); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); + + if (0) /* crashes on Windows */ + p_event_wait_for_multiple(NULL, 10, TRUE, 0); + + for (i = 0; i < NUMELMS(evts); i++) { + evts[i] = malloc(sizeof(evt)); + call_func1(p_event_ctor, evts[i]); + } + + ret = p_event_wait_for_multiple(evts, 0, TRUE, 100); + ok(!ret, "expected 0, got %d\n", ret); + + ret = p_event_wait_for_multiple(evts, NUMELMS(evts), TRUE, 100); + ok(ret == -1, "expected -1, got %d\n", ret); + + /* reset and test wait for multiple with all */ + for (i = 0; i < NUMELMS(evts); i++) + threads[i] = CreateThread(NULL, 0, test_event_thread, (void*)evts[i], 0, NULL); + + ret = p_event_wait_for_multiple(evts, NUMELMS(evts), TRUE, 5000); + ok(ret != -1, "didn't expect -1\n"); + + for (i = 0; i < NUMELMS(evts); i++) { + WaitForSingleObject(threads[i], INFINITE); + CloseHandle(threads[i]); + } + + /* reset and test wait for multiple with any */ + call_func1(p_event_reset, evts[0]); + + thread = CreateThread(NULL, 0, test_event_thread, (void*)evts[0], 0, NULL); + ret = p_event_wait_for_multiple(evts, 1, FALSE, 5000); + ok(!ret, "expected 0, got %d\n", ret); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); + + call_func1(p_event_reset, evts[0]); + call_func1(p_event_reset, evts[1]); + thread = CreateThread(NULL, 0, multiple_events_thread, (void*)evts, 0, NULL); + ret = p_event_wait_for_multiple(evts, 2, TRUE, 500); + ok(ret == -1, "expected -1, got %d\n", ret); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); + + call_func1(p_event_reset, evts[0]); + call_func1(p_event_set, evts[1]); + ret = p_event_wait_for_multiple(evts, 2, FALSE, 0); + ok(ret == 1, "expected 1, got %d\n", ret); + + for (i = 0; i < NUMELMS(evts); i++) { + call_func1(p_event_dtor, evts[i]); + free(evts[i]); + } + + call_func1(p_event_dtor, &evt); +} + START_TEST(msvcr100) { if (!init()) @@ -718,4 +849,5 @@ START_TEST(msvcr100) test__SpinWait(); test_reader_writer_lock(); test__ReentrantBlockingLock(); + test_event(); }

1 0

Huw Davies : winedbg: Return after raising an exception.
by Alexandre Julliard March 20, 2017

March 20, 2017

Module: wine Branch: master Commit: eba6bf44b3577ff98591a57e525a1da8dd736291 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eba6bf44b3577ff98591a57e5… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 17 21:40:31 2017 +0000 winedbg: Return after raising an exception. Fixes a compiler warning. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/types.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/programs/winedbg/types.c b/programs/winedbg/types.c index 5b24715..2df7572 100644 --- a/programs/winedbg/types.c +++ b/programs/winedbg/types.c @@ -80,11 +80,13 @@ LONGLONG types_extract_as_longlong(const struct dbg_lvalue* lvalue, { WINE_ERR("Couldn't get information\n"); RaiseException(DEBUG_STATUS_INTERNAL_ERROR, 0, 0, NULL); + return rtn; } if (size > sizeof(rtn)) { WINE_ERR("Size too large (%s)\n", wine_dbgstr_longlong(size)); RaiseException(DEBUG_STATUS_NOT_AN_INTEGER, 0, 0, NULL); + return rtn; } switch (bt) {

1 0

Józef Kucia : wined3d: Abort state application when there is problem with newly created sampler object.
by Alexandre Julliard March 20, 2017

March 20, 2017

Module: wine Branch: master Commit: de0a88538c9f8554a8658a90c5d4175121647aaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=de0a88538c9f8554a8658a90c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Mar 20 12:13:09 2017 +0100 wined3d: Abort state application when there is problem with newly created sampler object. 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/state.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 409c161..8ff1b46 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3633,17 +3633,17 @@ static void sampler(struct wined3d_context *context, const struct wined3d_state if (FAILED(wined3d_sampler_create(device, &desc, NULL, &sampler))) { ERR("Failed to create sampler.\n"); - sampler = NULL; + return; } - else + if (wine_rb_put(&device->samplers, &desc, &sampler->entry) == -1) { - if (wine_rb_put(&device->samplers, &desc, &sampler->entry) == -1) - ERR("Failed to insert sampler.\n"); + ERR("Failed to insert sampler.\n"); + wined3d_sampler_decref(sampler); + return; } } - if (sampler) - wined3d_sampler_bind(sampler, mapped_stage, texture, context); + wined3d_sampler_bind(sampler, mapped_stage, texture, context); /* Trigger shader constant reloading (for NP2 texcoord fixup) */ if (!(texture->flags & WINED3D_TEXTURE_POW2_MAT_IDENT))

1 0