wine-commits March 2019

wine-commits@winehq.org

2 participants
1097 discussions

Matteo Bruni : d3dx9: Avoid double free on effect initialization failure.
by Alexandre Julliard 18 Mar '19

18 Mar '19

Module: wine Branch: master Commit: cffe35488dc16414c6938e0f1a0169fb59730c97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cffe35488dc16414c6938e0f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Mar 18 19:58:39 2019 +0100 d3dx9: Avoid double free on effect initialization failure. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 51c7a37..3a8e152 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -6303,7 +6303,6 @@ static HRESULT d3dx9_base_effect_init(struct d3dx9_base_effect *base, debugstr_a(skip_constants[i]), j); HeapFree(GetProcessHeap(), 0, skip_constants_buffer); HeapFree(GetProcessHeap(), 0, skip_constants); - d3dx9_base_effect_cleanup(effect); return D3DERR_INVALIDCALL; } }

1 0

Piotr Caban : kernel32: Restore C locale for LC_CTYPE category.
by Alexandre Julliard 18 Mar '19

18 Mar '19

Module: wine Branch: master Commit: c8e195e1797bd513c91927743b3ed38fdfa86c2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8e195e1797bd513c9192774… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 18 20:03:40 2019 +0100 kernel32: Restore C locale for LC_CTYPE category. In tr_TR.UTF-8 locale tolower('I') != 'i' (this is not a bug in glibc, tolower('I') is suppossed to return dotless i that is 2-byte long). Because of that strcasemp("i", "I") returns that the strings are different. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index eedb0be..ed7543e 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -4226,6 +4226,7 @@ void LOCALE_Init(void) mac_cptable->info.codepage, unix_cp ); setlocale(LC_NUMERIC, "C"); /* FIXME: oleaut32 depends on this */ + setlocale(LC_CTYPE, "C"); /* Fixes issues when tr_TR.UTF-8 locale is used */ } static HANDLE NLS_RegOpenKey(HANDLE hRootKey, LPCWSTR szKeyName)

1 0

Ken Thomases : msvcp90: Fix vtable alignment on macOS and certain non-x86 architectures.
by Alexandre Julliard 18 Mar '19

18 Mar '19

Module: wine Branch: master Commit: 849daa9c8573f2489a9936b65288ae7ad0a78953 URL: https://source.winehq.org/git/wine.git/?a=commit;h=849daa9c8573f2489a9936b6… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Mar 18 14:21:56 2019 -0500 msvcp90: Fix vtable alignment on macOS and certain non-x86 architectures. On some platforms and architectures, the .align <n> directive aligns to 2^n bytes, not n bytes. The .balign <n> directive always aligns to n bytes. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/cxx.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/cxx.h b/dlls/msvcp90/cxx.h index 917d814..05c8776 100644 --- a/dlls/msvcp90/cxx.h +++ b/dlls/msvcp90/cxx.h @@ -45,7 +45,7 @@ #define __ASM_VTABLE(name,funcs) \ __asm__(".data\n" \ - "\t.align 8\n" \ + "\t.balign 8\n" \ "\t.quad " __ASM_NAME(#name "_rtti") "\n" \ "\t.globl " __ASM_NAME("MSVCP_" #name "_vtable") "\n" \ __ASM_NAME("MSVCP_" #name "_vtable") ":\n" \ @@ -57,7 +57,7 @@ #define __ASM_VTABLE(name,funcs) \ __asm__(".data\n" \ - "\t.align 4\n" \ + "\t.balign 4\n" \ "\t.long " __ASM_NAME(#name "_rtti") "\n" \ "\t.globl " __ASM_NAME("MSVCP_" #name "_vtable") "\n" \ __ASM_NAME("MSVCP_" #name "_vtable") ":\n" \

1 0

Ken Thomases : msvcrt: Fix vtable alignment on macOS and certain non-x86 architectures.
by Alexandre Julliard 18 Mar '19

