[PATCH] d3dx9: Use an assert() to validate access to const_tbl[].
Matteo Bruni
mbruni at codeweavers.com
Tue Mar 24 09:17:16 CDT 2020
This check is essentially validating that the hardcoded state_table[]
has reasonable values for the shader constant states. Use ARRAY_SIZE()
to avoid warnings if the compiler chooses an unsigned integer to back
enum SHADER_CONSTANT_TYPE.
Based on an idea by Henri Verbeet.
Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
---
dlls/d3dx9_36/effect.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index 88168df1e1a..525b87340bf 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -1469,11 +1469,7 @@ static HRESULT d3dx_set_shader_const_state(struct d3dx_effect *effect, enum SHAD
D3DXVECTOR4 value;
HRESULT ret;
- if (op < 0 || op > SCT_PSINT)
- {
- FIXME("Unknown op %u.\n", op);
- return D3DERR_INVALIDCALL;
- }
+ assert(op < ARRAY_SIZE(const_tbl));
element_count = param->bytes / const_tbl[op].elem_size;
TRACE("%s, index %u, element_count %u.\n", const_tbl[op].name, index, element_count);
if (param->type != const_tbl[op].type)
--
2.24.1
More information about the wine-devel
mailing list