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

[PATCH] mshtml.idl: Add DispHTMLW3CComputedStyle declaration.
by Jacek Caban 21 Mar '19

21 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/mshtmdid.h | 141 +++ include/mshtml.idl | 2230 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 2366 insertions(+), 5 deletions(-)

1 0

[PATCH] ntoskrnl.exe: Implement ObGetObjectType.
by Jacek Caban 21 Mar '19

21 Mar '19

From: Derek Lesho <dereklesho52(a)gmail.com> Signed-off-by: Derek Lesho <dereklesho52(a)Gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 19 +++++++++---------- dlls/ntoskrnl.exe/tests/driver.c | 12 ++++++++++++ 2 files changed, 21 insertions(+), 10 deletions(-)

2 1

[PATCH 5/5] mshtml: Correctly handle document not attached to window in IHTMLDocument2::put_URL.
by Jacek Caban 21 Mar '19

21 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmldoc.c | 10 +++++----- dlls/mshtml/tests/dom.c | 6 ++++++ 2 files changed, 11 insertions(+), 5 deletions(-)

2 2

[PATCH 1/2] d3dx9: Simplify effect cleanup.
by Matteo Bruni 21 Mar '19

21 Mar '19

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- Michael, let me know if these two patches conflict badly with your pending stuff, I'm happy to defer to a later point if needed. dlls/d3dx9_36/effect.c | 39 ++++++++++----------------------------- 1 file changed, 10 insertions(+), 29 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 0c28fae1ec5..d89c5d72b0a 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -677,11 +677,11 @@ static void free_technique(struct d3dx_technique *technique) technique->name = NULL; } -static void d3dx9_base_effect_cleanup(struct d3dx_effect *effect) +static void d3dx_effect_cleanup(struct d3dx_effect *effect) { unsigned int i; - TRACE("Effect %p.\n", effect); + TRACE("effect %p.\n", effect); heap_free(effect->full_name_tmp); @@ -690,7 +690,6 @@ static void d3dx9_base_effect_cleanup(struct d3dx_effect *effect) for (i = 0; i < effect->parameter_count; ++i) free_top_level_parameter(&effect->parameters[i]); heap_free(effect->parameters); - effect->parameters = NULL; } if (effect->techniques) @@ -698,37 +697,23 @@ static void d3dx9_base_effect_cleanup(struct d3dx_effect *effect) for (i = 0; i < effect->technique_count; ++i) free_technique(&effect->techniques[i]); heap_free(effect->techniques); - effect->techniques = NULL; } if (effect->objects) { for (i = 0; i < effect->object_count; ++i) - { free_object(&effect->objects[i]); - } heap_free(effect->objects); - effect->objects = NULL; } -} - -static void free_effect(struct d3dx_effect *effect) -{ - TRACE("Free effect %p\n", effect); - - d3dx9_base_effect_cleanup(effect); if (effect->pool) - { effect->pool->lpVtbl->Release(effect->pool); - } if (effect->manager) - { IUnknown_Release(effect->manager); - } IDirect3DDevice9_Release(effect->device); + heap_free(effect); } static void get_vector(struct d3dx_parameter *param, D3DXVECTOR4 *vector) @@ -1822,18 +1807,15 @@ static ULONG WINAPI d3dx_effect_AddRef(ID3DXEffect *iface) static ULONG WINAPI d3dx_effect_Release(ID3DXEffect *iface) { - struct d3dx_effect *This = impl_from_ID3DXEffect(iface); - ULONG ref = InterlockedDecrement(&This->ref); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + ULONG refcount = InterlockedDecrement(&effect->ref); - TRACE("(%p)->(): Release from %u\n", This, ref + 1); + TRACE("%p decreasing refcount to %u.\n", effect, refcount); - if (!ref) - { - free_effect(This); - HeapFree(GetProcessHeap(), 0, This); - } + if (!refcount) + d3dx_effect_cleanup(effect); - return ref; + return refcount; } /*** ID3DXBaseEffect methods ***/ @@ -6330,7 +6312,6 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev error_messages, pool_impl, skip_constants))) { FIXME("Failed to parse effect, hr %#x.\n", hr); - free_effect(effect); return hr; } @@ -6378,7 +6359,7 @@ HRESULT WINAPI D3DXCreateEffectEx(struct IDirect3DDevice9 *device, const void *s if (FAILED(hr)) { WARN("Failed to create effect object.\n"); - HeapFree(GetProcessHeap(), 0, object); + d3dx_effect_cleanup(object); return hr; } -- 2.19.2

2 3

[PATCH] msvcr120: Add [to]wctrans.
by Gijs Vermeulen 21 Mar '19

