March 2019 - Wine-devel - list.winehq.org

[PATCH] iphlpapi: Drop unneeded continue statements (coccinellery)
by Michael Stefaniuc 22 Mar '19

22 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/iphlpapi/ipstats.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index c36f42a378..be1cc524c4 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -823,11 +823,8 @@ DWORD WINAPI GetIpStatisticsEx(PMIB_IPSTATS stats, DWORD family) *ptr='\0'; for (i = 0; i < ARRAY_SIZE(ipstatlist); i++) - if (!strcasecmp(buf, ipstatlist[i].name)) - { - if (sscanf(value, "%d", &res)) *ipstatlist[i].elem = res; - continue; - } + if (!strcasecmp(buf, ipstatlist[i].name) && sscanf(value, "%d", &res)) + *ipstatlist[i].elem = res; } fclose(fp); ret = NO_ERROR; @@ -1213,11 +1210,8 @@ DWORD WINAPI GetUdpStatisticsEx(PMIB_UDPSTATS stats, DWORD family) *ptr='\0'; for (i = 0; i < ARRAY_SIZE(udpstatlist); i++) - if (!strcasecmp(buf, udpstatlist[i].name)) - { - if (sscanf(value, "%d", &res)) *udpstatlist[i].elem = res; - continue; - } + if (!strcasecmp(buf, udpstatlist[i].name) && sscanf(value, "%d", &res)) + *udpstatlist[i].elem = res; } fclose(fp); ret = NO_ERROR; -- 2.20.1

1 0

[PATCH] comdlg32: Avoid using the comma operator
by Michael Stefaniuc 22 Mar '19

22 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comdlg32/itemdlg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index 5f36d2bdee..1ae20ca782 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -1284,7 +1284,7 @@ static UINT ctrl_container_resize(FileDialogImpl *This, UINT container_width) /* Move the controls to their final destination */ - cur_col_pos = 0, cur_row_pos = 0; + cur_col_pos = 0; cur_row_pos = 0; LIST_FOR_EACH_ENTRY(ctrl, &This->cctrls, customctrl, entry) { if(ctrl->cdcstate & CDCS_VISIBLE) -- 2.20.1

1 0

[PATCH] propsys: Remove useless cast to self
by Michael Stefaniuc 22 Mar '19

22 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/propsys/propvar.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index 5d6eecad77..98fb129f6f 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -206,7 +206,7 @@ HRESULT WINAPI PropVariantToInt64(REFPROPVARIANT propvarIn, LONGLONG *ret) TRACE("%p,%p\n", propvarIn, ret); hr = PROPVAR_ConvertNumber(propvarIn, 64, TRUE, &res); - if (SUCCEEDED(hr)) *ret = (LONGLONG)res; + if (SUCCEEDED(hr)) *ret = res; return hr; } -- 2.20.1

1 0

[PATCH] quartz: Remove useless casts to self
by Michael Stefaniuc 22 Mar '19

22 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/quartz/avisplit.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index 40020bbfa9..f55ebf2219 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -955,10 +955,8 @@ static HRESULT AVISplitter_InitializeStreams(AVISplitterImpl *This) for (x = 0; x < This->Parser.cStreams; ++x) { - if ((DWORD)This->streams[x].frames != This->streams[x].streamheader.dwLength) - { - FIXME("stream %u: frames found: %u, frames meant to be found: %u\n", x, (DWORD)This->streams[x].frames, This->streams[x].streamheader.dwLength); - } + if (This->streams[x].frames != This->streams[x].streamheader.dwLength) + FIXME("stream %u: frames found: %u, frames meant to be found: %u\n", x, This->streams[x].frames, This->streams[x].streamheader.dwLength); } } -- 2.20.1

1 0

[PATCH 5/6] d3dx9: Get rid of struct d3dx9_base_effect
by Michael Stefaniuc 22 Mar '19