18 Mar '19

Module: wine Branch: master Commit: d22058d1cb399af1b2fbec371671cd716e957aa0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d22058d1cb399af1b2fbec37… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Mar 18 14:21:55 2019 -0500 msvcrt: Fix vtable alignment on macOS and certain non-x86 architectures. On some platforms and architectures, the .align <n> directive aligns to 2^n bytes, not n bytes. The .balign <n> directive always aligns to n bytes. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/cxx.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/cxx.h b/dlls/msvcrt/cxx.h index 027026e..3765dc8 100644 --- a/dlls/msvcrt/cxx.h +++ b/dlls/msvcrt/cxx.h @@ -44,7 +44,7 @@ #define __ASM_VTABLE(name,funcs) \ __asm__(".data\n" \ - "\t.align 8\n" \ + "\t.balign 8\n" \ "\t.quad " __ASM_NAME(#name "_rtti") "\n" \ "\t.globl " __ASM_NAME("MSVCRT_" #name "_vtable") "\n" \ __ASM_NAME("MSVCRT_" #name "_vtable") ":\n" \ @@ -56,7 +56,7 @@ #define __ASM_VTABLE(name,funcs) \ __asm__(".data\n" \ - "\t.align 4\n" \ + "\t.balign 4\n" \ "\t.long " __ASM_NAME(#name "_rtti") "\n" \ "\t.globl " __ASM_NAME("MSVCRT_" #name "_vtable") "\n" \ __ASM_NAME("MSVCRT_" #name "_vtable") ":\n" \

1 0

Michael Stefaniuc : xaudio2_7/tests: Remove redundant not-NULL checks ( coccinellery).
by Alexandre Julliard 18 Mar '19

18 Mar '19

