Module: wine Branch: master Commit: 1acd8278c860f19b59c741536b9ab9f02d29780f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1acd8278c860f19b59c741536b...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Tue Jan 17 21:13:33 2012 +0100
ddraw/tests: Add a border around the blitted source data in test_clipper_blt().
Some drivers use the neighbouring pixels in the interpolation. You can probably argue about whether that's right or wrong, but it's really not what we're trying to test in either case.
---
dlls/ddraw/tests/ddraw1.c | 18 +++++++++++++----- dlls/ddraw/tests/ddraw2.c | 18 +++++++++++++----- dlls/ddraw/tests/ddraw4.c | 18 +++++++++++++----- dlls/ddraw/tests/ddraw7.c | 18 +++++++++++++----- 4 files changed, 52 insertions(+), 20 deletions(-)
diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 846ca19..7ba5de1 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -173,8 +173,15 @@ static void test_clipper_blt(void) HWND window; DDBLTFX fx; HRESULT hr; + DWORD *ptr; DWORD ret;
+ static const DWORD src_data[] = + { + 0xff0000ff, 0xff0000ff, 0xff00ff00, 0xffff0000, 0xffffffff, 0xffffffff, + 0xff0000ff, 0xff0000ff, 0xff00ff00, 0xffff0000, 0xffffffff, 0xffffffff, + 0xff0000ff, 0xff0000ff, 0xff00ff00, 0xffff0000, 0xffffffff, 0xffffffff, + }; static const D3DCOLOR expected1[] = { 0x000000ff, 0x0000ff00, 0x00000000, 0x00000000, @@ -285,17 +292,18 @@ static void test_clipper_blt(void)
hr = IDirectDrawSurface_Lock(src_surface, NULL, &surface_desc, DDLOCK_WAIT, NULL); ok(SUCCEEDED(hr), "Failed to lock source surface, hr %#x.\n", hr); - ((DWORD *)surface_desc.lpSurface)[0] = 0xff0000ff; - ((DWORD *)surface_desc.lpSurface)[1] = 0xff00ff00; - ((DWORD *)surface_desc.lpSurface)[2] = 0xffff0000; - ((DWORD *)surface_desc.lpSurface)[3] = 0xffffffff; + ok(surface_desc.lPitch == 2560, "Got unexpected surface pitch %u.\n", surface_desc.lPitch); + ptr = surface_desc.lpSurface; + memcpy(&ptr[ 0], &src_data[ 0], 6 * sizeof(DWORD)); + memcpy(&ptr[ 640], &src_data[ 6], 6 * sizeof(DWORD)); + memcpy(&ptr[1280], &src_data[12], 6 * sizeof(DWORD)); hr = IDirectDrawSurface_Unlock(src_surface, NULL); ok(SUCCEEDED(hr), "Failed to unlock source surface, hr %#x.\n", hr);
hr = IDirectDrawSurface_SetClipper(dst_surface, clipper); ok(SUCCEEDED(hr), "Failed to set clipper, hr %#x.\n", hr);
- SetRect(&src_rect, 0, 0, 4, 1); + SetRect(&src_rect, 1, 1, 5, 2); hr = IDirectDrawSurface_Blt(dst_surface, NULL, src_surface, &src_rect, DDBLT_WAIT, NULL); ok(SUCCEEDED(hr), "Failed to blit, hr %#x.\n", hr); for (i = 0; i < 4; ++i) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index d94af1a..a0a26ee 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -180,8 +180,15 @@ static void test_clipper_blt(void) HWND window; DDBLTFX fx; HRESULT hr; + DWORD *ptr; DWORD ret;
+ static const DWORD src_data[] = + { + 0xff0000ff, 0xff0000ff, 0xff00ff00, 0xffff0000, 0xffffffff, 0xffffffff, + 0xff0000ff, 0xff0000ff, 0xff00ff00, 0xffff0000, 0xffffffff, 0xffffffff, + 0xff0000ff, 0xff0000ff, 0xff00ff00, 0xffff0000, 0xffffffff, 0xffffffff, + }; static const D3DCOLOR expected1[] = { 0x000000ff, 0x0000ff00, 0x00000000, 0x00000000, @@ -292,17 +299,18 @@ static void test_clipper_blt(void)
hr = IDirectDrawSurface_Lock(src_surface, NULL, &surface_desc, DDLOCK_WAIT, NULL); ok(SUCCEEDED(hr), "Failed to lock source surface, hr %#x.\n", hr); - ((DWORD *)surface_desc.lpSurface)[0] = 0xff0000ff; - ((DWORD *)surface_desc.lpSurface)[1] = 0xff00ff00; - ((DWORD *)surface_desc.lpSurface)[2] = 0xffff0000; - ((DWORD *)surface_desc.lpSurface)[3] = 0xffffffff; + ok(surface_desc.lPitch == 2560, "Got unexpected surface pitch %u.\n", surface_desc.lPitch); + ptr = surface_desc.lpSurface; + memcpy(&ptr[ 0], &src_data[ 0], 6 * sizeof(DWORD)); + memcpy(&ptr[ 640], &src_data[ 6], 6 * sizeof(DWORD)); + memcpy(&ptr[1280], &src_data[12], 6 * sizeof(DWORD)); hr = IDirectDrawSurface_Unlock(src_surface, NULL); ok(SUCCEEDED(hr), "Failed to unlock source surface, hr %#x.\n", hr);
hr = IDirectDrawSurface_SetClipper(dst_surface, clipper); ok(SUCCEEDED(hr), "Failed to set clipper, hr %#x.\n", hr);
- SetRect(&src_rect, 0, 0, 4, 1); + SetRect(&src_rect, 1, 1, 5, 2); hr = IDirectDrawSurface_Blt(dst_surface, NULL, src_surface, &src_rect, DDBLT_WAIT, NULL); ok(SUCCEEDED(hr), "Failed to blit, hr %#x.\n", hr); for (i = 0; i < 4; ++i) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 144f372..bf81412 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -476,8 +476,15 @@ static void test_clipper_blt(void) HWND window; DDBLTFX fx; HRESULT hr; + DWORD *ptr; DWORD ret;
+ static const DWORD src_data[] = + { + 0xff0000ff, 0xff0000ff, 0xff00ff00, 0xffff0000, 0xffffffff, 0xffffffff, + 0xff0000ff, 0xff0000ff, 0xff00ff00, 0xffff0000, 0xffffffff, 0xffffffff, + 0xff0000ff, 0xff0000ff, 0xff00ff00, 0xffff0000, 0xffffffff, 0xffffffff, + }; static const D3DCOLOR expected1[] = { 0x000000ff, 0x0000ff00, 0x00000000, 0x00000000, @@ -587,17 +594,18 @@ static void test_clipper_blt(void)
hr = IDirectDrawSurface4_Lock(src_surface, NULL, &surface_desc, DDLOCK_WAIT, NULL); ok(SUCCEEDED(hr), "Failed to lock source surface, hr %#x.\n", hr); - ((DWORD *)surface_desc.lpSurface)[0] = 0xff0000ff; - ((DWORD *)surface_desc.lpSurface)[1] = 0xff00ff00; - ((DWORD *)surface_desc.lpSurface)[2] = 0xffff0000; - ((DWORD *)surface_desc.lpSurface)[3] = 0xffffffff; + ok(surface_desc.lPitch == 2560, "Got unexpected surface pitch %u.\n", surface_desc.lPitch); + ptr = surface_desc.lpSurface; + memcpy(&ptr[ 0], &src_data[ 0], 6 * sizeof(DWORD)); + memcpy(&ptr[ 640], &src_data[ 6], 6 * sizeof(DWORD)); + memcpy(&ptr[1280], &src_data[12], 6 * sizeof(DWORD)); hr = IDirectDrawSurface4_Unlock(src_surface, NULL); ok(SUCCEEDED(hr), "Failed to unlock source surface, hr %#x.\n", hr);
hr = IDirectDrawSurface4_SetClipper(dst_surface, clipper); ok(SUCCEEDED(hr), "Failed to set clipper, hr %#x.\n", hr);
- SetRect(&src_rect, 0, 0, 4, 1); + SetRect(&src_rect, 1, 1, 5, 2); hr = IDirectDrawSurface4_Blt(dst_surface, NULL, src_surface, &src_rect, DDBLT_WAIT, NULL); ok(SUCCEEDED(hr), "Failed to blit, hr %#x.\n", hr); for (i = 0; i < 4; ++i) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index f130c01..84bae12 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -469,8 +469,15 @@ static void test_clipper_blt(void) HWND window; DDBLTFX fx; HRESULT hr; + DWORD *ptr; DWORD ret;
+ static const DWORD src_data[] = + { + 0xff0000ff, 0xff0000ff, 0xff00ff00, 0xffff0000, 0xffffffff, 0xffffffff, + 0xff0000ff, 0xff0000ff, 0xff00ff00, 0xffff0000, 0xffffffff, 0xffffffff, + 0xff0000ff, 0xff0000ff, 0xff00ff00, 0xffff0000, 0xffffffff, 0xffffffff, + }; static const D3DCOLOR expected1[] = { 0x000000ff, 0x0000ff00, 0x00000000, 0x00000000, @@ -580,17 +587,18 @@ static void test_clipper_blt(void)
hr = IDirectDrawSurface7_Lock(src_surface, NULL, &surface_desc, 0, NULL); ok(SUCCEEDED(hr), "Failed to lock source surface, hr %#x.\n", hr); - ((DWORD *)surface_desc.lpSurface)[0] = 0xff0000ff; - ((DWORD *)surface_desc.lpSurface)[1] = 0xff00ff00; - ((DWORD *)surface_desc.lpSurface)[2] = 0xffff0000; - ((DWORD *)surface_desc.lpSurface)[3] = 0xffffffff; + ok(surface_desc.lPitch == 2560, "Got unexpected surface pitch %u.\n", surface_desc.lPitch); + ptr = surface_desc.lpSurface; + memcpy(&ptr[ 0], &src_data[ 0], 6 * sizeof(DWORD)); + memcpy(&ptr[ 640], &src_data[ 6], 6 * sizeof(DWORD)); + memcpy(&ptr[1280], &src_data[12], 6 * sizeof(DWORD)); hr = IDirectDrawSurface7_Unlock(src_surface, NULL); ok(SUCCEEDED(hr), "Failed to unlock source surface, hr %#x.\n", hr);
hr = IDirectDrawSurface7_SetClipper(dst_surface, clipper); ok(SUCCEEDED(hr), "Failed to set clipper, hr %#x.\n", hr);
- SetRect(&src_rect, 0, 0, 4, 1); + SetRect(&src_rect, 1, 1, 5, 2); hr = IDirectDrawSurface7_Blt(dst_surface, NULL, src_surface, &src_rect, DDBLT_WAIT, NULL); ok(SUCCEEDED(hr), "Failed to blit, hr %#x.\n", hr); for (i = 0; i < 4; ++i)