Module: wine Branch: master Commit: 6e0d056e9a4f1a13aa3493044f8735673d2fe27c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e0d056e9a4f1a13aa3493044f...
Author: Stefan Dösinger stefan@codeweavers.com Date: Thu Sep 22 13:24:07 2011 +0200
ddraw/tests: Use sizeof instead of a magic number.
---
dlls/ddraw/tests/visual.c | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 96c940f..e0ba7bd 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -1453,7 +1453,7 @@ static void D3D1_TextureMapBlendTest(void)
memcpy(exdesc.lpData, test1_quads, sizeof(test1_quads));
- exe_buffer_ptr = 256 + (char*)exdesc.lpData; + exe_buffer_ptr = sizeof(test1_quads) + (char*)exdesc.lpData;
EXEBUF_PUT_PROCESSVERTICES(8, exe_buffer_ptr);
@@ -1478,7 +1478,7 @@ static void D3D1_TextureMapBlendTest(void)
EXEBUF_END(exe_buffer_ptr);
- exe_length = ((char*)exe_buffer_ptr - (char*)exdesc.lpData) - 256; + exe_length = ((char*)exe_buffer_ptr - (char*)exdesc.lpData) - sizeof(test1_quads);
hr = IDirect3DExecuteBuffer_Unlock(ExecuteBuffer); if (FAILED(hr)) { @@ -1488,7 +1488,7 @@ static void D3D1_TextureMapBlendTest(void) memset(&exdata, 0, sizeof(D3DEXECUTEDATA)); exdata.dwSize = sizeof(D3DEXECUTEDATA); exdata.dwVertexCount = 8; - exdata.dwInstructionOffset = 256; + exdata.dwInstructionOffset = sizeof(test1_quads); exdata.dwInstructionLength = exe_length; hr = IDirect3DExecuteBuffer_SetExecuteData(ExecuteBuffer, &exdata); ok(hr == D3D_OK, "IDirect3DExecuteBuffer_SetExecuteData failed with %08x\n", hr); @@ -1585,7 +1585,7 @@ static void D3D1_TextureMapBlendTest(void)
memcpy(exdesc.lpData, test1_quads, sizeof(test1_quads));
- exe_buffer_ptr = 256 + (char*)exdesc.lpData; + exe_buffer_ptr = sizeof(test1_quads) + (char*)exdesc.lpData;
EXEBUF_PUT_PROCESSVERTICES(8, exe_buffer_ptr);
@@ -1599,7 +1599,7 @@ static void D3D1_TextureMapBlendTest(void)
EXEBUF_END(exe_buffer_ptr);
- exe_length = ((char*)exe_buffer_ptr - (char*)exdesc.lpData) - 256; + exe_length = ((char*)exe_buffer_ptr - (char*)exdesc.lpData) - sizeof(test1_quads);
hr = IDirect3DExecuteBuffer_Unlock(ExecuteBuffer); if (FAILED(hr)) { @@ -1609,7 +1609,7 @@ static void D3D1_TextureMapBlendTest(void) memset(&exdata, 0, sizeof(D3DEXECUTEDATA)); exdata.dwSize = sizeof(D3DEXECUTEDATA); exdata.dwVertexCount = 8; - exdata.dwInstructionOffset = 256; + exdata.dwInstructionOffset = sizeof(test1_quads); exdata.dwInstructionLength = exe_length; hr = IDirect3DExecuteBuffer_SetExecuteData(ExecuteBuffer, &exdata); ok(hr == D3D_OK, "IDirect3DExecuteBuffer_SetExecuteData failed with %08x\n", hr); @@ -1706,7 +1706,7 @@ static void D3D1_TextureMapBlendTest(void)
memcpy(exdesc.lpData, test2_quads, sizeof(test2_quads));
- exe_buffer_ptr = 256 + (char*)exdesc.lpData; + exe_buffer_ptr = sizeof(test2_quads) + (char*)exdesc.lpData;
EXEBUF_PUT_PROCESSVERTICES(8, exe_buffer_ptr);
@@ -1721,7 +1721,7 @@ static void D3D1_TextureMapBlendTest(void)
EXEBUF_END(exe_buffer_ptr);
- exe_length = ((char*)exe_buffer_ptr - (char*)exdesc.lpData) - 256; + exe_length = ((char*)exe_buffer_ptr - (char*)exdesc.lpData) - sizeof(test2_quads);
hr = IDirect3DExecuteBuffer_Unlock(ExecuteBuffer); if (FAILED(hr)) { @@ -1731,7 +1731,7 @@ static void D3D1_TextureMapBlendTest(void) memset(&exdata, 0, sizeof(D3DEXECUTEDATA)); exdata.dwSize = sizeof(D3DEXECUTEDATA); exdata.dwVertexCount = 8; - exdata.dwInstructionOffset = 256; + exdata.dwInstructionOffset = sizeof(test2_quads); exdata.dwInstructionLength = exe_length; hr = IDirect3DExecuteBuffer_SetExecuteData(ExecuteBuffer, &exdata); ok(hr == D3D_OK, "IDirect3DExecuteBuffer_SetExecuteData failed with %08x\n", hr); @@ -1832,7 +1832,7 @@ static void D3D1_TextureMapBlendTest(void)
memcpy(exdesc.lpData, test1_quads, sizeof(test1_quads));
- exe_buffer_ptr = 256 + (char*)exdesc.lpData; + exe_buffer_ptr = sizeof(test1_quads) + (char*)exdesc.lpData;
EXEBUF_PUT_PROCESSVERTICES(8, exe_buffer_ptr);
@@ -1847,7 +1847,7 @@ static void D3D1_TextureMapBlendTest(void)
EXEBUF_END(exe_buffer_ptr);
- exe_length = ((char*)exe_buffer_ptr - (char*)exdesc.lpData) - 256; + exe_length = ((char*)exe_buffer_ptr - (char*)exdesc.lpData) - sizeof(test1_quads);
hr = IDirect3DExecuteBuffer_Unlock(ExecuteBuffer); if (FAILED(hr)) { @@ -1857,7 +1857,7 @@ static void D3D1_TextureMapBlendTest(void) memset(&exdata, 0, sizeof(D3DEXECUTEDATA)); exdata.dwSize = sizeof(D3DEXECUTEDATA); exdata.dwVertexCount = 8; - exdata.dwInstructionOffset = 256; + exdata.dwInstructionOffset = sizeof(test1_quads); exdata.dwInstructionLength = exe_length; hr = IDirect3DExecuteBuffer_SetExecuteData(ExecuteBuffer, &exdata); ok(hr == D3D_OK, "IDirect3DExecuteBuffer_SetExecuteData failed with %08x\n", hr); @@ -1970,7 +1970,7 @@ static void D3D1_TextureMapBlendTest(void)
memcpy(exdesc.lpData, test1_quads, sizeof(test1_quads));
- exe_buffer_ptr = 256 + (char*)exdesc.lpData; + exe_buffer_ptr = sizeof(test1_quads) + (char*)exdesc.lpData;
EXEBUF_PUT_PROCESSVERTICES(8, exe_buffer_ptr);
@@ -1985,7 +1985,7 @@ static void D3D1_TextureMapBlendTest(void)
EXEBUF_END(exe_buffer_ptr);
- exe_length = ((char*)exe_buffer_ptr - (char*)exdesc.lpData) - 256; + exe_length = ((char*)exe_buffer_ptr - (char*)exdesc.lpData) - sizeof(test1_quads);
hr = IDirect3DExecuteBuffer_Unlock(ExecuteBuffer); if (FAILED(hr)) { @@ -1995,7 +1995,7 @@ static void D3D1_TextureMapBlendTest(void) memset(&exdata, 0, sizeof(D3DEXECUTEDATA)); exdata.dwSize = sizeof(D3DEXECUTEDATA); exdata.dwVertexCount = 8; - exdata.dwInstructionOffset = 256; + exdata.dwInstructionOffset = sizeof(test1_quads); exdata.dwInstructionLength = exe_length; hr = IDirect3DExecuteBuffer_SetExecuteData(ExecuteBuffer, &exdata); ok(hr == D3D_OK, "IDirect3DExecuteBuffer_SetExecuteData failed with %08x\n", hr);