Signed-off-by: Matteo Bruni mbruni@codeweavers.com --- Also fix the same comment in ddraw4.c, merge with another similar patch that I had in my queue.
Supersedes patch 174018.
dlls/ddraw/tests/ddraw1.c | 2 +- dlls/ddraw/tests/ddraw2.c | 2 +- dlls/ddraw/tests/ddraw4.c | 4 ++-- dlls/ddraw/tests/ddraw7.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 64c03c87d0c..fa65d0e722e 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -5083,7 +5083,7 @@ static void test_surface_attachment(void) hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface2); todo_wine ok(hr == DDERR_CANNOTATTACHSURFACE, "Got unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) - IDirectDrawSurface_DeleteAttachedSurface(surface1, 0, surface3); + IDirectDrawSurface_DeleteAttachedSurface(surface1, 0, surface2); hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface3); ok(hr == D3D_OK, "Failed to attach depth buffer, hr %#x.\n", hr); hr = IDirectDrawSurface_DeleteAttachedSurface(surface1, 0, surface3); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 77c8e32e6bd..541362c7488 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -6094,7 +6094,7 @@ static void test_surface_attachment(void) hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface2); todo_wine ok(hr == DDERR_CANNOTATTACHSURFACE, "Got unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) - IDirectDrawSurface2_DeleteAttachedSurface(surface1, 0, surface3); + IDirectDrawSurface2_DeleteAttachedSurface(surface1, 0, surface2); hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface3); ok(hr == D3D_OK, "Failed to attach depth buffer, hr %#x.\n", hr); hr = IDirectDrawSurface2_DeleteAttachedSurface(surface1, 0, surface3); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index df20ccb09d3..e61d67d723d 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -7624,7 +7624,7 @@ static void test_surface_attachment(void) hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface2); todo_wine ok(hr == DDERR_CANNOTATTACHSURFACE, "Got unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) - IDirectDrawSurface4_DeleteAttachedSurface(surface1, 0, surface3); + IDirectDrawSurface4_DeleteAttachedSurface(surface1, 0, surface2); hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface3); ok(hr == D3D_OK, "Failed to attach depth buffer, hr %#x.\n", hr); hr = IDirectDrawSurface4_DeleteAttachedSurface(surface1, 0, surface3); @@ -16622,7 +16622,7 @@ static void test_surface_format_conversion_alpha(void) {16}, {0x0000f800}, {0x000007e0}, {0x0000001f}, {0x00000000} }, "R5G6B5", 2, 4, 4, 0, TRUE, - /* Looks broken for sysmem texture convertions on Windows (at + /* Looks broken for sysmem texture conversions on Windows (at * least with hardware device), the result is either error from * _Blt() or a copy of the source data without any conversion. */ }, diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 7c46f33cb7a..c1db7b2df6a 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -7496,7 +7496,7 @@ static void test_surface_attachment(void) hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface2); todo_wine ok(hr == DDERR_CANNOTATTACHSURFACE, "Got unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) - IDirectDrawSurface7_DeleteAttachedSurface(surface1, 0, surface3); + IDirectDrawSurface7_DeleteAttachedSurface(surface1, 0, surface2); hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface3); ok(hr == D3D_OK, "Failed to attach depth buffer, hr %#x.\n", hr); hr = IDirectDrawSurface7_DeleteAttachedSurface(surface1, 0, surface3); @@ -16593,7 +16593,7 @@ static void test_surface_format_conversion_alpha(void) {16}, {0x0000f800}, {0x000007e0}, {0x0000001f}, {0x00000000} }, "R5G6B5", 2, 4, 4, 0, TRUE, - /* Looks broken for sysmem texture convertions on Windows (at + /* Looks broken for sysmem texture conversions on Windows (at * least with hardware device), the result is either error from * _Blt() or a copy of the source data without any conversion. */ },
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=60427
Your paranoid android.
=== w864 (32 bit report) ===
ddraw: ddraw2.c:1013: Test failed: Got unexpected hr 0x887601c2. ddraw2.c:1015: Test failed: Got unexpected color 0x00000080.
=== w1064v1809_ar (32 bit report) ===
ddraw: ddraw2.c:1013: Test failed: Got unexpected hr 0x887601c2. ddraw2.c:1015: Test failed: Got unexpected color 0x00000000.
=== w1064v1809_he (32 bit report) ===
ddraw: ddraw2.c:1013: Test failed: Got unexpected hr 0x887601c2. ddraw2.c:1015: Test failed: Got unexpected color 0x00000000.
=== w1064v1809_ja (32 bit report) ===
ddraw: ddraw2.c:1013: Test failed: Got unexpected hr 0x887601c2. ddraw2.c:1015: Test failed: Got unexpected color 0x00000000.
=== w1064v1809_ar (32 bit report) ===
ddraw: ddraw4.c:1200: Test failed: Got unexpected color 0x0000ff00.
=== w1064v1809_he (32 bit report) ===
ddraw: ddraw4.c:1200: Test failed: Got unexpected color 0x0000ff00.
=== w1064v1809_ja (32 bit report) ===
ddraw: ddraw4.c:1200: Test failed: Got unexpected color 0x0000ff00.
=== w1064v1809 (32 bit report) ===
ddraw: 196c:ddraw7: unhandled exception c0000005 at 731440F8
=== w1064v1809_2scr (32 bit report) ===
ddraw: 1a6c:ddraw7: unhandled exception c0000005 at 733540F8
=== w1064v1809_ar (32 bit report) ===
ddraw: 1010:ddraw7: unhandled exception c0000005 at 72CC40F8
=== w1064v1809_he (32 bit report) ===
ddraw: 1a90:ddraw7: unhandled exception c0000005 at 735A40F8
=== w1064v1809_ja (32 bit report) ===
ddraw: 1a78:ddraw7: unhandled exception c0000005 at 723640F8
=== w1064v1809_zh_CN (32 bit report) ===
ddraw: 1aa4:ddraw7: unhandled exception c0000005 at 734240F8
-
Henri Verbeet -
Marvin -
Matteo Bruni