Module: wine Branch: master Commit: fcf0829b60e33ccd57b8b9975eebc701e88ff201 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcf0829b60e33ccd57b8b9975e...
Author: Francois Gouget fgouget@free.fr Date: Sat Apr 23 07:44:26 2016 +0200
d3dx9_36/tests: Spelling fixes for mesh and xfile ok() messages.
Signed-off-by: Francois Gouget fgouget@free.fr Signed-off-by: Matteo Bruni mbruni@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/d3dx9_36/tests/mesh.c | 24 ++++++++++++------------ dlls/d3dx9_36/tests/xfile.c | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 4a75e47..f2a0751 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -4848,7 +4848,7 @@ static void test_update_semantics(void) }
hr = mesh->lpVtbl->UpdateSemantics(mesh, declaration); - ok(hr == D3D_OK, "Test UpdateSematics, got %#x expected %#x\n", hr, D3D_OK); + ok(hr == D3D_OK, "Test UpdateSemantics, got %#x expected %#x\n", hr, D3D_OK);
/* Check that declaration was written by getting it again */ memset(declaration, 0, sizeof(declaration)); @@ -4863,7 +4863,7 @@ static void test_update_semantics(void) { if (decl_ptr->Usage == D3DDECLUSAGE_POSITION) { - ok(decl_ptr->Offset == offset, "Test UpdateSematics, got offset %d expected %d\n", + ok(decl_ptr->Offset == offset, "Test UpdateSemantics, got offset %d expected %d\n", decl_ptr->Offset, offset); } } @@ -4874,7 +4874,7 @@ static void test_update_semantics(void) memset(declaration, filler_a, sizeof(declaration)); memcpy(declaration, declaration0, sizeof(declaration0)); hr = mesh->lpVtbl->UpdateSemantics(mesh, declaration); - ok(hr == D3D_OK, "Test UpdateSematics, " + ok(hr == D3D_OK, "Test UpdateSemantics, " "got %#x expected D3D_OK\n", hr); memset(declaration, filler_b, sizeof(declaration)); hr = mesh->lpVtbl->GetDeclaration(mesh, declaration); @@ -4907,12 +4907,12 @@ static void test_update_semantics(void) }
hr = mesh->lpVtbl->UpdateSemantics(mesh, declaration); - ok(hr == D3D_OK, "Test UpdateSematics for overlapping fields, " + ok(hr == D3D_OK, "Test UpdateSemantics for overlapping fields, " "got %#x expected D3D_OK\n", hr);
/* Set the position type to color instead of float3 */ hr = mesh->lpVtbl->UpdateSemantics(mesh, declaration_pos_type_color); - ok(hr == D3D_OK, "Test UpdateSematics position type color, " + ok(hr == D3D_OK, "Test UpdateSemantics position type color, " "got %#x expected D3D_OK\n", hr);
/* The following test cases show that NULL, smaller or larger declarations, @@ -4925,7 +4925,7 @@ static void test_update_semantics(void) /* Null declaration (invalid declaration) */ mesh->lpVtbl->UpdateSemantics(mesh, declaration0); /* Set a valid declaration */ hr = mesh->lpVtbl->UpdateSemantics(mesh, NULL); - ok(hr == D3DERR_INVALIDCALL, "Test UpdateSematics null pointer declaration, " + ok(hr == D3DERR_INVALIDCALL, "Test UpdateSemantics null pointer declaration, " "got %#x expected D3DERR_INVALIDCALL\n", hr); vertex_size = mesh->lpVtbl->GetNumBytesPerVertex(mesh); ok(vertex_size == exp_vertex_size, "Got vertex declaration size %u, expected %u\n", @@ -4939,7 +4939,7 @@ static void test_update_semantics(void) /* Smaller vertex declaration (invalid declaration) */ mesh->lpVtbl->UpdateSemantics(mesh, declaration0); /* Set a valid declaration */ hr = mesh->lpVtbl->UpdateSemantics(mesh, declaration_smaller); - ok(hr == D3DERR_INVALIDCALL, "Test UpdateSematics for smaller vertex declaration, " + ok(hr == D3DERR_INVALIDCALL, "Test UpdateSemantics for smaller vertex declaration, " "got %#x expected D3DERR_INVALIDCALL\n", hr); vertex_size = mesh->lpVtbl->GetNumBytesPerVertex(mesh); ok(vertex_size == exp_vertex_size, "Got vertex declaration size %u, expected %u\n", @@ -4953,7 +4953,7 @@ static void test_update_semantics(void) /* Larger vertex declaration (invalid declaration) */ mesh->lpVtbl->UpdateSemantics(mesh, declaration0); /* Set a valid declaration */ hr = mesh->lpVtbl->UpdateSemantics(mesh, declaration_larger); - ok(hr == D3DERR_INVALIDCALL, "Test UpdateSematics for larger vertex declaration, " + ok(hr == D3DERR_INVALIDCALL, "Test UpdateSemantics for larger vertex declaration, " "got %#x expected D3DERR_INVALIDCALL\n", hr); vertex_size = mesh->lpVtbl->GetNumBytesPerVertex(mesh); ok(vertex_size == exp_vertex_size, "Got vertex declaration size %u, expected %u\n", @@ -4967,7 +4967,7 @@ static void test_update_semantics(void) /* Use multiple streams and keep the same vertex size (invalid declaration) */ mesh->lpVtbl->UpdateSemantics(mesh, declaration0); /* Set a valid declaration */ hr = mesh->lpVtbl->UpdateSemantics(mesh, declaration_multiple_streams); - ok(hr == D3DERR_INVALIDCALL, "Test UpdateSematics using multiple streams, " + ok(hr == D3DERR_INVALIDCALL, "Test UpdateSemantics using multiple streams, " "got %#x expected D3DERR_INVALIDCALL\n", hr); vertex_size = mesh->lpVtbl->GetNumBytesPerVertex(mesh); ok(vertex_size == exp_vertex_size, "Got vertex declaration size %u, expected %u\n", @@ -4987,7 +4987,7 @@ static void test_update_semantics(void) /* Double usage (invalid declaration) */ mesh->lpVtbl->UpdateSemantics(mesh, declaration0); /* Set a valid declaration */ hr = mesh->lpVtbl->UpdateSemantics(mesh, declaration_double_usage); - ok(hr == D3D_OK, "Test UpdateSematics double usage, " + ok(hr == D3D_OK, "Test UpdateSemantics double usage, " "got %#x expected D3D_OK\n", hr); vertex_size = mesh->lpVtbl->GetNumBytesPerVertex(mesh); ok(vertex_size == exp_vertex_size, "Got vertex declaration size %u, expected %u\n", @@ -5001,7 +5001,7 @@ static void test_update_semantics(void) /* Set the position to an undefined type (invalid declaration) */ mesh->lpVtbl->UpdateSemantics(mesh, declaration0); /* Set a valid declaration */ hr = mesh->lpVtbl->UpdateSemantics(mesh, declaration_undefined_type); - ok(hr == D3D_OK, "Test UpdateSematics undefined type, " + ok(hr == D3D_OK, "Test UpdateSemantics undefined type, " "got %#x expected D3D_OK\n", hr); vertex_size = mesh->lpVtbl->GetNumBytesPerVertex(mesh); ok(vertex_size == exp_vertex_size, "Got vertex declaration size %u, expected %u\n", @@ -5015,7 +5015,7 @@ static void test_update_semantics(void) /* Use a not 4 byte aligned offset (invalid declaration) */ mesh->lpVtbl->UpdateSemantics(mesh, declaration0); /* Set a valid declaration */ hr = mesh->lpVtbl->UpdateSemantics(mesh, declaration_not_4_byte_aligned_offset); - ok(hr == D3D_OK, "Test UpdateSematics not 4 byte aligned offset, " + ok(hr == D3D_OK, "Test UpdateSemantics not 4 byte aligned offset, " "got %#x expected D3D_OK\n", hr); vertex_size = mesh->lpVtbl->GetNumBytesPerVertex(mesh); ok(vertex_size == exp_vertex_size, "Got vertex declaration size %u, expected %u\n", diff --git a/dlls/d3dx9_36/tests/xfile.c b/dlls/d3dx9_36/tests/xfile.c index 9c722b7..46b4ee2 100644 --- a/dlls/d3dx9_36/tests/xfile.c +++ b/dlls/d3dx9_36/tests/xfile.c @@ -188,7 +188,7 @@ static void test_getname(void) ret = data_object->lpVtbl->GetName(data_object, name, &length); ok(ret == S_OK, "GetName failed with %#x\n", ret); ok(length == 7, "Returned length should be 7 instead of %ld\n", length); - ok(!strcmp(name, "Object"), "Returned string should be 'Object' intead of '%s'\n", name); + ok(!strcmp(name, "Object"), "Returned string should be 'Object' instead of '%s'\n", name); length = 3; ret = data_object->lpVtbl->GetName(data_object, name, &length); ok(ret== D3DXFERR_BADVALUE, "GetName returned %#x, expected %#x\n", ret, D3DXFERR_BADVALUE);