22 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 57cff363a7..8152362170 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -148,20 +148,11 @@ struct d3dx_technique struct IDirect3DStateBlock9 *saved_state; }; -struct d3dx9_base_effect -{ - struct d3dx_effect *effect; - - - ULONG64 version_counter; -}; - struct d3dx_effect { ID3DXEffect ID3DXEffect_iface; LONG ref; - struct d3dx9_base_effect base_effect; unsigned int parameter_count; unsigned int technique_count; unsigned int object_count; @@ -169,6 +160,7 @@ struct d3dx_effect struct d3dx_technique *techniques; struct d3dx_object *objects; DWORD flags; + ULONG64 version_counter; struct wine_rb_tree param_tree; char *full_name_tmp; unsigned int full_name_tmp_size; @@ -1122,7 +1114,7 @@ static BOOL walk_parameter_tree(struct d3dx_parameter *param, walk_parameter_dep static ULONG64 *get_version_counter_ptr(struct d3dx_effect *effect) { - return effect->pool ? &effect->pool->version_counter : &effect->base_effect.version_counter; + return effect->pool ? &effect->pool->version_counter : &effect->version_counter; } static ULONG64 next_effect_update_version(struct d3dx_effect *effect) @@ -6150,7 +6142,6 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev #else UINT compile_flags = 0; #endif - struct d3dx9_base_effect *base = &effect->base_effect; ID3DBlob *bytecode = NULL, *temp_errors = NULL; unsigned int skip_constants_count = 0; char *skip_constants_buffer = NULL; @@ -6177,7 +6168,6 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev IDirect3DDevice9_AddRef(device); effect->device = device; - base->effect = effect; effect->flags = eflags; read_dword(&ptr, &tag); -- 2.20.1

1 0

[PATCH 4/6] d3dx9: Move flags out of struct d3dx9_base_effect
by Michael Stefaniuc 22 Mar '19

22 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index b26740ab6b..57cff363a7 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -152,7 +152,6 @@ struct d3dx9_base_effect { struct d3dx_effect *effect; - DWORD flags; ULONG64 version_counter; }; @@ -169,6 +168,7 @@ struct d3dx_effect struct d3dx_top_level_parameter *parameters; struct d3dx_technique *techniques; struct d3dx_object *objects; + DWORD flags; struct wine_rb_tree param_tree; char *full_name_tmp; unsigned int full_name_tmp_size; @@ -503,8 +503,7 @@ static struct d3dx_parameter *get_valid_parameter(struct d3dx_effect *effect, D3 sizeof(parameter_magic_string))) return handle_param; - return effect->base_effect.flags & D3DXFX_LARGEADDRESSAWARE - ? NULL : get_parameter_by_name(effect, NULL, parameter); + return effect->flags & D3DXFX_LARGEADDRESSAWARE ? NULL : get_parameter_by_name(effect, NULL, parameter); } static void free_state(struct d3dx_state *state) @@ -1910,7 +1909,7 @@ static HRESULT WINAPI d3dx_effect_GetPassDesc(ID3DXEffect *iface, D3DXHANDLE pas desc->pVertexShaderFunction = NULL; desc->pPixelShaderFunction = NULL; - if (effect->base_effect.flags & D3DXFX_NOT_CLONEABLE) + if (effect->flags & D3DXFX_NOT_CLONEABLE) return D3D_OK; for (i = 0; i < pass->state_count; ++i) @@ -4095,7 +4094,7 @@ static HRESULT WINAPI d3dx_effect_CloneEffect(ID3DXEffect *iface, IDirect3DDevic if (!new_effect) return D3DERR_INVALIDCALL; - if (effect->base_effect.flags & D3DXFX_NOT_CLONEABLE) + if (effect->flags & D3DXFX_NOT_CLONEABLE) return E_FAIL; if (!device) @@ -6179,7 +6178,7 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev effect->device = device; base->effect = effect; - base->flags = eflags; + effect->flags = eflags; read_dword(&ptr, &tag); TRACE("Tag: %x\n", tag); -- 2.20.1

1 0

[PATCH 3/6] d3dx9: Avoid using This in d3dx_effect_Clone()
by Michael Stefaniuc 22 Mar '19

22 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 3e31d65226..b26740ab6b 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -4085,17 +4085,17 @@ static HRESULT WINAPI d3dx_effect_DeleteParameterBlock(ID3DXEffect *iface, D3DXH } #endif -static HRESULT WINAPI d3dx_effect_CloneEffect(ID3DXEffect *iface, struct IDirect3DDevice9 *device, - struct ID3DXEffect **effect) +static HRESULT WINAPI d3dx_effect_CloneEffect(ID3DXEffect *iface, IDirect3DDevice9 *device, + ID3DXEffect **new_effect) { - struct d3dx_effect *This = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); - FIXME("(%p)->(%p, %p): stub\n", This, device, effect); + FIXME("iface %p, device %p, new_effect %p stub.\n", effect, device, new_effect); - if (!effect) + if (!new_effect) return D3DERR_INVALIDCALL; - if (This->base_effect.flags & D3DXFX_NOT_CLONEABLE) + if (effect->base_effect.flags & D3DXFX_NOT_CLONEABLE) return E_FAIL; if (!device) -- 2.20.1

1 0

[PATCH 2/6] d3dx9: Merge the two pool fields of struct d3dx_effect
by Michael Stefaniuc 22 Mar '19

22 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 32db4a80ae..3e31d65226 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -152,7 +152,6 @@ struct d3dx9_base_effect { struct d3dx_effect *effect; - struct d3dx_effect_pool *pool; DWORD flags; ULONG64 version_counter; @@ -176,7 +175,7 @@ struct d3dx_effect struct ID3DXEffectStateManager *manager; struct IDirect3DDevice9 *device; - struct ID3DXEffectPool *pool; + struct d3dx_effect_pool *pool; struct d3dx_technique *active_technique; struct d3dx_pass *active_pass; BOOL started; @@ -707,7 +706,7 @@ static void d3dx_effect_cleanup(struct d3dx_effect *effect) } if (effect->pool) - effect->pool->lpVtbl->Release(effect->pool); + effect->pool->ID3DXEffectPool_iface.lpVtbl->Release(&effect->pool->ID3DXEffectPool_iface); if (effect->manager) IUnknown_Release(effect->manager); @@ -1124,7 +1123,7 @@ static BOOL walk_parameter_tree(struct d3dx_parameter *param, walk_parameter_dep static ULONG64 *get_version_counter_ptr(struct d3dx_effect *effect) { - return effect->base_effect.pool ? &effect->base_effect.pool->version_counter : &effect->base_effect.version_counter; + return effect->pool ? &effect->pool->version_counter : &effect->base_effect.version_counter; } static ULONG64 next_effect_update_version(struct d3dx_effect *effect) @@ -3535,7 +3534,7 @@ static HRESULT WINAPI d3dx_effect_GetPool(ID3DXEffect *iface, ID3DXEffectPool ** if (effect->pool) { - *pool = effect->pool; + *pool = &effect->pool->ID3DXEffectPool_iface; (*pool)->lpVtbl->AddRef(*pool); } else @@ -5939,7 +5938,6 @@ static BOOL param_set_top_level_param(void *top_level_param, struct d3dx_paramet static HRESULT d3dx_parse_effect(struct d3dx_effect *effect, const char *data, UINT data_size, DWORD start, const char **skip_constants, unsigned int skip_constants_count) { - struct d3dx9_base_effect *base = &effect->base_effect; const char *ptr = data + start; UINT stringcount, resourcecount; HRESULT hr; @@ -6049,7 +6047,7 @@ static HRESULT d3dx_parse_effect(struct d3dx_effect *effect, const char *data, U for (i = 0; i < effect->parameter_count; ++i) { - if (FAILED(hr = d3dx_pool_sync_shared_parameter(base->pool, &effect->parameters[i]))) + if (FAILED(hr = d3dx_pool_sync_shared_parameter(effect->pool, &effect->parameters[i]))) goto err_out; effect->parameters[i].version_counter = get_version_counter_ptr(effect); set_dirty(&effect->parameters[i].param); @@ -6155,7 +6153,6 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev #endif struct d3dx9_base_effect *base = &effect->base_effect; ID3DBlob *bytecode = NULL, *temp_errors = NULL; - struct d3dx_effect_pool *pool_impl = NULL; unsigned int skip_constants_count = 0; char *skip_constants_buffer = NULL; const char **skip_constants = NULL; @@ -6175,15 +6172,13 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev if (pool) { pool->lpVtbl->AddRef(pool); - pool_impl = impl_from_ID3DXEffectPool(pool); + effect->pool = impl_from_ID3DXEffectPool(pool); } - effect->pool = pool; IDirect3DDevice9_AddRef(device); effect->device = device; base->effect = effect; - base->pool = pool_impl; base->flags = eflags; read_dword(&ptr, &tag); -- 2.20.1

1 0

[PATCH 1/6] d3dx9: Avoid using 'This' in d3dx_effect_GetPool()
by Michael Stefaniuc 22 Mar '19

22 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 7635caa878..32db4a80ae 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -3523,9 +3523,9 @@ static HRESULT WINAPI d3dx_effect_SetArrayRange(ID3DXEffect *iface, D3DXHANDLE p /*** ID3DXEffect methods ***/ static HRESULT WINAPI d3dx_effect_GetPool(ID3DXEffect *iface, ID3DXEffectPool **pool) { - struct d3dx_effect *This = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); - TRACE("iface %p, pool %p\n", This, pool); + TRACE("iface %p, pool %p\n", effect, pool); if (!pool) { @@ -3533,12 +3533,14 @@ static HRESULT WINAPI d3dx_effect_GetPool(ID3DXEffect *iface, ID3DXEffectPool ** return D3DERR_INVALIDCALL; } - if (This->pool) + if (effect->pool) { - This->pool->lpVtbl->AddRef(This->pool); + *pool = effect->pool; + (*pool)->lpVtbl->AddRef(*pool); } + else + *pool = NULL; - *pool = This->pool; TRACE("Returning pool %p\n", *pool); -- 2.20.1

1 0

[PATCH 1/7] mfplat: Print warning instead of fixme for unsupported interfaces in attributes object.
by Nikolay Sivov 22 Mar '19

22 Mar '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/main.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 899aca73d9..8e9cb66058 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -651,24 +651,19 @@ static inline mfattributes *impl_from_IMFAttributes(IMFAttributes *iface) static HRESULT WINAPI mfattributes_QueryInterface(IMFAttributes *iface, REFIID riid, void **out) { - mfattributes *This = impl_from_IMFAttributes(iface); - - TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), out); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), out); - if(IsEqualGUID(riid, &IID_IUnknown) || - IsEqualGUID(riid, &IID_IMFAttributes)) + if (IsEqualIID(riid, &IID_IMFAttributes) || + IsEqualGUID(riid, &IID_IUnknown)) { - *out = &This->IMFAttributes_iface; - } - else - { - FIXME("(%s, %p)\n", debugstr_guid(riid), out); - *out = NULL; - return E_NOINTERFACE; + *out = iface; + IMFAttributes_AddRef(iface); + return S_OK; } - IUnknown_AddRef((IUnknown*)*out); - return S_OK; + WARN("Unsupported %s.\n", debugstr_guid(riid)); + *out = NULL; + return E_NOINTERFACE; } static ULONG WINAPI mfattributes_AddRef(IMFAttributes *iface) -- 2.20.1

2 9