April 2017 - Wine-commits - list.winehq.org

Józef Kucia : d3d11/tests: Add test for ID3DDeviceContextState.
by Alexandre Julliard 25 Apr '17

25 Apr '17

Module: wine Branch: master Commit: 5bdd59ef7e788feea5fde5b6f078353dec8ba511 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bdd59ef7e788feea5fde5b6f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 25 12:25:49 2017 +0200 d3d11/tests: Add test for ID3DDeviceContextState. 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/d3d11/tests/d3d11.c | 91 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 90 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index dfe50c6..5d3b818 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -21,7 +21,7 @@ #include <stdlib.h> #define COBJMACROS #include "initguid.h" -#include "d3d11.h" +#include "d3d11_1.h" #include "wine/test.h" #include <limits.h> @@ -5291,6 +5291,94 @@ static void test_private_data(void) ok(!refcount, "Test object has %u references left.\n", refcount); } +static void test_device_context_state(void) +{ + ID3DDeviceContextState *context_state, *previous_context_state; + ID3D11SamplerState *sampler, *tmp_sampler; + D3D11_SAMPLER_DESC sampler_desc; + D3D_FEATURE_LEVEL feature_level; + ID3D11DeviceContext1 *context; + ID3D11Device *d3d11_device; + ID3D11Device1 *device; + ULONG refcount; + HRESULT hr; + + if (!(d3d11_device = create_device(NULL))) + { + skip("Failed to create device.\n"); + return; + } + + hr = ID3D11Device_QueryInterface(d3d11_device, &IID_ID3D11Device1, (void **)&device); + ID3D11Device_Release(d3d11_device); + if (FAILED(hr)) + { + skip("ID3D11Device1 is not available.\n"); + return; + } + + feature_level = ID3D11Device1_GetFeatureLevel(device); + ID3D11Device1_GetImmediateContext1(device, &context); + + sampler_desc.Filter = D3D11_FILTER_MIN_MAG_MIP_LINEAR; + sampler_desc.AddressU = D3D11_TEXTURE_ADDRESS_WRAP; + sampler_desc.AddressV = D3D11_TEXTURE_ADDRESS_WRAP; + sampler_desc.AddressW = D3D11_TEXTURE_ADDRESS_WRAP; + sampler_desc.MipLODBias = 0.0f; + sampler_desc.MaxAnisotropy = 0; + sampler_desc.ComparisonFunc = D3D11_COMPARISON_ALWAYS; + sampler_desc.BorderColor[0] = 0.0f; + sampler_desc.BorderColor[1] = 1.0f; + sampler_desc.BorderColor[2] = 0.0f; + sampler_desc.BorderColor[3] = 1.0f; + sampler_desc.MinLOD = 0.0f; + sampler_desc.MaxLOD = 16.0f; + hr = ID3D11Device1_CreateSamplerState(device, &sampler_desc, &sampler); + ok(SUCCEEDED(hr), "Failed to create sampler state, hr %#x.\n", hr); + + ID3D11DeviceContext1_PSSetSamplers(context, 0, 1, &sampler); + tmp_sampler = (ID3D11SamplerState *)0xdeadbeef; + ID3D11DeviceContext1_PSGetSamplers(context, 0, 1, &tmp_sampler); + ok(tmp_sampler == sampler, "Got sampler %p, expected %p.\n", tmp_sampler, sampler); + ID3D11SamplerState_Release(tmp_sampler); + + feature_level = min(feature_level, D3D_FEATURE_LEVEL_10_1); + hr = ID3D11Device1_CreateDeviceContextState(device, 0, &feature_level, 1, D3D11_SDK_VERSION, + &IID_ID3D10Device, NULL, &context_state); + ok(SUCCEEDED(hr), "Failed to create device context state, hr %#x.\n", hr); + refcount = get_refcount(context_state); + ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + + /* Enable ID3D10Device behavior. */ + previous_context_state = (ID3DDeviceContextState *)0xdeadbeef; + ID3D11DeviceContext1_SwapDeviceContextState(context, context_state, &previous_context_state); + refcount = ID3DDeviceContextState_Release(context_state); + ok(!refcount, "Got refcount %u, expected 0.\n", refcount); + + ID3D11DeviceContext1_PSSetSamplers(context, 0, 1, &sampler); + tmp_sampler = (ID3D11SamplerState *)0xdeadbeef; + ID3D11DeviceContext1_PSGetSamplers(context, 0, 1, &tmp_sampler); + ok(tmp_sampler == (ID3D11SamplerState *)0xdeadbeef, "Got unexpected sampler %p.\n", tmp_sampler); + ID3D11DeviceContext1_PSSetSamplers(context, 0, 1, &tmp_sampler); + + ID3D11DeviceContext1_SwapDeviceContextState(context, previous_context_state, &context_state); + refcount = ID3DDeviceContextState_Release(context_state); + ok(!refcount, "Got refcount %u, expected 0.\n", refcount); + refcount = ID3DDeviceContextState_Release(previous_context_state); + ok(!refcount, "Got refcount %u, expected 0.\n", refcount); + + ID3D11DeviceContext1_PSSetSamplers(context, 0, 1, &sampler); + tmp_sampler = (ID3D11SamplerState *)0xdeadbeef; + ID3D11DeviceContext1_PSGetSamplers(context, 0, 1, &tmp_sampler); + ok(tmp_sampler == sampler, "Got sampler %p, expected %p.\n", tmp_sampler, sampler); + ID3D11SamplerState_Release(tmp_sampler); + + ID3D11SamplerState_Release(sampler); + ID3D11DeviceContext1_Release(context); + refcount = ID3D11Device1_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + static void test_blend(void) { ID3D11BlendState *src_blend, *dst_blend; @@ -17591,6 +17679,7 @@ START_TEST(d3d11) test_timestamp_query(); test_device_removed_reason(); test_private_data(); + test_device_context_state(); test_blend(); test_texture(); test_cube_maps();

