January 2015 - Wine-Commits

André Hentschel : Add WWN 383
by Jeremy Newman Jan. 16, 2015

Jan. 16, 2015

Module: website Branch: master Commit: cf23b3504aa25852d928ef1ed9c3046f6ed3d9f8 URL: http://source.winehq.org/git/website.git/?a=commit;h=cf23b3504aa25852d928ef… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jan 16 18:59:03 2015 +0100 Add WWN 383 --- news/de/2015011601.xml | 12 + news/en/2015011601.xml | 12 + wwn/en/wn20150116_383.xml | 1279 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1303 insertions(+) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=cf23b3504aa25852d9…

1 0

Michael Stefaniuc : dswave/tests: Remove an unused assigment (PVS-Studio).
by Alexandre Julliard Jan. 15, 2015

Jan. 15, 2015

Module: wine Branch: master Commit: bb33dbab1d2a0d1c0c0e017b1be6e3ede537cc3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb33dbab1d2a0d1c0c0e017b1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 15 13:10:21 2015 +0100 dswave/tests: Remove an unused assigment (PVS-Studio). --- dlls/dswave/tests/dswave.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dswave/tests/dswave.c b/dlls/dswave/tests/dswave.c index 1a96548..ce36d37 100644 --- a/dlls/dswave/tests/dswave.c +++ b/dlls/dswave/tests/dswave.c @@ -69,7 +69,7 @@ static void test_COM(void) ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); refcount = IPersistStream_AddRef(ps); ok(refcount == 4, "refcount == %u, expected 4\n", refcount); - refcount = IPersistStream_Release(ps); + IPersistStream_Release(ps); hr = IDirectMusicObject_QueryInterface(dmo, &IID_IUnknown, (void**)&unk); ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr);

1 0

Michael Stefaniuc : dmstyle/tests: Remove unused assigments (PVS-Studio).
by Alexandre Julliard Jan. 15, 2015

Jan. 15, 2015

Module: wine Branch: master Commit: 277b09059cd61e382c63df4bd9fb8b0a91d5407c URL: http://source.winehq.org/git/wine.git/?a=commit;h=277b09059cd61e382c63df4bd… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 15 13:05:04 2015 +0100 dmstyle/tests: Remove unused assigments (PVS-Studio). --- dlls/dmstyle/tests/dmstyle.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c index be9de42..1401d75 100644 --- a/dlls/dmstyle/tests/dmstyle.c +++ b/dlls/dmstyle/tests/dmstyle.c @@ -129,7 +129,7 @@ static void test_COM_section(void) ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); refcount = IPersistStream_AddRef(ps); ok(refcount == 4, "refcount == %u, expected 4\n", refcount); - refcount = IPersistStream_Release(ps); + IPersistStream_Release(ps); hr = IDirectMusicObject_QueryInterface(dmo, &IID_IUnknown, (void**)&unk); ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); @@ -196,7 +196,7 @@ static void test_COM_track(void) ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); refcount = IPersistStream_AddRef(ps); ok(refcount == 4, "refcount == %u, expected 4\n", refcount); - refcount = IPersistStream_Release(ps); + IPersistStream_Release(ps); hr = IDirectMusicTrack8_QueryInterface(dmt8, &IID_IUnknown, (void**)&unk); ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr);

1 0

Henri Verbeet : wined3d: Store a struct wined3d_sampler_desc in struct gl_texture.
by Alexandre Julliard Jan. 15, 2015

Jan. 15, 2015

Module: wine Branch: master Commit: 86e99abb1237e2eb3c44e8da9b0d5c05fe089840 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86e99abb1237e2eb3c44e8da9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 15 17:19:04 2015 +0100 wined3d: Store a struct wined3d_sampler_desc in struct gl_texture. Instead of a enum wined3d_texture_state array. --- dlls/wined3d/surface.c | 8 +-- dlls/wined3d/texture.c | 123 +++++++++++++++++++++-------------------- dlls/wined3d/wined3d_private.h | 21 +------ 3 files changed, 69 insertions(+), 83 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=86e99abb1237e2eb3c44e…

1 0

Henri Verbeet : wined3d: Introduce struct wined3d_sampler_desc.
by Alexandre Julliard Jan. 15, 2015

Jan. 15, 2015