Module: wine Branch: master Commit: 61d825ca3ed57ddec4a07f2e62f87432386a8daf URL: https://source.winehq.org/git/wine.git/?a=commit;h=61d825ca3ed57ddec4a07f2e… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 8 21:16:53 2019 +0100 xaudio2_7/tests: Remove redundant not-NULL checks (coccinellery). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/tests/xaudio2.c | 104 ++++++++++++++++++++--------------------- 1 file changed, 50 insertions(+), 54 deletions(-) diff --git a/dlls/xaudio2_7/tests/xaudio2.c b/dlls/xaudio2_7/tests/xaudio2.c index 4ead8d8..f2bffdf 100644 --- a/dlls/xaudio2_7/tests/xaudio2.c +++ b/dlls/xaudio2_7/tests/xaudio2.c @@ -1000,28 +1000,9 @@ static void test_xapo_creation_legacy(const char *module, unsigned int version) return; } - if(pCreateFX){ - for(i = 0; i < ARRAY_SIZE(const_clsids); ++i){ - hr = pCreateFX(const_clsids[i], &fx_unk); - ok(hr == S_OK, "%s: CreateFX(%s) failed: %08x\n", module, wine_dbgstr_guid(const_clsids[i]), hr); - if(SUCCEEDED(hr)){ - IXAPO *xapo; - hr = IUnknown_QueryInterface(fx_unk, &IID_IXAPO27, (void**)&xapo); - ok(hr == S_OK, "Couldn't get IXAPO27 interface: %08x\n", hr); - if(SUCCEEDED(hr)) - IXAPO_Release(xapo); - IUnknown_Release(fx_unk); - } - - hr = CoCreateInstance(const_clsids[i], NULL, CLSCTX_INPROC_SERVER, - &IID_IUnknown, (void**)&fx_unk); - ok(hr == REGDB_E_CLASSNOTREG, "CoCreateInstance should have failed: %08x\n", hr); - if(SUCCEEDED(hr)) - IUnknown_Release(fx_unk); - } - - hr = pCreateFX(avm_clsids[version - 20], &fx_unk); - ok(hr == S_OK, "%s: CreateFX(%s) failed: %08x\n", module, wine_dbgstr_guid(avm_clsids[version - 20]), hr); + for(i = 0; i < ARRAY_SIZE(const_clsids); ++i){ + hr = pCreateFX(const_clsids[i], &fx_unk); + ok(hr == S_OK, "%s: CreateFX(%s) failed: %08x\n", module, wine_dbgstr_guid(const_clsids[i]), hr); if(SUCCEEDED(hr)){ IXAPO *xapo; hr = IUnknown_QueryInterface(fx_unk, &IID_IXAPO27, (void**)&xapo); @@ -1031,16 +1012,33 @@ static void test_xapo_creation_legacy(const char *module, unsigned int version) IUnknown_Release(fx_unk); } - hr = pCreateFX(ar_clsids[version - 20], &fx_unk); - ok(hr == S_OK, "%s: CreateFX(%s) failed: %08x\n", module, wine_dbgstr_guid(ar_clsids[version - 20]), hr); - if(SUCCEEDED(hr)){ - IXAPO *xapo; - hr = IUnknown_QueryInterface(fx_unk, &IID_IXAPO27, (void**)&xapo); - ok(hr == S_OK, "Couldn't get IXAPO27 interface: %08x\n", hr); - if(SUCCEEDED(hr)) - IXAPO_Release(xapo); + hr = CoCreateInstance(const_clsids[i], NULL, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void**)&fx_unk); + ok(hr == REGDB_E_CLASSNOTREG, "CoCreateInstance should have failed: %08x\n", hr); + if(SUCCEEDED(hr)) IUnknown_Release(fx_unk); - } + } + + hr = pCreateFX(avm_clsids[version - 20], &fx_unk); + ok(hr == S_OK, "%s: CreateFX(%s) failed: %08x\n", module, wine_dbgstr_guid(avm_clsids[version - 20]), hr); + if(SUCCEEDED(hr)){ + IXAPO *xapo; + hr = IUnknown_QueryInterface(fx_unk, &IID_IXAPO27, (void**)&xapo); + ok(hr == S_OK, "Couldn't get IXAPO27 interface: %08x\n", hr); + if(SUCCEEDED(hr)) + IXAPO_Release(xapo); + IUnknown_Release(fx_unk); + } + + hr = pCreateFX(ar_clsids[version - 20], &fx_unk); + ok(hr == S_OK, "%s: CreateFX(%s) failed: %08x\n", module, wine_dbgstr_guid(ar_clsids[version - 20]), hr); + if(SUCCEEDED(hr)){ + IXAPO *xapo; + hr = IUnknown_QueryInterface(fx_unk, &IID_IXAPO27, (void**)&xapo); + ok(hr == S_OK, "Couldn't get IXAPO27 interface: %08x\n", hr); + if(SUCCEEDED(hr)) + IXAPO_Release(xapo); + IUnknown_Release(fx_unk); } FreeLibrary(xapofxdll); @@ -1083,29 +1081,9 @@ static void test_xapo_creation_modern(const char *module) return; } - if(pCreateFX){ - for(i = 0; i < ARRAY_SIZE(const_clsids); ++i){ - hr = pCreateFX(const_clsids[i], &fx_unk, NULL, 0); - ok(hr == S_OK, "%s: CreateFX(%s) failed: %08x\n", module, wine_dbgstr_guid(const_clsids[i]), hr); - if(SUCCEEDED(hr)){ - IXAPO *xapo; - hr = IUnknown_QueryInterface(fx_unk, &IID_IXAPO, (void**)&xapo); - ok(hr == S_OK, "Couldn't get IXAPO interface: %08x\n", hr); - if(SUCCEEDED(hr)) - IXAPO_Release(xapo); - IUnknown_Release(fx_unk); - } - - hr = CoCreateInstance(const_clsids[i], NULL, CLSCTX_INPROC_SERVER, - &IID_IUnknown, (void**)&fx_unk); - ok(hr == REGDB_E_CLASSNOTREG, "CoCreateInstance should have failed: %08x\n", hr); - if(SUCCEEDED(hr)) - IUnknown_Release(fx_unk); - } - - /* test legacy CLSID */ - hr = pCreateFX(&CLSID_AudioVolumeMeter27, &fx_unk, NULL, 0); - ok(hr == S_OK, "%s: CreateFX(CLSID_AudioVolumeMeter) failed: %08x\n", module, hr); + for(i = 0; i < ARRAY_SIZE(const_clsids); ++i){ + hr = pCreateFX(const_clsids[i], &fx_unk, NULL, 0); + ok(hr == S_OK, "%s: CreateFX(%s) failed: %08x\n", module, wine_dbgstr_guid(const_clsids[i]), hr); if(SUCCEEDED(hr)){ IXAPO *xapo; hr = IUnknown_QueryInterface(fx_unk, &IID_IXAPO, (void**)&xapo); @@ -1114,6 +1092,24 @@ static void test_xapo_creation_modern(const char *module) IXAPO_Release(xapo); IUnknown_Release(fx_unk); } + + hr = CoCreateInstance(const_clsids[i], NULL, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void**)&fx_unk); + ok(hr == REGDB_E_CLASSNOTREG, "CoCreateInstance should have failed: %08x\n", hr); + if(SUCCEEDED(hr)) + IUnknown_Release(fx_unk); + } + + /* test legacy CLSID */ + hr = pCreateFX(&CLSID_AudioVolumeMeter27, &fx_unk, NULL, 0); + ok(hr == S_OK, "%s: CreateFX(CLSID_AudioVolumeMeter) failed: %08x\n", module, hr); + if(SUCCEEDED(hr)){ + IXAPO *xapo; + hr = IUnknown_QueryInterface(fx_unk, &IID_IXAPO, (void**)&xapo); + ok(hr == S_OK, "Couldn't get IXAPO interface: %08x\n", hr); + if(SUCCEEDED(hr)) + IXAPO_Release(xapo); + IUnknown_Release(fx_unk); } pCAVM = (void*)GetProcAddress(xaudio2dll, "CreateAudioVolumeMeter");

