[PATCH v7 0/2] MR979: d3d9: Implement d3dx_effect_SetRawValue
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46012 Signed-off-by: Patrick Hibbs <hibbsncc1701(a)gmail.com> -- v7: d3dx9/tests: Implement tests for d3dx_effect_SetRawValue(). d3dx9: Implement d3dx_effect_SetRawValue https://gitlab.winehq.org/wine/wine/-/merge_requests/979
From: Patrick Hibbs <hibbsncc1701(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46012 Signed-off-by: Patrick Hibbs <hibbsncc1701(a)gmail.com> --- V3: Implement boolean and some numeric specific type behaviors revealed by the new tests. V2: Fix prefix in commit subject. --- dlls/d3dx9_36/effect.c | 154 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 152 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 7719edd4f25..e73b3a1c269 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -4442,10 +4442,160 @@ 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 *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = (parameter == INVALID_HANDLE_VALUE) ? NULL : get_valid_parameter(effect, parameter); + const unsigned int single_size = sizeof(DWORD); + unsigned int x, index_offset, remaining_byte_offset, remaining_bytes; + void *raw; + + TRACE("iface %p, parameter %p, data %p, byte_offset %u, bytes %u.\n", iface, parameter, data, byte_offset, bytes); - return E_NOTIMPL; + /* pendentic */ + index_offset = 0; + remaining_byte_offset = 0; + + /* BOOLs and Matries with a single value copy require sanitization of the + byte_offset. + + Specificly, matries with a single value copy only allow byte shifts that + are not multiples of the value (DWORD) size. For multiples, we increment + the index of the promoted data type, then add any remainder as a byte + offset. + + For BOOLs, due to their value sanitization, we only care about the + index of their promoted data type. Unless it's a non value size matrix. + In that case we do care about the byte offset. + */ + if (byte_offset > 0 && (param->type == D3DXPT_BOOL || + (param->class == D3DXPC_MATRIX_COLUMNS || + param->class == D3DXPC_MATRIX_ROWS))) + { + remaining_byte_offset = byte_offset % single_size; + if (remaining_byte_offset != 0) + index_offset = byte_offset / single_size; + else + index_offset = byte_offset; + if (param->type != D3DXPT_BOOL || (bytes != single_size && + (param->class == D3DXPC_MATRIX_COLUMNS || + param->class == D3DXPC_MATRIX_ROWS))) + { + index_offset = index_offset * single_size; + if (param->type != D3DXPT_BOOL) + index_offset = index_offset * single_size; + } + } + + /* If parameter is bad, we are expected to throw C0000005. */ + switch (param->class) + { + case D3DXPC_STRUCT: + break; + case D3DXPC_OBJECT: + raw = param_get_data_and_dirtify(effect, param, param->bytes, TRUE); + if (data && bytes) + { + if (((char*)raw)[0] != '\0') + { + memset(raw, '\0', param->bytes); + return S_OK; /* This returns a false success. */ + } + else + { + return D3DERR_INVALIDCALL; + } + } + break; + case D3DXPC_SCALAR: + raw = param_get_data_and_dirtify(effect, param, param->bytes, TRUE); + if (param->type == D3DXPT_BOOL) + *(BOOL*)raw = *(BOOL*)data ? TRUE : FALSE; + else + memcpy((unsigned char*)raw + byte_offset, data, bytes); + return S_OK; + break; + case D3DXPC_VECTOR: + raw = (unsigned char*)param_get_data_and_dirtify(effect, param, param->bytes, TRUE); + if (param->type == D3DXPT_BOOL) + { + raw = (unsigned char*)raw + index_offset; + *(DWORD*)raw = *(DWORD*)data ? TRUE : FALSE; + memset((unsigned char*)raw + single_size, \ + '\0', param->bytes - index_offset - single_size); + } + else + { + raw = (unsigned char*)raw + byte_offset; + for (x = 0; (x * single_size) + byte_offset < param->bytes && (x * single_size) < bytes; x++) + { + memcpy((unsigned char*)raw + (x * single_size), \ + (unsigned char*)data + (x * single_size), \ + single_size); + } + } + return S_OK; + break; + case D3DXPC_MATRIX_COLUMNS: + case D3DXPC_MATRIX_ROWS: + raw = (unsigned char*)param_get_data_and_dirtify(effect, param, param->bytes, TRUE); + if (param->type == D3DXPT_BOOL) + { + if (bytes == single_size) + { + raw = (unsigned char*)raw + index_offset; + for (x = 0; (x * single_size) < param->bytes - index_offset; x++) + { + remaining_bytes = param->bytes - index_offset - \ + (x * single_size) - single_size; + *(DWORD*)raw = *(DWORD*)data ? TRUE : FALSE; + memset((unsigned char*)raw + single_size, \ + '\0', (remaining_bytes > (single_size * 4) ? \ + single_size * 4 : remaining_bytes)); + raw = (unsigned char*)raw + (remaining_bytes > (single_size * 4) ? \ + single_size * 4 : remaining_bytes); + } + } + else + { + raw = (unsigned char*)raw + index_offset; + for (x = 0; (x * single_size) < param->bytes - index_offset; x++) + { + ((DWORD*)raw)[x] = ((DWORD*)data)[x] ? TRUE : FALSE; + } + } + } + else + { + if (bytes == single_size) + { + raw = (unsigned char*)raw + index_offset + remaining_byte_offset; + for (x = 0; (x * single_size) + byte_offset < param->bytes && (x * single_size) < bytes; x++) + { + memcpy((unsigned char*)raw + (x * single_size), \ + (unsigned char*)data + (x * single_size), \ + single_size); + } + } + else + { + raw = (unsigned char*)raw + byte_offset; + for (x = 0; byte_offset + (x * single_size) < param->bytes && + (x * single_size) < bytes; x++) + { + memcpy((unsigned char*)raw + (x * single_size), \ + (unsigned char*)data + (x * single_size), \ + single_size); + } + } + } + return S_OK; + break; + default: + FIXME("Unhandled param class %s.\n", debug_d3dxparameter_class(param->class)); + break; + }; + + return D3DERR_INVALIDCALL; } #endif -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/979
From: Patrick Hibbs <hibbsncc1701(a)gmail.com> Signed-off-by: Patrick Hibbs <hibbsncc1701(a)gmail.com> --- v4: Add additional byte_offset tests for integer matrices. v3: More fixes as suggested. - Reorder test_set_raw_data_value so that the values to set are all at the start and the expected values all at the end. - Use decimal numbers for the test index. (And print them to the test log accordingly.) - Fix dbg_print_bits() to increment byte. (Will be removed with the final revision of this test. As it helps me out.) Thanks @Mystral for telling me. That was why I kept going around in circles trying to fix patch #1. - Fix whitespace issues. (No spaces before / after parenthesis of function calls or operators.) - Get rid of C++ style comments, and use an if (0) for the tests that crash. - Store GetParameterByName()'s result in a variable, and check that it's not NULL. - Store the buffer offsets in a variable. Instead of constantly recalculating them when needed. - Print floats using the "%.8e" specifier. - Abort the tests when we hit the dead code path. - Get rid of pointless greater than single_size check. (Forgot to remove it in a restructuring.) - Don't use "\0", use "" instead. - Move test_set_raw_data_values into the actual test function, rename it to "tests", and make it const. - Use lowercase names for the global constants. - Avoid calling malloc(). Make the result_buf a static array. - Store GetValue()'s result in a variable, and ok() it's result. - Handle destroyed paramaters without crashing. v2: Actually use a real datatype instead of an enum when calling sizeof(). --- dlls/d3dx9_36/tests/effect.c | 736 +++++++++++++++++++++++++++++++++++ 1 file changed, 736 insertions(+) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 12af35cb8d8..b134f472e95 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -8703,6 +8703,741 @@ 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 +{ + const char *param_name; + D3DXPARAMETER_TYPE param_type; + const void *data; + unsigned int data_size; + unsigned int offset; + HRESULT expected_hr; + const void *expected_data; + unsigned int expected_data_size; +}; + +static const DWORD set_rawdata_clear[16] = { 0 }; +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 int set_rawdata_int44_bbaa[16] = { (3 << 8) | 3, 0, 0, 0, 514, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; +static const int set_rawdata_int44_bbaaa[16] = { (3 << 8) | 3, 0, 0, 0, 131586, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; +static const int set_rawdata_int44_bbaaaa[16] = { (3 << 8) | 3, 0, 0, 0, 33686018, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; +static const int set_rawdata_int44_bbaaaab[16] = { (3 << 8) | 3, 0, 0, 0, 33686018, 0, 0, 0, 3, 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 }; + +static void test_effect_setrawvalue_init_floats(void) +{ + memcpy(((unsigned char*)&set_rawdata_float4_ba) + 1, &set_rawdata_float44_a, sizeof(FLOAT)); + memcpy(((unsigned char*)&set_rawdata_float4_bba) + 1, &set_rawdata_float44_a, sizeof(FLOAT)); + set_rawdata_float4_bba[1] = 1.0f; + memcpy(((unsigned char*)&set_rawdata_float44_ba) + 1, &set_rawdata_float44_a, sizeof(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(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)[y] & (1 << x)) ? '1' : '0'; + } + } +} + +static void test_effect_setrawvalue(IDirect3DDevice9 *device) +{ + const struct test_set_raw_data_value tests[] = + { + /* All of these cause C0000005 on win10. + { "b", D3DXPT_BOOL, NULL, sizeof( BOOL ), 0, D3DERR_INVALIDCALL, NULL, sizeof( BOOL ), 0 }, + { "b4", D3DXPT_BOOL, NULL, sizeof( BOOL ) * 4, 0, D3DERR_INVALIDCALL, NULL, sizeof( BOOL ) * 4 }, + { "b44", D3DXPT_BOOL, NULL, sizeof( BOOL ) * 16, 0, D3DERR_INVALIDCALL, NULL, sizeof( BOOL ) * 16 }, + { "i", D3DXPT_INT, NULL, sizeof( DWORD ), 0, D3DERR_INVALIDCALL, NULL, sizeof( DWORD ) }, + { "i4", D3DXPT_INT, NULL, sizeof( DWORD ) * 4, 0, D3DERR_INVALIDCALL, NULL, sizeof( DWORD ) * 4 }, + { "i44", D3DXPT_INT, NULL, sizeof( DWORD ) * 16, 0, D3DERR_INVALIDCALL, NULL, sizeof( DWORD ) * 16 }, + { "f", D3DXPT_FLOAT, NULL, sizeof( DWORD ), 0, D3DERR_INVALIDCALL, NULL, sizeof( DWORD ) }, + { "f4", D3DXPT_FLOAT, NULL, sizeof( DWORD ) * 4, 0, D3DERR_INVALIDCALL, NULL, sizeof( DWORD ) * 4 }, + { "f44", D3DXPT_FLOAT, NULL, sizeof( DWORD ) * 16, 0, D3DERR_INVALIDCALL, NULL, sizeof( DWORD ) * 16 }, + { "s_2", D3DXPT_STRING, NULL, sizeof( "test" ), 0, D3DERR_INVALIDCALL, "test", sizeof( "test" ) }, + + All of these fail on win10 due to the paramater being destroyed* by a previous test. + *: GetParamaterByName() returns an invalid handle for the given parameter. + { "s", D3DXPT_STRING, "test_longer_string", 0, 0, D3DERR_INVALIDCALL, "", sizeof( "" ) }, + { "s", D3DXPT_STRING, "test_longer_string", sizeof( "test_longer_string" ), 0, D3DERR_INVALIDCALL, "", sizeof( "" ) }, + { "s", D3DXPT_STRING, "test_longer_string", sizeof( "test_longer_string" ), sizeof( "test" ), D3DERR_INVALIDCALL, "", sizeof( "" ) }, + { "tex", D3DXPT_TEXTURE, "DEADBEEF", 0, 0, D3DERR_INVALIDCALL, "", sizeof( "" ) }, + { "tex", D3DXPT_TEXTURE, "DEAFCAFE", sizeof( "DEAFCAFE" ), sizeof( "DEAFCAFE" ), D3DERR_INVALIDCALL, "", sizeof( "" ) }, + { "tex2d", D3DXPT_TEXTURE2D, "DEADBEEF", 0, 0, D3DERR_INVALIDCALL, "", sizeof( "" ) }, + { "tex2d", D3DXPT_TEXTURE2D, "DEAFCAFE", sizeof( "DEAFCAFE" ), sizeof( "DEAFCAFE" ), D3DERR_INVALIDCALL, "", sizeof( "" ) }, + { "tex3d", D3DXPT_TEXTURE3D, "DEADBEEF", 0, 0, D3DERR_INVALIDCALL, "", sizeof( "" ) }, + { "tex3d", D3DXPT_TEXTURE3D, "DEAFCAFE", sizeof( "DEAFCAFE" ), sizeof( "DEAFCAFE" ), D3DERR_INVALIDCALL, "", sizeof( "" ) }, + { "v", D3DXPT_VERTEXSHADER, "DEADBEEF", 0, 0, D3DERR_INVALIDCALL, "", sizeof( "" ) }, + { "v", D3DXPT_VERTEXSHADER, "DEAFCAFE", sizeof( "DEAFCAFE" ), sizeof( "DEAFCAFE" ), D3DERR_INVALIDCALL, "", sizeof( "" ) }, + { "v_2", D3DXPT_VERTEXSHADER, "DEADBEEF", 0, 0, D3DERR_INVALIDCALL, "", sizeof( "" ) }, + { "v_2", D3DXPT_VERTEXSHADER, "DEAFCAFE", sizeof( "DEAFCAFE" ), sizeof( "DEAFCAFE" ), D3DERR_INVALIDCALL, "", sizeof( "" ) }, + { "p", D3DXPT_PIXELSHADER, "DEADBEEF", 0, 0, D3DERR_INVALIDCALL, "", sizeof( "" ) }, + { "p", D3DXPT_PIXELSHADER, "DEAFCAFE", sizeof( "DEAFCAFE" ), sizeof( "DEAFCAFE" ), D3DERR_INVALIDCALL, "", sizeof( "" ) }, + { "p_2", D3DXPT_PIXELSHADER, "DEADBEEF", 0, 0, D3DERR_INVALIDCALL, "", sizeof( "" ) }, + { "p_2", D3DXPT_PIXELSHADER, "DEAFCAFE", sizeof( "DEAFCAFE" ), sizeof( "DEAFCAFE" ), D3DERR_INVALIDCALL, "", sizeof( "" ) }, + */ + + /* Boolean. Test# 0 */ + { "b", D3DXPT_BOOL, &set_rawdata_bool44_a, sizeof( BOOL ), 0, S_OK, &set_rawdata_bool44_a, sizeof( BOOL ) }, + { "b", D3DXPT_BOOL, &set_rawdata_int44_b, 0, 0, S_OK, &set_rawdata_bool44_a, sizeof( BOOL ) }, + { "b", D3DXPT_BOOL, &set_rawdata_int44_b, sizeof( BOOL ), sizeof( BOOL ), S_OK, &set_rawdata_bool44_a, sizeof( BOOL ) }, + { "b", D3DXPT_BOOL, &set_rawdata_int44_b, sizeof( BOOL ), 0, S_OK, &set_rawdata_bool44_a, sizeof( BOOL ) }, + + /* Boolean vector. Test# 4 */ + { "b4", D3DXPT_BOOL, &set_rawdata_bool44_a, sizeof( BOOL ) * 4, 0, S_OK, &set_rawdata_bool44_a, sizeof( BOOL ) * 4 }, + { "b4", D3DXPT_BOOL, &set_rawdata_int44_b, 0, 0, S_OK, &set_rawdata_bool44_a, sizeof( BOOL ) * 4 }, + { "b4", D3DXPT_BOOL, &set_rawdata_int44_b, sizeof( BOOL ) * 4, 0, S_OK, &set_rawdata_bool44_a, sizeof( BOOL ) * 4 }, + { "b4", D3DXPT_BOOL, &set_rawdata_int44_b, sizeof( BOOL ) * 4, 1, S_OK, &set_rawdata_bool44_a, sizeof( BOOL ) * 4 }, + { "b4", D3DXPT_BOOL, &set_rawdata_int44_b, sizeof( BOOL ) * 4, sizeof( BOOL ), S_OK, &set_rawdata_bool4_ba, sizeof( BOOL ) * 4 }, + + /* Boolean matrix. Test# 9 */ + { "b44", D3DXPT_BOOL, &set_rawdata_bool44_a, sizeof( DWORD ) * 16, 0, S_OK, &set_rawdata_bool44_a, sizeof( BOOL ) * 16 }, + { "b44", D3DXPT_BOOL, &set_rawdata_int44_b, 0, 0, S_OK, &set_rawdata_bool44_a, sizeof( BOOL ) * 16 }, + { "b44", D3DXPT_BOOL, &set_rawdata_int44_b, sizeof( BOOL ) * 16, 0, S_OK, &set_rawdata_bool44_a, sizeof( BOOL ) * 16 }, + { "b44", D3DXPT_BOOL, &set_rawdata_int44_b, sizeof( BOOL ) * 16, 1, S_OK, &set_rawdata_bool44_a, sizeof( BOOL ) * 16 }, + { "b44", D3DXPT_BOOL, &set_rawdata_int44_b, sizeof( BOOL ) * 16, sizeof( BOOL ), S_OK, &set_rawdata_bool44_ba, sizeof( BOOL ) * 16 }, + + /* Integer. Test# 14 */ + { "i", D3DXPT_INT, &set_rawdata_int44_a, sizeof( DWORD ), 0, S_OK, &set_rawdata_int44_a, sizeof( DWORD ) }, + { "i", D3DXPT_INT, &set_rawdata_int44_b, 0, 0, S_OK, &set_rawdata_int44_a, sizeof( DWORD ) }, + { "i", D3DXPT_INT, &set_rawdata_int44_b, sizeof( DWORD ), sizeof( DWORD ), S_OK, &set_rawdata_int44_a, sizeof( DWORD ) }, + + /* Integer vector. Test# 17 */ + { "i4", D3DXPT_INT, &set_rawdata_int44_a, sizeof( DWORD ) * 4, 0, S_OK, &set_rawdata_int44_a, sizeof( DWORD ) * 4 }, + { "i4", D3DXPT_INT, &set_rawdata_int44_b, 0, 0, S_OK, &set_rawdata_int44_a, sizeof( DWORD ) * 4 }, + { "i4", D3DXPT_INT, &set_rawdata_int44_b, sizeof( DWORD ), 0, S_OK, &set_rawdata_int44_b, sizeof( DWORD ) * 4 }, + { "i4", D3DXPT_INT, &set_rawdata_int44_b, sizeof( DWORD ), 1, S_OK, &set_rawdata_int4_ba, sizeof( DWORD ) * 4 }, + { "i4", D3DXPT_INT, &set_rawdata_int44_a, sizeof( DWORD ), sizeof( DWORD ), S_OK, &set_rawdata_int4_bba, sizeof( DWORD ) * 4 }, + + /* Integer matrix. Test# 22 */ + { "i44", D3DXPT_INT, &set_rawdata_int44_a, sizeof( DWORD ) * 16, 0, S_OK, &set_rawdata_int44_a, sizeof( DWORD ) * 16 }, + { "i44", D3DXPT_INT, &set_rawdata_int44_b, 0, 0, S_OK, &set_rawdata_int44_a, sizeof( DWORD ) * 16 }, + { "i44", D3DXPT_INT, &set_rawdata_int44_b, sizeof( DWORD ), 0, S_OK, &set_rawdata_int44_b, sizeof( DWORD ) * 16 }, + { "i44", D3DXPT_INT, &set_rawdata_int44_b, sizeof( DWORD ), 1, S_OK, &set_rawdata_int44_ba, sizeof( DWORD ) * 16 }, + { "i44", D3DXPT_INT, &set_rawdata_int44_a, sizeof( DWORD ), sizeof( DWORD ), S_OK, &set_rawdata_int44_bba, sizeof( DWORD ) * 16 }, + { "i44", D3DXPT_INT, &set_rawdata_int44_a, sizeof( DWORD ), sizeof( DWORD ) + 1, S_OK, &set_rawdata_int44_bbaa, sizeof( DWORD ) * 16 }, + { "i44", D3DXPT_INT, &set_rawdata_int44_a, sizeof( DWORD ), sizeof( DWORD ) + 2, S_OK, &set_rawdata_int44_bbaaa, sizeof( DWORD ) * 16 }, + { "i44", D3DXPT_INT, &set_rawdata_int44_a, sizeof( DWORD ), sizeof( DWORD ) + 3, S_OK, &set_rawdata_int44_bbaaaa, sizeof( DWORD ) * 16 }, + { "i44", D3DXPT_INT, &set_rawdata_int44_b, sizeof( DWORD ), sizeof( DWORD ) * 2, S_OK, set_rawdata_int44_bbaaaab, sizeof( DWORD ) * 16 }, + + /* Float. Test# 31 */ + { "f", D3DXPT_FLOAT, &set_rawdata_float44_a, sizeof( FLOAT ), 0, S_OK, &set_rawdata_float44_a, sizeof( FLOAT ) }, + { "f", D3DXPT_FLOAT, &set_rawdata_float44_b, 0, 0, S_OK, &set_rawdata_float44_a, sizeof( FLOAT ) }, + { "f", D3DXPT_FLOAT, &set_rawdata_float44_b, sizeof( FLOAT ), sizeof( FLOAT ), S_OK, &set_rawdata_float44_a, sizeof( FLOAT ) }, + + /* Float vector. Test# 34 */ + { "f4", D3DXPT_FLOAT, &set_rawdata_float44_a, sizeof( FLOAT ) * 4, 0, S_OK, &set_rawdata_float44_a, sizeof( FLOAT ) * 4 }, + { "f4", D3DXPT_FLOAT, &set_rawdata_float44_b, 0, 0, S_OK, &set_rawdata_float44_a, sizeof( FLOAT ) * 4 }, + { "f4", D3DXPT_FLOAT, &set_rawdata_float44_b, sizeof( FLOAT ), 0, S_OK, &set_rawdata_float44_b, sizeof( FLOAT ) * 4 }, + { "f4", D3DXPT_FLOAT, &set_rawdata_float44_a, sizeof( FLOAT ), 1, S_OK, &set_rawdata_float4_ba, sizeof( FLOAT ) * 4 }, + { "f4", D3DXPT_FLOAT, &set_rawdata_float44_a, sizeof( FLOAT ), sizeof( FLOAT ), S_OK, &set_rawdata_float4_bba, sizeof( FLOAT ) * 4 }, + + /* Float matrix. Test# 39 */ + { "f44", D3DXPT_FLOAT, &set_rawdata_float44_a, sizeof( FLOAT ) * 16, 0, S_OK, &set_rawdata_float44_a, sizeof( FLOAT ) * 16 }, + { "f44", D3DXPT_FLOAT, &set_rawdata_float44_b, 0, 0, S_OK, &set_rawdata_float44_a, sizeof( FLOAT ) * 16 }, + { "f44", D3DXPT_FLOAT, &set_rawdata_float44_b, sizeof( FLOAT ), 0, S_OK, &set_rawdata_float44_b, sizeof( FLOAT ) * 16 }, + { "f44", D3DXPT_FLOAT, &set_rawdata_float44_a, sizeof( FLOAT ), 1, S_OK, &set_rawdata_float44_ba, sizeof( FLOAT ) * 16 }, + { "f44", D3DXPT_FLOAT, &set_rawdata_float44_a, sizeof( FLOAT ), sizeof( FLOAT ), S_OK, &set_rawdata_float44_bba, sizeof( FLOAT ) * 16 }, + + /* String vector. Test# 44 + Note: These tests will always allow getting a handle to their + paramater. But the GetString() call will fail without a crash. + (Probably due to the string being destroyed. See below.) + + So for these we set the check string to "0xBADBEEF" to allow + checking the return value of GetString(). + */ + { "s_2", D3DXPT_STRING, "test", sizeof( "test" ), 0, S_OK, "0xBADBEEF", sizeof( "" ) }, + { "s_2", D3DXPT_STRING, "test_longer_string", 0, 0, S_OK, "0xBADBEEF", sizeof( "" ) }, + { "s_2", D3DXPT_STRING, "test_longer_string", sizeof( "test_longer_string" ), 0, S_OK, "0xBADBEEF", sizeof( "" ) }, + + /* Strings. Test# 47 + Note: All tests below this point are to check if + 1) The paramater is destroyed. + 2) The paramater handle can no longer be + retrived by GetParamaterByName(). + + Any attempt to get the paramater after it's destruction via it's + relevant GetXXX() function will cause us to crash. + + As such the GetParamaterByName() tests have their expected data + set to NULL. (Which prevents the call to SetRawValue().) + + The destroying tests have their expected data length set to 0 and + expected data set to "". (Which allows calling SetRawValue(), + but avoids calling the relavent GetXXX() function.) + */ + { "s", D3DXPT_STRING, "test", sizeof( "test" ), 0, S_OK, "", 0 }, + { "s", D3DXPT_STRING, NULL, sizeof( "test" ), 0, D3DERR_INVALIDCALL, NULL, 0 }, + + /* Textures. Test# 49 */ + { "tex", D3DXPT_TEXTURE, "DEAFCAFE", sizeof( "DEAFCAFE" ), 0, S_OK, "", 0 }, + { "tex", D3DXPT_TEXTURE, NULL, sizeof( "DEAFCAFE" ), 0, D3DERR_INVALIDCALL, NULL, 0 }, + + /* 2D Textures. Test# 51 */ + { "tex2d", D3DXPT_TEXTURE2D, "DEAFCAFE", sizeof( "DEAFCAFE" ), 0, S_OK, "", 0 }, + { "tex2d", D3DXPT_TEXTURE2D, NULL, sizeof( "DEAFCAFE" ), 0, D3DERR_INVALIDCALL, NULL, 0 }, + + /* 3D Textures. Test# 53 */ + { "tex3d", D3DXPT_TEXTURE3D, "DEAFCAFE", sizeof( "DEAFCAFE" ), 0, S_OK, "", 0 }, + { "tex3d", D3DXPT_TEXTURE3D, NULL, sizeof( "DEAFCAFE" ), 0, D3DERR_INVALIDCALL, NULL, 0 }, + + /* Vertex Shaders. Test# 55 */ + { "v", D3DXPT_VERTEXSHADER, "DEAFCAFE", sizeof( "DEAFCAFE" ), 0, S_OK, "", 0 }, + { "v", D3DXPT_VERTEXSHADER, NULL, sizeof( "DEAFCAFE" ), 0, D3DERR_INVALIDCALL, NULL, 0 }, + + /* Vertex Shaders vector. Test# 57 */ + { "v_2", D3DXPT_VERTEXSHADER, "DEAFCAFE", sizeof( "DEAFCAFE" ), 0, S_OK, "", 0 }, + { "v_2", D3DXPT_VERTEXSHADER, NULL, sizeof( "DEAFCAFE" ), 0, D3DERR_INVALIDCALL, NULL, 0 }, + + /* Pixel Shaders. Test# 59 */ + { "p", D3DXPT_PIXELSHADER, "DEAFCAFE", sizeof( "DEAFCAFE" ), 0, S_OK, "", 0 }, + { "p", D3DXPT_PIXELSHADER, NULL, sizeof( "DEAFCAFE" ), 0, D3DERR_INVALIDCALL, NULL, 0 }, + + /* Pixel Shaders vector. Test# 61. */ + { "p_2", D3DXPT_PIXELSHADER, "DEAFCAFE", sizeof( "DEAFCAFE" ), 0, S_OK, "", 0 }, + { "p_2", D3DXPT_PIXELSHADER, NULL, sizeof( "DEAFCAFE" ), 0, D3DERR_INVALIDCALL, NULL, 0 } + }; + + void *current_result, *current_expected; + char result_buf[64] = { '\0' }; + char expected_bit_buf[33] = { '\0' }; + char result_bit_buf[33] = { '\0' }; + unsigned int x, y, single_size; + D3DXHANDLE param_hr; + ID3DXEffect *effect; + 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. */ + if (0) + { + 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(tests) / sizeof(struct test_set_raw_data_value)); x++) + { + param_hr = effect->lpVtbl->GetParameterByName(effect, NULL, tests[x].param_name); + ok((param_hr != NULL && tests[x].expected_data != NULL) || + (param_hr == NULL && tests[x].expected_data == NULL), + "Test # %d GetParameterByName() did not return the expected result.\n", x); + if (tests[x].expected_data != NULL) + { + memset(result_buf, '\0', tests[x].expected_data_size); + hr = effect->lpVtbl->SetRawValue(effect, + param_hr, + tests[x].data, + tests[x].offset, + tests[x].data_size); + ok(hr == tests[x].expected_hr, + "Test # %d var name %s : got HRESULT %#1.1x, expected %#1.1x.\n", + x, + tests[x].param_name, + hr, + tests[x].expected_hr); + switch (tests[x].param_type) + { + case D3DXPT_BOOL: + case D3DXPT_INT: + case D3DXPT_FLOAT: + ok(effect->lpVtbl->GetValue(effect, + param_hr, + result_buf, + tests[x].expected_data_size) == S_OK, + "Test # %d var name %s : could not get value.\n", + x, + tests[x].param_name); + single_size = (tests[x].param_type == D3DXPT_BOOL) ? sizeof(BOOL) : + (tests[x].param_type == D3DXPT_INT) ? sizeof(DWORD) : + sizeof(FLOAT); + + for (y = 0; y < tests[x].expected_data_size / single_size; y++) + { + current_result = ((unsigned char*)result_buf) + (single_size * y); + current_expected = ((unsigned char*)tests[x].expected_data) + + (single_size * y); + memcmp_ret = memcmp(current_result, current_expected, + single_size); + if (memcmp_ret != 0) + { + dbg_print_bits(current_result, single_size, result_bit_buf); + dbg_print_bits(current_expected, single_size, expected_bit_buf); + } + switch (tests[x].param_type) + { + case D3DXPT_FLOAT: + ok(memcmp_ret == 0, + "Test # %d type %#1.1x var name %s index %#1.1x: got %.8e (bits: %s), expected %.8e (bits: %s).\n", + x, + tests[x].param_type, + tests[x].param_name, + y, + *(float*)current_result, + result_bit_buf, + *(float*)current_expected, + expected_bit_buf); + break; + case D3DXPT_INT: + ok(memcmp_ret == 0, + "Test # %d type %#1.1x var name %s index %#1.1x: got %#1.1x (bits: %s), expected %#1.1x (bits: %s).\n", + x, + tests[x].param_type, + tests[x].param_name, + y, + *(unsigned int*)current_result, + result_bit_buf, + *(unsigned int*)current_expected, + expected_bit_buf); + break; + case D3DXPT_BOOL: + ok(memcmp_ret == 0, + "Test # %d type %#1.1x var name %s index %#1.1x: got %#1.1x (bits: %s), expected %#1.1x (bits: %s).\n", + x, + tests[x].param_type, + tests[x].param_name, + y, + *(unsigned char*)current_result, + result_bit_buf, + *(unsigned char*)current_expected, + expected_bit_buf); + break; + default: + /* Should never get here, but gcc complains without a default... */ + skip("Test # %d not performed. Reached dead codepath.\n", x); + return; + break; + }; + } + break; + /* All types below will crash if we call their GetXXX() function + after the paramater has been destroyed. + + We use the size check to avoid the crash. + */ + case D3DXPT_STRING: + if (tests[x].expected_data_size > 0) + { + hr = effect->lpVtbl->GetString(effect, + param_hr, + (const char**)¤t_result); + if (memcmp(tests[x].expected_data, + "0xBADBEEF", + sizeof("0xBADBEEF")) != 0) + { + ok(hr == S_OK, + "Test # %d var name %s : could not get value.\n", + x, + tests[x].param_name); + ok(memcmp(current_result, + tests[x].expected_data, + tests[x].expected_data_size) == 0, + "Test # %d type %#1.1x var name %s: got %s, expected %s.\n", + x, + tests[x].param_type, + tests[x].param_name, + (char *)current_result, + (char *)tests[x].expected_data); + } + else + { + /* Check for invalid call on destroyed string vector. */ + ok(hr == D3DERR_INVALIDCALL, + "Test # %d var name %s : got %#x expected %#x\n", + x, + tests[x].param_name, + hr, + D3DERR_INVALIDCALL); + } + } + break; + case D3DXPT_TEXTURE: + case D3DXPT_TEXTURE2D: + case D3DXPT_TEXTURE3D: + if (tests[x].expected_data_size > 0) + { + ok(effect->lpVtbl->GetTexture(effect, + param_hr, + (LPDIRECT3DBASETEXTURE9*)¤t_result) == S_OK, + "Test # %d var name %s : could not get value.\n", + x, + tests[x].param_name); + ok(memcmp(current_result, + tests[x].expected_data, + tests[x].expected_data_size) == 0, + "Test # %d type %#1.1x var name %s: did not get expected result.\n", + x, + tests[x].param_type, + tests[x].param_name); + } + break; + case D3DXPT_VERTEXSHADER: + if (tests[x].expected_data_size > 0) + { + ok(effect->lpVtbl->GetVertexShader(effect, + param_hr, + (LPDIRECT3DVERTEXSHADER9*)¤t_result) == S_OK, + "Test # %d var name %s : could not get value.\n", + x, + tests[x].param_name); + ok(memcmp(current_result, + tests[x].expected_data, + tests[x].expected_data_size) == 0, + "Test # %d type %#1.1x var name %s: did not get expected result.\n", + x, + tests[x].param_type, + tests[x].param_name); + } + break; + case D3DXPT_PIXELSHADER: + if (tests[x].expected_data_size > 0) + { + ok(effect->lpVtbl->GetPixelShader(effect, + param_hr, + (LPDIRECT3DPIXELSHADER9*)¤t_result) == S_OK, + "Test # %d var name %s : could not get value.\n", + x, + tests[x].param_name); + ok(memcmp(current_result, + tests[x].expected_data, + tests[x].expected_data_size) == 0, + "Test # %d type %#1.1x var name %s: did not get expected result.\n", + x, + tests[x].param_type, + tests[x].param_name); + } + break; + default: + /* Should never get here. */ + skip("Test # %d type %#1.1x var name %s : unknown type.\n", + x, + tests[x].param_type, + tests[x].param_name); + break; + }; + /*effect->lpVtbl->SetRawValue( effect, + effect->lpVtbl->GetParameterByName( effect, NULL, tests[x].param_name ), + set_rawdata_clear, + 0, + sizeof( set_rawdata_clear ) );*/ + } + else + { + effect->lpVtbl->Release(effect); + hr = D3DXCreateEffect(device, test_set_raw_value_blob, + sizeof(test_set_raw_value_blob), NULL, NULL, 0, NULL, &effect, NULL); + ok(hr == D3D_OK, "Test # %d Unable to recreate effect. Got result %#1.1x, expected 0 (D3D_OK).\n", + x, hr); + if (hr != D3D_OK) + return; + } + } + effect->lpVtbl->Release(effect); +} + START_TEST(effect) { IDirect3DDevice9 *device; @@ -8731,6 +9466,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
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 tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details: The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=125451 Your paranoid android. === debian11 (32 bit report) === d3dx9_36: effect.c:9285: Test failed: Test # 26 type 0x2 var name i44 index 0x4: got 0 (bits: 00000000000000000000000000000000), expected 0x2 (bits: 01000000000000000000000000000000). effect.c:9285: Test failed: Test # 27 type 0x2 var name i44 index 0x4: got 0x200 (bits: 00000000010000000000000000000000), expected 0x202 (bits: 01000000010000000000000000000000). effect.c:9285: Test failed: Test # 28 type 0x2 var name i44 index 0x4: got 0x20200 (bits: 00000000010000000100000000000000), expected 0x20202 (bits: 01000000010000000100000000000000). effect.c:9285: Test failed: Test # 29 type 0x2 var name i44 index 0x4: got 0x2020200 (bits: 00000000010000000100000001000000), expected 0x2020202 (bits: 01000000010000000100000001000000). effect.c:9285: Test failed: Test # 30 type 0x2 var name i44 index 0x4: got 0x2020200 (bits: 00000000010000000100000001000000), expected 0x2020202 (bits: 01000000010000000100000001000000). effect.c:9285: Test failed: Test # 30 type 0x2 var name i44 index 0x8: got 0 (bits: 00000000000000000000000000000000), expected 0x3 (bits: 11000000000000000000000000000000). effect.c:9273: Test failed: Test # 42 type 0x3 var name f44 index 0x1: got 8.82818033e-044 (bits: 11111100000000000000000000000000), expected 0.00000000e+000 (bits: 00000000000000000000000000000000). effect.c:9273: Test failed: Test # 42 type 0x3 var name f44 index 0x4: got 0.00000000e+000 (bits: 00000000000000000000000000000000), expected 8.82818033e-044 (bits: 11111100000000000000000000000000). effect.c:9273: Test failed: Test # 43 type 0x3 var name f44 index 0x1: got 8.82818033e-044 (bits: 11111100000000000000000000000000), expected 0.00000000e+000 (bits: 00000000000000000000000000000000). effect.c:9273: Test failed: Test # 43 type 0x3 var name f44 index 0x4: got 0.00000000e+000 (bits: 00000000000000000000000000000000), expected 1.00000000e+000 (bits: 00000000000000000000000111111100). effect.c:9236: Test failed: Test # 45 var name s_2 : got HRESULT 0x8876086c, expected 0. effect.c:9236: Test failed: Test # 46 var name s_2 : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 48 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 49 var name tex : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 50 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 51 var name tex2d : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 52 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 53 var name tex3d : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 54 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 55 var name v : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 56 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 57 var name v_2 : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 58 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 59 var name p : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 60 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 61 var name p_2 : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 62 GetParameterByName() did not return the expected result. === debian11 (32 bit ar:MA report) === d3dx9_36: effect.c:9285: Test failed: Test # 26 type 0x2 var name i44 index 0x4: got 0 (bits: 00000000000000000000000000000000), expected 0x2 (bits: 01000000000000000000000000000000). effect.c:9285: Test failed: Test # 27 type 0x2 var name i44 index 0x4: got 0x200 (bits: 00000000010000000000000000000000), expected 0x202 (bits: 01000000010000000000000000000000). effect.c:9285: Test failed: Test # 28 type 0x2 var name i44 index 0x4: got 0x20200 (bits: 00000000010000000100000000000000), expected 0x20202 (bits: 01000000010000000100000000000000). effect.c:9285: Test failed: Test # 29 type 0x2 var name i44 index 0x4: got 0x2020200 (bits: 00000000010000000100000001000000), expected 0x2020202 (bits: 01000000010000000100000001000000). effect.c:9285: Test failed: Test # 30 type 0x2 var name i44 index 0x4: got 0x2020200 (bits: 00000000010000000100000001000000), expected 0x2020202 (bits: 01000000010000000100000001000000). effect.c:9285: Test failed: Test # 30 type 0x2 var name i44 index 0x8: got 0 (bits: 00000000000000000000000000000000), expected 0x3 (bits: 11000000000000000000000000000000). effect.c:9273: Test failed: Test # 42 type 0x3 var name f44 index 0x1: got 8.82818033e-044 (bits: 11111100000000000000000000000000), expected 0.00000000e+000 (bits: 00000000000000000000000000000000). effect.c:9273: Test failed: Test # 42 type 0x3 var name f44 index 0x4: got 0.00000000e+000 (bits: 00000000000000000000000000000000), expected 8.82818033e-044 (bits: 11111100000000000000000000000000). effect.c:9273: Test failed: Test # 43 type 0x3 var name f44 index 0x1: got 8.82818033e-044 (bits: 11111100000000000000000000000000), expected 0.00000000e+000 (bits: 00000000000000000000000000000000). effect.c:9273: Test failed: Test # 43 type 0x3 var name f44 index 0x4: got 0.00000000e+000 (bits: 00000000000000000000000000000000), expected 1.00000000e+000 (bits: 00000000000000000000000111111100). effect.c:9236: Test failed: Test # 45 var name s_2 : got HRESULT 0x8876086c, expected 0. effect.c:9236: Test failed: Test # 46 var name s_2 : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 48 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 49 var name tex : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 50 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 51 var name tex2d : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 52 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 53 var name tex3d : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 54 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 55 var name v : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 56 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 57 var name v_2 : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 58 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 59 var name p : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 60 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 61 var name p_2 : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 62 GetParameterByName() did not return the expected result. === debian11 (32 bit de report) === d3dx9_36: effect.c:9285: Test failed: Test # 26 type 0x2 var name i44 index 0x4: got 0 (bits: 00000000000000000000000000000000), expected 0x2 (bits: 01000000000000000000000000000000). effect.c:9285: Test failed: Test # 27 type 0x2 var name i44 index 0x4: got 0x200 (bits: 00000000010000000000000000000000), expected 0x202 (bits: 01000000010000000000000000000000). effect.c:9285: Test failed: Test # 28 type 0x2 var name i44 index 0x4: got 0x20200 (bits: 00000000010000000100000000000000), expected 0x20202 (bits: 01000000010000000100000000000000). effect.c:9285: Test failed: Test # 29 type 0x2 var name i44 index 0x4: got 0x2020200 (bits: 00000000010000000100000001000000), expected 0x2020202 (bits: 01000000010000000100000001000000). effect.c:9285: Test failed: Test # 30 type 0x2 var name i44 index 0x4: got 0x2020200 (bits: 00000000010000000100000001000000), expected 0x2020202 (bits: 01000000010000000100000001000000). effect.c:9285: Test failed: Test # 30 type 0x2 var name i44 index 0x8: got 0 (bits: 00000000000000000000000000000000), expected 0x3 (bits: 11000000000000000000000000000000). effect.c:9273: Test failed: Test # 42 type 0x3 var name f44 index 0x1: got 8.82818033e-044 (bits: 11111100000000000000000000000000), expected 0.00000000e+000 (bits: 00000000000000000000000000000000). effect.c:9273: Test failed: Test # 42 type 0x3 var name f44 index 0x4: got 0.00000000e+000 (bits: 00000000000000000000000000000000), expected 8.82818033e-044 (bits: 11111100000000000000000000000000). effect.c:9273: Test failed: Test # 43 type 0x3 var name f44 index 0x1: got 8.82818033e-044 (bits: 11111100000000000000000000000000), expected 0.00000000e+000 (bits: 00000000000000000000000000000000). effect.c:9273: Test failed: Test # 43 type 0x3 var name f44 index 0x4: got 0.00000000e+000 (bits: 00000000000000000000000000000000), expected 1.00000000e+000 (bits: 00000000000000000000000111111100). effect.c:9236: Test failed: Test # 45 var name s_2 : got HRESULT 0x8876086c, expected 0. effect.c:9236: Test failed: Test # 46 var name s_2 : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 48 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 49 var name tex : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 50 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 51 var name tex2d : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 52 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 53 var name tex3d : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 54 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 55 var name v : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 56 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 57 var name v_2 : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 58 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 59 var name p : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 60 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 61 var name p_2 : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 62 GetParameterByName() did not return the expected result. === debian11 (32 bit fr report) === d3dx9_36: effect.c:9285: Test failed: Test # 26 type 0x2 var name i44 index 0x4: got 0 (bits: 00000000000000000000000000000000), expected 0x2 (bits: 01000000000000000000000000000000). effect.c:9285: Test failed: Test # 27 type 0x2 var name i44 index 0x4: got 0x200 (bits: 00000000010000000000000000000000), expected 0x202 (bits: 01000000010000000000000000000000). effect.c:9285: Test failed: Test # 28 type 0x2 var name i44 index 0x4: got 0x20200 (bits: 00000000010000000100000000000000), expected 0x20202 (bits: 01000000010000000100000000000000). effect.c:9285: Test failed: Test # 29 type 0x2 var name i44 index 0x4: got 0x2020200 (bits: 00000000010000000100000001000000), expected 0x2020202 (bits: 01000000010000000100000001000000). effect.c:9285: Test failed: Test # 30 type 0x2 var name i44 index 0x4: got 0x2020200 (bits: 00000000010000000100000001000000), expected 0x2020202 (bits: 01000000010000000100000001000000). effect.c:9285: Test failed: Test # 30 type 0x2 var name i44 index 0x8: got 0 (bits: 00000000000000000000000000000000), expected 0x3 (bits: 11000000000000000000000000000000). effect.c:9273: Test failed: Test # 42 type 0x3 var name f44 index 0x1: got 8.82818033e-044 (bits: 11111100000000000000000000000000), expected 0.00000000e+000 (bits: 00000000000000000000000000000000). effect.c:9273: Test failed: Test # 42 type 0x3 var name f44 index 0x4: got 0.00000000e+000 (bits: 00000000000000000000000000000000), expected 8.82818033e-044 (bits: 11111100000000000000000000000000). effect.c:9273: Test failed: Test # 43 type 0x3 var name f44 index 0x1: got 8.82818033e-044 (bits: 11111100000000000000000000000000), expected 0.00000000e+000 (bits: 00000000000000000000000000000000). effect.c:9273: Test failed: Test # 43 type 0x3 var name f44 index 0x4: got 0.00000000e+000 (bits: 00000000000000000000000000000000), expected 1.00000000e+000 (bits: 00000000000000000000000111111100). effect.c:9236: Test failed: Test # 45 var name s_2 : got HRESULT 0x8876086c, expected 0. effect.c:9236: Test failed: Test # 46 var name s_2 : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 48 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 49 var name tex : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 50 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 51 var name tex2d : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 52 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 53 var name tex3d : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 54 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 55 var name v : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 56 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 57 var name v_2 : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 58 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 59 var name p : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 60 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 61 var name p_2 : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 62 GetParameterByName() did not return the expected result. === debian11 (32 bit he:IL report) === d3dx9_36: effect.c:9285: Test failed: Test # 26 type 0x2 var name i44 index 0x4: got 0 (bits: 00000000000000000000000000000000), expected 0x2 (bits: 01000000000000000000000000000000). effect.c:9285: Test failed: Test # 27 type 0x2 var name i44 index 0x4: got 0x200 (bits: 00000000010000000000000000000000), expected 0x202 (bits: 01000000010000000000000000000000). effect.c:9285: Test failed: Test # 28 type 0x2 var name i44 index 0x4: got 0x20200 (bits: 00000000010000000100000000000000), expected 0x20202 (bits: 01000000010000000100000000000000). effect.c:9285: Test failed: Test # 29 type 0x2 var name i44 index 0x4: got 0x2020200 (bits: 00000000010000000100000001000000), expected 0x2020202 (bits: 01000000010000000100000001000000). effect.c:9285: Test failed: Test # 30 type 0x2 var name i44 index 0x4: got 0x2020200 (bits: 00000000010000000100000001000000), expected 0x2020202 (bits: 01000000010000000100000001000000). effect.c:9285: Test failed: Test # 30 type 0x2 var name i44 index 0x8: got 0 (bits: 00000000000000000000000000000000), expected 0x3 (bits: 11000000000000000000000000000000). effect.c:9273: Test failed: Test # 42 type 0x3 var name f44 index 0x1: got 8.82818033e-044 (bits: 11111100000000000000000000000000), expected 0.00000000e+000 (bits: 00000000000000000000000000000000). effect.c:9273: Test failed: Test # 42 type 0x3 var name f44 index 0x4: got 0.00000000e+000 (bits: 00000000000000000000000000000000), expected 8.82818033e-044 (bits: 11111100000000000000000000000000). effect.c:9273: Test failed: Test # 43 type 0x3 var name f44 index 0x1: got 8.82818033e-044 (bits: 11111100000000000000000000000000), expected 0.00000000e+000 (bits: 00000000000000000000000000000000). effect.c:9273: Test failed: Test # 43 type 0x3 var name f44 index 0x4: got 0.00000000e+000 (bits: 00000000000000000000000000000000), expected 1.00000000e+000 (bits: 00000000000000000000000111111100). effect.c:9236: Test failed: Test # 45 var name s_2 : got HRESULT 0x8876086c, expected 0. effect.c:9236: Test failed: Test # 46 var name s_2 : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 48 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 49 var name tex : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 50 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 51 var name tex2d : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 52 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 53 var name tex3d : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 54 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 55 var name v : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 56 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 57 var name v_2 : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 58 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 59 var name p : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 60 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 61 var name p_2 : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 62 GetParameterByName() did not return the expected result. === debian11 (32 bit hi:IN report) === d3dx9_36: effect.c:9285: Test failed: Test # 26 type 0x2 var name i44 index 0x4: got 0 (bits: 00000000000000000000000000000000), expected 0x2 (bits: 01000000000000000000000000000000). effect.c:9285: Test failed: Test # 27 type 0x2 var name i44 index 0x4: got 0x200 (bits: 00000000010000000000000000000000), expected 0x202 (bits: 01000000010000000000000000000000). effect.c:9285: Test failed: Test # 28 type 0x2 var name i44 index 0x4: got 0x20200 (bits: 00000000010000000100000000000000), expected 0x20202 (bits: 01000000010000000100000000000000). effect.c:9285: Test failed: Test # 29 type 0x2 var name i44 index 0x4: got 0x2020200 (bits: 00000000010000000100000001000000), expected 0x2020202 (bits: 01000000010000000100000001000000). effect.c:9285: Test failed: Test # 30 type 0x2 var name i44 index 0x4: got 0x2020200 (bits: 00000000010000000100000001000000), expected 0x2020202 (bits: 01000000010000000100000001000000). effect.c:9285: Test failed: Test # 30 type 0x2 var name i44 index 0x8: got 0 (bits: 00000000000000000000000000000000), expected 0x3 (bits: 11000000000000000000000000000000). effect.c:9273: Test failed: Test # 42 type 0x3 var name f44 index 0x1: got 8.82818033e-044 (bits: 11111100000000000000000000000000), expected 0.00000000e+000 (bits: 00000000000000000000000000000000). effect.c:9273: Test failed: Test # 42 type 0x3 var name f44 index 0x4: got 0.00000000e+000 (bits: 00000000000000000000000000000000), expected 8.82818033e-044 (bits: 11111100000000000000000000000000). effect.c:9273: Test failed: Test # 43 type 0x3 var name f44 index 0x1: got 8.82818033e-044 (bits: 11111100000000000000000000000000), expected 0.00000000e+000 (bits: 00000000000000000000000000000000). effect.c:9273: Test failed: Test # 43 type 0x3 var name f44 index 0x4: got 0.00000000e+000 (bits: 00000000000000000000000000000000), expected 1.00000000e+000 (bits: 00000000000000000000000111111100). effect.c:9236: Test failed: Test # 45 var name s_2 : got HRESULT 0x8876086c, expected 0. effect.c:9236: Test failed: Test # 46 var name s_2 : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 48 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 49 var name tex : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 50 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 51 var name tex2d : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 52 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 53 var name tex3d : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 54 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 55 var name v : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 56 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 57 var name v_2 : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 58 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 59 var name p : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 60 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 61 var name p_2 : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 62 GetParameterByName() did not return the expected result. === debian11 (32 bit ja:JP report) === d3dx9_36: effect.c:9285: Test failed: Test # 26 type 0x2 var name i44 index 0x4: got 0 (bits: 00000000000000000000000000000000), expected 0x2 (bits: 01000000000000000000000000000000). effect.c:9285: Test failed: Test # 27 type 0x2 var name i44 index 0x4: got 0x200 (bits: 00000000010000000000000000000000), expected 0x202 (bits: 01000000010000000000000000000000). effect.c:9285: Test failed: Test # 28 type 0x2 var name i44 index 0x4: got 0x20200 (bits: 00000000010000000100000000000000), expected 0x20202 (bits: 01000000010000000100000000000000). effect.c:9285: Test failed: Test # 29 type 0x2 var name i44 index 0x4: got 0x2020200 (bits: 00000000010000000100000001000000), expected 0x2020202 (bits: 01000000010000000100000001000000). effect.c:9285: Test failed: Test # 30 type 0x2 var name i44 index 0x4: got 0x2020200 (bits: 00000000010000000100000001000000), expected 0x2020202 (bits: 01000000010000000100000001000000). effect.c:9285: Test failed: Test # 30 type 0x2 var name i44 index 0x8: got 0 (bits: 00000000000000000000000000000000), expected 0x3 (bits: 11000000000000000000000000000000). effect.c:9273: Test failed: Test # 42 type 0x3 var name f44 index 0x1: got 8.82818033e-044 (bits: 11111100000000000000000000000000), expected 0.00000000e+000 (bits: 00000000000000000000000000000000). effect.c:9273: Test failed: Test # 42 type 0x3 var name f44 index 0x4: got 0.00000000e+000 (bits: 00000000000000000000000000000000), expected 8.82818033e-044 (bits: 11111100000000000000000000000000). effect.c:9273: Test failed: Test # 43 type 0x3 var name f44 index 0x1: got 8.82818033e-044 (bits: 11111100000000000000000000000000), expected 0.00000000e+000 (bits: 00000000000000000000000000000000). effect.c:9273: Test failed: Test # 43 type 0x3 var name f44 index 0x4: got 0.00000000e+000 (bits: 00000000000000000000000000000000), expected 1.00000000e+000 (bits: 00000000000000000000000111111100). effect.c:9236: Test failed: Test # 45 var name s_2 : got HRESULT 0x8876086c, expected 0. effect.c:9236: Test failed: Test # 46 var name s_2 : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 48 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 49 var name tex : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 50 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 51 var name tex2d : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 52 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 53 var name tex3d : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 54 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 55 var name v : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 56 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 57 var name v_2 : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 58 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 59 var name p : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 60 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 61 var name p_2 : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 62 GetParameterByName() did not return the expected result. === debian11 (32 bit zh:CN report) === d3dx9_36: effect.c:9285: Test failed: Test # 26 type 0x2 var name i44 index 0x4: got 0 (bits: 00000000000000000000000000000000), expected 0x2 (bits: 01000000000000000000000000000000). effect.c:9285: Test failed: Test # 27 type 0x2 var name i44 index 0x4: got 0x200 (bits: 00000000010000000000000000000000), expected 0x202 (bits: 01000000010000000000000000000000). effect.c:9285: Test failed: Test # 28 type 0x2 var name i44 index 0x4: got 0x20200 (bits: 00000000010000000100000000000000), expected 0x20202 (bits: 01000000010000000100000000000000). effect.c:9285: Test failed: Test # 29 type 0x2 var name i44 index 0x4: got 0x2020200 (bits: 00000000010000000100000001000000), expected 0x2020202 (bits: 01000000010000000100000001000000). effect.c:9285: Test failed: Test # 30 type 0x2 var name i44 index 0x4: got 0x2020200 (bits: 00000000010000000100000001000000), expected 0x2020202 (bits: 01000000010000000100000001000000). effect.c:9285: Test failed: Test # 30 type 0x2 var name i44 index 0x8: got 0 (bits: 00000000000000000000000000000000), expected 0x3 (bits: 11000000000000000000000000000000). effect.c:9273: Test failed: Test # 42 type 0x3 var name f44 index 0x1: got 8.82818033e-044 (bits: 11111100000000000000000000000000), expected 0.00000000e+000 (bits: 00000000000000000000000000000000). effect.c:9273: Test failed: Test # 42 type 0x3 var name f44 index 0x4: got 0.00000000e+000 (bits: 00000000000000000000000000000000), expected 8.82818033e-044 (bits: 11111100000000000000000000000000). effect.c:9273: Test failed: Test # 43 type 0x3 var name f44 index 0x1: got 8.82818033e-044 (bits: 11111100000000000000000000000000), expected 0.00000000e+000 (bits: 00000000000000000000000000000000). effect.c:9273: Test failed: Test # 43 type 0x3 var name f44 index 0x4: got 0.00000000e+000 (bits: 00000000000000000000000000000000), expected 1.00000000e+000 (bits: 00000000000000000000000111111100). effect.c:9236: Test failed: Test # 45 var name s_2 : got HRESULT 0x8876086c, expected 0. effect.c:9236: Test failed: Test # 46 var name s_2 : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 48 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 49 var name tex : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 50 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 51 var name tex2d : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 52 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 53 var name tex3d : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 54 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 55 var name v : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 56 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 57 var name v_2 : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 58 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 59 var name p : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 60 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 61 var name p_2 : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 62 GetParameterByName() did not return the expected result. === debian11 (32 bit WoW report) === d3dx9_36: effect.c:9285: Test failed: Test # 26 type 0x2 var name i44 index 0x4: got 0 (bits: 00000000000000000000000000000000), expected 0x2 (bits: 01000000000000000000000000000000). effect.c:9285: Test failed: Test # 27 type 0x2 var name i44 index 0x4: got 0x200 (bits: 00000000010000000000000000000000), expected 0x202 (bits: 01000000010000000000000000000000). effect.c:9285: Test failed: Test # 28 type 0x2 var name i44 index 0x4: got 0x20200 (bits: 00000000010000000100000000000000), expected 0x20202 (bits: 01000000010000000100000000000000). effect.c:9285: Test failed: Test # 29 type 0x2 var name i44 index 0x4: got 0x2020200 (bits: 00000000010000000100000001000000), expected 0x2020202 (bits: 01000000010000000100000001000000). effect.c:9285: Test failed: Test # 30 type 0x2 var name i44 index 0x4: got 0x2020200 (bits: 00000000010000000100000001000000), expected 0x2020202 (bits: 01000000010000000100000001000000). effect.c:9285: Test failed: Test # 30 type 0x2 var name i44 index 0x8: got 0 (bits: 00000000000000000000000000000000), expected 0x3 (bits: 11000000000000000000000000000000). effect.c:9273: Test failed: Test # 42 type 0x3 var name f44 index 0x1: got 8.82818033e-044 (bits: 11111100000000000000000000000000), expected 0.00000000e+000 (bits: 00000000000000000000000000000000). effect.c:9273: Test failed: Test # 42 type 0x3 var name f44 index 0x4: got 0.00000000e+000 (bits: 00000000000000000000000000000000), expected 8.82818033e-044 (bits: 11111100000000000000000000000000). effect.c:9273: Test failed: Test # 43 type 0x3 var name f44 index 0x1: got 8.82818033e-044 (bits: 11111100000000000000000000000000), expected 0.00000000e+000 (bits: 00000000000000000000000000000000). effect.c:9273: Test failed: Test # 43 type 0x3 var name f44 index 0x4: got 0.00000000e+000 (bits: 00000000000000000000000000000000), expected 1.00000000e+000 (bits: 00000000000000000000000111111100). effect.c:9236: Test failed: Test # 45 var name s_2 : got HRESULT 0x8876086c, expected 0. effect.c:9236: Test failed: Test # 46 var name s_2 : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 48 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 49 var name tex : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 50 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 51 var name tex2d : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 52 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 53 var name tex3d : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 54 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 55 var name v : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 56 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 57 var name v_2 : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 58 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 59 var name p : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 60 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 61 var name p_2 : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 62 GetParameterByName() did not return the expected result. === debian11 (64 bit WoW report) === d3dx9_36: effect.c:9285: Test failed: Test # 26 type 0x2 var name i44 index 0x4: got 0 (bits: 00000000000000000000000000000000), expected 0x2 (bits: 01000000000000000000000000000000). effect.c:9285: Test failed: Test # 27 type 0x2 var name i44 index 0x4: got 0x200 (bits: 00000000010000000000000000000000), expected 0x202 (bits: 01000000010000000000000000000000). effect.c:9285: Test failed: Test # 28 type 0x2 var name i44 index 0x4: got 0x20200 (bits: 00000000010000000100000000000000), expected 0x20202 (bits: 01000000010000000100000000000000). effect.c:9285: Test failed: Test # 29 type 0x2 var name i44 index 0x4: got 0x2020200 (bits: 00000000010000000100000001000000), expected 0x2020202 (bits: 01000000010000000100000001000000). effect.c:9285: Test failed: Test # 30 type 0x2 var name i44 index 0x4: got 0x2020200 (bits: 00000000010000000100000001000000), expected 0x2020202 (bits: 01000000010000000100000001000000). effect.c:9285: Test failed: Test # 30 type 0x2 var name i44 index 0x8: got 0 (bits: 00000000000000000000000000000000), expected 0x3 (bits: 11000000000000000000000000000000). effect.c:9273: Test failed: Test # 42 type 0x3 var name f44 index 0x1: got 8.82818033e-044 (bits: 11111100000000000000000000000000), expected 0.00000000e+000 (bits: 00000000000000000000000000000000). effect.c:9273: Test failed: Test # 42 type 0x3 var name f44 index 0x4: got 0.00000000e+000 (bits: 00000000000000000000000000000000), expected 8.82818033e-044 (bits: 11111100000000000000000000000000). effect.c:9273: Test failed: Test # 43 type 0x3 var name f44 index 0x1: got 8.82818033e-044 (bits: 11111100000000000000000000000000), expected 0.00000000e+000 (bits: 00000000000000000000000000000000). effect.c:9273: Test failed: Test # 43 type 0x3 var name f44 index 0x4: got 0.00000000e+000 (bits: 00000000000000000000000000000000), expected 1.00000000e+000 (bits: 00000000000000000000000111111100). effect.c:9236: Test failed: Test # 45 var name s_2 : got HRESULT 0x8876086c, expected 0. effect.c:9236: Test failed: Test # 46 var name s_2 : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 48 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 49 var name tex : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 50 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 51 var name tex2d : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 52 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 53 var name tex3d : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 54 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 55 var name v : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 56 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 57 var name v_2 : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 58 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 59 var name p : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 60 GetParameterByName() did not return the expected result. effect.c:9236: Test failed: Test # 61 var name p_2 : got HRESULT 0x8876086c, expected 0. effect.c:9225: Test failed: Test # 62 GetParameterByName() did not return the expected result.
Is that what happens or is just the rest of the parameter being set to 0?
In the case of a promoted scalar value, it only sets up to the remaining 3 bytes of the promoted type. I.e. If there is more than 3 bytes remaining in the given parameter, then only those 3 bytes are set to zero and everything else is left intact.
How should they be fixed? I'm still assuming that SetRawValue() more or less does what it says i.e. it just sets the value of parameters by mere byte-for-byte copy, without any kind of conversion or fixup. Do we have evidence that's not the case?
According to the current tests, fixups or conversions are performed when: 1. The given parameter is a boolean type. OR 2. The parameter is a numeric type AND the argument IS a single scalar. I.e. bytes == sizeof(DWORD) That last one is particularly a pain because when the given parameter is a matrix, it _changes_ the meaning / behavior of the byte_offset argument. As the test I just pushed shows, for matrices byte_offset can only shift the copied values up to 3 times. This is because SetRawValue() will treat byte_offset as an array index keyed on multiples of 4 (sizeof(DWORD)). I.e. Given a byte_offset of 3 with a parameter of int44, SetRawValue() will start writing to the first int (array[0]) but shift all bytes over by 3. A byte_offset of 5 however, will cause SetRawValue() to start writing at the _fifth_ int (array[4]) and shift all bytes over by 1. I assume that this also applies to booleans, but due to the boolean fixups the remaining byte shift is effectively ignored.
It might make sense to clear them to a non-zero value (e.g. some variation of the usual 0xdeadbeef marker) to make those results more evident.
OK, will do. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/979#note_12226
Is that what happens or is just the rest of the parameter being set to 0?
In the case of a promoted scalar value, it only sets up to the remaining 3 bytes of the promoted type. I.e. If there is more than 3 bytes remaining in the given parameter, then only those 3 bytes are set to zero and everything else is left intact.
I assume you mean the remaining 3 DWORDs. There's a good chance that parameters are internally handled at vec4 granularity (i.e. everything is made of a bunch of 4-element vectors) and individual vec4s are set "atomically".
As the test I just pushed shows, for matrices byte_offset can only shift the copied values up to 3 times. This is because SetRawValue() will treat byte_offset as an array index keyed on multiples of 4 (sizeof(DWORD)). I.e. Given a byte_offset of 3 with a parameter of int44, SetRawValue() will start writing to the first int (array\[0\]) but shift all bytes over by 3. A byte_offset of 5 however, will cause SetRawValue() to start writing at the *fifth* int (array\[4\]) and shift all bytes over by 1.
Could it be that matrices are stored with reversed majority instead (so like in the order ._11, ._12, ._13, ._14, ._21, ... and you're reading them as ._11, ._21, _31, _41, _12, ...)? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/979#note_12234
I assume you mean the remaining 3 DWORDs. There's a good chance that parameters are internally handled at vec4 granularity (i.e. everything is made of a bunch of 4-element vectors) and individual vec4s are set "atomically".
That's probably correct given what the tests show and MSDN's Remarks section. "all values expected to be matrix4x4s or float4s", "expected to be in column major order", and "ints and floats are cast into float4s."
Could it be that matrices are stored with reversed majority instead (so like in the order .\_11, .\_12, .\_13, .\_14, .\_21, ... and you're reading them as .\_11, .\_21, \_31, \_41, \_12, ...)?
What do you mean by reversed majority? Reversed byte order? The current tests fills the current buffer with 2, writes a 3 with byte_offsets of 0 and 1, then a 2 with byte_offsets of 4, 5, 6, and 7. Then for the next test it writes a 3 with a byte_offset of 8. Which results in the following array values: { 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2 } { 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3 } { (3 << 8) | 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } { (3 << 8) | 3, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } { (3 << 8) | 3, 0, 0, 0, 514, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } { (3 << 8) | 3, 0, 0, 0, 131586, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } { (3 << 8) | 3, 0, 0, 0, 33686018, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } { (3 << 8) | 3, 0, 0, 0, 33686018, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0 } FYI, the current wine implementation fails these tests because for some reason, it refuses to write the first byte of the fifth array index. (So, the first 2 never gets written to array[4].) Still not sure why though... -- https://gitlab.winehq.org/wine/wine/-/merge_requests/979#note_12253
Could it be that matrices are stored with reversed majority instead (so like in the order .\_11, .\_12, .\_13, .\_14, .\_21, ... and you're reading them as .\_11, .\_21, \_31, \_41, \_12, ...)?
What do you mean by reversed majority? Reversed byte order?
I mean that, probably, the matrices are stored as row-major (i.e. row after row) but then GetValue() will return the data column-major (column after column), or the other way around. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/979#note_12340
I tested this MR with Need for Speed: World and the game experiences the same vertex explosions as my quick `memcpy()` hack (the game doesn't use a byte offset or objects when calling this function (which are the only things causing test failures on Wine) so I'm not sure if this function is even the issue) -- https://gitlab.winehq.org/wine/wine/-/merge_requests/979#note_68036
On Wed Apr 24 21:59:40 2024 +0000, Aida Jonikienė wrote:
I tested this MR with Need for Speed: World and the game experiences the same vertex explosions as my quick `memcpy()` hack (the game doesn't use a byte offset or objects when calling this function (which are the only things causing test failures on Wine) so I'm not sure if this function is even the issue) It's certainly possible that there are further issues with NFS:W after SetRawValue() is implemented correctly, but I'm not confident that this MR is actually good enough. We probably need more tests in general and, AFAICS, the unresolved threads still need to be addressed.
In particular, I'm curious if NFS:W tries to set multiple parameters with a single SetRawValue() call. That generally wouldn't work with this and it would be interesting to know if that's something that games actually attempt to do. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/979#note_68776
On Wed Apr 24 21:59:40 2024 +0000, Matteo Bruni wrote:
It's certainly possible that there are further issues with NFS:W after SetRawValue() is implemented correctly, but I'm not confident that this MR is actually good enough. We probably need more tests in general and, AFAICS, the unresolved threads still need to be addressed. In particular, I'm curious if NFS:W tries to set multiple parameters with a single SetRawValue() call. That generally wouldn't work with this and it would be interesting to know if that's something that games actually attempt to do. @Mystral I think I saw some discrepancies with `bytes` and `param->bytes` variables in the SetRawValue() calls (so it might or might not be that)
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/979#note_68820
On Thu Apr 25 05:41:04 2024 +0000, Aida Jonikienė wrote:
@Mystral I think I saw some discrepancies with `bytes` and `param->bytes` variables in the SetRawValue() calls (so it might or might not be that) It looks like this function was the issue but I didn't look at one part of its behavior (@cmcadams figured it out and sent me a quick patch which I think fixed the rendering completely)
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/979#note_90621
This merge request was closed by Matteo Bruni. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/979
This was mostly superseded by !7505, which was merged as 4 commits ending with 84c7e1ffadd02fc05f4b9d8189913bf11864835a. Further improvements should be made on top of that as needed. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/979#note_98849
participants (5)
-
Aida Jonikienė -
Marvin -
Matteo Bruni (＠Mystral)
-
Patrick Hibbs
-
Patrick Hibbs (＠hibbsncc1701)