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

Józef Kucia : wined3d: Validate all layers locations for render target views.
by Alexandre Julliard 19 Apr '17

19 Apr '17

Module: wine Branch: master Commit: 6920164824fbb640ba659dc067d7009ebd3eeb58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6920164824fbb640ba659dc06… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 18 11:24:13 2017 +0200 wined3d: Validate all layers locations for render target views. 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/drawprim.c | 2 +- dlls/wined3d/view.c | 18 ++++++++++++++++++ dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 15b3791..0b5b5e6 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -543,7 +543,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s struct wined3d_surface *ds = wined3d_rendertarget_view_get_surface(dsv); DWORD location = context->render_offscreen ? ds->container->resource.draw_binding : WINED3D_LOCATION_DRAWABLE; - wined3d_texture_validate_location(ds->container, dsv->sub_resource_idx, location); + wined3d_rendertarget_view_validate_location(dsv, location); wined3d_texture_invalidate_location(ds->container, dsv->sub_resource_idx, ~location); } diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index e1e1956..4e1ea6d 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -436,6 +436,24 @@ void wined3d_rendertarget_view_load_location(struct wined3d_rendertarget_view *v wined3d_texture_load_location(texture, sub_resource_idx, context, location); } +void wined3d_rendertarget_view_validate_location(struct wined3d_rendertarget_view *view, DWORD location) +{ + struct wined3d_resource *resource = view->resource; + unsigned int i, sub_resource_idx; + struct wined3d_texture *texture; + + if (resource->type == WINED3D_RTYPE_BUFFER) + { + FIXME("Not implemented for resources %s.\n", debug_d3dresourcetype(resource->type)); + return; + } + + texture = texture_from_resource(resource); + sub_resource_idx = view->sub_resource_idx; + for (i = 0; i < view->layer_count; ++i, sub_resource_idx += texture->level_count) + wined3d_texture_validate_location(texture, sub_resource_idx, location); +} + static void wined3d_render_target_view_cs_init(void *object) { struct wined3d_rendertarget_view *view = object; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ff5b242..c49e010 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3462,6 +3462,8 @@ void wined3d_rendertarget_view_load_location(struct wined3d_rendertarget_view *v struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; void wined3d_rendertarget_view_prepare_location(struct wined3d_rendertarget_view *view, struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; +void wined3d_rendertarget_view_validate_location(struct wined3d_rendertarget_view *view, + DWORD location) DECLSPEC_HIDDEN; struct wined3d_shader_resource_view {

1 0

Józef Kucia : wined3d: Invalidate all layers locations for render target views.
by Alexandre Julliard 19 Apr '17

19 Apr '17

Module: wine Branch: master Commit: a912c95d96763c0bfc6b5372a65c487f87c04b47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a912c95d96763c0bfc6b5372a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 18 11:24:14 2017 +0200 wined3d: Invalidate all layers locations for render target views. 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/drawprim.c | 10 +++------- dlls/wined3d/view.c | 42 ++++++++++++++++++++++++++---------------- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 31 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 0b5b5e6..1fde7ea 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -499,16 +499,13 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s for (i = 0; i < gl_info->limits.buffers; ++i) { - struct wined3d_texture *rt; - if (!(rtv = fb->render_targets[i]) || rtv->format->id == WINED3DFMT_NULL) continue; - rt = wined3d_texture_from_resource(rtv->resource); if (state->render_states[WINED3D_RS_COLORWRITEENABLE]) { wined3d_rendertarget_view_load_location(rtv, context, rtv->resource->draw_binding); - wined3d_texture_invalidate_location(rt, rtv->sub_resource_idx, ~rtv->resource->draw_binding); + wined3d_rendertarget_view_invalidate_location(rtv, ~rtv->resource->draw_binding); } else { @@ -540,11 +537,10 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s if (dsv && state->render_states[WINED3D_RS_ZWRITEENABLE]) { - struct wined3d_surface *ds = wined3d_rendertarget_view_get_surface(dsv); - DWORD location = context->render_offscreen ? ds->container->resource.draw_binding : WINED3D_LOCATION_DRAWABLE; + DWORD location = context->render_offscreen ? dsv->resource->draw_binding : WINED3D_LOCATION_DRAWABLE; wined3d_rendertarget_view_validate_location(dsv, location); - wined3d_texture_invalidate_location(ds->container, dsv->sub_resource_idx, ~location); + wined3d_rendertarget_view_invalidate_location(dsv, ~location); } stream_info = &context->stream_info; diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 4e1ea6d..cb3578a 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -270,6 +270,26 @@ static void create_buffer_view(struct wined3d_gl_view *view, struct wined3d_cont create_buffer_texture(view, context, buffer, view_format, offset, size); } +static void wined3d_view_invalidate_location(struct wined3d_resource *resource, + const struct wined3d_view_desc *desc, DWORD location) +{ + unsigned int i, sub_resource_idx, layer_count; + struct wined3d_texture *texture; + + if (resource->type == WINED3D_RTYPE_BUFFER) + { + wined3d_buffer_invalidate_location(buffer_from_resource(resource), location); + return; + } + + texture = texture_from_resource(resource); + + sub_resource_idx = desc->u.texture.layer_idx * texture->level_count + desc->u.texture.level_idx; + layer_count = resource->type != WINED3D_RTYPE_TEXTURE_3D ? desc->u.texture.layer_count : 1; + for (i = 0; i < layer_count; ++i, sub_resource_idx += texture->level_count) + wined3d_texture_invalidate_location(texture, sub_resource_idx, location); +} + ULONG CDECL wined3d_rendertarget_view_incref(struct wined3d_rendertarget_view *view) { ULONG refcount = InterlockedIncrement(&view->refcount); @@ -454,6 +474,11 @@ void wined3d_rendertarget_view_validate_location(struct wined3d_rendertarget_vie wined3d_texture_validate_location(texture, sub_resource_idx, location); } +void wined3d_rendertarget_view_invalidate_location(struct wined3d_rendertarget_view *view, DWORD location) +{ + wined3d_view_invalidate_location(view->resource, &view->desc, location); +} + static void wined3d_render_target_view_cs_init(void *object) { struct wined3d_rendertarget_view *view = object; @@ -819,22 +844,7 @@ void * CDECL wined3d_unordered_access_view_get_parent(const struct wined3d_unord void wined3d_unordered_access_view_invalidate_location(struct wined3d_unordered_access_view *view, DWORD location) { - struct wined3d_resource *resource = view->resource; - unsigned int i, sub_resource_idx, layer_count; - struct wined3d_texture *texture; - - if (resource->type == WINED3D_RTYPE_BUFFER) - { - wined3d_buffer_invalidate_location(buffer_from_resource(resource), location); - return; - } - - texture = texture_from_resource(resource); - - sub_resource_idx = view->desc.u.texture.layer_idx * texture->level_count + view->desc.u.texture.level_idx; - layer_count = (resource->type != WINED3D_RTYPE_TEXTURE_3D) ? view->desc.u.texture.layer_count : 1; - for (i = 0; i < layer_count; ++i, sub_resource_idx += texture->level_count) - wined3d_texture_invalidate_location(texture, sub_resource_idx, location); + wined3d_view_invalidate_location(view->resource, &view->desc, location); } static void wined3d_unordered_access_view_cs_init(void *object) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c49e010..cd90eb8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3458,6 +3458,8 @@ static inline struct wined3d_surface *wined3d_rendertarget_view_get_surface( void wined3d_rendertarget_view_get_drawable_size(const struct wined3d_rendertarget_view *view, const struct wined3d_context *context, unsigned int *width, unsigned int *height) DECLSPEC_HIDDEN; +void wined3d_rendertarget_view_invalidate_location(struct wined3d_rendertarget_view *view, + DWORD location) DECLSPEC_HIDDEN; void wined3d_rendertarget_view_load_location(struct wined3d_rendertarget_view *view, struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; void wined3d_rendertarget_view_prepare_location(struct wined3d_rendertarget_view *view,

1 0

Henri Verbeet : usp10: Validate positioning record sequence indices in GPOS_apply_ChainContextPos ().
by Alexandre Julliard 19 Apr '17

19 Apr '17

Module: wine Branch: master Commit: 34a9400a89c4d1b8a46979432f3864e8065919fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=34a9400a89c4d1b8a46979432… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 17 20:26:56 2017 +0200 usp10: Validate positioning record sequence indices in GPOS_apply_ChainContextPos(). The issue is somewhat theoretical, since in reasonbale fonts the indices should always be valid, and in fact are fairly likely to be 0. On the other hand, web fonts exist. 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 | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index a3346ef..f0417f1 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -2301,12 +2301,20 @@ static unsigned int GPOS_apply_ChainContextPos(const ScriptCache *script_cache, for (k = 0; k < positioning_count; ++k) { - WORD lookup_index = GET_BE_WORD(positioning->PosLookupRecord[k].LookupListIndex); - WORD sequence_index = GET_BE_WORD(positioning->PosLookupRecord[k].SequenceIndex) * write_dir; + unsigned int lookup_index = GET_BE_WORD(positioning->PosLookupRecord[k].LookupListIndex); + unsigned int sequence_index = GET_BE_WORD(positioning->PosLookupRecord[k].SequenceIndex); + unsigned int g = glyph_index + write_dir * sequence_index; + + if (g >= glyph_count) + { + WARN("Skipping invalid sequence index %u (glyph index %u, write dir %d).\n", + sequence_index, glyph_index, write_dir); + continue; + } TRACE("Position: %u -> %u %u.\n", k, sequence_index, lookup_index); GPOS_apply_lookup(script_cache, otm, logfont, analysis, advance, lookup, lookup_index, - glyphs, glyph_index + sequence_index, glyph_count, goffset); + glyphs, g, glyph_count, goffset); } return input_count + lookahead_count; }

1 0

Henri Verbeet : usp10: Validate substition record sequence indices in GSUB_apply_ChainContextSubst ().
by Alexandre Julliard 19 Apr '17

19 Apr '17

Module: wine Branch: master Commit: d1ca880ec45cfccf929ea1545840537ce25eeebf URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1ca880ec45cfccf929ea1545… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 17 20:26:57 2017 +0200 usp10: Validate substition record sequence indices in GSUB_apply_ChainContextSubst(). 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 | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index f0417f1..2cca0cb 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -1346,12 +1346,19 @@ static INT GSUB_apply_ChainContextSubst(const OT_LookupList* lookup, const OT_Lo substitute_count = GET_BE_WORD(substitute->SubstCount); for (k = 0; k < substitute_count; ++k) { - WORD lookup_index = GET_BE_WORD(substitute->SubstLookupRecord[k].LookupListIndex); - WORD sequence_index = GET_BE_WORD(substitute->SubstLookupRecord[k].SequenceIndex) * write_dir; + unsigned int lookup_index = GET_BE_WORD(substitute->SubstLookupRecord[k].LookupListIndex); + unsigned int sequence_index = GET_BE_WORD(substitute->SubstLookupRecord[k].SequenceIndex); + unsigned int g = glyph_index + write_dir * sequence_index; + + if (g >= *glyph_count) + { + WARN("Skipping invalid sequence index %u (glyph index %u, write dir %d).\n", + sequence_index, glyph_index, write_dir); + continue; + } TRACE("SUBST: %u -> %u %u.\n", k, sequence_index, lookup_index); - new_index = GSUB_apply_lookup(lookup, lookup_index, glyphs, - glyph_index + sequence_index, write_dir, glyph_count); + new_index = GSUB_apply_lookup(lookup, lookup_index, glyphs, g, write_dir, glyph_count); if (new_index == GSUB_E_NOGLYPH) ERR("Chain failed to generate a glyph.\n"); } @@ -1426,12 +1433,19 @@ static INT GSUB_apply_ChainContextSubst(const OT_LookupList* lookup, const OT_Lo substitution_count = GET_BE_WORD(substitute->SubstCount); for (k = 0; k < substitution_count; ++k) { - WORD lookup_index = GET_BE_WORD(substitute->SubstLookupRecord[k].LookupListIndex); - WORD sequence_index = GET_BE_WORD(substitute->SubstLookupRecord[k].SequenceIndex) * write_dir; + unsigned int lookup_index = GET_BE_WORD(substitute->SubstLookupRecord[k].LookupListIndex); + unsigned int sequence_index = GET_BE_WORD(substitute->SubstLookupRecord[k].SequenceIndex); + unsigned int g = glyph_index + write_dir * sequence_index; + + if (g >= *glyph_count) + { + WARN("Skipping invalid sequence index %u (glyph index %u, write dir %d).\n", + sequence_index, glyph_index, write_dir); + continue; + } TRACE("SUBST: %u -> %u %u.\n", k, sequence_index, lookup_index); - new_index = GSUB_apply_lookup(lookup, lookup_index, glyphs, - glyph_index + sequence_index, write_dir, glyph_count); + new_index = GSUB_apply_lookup(lookup, lookup_index, glyphs, g, write_dir, glyph_count); if (new_index == GSUB_E_NOGLYPH) ERR("Chain failed to generate a glyph.\n"); }

1 0

Henri Verbeet : usp10: Range check glyph counts in GPOS_apply_ContextPos() .
by Alexandre Julliard 19 Apr '17

19 Apr '17

Module: wine Branch: master Commit: 1b02c1ac50141058edd77ea373468c7bf5f13d25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b02c1ac50141058edd77ea37… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 17 20:26:58 2017 +0200 usp10: Range check glyph counts in GPOS_apply_ContextPos(). 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 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 2cca0cb..ec425a1 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -2166,12 +2166,18 @@ static unsigned int GPOS_apply_ContextPos(const ScriptCache *script_cache, const { const GPOS_PosClassRule_1 *pr; const GPOS_PosClassRule_2 *pr_2; + unsigned int g; int g_count, l; offset = GET_BE_WORD(pcs->PosClassRule[k]); pr = (const GPOS_PosClassRule_1*)((const BYTE*)pcs+offset); g_count = GET_BE_WORD(pr->GlyphCount); TRACE("PosClassRule has %i glyphs classes\n",g_count); + + g = glyph_index + write_dir * (g_count - 1); + if (g >= glyph_count) + continue; + for (l = 0; l < g_count-1; l++) { int g_class = OT_get_glyph_class(glyph_class_table, glyphs[glyph_index + (write_dir * (l+1))]);

1 0

Henri Verbeet : usp10: Simplify the "pr_2" assignment in GPOS_apply_ContextPos().
by Alexandre Julliard 19 Apr '17

19 Apr '17

Module: wine Branch: master Commit: 82d36ba63fe2132e1cca73cf23b7f3a92207151a URL: http://source.winehq.org/git/wine.git/?a=commit;h=82d36ba63fe2132e1cca73cf2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 17 20:26:59 2017 +0200 usp10: Simplify the "pr_2" assignment in GPOS_apply_ContextPos(). 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 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index ec425a1..e190b92 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -2191,8 +2191,7 @@ static unsigned int GPOS_apply_ContextPos(const ScriptCache *script_cache, const } TRACE("Rule matches\n"); - pr_2 = (const GPOS_PosClassRule_2*)((const BYTE*)pr+ - FIELD_OFFSET(GPOS_PosClassRule_1, Class[g_count-1])); + pr_2 = (const GPOS_PosClassRule_2 *)&pr->Class[g_count - 1]; for (l = 0; l < GET_BE_WORD(pr->PosCount); l++) {

1 0

Henri Verbeet : usp10: Validate positioning record sequence indices in GPOS_apply_ContextPos().
by Alexandre Julliard 19 Apr '17

19 Apr '17

Module: wine Branch: master Commit: c5619beb773827928637864f81d6de0a236b77f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5619beb773827928637864f8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 17 20:27:00 2017 +0200 usp10: Validate positioning record sequence indices in GPOS_apply_ContextPos(). 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 | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index e190b92..d2e0fc5 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -2195,12 +2195,21 @@ static unsigned int GPOS_apply_ContextPos(const ScriptCache *script_cache, const for (l = 0; l < GET_BE_WORD(pr->PosCount); l++) { - int lookupIndex = GET_BE_WORD(pr_2->PosLookupRecord[l].LookupListIndex); - int SequenceIndex = GET_BE_WORD(pr_2->PosLookupRecord[l].SequenceIndex) * write_dir; + unsigned int lookup_index = GET_BE_WORD(pr_2->PosLookupRecord[l].LookupListIndex); + unsigned int sequence_index = GET_BE_WORD(pr_2->PosLookupRecord[l].SequenceIndex); - TRACE("Position: %i -> %i %i\n",l, SequenceIndex, lookupIndex); - GPOS_apply_lookup(script_cache, otm, logfont, analysis, advance, lookup, lookupIndex, - glyphs, glyph_index + SequenceIndex, glyph_count, goffset); + g = glyph_index + write_dir * sequence_index; + if (g >= glyph_count) + { + WARN("Invalid sequence index %u (glyph index %u, write dir %d).\n", + sequence_index, glyph_index, write_dir); + continue; + } + + TRACE("Position: %u -> %u %u.\n", l, sequence_index, lookup_index); + + GPOS_apply_lookup(script_cache, otm, logfont, analysis, advance, + lookup, lookup_index, glyphs, g, glyph_count, goffset); } return 1; }

1 0

Andrew Eikum : xaudio2: Try to increase OpenAL source limit.
by Alexandre Julliard 19 Apr '17

19 Apr '17

Module: wine Branch: master Commit: 986a14f9500dd0abf598703a775e2e610594200c URL: http://source.winehq.org/git/wine.git/?a=commit;h=986a14f9500dd0abf598703a7… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Apr 17 13:14:58 2017 -0500 xaudio2: Try to increase OpenAL source limit. openal-soft recently added support for applications to request new source count limits. Older versions will silently ignore these attributes. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/xaudio_dll.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index b2a5e3b..a091629 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -1593,7 +1593,7 @@ static HRESULT WINAPI IXAudio2Impl_CreateMasteringVoice(IXAudio2 *iface, IMMDevice *dev; HRESULT hr; WAVEFORMATEX *fmt; - ALCint attrs[7]; + ALCint attrs[11]; REFERENCE_TIME period, bufdur; TRACE("(%p)->(%p, %u, %u, 0x%x, %s, %p, 0x%x)\n", This, @@ -1743,11 +1743,20 @@ static HRESULT WINAPI IXAudio2Impl_CreateMasteringVoice(IXAudio2 *iface, LeaveCriticalSection(&This->lock); return AUDCLNT_E_UNSUPPORTED_FORMAT; } + attrs[2] = ALC_FREQUENCY; attrs[3] = inputSampleRate; + attrs[4] = ALC_FORMAT_TYPE_SOFT; attrs[5] = al_get_loopback_format(&This->fmt); - attrs[6] = 0; + + /* some games create very many sources */ + attrs[6] = ALC_STEREO_SOURCES; + attrs[7] = 1024; + attrs[8] = ALC_MONO_SOURCES; + attrs[9] = 1024; + + attrs[10] = 0; if(!attrs[5]){ WARN("OpenAL can't output samples in this format\n");

1 0

Michael Stefaniuc : credui: Use SetRectEmpty() instead of memset().
by Alexandre Julliard 19 Apr '17

19 Apr '17

Module: wine Branch: master Commit: dc0a49f3bb07b73fa63cc80f32c5717d8a455fcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc0a49f3bb07b73fa63cc80f3… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Apr 17 21:42:01 2017 +0200 credui: Use SetRectEmpty() instead of memset(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/credui/credui_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/credui/credui_main.c b/dlls/credui/credui_main.c index 0da4643..a4df9fe 100644 --- a/dlls/credui/credui_main.c +++ b/dlls/credui/credui_main.c @@ -216,7 +216,7 @@ static void CredDialogCreateBalloonTip(HWND hwndDlg, struct cred_dialog_params * toolinfo.uFlags = TTF_TRACK; toolinfo.hwnd = hwndDlg; toolinfo.uId = TOOLID_INCORRECTPASSWORD; - memset(&toolinfo.rect, 0, sizeof(toolinfo.rect)); + SetRectEmpty(&toolinfo.rect); toolinfo.hinst = NULL; toolinfo.lpszText = wszText; toolinfo.lParam = 0;

1 0

Michael Stefaniuc : amstream/tests: Use SetRectEmpty() instead of memset() .
by Alexandre Julliard 19 Apr '17

19 Apr '17

Module: wine Branch: master Commit: 0e0cc67c5aa69140a672bfc4942a1b91f4a683d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e0cc67c5aa69140a672bfc49… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Apr 17 21:42:00 2017 +0200 amstream/tests: Use SetRectEmpty() instead of memset(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/tests/amstream.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index a7999be..c08f989 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -572,7 +572,7 @@ static void test_IDirectDrawStreamSample(void) EXPECT_REF(surface, 2); surface2 = NULL; - memset(&rect, 0, sizeof(rect)); + SetRectEmpty(&rect); hr = IDirectDrawStreamSample_GetSurface(pddsample, &surface2, &rect); ok(hr == S_OK, "got 0x%08x\n", hr); ok(surface == surface2, "got %p\n", surface2);

1 0