1 0

Michael Stefaniuc : d3dx9: Pass a struct d3dx_effect to d3dx9_base_effect_cleanup().
by Alexandre Julliard 18 Mar '19

18 Mar '19

Module: wine Branch: master Commit: 2f16d2f4ca86263571797d9544a9534e8aa29c16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f16d2f4ca86263571797d95… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 15 22:39:17 2019 +0100 d3dx9: Pass a struct d3dx_effect to d3dx9_base_effect_cleanup(). 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 | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index ae577d0..51c7a37 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -683,8 +683,9 @@ static void free_technique(struct d3dx_technique *technique) technique->name = NULL; } -static void d3dx9_base_effect_cleanup(struct d3dx9_base_effect *base) +static void d3dx9_base_effect_cleanup(struct d3dx_effect *effect) { + struct d3dx9_base_effect *base = &effect->base_effect; unsigned int i; TRACE("base %p.\n", base); @@ -693,7 +694,7 @@ static void d3dx9_base_effect_cleanup(struct d3dx9_base_effect *base) if (base->parameters) { - for (i = 0; i < base->effect->parameter_count; ++i) + for (i = 0; i < effect->parameter_count; ++i) free_top_level_parameter(&base->parameters[i]); HeapFree(GetProcessHeap(), 0, base->parameters); base->parameters = NULL; @@ -707,14 +708,14 @@ static void d3dx9_base_effect_cleanup(struct d3dx9_base_effect *base) base->techniques = NULL; } - if (base->effect->objects) + if (effect->objects) { - for (i = 0; i < base->effect->object_count; ++i) + for (i = 0; i < effect->object_count; ++i) { - free_object(&base->effect->objects[i]); + free_object(&effect->objects[i]); } - HeapFree(GetProcessHeap(), 0, base->effect->objects); - base->effect->objects = NULL; + heap_free(effect->objects); + effect->objects = NULL; } } @@ -722,7 +723,7 @@ static void free_effect(struct d3dx_effect *effect) { TRACE("Free effect %p\n", effect); - d3dx9_base_effect_cleanup(&effect->base_effect); + d3dx9_base_effect_cleanup(effect); if (effect->pool) { @@ -6302,7 +6303,7 @@ static HRESULT d3dx9_base_effect_init(struct d3dx9_base_effect *base, debugstr_a(skip_constants[i]), j); HeapFree(GetProcessHeap(), 0, skip_constants_buffer); HeapFree(GetProcessHeap(), 0, skip_constants); - d3dx9_base_effect_cleanup(base); + d3dx9_base_effect_cleanup(effect); return D3DERR_INVALIDCALL; } }