1 0

Józef Kucia : wined3d: Initialize geometry shader limits when OpenGL 3.2 is supported.
by Alexandre Julliard 25 Apr '17

25 Apr '17

Module: wine Branch: master Commit: 08e68f4fe852022622de7545ec0d3d9870ead795 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08e68f4fe852022622de7545e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 25 12:25:50 2017 +0200 wined3d: Initialize geometry shader limits when OpenGL 3.2 is supported. 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/directx.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d9a9c6f..f5d4882 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3655,8 +3655,7 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) gl_info->limits.samplers[WINED3D_SHADER_TYPE_DOMAIN] = gl_max; TRACE("Max domain samplers: %u.\n", gl_info->limits.samplers[WINED3D_SHADER_TYPE_DOMAIN]); } - if ((!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT] || gl_info->supported[ARB_GEOMETRY_SHADER4]) - && gl_info->supported[ARB_UNIFORM_BUFFER_OBJECT]) + if (gl_info->supported[WINED3D_GL_VERSION_3_2] && gl_info->supported[ARB_UNIFORM_BUFFER_OBJECT]) { gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_GEOMETRY_UNIFORM_BLOCKS, &gl_max); gl_info->limits.uniform_blocks[WINED3D_SHADER_TYPE_GEOMETRY] = min(gl_max, WINED3D_MAX_CBS);

1 0

Henri Verbeet : d3dx9/tests: Cleanup expect_mat.
by Alexandre Julliard 25 Apr '17

25 Apr '17

Module: wine Branch: master Commit: ff3f2ee9b93c6f92cf23de8edf2438586820b974 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff3f2ee9b93c6f92cf23de8ed… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 24 23:31:32 2017 +0200 d3dx9/tests: Cleanup expect_mat. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 158 ++++++++++++++++++++++++--------------------- 1 file changed, 85 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ff3f2ee9b93c6f92cf23d…

1 0

Henri Verbeet : d3dx9/tests: Cleanup expect_color.
by Alexandre Julliard 25 Apr '17

25 Apr '17

