[PATCH 0/2] MR6852: d3d/tests: Clang -Wformat-security fixes.
Fixes -Wformat-security on Clang. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6852
From: Jacek Caban <jacek(a)codeweavers.com> Fixes -Wformat-security on Clang. --- dlls/d3d11/tests/d3d11.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 4b6c54fc71e..6d9ad491716 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -18905,7 +18905,7 @@ static void check_layout_element_exclusion(ID3D11Device *device, const D3D11_INP unsigned int i; HRESULT hr; - winetest_push_context(test_context); + winetest_push_context("%s", test_context); hr = ID3D11Device_CreateInputLayout(device, elements, element_count, shader_code, shader_code_size, &layout); ok(hr == S_OK, "Got hr %#lx.\n", hr); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6852
From: Jacek Caban <jacek(a)codeweavers.com> Fixes -Wformat-security on Clang. --- dlls/ddraw/tests/ddraw4.c | 2 +- dlls/ddraw/tests/ddraw7.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 7f7c563303f..96bdbf37183 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -17118,7 +17118,7 @@ static void test_viewport(void) for (j = 0; j < ARRAY_SIZE(tests); ++j) { - winetest_push_context(tests[j].message); + winetest_push_context("%s", tests[j].message); expected_failure = tests[j].vp.dwX + tests[j].vp.dwWidth > rt_sizes[i].x || tests[j].vp.dwY + tests[j].vp.dwHeight > rt_sizes[i].y; diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 76c52be0258..343ca652214 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -16666,7 +16666,7 @@ static void test_viewport(void) for (j = 0; j < ARRAY_SIZE(tests); ++j) { - winetest_push_context(tests[j].message); + winetest_push_context("%s", tests[j].message); hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff000000, tests[j].expected_z - z_eps, 0); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6852
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=149778 Your paranoid android. === w1064_tsign (32 bit report) === ddraw: ddraw4.c:4050: Test failed: Expected (0,0)-(640,480), got (-8,-8)-(648,488). ddraw4.c:4075: Test failed: Expected (0,0)-(640,480), got (-8,-8)-(648,488). === w10pro64 (32 bit report) === ddraw: ddraw7.c:2595: Test failed: Expected message 0x46, but didn't receive it. ddraw7.c:2718: Test failed: Failed to set foreground window. ddraw7.c:2726: Test failed: Failed to set foreground window. ddraw7.c:2752: Test failed: Expected window style 0x14cf0000, got 0x4cf0000. ddraw7.c:2755: Test failed: Expected window extended style 0x108, got 0x100. ddraw7.c:2762: Test failed: Expected window extended style 0x108, got 0x100. ddraw7.c:2771: Test failed: Expected window extended style 0x108, got 0x100. ddraw7.c:2780: Test failed: Expected window extended style 0x108, got 0x100. ddraw7.c:2783: Test failed: Failed to set foreground window. ddraw7.c:2790: Test failed: Expected window style 0x14cf0000, got 0x4cf0000. ddraw7.c:2793: Test failed: Expected window extended style 0x108, got 0x100. ddraw7.c:2806: Test failed: Failed to set foreground window. ddraw7.c:2831: Test failed: Failed to set foreground window. ddraw7.c:2846: Test failed: Failed to set foreground window. ddraw7.c:2855: Test failed: Expected window extended style 0x108, got 0x100. ddraw7.c:2875: Test failed: Expected window extended style 0x108, got 0x100. ddraw7.c:2878: Test failed: Failed to set foreground window. ddraw7.c:2881: Test failed: Expected window style 0x34cf0000, got 0x14cf0000. ddraw7.c:2884: Test failed: Expected window extended style 0x108, got 0x100. ddraw7.c:2897: Test failed: Expected WS_EX_TOPMOST. ddraw7.c:2914: Test failed: Expected WS_EX_TOPMOST. ddraw7.c:3275: Test failed: Failed to set foreground window. ddraw7.c:3276: Test failed: Expected message 0x6, but didn't receive it. ddraw7.c:3283: Test failed: Got unexpected screen size 800x600. ddraw7.c:747: Test failed: Got unexpected wparam 0 for message 0x1c, expected 0x1. ddraw7.c:3289: Test failed: Expected message 0x5, but didn't receive it. ddraw7.c:3292: Test failed: Expected (0,0)-(640,480), got (-32000,-32000)-(-31840,-31972). ddraw7.c:3309: Test failed: Expected message 0x46, but didn't receive it. ddraw7.c:3750: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,736). ddraw7.c:3822: Test failed: Expected (0,0)-(640,480), got (-8,-8)-(648,448). ddraw7.c:3847: Test failed: Expected (0,0)-(640,480), got (-8,-8)-(648,448).
This merge request was approved by Elizabeth Figura. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6852
I guess, but is -Wformat-security really getting us anything? Are there any interesting cases? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6852#note_88071
On Tue Nov 19 20:21:33 2024 +0000, Elizabeth Figura wrote:
I guess, but is -Wformat-security really getting us anything? Are there any interesting cases? No, I don't think it's useful on its own.
We currently don't use format attribute in clang builds and I'd like to change it, but before I do, I need to fix the last few warnings. There is not much more than MRs I just created. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6852#note_88076
This merge request was approved by Jan Sikorski. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6852
participants (5)
-
Elizabeth Figura (＠zfigura) -
Jacek Caban
-
Jacek Caban (＠jacek)
-
Jan Sikorski (＠jsikorski)
-
Marvin