[PATCH v2 0/2] MR1295: Enable compilation with long types in d3dx9_36/tests.
-- v2: dlls/d3dx9_36/tests: Use correct integral type. d3dx9_36/tests: Introduce union to help passing float values in DWORD. https://gitlab.winehq.org/wine/wine/-/merge_requests/1295
From: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/d3dx9_36/tests/effect.c | 57 ++++++++++++++++++++---------------- 1 file changed, 31 insertions(+), 26 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 12af35cb8d8..9f4a8b7bc2e 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -5465,6 +5465,11 @@ static void test_effect_commitchanges(IDirect3DDevice9 *device) HRESULT hr; D3DXHANDLE param; unsigned int i, passes_count, value; + union + { + DWORD dw; + float f; + } float_value; int ivect[4]; D3DXVECTOR4 fvect; IDirect3DVertexShader9 *vshader; @@ -5626,14 +5631,14 @@ static void test_effect_commitchanges(IDirect3DDevice9 *device) test_effect_preshader_compare_vconsts(device, check_vconsts_parameters[7].const_updated_mask, check_vconsts_parameters[7].param_name); - *(float *)&value = 9999.0f; - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGDENSITY, value); + float_value.f = 9999.0f; + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGDENSITY, float_value.dw); ok(hr == D3D_OK, "Got result %#x.\n", hr); - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGSTART, value); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGSTART, float_value.dw); ok(hr == D3D_OK, "Got result %#x.\n", hr); - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_POINTSCALE_A, value); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_POINTSCALE_A, float_value.dw); ok(hr == D3D_OK, "Got result %#x.\n", hr); - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_POINTSCALE_B, value); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_POINTSCALE_B, float_value.dw); ok(hr == D3D_OK, "Got result %#x.\n", hr); test_effect_clear_vconsts(device); param = effect->lpVtbl->GetParameterByName(effect, NULL, "ts2"); @@ -5648,29 +5653,29 @@ static void test_effect_commitchanges(IDirect3DDevice9 *device) ok(hr == D3D_OK, "Got result %#x.\n", hr); hr = effect->lpVtbl->CommitChanges(effect); ok(hr == D3D_OK, "Got result %#x.\n", hr); - hr = IDirect3DDevice9_GetRenderState(device, D3DRS_FOGDENSITY, &value); + hr = IDirect3DDevice9_GetRenderState(device, D3DRS_FOGDENSITY, &float_value.dw); ok(hr == D3D_OK, "Got result %#x.\n", hr); - ok(value == 0, "Unexpected fog density %g.\n", *(float *)&value); - hr = IDirect3DDevice9_GetRenderState(device, D3DRS_FOGSTART, &value); + ok(float_value.f == 0, "Unexpected fog density %g.\n", float_value.f); + hr = IDirect3DDevice9_GetRenderState(device, D3DRS_FOGSTART, &float_value.dw); ok(hr == D3D_OK, "Got result %#x.\n", hr); - ok(*(float *)&value == 4.0f, "Unexpected fog start %g.\n", *(float *)&value); - hr = IDirect3DDevice9_GetRenderState(device, D3DRS_POINTSCALE_A, &value); + ok(float_value.f == 4.0f, "Unexpected fog start %g.\n", float_value.f); + hr = IDirect3DDevice9_GetRenderState(device, D3DRS_POINTSCALE_A, &float_value.dw); ok(hr == D3D_OK, "Got result %#x.\n", hr); - ok(*(float *)&value == 9999.0f, "Unexpected point scale A %g.\n", *(float *)&value); - hr = IDirect3DDevice9_GetRenderState(device, D3DRS_POINTSCALE_B, &value); + ok(float_value.f == 9999.0f, "Unexpected point scale A %g.\n", float_value.f); + hr = IDirect3DDevice9_GetRenderState(device, D3DRS_POINTSCALE_B, &float_value.dw); ok(hr == D3D_OK, "Got result %#x.\n", hr); - ok(*(float *)&value == 9999.0f, "Unexpected point scale B %g.\n", *(float *)&value); + ok(float_value.f == 9999.0f, "Unexpected point scale B %g.\n", float_value.f); test_effect_preshader_compare_vconsts(device, check_vconsts_parameters[8].const_updated_mask, check_vconsts_parameters[8].param_name); - *(float *)&value = 9999.0f; - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGDENSITY, value); + float_value.f = 9999.0f; + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGDENSITY, float_value.dw); ok(hr == D3D_OK, "Got result %#x.\n", hr); - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGSTART, value); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGSTART, float_value.dw); ok(hr == D3D_OK, "Got result %#x.\n", hr); - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_POINTSCALE_A, value); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_POINTSCALE_A, float_value.dw); ok(hr == D3D_OK, "Got result %#x.\n", hr); - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_POINTSCALE_B, value); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_POINTSCALE_B, float_value.dw); ok(hr == D3D_OK, "Got result %#x.\n", hr); test_effect_clear_vconsts(device); param = effect->lpVtbl->GetParameterByName(effect, NULL, "ts3"); @@ -5687,18 +5692,18 @@ static void test_effect_commitchanges(IDirect3DDevice9 *device) ok(hr == D3D_OK, "Got result %#x.\n", hr); hr = effect->lpVtbl->CommitChanges(effect); ok(hr == D3D_OK, "Got result %#x.\n", hr); - hr = IDirect3DDevice9_GetRenderState(device, D3DRS_FOGDENSITY, &value); + hr = IDirect3DDevice9_GetRenderState(device, D3DRS_FOGDENSITY, &float_value.dw); ok(hr == D3D_OK, "Got result %#x.\n", hr); - ok(*(float *)&value == 9999.0f, "Unexpected fog density %g.\n", *(float *)&value); - hr = IDirect3DDevice9_GetRenderState(device, D3DRS_FOGSTART, &value); + ok(float_value.f == 9999.0f, "Unexpected fog density %g.\n", float_value.f); + hr = IDirect3DDevice9_GetRenderState(device, D3DRS_FOGSTART, &float_value.dw); ok(hr == D3D_OK, "Got result %#x.\n", hr); - ok(*(float *)&value == 9999.0f, "Unexpected fog start %g.\n", *(float *)&value); - hr = IDirect3DDevice9_GetRenderState(device, D3DRS_POINTSCALE_A, &value); + ok(float_value.f == 9999.0f, "Unexpected fog start %g.\n", float_value.f); + hr = IDirect3DDevice9_GetRenderState(device, D3DRS_POINTSCALE_A, &float_value.dw); ok(hr == D3D_OK, "Got result %#x.\n", hr); - ok(*(float *)&value == 4.0f, "Unexpected point scale A %g.\n", *(float *)&value); - hr = IDirect3DDevice9_GetRenderState(device, D3DRS_POINTSCALE_B, &value); + ok(float_value.f == 4.0f, "Unexpected point scale A %g.\n", float_value.f); + hr = IDirect3DDevice9_GetRenderState(device, D3DRS_POINTSCALE_B, &float_value.dw); ok(hr == D3D_OK, "Got result %#x.\n", hr); - ok(*(float *)&value == 12.0f, "Unexpected point scale B %g.\n", *(float *)&value); + ok(float_value.f == 12.0f, "Unexpected point scale B %g.\n", float_value.f); test_effect_preshader_compare_vconsts(device, check_vconsts_parameters[11].const_updated_mask, check_vconsts_parameters[11].param_name); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1295
From: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/d3dx9_36/tests/effect.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 9f4a8b7bc2e..71c3da963c8 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -5464,12 +5464,13 @@ static void test_effect_commitchanges(IDirect3DDevice9 *device) ID3DXEffect *effect; HRESULT hr; D3DXHANDLE param; - unsigned int i, passes_count, value; + unsigned int i, passes_count; union { DWORD dw; float f; } float_value; + DWORD value; int ivect[4]; D3DXVECTOR4 fvect; IDirect3DVertexShader9 *vshader; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1295
v2 pushed: - added handling of float values as suggested by @Mystral - removed patch about ok() handling => the floor is yours @Mystral -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1295#note_15993
This merge request was approved by Matteo Bruni. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1295
participants (3)
-
Eric Pouech -
eric pouech (＠epo)
-
Matteo Bruni (＠Mystral)