[PATCH v3 0/2] MR979: d3d9: Implement d3dx_effect_SetRawValue

Signed-off-by: Patrick Hibbs hibbsncc1701@gmail.com --- V2: Fix prefix in commit subject. --- dlls/d3dx9_36/effect.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 7719edd4f25..f82d69d1acd 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -4442,10 +4442,26 @@ static HRESULT WINAPI d3dx_effect_CloneEffect(ID3DXEffect *iface, IDirect3DDevic static HRESULT WINAPI d3dx_effect_SetRawValue(ID3DXEffect *iface, D3DXHANDLE parameter, const void *data, UINT byte_offset, UINT bytes) { - FIXME("iface %p, parameter %p, data %p, byte_offset %u, bytes %u stub!\n", + struct d3dx_effect *src = impl_from_ID3DXEffect( iface ); + struct d3dx_parameter *param = get_valid_parameter( src, parameter ); + void *raw = NULL; + + TRACE("iface %p, parameter %p, data %p, byte_offset %u, bytes %u.\n", iface, parameter, data, byte_offset, bytes);

- return E_NOTIMPL; + if (!src) + { + WARN("Invalid variable.\n"); + return E_FAIL; + } + + if (!data || !param || !(raw = param_get_data_and_dirtify( src, param, + byte_offset + bytes, TRUE ))) + return D3DERR_INVALIDCALL; + + memcpy( raw, data, bytes ); + + return S_OK; } #endif

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/979

Patrick Hibbs

12:39 a.m.

New subject: [PATCH v3 2/2] d3dx9/tests: Implement tests for d3dx_effect_SetRawValue().

From: Patrick Hibbs hibbsncc1701@gmail.com

Signed-off-by: Patrick Hibbs hibbsncc1701@gmail.com --- --- dlls/d3dx9_36/tests/effect.c | 599 +++++++++++++++++++++++++++++++++++ 1 file changed, 599 insertions(+)

diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 12af35cb8d8..033401720f2 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -8703,6 +8703,604 @@ static void test_effect_parameter_block(void) DestroyWindow(window); }

+/* + * fxc.exe /Tfx_2_0 + */ +#if 0 +bool b = false; +bool4 b4 = {false,false,false,false}; +bool4x4 b44 = {{false,false,false,false}, {false,false,false,false}, + {false,false,false,false}, {false,false,false,false}}; +int i = 0; +int4 i4 = {0,0,0,0}; +int4x4 i44 = {{4411, 4421, 4431, 4441}, {4412, 4422, 4432, 4442}, + {4413, 4423, 4433, 4443}, {4414, 4424, 4434, 4444}}; +float f = 0.0; +float4 f4 = {4.1, 4.2, 4.3, 4.4}; +float4x4 f44 = {{4.1, 4.2, 4.3, 4.4}, {4.5, 4.6, 4.7, 4.8}, + {4.9, 4.10, 4.11, 4.12}, {4.13, 4.14, 4.15, 4.16}}; +string s = "blank"; +string s_2[2] = {"blank1", "blank2"}; +texture tex; +texture2D tex2d; +texture2D tex3d; +Vertexshader v; +Vertexshader v_2[2]; +Pixelshader p; +Pixelshader p_2[2]; +technique t { pass p { } }; +#endif +static const BYTE test_set_raw_value_blob[] = +{ + 1, 9, 255, 254, 136, 3, + 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 0, 0, + 0, 0, 36, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, 0, + 1, 0, 0, 0, 0, 0, + 0, 0, 2, 0, 0, 0, + 98, 0, 0, 0, 1, 0, + 0, 0, 1, 0, 0, 0, + 88, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 4, 0, 0, 0, 1, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 3, 0, 0, 0, 98, 52, + 0, 0, 1, 0, 0, 0, + 2, 0, 0, 0, 188, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 4, 0, + 0, 0, 4, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 4, 0, + 0, 0, 98, 52, 52, 0, + 2, 0, 0, 0, 0, 0, + 0, 0, 228, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, 0, + 1, 0, 0, 0, 0, 0, + 0, 0, 2, 0, 0, 0, + 105, 0, 0, 0, 2, 0, + 0, 0, 1, 0, 0, 0, + 24, 1, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 4, 0, 0, 0, 1, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 3, 0, 0, 0, 105, 52, + 0, 0, 2, 0, 0, 0, + 2, 0, 0, 0, 124, 1, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 4, 0, + 0, 0, 4, 0, 0, 0, + 59, 17, 0, 0, 69, 17, + 0, 0, 79, 17, 0, 0, + 89, 17, 0, 0, 60, 17, + 0, 0, 70, 17, 0, 0, + 80, 17, 0, 0, 90, 17, + 0, 0, 61, 17, 0, 0, + 71, 17, 0, 0, 81, 17, + 0, 0, 91, 17, 0, 0, + 62, 17, 0, 0, 72, 17, + 0, 0, 82, 17, 0, 0, + 92, 17, 0, 0, 4, 0, + 0, 0, 105, 52, 52, 0, + 3, 0, 0, 0, 0, 0, + 0, 0, 164, 1, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, 0, + 1, 0, 0, 0, 0, 0, + 0, 0, 2, 0, 0, 0, + 102, 0, 0, 0, 3, 0, + 0, 0, 1, 0, 0, 0, + 216, 1, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 4, 0, 0, 0, 1, 0, + 0, 0, 51, 51, 131, 64, + 102, 102, 134, 64, 154, 153, + 137, 64, 205, 204, 140, 64, + 3, 0, 0, 0, 102, 52, + 0, 0, 3, 0, 0, 0, + 2, 0, 0, 0, 60, 2, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 4, 0, + 0, 0, 4, 0, 0, 0, + 51, 51, 131, 64, 102, 102, + 134, 64, 154, 153, 137, 64, + 205, 204, 140, 64, 0, 0, + 144, 64, 51, 51, 147, 64, + 102, 102, 150, 64, 154, 153, + 153, 64, 205, 204, 156, 64, + 51, 51, 131, 64, 31, 133, + 131, 64, 10, 215, 131, 64, + 246, 40, 132, 64, 225, 122, + 132, 64, 205, 204, 132, 64, + 184, 30, 133, 64, 4, 0, + 0, 0, 102, 52, 52, 0, + 4, 0, 0, 0, 4, 0, + 0, 0, 92, 2, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, 0, + 2, 0, 0, 0, 115, 0, + 0, 0, 4, 0, 0, 0, + 4, 0, 0, 0, 128, 2, + 0, 0, 0, 0, 0, 0, + 2, 0, 0, 0, 2, 0, + 0, 0, 3, 0, 0, 0, + 4, 0, 0, 0, 115, 95, + 50, 0, 5, 0, 0, 0, + 4, 0, 0, 0, 160, 2, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 4, 0, + 0, 0, 4, 0, 0, 0, + 116, 101, 120, 0, 7, 0, + 0, 0, 4, 0, 0, 0, + 192, 2, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 5, 0, 0, 0, 6, 0, + 0, 0, 116, 101, 120, 50, + 100, 0, 0, 0, 7, 0, + 0, 0, 4, 0, 0, 0, + 228, 2, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 6, 0, 0, 0, 6, 0, + 0, 0, 116, 101, 120, 51, + 100, 0, 0, 0, 16, 0, + 0, 0, 4, 0, 0, 0, + 8, 3, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 7, 0, 0, 0, 2, 0, + 0, 0, 118, 0, 0, 0, + 16, 0, 0, 0, 4, 0, + 0, 0, 44, 3, 0, 0, + 0, 0, 0, 0, 2, 0, + 0, 0, 8, 0, 0, 0, + 9, 0, 0, 0, 4, 0, + 0, 0, 118, 95, 50, 0, + 15, 0, 0, 0, 4, 0, + 0, 0, 76, 3, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 10, 0, 0, 0, + 2, 0, 0, 0, 112, 0, + 0, 0, 15, 0, 0, 0, + 4, 0, 0, 0, 112, 3, + 0, 0, 0, 0, 0, 0, + 2, 0, 0, 0, 11, 0, + 0, 0, 12, 0, 0, 0, + 4, 0, 0, 0, 112, 95, + 50, 0, 2, 0, 0, 0, + 112, 0, 0, 0, 2, 0, + 0, 0, 116, 0, 0, 0, + 18, 0, 0, 0, 1, 0, + 0, 0, 7, 0, 0, 0, + 13, 0, 0, 0, 4, 0, + 0, 0, 32, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 44, 0, 0, 0, + 72, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 96, 0, 0, 0, 124, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 196, 0, + 0, 0, 224, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 236, 0, 0, 0, + 8, 1, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 32, 1, 0, 0, 60, 1, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 132, 1, + 0, 0, 160, 1, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 172, 1, 0, 0, + 200, 1, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 224, 1, 0, 0, 252, 1, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 68, 2, + 0, 0, 88, 2, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 100, 2, 0, 0, + 120, 2, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 136, 2, 0, 0, 156, 2, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 168, 2, + 0, 0, 188, 2, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 204, 2, 0, 0, + 224, 2, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 240, 2, 0, 0, 4, 3, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 16, 3, + 0, 0, 36, 3, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 52, 3, 0, 0, + 72, 3, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 84, 3, 0, 0, 104, 3, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 128, 3, + 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 120, 3, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 12, 0, + 0, 0, 0, 0, 0, 0, + 11, 0, 0, 0, 0, 0, + 0, 0, 12, 0, 0, 0, + 0, 0, 0, 0, 10, 0, + 0, 0, 0, 0, 0, 0, + 8, 0, 0, 0, 0, 0, + 0, 0, 9, 0, 0, 0, + 0, 0, 0, 0, 7, 0, + 0, 0, 0, 0, 0, 0, + 6, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, + 0, 0, 0, 0, 4, 0, + 0, 0, 0, 0, 0, 0, + 2, 0, 0, 0, 7, 0, + 0, 0, 98, 108, 97, 110, + 107, 49, 0, 0, 3, 0, + 0, 0, 7, 0, 0, 0, + 98, 108, 97, 110, 107, 50, + 0, 0, 1, 0, 0, 0, + 6, 0, 0, 0, 98, 108, + 97, 110, 107, 0, 0, 0 +}; + +struct test_set_raw_data_value +{ + D3DXPARAMETER_TYPE param_type; + unsigned int expected_data_len; + unsigned int param_data_len; + unsigned int offset; + HRESULT expected_result; + const void *expected_data; + const char *param_name; + const void *param_data; +}; + +static const int SET_RAWDATA_BOOL44_A[16] = { 1 }; +static const int SET_RAWDATA_BOOL4_BA[16] = { 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; +static const int SET_RAWDATA_BOOL44_BA[16] = { 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; +static const int SET_RAWDATA_INT44_A[16] = { 2 }; +static const int SET_RAWDATA_INT44_B[16] = { 3 }; +static const int SET_RAWDATA_INT4_BA[16] = { (3 << 8) | 3, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 }; +static const int SET_RAWDATA_INT4_BBA[16] = { (3 << 8) | 3, 2, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 }; +static const int SET_RAWDATA_INT44_BA[16] = { (3 << 8) | 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; +static const int SET_RAWDATA_INT44_BBA[16] = { (3 << 8) | 3, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; +static const float SET_RAWDATA_FLOAT44_A[16] = { 1.0f }; +static const float SET_RAWDATA_FLOAT44_B[16] = { 1.2f }; +/* Note: The values below need to have index 0 updated with a value (1.0f) with + * an off-by-one byte alignment copied to them. + * See test_effect_setrawvalue_init_floats() below. + * + * E.x. arr[0] = (1.0f & 0x00FFFFFF) | 1.2f; + */ +static float SET_RAWDATA_FLOAT4_BA[16] = { 1.2f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, + 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f }; +static float SET_RAWDATA_FLOAT4_BBA[16] = { 1.2f, 1.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, + 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f }; +static float SET_RAWDATA_FLOAT44_BA[16] = { 1.2f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f }; +static float SET_RAWDATA_FLOAT44_BBA[16] = { 1.2f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f }; + +struct test_set_raw_data_value test_set_raw_data_values[] = +{ + /* All of these cause C0000005 on win10. + { D3DXPT_BOOL, sizeof( D3DXPT_BOOL ), sizeof( D3DXPT_BOOL ), 0, D3DERR_INVALIDCALL, NULL, "b", NULL }, + { D3DXPT_BOOL, sizeof( D3DXPT_BOOL ) * 4, sizeof( D3DXPT_BOOL ) * 4, 0, D3DERR_INVALIDCALL, NULL, "b4", NULL }, + { D3DXPT_BOOL, sizeof( D3DXPT_BOOL ) * 16, sizeof( D3DXPT_BOOL ) * 16, 0, D3DERR_INVALIDCALL, NULL, "b44", NULL }, + { D3DXPT_INT, sizeof( D3DXPT_INT ), sizeof( D3DXPT_INT ), 0, D3DERR_INVALIDCALL, NULL, "i", NULL }, + { D3DXPT_INT, sizeof( D3DXPT_INT ) * 4, sizeof( D3DXPT_INT ) * 4, 0, D3DERR_INVALIDCALL, NULL, "i4", NULL }, + { D3DXPT_INT, sizeof( D3DXPT_INT ) * 16, sizeof( D3DXPT_INT ) * 16, 0, D3DERR_INVALIDCALL, NULL, "i44", NULL }, + { D3DXPT_FLOAT, sizeof( D3DXPT_FLOAT ), sizeof( D3DXPT_FLOAT ), 0, D3DERR_INVALIDCALL, NULL, "f", NULL }, + { D3DXPT_FLOAT, sizeof( D3DXPT_FLOAT ) * 4, sizeof( D3DXPT_FLOAT ) * 4, 0, D3DERR_INVALIDCALL, NULL, "f4", NULL }, + { D3DXPT_FLOAT, sizeof( D3DXPT_FLOAT ) * 16, sizeof( D3DXPT_FLOAT ) * 16, 0, D3DERR_INVALIDCALL, NULL, "f44", NULL }, + { D3DXPT_STRING, sizeof( "test" ), sizeof( "test" ), 0, D3DERR_INVALIDCALL, "test", "s_2", NULL }, + */ + + /* Boolean. Test 0x0 */ + { D3DXPT_BOOL, sizeof( D3DXPT_BOOL ), sizeof( D3DXPT_BOOL ), 0, S_OK, &SET_RAWDATA_BOOL44_A, "b", &SET_RAWDATA_BOOL44_A }, + { D3DXPT_BOOL, sizeof( D3DXPT_BOOL ), 0, 0, S_OK, &SET_RAWDATA_BOOL44_A, "b", &SET_RAWDATA_INT44_B }, + { D3DXPT_BOOL, sizeof( D3DXPT_BOOL ), sizeof( D3DXPT_BOOL ), sizeof( D3DXPT_BOOL ), S_OK, &SET_RAWDATA_BOOL44_A, "b", &SET_RAWDATA_INT44_B }, + { D3DXPT_BOOL, sizeof( D3DXPT_BOOL ), sizeof( D3DXPT_BOOL ), 0, S_OK, &SET_RAWDATA_BOOL44_A, "b", &SET_RAWDATA_INT44_B }, + + /* Boolean vector. Test 0x4 */ + { D3DXPT_BOOL, sizeof( D3DXPT_BOOL ) * 4, sizeof( D3DXPT_BOOL ) * 4, 0, S_OK, &SET_RAWDATA_BOOL44_A, "b4", &SET_RAWDATA_BOOL44_A }, + { D3DXPT_BOOL, sizeof( D3DXPT_BOOL ) * 4, 0, 0, S_OK, &SET_RAWDATA_BOOL44_A, "b4", &SET_RAWDATA_INT44_B }, + { D3DXPT_BOOL, sizeof( D3DXPT_BOOL ) * 4, sizeof( D3DXPT_BOOL ) * 4, 0, S_OK, &SET_RAWDATA_BOOL44_A, "b4", &SET_RAWDATA_INT44_B }, + { D3DXPT_BOOL, sizeof( D3DXPT_BOOL ) * 4, sizeof( D3DXPT_BOOL ) * 4, 1, S_OK, &SET_RAWDATA_BOOL44_A, "b4", &SET_RAWDATA_INT44_B }, + { D3DXPT_BOOL, sizeof( D3DXPT_BOOL ) * 4, sizeof( D3DXPT_BOOL ) * 4, sizeof( D3DXPT_BOOL ), S_OK, &SET_RAWDATA_BOOL4_BA, "b4", &SET_RAWDATA_INT44_B }, + + /* Boolean matrix. Test 0x9 */ + { D3DXPT_BOOL, sizeof( D3DXPT_BOOL ) * 16, sizeof( D3DXPT_BOOL ) * 16, 0, S_OK, &SET_RAWDATA_BOOL44_A, "b44", &SET_RAWDATA_BOOL44_A }, + { D3DXPT_BOOL, sizeof( D3DXPT_BOOL ) * 16, 0, 0, S_OK, &SET_RAWDATA_BOOL44_A, "b44", &SET_RAWDATA_INT44_B }, + { D3DXPT_BOOL, sizeof( D3DXPT_BOOL ) * 16, sizeof( D3DXPT_BOOL ) * 16, 0, S_OK, &SET_RAWDATA_BOOL44_A, "b44", &SET_RAWDATA_INT44_B }, + { D3DXPT_BOOL, sizeof( D3DXPT_BOOL ) * 16, sizeof( D3DXPT_BOOL ) * 16, 1, S_OK, &SET_RAWDATA_BOOL44_A, "b44", &SET_RAWDATA_INT44_B }, + { D3DXPT_BOOL, sizeof( D3DXPT_BOOL ) * 16, sizeof( D3DXPT_BOOL ) * 16, sizeof( D3DXPT_BOOL ), S_OK, &SET_RAWDATA_BOOL44_BA, "b44", &SET_RAWDATA_INT44_B }, + + /* Integer. Test 0xE */ + { D3DXPT_INT, sizeof( D3DXPT_INT ), sizeof( D3DXPT_INT ), 0, S_OK, &SET_RAWDATA_INT44_A, "i", &SET_RAWDATA_INT44_A }, + { D3DXPT_INT, sizeof( D3DXPT_INT ), 0, 0, S_OK, &SET_RAWDATA_INT44_A, "i", &SET_RAWDATA_INT44_B }, + { D3DXPT_INT, sizeof( D3DXPT_INT ), sizeof( D3DXPT_INT ), sizeof( D3DXPT_INT ), S_OK, &SET_RAWDATA_INT44_A, "i", &SET_RAWDATA_INT44_B }, + + /* Integer vector. Test 0x11 */ + { D3DXPT_INT, sizeof( D3DXPT_INT ) * 4, sizeof( D3DXPT_INT ) * 4, 0, S_OK, &SET_RAWDATA_INT44_A, "i4", &SET_RAWDATA_INT44_A }, + { D3DXPT_INT, sizeof( D3DXPT_INT ) * 4, 0, 0, S_OK, &SET_RAWDATA_INT44_A, "i4", &SET_RAWDATA_INT44_B }, + { D3DXPT_INT, sizeof( D3DXPT_INT ) * 4, sizeof( D3DXPT_INT ), 0, S_OK, &SET_RAWDATA_INT44_B, "i4", &SET_RAWDATA_INT44_B }, + { D3DXPT_INT, sizeof( D3DXPT_INT ) * 4, sizeof( D3DXPT_INT ), 1, S_OK, &SET_RAWDATA_INT4_BA, "i4", &SET_RAWDATA_INT44_B }, + { D3DXPT_INT, sizeof( D3DXPT_INT ) * 4, sizeof( D3DXPT_INT ), sizeof( D3DXPT_INT ), S_OK, &SET_RAWDATA_INT4_BBA, "i4", &SET_RAWDATA_INT44_A }, + + /* Integer matrix. Test 0x16 */ + { D3DXPT_INT, sizeof( D3DXPT_INT ) * 16, sizeof( D3DXPT_INT ) * 16, 0, S_OK, &SET_RAWDATA_INT44_A, "i44", &SET_RAWDATA_INT44_A }, + { D3DXPT_INT, sizeof( D3DXPT_INT ) * 16, 0, 0, S_OK, &SET_RAWDATA_INT44_A, "i44", &SET_RAWDATA_INT44_B }, + { D3DXPT_INT, sizeof( D3DXPT_INT ) * 16, sizeof( D3DXPT_INT ), 0, S_OK, &SET_RAWDATA_INT44_B, "i44", &SET_RAWDATA_INT44_B }, + { D3DXPT_INT, sizeof( D3DXPT_INT ) * 16, sizeof( D3DXPT_INT ), 1, S_OK, &SET_RAWDATA_INT44_BA, "i44", &SET_RAWDATA_INT44_B }, + { D3DXPT_INT, sizeof( D3DXPT_INT ) * 16, sizeof( D3DXPT_INT ), sizeof( D3DXPT_INT ), S_OK, &SET_RAWDATA_INT44_BBA, "i44", &SET_RAWDATA_INT44_A }, + + /* Float. Test 0x1B */ + { D3DXPT_FLOAT, sizeof( D3DXPT_FLOAT ), sizeof( D3DXPT_FLOAT ), 0, S_OK, &SET_RAWDATA_FLOAT44_A, "f", &SET_RAWDATA_FLOAT44_A }, + { D3DXPT_FLOAT, sizeof( D3DXPT_FLOAT ), 0, 0, S_OK, &SET_RAWDATA_FLOAT44_A, "f", &SET_RAWDATA_FLOAT44_B }, + { D3DXPT_FLOAT, sizeof( D3DXPT_FLOAT ), sizeof( D3DXPT_FLOAT ), sizeof( D3DXPT_FLOAT ), S_OK, &SET_RAWDATA_FLOAT44_A, "f", &SET_RAWDATA_FLOAT44_B }, + + /* Float vector. Test 0x1E */ + { D3DXPT_FLOAT, sizeof( D3DXPT_FLOAT ) * 4, sizeof( D3DXPT_FLOAT ) * 4, 0, S_OK, &SET_RAWDATA_FLOAT44_A, "f4", &SET_RAWDATA_FLOAT44_A }, + { D3DXPT_FLOAT, sizeof( D3DXPT_FLOAT ) * 4, 0, 0, S_OK, &SET_RAWDATA_FLOAT44_A, "f4", &SET_RAWDATA_FLOAT44_B }, + { D3DXPT_FLOAT, sizeof( D3DXPT_FLOAT ) * 4, sizeof( D3DXPT_FLOAT ), 0, S_OK, &SET_RAWDATA_FLOAT44_B, "f4", &SET_RAWDATA_FLOAT44_B }, + { D3DXPT_FLOAT, sizeof( D3DXPT_FLOAT ) * 4, sizeof( D3DXPT_FLOAT ), 1, S_OK, &SET_RAWDATA_FLOAT4_BA, "f4", &SET_RAWDATA_FLOAT44_A }, + { D3DXPT_FLOAT, sizeof( D3DXPT_FLOAT ) * 4, sizeof( D3DXPT_FLOAT ), sizeof( D3DXPT_FLOAT ), S_OK, &SET_RAWDATA_FLOAT4_BBA, "f4", &SET_RAWDATA_FLOAT44_A }, + + /* Float matrix. Test 0x23 */ + { D3DXPT_FLOAT, sizeof( D3DXPT_FLOAT ) * 16, sizeof( D3DXPT_FLOAT ) * 16, 0, S_OK, &SET_RAWDATA_FLOAT44_A, "f44", &SET_RAWDATA_FLOAT44_A }, + { D3DXPT_FLOAT, sizeof( D3DXPT_FLOAT ) * 16, 0, 0, S_OK, &SET_RAWDATA_FLOAT44_A, "f44", &SET_RAWDATA_FLOAT44_B }, + { D3DXPT_FLOAT, sizeof( D3DXPT_FLOAT ) * 16, sizeof( D3DXPT_FLOAT ), 0, S_OK, &SET_RAWDATA_FLOAT44_B, "f44", &SET_RAWDATA_FLOAT44_B }, + { D3DXPT_FLOAT, sizeof( D3DXPT_FLOAT ) * 16, sizeof( D3DXPT_FLOAT ), 1, S_OK, &SET_RAWDATA_FLOAT44_BA, "f44", &SET_RAWDATA_FLOAT44_A }, + { D3DXPT_FLOAT, sizeof( D3DXPT_FLOAT ) * 16, sizeof( D3DXPT_FLOAT ), sizeof( D3DXPT_FLOAT ), S_OK, &SET_RAWDATA_FLOAT44_BBA, "f44", &SET_RAWDATA_FLOAT44_A }, + + /* Strings. Test 0x28 */ + { D3DXPT_STRING, sizeof( "\0" ), sizeof( "test" ), 0, S_OK, "\0", "s", "test" }, + { D3DXPT_STRING, sizeof( "\0" ), sizeof( "test" ), 0, D3DERR_INVALIDCALL, "\0", "s", NULL }, + { D3DXPT_STRING, sizeof( "\0" ), 0, 0, D3DERR_INVALIDCALL, "\0", "s", "test_longer_string" }, + { D3DXPT_STRING, sizeof( "\0" ), sizeof( "test_longer_string" ), 0, D3DERR_INVALIDCALL, "\0", "s", "test_longer_string" }, + { D3DXPT_STRING, sizeof( "\0" ), sizeof( "test_longer_string" ), sizeof( "test" ), D3DERR_INVALIDCALL, "\0", "s", "test_longer_string" }, + + /* String vector. Test 0x2E */ + { D3DXPT_STRING, sizeof( "\0" ), sizeof( "test" ), 0, S_OK, "\0", "s_2", "test" }, + { D3DXPT_STRING, sizeof( "\0" ), 0, 0, S_OK, "\0", "s_2", "test_longer_string" }, + { D3DXPT_STRING, sizeof( "\0" ), sizeof( "test_longer_string" ), 0, S_OK, "\0", "s_2", "test_longer_string" }, + + /* Textures. Test 0x31 */ + { D3DXPT_TEXTURE, sizeof( "\0" ), sizeof( "DEAFCAFE" ), 0, S_OK, "\0", "tex", "DEAFCAFE" }, + { D3DXPT_TEXTURE, sizeof( "\0" ), sizeof( "DEAFCAFE" ), 0, D3DERR_INVALIDCALL, "\0", "tex", NULL }, + { D3DXPT_TEXTURE, sizeof( "\0" ), 0, 0, D3DERR_INVALIDCALL, "\0", "tex", "DEADBEEF" }, + { D3DXPT_TEXTURE, sizeof( "\0" ), sizeof( "DEAFCAFE" ), sizeof( "DEAFCAFE" ), D3DERR_INVALIDCALL, "\0", "tex", "DEAFCAFE" }, + + { D3DXPT_TEXTURE2D, sizeof( "\0" ), sizeof( "DEAFCAFE" ), 0, S_OK, "\0", "tex2d", "DEAFCAFE" }, + { D3DXPT_TEXTURE2D, sizeof( "\0" ), sizeof( "DEAFCAFE" ), 0, D3DERR_INVALIDCALL, "\0", "tex2d", NULL }, + { D3DXPT_TEXTURE2D, sizeof( "\0" ), 0, 0, D3DERR_INVALIDCALL, "\0", "tex2d", "DEADBEEF" }, + { D3DXPT_TEXTURE2D, sizeof( "\0" ), sizeof( "DEAFCAFE" ), sizeof( "DEAFCAFE" ), D3DERR_INVALIDCALL, "\0", "tex2d", "DEAFCAFE" }, + + { D3DXPT_TEXTURE3D, sizeof( "\0" ), sizeof( "DEAFCAFE" ), 0, S_OK, "\0", "tex3d", "DEAFCAFE" }, + { D3DXPT_TEXTURE3D, sizeof( "\0" ), sizeof( "DEAFCAFE" ), 0, D3DERR_INVALIDCALL, "\0", "tex3d", NULL }, + { D3DXPT_TEXTURE3D, sizeof( "\0" ), 0, 0, D3DERR_INVALIDCALL, "\0", "tex3d", "DEADBEEF" }, + { D3DXPT_TEXTURE3D, sizeof( "\0" ), sizeof( "DEAFCAFE" ), sizeof( "DEAFCAFE" ), D3DERR_INVALIDCALL, "\0", "tex3d", "DEAFCAFE" }, + + /* Shaders. Test 0x3D */ + { D3DXPT_VERTEXSHADER, sizeof( "\0" ), sizeof( "DEAFCAFE" ), 0, S_OK, "\0", "v", "DEAFCAFE" }, + { D3DXPT_VERTEXSHADER, sizeof( "\0" ), sizeof( "DEAFCAFE" ), 0, D3DERR_INVALIDCALL, "\0", "v", NULL }, + { D3DXPT_VERTEXSHADER, sizeof( "\0" ), 0, 0, D3DERR_INVALIDCALL, "\0", "v", "DEADBEEF" }, + { D3DXPT_VERTEXSHADER, sizeof( "\0" ), sizeof( "DEAFCAFE" ), sizeof( "DEAFCAFE" ), D3DERR_INVALIDCALL, "\0", "v", "DEAFCAFE" }, + + { D3DXPT_VERTEXSHADER, sizeof( "\0" ), sizeof( "DEAFCAFE" ), 0, S_OK, "\0", "v_2", "DEAFCAFE" }, + { D3DXPT_VERTEXSHADER, sizeof( "\0" ), sizeof( "DEAFCAFE" ), 0, D3DERR_INVALIDCALL, "\0", "v_2", NULL }, + { D3DXPT_VERTEXSHADER, sizeof( "\0" ), 0, 0, D3DERR_INVALIDCALL, "\0", "v_2", "DEADBEEF" }, + { D3DXPT_VERTEXSHADER, sizeof( "\0" ), sizeof( "DEAFCAFE" ), sizeof( "DEAFCAFE" ), D3DERR_INVALIDCALL, "\0", "v_2", "DEAFCAFE" }, + + { D3DXPT_PIXELSHADER, sizeof( "\0" ), sizeof( "DEAFCAFE" ), 0, S_OK, "\0", "p", "DEAFCAFE" }, + { D3DXPT_PIXELSHADER, sizeof( "\0" ), sizeof( "DEAFCAFE" ), 0, D3DERR_INVALIDCALL, "\0", "p", NULL }, + { D3DXPT_PIXELSHADER, sizeof( "\0" ), 0, 0, D3DERR_INVALIDCALL, "\0", "p", "DEADBEEF" }, + { D3DXPT_PIXELSHADER, sizeof( "\0" ), sizeof( "DEAFCAFE" ), sizeof( "DEAFCAFE" ), D3DERR_INVALIDCALL, "\0", "p", "DEAFCAFE" }, + + { D3DXPT_PIXELSHADER, sizeof( "\0" ), sizeof( "DEAFCAFE" ), 0, S_OK, "\0", "p_2", "DEAFCAFE" }, + { D3DXPT_PIXELSHADER, sizeof( "\0" ), sizeof( "DEAFCAFE" ), 0, D3DERR_INVALIDCALL, "\0", "p_2", NULL }, + { D3DXPT_PIXELSHADER, sizeof( "\0" ), 0, 0, D3DERR_INVALIDCALL, "\0", "p_2", "DEADBEEF" }, + { D3DXPT_PIXELSHADER, sizeof( "\0" ), sizeof( "DEAFCAFE" ), sizeof( "DEAFCAFE" ), D3DERR_INVALIDCALL, "\0", "p_2", "DEAFCAFE" } +}; + +static void test_effect_setrawvalue_init_floats(void) +{ + memcpy( ((unsigned char*)&SET_RAWDATA_FLOAT4_BA) + 1, &SET_RAWDATA_FLOAT44_A, sizeof(D3DXPT_FLOAT) ); + memcpy( ((unsigned char*)&SET_RAWDATA_FLOAT4_BBA) + 1, &SET_RAWDATA_FLOAT44_A, sizeof(D3DXPT_FLOAT) ); + SET_RAWDATA_FLOAT4_BBA[1] = 1.0f; + memcpy( ((unsigned char*)&SET_RAWDATA_FLOAT44_BA) + 1, &SET_RAWDATA_FLOAT44_A, sizeof(D3DXPT_FLOAT) ); + SET_RAWDATA_FLOAT44_BA[4] = SET_RAWDATA_FLOAT44_BA[1]; + SET_RAWDATA_FLOAT44_BA[1] = 0.0f; + memcpy( ((unsigned char*)&SET_RAWDATA_FLOAT44_BBA) + 1, &SET_RAWDATA_FLOAT44_A, sizeof(D3DXPT_FLOAT) ); + SET_RAWDATA_FLOAT44_BBA[1] = 0.0f; +} + +static inline void dbg_print_bits(void * byte, unsigned int count, char *str) +{ + int x, y; + + for (y = 0; y < count; y++) + { + for (x = 0; x < CHAR_BIT; x++) + { + str[(y * CHAR_BIT) + x] = (*(unsigned char*)byte & (1 << x)) ? '1' : '0'; + } + } +} + +static void test_effect_setrawvalue(IDirect3DDevice9 *device) +{ + char expected_bit_buf[33] = { '\0' }; + char result_bit_buf[33] = { '\0' }; + unsigned int x, y, single_size; + ID3DXEffect *effect; + void *result_buf; + int memcmp_ret; + HRESULT hr; + + hr = D3DXCreateEffect( device, test_set_raw_value_blob, + sizeof(test_set_raw_value_blob), NULL, NULL, 0, NULL, &effect, NULL ); + ok( hr == D3D_OK, "Got result %#1.1x, expected 0 (D3D_OK).\n", hr ); + + /* All of these cause C0000005 on win10. */ + //hr = effect->lpVtbl->SetRawValue( effect, INVALID_HANDLE_VALUE, NULL, 0, 0 ); + //ok( hr == D3DERR_INVALIDCALL, "Got result %#x, expected 0 (D3D_INVALIDCALL).\n", hr ); + //hr = effect->lpVtbl->SetRawValue( effect, INVALID_HANDLE_VALUE, NULL, 1, 0 ); + //ok( hr == D3DERR_INVALIDCALL, "Got result %#x, expected 0 (D3D_INVALIDCALL).\n", hr ); + //hr = effect->lpVtbl->SetRawValue( effect, INVALID_HANDLE_VALUE, NULL, 0, 1 ); + //ok( hr == D3DERR_INVALIDCALL, "Got result %#x, expected 0 (D3D_INVALIDCALL).\n", hr ); + //hr = effect->lpVtbl->SetRawValue( effect, INVALID_HANDLE_VALUE, NULL, 1, 1 ); + //ok( hr == D3DERR_INVALIDCALL, "Got result %#x, expected 0 (D3D_INVALIDCALL).\n", hr ); + + test_effect_setrawvalue_init_floats(); + + /* Begin value loop. */ + for (x = 0; x < (sizeof( test_set_raw_data_values ) / sizeof( struct test_set_raw_data_value )); x++) + { + result_buf = malloc( test_set_raw_data_values[x].expected_data_len ); + if (result_buf) + { + memset( result_buf, '\0', test_set_raw_data_values[x].expected_data_len ); + hr = effect->lpVtbl->SetRawValue( effect, + effect->lpVtbl->GetParameterByName( effect, NULL, test_set_raw_data_values[x].param_name ), + test_set_raw_data_values[x].param_data, + test_set_raw_data_values[x].offset, + test_set_raw_data_values[x].param_data_len ); + ok( hr == test_set_raw_data_values[x].expected_result, + "Test # %#1.1x var name %s : got HRESULT %#1.1x, expected %#1.1x.\n", x, + test_set_raw_data_values[x].param_name, hr, + test_set_raw_data_values[x].expected_result ); + effect->lpVtbl->GetValue( effect, + effect->lpVtbl->GetParameterByName( effect, NULL, test_set_raw_data_values[x].param_name ), + result_buf, + test_set_raw_data_values[x].expected_data_len ); + switch (test_set_raw_data_values[x].param_type) + { + case D3DXPT_BOOL: + case D3DXPT_INT: + case D3DXPT_FLOAT: + single_size = (test_set_raw_data_values[x].param_type == D3DXPT_BOOL) ? sizeof( D3DXPT_BOOL ) : + (test_set_raw_data_values[x].param_type == D3DXPT_INT) ? sizeof( D3DXPT_INT ) : + sizeof( D3DXPT_FLOAT ); + + if (test_set_raw_data_values[x].expected_data_len > single_size) + { + for (y = 0; y < test_set_raw_data_values[x].expected_data_len / single_size; y++) + { + memcmp_ret = memcmp( ((unsigned char*)result_buf) + (single_size * y), + ((unsigned char*)test_set_raw_data_values[x].expected_data) + + (single_size * y), + single_size ); + if (memcmp_ret != 0) + { + dbg_print_bits( ((unsigned char*)result_buf) + (single_size * y), + single_size, result_bit_buf ); + dbg_print_bits( ((unsigned char*)test_set_raw_data_values[x].expected_data) + + (single_size * y), single_size, expected_bit_buf ); + } + switch (test_set_raw_data_values[x].param_type) + { + case D3DXPT_FLOAT: + ok( memcmp_ret == 0, + "Test #%#1.1x type %#1.1x var name %s index %#1.1x: got %#1.1f (bits: %s), expected %#1.1f (bits: %s).\n", + x, + test_set_raw_data_values[x].param_type, + test_set_raw_data_values[x].param_name, + y, + *(float*)(((unsigned char*)result_buf) + (single_size * y)), + result_bit_buf, + *(float*)(((unsigned char*)test_set_raw_data_values[x].expected_data) + + (single_size * y)), + expected_bit_buf ); + break; + case D3DXPT_INT: + ok( memcmp_ret == 0, + "Test #%#1.1x type %#1.1x var name %s index %#1.1x: got %#1.1x (bits: %s), expected %#1.1x (bits: %s).\n", + x, + test_set_raw_data_values[x].param_type, + test_set_raw_data_values[x].param_name, + y, + *(unsigned int*)(((unsigned char*)result_buf) + (single_size * y)), + result_bit_buf, + *(unsigned int*)(((unsigned char*)test_set_raw_data_values[x].expected_data) + + (single_size * y)), + expected_bit_buf ); + break; + case D3DXPT_BOOL: + ok( memcmp_ret == 0, + "Test #%#1.1x type %#1.1x var name %s index %#1.1x: got %#1.1x (bits: %s), expected %#1.1x (bits: %s).\n", + x, + test_set_raw_data_values[x].param_type, + test_set_raw_data_values[x].param_name, + y, + *(((unsigned char*)result_buf) + (single_size * y)), + result_bit_buf, + *(((unsigned char*)test_set_raw_data_values[x].expected_data) + + (single_size * y)), + expected_bit_buf ); + break; + default: + /* Should never get here, but gcc complains without a default... */ + trace("Test #%#x not performed. Reached dead codepath.\n", x); + break; + }; + } + } + break; + case D3DXPT_STRING: + ok( memcmp( result_buf, + test_set_raw_data_values[x].expected_data, + test_set_raw_data_values[x].expected_data_len ) == 0, + "Test #%#1.1x type %#1.1x var name %s: got %s, expected %s.\n", + x, + test_set_raw_data_values[x].param_type, + test_set_raw_data_values[x].param_name, + (char *)result_buf, + (char *)test_set_raw_data_values[x].expected_data ); + break; + default: + ok( memcmp( result_buf, + test_set_raw_data_values[x].expected_data, + test_set_raw_data_values[x].expected_data_len ) == 0, + "Test #%#1.1x type %#1.1x var name %s: got %#1.1x, expected %#1.1x.\n", + x, + test_set_raw_data_values[x].param_type, + test_set_raw_data_values[x].param_name, + *(unsigned char*)result_buf, + *(unsigned char*)test_set_raw_data_values[x].expected_data ); + break; + }; + free( result_buf ); + } + else + { + skip("Could not allocate memory for test!"); + break; + } + } + effect->lpVtbl->Release(effect); +} + START_TEST(effect) { IDirect3DDevice9 *device; @@ -8731,6 +9329,7 @@ START_TEST(effect) test_effect_large_address_aware_flag(device); test_effect_get_pass_desc(device); test_effect_skip_constants(device); + test_effect_setrawvalue( device );

refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/979

Marvin

1:28 a.m.

New subject: [PATCH v3 2/2] d3dx9/tests: Implement tests for d3dx_effect_SetRawValue().

Hi,

It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated.

The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=124822

Your paranoid android.

=== debian11 (32 bit report) ===

Report validation errors: d3dx9_36:effect has no test summary line (early exit of the main process?) d3dx9_36:effect has unaccounted for todo messages d3dx9_36:effect has unaccounted for skip messages d3dx9_36:effect returned a non-zero exit code despite reporting no failures

=== debian11 (32 bit ar:MA report) ===

=== debian11 (32 bit de report) ===

=== debian11 (32 bit fr report) ===

=== debian11 (32 bit he:IL report) ===

=== debian11 (32 bit hi:IN report) ===

=== debian11 (32 bit ja:JP report) ===

=== debian11 (32 bit zh:CN report) ===

=== debian11 (32 bit WoW report) ===

=== debian11 (64 bit WoW report) ===

Patrick Hibbs (＠hibbsncc1701)

12:52 a.m.

On Mon Oct 10 00:52:11 2022 +0000, Matteo Bruni wrote:

...

It would be nice to have some tests for this, checking that your implementation matches native behavior for both normal and edge cases (e.g. for the latter, what happens when data or param are NULL). You can probably use the last couple of tests at the end of d3dx9_36/tests/effect.c as reference. Also nitpick, the prefix in the commit subject should be "d3dx9:".

OK, fixed the commit subject.

I've also added some tests. There will need to be another revision to this MR for wine to pass them correctly, but they currently pass without error on Win10.

I do have a few questions:

1) Is there a preferred method for testing byte-misaligned floats in wine tests? Currently, I'm setting the unaffected parts of the array in the initializer, and then fixing it up at runtime with a memcpy(). Is there another method I should use?

2) As Win10 allows setting the byte-misaligned float, how should I deal with the assert in param_get_data_and_dirtify()? As the tests currently fail under wine due to it.

3) How did you get fx.exe to output DWORDs? I can manually clean it up but I'd prefer to have less to do. :smile:

4) Any other clean ups or tests to recommend?

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/979#note_10085

849

Age (days ago)

849

Last active (days ago)

wine-gitlab@winehq.org

4 comments

3 participants

tags (0)

participants (3)

Marvin
Patrick Hibbs
Patrick Hibbs (＠hibbsncc1701)