1 0

Michael Stefaniuc : d3dx9: Pass a struct d3dx_effect to get_annotation_by_name().
by Alexandre Julliard 18 Mar '19

18 Mar '19

Module: wine Branch: master Commit: 7738fec56b8d55f006babf4d9fb7a1b79cf363af URL: https://source.winehq.org/git/wine.git/?a=commit;h=7738fec56b8d55f006babf4d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 15 22:39:16 2019 +0100 d3dx9: Pass a struct d3dx_effect to get_annotation_by_name(). 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 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index a45f289..ae577d0 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -854,9 +854,10 @@ static struct d3dx_parameter *get_parameter_element_by_name(struct d3dx9_base_ef return NULL; } -static struct d3dx_parameter *get_annotation_by_name(struct d3dx9_base_effect *base, - unsigned int count, struct d3dx_parameter *annotations, const char *name) +static struct d3dx_parameter *get_annotation_by_name(struct d3dx_effect *effect, unsigned int count, + struct d3dx_parameter *annotations, const char *name) { + struct d3dx9_base_effect *base = &effect->base_effect; UINT i, length; struct d3dx_parameter *temp_parameter; const char *part; @@ -2251,7 +2252,7 @@ static D3DXHANDLE WINAPI d3dx_effect_GetAnnotationByName(ID3DXEffect *iface, D3D annotation_count = get_annotation_from_object(effect, object, &annotations); - annotation = get_annotation_by_name(&effect->base_effect, annotation_count, annotations, name); + annotation = get_annotation_by_name(effect, annotation_count, annotations, name); if (annotation) { TRACE("Returning parameter %p\n", annotation);

1 0

Michael Stefaniuc : d3dx9: Pass a struct d3dx_effect to add_param_to_tree( ).
by Alexandre Julliard 18 Mar '19

18 Mar '19

Module: wine Branch: master Commit: 62a26e1ad0e18b8de8ac8154cbce6c6f66f2249b URL: https://source.winehq.org/git/wine.git/?a=commit;h=62a26e1ad0e18b8de8ac8154… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 15 22:39:15 2019 +0100 d3dx9: Pass a struct d3dx_effect to add_param_to_tree(). 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 e20c9c5..a45f289 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -5072,7 +5072,7 @@ static int param_rb_compare(const void *key, const struct wine_rb_entry *entry) return strcmp(name, param->full_name); } -static void add_param_to_tree(struct d3dx9_base_effect *base, struct d3dx_parameter *param, +static void add_param_to_tree(struct d3dx_effect *effect, struct d3dx_parameter *param, struct d3dx_parameter *parent, char separator, unsigned int element) { const char *parent_name = parent ? parent->full_name : NULL; @@ -5127,18 +5127,18 @@ static void add_param_to_tree(struct d3dx9_base_effect *base, struct d3dx_parame memcpy(param->full_name, param->name, len); } TRACE("Full name is %s.\n", param->full_name); - wine_rb_put(&base->param_tree, param->full_name, &param->rb_entry); + wine_rb_put(&effect->base_effect.param_tree, param->full_name, &param->rb_entry); if (is_top_level_parameter(param)) for (i = 0; i < param->top_level_param->annotation_count; ++i) - add_param_to_tree(base, &param->top_level_param->annotations[i], param, '@', 0); + add_param_to_tree(effect, &param->top_level_param->annotations[i], param, '@', 0); if (param->element_count) for (i = 0; i < param->element_count; ++i) - add_param_to_tree(base, &param->members[i], param, '[', i); + add_param_to_tree(effect, &param->members[i], param, '[', i); else for (i = 0; i < param->member_count; ++i) - add_param_to_tree(base, &param->members[i], param, '.', 0); + add_param_to_tree(effect, &param->members[i], param, '.', 0); } static HRESULT d3dx_parse_effect_typedef(struct d3dx_effect *effect, struct d3dx_parameter *param, @@ -6013,7 +6013,7 @@ static HRESULT d3dx_parse_effect(struct d3dx_effect *effect, const char *data, U } walk_parameter_tree(&base->parameters[i].param, param_set_top_level_param, &base->parameters[i]); - add_param_to_tree(base, &base->parameters[i].param, NULL, 0, 0); + add_param_to_tree(effect, &base->parameters[i].param, NULL, 0, 0); } }