21 Mar '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46848 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- .../api-ms-win-crt-convert-l1-1-0.spec | 2 +- .../api-ms-win-crt-string-l1-1-0.spec | 2 +- dlls/msvcr120/msvcr120.spec | 4 +- dlls/msvcr120/tests/msvcr120.c | 37 +++++++++++++++++++ dlls/msvcr120_app/msvcr120_app.spec | 4 +- dlls/msvcrt/locale.c | 27 ++++++++++++++ dlls/msvcrt/msvcrt.h | 3 ++ dlls/ucrtbase/ucrtbase.spec | 4 +- 8 files changed, 75 insertions(+), 8 deletions(-) diff --git a/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec b/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec index a72ec0a470..1b877e3872 100644 --- a/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec +++ b/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec @@ -119,4 +119,4 @@ @ cdecl wctob(long) ucrtbase.wctob @ cdecl wctomb(ptr long) ucrtbase.wctomb @ cdecl wctomb_s(ptr ptr long long) ucrtbase.wctomb_s -@ stub wctrans +@ cdecl wctrans(str) ucrtbase.wctrans diff --git a/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec b/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec index 0a61576bb6..78544371d2 100644 --- a/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec +++ b/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec @@ -151,7 +151,7 @@ @ cdecl strxfrm(ptr str long) ucrtbase.strxfrm @ cdecl tolower(long) ucrtbase.tolower @ cdecl toupper(long) ucrtbase.toupper -@ stub towctrans +@ cdecl towctrans(long long) ucrtbase.towctrans @ cdecl towlower(long) ucrtbase.towlower @ cdecl towupper(long) ucrtbase.towupper @ cdecl wcscat(wstr wstr) ucrtbase.wcscat diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 0e3d7bbc37..b4a0d7e6b0 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2414,7 +2414,7 @@ @ cdecl tmpnam_s(ptr long) MSVCRT_tmpnam_s @ cdecl tolower(long) MSVCRT_tolower @ cdecl toupper(long) MSVCRT_toupper -@ stub towctrans +@ cdecl towctrans(long long) MSVCR120_towctrans @ cdecl towlower(long) MSVCRT_towlower @ cdecl towupper(long) MSVCRT_towupper @ cdecl trunc(double) MSVCR120_trunc @@ -2486,7 +2486,7 @@ @ cdecl wctob(long) MSVCRT_wctob @ cdecl wctomb(ptr long) MSVCRT_wctomb @ cdecl wctomb_s(ptr ptr long long) MSVCRT_wctomb_s -@ stub wctrans +@ cdecl wctrans(str) MSVCR120_wctrans @ cdecl wctype(str) @ cdecl wmemcpy_s(ptr long ptr long) @ cdecl wmemmove_s(ptr long ptr long) diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index 3077a18c1e..be5df27e93 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -23,6 +23,7 @@ #include <stdio.h> #include <float.h> #include <limits.h> +#include <wctype.h> #include <windef.h> #include <winbase.h> @@ -205,6 +206,8 @@ static double (__cdecl *p_creal)(_Dcomplex); static double (__cdecl *p_nexttoward)(double, double); static float (__cdecl *p_nexttowardf)(float, double); static double (__cdecl *p_nexttowardl)(double, double); +static wctrans_t (__cdecl *p_wctrans)(const char*); +static wint_t (__cdecl *p_towctrans)(wint_t, wctrans_t); /* make sure we use the correct errno */ #undef errno @@ -268,6 +271,8 @@ static BOOL init(void) SET(p_nexttoward, "nexttoward"); SET(p_nexttowardf, "nexttowardf"); SET(p_nexttowardl, "nexttowardl"); + SET(p_wctrans, "wctrans"); + SET(p_towctrans, "towctrans"); if(sizeof(void*) == 8) { /* 64-bit initialization */ SET(p_critical_section_ctor, "??0critical_section(a)Concurrency@@QEAA(a)XZ"); @@ -1052,6 +1057,37 @@ static void test_nexttoward(void) ok(e == -1, "Expected no error, got %d.\n", e); } +static void test_towctrans(void) +{ + wchar_t ret; + + ret = p_wctrans("tolower"); + ok(ret == 2, "wctrans returned %d, expected 2\n", ret); + ret = p_wctrans("toupper"); + ok(ret == 1, "wctrans returned %d, expected 1\n", ret); + ret = p_wctrans("toLower"); + ok(ret == 0, "wctrans returned %d, expected 0\n", ret); + ret = p_wctrans(""); + ok(ret == 0, "wctrans returned %d, expected 0\n", ret); + if(0) { /* crashes on windows */ + ret = p_wctrans(NULL); + ok(ret == 0, "wctrans returned %d, expected 0\n", ret); + } + + ret = p_towctrans('t', 2); + ok(ret == 't', "towctrans('t', 2) returned %c, expected t\n", ret); + ret = p_towctrans('T', 2); + ok(ret == 't', "towctrans('T', 2) returned %c, expected t\n", ret); + ret = p_towctrans('T', 0); + ok(ret == 't', "towctrans('T', 0) returned %c, expected t\n", ret); + ret = p_towctrans('T', 3); + ok(ret == 't', "towctrans('T', 3) returned %c, expected t\n", ret); + ret = p_towctrans('t', 1); + ok(ret == 'T', "towctrans('t', 1) returned %c, expected T\n", ret); + ret = p_towctrans('T', 1); + ok(ret == 'T', "towctrans('T', 1) returned %c, expected T\n", ret); +} + START_TEST(msvcr120) { if (!init()) return; @@ -1072,4 +1108,5 @@ START_TEST(msvcr120) test_vsscanf(); test__Cbuild(); test_nexttoward(); + test_towctrans(); } diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 5b1549b35b..2bb377bf37 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -2076,7 +2076,7 @@ @ cdecl tmpnam_s(ptr long) msvcr120.tmpnam_s @ cdecl tolower(long) msvcr120.tolower @ cdecl toupper(long) msvcr120.toupper -@ stub towctrans +@ cdecl towctrans(long long) msvcr120.towctrans @ cdecl towlower(long) msvcr120.towlower @ cdecl towupper(long) msvcr120.towupper @ cdecl trunc(double) msvcr120.trunc @@ -2148,7 +2148,7 @@ @ cdecl wctob(long) msvcr120.wctob @ cdecl wctomb(ptr long) msvcr120.wctomb @ cdecl wctomb_s(ptr ptr long long) msvcr120.wctomb_s -@ stub wctrans +@ cdecl wctrans(str) msvcr120.wctrans @ cdecl wctype(str) msvcr120.wctype @ cdecl wmemcpy_s(ptr long ptr long) msvcr120.wmemcpy_s @ cdecl wmemmove_s(ptr long ptr long) msvcr120.wmemmove_s diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index a1e827d9e2..4282fed7ff 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -2069,3 +2069,30 @@ BOOL msvcrt_init_locale(void) _setmbcp(_MB_CP_ANSI); return TRUE; } + +#if _MSVCR_VER >= 120 +/********************************************************************* + * wctrans (MSVCR120.@) + */ +MSVCRT_wctrans_t CDECL MSVCR120_wctrans(const char *property) +{ + static const char str_tolower[] = "tolower"; + static const char str_toupper[] = "toupper"; + + if(!strcmp(property, str_tolower)) + return 2; + if(!strcmp(property, str_toupper)) + return 1; + return 0; +} + +/********************************************************************* + * towctrans (MSVCR120.@) + */ +MSVCRT_wint_t CDECL MSVCR120_towctrans(MSVCRT_wint_t c, MSVCRT_wctrans_t category) +{ + if(category == 1) + return MSVCRT__towupper_l(c, NULL); + return MSVCRT__towlower_l(c, NULL); +} +#endif diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 8df8e3babe..ed12deeaee 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -63,6 +63,7 @@ typedef unsigned char MSVCRT_bool; typedef unsigned short MSVCRT_wchar_t; typedef unsigned short MSVCRT_wint_t; +typedef unsigned short MSVCRT_wctrans_t; typedef unsigned short MSVCRT_wctype_t; typedef unsigned short MSVCRT__ino_t; typedef unsigned int MSVCRT__fsize_t; @@ -1145,6 +1146,8 @@ void __cdecl MSVCRT__invalid_parameter(const MSVCRT_wchar_t *expr, const MSVCRT_ const MSVCRT_wchar_t *file, unsigned int line, MSVCRT_uintptr_t arg); int __cdecl MSVCRT__toupper_l(int,MSVCRT__locale_t); int __cdecl MSVCRT__tolower_l(int,MSVCRT__locale_t); +int __cdecl MSVCRT__towupper_l(MSVCRT_wint_t,MSVCRT__locale_t); +int __cdecl MSVCRT__towlower_l(MSVCRT_wint_t,MSVCRT__locale_t); int __cdecl MSVCRT__strnicmp(const char*, const char*, MSVCRT_size_t); int __cdecl MSVCRT__strnicoll_l(const char*, const char*, MSVCRT_size_t, MSVCRT__locale_t); int __cdecl MSVCRT__strncoll_l(const char*, const char*, MSVCRT_size_t, MSVCRT__locale_t); diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 770dd4faf9..544ebf8c92 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2543,7 +2543,7 @@ @ cdecl tmpnam_s(ptr long) MSVCRT_tmpnam_s @ cdecl tolower(long) MSVCRT_tolower @ cdecl toupper(long) MSVCRT_toupper -@ stub towctrans +@ cdecl towctrans(long long) MSVCR120_towctrans @ cdecl towlower(long) MSVCRT_towlower @ cdecl towupper(long) MSVCRT_towupper @ cdecl trunc(double) MSVCR120_trunc @@ -2593,7 +2593,7 @@ @ cdecl wctob(long) MSVCRT_wctob @ cdecl wctomb(ptr long) MSVCRT_wctomb @ cdecl wctomb_s(ptr ptr long long) MSVCRT_wctomb_s -@ stub wctrans +@ cdecl wctrans(str) MSVCR120_wctrans @ cdecl wctype(str) @ cdecl wmemcpy_s(ptr long ptr long) @ cdecl wmemmove_s(ptr long ptr long) -- 2.21.0

