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

Michael Stefaniuc : quartz: Remove useless casts to self.
by Alexandre Julliard 22 Mar '19

22 Mar '19

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 : propsys: Remove useless cast to self.
by Alexandre Julliard 22 Mar '19

22 Mar '19

Module: wine Branch: master Commit: 44d4fb5f1ecafb3e2744933ab19c8ca100dc6219 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44d4fb5f1ecafb3e2744933a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 22 08:47:32 2019 +0100 propsys: Remove useless cast to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(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 5d6eeca..98fb129 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; }

1 0

Michael Stefaniuc : comdlg32: Avoid using the comma operator.
by Alexandre Julliard 22 Mar '19

22 Mar '19

Module: wine Branch: master Commit: 773e1788ceb21c116115511e3eefb468b2d0fa36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=773e1788ceb21c116115511e… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 22 08:47:33 2019 +0100 comdlg32: Avoid using the comma operator. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(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 5f36d2b..1ae20ca 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)

1 0

Michael Stefaniuc : gdiplus: Avoid using the comma operator.
by Alexandre Julliard 22 Mar '19

22 Mar '19

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 : iphlpapi: Drop unneeded continue statements ( coccinellery).
by Alexandre Julliard 22 Mar '19

22 Mar '19

Module: wine Branch: master Commit: 8c79999122e3ca6b7d4239ed6848f7cabd053a48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c79999122e3ca6b7d4239ed… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 22 08:47:35 2019 +0100 iphlpapi: Drop unneeded continue statements (coccinellery). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(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 c36f42a..be1cc52 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;

1 0

Jacek Caban : mshtml: Add IHTMLWindow6::get_localStorage implementation.
by Alexandre Julliard 22 Mar '19

22 Mar '19

Module: wine Branch: master Commit: 64b5d6b3e5944b6f4b4d6bcd0df2f8b6bb32b584 URL: https://source.winehq.org/git/wine.git/?a=commit;h=64b5d6b3e5944b6f4b4d6bcd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 22 15:16:28 2019 +0100 mshtml: Add IHTMLWindow6::get_localStorage implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlwindow.c | 20 +++++++++++++++++--- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/elements.js | 11 ++++++++++- 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 92b0537..926ebb9 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -295,6 +295,8 @@ static void release_inner_window(HTMLInnerWindow *This) if(This->session_storage) IHTMLStorage_Release(This->session_storage); + if(This->local_storage) + IHTMLStorage_Release(This->local_storage); if(This->mon) IMoniker_Release(This->mon); @@ -2123,7 +2125,7 @@ static HRESULT WINAPI HTMLWindow6_get_sessionStorage(IHTMLWindow6 *iface, IHTMLS { HTMLWindow *This = impl_from_IHTMLWindow6(iface); - FIXME("(%p)->(%p)\n", This, p); + TRACE("(%p)->(%p)\n", This, p); if(!This->inner_window->session_storage) { HRESULT hres; @@ -2141,8 +2143,20 @@ static HRESULT WINAPI HTMLWindow6_get_sessionStorage(IHTMLWindow6 *iface, IHTMLS static HRESULT WINAPI HTMLWindow6_get_localStorage(IHTMLWindow6 *iface, IHTMLStorage **p) { HTMLWindow *This = impl_from_IHTMLWindow6(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + if(!This->inner_window->local_storage) { + HRESULT hres; + + hres = create_storage(&This->inner_window->local_storage); + if(FAILED(hres)) + return hres; + } + + IHTMLStorage_AddRef(This->inner_window->local_storage); + *p = This->inner_window->local_storage; + return S_OK; } static HRESULT WINAPI HTMLWindow6_put_onhashchange(IHTMLWindow6 *iface, VARIANT v) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index f2939da..14cc561 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -515,6 +515,7 @@ struct HTMLInnerWindow { IHTMLScreen *screen; OmHistory *history; IHTMLStorage *session_storage; + IHTMLStorage *local_storage; BOOL performance_initialized; VARIANT performance; diff --git a/dlls/mshtml/tests/elements.js b/dlls/mshtml/tests/elements.js index 7213388..b23f5c1 100644 --- a/dlls/mshtml/tests/elements.js +++ b/dlls/mshtml/tests/elements.js @@ -290,6 +290,14 @@ function test_style_properties() { next_test(); } +function test_storage() { + ok(typeof(window.sessionStorage) === "object", + "typeof(window.sessionStorage) = " + typeof(window.sessionStorage)); + ok(typeof(window.localStorage) === "object", + "typeof(window.localStorage) = " + typeof(window.localStorage)); + next_test(); +} + var tests = [ test_input_selection, test_textContent, @@ -301,5 +309,6 @@ var tests = [ test_query_selector, test_compare_position, test_document_owner, - test_style_properties + test_style_properties, + test_storage ];

1 0

Michael Stefaniuc : d3dx9: Avoid using 'This' in d3dx_effect_GetPool().
by Alexandre Julliard 22 Mar '19

22 Mar '19

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: Merge the two pool fields of struct d3dx_effect.
by Alexandre Julliard 22 Mar '19

22 Mar '19

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: Avoid using This in d3dx_effect_Clone().
by Alexandre Julliard 22 Mar '19

22 Mar '19

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 22 Mar '19

22 Mar '19

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