[PATCH 07/10] wined3d: Never report WINEDDSCAPS_ALPHA, WINEDDSCAPS_SYSTEMMEMORY and WINEDDSCAPS_VISIBLE.
Signed-off-by: Henri Verbeet hverbeet@codeweavers.com --- dlls/ddraw/tests/ddraw1.c | 8 ++++---- dlls/ddraw/tests/ddraw2.c | 8 ++++---- dlls/ddraw/tests/ddraw4.c | 8 ++++---- dlls/ddraw/tests/ddraw7.c | 8 ++++---- dlls/wined3d/directx.c | 7 ++----- 5 files changed, 18 insertions(+), 21 deletions(-)
diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 9bba97eb455..7c6116f4cde 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -12948,12 +12948,12 @@ static void test_caps(void) no3d = !(hal_caps.ddsCaps.dwCaps & DDSCAPS_3DDEVICE); if (hal_caps.ddsCaps.dwCaps) { - todo_wine ok(!(hal_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); + ok(!(hal_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); todo_wine_if(no3d) ok(!(~hal_caps.ddsCaps.dwCaps & caps_always), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); todo_wine ok(!(~hal_caps.ddsCaps.dwCaps & caps_hal), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); } - todo_wine ok(!(hel_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); + ok(!(hel_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); todo_wine_if(no3d) ok(!(~hel_caps.ddsCaps.dwCaps & caps_always), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); todo_wine ok(!(hel_caps.ddsCaps.dwCaps & caps_hal), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); @@ -12978,7 +12978,7 @@ static void test_caps(void) "Got unexpected caps %#x, expected %#x.\n", hel_caps.ddsOldCaps.dwCaps, hel_caps.ddsCaps.dwCaps);
- todo_wine ok(!(hal_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); + ok(!(hal_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); todo_wine_if(no3d) ok(!(~hal_caps.ddsCaps.dwCaps & caps_always), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); todo_wine ok(!(~hal_caps.ddsCaps.dwCaps & caps_hal), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); @@ -13004,7 +13004,7 @@ static void test_caps(void) hel_caps.ddsOldCaps.dwCaps, hel_caps.ddsCaps.dwCaps);
todo_wine ok(!hal_caps.ddsCaps.dwCaps, "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); - todo_wine ok(!(hel_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); + ok(!(hel_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); todo_wine_if(no3d) ok(!(~hel_caps.ddsCaps.dwCaps & caps_always), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); todo_wine ok(!(hel_caps.ddsCaps.dwCaps & caps_hal), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 6ceec6f92c3..f4ac6673969 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -13825,12 +13825,12 @@ static void test_caps(void) no3d = !(hal_caps.ddsCaps.dwCaps & DDSCAPS_3DDEVICE); if (hal_caps.ddsCaps.dwCaps) { - todo_wine ok(!(hal_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); + ok(!(hal_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); todo_wine_if(no3d) ok(!(~hal_caps.ddsCaps.dwCaps & caps_always), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); todo_wine ok(!(~hal_caps.ddsCaps.dwCaps & caps_hal), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); } - todo_wine ok(!(hel_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); + ok(!(hel_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); todo_wine_if(no3d) ok(!(~hel_caps.ddsCaps.dwCaps & caps_always), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); todo_wine ok(!(hel_caps.ddsCaps.dwCaps & caps_hal), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); @@ -13858,7 +13858,7 @@ static void test_caps(void) "Got unexpected caps %#x, expected %#x.\n", hel_caps.ddsOldCaps.dwCaps, hel_caps.ddsCaps.dwCaps);
- todo_wine ok(!(hal_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); + ok(!(hal_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); todo_wine_if(no3d) ok(!(~hal_caps.ddsCaps.dwCaps & caps_always), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); todo_wine ok(!(~hal_caps.ddsCaps.dwCaps & caps_hal), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); @@ -13887,7 +13887,7 @@ static void test_caps(void) hel_caps.ddsOldCaps.dwCaps, hel_caps.ddsCaps.dwCaps);
todo_wine ok(!hal_caps.ddsCaps.dwCaps, "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); - todo_wine ok(!(hel_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); + ok(!(hel_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); todo_wine_if(no3d) ok(!(~hel_caps.ddsCaps.dwCaps & caps_always), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); todo_wine ok(!(hel_caps.ddsCaps.dwCaps & caps_hal), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index d04d09ac783..e181f324f22 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -16386,12 +16386,12 @@ static void test_caps(void) no3d = !(hal_caps.ddsCaps.dwCaps & DDSCAPS_3DDEVICE); if (hal_caps.ddsCaps.dwCaps) { - todo_wine ok(!(hal_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); + ok(!(hal_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); todo_wine_if(no3d) ok(!(~hal_caps.ddsCaps.dwCaps & caps_always), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); todo_wine ok(!(~hal_caps.ddsCaps.dwCaps & caps_hal), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); } - todo_wine ok(!(hel_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); + ok(!(hel_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); todo_wine_if(no3d) ok(!(~hel_caps.ddsCaps.dwCaps & caps_always), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); todo_wine ok(!(hel_caps.ddsCaps.dwCaps & caps_hal), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); @@ -16419,7 +16419,7 @@ static void test_caps(void) "Got unexpected caps %#x, expected %#x.\n", hel_caps.ddsOldCaps.dwCaps, hel_caps.ddsCaps.dwCaps);
- todo_wine ok(!(hal_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); + ok(!(hal_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); todo_wine_if(no3d) ok(!(~hal_caps.ddsCaps.dwCaps & caps_always), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); todo_wine ok(!(~hal_caps.ddsCaps.dwCaps & caps_hal), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); @@ -16448,7 +16448,7 @@ static void test_caps(void) hel_caps.ddsOldCaps.dwCaps, hel_caps.ddsCaps.dwCaps);
todo_wine ok(!hal_caps.ddsCaps.dwCaps, "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); - todo_wine ok(!(hel_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); + ok(!(hel_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); todo_wine_if(no3d) ok(!(~hel_caps.ddsCaps.dwCaps & caps_always), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); todo_wine ok(!(hel_caps.ddsCaps.dwCaps & caps_hal), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 5f7c9d43eb8..cd8290c4d9a 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -16358,12 +16358,12 @@ static void test_caps(void) no3d = !(hal_caps.ddsCaps.dwCaps & DDSCAPS_3DDEVICE); if (hal_caps.ddsCaps.dwCaps) { - todo_wine ok(!(hal_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); + ok(!(hal_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); todo_wine_if(no3d) ok(!(~hal_caps.ddsCaps.dwCaps & caps_always), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); todo_wine ok(!(~hal_caps.ddsCaps.dwCaps & caps_hal), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); } - todo_wine ok(!(hel_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); + ok(!(hel_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); todo_wine_if(no3d) ok(!(~hel_caps.ddsCaps.dwCaps & caps_always), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); todo_wine ok(!(hel_caps.ddsCaps.dwCaps & caps_hal), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); @@ -16388,7 +16388,7 @@ static void test_caps(void) "Got unexpected caps %#x, expected %#x.\n", hel_caps.ddsOldCaps.dwCaps, hel_caps.ddsCaps.dwCaps);
- todo_wine ok(!(hal_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); + ok(!(hal_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); todo_wine_if(no3d) ok(!(~hal_caps.ddsCaps.dwCaps & caps_always), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); todo_wine ok(!(~hal_caps.ddsCaps.dwCaps & caps_hal), "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); @@ -16414,7 +16414,7 @@ static void test_caps(void) hel_caps.ddsOldCaps.dwCaps, hel_caps.ddsCaps.dwCaps);
todo_wine ok(!hal_caps.ddsCaps.dwCaps, "Got unexpected caps %#x.\n", hal_caps.ddsCaps.dwCaps); - todo_wine ok(!(hel_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); + ok(!(hel_caps.ddsCaps.dwCaps & caps_never), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); todo_wine_if(no3d) ok(!(~hel_caps.ddsCaps.dwCaps & caps_always), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); todo_wine ok(!(hel_caps.ddsCaps.dwCaps & caps_hal), "Got unexpected caps %#x.\n", hel_caps.ddsCaps.dwCaps); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c886ea155c5..fec1b935e2c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2192,15 +2192,12 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, unsigned in caps->ddraw_caps.ssb_color_key_caps = ckey_caps; caps->ddraw_caps.ssb_fx_caps = fx_caps;
- caps->ddraw_caps.dds_caps = WINEDDSCAPS_ALPHA - | WINEDDSCAPS_BACKBUFFER + caps->ddraw_caps.dds_caps = WINEDDSCAPS_BACKBUFFER | WINEDDSCAPS_FLIP | WINEDDSCAPS_FRONTBUFFER | WINEDDSCAPS_OFFSCREENPLAIN | WINEDDSCAPS_PALETTE - | WINEDDSCAPS_PRIMARYSURFACE - | WINEDDSCAPS_SYSTEMMEMORY - | WINEDDSCAPS_VISIBLE; + | WINEDDSCAPS_PRIMARYSURFACE;
caps->shader_double_precision = d3d_info->shader_double_precision; caps->viewport_array_index_any_shader = d3d_info->viewport_array_index_any_shader;
Hi,
While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=55356
Your paranoid android.
=== wvistau64_zh_CN (32 bit report) ===
ddraw: ddraw1.c:2801: Test failed: Expected message 0x46, but didn't receive it. ddraw1.c:2803: Test failed: Expected screen size 1024x768, got 0x0. ddraw1.c:2809: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw1.c:2839: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw1.c:2846: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw1.c:2872: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw1.c:2895: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw1.c:2924: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw1.c:2950: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw1.c:2970: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw1.c:3006: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw1.c:3016: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw1.c:3042: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw1.c:3065: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw1.c:3087: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw1.c:3113: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw1.c:3133: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw1.c:3170: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745).
=== w864 (64 bit report) ===
ddraw: ddraw1.c:12985: Test failed: Got unexpected caps 0x421350. ddraw1.c:12991: Test failed: Got unexpected hr 0x80004005. 074c:ddraw1: unhandled exception c0000005 at 0000000000416F57
=== w1064v1507 (64 bit report) ===
ddraw: ddraw1.c:12985: Test failed: Got unexpected caps 0x421350. ddraw1.c:12991: Test failed: Got unexpected hr 0x80004005. 0330:ddraw1: unhandled exception c0000005 at 0000000000416F57
=== w1064v1809 (64 bit report) ===
ddraw: ddraw1.c:12985: Test failed: Got unexpected caps 0x421350. ddraw1.c:12991: Test failed: Got unexpected hr 0x80004005. 0040:ddraw1: unhandled exception c0000005 at 0000000000416F57
=== w864 (64 bit report) ===
ddraw: ddraw2.c:13865: Test failed: Got unexpected caps 0x421350. ddraw2.c:13871: Test failed: Got unexpected hr 0x80004005. 06a0:ddraw2: unhandled exception c0000005 at 000000000044C410
=== w1064v1507 (64 bit report) ===
ddraw: ddraw2.c:13865: Test failed: Got unexpected caps 0x421350. ddraw2.c:13871: Test failed: Got unexpected hr 0x80004005. 0330:ddraw2: unhandled exception c0000005 at 000000000044C410
=== w1064v1809 (64 bit report) ===
ddraw: ddraw2.c:13865: Test failed: Got unexpected caps 0x421350. ddraw2.c:13871: Test failed: Got unexpected hr 0x80004005. 1514:ddraw2: unhandled exception c0000005 at 000000000044C410
=== wvistau64_zh_CN (32 bit report) ===
ddraw: ddraw4.c:3066: Test failed: Expected message 0x46, but didn't receive it. ddraw4.c:3068: Test failed: Expected screen size 1024x768, got 0x0. ddraw4.c:3074: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw4.c:3104: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw4.c:3111: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw4.c:3137: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw4.c:3160: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw4.c:3182: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw4.c:3208: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw4.c:3228: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw4.c:3264: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw4.c:3274: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw4.c:3300: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw4.c:3323: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw4.c:3345: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw4.c:3371: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw4.c:3391: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745). ddraw4.c:3428: Test failed: Expected (0,0)-(1024,768), got (-8,-8)-(1032,745).
=== wvistau64_he (task log) ===
Task errors: The previous 1 run(s) terminated abnormally
=== w1064v1809 (32 bit report) ===
ddraw: 1744:ddraw7: unhandled exception c0000005 at 733C40F8
=== debian10 (32 bit report) ===
ddraw: ddraw1: Timeout ddraw2: Timeout ddraw4: Timeout ddraw7: Timeout
=== debian10 (build log) ===
Task: WineTest did not produce the win32_fr_FR report
=== debian10 (32 bit WoW report) ===
ddraw: ddraw1: Timeout ddraw2: Timeout ddraw4: Timeout ddraw7: Timeout
=== debian10 (build log) ===
Task: WineTest did not produce the wow64 report
-
Henri Verbeet -
Marvin