Signed-off-by: Stefan Dösinger <stefan@codeweavers.com
---
The way it stands it is just a repeat of the test a few lines earlier. I guess this was the original intention. And no, it does not affect the E_FAIL on the Geforce 9600. --- dlls/ddraw/tests/ddraw1.c | 8 ++++---- dlls/ddraw/tests/ddraw2.c | 8 ++++---- dlls/ddraw/tests/ddraw4.c | 8 ++++---- dlls/ddraw/tests/ddraw7.c | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index c10be66236a..8e9d8ff9ad1 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -10077,13 +10077,13 @@ static void test_getdc(void) hr = IDirectDrawSurface_Unlock(surface, NULL); ok(SUCCEEDED(hr), "Failed to unmap surface for format %s, hr %#x.\n", test_data[i].name, hr);
- hr = IDirectDrawSurface_Lock(surface, NULL, &map_desc, DDLOCK_READONLY | DDLOCK_WAIT, NULL); + hr = IDirectDrawSurface_Lock(surface2, NULL, &map_desc, DDLOCK_READONLY | DDLOCK_WAIT, NULL); ok(SUCCEEDED(hr), "Failed to map surface for format %s, hr %#x.\n", test_data[i].name, hr); - hr = IDirectDrawSurface_GetDC(surface, &dc); + hr = IDirectDrawSurface_GetDC(surface2, &dc); ok(SUCCEEDED(hr), "Failed to get DC for format %s, hr %#x.\n", test_data[i].name, hr); - hr = IDirectDrawSurface_ReleaseDC(surface, dc); + hr = IDirectDrawSurface_ReleaseDC(surface2, dc); ok(SUCCEEDED(hr), "Failed to release DC for format %s, hr %#x.\n", test_data[i].name, hr); - hr = IDirectDrawSurface_Unlock(surface, NULL); + hr = IDirectDrawSurface_Unlock(surface2, NULL); ok(SUCCEEDED(hr) || broken(ddraw_is_nvidia(ddraw) && hr == E_FAIL), "Failed to unmap surface for format %s, hr %#x.\n", test_data[i].name, hr);
diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 800e5d8a80b..273a01c2f4c 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -10776,13 +10776,13 @@ static void test_getdc(void) hr = IDirectDrawSurface_Unlock(surface, NULL); ok(SUCCEEDED(hr), "Failed to unmap surface for format %s, hr %#x.\n", test_data[i].name, hr);
- hr = IDirectDrawSurface_Lock(surface, NULL, &map_desc, DDLOCK_READONLY | DDLOCK_WAIT, NULL); + hr = IDirectDrawSurface_Lock(surface2, NULL, &map_desc, DDLOCK_READONLY | DDLOCK_WAIT, NULL); ok(SUCCEEDED(hr), "Failed to map surface for format %s, hr %#x.\n", test_data[i].name, hr); - hr = IDirectDrawSurface_GetDC(surface, &dc); + hr = IDirectDrawSurface_GetDC(surface2, &dc); ok(SUCCEEDED(hr), "Failed to get DC for format %s, hr %#x.\n", test_data[i].name, hr); - hr = IDirectDrawSurface_ReleaseDC(surface, dc); + hr = IDirectDrawSurface_ReleaseDC(surface2, dc); ok(SUCCEEDED(hr), "Failed to release DC for format %s, hr %#x.\n", test_data[i].name, hr); - hr = IDirectDrawSurface_Unlock(surface, NULL); + hr = IDirectDrawSurface_Unlock(surface2, NULL); ok(SUCCEEDED(hr) || broken(ddraw_is_nvidia(ddraw) && hr == E_FAIL), "Failed to unmap surface for format %s, hr %#x.\n", test_data[i].name, hr);
diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 29d72dfbbae..c674bad992c 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -12756,13 +12756,13 @@ static void test_getdc(void) hr = IDirectDrawSurface4_Unlock(surface, NULL); ok(SUCCEEDED(hr), "Failed to unmap surface for format %s, hr %#x.\n", test_data[i].name, hr);
- hr = IDirectDrawSurface4_Lock(surface, NULL, &map_desc, DDLOCK_READONLY | DDLOCK_WAIT, NULL); + hr = IDirectDrawSurface4_Lock(surface2, NULL, &map_desc, DDLOCK_READONLY | DDLOCK_WAIT, NULL); ok(SUCCEEDED(hr), "Failed to map surface for format %s, hr %#x.\n", test_data[i].name, hr); - hr = IDirectDrawSurface4_GetDC(surface, &dc); + hr = IDirectDrawSurface4_GetDC(surface2, &dc); ok(SUCCEEDED(hr), "Failed to get DC for format %s, hr %#x.\n", test_data[i].name, hr); - hr = IDirectDrawSurface4_ReleaseDC(surface, dc); + hr = IDirectDrawSurface4_ReleaseDC(surface2, dc); ok(SUCCEEDED(hr), "Failed to release DC for format %s, hr %#x.\n", test_data[i].name, hr); - hr = IDirectDrawSurface4_Unlock(surface, NULL); + hr = IDirectDrawSurface4_Unlock(surface2, NULL); ok(SUCCEEDED(hr), "Failed to unmap surface for format %s, hr %#x.\n", test_data[i].name, hr);
hr = IDirectDrawSurface4_Lock(surface2, NULL, &map_desc, DDLOCK_READONLY | DDLOCK_WAIT, NULL); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 20a1bc5f3af..849db47a6f4 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -12748,13 +12748,13 @@ static void test_getdc(void) hr = IDirectDrawSurface7_Unlock(surface, NULL); ok(SUCCEEDED(hr), "Failed to unmap surface for format %s, hr %#x.\n", test_data[i].name, hr);
- hr = IDirectDrawSurface7_Lock(surface, NULL, &map_desc, DDLOCK_READONLY | DDLOCK_WAIT, NULL); + hr = IDirectDrawSurface7_Lock(surface2, NULL, &map_desc, DDLOCK_READONLY | DDLOCK_WAIT, NULL); ok(SUCCEEDED(hr), "Failed to map surface for format %s, hr %#x.\n", test_data[i].name, hr); - hr = IDirectDrawSurface7_GetDC(surface, &dc); + hr = IDirectDrawSurface7_GetDC(surface2, &dc); ok(SUCCEEDED(hr), "Failed to get DC for format %s, hr %#x.\n", test_data[i].name, hr); - hr = IDirectDrawSurface7_ReleaseDC(surface, dc); + hr = IDirectDrawSurface7_ReleaseDC(surface2, dc); ok(SUCCEEDED(hr), "Failed to release DC for format %s, hr %#x.\n", test_data[i].name, hr); - hr = IDirectDrawSurface7_Unlock(surface, NULL); + hr = IDirectDrawSurface7_Unlock(surface2, NULL); ok(SUCCEEDED(hr), "Failed to unmap surface for format %s, hr %#x.\n", test_data[i].name, hr);
hr = IDirectDrawSurface7_Lock(surface2, NULL, &map_desc, DDLOCK_READONLY | DDLOCK_WAIT, NULL);