Module: wine Branch: master Commit: 7b93124e0e9948a3c66b4f9740711f3c92e1ea10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b93124e0e9948a3c66b4f974… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 24 23:31:33 2017 +0200 d3dx9/tests: Cleanup expect_color. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 39 +++++++++++++++++++++++++++------------ 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 62afcdf..9f40d86 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -29,8 +29,6 @@ #define relative_error(exp, out) (fabsf(exp) < 1e-38f ? fabsf(exp - out) : fabsf(1.0f - (out) / (exp))) -#define expect_color(expectedcolor,gotcolor) ok((relative_error(expectedcolor.r, gotcolor.r)<admitted_error)&&(relative_error(expectedcolor.g, gotcolor.g)<admitted_error)&&(relative_error(expectedcolor.b, gotcolor.b)<admitted_error)&&(relative_error(expectedcolor.a, gotcolor.a)<admitted_error),"Expected Color= (%f, %f, %f, %f)\n , Got Color= (%f, %f, %f, %f)\n", expectedcolor.r, expectedcolor.g, expectedcolor.b, expectedcolor.a, gotcolor.r, gotcolor.g, gotcolor.b, gotcolor.a); - static BOOL compare_float(float f, float g, unsigned int ulps) { int x = *(int *)&f; @@ -47,6 +45,14 @@ static BOOL compare_float(float f, float g, unsigned int ulps) return TRUE; } +static BOOL compare_color(const D3DXCOLOR *c1, const D3DXCOLOR *c2, unsigned int ulps) +{ + return compare_float(c1->r, c2->r, ulps) + && compare_float(c1->g, c2->g, ulps) + && compare_float(c1->b, c2->b, ulps) + && compare_float(c1->a, c2->a, ulps); +} + static BOOL compare_matrix(const D3DXMATRIX *m1, const D3DXMATRIX *m2, unsigned int ulps) { unsigned int i, j; @@ -63,6 +69,15 @@ static BOOL compare_matrix(const D3DXMATRIX *m1, const D3DXMATRIX *m2, unsigned return TRUE; } +#define expect_color(expected, color, ulps) expect_color_(__LINE__, expected, color, ulps) +static void expect_color_(unsigned int line, const D3DXCOLOR *expected, const D3DXCOLOR *color, unsigned int ulps) +{ + BOOL equal = compare_color(expected, color, ulps); + ok_(__FILE__, line)(equal, + "Got unexpected color {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e}.\n", + color->r, color->g, color->b, color->a, expected->r, expected->g, expected->b, expected->a); +} + #define expect_matrix(expected, matrix, ulps) expect_matrix_(__LINE__, expected, matrix, ulps) static void expect_matrix_(unsigned int line, const D3DXMATRIX *expected, const D3DXMATRIX *matrix, unsigned int ulps) { @@ -155,7 +170,7 @@ static void D3DXColorTest(void) /*_______________D3DXColorAdd________________*/ expected.r = 0.9f; expected.g = 1.05f; expected.b = 0.99f, expected.a = 0.93f; D3DXColorAdd(&got,&color1,&color2); - expect_color(expected,got); + expect_color(&expected, &got, 1); /* Test the NULL case */ funcpointer = D3DXColorAdd(&got,NULL,&color2); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); @@ -167,17 +182,17 @@ static void D3DXColorTest(void) /*_______________D3DXColorAdjustContrast______*/ expected.r = 0.41f; expected.g = 0.575f; expected.b = 0.473f, expected.a = 0.93f; D3DXColorAdjustContrast(&got,&color,scale); - expect_color(expected,got); + expect_color(&expected, &got, 0); /*_______________D3DXColorAdjustSaturation______*/ expected.r = 0.486028f; expected.g = 0.651028f; expected.b = 0.549028f, expected.a = 0.93f; D3DXColorAdjustSaturation(&got,&color,scale); - expect_color(expected,got); + expect_color(&expected, &got, 16); /*_______________D3DXColorLerp________________*/ expected.r = 0.32f; expected.g = 0.69f; expected.b = 0.356f; expected.a = 0.897f; D3DXColorLerp(&got,&color,&color1,scale); - expect_color(expected,got); + expect_color(&expected, &got, 0); /* Test the NULL case */ funcpointer = D3DXColorLerp(&got,NULL,&color1,scale); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); @@ -189,7 +204,7 @@ static void D3DXColorTest(void) /*_______________D3DXColorModulate________________*/ expected.r = 0.18f; expected.g = 0.275f; expected.b = 0.1748f; expected.a = 0.0902f; D3DXColorModulate(&got,&color1,&color2); - expect_color(expected,got); + expect_color(&expected, &got, 0); /* Test the NULL case */ funcpointer = D3DXColorModulate(&got,NULL,&color2); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); @@ -201,17 +216,17 @@ static void D3DXColorTest(void) /*_______________D3DXColorNegative________________*/ expected.r = 0.8f; expected.g = 0.25f; expected.b = 0.59f; expected.a = 0.93f; D3DXColorNegative(&got,&color); - expect_color(got,expected); + expect_color(&expected, &got, 1); /* Test the greater than 1 case */ color1.r = 0.2f; color1.g = 1.75f; color1.b = 0.41f; color1.a = 0.93f; expected.r = 0.8f; expected.g = -0.75f; expected.b = 0.59f; expected.a = 0.93f; D3DXColorNegative(&got,&color1); - expect_color(got,expected); + expect_color(&expected, &got, 1); /* Test the negative case */ color1.r = 0.2f; color1.g = -0.75f; color1.b = 0.41f; color1.a = 0.93f; expected.r = 0.8f; expected.g = 1.75f; expected.b = 0.59f; expected.a = 0.93f; D3DXColorNegative(&got,&color1); - expect_color(got,expected); + expect_color(&expected, &got, 1); /* Test the NULL case */ funcpointer = D3DXColorNegative(&got,NULL); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); @@ -221,7 +236,7 @@ static void D3DXColorTest(void) /*_______________D3DXColorScale________________*/ expected.r = 0.06f; expected.g = 0.225f; expected.b = 0.123f; expected.a = 0.279f; D3DXColorScale(&got,&color,scale); - expect_color(expected,got); + expect_color(&expected, &got, 1); /* Test the NULL case */ funcpointer = D3DXColorScale(&got,NULL,scale); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); @@ -231,7 +246,7 @@ static void D3DXColorTest(void) /*_______________D3DXColorSubtract_______________*/ expected.r = -0.1f; expected.g = 0.25f; expected.b = -0.35f, expected.a = 0.82f; D3DXColorSubtract(&got,&color,&color2); - expect_color(expected,got); + expect_color(&expected, &got, 1); /* Test the NULL case */ funcpointer = D3DXColorSubtract(&got,NULL,&color2); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer);

