From: Eric Pouech eric.pouech@gmail.com
--- dlls/d3dx9_36/tests/asm.c | 46 ++++++++++++++++-------------------- dlls/d3dx9_36/tests/shader.c | 4 ++-- 2 files changed, 22 insertions(+), 28 deletions(-)
diff --git a/dlls/d3dx9_36/tests/asm.c b/dlls/d3dx9_36/tests/asm.c index 6db4a6de2c1..2854936fb80 100644 --- a/dlls/d3dx9_36/tests/asm.c +++ b/dlls/d3dx9_36/tests/asm.c @@ -217,7 +217,7 @@ static void assembleshader_test(void) hr = D3DXAssembleShader(test1, strlen(test1), defines, NULL, D3DXSHADER_SKIPVALIDATION, &shader, &messages); - ok(hr == D3D_OK, "pDefines test failed with error 0x%lx - %ld\n", hr, hr & 0x0000FFFF); + ok(hr == D3D_OK, "Unexpected hr %#lx.\n", hr); if(messages) { trace("D3DXAssembleShader messages:\n%s", (char *)ID3DXBuffer_GetBufferPointer(messages)); ID3DXBuffer_Release(messages); @@ -229,7 +229,7 @@ static void assembleshader_test(void) hr = D3DXAssembleShader(test1, strlen(test1), defines, NULL, D3DXSHADER_SKIPVALIDATION, &shader, NULL); - ok(hr == D3D_OK, "NULL messages test failed with error 0x%lx - %ld\n", hr, hr & 0x0000FFFF); + ok(hr == D3D_OK, "Unexpected hr %#lx.\n", hr); if(shader) ID3DXBuffer_Release(shader);
/* NULL shader test */ @@ -237,7 +237,7 @@ static void assembleshader_test(void) hr = D3DXAssembleShader(test1, strlen(test1), defines, NULL, D3DXSHADER_SKIPVALIDATION, NULL, &messages); - ok(hr == D3D_OK, "NULL shader test failed with error 0x%lx - %ld\n", hr, hr & 0x0000FFFF); + ok(hr == D3D_OK, "Unexpected hr %#lx.\n", hr); if(messages) { trace("D3DXAssembleShader messages:\n%s", (char *)ID3DXBuffer_GetBufferPointer(messages)); ID3DXBuffer_Release(messages); @@ -316,7 +316,7 @@ static void assembleshader_test(void) hr = D3DXAssembleShaderFromFileA(shader_vsh_path, NULL, NULL, D3DXSHADER_SKIPVALIDATION, &shader, &messages); - ok(hr == D3D_OK, "D3DXAssembleShaderFromFile test failed with error 0x%lx - %ld\n", hr, hr & 0x0000FFFF); + ok(hr == D3D_OK, "Unexpected hr %#lx.\n", hr); if(messages) { trace("D3DXAssembleShader messages:\n%s", (char *)ID3DXBuffer_GetBufferPointer(messages)); ID3DXBuffer_Release(messages); @@ -328,7 +328,7 @@ static void assembleshader_test(void) messages = NULL; hr = D3DXAssembleShaderFromFileA("shader.vsh", NULL, &include.ID3DXInclude_iface, D3DXSHADER_SKIPVALIDATION, &shader, &messages); - ok(hr == D3D_OK, "D3DXAssembleShaderFromFile + pInclude test failed with error 0x%lx - %ld\n", hr, hr & 0x0000FFFF); + ok(hr == D3D_OK, "Unexpected hr %#lx.\n", hr); if(messages) { trace("D3DXAssembleShader messages:\n%s", (char *)ID3DXBuffer_GetBufferPointer(messages)); ID3DXBuffer_Release(messages); @@ -348,7 +348,7 @@ static void assembleshader_test(void) hr = D3DXAssembleShaderFromFileA(shader3_vsh_path, NULL, NULL, D3DXSHADER_SKIPVALIDATION, &shader, &messages); - ok(hr == D3D_OK, "D3DXAssembleShaderFromFile path search test failed with error 0x%lx - %ld\n", hr, hr & 0x0000FFFF); + ok(hr == D3D_OK, "Unexpected hr %#lx.\n", hr); if(messages) { trace("D3DXAssembleShaderFromFile path search messages:\n%s", (char *)ID3DXBuffer_GetBufferPointer(messages)); ID3DXBuffer_Release(messages); @@ -369,8 +369,7 @@ static void assembleshader_test(void) messages = NULL; hr = D3DXAssembleShaderFromFileA("shader.vsh", NULL, &include.ID3DXInclude_iface, D3DXSHADER_SKIPVALIDATION, &shader, &messages); - ok(hr == D3D_OK, "D3DXAssembleShaderFromFile + pInclude main shader test failed with error 0x%lx - %ld\n", - hr, hr & 0x0000ffff); + ok(hr == D3D_OK, "Unexpected hr %#lx.\n", hr); if (messages) { trace("D3DXAssembleShader messages:\n%s", (char *)ID3DXBuffer_GetBufferPointer(messages)); @@ -383,8 +382,7 @@ static void assembleshader_test(void) messages = NULL; hr = D3DXAssembleShaderFromFileW(L"shader.vsh", NULL, &include.ID3DXInclude_iface, D3DXSHADER_SKIPVALIDATION, &shader, &messages); - ok(hr == D3D_OK, "D3DXAssembleShaderFromFile + pInclude main shader test failed with error 0x%lx - %ld\n", - hr, hr & 0x0000ffff); + ok(hr == D3D_OK, "Unexpected hr %#lx.\n", hr); if (messages) { trace("D3DXAssembleShader messages:\n%s", (char *)ID3DXBuffer_GetBufferPointer(messages)); @@ -400,7 +398,7 @@ static void assembleshader_test(void) hr = D3DXAssembleShader(NULL, 0, NULL, NULL, D3DXSHADER_SKIPVALIDATION, &shader, &messages); - ok(hr == D3DXERR_INVALIDDATA, "NULL shader test failed with error 0x%lx - %ld\n", hr, hr & 0x0000FFFF); + ok(hr == D3DXERR_INVALIDDATA, "Unexpected hr %#lx.\n", hr); if(messages) { trace("D3DXAssembleShader messages:\n%s", (char *)ID3DXBuffer_GetBufferPointer(messages)); ID3DXBuffer_Release(messages); @@ -413,8 +411,7 @@ static void assembleshader_test(void) NULL, NULL, D3DXSHADER_SKIPVALIDATION, &shader, &messages); ok(hr == D3DXERR_INVALIDDATA || hr == E_FAIL, /* I get this on WinXP */ - "D3DXAssembleShaderFromFile nonexistent file test failed with error 0x%lx - %ld\n", - hr, hr & 0x0000FFFF); + "Unexpected hr %#lx.\n", hr); if(messages) { trace("D3DXAssembleShaderFromFile messages:\n%s", (char *)ID3DXBuffer_GetBufferPointer(messages)); ID3DXBuffer_Release(messages); @@ -427,7 +424,7 @@ static void assembleshader_test(void) hr = D3DXAssembleShaderFromResourceA(NULL, MAKEINTRESOURCEA(IDB_ASMSHADER), NULL, NULL, D3DXSHADER_SKIPVALIDATION, &shader, &messages); - ok(hr == D3D_OK, "D3DXAssembleShaderFromResource test failed with error 0x%lx - %ld\n", hr, hr & 0x0000FFFF); + ok(hr == D3D_OK, "Unexpected hr %#lx.\n", hr); if(messages) { trace("D3DXAssembleShaderFromResource messages:\n%s", (char *)ID3DXBuffer_GetBufferPointer(messages)); ID3DXBuffer_Release(messages); @@ -440,7 +437,7 @@ static void assembleshader_test(void) hr = D3DXAssembleShaderFromResourceA(NULL, "notexisting", NULL, NULL, D3DXSHADER_SKIPVALIDATION, &shader, &messages); - ok(hr == D3DXERR_INVALIDDATA, "D3DXAssembleShaderFromResource NULL shader test failed with error 0x%lx - %ld\n", hr, hr & 0x0000FFFF); + ok(hr == D3DXERR_INVALIDDATA, "Unexpected hr %#lx.\n", hr); if(messages) { trace("D3DXAssembleShaderFromResource messages:\n%s", (char *)ID3DXBuffer_GetBufferPointer(messages)); ID3DXBuffer_Release(messages); @@ -486,7 +483,7 @@ static void d3dxpreprocess_test(void) messages = NULL; hr = D3DXPreprocessShaderFromFileA(shader3_vsh_path, NULL, NULL, &shader, &messages); - ok(hr == D3D_OK, "D3DXPreprocessShaderFromFile path search test failed with error 0x%lx - %ld\n", hr, hr & 0x0000FFFF); + ok(hr == D3D_OK, "Unexpected hr %#lx.\n", hr); if(messages) { trace("D3DXPreprocessShaderFromFile path search messages:\n%s", (char *)ID3DXBuffer_GetBufferPointer(messages)); ID3DXBuffer_Release(messages); @@ -500,7 +497,7 @@ static void d3dxpreprocess_test(void) hr = D3DXPreprocessShaderFromFileA(shader_vsh_path, NULL, NULL, &shader, &messages); - ok(hr == D3D_OK, "D3DXPreprocessShaderFromFile test failed with error 0x%lx - %ld\n", hr, hr & 0x0000FFFF); + ok(hr == D3D_OK, "Unexpected hr %#lx.\n", hr); if(messages) { trace("D3DXPreprocessShader messages:\n%s", (char *)ID3DXBuffer_GetBufferPointer(messages)); ID3DXBuffer_Release(messages); @@ -512,7 +509,7 @@ static void d3dxpreprocess_test(void) messages = NULL; hr = D3DXPreprocessShaderFromFileA("shader.vsh", NULL, &include.ID3DXInclude_iface, &shader, &messages); - ok(hr == D3D_OK, "D3DXPreprocessShaderFromFile + pInclude test failed with error 0x%lx - %ld\n", hr, hr & 0x0000FFFF); + ok(hr == D3D_OK, "Unexpected hr %#lx.\n", hr); if(messages) { trace("D3DXPreprocessShader messages:\n%s", (char *)ID3DXBuffer_GetBufferPointer(messages)); ID3DXBuffer_Release(messages); @@ -532,8 +529,7 @@ static void d3dxpreprocess_test(void) messages = NULL; hr = D3DXPreprocessShaderFromFileA("shader.vsh", NULL, &include.ID3DXInclude_iface, &shader, &messages); - ok(hr == D3D_OK, "D3DXPreprocessShaderFromFile + pInclude main shader test failed with error 0x%lx - %ld\n", - hr, hr & 0x0000ffff); + ok(hr == D3D_OK, "Unexpected hr %#lx.\n", hr); if (messages) { trace("D3DXPreprocessShaderFromFile messages:\n%s", (char *)ID3DXBuffer_GetBufferPointer(messages)); @@ -546,8 +542,7 @@ static void d3dxpreprocess_test(void) messages = NULL; hr = D3DXPreprocessShaderFromFileW(L"shader.vsh", NULL, &include.ID3DXInclude_iface, &shader, &messages); - ok(hr == D3D_OK, "D3DXPreprocessShaderFromFile + pInclude main shader test failed with error 0x%lx - %ld\n", - hr, hr & 0x0000ffff); + ok(hr == D3D_OK, "Unexpected hr %#lx.\n", hr); if (messages) { trace("D3DXPreprocessShaderFromFile messages:\n%s", (char *)ID3DXBuffer_GetBufferPointer(messages)); @@ -564,8 +559,7 @@ static void d3dxpreprocess_test(void) NULL, NULL, &shader, &messages); ok(hr == D3DXERR_INVALIDDATA || hr == E_FAIL, /* I get this on WinXP */ - "D3DXPreprocessShaderFromFile nonexistent file test failed with error 0x%lx - %ld\n", - hr, hr & 0x0000FFFF); + "Unexpected hr %#lx.\n", hr); if(messages) { trace("D3DXPreprocessShaderFromFile messages:\n%s", (char *)ID3DXBuffer_GetBufferPointer(messages)); ID3DXBuffer_Release(messages); @@ -578,7 +572,7 @@ static void d3dxpreprocess_test(void) hr = D3DXPreprocessShaderFromResourceA(NULL, MAKEINTRESOURCEA(IDB_ASMSHADER), NULL, NULL, &shader, &messages); - ok(hr == D3D_OK, "D3DXPreprocessShaderFromResource test failed with error 0x%lx - %ld\n", hr, hr & 0x0000FFFF); + ok(hr == D3D_OK, "Unexpected hr %#lx.\n", hr); if(messages) { trace("D3DXPreprocessShaderFromResource messages:\n%s", (char *)ID3DXBuffer_GetBufferPointer(messages)); ID3DXBuffer_Release(messages); @@ -591,7 +585,7 @@ static void d3dxpreprocess_test(void) hr = D3DXPreprocessShaderFromResourceA(NULL, "notexisting", NULL, NULL, &shader, &messages); - ok(hr == D3DXERR_INVALIDDATA, "D3DXPreprocessShaderFromResource NULL shader test failed with error 0x%lx - %ld\n", hr, hr & 0x0000FFFF); + ok(hr == D3DXERR_INVALIDDATA, "Unexpected hr %#lx.\n", hr); if(messages) { trace("D3DXPreprocessShaderFromResource messages:\n%s", (char *)ID3DXBuffer_GetBufferPointer(messages)); ID3DXBuffer_Release(messages); diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index bbeb58bdfca..984f82d1448 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -458,7 +458,7 @@ static void test_get_shader_constant_table_ex(void) ok(constant_table != NULL, "D3DXGetShaderConstantTableEx() failed, got NULL\n");
size = ID3DXConstantTable_GetBufferSize(constant_table); - ok(size == 28, "Got result %lx, expected 28\n", size); + ok(size == 28, "Unexpected size %lu.\n", size);
data = ID3DXConstantTable_GetBufferPointer(constant_table); ok(!memcmp(data, shader_with_ctab + 6, size), "Retrieved wrong CTAB data\n"); @@ -471,7 +471,7 @@ static void test_get_shader_constant_table_ex(void) ok(desc.Creator == (const char *)data + 0x10, "Got result %p, expected %p\n", desc.Creator, (const char *)data + 0x10); ok(desc.Version == D3DVS_VERSION(3, 0), "Got result %lx, expected %x\n", desc.Version, D3DVS_VERSION(3, 0)); - ok(desc.Constants == 0, "Got result %x, expected 0\n", desc.Constants); + ok(desc.Constants == 0, "Unexpected Constants %u.\n", desc.Constants);
ID3DXConstantTable_Release(constant_table);