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

Michael Stefaniuc : quartz: Remove useless casts to self.
by Alexandre Julliard March 22, 2019

March 22, 2019

Module: wine Branch: master Commit: b7ce2fc508aa88a1454bb9206a0d118e8c8577e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7ce2fc508aa88a1454bb920… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 22 08:47:31 2019 +0100 quartz: Remove useless casts to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(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 40020bb..f55ebf2 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); } }

1 0

Michael Stefaniuc : gdiplus: Avoid using the comma operator.
by Alexandre Julliard March 22, 2019

March 22, 2019

Module: wine Branch: master Commit: 5d2aa1eebd11d2b7f65169ce6a43ed11377668b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d2aa1eebd11d2b7f65169ce… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 22 08:47:34 2019 +0100 gdiplus: Avoid using the comma operator. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/brush.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 42b7e84..e65d4a2 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -67,7 +67,7 @@ GpStatus WINGDIPAPI GdipCloneBrush(GpBrush *brush, GpBrush **clone) *clone = heap_alloc_zero(sizeof(GpPathGradient)); if (!*clone) return OutOfMemory; - src = (GpPathGradient*) brush, + src = (GpPathGradient*) brush; dest = (GpPathGradient*) *clone; memcpy(dest, src, sizeof(GpPathGradient));

1 0

Michael Stefaniuc : d3dx9: Avoid using 'This' in d3dx_effect_GetPool().
by Alexandre Julliard March 22, 2019

March 22, 2019

Module: wine Branch: master Commit: 3bd0fc3d6ad75ec723f2268e2d6de79be904de2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=3bd0fc3d6ad75ec723f2268e… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 22 19:09:52 2019 +0100 d3dx9: Avoid using 'This' in d3dx_effect_GetPool(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 7635caa..874b81b 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,14 +3533,14 @@ static HRESULT WINAPI d3dx_effect_GetPool(ID3DXEffect *iface, ID3DXEffectPool ** return D3DERR_INVALIDCALL; } - if (This->pool) + *pool = NULL; + if (effect->pool) { - This->pool->lpVtbl->AddRef(This->pool); + *pool = effect->pool; + (*pool)->lpVtbl->AddRef(*pool); } - *pool = This->pool; - - TRACE("Returning pool %p\n", *pool); + TRACE("Returning pool %p.\n", *pool); return S_OK; }

1 0

Michael Stefaniuc : d3dx9: Avoid using This in d3dx_effect_Clone().
by Alexandre Julliard March 22, 2019

March 22, 2019

Module: wine Branch: master Commit: c56906599cdad729834a6807747ce2c928fc511d URL: https://source.winehq.org/git/wine.git/?a=commit;h=c56906599cdad729834a6807… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 22 19:09:54 2019 +0100 d3dx9: Avoid using This in d3dx_effect_Clone(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(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 43cc32d..b98cab2 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -4087,17 +4087,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)

1 0

Michael Stefaniuc : d3dx9: Move flags out of struct d3dx9_base_effect.
by Alexandre Julliard March 22, 2019

March 22, 2019

Module: wine Branch: master Commit: 7f16670edc3ed5c8ab5bdd88e88a00f8ba1853dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f16670edc3ed5c8ab5bdd88… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 22 19:09:55 2019 +0100 d3dx9: Move flags out of struct d3dx9_base_effect. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(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 b98cab2..0e91f28 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) @@ -1914,7 +1913,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) @@ -4097,7 +4096,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) @@ -6181,7 +6180,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);

1 0

Józef Kucia : d3d12: Load vulkan-1.dll once.
by Alexandre Julliard March 22, 2019

March 22, 2019

Module: wine Branch: master Commit: a29e6b8b772c1f10dbfc3d82cdb44cadf00ef5b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a29e6b8b772c1f10dbfc3d82… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 22 09:42:02 2019 +0100 d3d12: Load vulkan-1.dll once. 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/d3d12/d3d12_main.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/d3d12/d3d12_main.c b/dlls/d3d12/d3d12_main.c index 8a199aa..fff3acb 100644 --- a/dlls/d3d12/d3d12_main.c +++ b/dlls/d3d12/d3d12_main.c @@ -47,11 +47,25 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); #ifdef USE_WIN32_VULKAN +static HMODULE vulkan_module; + /* FIXME: We should unload vulkan-1.dll. */ +static BOOL WINAPI load_vulkan_dll_once(INIT_ONCE *once, void *param, void **context) +{ + vulkan_module = LoadLibraryA("vulkan-1.dll"); + return TRUE; +} + static PFN_vkGetInstanceProcAddr load_vulkan(void) { - HMODULE vulkan = LoadLibraryA("vulkan-1.dll"); - return (void *)GetProcAddress(vulkan, "vkGetInstanceProcAddr"); + static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; + + InitOnceExecuteOnce(&init_once, load_vulkan_dll_once, NULL, NULL); + + if (vulkan_module) + return (void *)GetProcAddress(vulkan_module, "vkGetInstanceProcAddr"); + + return NULL; } #else

1 0

Józef Kucia : wined3d: Merge if statements in adapter_gl_get_wined3d_caps().
by Alexandre Julliard March 22, 2019