1 0

Paul Gofman : d3dx9/tests: Add more tests for IsParameterUsed() function.
by Alexandre Julliard 25 Apr '17

25 Apr '17

Module: wine Branch: master Commit: bc655a40ec6c77c48347aef9e9f508f53ea7bcf8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc655a40ec6c77c48347aef9e… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Apr 24 14:36:46 2017 +0300 d3dx9/tests: Add more tests for IsParameterUsed() function. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index b1f7f3e..fdbc579 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -5937,6 +5937,34 @@ static void test_effect_shared_parameters(IDirect3DDevice9 *device) effect3->lpVtbl->GetFloat(effect3, param, &fvect.x); ok(fvect.x == 0.0f, "Unexpected parameter value %g.\n", fvect.x); + param = effect1->lpVtbl->GetParameterByName(effect1, NULL, "arr2"); + ok(!!param, "GetParameterByName failed.\n"); + ok(!effect3->lpVtbl->IsParameterUsed(effect3, param, "tech0"), + "Unexpected IsParameterUsed result.\n"); + + param = effect3->lpVtbl->GetParameterByName(effect3, NULL, "arr2"); + ok(!!param, "GetParameterByName failed.\n"); + ok(effect3->lpVtbl->IsParameterUsed(effect3, param, "tech0"), + "Unexpected IsParameterUsed result.\n"); + + param = effect1->lpVtbl->GetParameterByName(effect1, NULL, "vs_arr2"); + ok(!!param, "GetParameterByName failed.\n"); + ok(!effect3->lpVtbl->IsParameterUsed(effect3, param, "tech0"), + "Unexpected IsParameterUsed result.\n"); + + todo_wine + ok(effect3->lpVtbl->IsParameterUsed(effect3, "vs_arr2", "tech0"), + "Unexpected IsParameterUsed result.\n"); + todo_wine + ok(!effect3->lpVtbl->IsParameterUsed(effect3, "vs_arr2[0]", "tech0"), + "Unexpected IsParameterUsed result.\n"); + todo_wine + ok(!effect3->lpVtbl->IsParameterUsed(effect3, "vs_arr2[1]", "tech0"), + "Unexpected IsParameterUsed result.\n"); + + ok(effect1->lpVtbl->IsParameterUsed(effect1, param, "tech0"), + "Unexpected IsParameterUsed result.\n"); + hr = effect3->lpVtbl->Begin(effect3, &passes_count, 0); ok(hr == D3D_OK, "Got result %#x.\n", hr);

1 0

Paul Gofman : d3dx9: Reference top level parameter instead of dirty flag.
by Alexandre Julliard 25 Apr '17

25 Apr '17