2 1

[PATCH 6/6] d3dx9: Move techniques out of struct d3dx9_base_effect
by Michael Stefaniuc 21 Mar '19

21 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 63 +++++++++++++++++++----------------------- 1 file changed, 28 insertions(+), 35 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 53317a066b..0c28fae1ec 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -152,8 +152,6 @@ struct d3dx9_base_effect { struct d3dx_effect *effect; - struct d3dx_technique *techniques; - struct d3dx_effect_pool *pool; DWORD flags; @@ -170,6 +168,7 @@ struct d3dx_effect unsigned int technique_count; unsigned int object_count; struct d3dx_top_level_parameter *parameters; + struct d3dx_technique *techniques; struct d3dx_object *objects; struct wine_rb_tree param_tree; char *full_name_tmp; @@ -453,15 +452,14 @@ static inline D3DXHANDLE get_pass_handle(struct d3dx_pass *pass) static struct d3dx_technique *get_technique_by_name(struct d3dx_effect *effect, const char *name) { - struct d3dx9_base_effect *base = &effect->base_effect; unsigned int i; if (!name) return NULL; for (i = 0; i < effect->technique_count; ++i) { - if (!strcmp(base->techniques[i].name, name)) - return &base->techniques[i]; + if (!strcmp(effect->techniques[i].name, name)) + return &effect->techniques[i]; } return NULL; @@ -469,13 +467,12 @@ static struct d3dx_technique *get_technique_by_name(struct d3dx_effect *effect, static struct d3dx_technique *get_valid_technique(struct d3dx_effect *effect, D3DXHANDLE technique) { - struct d3dx9_base_effect *base = &effect->base_effect; unsigned int i; for (i = 0; i < effect->technique_count; ++i) { - if (get_technique_handle(&base->techniques[i]) == technique) - return &base->techniques[i]; + if (get_technique_handle(&effect->techniques[i]) == technique) + return &effect->techniques[i]; } return get_technique_by_name(effect, technique); @@ -483,12 +480,11 @@ static struct d3dx_technique *get_valid_technique(struct d3dx_effect *effect, D3 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 < effect->technique_count; ++i) { - struct d3dx_technique *technique = &base->techniques[i]; + struct d3dx_technique *technique = &effect->techniques[i]; for (k = 0; k < technique->pass_count; ++k) { @@ -683,10 +679,9 @@ static void free_technique(struct d3dx_technique *technique) 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); + TRACE("Effect %p.\n", effect); heap_free(effect->full_name_tmp); @@ -698,12 +693,12 @@ static void d3dx9_base_effect_cleanup(struct d3dx_effect *effect) effect->parameters = NULL; } - if (base->techniques) + if (effect->techniques) { for (i = 0; i < effect->technique_count; ++i) - free_technique(&base->techniques[i]); - HeapFree(GetProcessHeap(), 0, base->techniques); - base->techniques = NULL; + free_technique(&effect->techniques[i]); + heap_free(effect->techniques); + effect->techniques = NULL; } if (effect->objects) @@ -1897,7 +1892,7 @@ static HRESULT WINAPI d3dx_effect_GetTechniqueDesc(ID3DXEffect *iface, D3DXHANDL D3DXTECHNIQUE_DESC *desc) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); - struct d3dx_technique *tech = technique ? get_valid_technique(effect, technique) : &effect->base_effect.techniques[0]; + struct d3dx_technique *tech = technique ? get_valid_technique(effect, technique) : &effect->techniques[0]; TRACE("iface %p, technique %p, desc %p.\n", iface, technique, desc); @@ -2127,9 +2122,9 @@ static D3DXHANDLE WINAPI d3dx_effect_GetTechnique(ID3DXEffect *iface, UINT index return NULL; } - TRACE("Returning technique %p.\n", &effect->base_effect.techniques[index]); + TRACE("Returning technique %p.\n", &effect->techniques[index]); - return get_technique_handle(&effect->base_effect.techniques[index]); + return get_technique_handle(&effect->techniques[index]); } static D3DXHANDLE WINAPI d3dx_effect_GetTechniqueByName(ID3DXEffect *iface, const char *name) @@ -3647,7 +3642,6 @@ static HRESULT WINAPI d3dx_effect_FindNextValidTechnique(ID3DXEffect *iface, D3D D3DXHANDLE *next_technique) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); - struct d3dx9_base_effect *base = &effect->base_effect; struct d3dx_technique *prev_tech, *tech; unsigned int i; @@ -3660,7 +3654,7 @@ static HRESULT WINAPI d3dx_effect_FindNextValidTechnique(ID3DXEffect *iface, D3D for (i = 0; i < effect->technique_count; ++i) { - tech = &base->techniques[i]; + tech = &effect->techniques[i]; if (tech == prev_tech) { ++i; @@ -3675,7 +3669,7 @@ static HRESULT WINAPI d3dx_effect_FindNextValidTechnique(ID3DXEffect *iface, D3D for (; i < effect->technique_count; ++i) { - tech = &base->techniques[i]; + tech = &effect->techniques[i]; if (SUCCEEDED(d3dx_effect_ValidateTechnique(iface, get_technique_handle(tech)))) { *next_technique = get_technique_handle(tech); @@ -3683,7 +3677,7 @@ static HRESULT WINAPI d3dx_effect_FindNextValidTechnique(ID3DXEffect *iface, D3D } } - *next_technique = get_technique_handle(&base->techniques[0]); + *next_technique = get_technique_handle(&effect->techniques[0]); return S_FALSE; } @@ -5774,7 +5768,6 @@ static HRESULT d3dx_parse_array_selector(struct d3dx_effect *effect, struct d3dx static HRESULT d3dx_parse_resource(struct d3dx_effect *effect, const char *data, const char **ptr, const char **skip_constants, unsigned int skip_constants_count) { - struct d3dx9_base_effect *base = &effect->base_effect; DWORD technique_index; DWORD index, state_index, usage, element_index; struct d3dx_state *state; @@ -5842,7 +5835,7 @@ static HRESULT d3dx_parse_resource(struct d3dx_effect *effect, const char *data, return E_FAIL; } - technique = &base->techniques[technique_index]; + technique = &effect->techniques[technique_index]; if (index >= technique->pass_count) { FIXME("Index out of bounds: index %u >= pass_count %u\n", index, technique->pass_count); @@ -6015,8 +6008,8 @@ static HRESULT d3dx_parse_effect(struct d3dx_effect *effect, const char *data, U if (effect->technique_count) { - base->techniques = heap_alloc_zero(sizeof(*base->techniques) * effect->technique_count); - if (!base->techniques) + effect->techniques = heap_alloc_zero(sizeof(*effect->techniques) * effect->technique_count); + if (!effect->techniques) { ERR("Out of memory.\n"); hr = E_OUTOFMEMORY; @@ -6026,7 +6019,7 @@ static HRESULT d3dx_parse_effect(struct d3dx_effect *effect, const char *data, U for (i = 0; i < effect->technique_count; ++i) { TRACE("Parsing technique %u.\n", i); - hr = d3dx_parse_effect_technique(effect, &base->techniques[i], data, &ptr, effect->objects); + hr = d3dx_parse_effect_technique(effect, &effect->techniques[i], data, &ptr, effect->objects); if (hr != D3D_OK) { WARN("Failed to parse technique %u.\n", i); @@ -6081,12 +6074,12 @@ static HRESULT d3dx_parse_effect(struct d3dx_effect *effect, const char *data, U err_out: - if (base->techniques) + if (effect->techniques) { for (i = 0; i < effect->technique_count; ++i) - free_technique(&base->techniques[i]); - HeapFree(GetProcessHeap(), 0, base->techniques); - base->techniques = NULL; + free_technique(&effect->techniques[i]); + heap_free(effect->techniques); + effect->techniques = NULL; } if (effect->parameters) @@ -6288,7 +6281,7 @@ static HRESULT d3dx9_base_effect_init(struct d3dx_effect *effect, const char *da { for (j = 0; j < effect->technique_count; ++j) { - if (is_parameter_used(param, &base->techniques[j])) + if (is_parameter_used(param, &effect->techniques[j])) { WARN("skip_constants parameter %s is used in technique %u.\n", debugstr_a(skip_constants[i]), j); @@ -6342,9 +6335,9 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev } /* initialize defaults - check because of unsupported ascii effects */ - if (effect->base_effect.techniques) + if (effect->techniques) { - effect->active_technique = &effect->base_effect.techniques[0]; + effect->active_technique = &effect->techniques[0]; effect->active_pass = NULL; } -- 2.20.1

2 1

[PATCH 5/6] d3dx9: Move parameters out of struct d3dx9_base_effect
by Michael Stefaniuc 21 Mar '19

21 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 53 ++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 28 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 17d97bb199..53317a066b 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_top_level_parameter *parameters; struct d3dx_technique *techniques; struct d3dx_effect_pool *pool; @@ -170,6 +169,7 @@ struct d3dx_effect unsigned int parameter_count; unsigned int technique_count; unsigned int object_count; + struct d3dx_top_level_parameter *parameters; struct d3dx_object *objects; struct wine_rb_tree param_tree; char *full_name_tmp; @@ -690,12 +690,12 @@ static void d3dx9_base_effect_cleanup(struct d3dx_effect *effect) heap_free(effect->full_name_tmp); - if (base->parameters) + if (effect->parameters) { for (i = 0; i < effect->parameter_count; ++i) - free_top_level_parameter(&base->parameters[i]); - HeapFree(GetProcessHeap(), 0, base->parameters); - base->parameters = NULL; + free_top_level_parameter(&effect->parameters[i]); + heap_free(effect->parameters); + effect->parameters = NULL; } if (base->techniques) @@ -1984,8 +1984,8 @@ static D3DXHANDLE WINAPI d3dx_effect_GetParameter(ID3DXEffect *iface, D3DXHANDLE { if (index < effect->parameter_count) { - TRACE("Returning parameter %p.\n", &effect->base_effect.parameters[index]); - return get_parameter_handle(&effect->base_effect.parameters[index].param); + TRACE("Returning parameter %p.\n", &effect->parameters[index]); + return get_parameter_handle(&effect->parameters[index].param); } } else @@ -2038,7 +2038,7 @@ static D3DXHANDLE WINAPI d3dx_effect_GetParameterBySemantic(ID3DXEffect *iface, { for (i = 0; i < effect->parameter_count; ++i) { - temp_param = &effect->base_effect.parameters[i].param; + temp_param = &effect->parameters[i].param; if (!temp_param->semantic) { @@ -2097,8 +2097,8 @@ static D3DXHANDLE WINAPI d3dx_effect_GetParameterElement(ID3DXEffect *iface, D3D { if (index < effect->parameter_count) { - TRACE("Returning parameter %p.\n", &effect->base_effect.parameters[index]); - return get_parameter_handle(&effect->base_effect.parameters[index].param); + TRACE("Returning parameter %p.\n", &effect->parameters[index]); + return get_parameter_handle(&effect->parameters[index].param); } } else @@ -4019,13 +4019,12 @@ static BOOL param_on_lost_device(void *data, struct d3dx_parameter *param) static HRESULT WINAPI d3dx_effect_OnLostDevice(ID3DXEffect *iface) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); - struct d3dx9_base_effect *base = &effect->base_effect; unsigned int i; TRACE("iface %p.\n", iface); for (i = 0; i < effect->parameter_count; ++i) - walk_parameter_tree(&base->parameters[i].param, param_on_lost_device, NULL); + walk_parameter_tree(&effect->parameters[i].param, param_on_lost_device, NULL); return D3D_OK; } @@ -5809,7 +5808,7 @@ static HRESULT d3dx_parse_resource(struct d3dx_effect *effect, const char *data, return E_FAIL; } - parameter = &base->parameters[index].param; + parameter = &effect->parameters[index].param; if (element_index != 0xffffffff) { if (element_index >= parameter->element_count && parameter->element_count != 0) @@ -5992,9 +5991,8 @@ static HRESULT d3dx_parse_effect(struct d3dx_effect *effect, const char *data, U wine_rb_init(&effect->param_tree, param_rb_compare); if (effect->parameter_count) { - base->parameters = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(*base->parameters) * effect->parameter_count); - if (!base->parameters) + effect->parameters = heap_alloc_zero(sizeof(*effect->parameters) * effect->parameter_count); + if (!effect->parameters) { ERR("Out of memory.\n"); hr = E_OUTOFMEMORY; @@ -6003,16 +6001,15 @@ static HRESULT d3dx_parse_effect(struct d3dx_effect *effect, const char *data, U for (i = 0; i < effect->parameter_count; ++i) { - param_set_magic_number(&base->parameters[i].param); - hr = d3dx_parse_effect_parameter(effect, &base->parameters[i], data, &ptr, effect->objects); + param_set_magic_number(&effect->parameters[i].param); + hr = d3dx_parse_effect_parameter(effect, &effect->parameters[i], data, &ptr, effect->objects); if (hr != D3D_OK) { WARN("Failed to parse parameter %u.\n", i); goto err_out; } - walk_parameter_tree(&base->parameters[i].param, param_set_top_level_param, - &base->parameters[i]); - add_param_to_tree(effect, &base->parameters[i].param, NULL, 0, 0); + walk_parameter_tree(&effect->parameters[i].param, param_set_top_level_param, &effect->parameters[i]); + add_param_to_tree(effect, &effect->parameters[i].param, NULL, 0, 0); } } @@ -6075,10 +6072,10 @@ 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, &base->parameters[i]))) + if (FAILED(hr = d3dx_pool_sync_shared_parameter(base->pool, &effect->parameters[i]))) goto err_out; - base->parameters[i].version_counter = get_version_counter_ptr(effect); - set_dirty(&base->parameters[i].param); + effect->parameters[i].version_counter = get_version_counter_ptr(effect); + set_dirty(&effect->parameters[i].param); } return D3D_OK; @@ -6092,14 +6089,14 @@ err_out: base->techniques = NULL; } - if (base->parameters) + if (effect->parameters) { for (i = 0; i < effect->parameter_count; ++i) { - free_top_level_parameter(&base->parameters[i]); + free_top_level_parameter(&effect->parameters[i]); } - HeapFree(GetProcessHeap(), 0, base->parameters); - base->parameters = NULL; + heap_free(effect->parameters); + effect->parameters = NULL; } if (effect->objects) -- 2.20.1

2 1

[PATCH 4/6] d3dx9: Use get_version_counter_ptr() instead of open coding it
by Michael Stefaniuc 21 Mar '19

21 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 30a60f46ad..17d97bb199 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -6077,9 +6077,7 @@ static HRESULT d3dx_parse_effect(struct d3dx_effect *effect, const char *data, U { if (FAILED(hr = d3dx_pool_sync_shared_parameter(base->pool, &base->parameters[i]))) goto err_out; - base->parameters[i].version_counter = base->pool - ? &base->pool->version_counter - : &base->version_counter; + base->parameters[i].version_counter = get_version_counter_ptr(effect); set_dirty(&base->parameters[i].param); } return D3D_OK; -- 2.20.1

2 1

[PATCH 3/6] d3dx9: Move technique_count out of struct d3dx9_base_effect
by Michael Stefaniuc 21 Mar '19

21 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index d2af2d5ffa..30a60f46ad 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -152,8 +152,6 @@ struct d3dx9_base_effect { struct d3dx_effect *effect; - UINT technique_count; - struct d3dx_top_level_parameter *parameters; struct d3dx_technique *techniques; @@ -170,6 +168,7 @@ struct d3dx_effect struct d3dx9_base_effect base_effect; unsigned int parameter_count; + unsigned int technique_count; unsigned int object_count; struct d3dx_object *objects; struct wine_rb_tree param_tree; @@ -459,7 +458,7 @@ static struct d3dx_technique *get_technique_by_name(struct d3dx_effect *effect, if (!name) return NULL; - for (i = 0; i < base->technique_count; ++i) + for (i = 0; i < effect->technique_count; ++i) { if (!strcmp(base->techniques[i].name, name)) return &base->techniques[i]; @@ -473,7 +472,7 @@ static struct d3dx_technique *get_valid_technique(struct d3dx_effect *effect, D3 struct d3dx9_base_effect *base = &effect->base_effect; unsigned int i; - for (i = 0; i < base->technique_count; ++i) + for (i = 0; i < effect->technique_count; ++i) { if (get_technique_handle(&base->techniques[i]) == technique) return &base->techniques[i]; @@ -487,7 +486,7 @@ static struct d3dx_pass *get_valid_pass(struct d3dx_effect *effect, D3DXHANDLE p struct d3dx9_base_effect *base = &effect->base_effect; unsigned int i, k; - for (i = 0; i < base->technique_count; ++i) + for (i = 0; i < effect->technique_count; ++i) { struct d3dx_technique *technique = &base->techniques[i]; @@ -701,7 +700,7 @@ static void d3dx9_base_effect_cleanup(struct d3dx_effect *effect) if (base->techniques) { - for (i = 0; i < base->technique_count; ++i) + for (i = 0; i < effect->technique_count; ++i) free_technique(&base->techniques[i]); HeapFree(GetProcessHeap(), 0, base->techniques); base->techniques = NULL; @@ -1859,7 +1858,7 @@ static HRESULT WINAPI d3dx_effect_GetDesc(ID3DXEffect *iface, D3DXEFFECT_DESC *d desc->Creator = NULL; desc->Functions = 0; desc->Parameters = effect->parameter_count; - desc->Techniques = effect->base_effect.technique_count; + desc->Techniques = effect->technique_count; return D3D_OK; } @@ -2122,7 +2121,7 @@ static D3DXHANDLE WINAPI d3dx_effect_GetTechnique(ID3DXEffect *iface, UINT index TRACE("iface %p, index %u.\n", iface, index); - if (index >= effect->base_effect.technique_count) + if (index >= effect->technique_count) { WARN("Invalid argument specified.\n"); return NULL; @@ -3659,7 +3658,7 @@ static HRESULT WINAPI d3dx_effect_FindNextValidTechnique(ID3DXEffect *iface, D3D if (!(prev_tech = get_valid_technique(effect, technique))) return D3DERR_INVALIDCALL; - for (i = 0; i < base->technique_count; ++i) + for (i = 0; i < effect->technique_count; ++i) { tech = &base->techniques[i]; if (tech == prev_tech) @@ -3674,7 +3673,7 @@ static HRESULT WINAPI d3dx_effect_FindNextValidTechnique(ID3DXEffect *iface, D3D i = 0; } - for (; i < base->technique_count; ++i) + for (; i < effect->technique_count; ++i) { tech = &base->techniques[i]; if (SUCCEEDED(d3dx_effect_ValidateTechnique(iface, get_technique_handle(tech)))) @@ -5837,9 +5836,10 @@ static HRESULT d3dx_parse_resource(struct d3dx_effect *effect, const char *data, struct d3dx_technique *technique; struct d3dx_pass *pass; - if (technique_index >= base->technique_count) + if (technique_index >= effect->technique_count) { - FIXME("Index out of bounds: technique_index %u >= technique_count %u\n", technique_index, base->technique_count); + FIXME("Index out of bounds: technique_index %u >= technique_count %u.\n", technique_index, + effect->technique_count); return E_FAIL; } @@ -5972,8 +5972,8 @@ static HRESULT d3dx_parse_effect(struct d3dx_effect *effect, const char *data, U read_dword(&ptr, &effect->parameter_count); TRACE("Parameter count: %u.\n", effect->parameter_count); - read_dword(&ptr, &base->technique_count); - TRACE("Technique count: %u.\n", base->technique_count); + read_dword(&ptr, &effect->technique_count); + TRACE("Technique count: %u.\n", effect->technique_count); skip_dword_unknown(&ptr, 1); @@ -6016,10 +6016,9 @@ static HRESULT d3dx_parse_effect(struct d3dx_effect *effect, const char *data, U } } - if (base->technique_count) + if (effect->technique_count) { - base->techniques = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(*base->techniques) * base->technique_count); + base->techniques = heap_alloc_zero(sizeof(*base->techniques) * effect->technique_count); if (!base->techniques) { ERR("Out of memory.\n"); @@ -6027,7 +6026,7 @@ static HRESULT d3dx_parse_effect(struct d3dx_effect *effect, const char *data, U goto err_out; } - for (i = 0; i < base->technique_count; ++i) + for (i = 0; i < effect->technique_count; ++i) { TRACE("Parsing technique %u.\n", i); hr = d3dx_parse_effect_technique(effect, &base->techniques[i], data, &ptr, effect->objects); @@ -6089,7 +6088,7 @@ err_out: if (base->techniques) { - for (i = 0; i < base->technique_count; ++i) + for (i = 0; i < effect->technique_count; ++i) free_technique(&base->techniques[i]); HeapFree(GetProcessHeap(), 0, base->techniques); base->techniques = NULL; @@ -6292,7 +6291,7 @@ static HRESULT d3dx9_base_effect_init(struct d3dx_effect *effect, const char *da param = get_parameter_by_name(effect, NULL, skip_constants[i]); if (param) { - for (j = 0; j < base->technique_count; ++j) + for (j = 0; j < effect->technique_count; ++j) { if (is_parameter_used(param, &base->techniques[j])) { -- 2.20.1

2 1

[PATCH 2/6] d3dx9: Pass a struct d3dx_effect to d3dx9_create_object()
by Michael Stefaniuc 21 Mar '19

21 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(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 b8fb9041c2..d2af2d5ffa 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -5674,10 +5674,10 @@ err_out: return hr; } -static HRESULT d3dx9_create_object(struct d3dx9_base_effect *base, struct d3dx_object *object) +static HRESULT d3dx9_create_object(struct d3dx_effect *effect, struct d3dx_object *object) { struct d3dx_parameter *param = object->param; - struct IDirect3DDevice9 *device = base->effect->device; + IDirect3DDevice9 *device = effect->device; HRESULT hr; if (*(char **)param->data) @@ -5880,7 +5880,7 @@ static HRESULT d3dx_parse_resource(struct d3dx_effect *effect, const char *data, if (object->data) { - if (FAILED(hr = d3dx9_create_object(base, object))) + if (FAILED(hr = d3dx9_create_object(effect, object))) return hr; if (FAILED(hr = d3dx_create_param_eval(effect, object->data, object->size, param->type, &param->param_eval, get_version_counter_ptr(effect), @@ -6057,7 +6057,7 @@ static HRESULT d3dx_parse_effect(struct d3dx_effect *effect, const char *data, U if (effect->objects[id].data) { - if (FAILED(hr = d3dx9_create_object(base, &effect->objects[id]))) + if (FAILED(hr = d3dx9_create_object(effect, &effect->objects[id]))) goto err_out; } } -- 2.20.1

2 1