March 22, 2019

Module: wine Branch: master Commit: 43965b9005be5021d3ddb5a83feaf576d4f1fee9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=43965b9005be5021d3ddb5a8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 22 09:42:04 2019 +0100 wined3d: Merge if statements in adapter_gl_get_wined3d_caps(). 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/adapter_gl.c | 79 ++++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 46 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index b02241b..3a0511e 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4275,6 +4275,9 @@ static void adapter_gl_get_wined3d_caps(const struct wined3d_adapter *adapter, s caps->RasterCaps |= WINED3DPRASTERCAPS_ANISOTROPY | WINED3DPRASTERCAPS_ZBIAS | WINED3DPRASTERCAPS_MIPMAPLODBIAS; + + caps->TextureFilterCaps |= WINED3DPTFILTERCAPS_MAGFANISOTROPIC + | WINED3DPTFILTERCAPS_MINFANISOTROPIC; } if (gl_info->supported[ARB_BLEND_FUNC_EXTENDED]) @@ -4292,25 +4295,8 @@ static void adapter_gl_get_wined3d_caps(const struct wined3d_adapter *adapter, s | WINED3DPTEXTURECAPS_MIPVOLUMEMAP; if (!d3d_info->texture_npot) caps->TextureCaps |= WINED3DPTEXTURECAPS_VOLUMEMAP_POW2; - } - - if (gl_info->supported[ARB_TEXTURE_CUBE_MAP]) - { - caps->TextureCaps |= WINED3DPTEXTURECAPS_CUBEMAP - | WINED3DPTEXTURECAPS_MIPCUBEMAP; - if (!d3d_info->texture_npot) - caps->TextureCaps |= WINED3DPTEXTURECAPS_CUBEMAP_POW2; - } - - if (gl_info->supported[ARB_TEXTURE_FILTER_ANISOTROPIC]) - { - caps->TextureFilterCaps |= WINED3DPTFILTERCAPS_MAGFANISOTROPIC - | WINED3DPTFILTERCAPS_MINFANISOTROPIC; - } - if (gl_info->supported[ARB_TEXTURE_CUBE_MAP]) - { - caps->CubeTextureFilterCaps |= WINED3DPTFILTERCAPS_MAGFLINEAR + caps->VolumeTextureFilterCaps |= WINED3DPTFILTERCAPS_MAGFLINEAR | WINED3DPTFILTERCAPS_MAGFPOINT | WINED3DPTFILTERCAPS_MINFLINEAR | WINED3DPTFILTERCAPS_MINFPOINT @@ -4323,16 +4309,34 @@ static void adapter_gl_get_wined3d_caps(const struct wined3d_adapter *adapter, s | WINED3DPTFILTERCAPS_MIPNEAREST | WINED3DPTFILTERCAPS_NEAREST; - if (gl_info->supported[ARB_TEXTURE_FILTER_ANISOTROPIC]) + caps->VolumeTextureAddressCaps |= WINED3DPTADDRESSCAPS_INDEPENDENTUV + | WINED3DPTADDRESSCAPS_CLAMP + | WINED3DPTADDRESSCAPS_WRAP; + + if (gl_info->supported[ARB_TEXTURE_BORDER_CLAMP]) { - caps->CubeTextureFilterCaps |= WINED3DPTFILTERCAPS_MAGFANISOTROPIC - | WINED3DPTFILTERCAPS_MINFANISOTROPIC; + caps->VolumeTextureAddressCaps |= WINED3DPTADDRESSCAPS_BORDER; + } + if (gl_info->supported[ARB_TEXTURE_MIRRORED_REPEAT]) + { + caps->VolumeTextureAddressCaps |= WINED3DPTADDRESSCAPS_MIRROR; } + if (gl_info->supported[ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE]) + { + caps->VolumeTextureAddressCaps |= WINED3DPTADDRESSCAPS_MIRRORONCE; + } + + caps->MaxVolumeExtent = gl_info->limits.texture3d_size; } - if (gl_info->supported[EXT_TEXTURE3D]) + if (gl_info->supported[ARB_TEXTURE_CUBE_MAP]) { - caps->VolumeTextureFilterCaps |= WINED3DPTFILTERCAPS_MAGFLINEAR + caps->TextureCaps |= WINED3DPTEXTURECAPS_CUBEMAP + | WINED3DPTEXTURECAPS_MIPCUBEMAP; + if (!d3d_info->texture_npot) + caps->TextureCaps |= WINED3DPTEXTURECAPS_CUBEMAP_POW2; + + caps->CubeTextureFilterCaps |= WINED3DPTFILTERCAPS_MAGFLINEAR | WINED3DPTFILTERCAPS_MAGFPOINT | WINED3DPTFILTERCAPS_MINFLINEAR | WINED3DPTFILTERCAPS_MINFPOINT @@ -4344,6 +4348,12 @@ static void adapter_gl_get_wined3d_caps(const struct wined3d_adapter *adapter, s | WINED3DPTFILTERCAPS_MIPLINEAR | WINED3DPTFILTERCAPS_MIPNEAREST | WINED3DPTFILTERCAPS_NEAREST; + + if (gl_info->supported[ARB_TEXTURE_FILTER_ANISOTROPIC]) + { + caps->CubeTextureFilterCaps |= WINED3DPTFILTERCAPS_MAGFANISOTROPIC + | WINED3DPTFILTERCAPS_MINFANISOTROPIC; + } } if (gl_info->supported[ARB_TEXTURE_BORDER_CLAMP]) @@ -4359,29 +4369,6 @@ static void adapter_gl_get_wined3d_caps(const struct wined3d_adapter *adapter, s caps->TextureAddressCaps |= WINED3DPTADDRESSCAPS_MIRRORONCE; } - if (gl_info->supported[EXT_TEXTURE3D]) - { - caps->VolumeTextureAddressCaps |= WINED3DPTADDRESSCAPS_INDEPENDENTUV - | WINED3DPTADDRESSCAPS_CLAMP - | WINED3DPTADDRESSCAPS_WRAP; - - if (gl_info->supported[ARB_TEXTURE_BORDER_CLAMP]) - { - caps->VolumeTextureAddressCaps |= WINED3DPTADDRESSCAPS_BORDER; - } - if (gl_info->supported[ARB_TEXTURE_MIRRORED_REPEAT]) - { - caps->VolumeTextureAddressCaps |= WINED3DPTADDRESSCAPS_MIRROR; - } - if (gl_info->supported[ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE]) - { - caps->VolumeTextureAddressCaps |= WINED3DPTADDRESSCAPS_MIRRORONCE; - } - } - - if (gl_info->supported[EXT_TEXTURE3D]) - caps->MaxVolumeExtent = gl_info->limits.texture3d_size; - if (gl_info->supported[EXT_STENCIL_WRAP]) { caps->StencilCaps |= WINED3DSTENCILCAPS_DECR

1 0

Józef Kucia : wined3d: Introduce a separate structure for OpenGL adapters.
by Alexandre Julliard March 22, 2019

March 22, 2019

Module: wine Branch: master Commit: 7593a7544d865c9b4448794a8e938316db8a6606 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7593a7544d865c9b4448794a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 22 09:42:05 2019 +0100 wined3d: Introduce a separate structure for OpenGL adapters. 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/adapter_gl.c | 31 ++++++++++++++--- dlls/wined3d/device.c | 2 +- dlls/wined3d/directx.c | 76 +++++++++++++++++++++++++++++------------- dlls/wined3d/wined3d_private.h | 22 +++++++----- 4 files changed, 94 insertions(+), 37 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7593a7544d865c9b4448…

1 0

Michael Stefaniuc : d3dx9: Merge the two pool fields of struct d3dx_effect.
by Alexandre Julliard March 22, 2019

March 22, 2019

Module: wine Branch: master Commit: ef974e59856d702523ef04b5e315d0c980097c8d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef974e59856d702523ef04b5… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 22 19:09:53 2019 +0100 d3dx9: Merge the two pool fields of struct d3dx_effect. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 874b81b..43cc32d 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; @@ -679,6 +678,7 @@ static void free_technique(struct d3dx_technique *technique) static void d3dx_effect_cleanup(struct d3dx_effect *effect) { + ID3DXEffectPool *pool; unsigned int i; TRACE("effect %p.\n", effect); @@ -707,7 +707,10 @@ static void d3dx_effect_cleanup(struct d3dx_effect *effect) } if (effect->pool) - effect->pool->lpVtbl->Release(effect->pool); + { + pool = &effect->pool->ID3DXEffectPool_iface; + pool->lpVtbl->Release(pool); + } if (effect->manager) IUnknown_Release(effect->manager); @@ -1124,7 +1127,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) @@ -3536,7 +3539,7 @@ static HRESULT WINAPI d3dx_effect_GetPool(ID3DXEffect *iface, ID3DXEffectPool ** *pool = NULL; if (effect->pool) { - *pool = effect->pool; + *pool = &effect->pool->ID3DXEffectPool_iface; (*pool)->lpVtbl->AddRef(*pool); } @@ -5937,7 +5940,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; @@ -6047,7 +6049,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); @@ -6153,7 +6155,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; @@ -6173,15 +6174,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);

1 0

Michael Stefaniuc : d3dx9: Get rid of struct d3dx9_base_effect.
by Alexandre Julliard March 22, 2019

March 22, 2019

Module: wine Branch: master Commit: 3b951b77f87ed9102fc7a2ccb0807b5592990147 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b951b77f87ed9102fc7a2cc… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 22 19:09:56 2019 +0100 d3dx9: Get rid of struct d3dx9_base_effect. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 0e91f28..433ec3b 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; + struct wine_rb_tree param_tree; char *full_name_tmp; unsigned int full_name_tmp_size; @@ -180,6 +172,7 @@ struct d3dx_effect struct d3dx_pass *active_pass; BOOL started; DWORD begin_flags; + ULONG64 version_counter; D3DLIGHT9 current_light[8]; unsigned int light_updated; @@ -1126,7 +1119,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) @@ -6152,7 +6145,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; @@ -6179,7 +6171,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);

1 0