Module: wine Branch: master Commit: 4b480f551970ca5db1b662da9d70f9d002f31b6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b480f551970ca5db1b662da9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 15 17:19:03 2015 +0100 wined3d: Introduce struct wined3d_sampler_desc. --- dlls/d3d10core/state.c | 60 +++++++++++++++++++++++++++++++++++++++++- dlls/wined3d/sampler.c | 13 +++++---- dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d.h | 21 ++++++++++++++- 5 files changed, 89 insertions(+), 8 deletions(-) diff --git a/dlls/d3d10core/state.c b/dlls/d3d10core/state.c index c816803..7e7d19b 100644 --- a/dlls/d3d10core/state.c +++ b/dlls/d3d10core/state.c @@ -24,6 +24,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10core); +#define D3D10_FILTER_MIP_MASK 0x01 +#define D3D10_FILTER_MAG_MASK 0x04 +#define D3D10_FILTER_MIN_MASK 0x10 +#define D3D10_FILTER_ANISO_MASK 0x40 +#define D3D10_FILTER_COMPARE_MASK 0x80 + static inline struct d3d10_blend_state *impl_from_ID3D10BlendState(ID3D10BlendState *iface) { return CONTAINING_RECORD(iface, struct d3d10_blend_state, ID3D10BlendState_iface); @@ -590,16 +596,68 @@ static const struct ID3D10SamplerStateVtbl d3d10_sampler_state_vtbl = d3d10_sampler_state_GetDesc, }; +static enum wined3d_texture_address wined3d_texture_address_from_d3d10core(enum D3D10_TEXTURE_ADDRESS_MODE t) +{ + return (enum wined3d_texture_address)t; +} + +static enum wined3d_texture_filter_type wined3d_texture_filter_mip_from_d3d10core(enum D3D10_FILTER f) +{ + if (f & D3D10_FILTER_MIP_MASK) + return WINED3D_TEXF_LINEAR; + return WINED3D_TEXF_POINT; +} + +static enum wined3d_texture_filter_type wined3d_texture_filter_mag_from_d3d10core(enum D3D10_FILTER f) +{ + if (f & D3D10_FILTER_MAG_MASK) + return WINED3D_TEXF_LINEAR; + return WINED3D_TEXF_POINT; +} + +static enum wined3d_texture_filter_type wined3d_texture_filter_min_from_d3d10core(enum D3D10_FILTER f) +{ + if (f & D3D10_FILTER_MIN_MASK) + return WINED3D_TEXF_LINEAR; + return WINED3D_TEXF_POINT; +} + +static BOOL wined3d_texture_compare_from_d3d10core(enum D3D10_FILTER f) +{ + return f & D3D10_FILTER_COMPARE_MASK; +} + +static enum wined3d_cmp_func wined3d_cmp_func_from_d3d10core(D3D10_COMPARISON_FUNC f) +{ + return (enum wined3d_cmp_func)f; +} + HRESULT d3d10_sampler_state_init(struct d3d10_sampler_state *state, struct d3d10_device *device, const D3D10_SAMPLER_DESC *desc) { + struct wined3d_sampler_desc wined3d_desc; HRESULT hr; state->ID3D10SamplerState_iface.lpVtbl = &d3d10_sampler_state_vtbl; state->refcount = 1; state->desc = *desc; - if (FAILED(hr = wined3d_sampler_create(state, &state->wined3d_sampler))) + wined3d_desc.address_u = wined3d_texture_address_from_d3d10core(desc->AddressU); + wined3d_desc.address_v = wined3d_texture_address_from_d3d10core(desc->AddressV); + wined3d_desc.address_w = wined3d_texture_address_from_d3d10core(desc->AddressW); + memcpy(wined3d_desc.border_color, desc->BorderColor, sizeof(wined3d_desc.border_color)); + wined3d_desc.mag_filter = wined3d_texture_filter_mag_from_d3d10core(desc->Filter); + wined3d_desc.min_filter = wined3d_texture_filter_min_from_d3d10core(desc->Filter); + wined3d_desc.mip_filter = wined3d_texture_filter_mip_from_d3d10core(desc->Filter); + wined3d_desc.lod_bias = desc->MipLODBias; + wined3d_desc.min_lod = desc->MinLOD; + wined3d_desc.max_lod = desc->MaxLOD; + wined3d_desc.max_anisotropy = desc->Filter & D3D10_FILTER_ANISO_MASK ? desc->MaxAnisotropy : 1; + wined3d_desc.compare = wined3d_texture_compare_from_d3d10core(desc->Filter); + wined3d_desc.comparison_func = wined3d_cmp_func_from_d3d10core(desc->ComparisonFunc); + wined3d_desc.srgb_decode = FALSE; + + if (FAILED(hr = wined3d_sampler_create(&wined3d_desc, state, &state->wined3d_sampler))) { WARN("Failed to create wined3d sampler, hr %#x.\n", hr); return hr; diff --git a/dlls/wined3d/sampler.c b/dlls/wined3d/sampler.c index d5c44c9..ed9002e 100644 --- a/dlls/wined3d/sampler.c +++ b/dlls/wined3d/sampler.c @@ -1,5 +1,5 @@ /* - * Copyright 2012 Henri Verbeet for CodeWeavers + * Copyright 2012, 2015 Henri Verbeet for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -52,22 +52,25 @@ void * CDECL wined3d_sampler_get_parent(const struct wined3d_sampler *sampler) return sampler->parent; } -static void wined3d_sampler_init(struct wined3d_sampler *sampler, void *parent) +static void wined3d_sampler_init(struct wined3d_sampler *sampler, + const struct wined3d_sampler_desc *desc, void *parent) { sampler->refcount = 1; sampler->parent = parent; + sampler->desc = *desc; } -HRESULT CDECL wined3d_sampler_create(void *parent, struct wined3d_sampler **sampler) +HRESULT CDECL wined3d_sampler_create(const struct wined3d_sampler_desc *desc, + void *parent, struct wined3d_sampler **sampler) { struct wined3d_sampler *object; - TRACE("parent %p, sampler %p.\n", parent, sampler); + TRACE("desc %p, parent %p, sampler %p.\n", desc, parent, sampler); if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - wined3d_sampler_init(object, parent); + wined3d_sampler_init(object, desc, parent); TRACE("Created sampler %p.\n", object); *sampler = object; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 7a77003..e6383b0 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -194,7 +194,7 @@ @ cdecl wined3d_rendertarget_view_incref(ptr) @ cdecl wined3d_rendertarget_view_set_parent(ptr ptr) -@ cdecl wined3d_sampler_create(ptr ptr) +@ cdecl wined3d_sampler_create(ptr ptr ptr) @ cdecl wined3d_sampler_decref(ptr) @ cdecl wined3d_sampler_get_parent(ptr) @ cdecl wined3d_sampler_incref(ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 047946b..a552d40 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2409,6 +2409,7 @@ struct wined3d_sampler { LONG refcount; void *parent; + struct wined3d_sampler_desc desc; }; struct wined3d_vertex_declaration_element diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 6e06388..0e8b2f9 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1976,6 +1976,24 @@ struct wined3d_rendertarget_view_desc } u; }; +struct wined3d_sampler_desc +{ + enum wined3d_texture_address address_u; + enum wined3d_texture_address address_v; + enum wined3d_texture_address address_w; + float border_color[4]; + enum wined3d_texture_filter_type mag_filter; + enum wined3d_texture_filter_type min_filter; + enum wined3d_texture_filter_type mip_filter; + float lod_bias; + float min_lod; + float max_lod; + unsigned int max_anisotropy; + BOOL compare; + enum wined3d_cmp_func comparison_func; + BOOL srgb_decode; +}; + struct wined3d_shader_signature_element { const char *semantic_name; @@ -2434,7 +2452,8 @@ void * __cdecl wined3d_rendertarget_view_get_sub_resource_parent(const struct wi ULONG __cdecl wined3d_rendertarget_view_incref(struct wined3d_rendertarget_view *view); void __cdecl wined3d_rendertarget_view_set_parent(struct wined3d_rendertarget_view *view, void *parent); -HRESULT __cdecl wined3d_sampler_create(void *parent, struct wined3d_sampler **sampler); +HRESULT __cdecl wined3d_sampler_create(const struct wined3d_sampler_desc *desc, + void *parent, struct wined3d_sampler **sampler); ULONG __cdecl wined3d_sampler_decref(struct wined3d_sampler *sampler); void * __cdecl wined3d_sampler_get_parent(const struct wined3d_sampler *sampler); ULONG __cdecl wined3d_sampler_incref(struct wined3d_sampler *sampler);

