[PATCH 5/6] Workaround GCC11 complaining about sizeof(a)/sizeof(b) constructs when it's
Eric Pouech
eric.pouech at gmail.com
Tue Sep 28 11:49:56 CDT 2021
not referring to the number of elements of an array
Signed-off-by: Eric Pouech <eric.pouech at gmail.com>
---
dlls/d3dx9_36/tests/effect.c | 4 ++--
dlls/d3dx9_36/tests/mesh.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c
index 4b91425389f..d1954c5cd11 100644
--- a/dlls/d3dx9_36/tests/effect.c
+++ b/dlls/d3dx9_36/tests/effect.c
@@ -1475,7 +1475,7 @@ static void test_effect_parameter_value_GetMatrixPointerArray(const struct test_
HRESULT hr;
DWORD cmp = 0xabababab;
FLOAT fvalue[EFFECT_PARAMETER_VALUE_ARRAY_SIZE];
- D3DXMATRIX *matrix_pointer_array[sizeof(fvalue)/sizeof(D3DXMATRIX)];
+ D3DXMATRIX *matrix_pointer_array[sizeof(fvalue)/(sizeof(D3DXMATRIX))];
UINT l, k, m, element, err = 0;
for (element = 0; element <= res_desc->Elements + 1; ++element)
@@ -1657,7 +1657,7 @@ static void test_effect_parameter_value_GetMatrixTransposePointerArray(const str
HRESULT hr;
DWORD cmp = 0xabababab;
FLOAT fvalue[EFFECT_PARAMETER_VALUE_ARRAY_SIZE];
- D3DXMATRIX *matrix_pointer_array[sizeof(fvalue)/sizeof(D3DXMATRIX)];
+ D3DXMATRIX *matrix_pointer_array[sizeof(fvalue)/(sizeof(D3DXMATRIX))];
UINT l, k, m, element, err = 0;
for (element = 0; element <= res_desc->Elements + 1; ++element)
diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c
index e981f3623ce..a583a42d30f 100644
--- a/dlls/d3dx9_36/tests/mesh.c
+++ b/dlls/d3dx9_36/tests/mesh.c
@@ -4824,7 +4824,7 @@ static void test_update_semantics(void)
hr = mesh->lpVtbl->GetDeclaration(mesh, declaration);
ok(hr == D3D_OK, "Couldn't get vertex declaration. Got %#x, expected D3D_OK\n", hr);
decl_mem = (int*)declaration;
- for (i = sizeof(declaration0)/sizeof(*decl_mem); i < sizeof(declaration)/sizeof(*decl_mem); i++)
+ for (i = sizeof(declaration0)/(sizeof(*decl_mem)); i < sizeof(declaration)/(sizeof(*decl_mem)); i++)
{
equal = memcmp(&decl_mem[i], &filler_b, sizeof(filler_b));
ok(equal == 0,
More information about the wine-devel
mailing list