Module: wine Branch: master Commit: 2be74048d6220a5439d41940c9870dac6ab5eb0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2be74048d6220a5439d41940c… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Apr 24 14:36:47 2017 +0300 d3dx9: Reference top level parameter instead of dirty flag. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/d3dx9_private.h | 4 ++-- dlls/d3dx9_36/effect.c | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h index 145ab80..da4564d 100644 --- a/dlls/d3dx9_36/d3dx9_private.h +++ b/dlls/d3dx9_36/d3dx9_private.h @@ -218,12 +218,12 @@ struct d3dx_parameter struct d3dx_parameter *referenced_param; struct d3dx_param_eval *param_eval; - DWORD *dirty_flag_ptr; + struct d3dx_parameter *top_level_param; }; static inline BOOL is_param_dirty(struct d3dx_parameter *param) { - return *param->dirty_flag_ptr & PARAMETER_FLAG_DIRTY; + return param->top_level_param->runtime_flags & PARAMETER_FLAG_DIRTY; } struct d3dx9_base_effect; diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 8dc4738..8861a05 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1332,7 +1332,7 @@ static BOOL walk_parameter_tree(struct d3dx_parameter *param, walk_parameter_dep static void set_dirty(struct d3dx_parameter *param) { - *param->dirty_flag_ptr |= PARAMETER_FLAG_DIRTY; + param->top_level_param->runtime_flags |= PARAMETER_FLAG_DIRTY; } static void clear_dirty_params(struct d3dx9_base_effect *base) @@ -1340,7 +1340,7 @@ static void clear_dirty_params(struct d3dx9_base_effect *base) unsigned int i; for (i = 0; i < base->parameter_count; ++i) - *base->parameters[i].dirty_flag_ptr &= ~PARAMETER_FLAG_DIRTY; + base->parameters[i].runtime_flags &= ~PARAMETER_FLAG_DIRTY; } static HRESULT d3dx9_base_effect_set_value(struct d3dx9_base_effect *base, @@ -5878,9 +5878,9 @@ static HRESULT d3dx9_parse_resource(struct d3dx9_base_effect *base, const char * return hr; } -static BOOL param_set_dirty_flag_ptr(void *dirty_flag_ptr, struct d3dx_parameter *param) +static BOOL param_set_top_level_param(void *top_level_param, struct d3dx_parameter *param) { - param->dirty_flag_ptr = (DWORD *)dirty_flag_ptr; + param->top_level_param = top_level_param; return FALSE; } @@ -5992,8 +5992,8 @@ static HRESULT d3dx9_parse_effect(struct d3dx9_base_effect *base, const char *da } for (i = 0; i < base->parameter_count; ++i) - walk_parameter_tree(&base->parameters[i], param_set_dirty_flag_ptr, - &base->parameters[i].runtime_flags); + walk_parameter_tree(&base->parameters[i], param_set_top_level_param, + &base->parameters[i]); return D3D_OK; err_out:

1 0

Paul Gofman : d3dx9: Fix IsParameterUsed() for the case when state references child parameter.
by Alexandre Julliard 25 Apr '17

25 Apr '17

Module: wine Branch: master Commit: 1bd3cc24af577f1787d630d89562f58053ba8876 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bd3cc24af577f1787d630d89… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Apr 24 14:36:48 2017 +0300 d3dx9: Fix IsParameterUsed() for the case when state references child parameter. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 1 + dlls/d3dx9_36/tests/effect.c | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 8861a05..1fd99832 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -3728,6 +3728,7 @@ static BOOL walk_parameter_dep(struct d3dx_parameter *param, walk_parameter_dep_ unsigned int i; unsigned int member_count; + param = param->top_level_param; if (param_func(data, param)) return TRUE; diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index fdbc579..9a436d5 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -5949,16 +5949,14 @@ static void test_effect_shared_parameters(IDirect3DDevice9 *device) param = effect1->lpVtbl->GetParameterByName(effect1, NULL, "vs_arr2"); ok(!!param, "GetParameterByName failed.\n"); + todo_wine ok(!effect3->lpVtbl->IsParameterUsed(effect3, param, "tech0"), "Unexpected IsParameterUsed result.\n"); - todo_wine ok(effect3->lpVtbl->IsParameterUsed(effect3, "vs_arr2", "tech0"), "Unexpected IsParameterUsed result.\n"); - todo_wine ok(!effect3->lpVtbl->IsParameterUsed(effect3, "vs_arr2[0]", "tech0"), "Unexpected IsParameterUsed result.\n"); - todo_wine ok(!effect3->lpVtbl->IsParameterUsed(effect3, "vs_arr2[1]", "tech0"), "Unexpected IsParameterUsed result.\n");

1 0

Paul Gofman : d3dx9: Factor out free_parameter_data() function.
by Alexandre Julliard 25 Apr '17

25 Apr '17

Module: wine Branch: master Commit: bb52c5983ddb371eee5c61773e4fc7c213439ce8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb52c5983ddb371eee5c61773… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Apr 24 14:36:50 2017 +0300 d3dx9: Factor out free_parameter_data() function. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 61 ++++++++++++++++++++++++-------------------------- 1 file changed, 29 insertions(+), 32 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 1fd99832..0f5e3e5 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -502,37 +502,8 @@ static void free_sampler(struct d3dx_sampler *sampler) HeapFree(GetProcessHeap(), 0, sampler->states); } -static void free_parameter(struct d3dx_parameter *param, BOOL element, BOOL child) +static void free_parameter_data(struct d3dx_parameter *param, BOOL child) { - unsigned int i; - - TRACE("Free parameter %p, name %s, type %s, child %s\n", param, param->name, - debug_d3dxparameter_type(param->type), child ? "yes" : "no"); - - if (param->param_eval) - { - d3dx_free_param_eval(param->param_eval); - param->param_eval = NULL; - } - - if (param->annotations) - { - for (i = 0; i < param->annotation_count; ++i) - free_parameter(&param->annotations[i], FALSE, FALSE); - HeapFree(GetProcessHeap(), 0, param->annotations); - param->annotations = NULL; - } - - if (param->members) - { - unsigned int count = param->element_count ? param->element_count : param->member_count; - - for (i = 0; i < count; ++i) - free_parameter(&param->members[i], param->element_count != 0, TRUE); - HeapFree(GetProcessHeap(), 0, param->members); - param->members = NULL; - } - if (param->class == D3DXPC_OBJECT && !param->element_count) { switch (param->type) @@ -564,12 +535,38 @@ static void free_parameter(struct d3dx_parameter *param, BOOL element, BOOL chil break; } } - if (!child) - { HeapFree(GetProcessHeap(), 0, param->data); +} + +static void free_parameter(struct d3dx_parameter *param, BOOL element, BOOL child) +{ + unsigned int i; + + TRACE("Free parameter %p, name %s, type %s, element %#x, child %#x.\n", param, param->name, + debug_d3dxparameter_type(param->type), element, child); + + if (param->param_eval) + d3dx_free_param_eval(param->param_eval); + + if (param->annotations) + { + for (i = 0; i < param->annotation_count; ++i) + free_parameter(&param->annotations[i], FALSE, FALSE); + HeapFree(GetProcessHeap(), 0, param->annotations); } + if (param->members) + { + unsigned int count = param->element_count ? param->element_count : param->member_count; + + for (i = 0; i < count; ++i) + free_parameter(&param->members[i], param->element_count != 0, TRUE); + HeapFree(GetProcessHeap(), 0, param->members); + } + + free_parameter_data(param, child); + /* only the parent has to release name and semantic */ if (!element) {

1 0

Hugh McMaster : regedit: Simplify parseKeyName.
by Alexandre Julliard 25 Apr '17

25 Apr '17

Module: wine Branch: master Commit: 0481f31d4c2f546d2e5fd2fdd58a6d190af9d044 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0481f31d4c2f546d2e5fd2fdd… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Apr 25 13:30:56 2017 +0000 regedit: Simplify parseKeyName. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 53 +++++++++++++--------------------------------- 1 file changed, 15 insertions(+), 38 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 96c4564..1672f22 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -301,50 +301,27 @@ static int REGPROC_unescape_string(WCHAR* str) return val_idx; } -static BOOL parseKeyName(LPWSTR lpKeyName, HKEY *hKey, LPWSTR *lpKeyPath) +static HKEY parseKeyName(LPWSTR lpKeyName, LPWSTR *lpKeyPath) { - WCHAR* lpSlash = NULL; - unsigned int i, len; + unsigned int i; if (lpKeyName == NULL) - return FALSE; + return 0; - for(i = 0; *(lpKeyName+i) != 0; i++) - { - if(*(lpKeyName+i) == '\\') - { - lpSlash = lpKeyName+i; - break; - } - } + *lpKeyPath = strchrW(lpKeyName, '\\'); + if (*lpKeyPath) (*lpKeyPath)++; - if (lpSlash) - { - len = lpSlash-lpKeyName; - } - else + for (i = 0; i < ARRAY_SIZE(reg_class_keys); i++) { - len = lstrlenW(lpKeyName); - lpSlash = lpKeyName+len; - } - *hKey = NULL; - - for (i = 0; i < ARRAY_SIZE(reg_class_keys); i++) { - if (CompareStringW(LOCALE_USER_DEFAULT, 0, lpKeyName, len, reg_class_namesW[i], -1) == CSTR_EQUAL && - len == lstrlenW(reg_class_namesW[i])) { - *hKey = reg_class_keys[i]; - break; + int len = lstrlenW(reg_class_namesW[i]); + if (!strncmpW(lpKeyName, reg_class_namesW[i], len) && + (lpKeyName[len] == 0 || lpKeyName[len] == '\\')) + { + return reg_class_keys[i]; } } - if (*hKey == NULL) - return FALSE; - - - if (*lpSlash != '\0') - lpSlash++; - *lpKeyPath = lpSlash; - return TRUE; + return 0; } /* Globals used by the setValue() & co */ @@ -490,7 +467,7 @@ static LONG openKeyW(WCHAR* stdInput) return ERROR_INVALID_PARAMETER; /* Get the registry class */ - if (!parseKeyName(stdInput, &keyClass, &keyPath)) + if (!(keyClass = parseKeyName(stdInput, &keyPath))) return ERROR_INVALID_PARAMETER; res = RegCreateKeyExW( @@ -1323,7 +1300,7 @@ BOOL export_registry_key(WCHAR *file_name, WCHAR *reg_key_name, DWORD format) lstrcpyW(reg_key_name_buf, reg_key_name); /* open the specified key */ - if (!parseKeyName(reg_key_name, &reg_key_class, &branch_name)) { + if (!(reg_key_class = parseKeyName(reg_key_name, &branch_name))) { output_message(STRING_INCORRECT_REG_CLASS, reg_key_name); exit(1); } @@ -1408,7 +1385,7 @@ void delete_registry_key(WCHAR *reg_key_name) if (!reg_key_name || !reg_key_name[0]) return; - if (!parseKeyName(reg_key_name, &key_class, &key_name)) { + if (!(key_class = parseKeyName(reg_key_name, &key_name))) { output_message(STRING_INCORRECT_REG_CLASS, reg_key_name); exit(1); }

1 0

Hugh McMaster : regedit: Validate REG_SZ import data before processing it any further.
by Alexandre Julliard 25 Apr '17

25 Apr '17

Module: wine Branch: master Commit: 9aff5c88ad874698e07c44bd3825a70414ee77e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9aff5c88ad874698e07c44bd3… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Apr 25 13:31:10 2017 +0000 regedit: Validate REG_SZ import data before processing it any further. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 30 ++++++++++++++++++++++-------- programs/regedit/tests/regedit.c | 14 +++++++------- 2 files changed, 29 insertions(+), 15 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 1672f22..22c4d9e 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -264,13 +264,19 @@ static DWORD getDataType(LPWSTR *lpValue, DWORD* parse_type) } /****************************************************************************** - * Replaces escape sequences with the characters. + * Replaces escape sequences with their character equivalents and + * null-terminates the string on the first non-escaped double quote. + * + * Assigns a pointer to the remaining unparsed data in the line. + * Returns TRUE or FALSE to indicate whether a closing double quote was found. */ -static int REGPROC_unescape_string(WCHAR* str) +static BOOL REGPROC_unescape_string(WCHAR *str, WCHAR **unparsed) { int str_idx = 0; /* current character under analysis */ int val_idx = 0; /* the last character of the unescaped string */ int len = lstrlenW(str); + BOOL ret; + for (str_idx = 0; str_idx < len; str_idx++, val_idx++) { if (str[str_idx] == '\\') { str_idx++; @@ -293,12 +299,17 @@ static int REGPROC_unescape_string(WCHAR* str) str[val_idx] = str[str_idx]; break; } + } else if (str[str_idx] == '"') { + break; } else { str[val_idx] = str[str_idx]; } } + + ret = (str[str_idx] == '"'); + *unparsed = str + str_idx + 1; str[val_idx] = '\0'; - return val_idx; + return ret; } static HKEY parseKeyName(LPWSTR lpKeyName, LPWSTR *lpKeyPath) @@ -397,12 +408,14 @@ static LONG setValue(WCHAR* val_name, WCHAR* val_data, BOOL is_unicode) if (dwParseType == REG_SZ) /* no conversion for string */ { - dwLen = REGPROC_unescape_string(val_data); - if(!dwLen || val_data[dwLen-1] != '"') + WCHAR *line; + if (!REGPROC_unescape_string(val_data, &line)) + return ERROR_INVALID_DATA; + while (*line == ' ' || *line == '\t') line++; + if (*line && *line != ';') return ERROR_INVALID_DATA; - val_data[dwLen-1] = '\0'; /* remove last quotes */ lpbData = (BYTE*) val_data; - dwLen = dwLen * sizeof(WCHAR); /* size is in bytes */ + dwLen = (lstrlenW(val_data) + 1) * sizeof(WCHAR); /* size is in bytes */ } else if (dwParseType == REG_DWORD) /* Convert the dword types */ { @@ -520,6 +533,7 @@ static void processSetValue(WCHAR* line, BOOL is_unicode) { WCHAR* val_name; /* registry value name */ WCHAR* val_data; /* registry value data */ + WCHAR* p; int line_idx = 0; /* current character under analysis */ LONG res; @@ -570,7 +584,7 @@ static void processSetValue(WCHAR* line, BOOL is_unicode) while (line_idx > 0 && isspaceW(val_data[line_idx-1])) line_idx--; val_data[line_idx] = '\0'; - REGPROC_unescape_string(val_name); + REGPROC_unescape_string(val_name, &p); res = setValue(val_name, val_data, is_unicode); if ( res != ERROR_SUCCESS ) output_message(STRING_SETVALUE_FAILED, val_name, currentKeyName); diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 7584ed4..8010a47 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -560,8 +560,8 @@ static void test_invalid_import(void) "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Test15a\"=\"foo\"bar\"\n" "\"Test15b\"=\"foo\"\"bar\"\n\n"); - todo_wine verify_reg_nonexist(hkey, "Test15a"); - todo_wine verify_reg_nonexist(hkey, "Test15b"); + verify_reg_nonexist(hkey, "Test15a"); + verify_reg_nonexist(hkey, "Test15b"); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -607,7 +607,7 @@ static void test_comments(void) "\"Wine5\"=dword:01020304 #comment\n" "\"Wine6\"=dword:02040608 ;comment\n\n"); verify_reg_nonexist(hkey, "Wine3"); - todo_wine verify_reg(hkey, "Wine4", REG_SZ, "Value 2", 8, 0); + verify_reg(hkey, "Wine4", REG_SZ, "Value 2", 8, 0); verify_reg_nonexist(hkey, "Wine5"); dword = 0x2040608; verify_reg(hkey, "Wine6", REG_DWORD, &dword, sizeof(dword), 0); @@ -639,9 +639,9 @@ static void test_comments(void) verify_reg_nonexist(hkey, "Comment2"); verify_reg_nonexist(hkey, "Comment3"); verify_reg_nonexist(hkey, "Comment4"); - todo_wine verify_reg_nonexist(hkey, "Wine11"); + verify_reg_nonexist(hkey, "Wine11"); verify_reg_nonexist(hkey, "Comment5"); - verify_reg(hkey, "Wine12", REG_SZ, "Value 7", 8, TODO_REG_SIZE|TODO_REG_DATA); + verify_reg(hkey, "Wine12", REG_SZ, "Value 7", 8, 0); verify_reg_nonexist(hkey, "Comment6"); exec_import_str("REGEDIT4\n\n" @@ -690,8 +690,8 @@ static void test_comments(void) "\"Wine26b\"=\"Value2\"\t\t;comment\n" "\"Wine26c\"=\"Value3\" #comment\n" "\"Wine26d\"=\"Value4\"\t\t#comment\n\n"); - todo_wine verify_reg(hkey, "Wine26a", REG_SZ, "Value1", 7, 0); - todo_wine verify_reg(hkey, "Wine26b", REG_SZ, "Value2", 7, 0); + verify_reg(hkey, "Wine26a", REG_SZ, "Value1", 7, 0); + verify_reg(hkey, "Wine26b", REG_SZ, "Value2", 7, 0); verify_reg_nonexist(hkey, "Wine26c"); verify_reg_nonexist(hkey, "Wine26d");

1 0