1 0

Piotr Caban : ole32: Only change DoDragDrop return value on IDropTarget:: Drop failure.
by Alexandre Julliard Jan. 15, 2015

Jan. 15, 2015

Module: wine Branch: master Commit: 95c57c618affa2ff77a7a54798c4ce6b2dd1234c URL: http://source.winehq.org/git/wine.git/?a=commit;h=95c57c618affa2ff77a7a5479… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 15 13:39:31 2015 +0100 ole32: Only change DoDragDrop return value on IDropTarget::Drop failure. --- dlls/ole32/ole2.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 786fdb4..f6c6c10 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2407,11 +2407,12 @@ static void OLEDD_TrackStateChange(TrackerWindowInfo* trackerInfo) */ case DRAGDROP_S_DROP: if (*trackerInfo->pdwEffect != DROPEFFECT_NONE) - trackerInfo->returnValue = IDropTarget_Drop(trackerInfo->curDragTarget, - trackerInfo->dataObject, - trackerInfo->dwKeyState, - trackerInfo->curMousePos, - trackerInfo->pdwEffect); + { + hr = IDropTarget_Drop(trackerInfo->curDragTarget, trackerInfo->dataObject, + trackerInfo->dwKeyState, trackerInfo->curMousePos, trackerInfo->pdwEffect); + if (FAILED(hr)) + trackerInfo->returnValue = hr; + } else IDropTarget_DragLeave(trackerInfo->curDragTarget); break;