1 0

Michael Stefaniuc : d3dx9: Pass a struct d3dx_effect to the version helpers.
by Alexandre Julliard 18 Mar '19

18 Mar '19

Module: wine Branch: master Commit: f9351bae3e22ac500c237ab5a0b0556561e913d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9351bae3e22ac500c237ab5… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 15 22:39:14 2019 +0100 d3dx9: Pass a struct d3dx_effect to the version helpers. 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 | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 7196546..e20c9c5 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1143,14 +1143,14 @@ static BOOL walk_parameter_tree(struct d3dx_parameter *param, walk_parameter_dep return FALSE; } -static ULONG64 *get_version_counter_ptr(struct d3dx9_base_effect *base) +static ULONG64 *get_version_counter_ptr(struct d3dx_effect *effect) { - return base->pool ? &base->pool->version_counter : &base->version_counter; + return effect->base_effect.pool ? &effect->base_effect.pool->version_counter : &effect->base_effect.version_counter; } -static ULONG64 next_effect_update_version(struct d3dx9_base_effect *base) +static ULONG64 next_effect_update_version(struct d3dx_effect *effect) { - return next_update_version(get_version_counter_ptr(base)); + return next_update_version(get_version_counter_ptr(effect)); } static void set_dirty(struct d3dx_parameter *param) @@ -1577,7 +1577,7 @@ static HRESULT d3dx9_apply_pass_states(struct d3dx_effect *effect, struct d3dx_p unsigned int i; HRESULT ret; HRESULT hr; - ULONG64 new_update_version = next_effect_update_version(&effect->base_effect); + ULONG64 new_update_version = next_effect_update_version(effect); TRACE("effect %p, pass %p, state_count %u.\n", effect, pass, pass->state_count); @@ -5745,7 +5745,7 @@ static HRESULT d3dx_parse_array_selector(struct d3dx_effect *effect, struct d3dx FIXME("Unaligned string_size %u.\n", string_size); if (FAILED(ret = d3dx_create_param_eval(base, (DWORD *)(ptr + string_size) + 1, object->size - (string_size + sizeof(DWORD)), D3DXPT_INT, &param->param_eval, - get_version_counter_ptr(base), NULL, 0))) + get_version_counter_ptr(effect), NULL, 0))) return ret; ret = D3D_OK; param = state->referenced_param; @@ -5765,7 +5765,7 @@ static HRESULT d3dx_parse_array_selector(struct d3dx_effect *effect, struct d3dx TRACE("Creating preshader for object %u.\n", param->members[i].object_id); object = &effect->objects[param->members[i].object_id]; if (FAILED(ret = d3dx_create_param_eval(base, object->data, object->size, param->type, - &param->members[i].param_eval, get_version_counter_ptr(base), + &param->members[i].param_eval, get_version_counter_ptr(effect), skip_constants, skip_constants_count))) break; } @@ -5884,7 +5884,7 @@ static HRESULT d3dx_parse_resource(struct d3dx_effect *effect, const char *data, if (FAILED(hr = d3dx9_create_object(base, object))) return hr; if (FAILED(hr = d3dx_create_param_eval(base, object->data, object->size, param->type, - &param->param_eval, get_version_counter_ptr(base), + &param->param_eval, get_version_counter_ptr(effect), skip_constants, skip_constants_count))) return hr; } @@ -5898,7 +5898,7 @@ static HRESULT d3dx_parse_resource(struct d3dx_effect *effect, const char *data, if (FAILED(hr = d3dx9_copy_data(effect, param->object_id, ptr))) return hr; if (FAILED(hr = d3dx_create_param_eval(base, object->data, object->size, param->type, - &param->param_eval, get_version_counter_ptr(base), NULL, 0))) + &param->param_eval, get_version_counter_ptr(effect), NULL, 0))) return hr; break; @@ -5927,7 +5927,7 @@ static HRESULT d3dx_parse_resource(struct d3dx_effect *effect, const char *data, if (!refpar->param_eval) { if (FAILED(hr = d3dx_create_param_eval(base, refobj->data, refobj->size, - refpar->type, &refpar->param_eval, get_version_counter_ptr(base), + refpar->type, &refpar->param_eval, get_version_counter_ptr(effect), skip_constants, skip_constants_count))) return hr; }

1 0

Michael Stefaniuc : d3dx9: Pass a struct d3dx_effect to get_valid_pass().
by Alexandre Julliard 18 Mar '19

18 Mar '19

Module: wine Branch: master Commit: 956b30dbf3899e3cd0ccccc17d99f01047caf634 URL: https://source.winehq.org/git/wine.git/?a=commit;h=956b30dbf3899e3cd0ccccc1… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 15 22:39:13 2019 +0100 d3dx9: Pass a struct d3dx_effect to get_valid_pass(). 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 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 3d90cc6..7196546 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -483,8 +483,9 @@ static struct d3dx_technique *get_valid_technique(struct d3dx_effect *effect, D3 return get_technique_by_name(effect, technique); } -static struct d3dx_pass *get_valid_pass(struct d3dx9_base_effect *base, D3DXHANDLE pass) +static struct d3dx_pass *get_valid_pass(struct d3dx_effect *effect, D3DXHANDLE pass) { + struct d3dx9_base_effect *base = &effect->base_effect; unsigned int i, k; for (i = 0; i < base->technique_count; ++i) @@ -1087,9 +1088,8 @@ static HRESULT d3dx9_get_param_value_ptr(struct d3dx_pass *pass, struct d3dx_sta static unsigned int get_annotation_from_object(struct d3dx_effect *effect, D3DXHANDLE object, struct d3dx_parameter **annotations) { - struct d3dx9_base_effect *base = &effect->base_effect; struct d3dx_parameter *param = get_valid_parameter(effect, object); - struct d3dx_pass *pass = get_valid_pass(base, object); + struct d3dx_pass *pass = get_valid_pass(effect, object); struct d3dx_technique *technique = get_valid_technique(effect, object); if (pass) @@ -1918,7 +1918,7 @@ static HRESULT WINAPI d3dx_effect_GetTechniqueDesc(ID3DXEffect *iface, D3DXHANDL static HRESULT WINAPI d3dx_effect_GetPassDesc(ID3DXEffect *iface, D3DXHANDLE pass_handle, D3DXPASS_DESC *desc) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); - struct d3dx_pass *pass = get_valid_pass(&effect->base_effect, pass_handle); + struct d3dx_pass *pass = get_valid_pass(effect, pass_handle); unsigned int i; TRACE("iface %p, pass %p, desc %p.\n", iface, pass, desc);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2019