1 0

Henri Verbeet : wined3d: Merge shader_glsl_load_vsamplers() and shader_glsl_load_psamplers().
by Alexandre Julliard Jan. 15, 2015

Jan. 15, 2015

Module: wine Branch: master Commit: 60d44af34e7fa30f4ad0ecfc256367fa4aa057ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=60d44af34e7fa30f4ad0ecfc2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 15 17:19:07 2015 +0100 wined3d: Merge shader_glsl_load_vsamplers() and shader_glsl_load_psamplers(). --- dlls/wined3d/glsl_shader.c | 77 +++++++++++++++++++++------------------------- 1 file changed, 35 insertions(+), 42 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 24a8b46..a829651 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -413,55 +413,50 @@ static void shader_glsl_validate_link(const struct wined3d_gl_info *gl_info, GLh } /* Context activation is done by the caller. */ -static void shader_glsl_load_psamplers(const struct wined3d_gl_info *gl_info, - const DWORD *tex_unit_map, GLhandleARB programId) +static void shader_glsl_load_samplers(const struct wined3d_gl_info *gl_info, + const DWORD *tex_unit_map, GLhandleARB program_id) { - GLint name_loc; + unsigned int mapped_unit; char sampler_name[20]; - unsigned int i; + const char *prefix; + unsigned int i, j; + GLint name_loc; - for (i = 0; i < MAX_FRAGMENT_SAMPLERS; ++i) + static const struct { - snprintf(sampler_name, sizeof(sampler_name), "ps_sampler%u", i); - name_loc = GL_EXTCALL(glGetUniformLocationARB(programId, sampler_name)); - if (name_loc != -1) { - DWORD mapped_unit = tex_unit_map[i]; - if (mapped_unit != WINED3D_UNMAPPED_STAGE && mapped_unit < gl_info->limits.fragment_samplers) - { - TRACE("Loading %s for texture %d\n", sampler_name, mapped_unit); - GL_EXTCALL(glUniform1iARB(name_loc, mapped_unit)); - checkGLcall("glUniform1iARB"); - } else { - ERR("Trying to load sampler %s on unsupported unit %d\n", sampler_name, mapped_unit); - } - } + enum wined3d_shader_type type; + unsigned int base_idx; + unsigned int count; } -} - -/* Context activation is done by the caller. */ -static void shader_glsl_load_vsamplers(const struct wined3d_gl_info *gl_info, - const DWORD *tex_unit_map, GLhandleARB programId) -{ - GLint name_loc; - char sampler_name[20]; - unsigned int i; + sampler_info[] = + { + {WINED3D_SHADER_TYPE_PIXEL, 0, MAX_FRAGMENT_SAMPLERS}, + {WINED3D_SHADER_TYPE_VERTEX, MAX_FRAGMENT_SAMPLERS, MAX_VERTEX_SAMPLERS}, + }; - for (i = 0; i < MAX_VERTEX_SAMPLERS; ++i) + for (i = 0; i < ARRAY_SIZE(sampler_info); ++i) { - snprintf(sampler_name, sizeof(sampler_name), "vs_sampler%u", i); - name_loc = GL_EXTCALL(glGetUniformLocationARB(programId, sampler_name)); - if (name_loc != -1) { - DWORD mapped_unit = tex_unit_map[MAX_FRAGMENT_SAMPLERS + i]; - if (mapped_unit != WINED3D_UNMAPPED_STAGE && mapped_unit < gl_info->limits.combined_samplers) + prefix = shader_glsl_get_prefix(sampler_info[i].type); + + for (j = 0; j < sampler_info[i].count; ++j) + { + snprintf(sampler_name, sizeof(sampler_name), "%s_sampler%u", prefix, j); + name_loc = GL_EXTCALL(glGetUniformLocationARB(program_id, sampler_name)); + if (name_loc == -1) + continue; + + mapped_unit = tex_unit_map[sampler_info[i].base_idx + j]; + if (mapped_unit == WINED3D_UNMAPPED_STAGE || mapped_unit >= gl_info->limits.combined_samplers) { - TRACE("Loading %s for texture %d\n", sampler_name, mapped_unit); - GL_EXTCALL(glUniform1iARB(name_loc, mapped_unit)); - checkGLcall("glUniform1iARB"); - } else { - ERR("Trying to load sampler %s on unsupported unit %d\n", sampler_name, mapped_unit); + ERR("Trying to load sampler %s on unsupported unit %u.\n", sampler_name, mapped_unit); + continue; } + + TRACE("Loading sampler %s on unit %u.\n", sampler_name, mapped_unit); + GL_EXTCALL(glUniform1iARB(name_loc, mapped_unit)); } } + checkGLcall("glUniform1iARB"); } /* Context activation is done by the caller. */ @@ -5996,10 +5991,8 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const * vertex shader with fixed function pixel processing is used we make sure that the card * supports enough samplers to allow the max number of vertex samplers with all possible * fixed function fragment processing setups. So once the program is linked these samplers - * won't change. - */ - shader_glsl_load_vsamplers(gl_info, context->tex_unit_map, programId); - shader_glsl_load_psamplers(gl_info, context->tex_unit_map, programId); + * won't change. */ + shader_glsl_load_samplers(gl_info, context->tex_unit_map, programId); entry->constant_update_mask = 0; if (vshader)

1 0

Michael Stefaniuc : dmscript/tests: Remove an unused assigment (PVS-Studio ).
by Alexandre Julliard Jan. 15, 2015

Jan. 15, 2015

Module: wine Branch: master Commit: d84659cad75be0ea169171cdc86b2d9625268aad URL: http://source.winehq.org/git/wine.git/?a=commit;h=d84659cad75be0ea169171cdc… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 15 13:01:08 2015 +0100 dmscript/tests: Remove an unused assigment (PVS-Studio). --- dlls/dmscript/tests/dmscript.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmscript/tests/dmscript.c b/dlls/dmscript/tests/dmscript.c index 02fddc3..59858d5 100644 --- a/dlls/dmscript/tests/dmscript.c +++ b/dlls/dmscript/tests/dmscript.c @@ -164,7 +164,7 @@ static void test_COM_scripttrack(void) ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); refcount = IPersistStream_AddRef(ps); ok(refcount == 4, "refcount == %u, expected 4\n", refcount); - refcount = IPersistStream_Release(ps); + IPersistStream_Release(ps); hr = IDirectMusicTrack_QueryInterface(dmt, &IID_IUnknown, (void**)&unk); ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr);

1 0

Henri Verbeet : wined3d: Replace wined3d_texture_apply_state_changes() with wined3d_texture_apply_sampler_desc().
by Alexandre Julliard Jan. 15, 2015

Jan. 15, 2015

Module: wine Branch: master Commit: 5231113fc7cf62cd51d772ac46c449a7db5b0579 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5231113fc7cf62cd51d772ac4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 15 17:19:05 2015 +0100 wined3d: Replace wined3d_texture_apply_state_changes() with wined3d_texture_apply_sampler_desc(). --- dlls/wined3d/directx.c | 22 ----- dlls/wined3d/state.c | 132 ++++++++++++++++++++++----- dlls/wined3d/surface.c | 10 +-- dlls/wined3d/texture.c | 196 +++++++++++------------------------------ dlls/wined3d/wined3d_private.h | 22 ++--- 5 files changed, 170 insertions(+), 212 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5231113fc7cf62cd51d77…

1 0

Michael Stefaniuc : dmusic/tests: Remove an unused assigment (PVS-Studio).
by Alexandre Julliard Jan. 15, 2015

Jan. 15, 2015

Module: wine Branch: master Commit: f8977578656edc0548aaee2c9b518f56e5b85fe4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8977578656edc0548aaee2c9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 15 13:09:00 2015 +0100 dmusic/tests: Remove an unused assigment (PVS-Studio). --- dlls/dmusic/tests/dmusic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index b28a187..5a0c095 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -248,7 +248,7 @@ static void test_COM(void) ok(hr == S_OK, "QueryInterface for IID_IDirectMusic failed: %08x\n", hr); refcount = IDirectMusic_AddRef(dm); ok(refcount == 4, "refcount == %u, expected 4\n", refcount); - refcount = IDirectMusic_Release(dm); + IDirectMusic_Release(dm); hr = IDirectMusic8_QueryInterface(dm8, &IID_IUnknown, (void**)&unk); ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr);

1 0