[ros-diffs] [reactos] 191/218: [WINESYNC] d3dx9/tests: Remove useless '\n' within some ok() messages.

[winesync]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=48f365863f097171095c2…

commit 48f365863f097171095c2584d37f0f9e309dbad9
Author:     winesync <ros-dev(a)reactos.org>
AuthorDate: Mon Sep 21 23:07:35 2020 +0200
Commit:     Jérôme Gardou <jerome.gardou(a)reactos.org>
CommitDate: Thu Feb 4 16:37:06 2021 +0100

    [WINESYNC] d3dx9/tests: Remove useless '\n' within some ok() messages.
    
    Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>
    Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>
    Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
    
    wine commit id c1cf13a7512387885616684130b605a7640f5187 by Christian Costa
<titan.costa(a)gmail.com>
---
 modules/rostests/winetests/d3dx9_36/mesh.c | 16 ++++++----------
 sdk/tools/winesync/d3dx9.cfg               |  2 +-
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/modules/rostests/winetests/d3dx9_36/mesh.c
b/modules/rostests/winetests/d3dx9_36/mesh.c
index 50b867ee483..cc67551ed06 100644
--- a/modules/rostests/winetests/d3dx9_36/mesh.c
+++ b/modules/rostests/winetests/d3dx9_36/mesh.c
@@ -10157,10 +10157,10 @@ static void test_clone_mesh(void)
 
         hr = mesh->lpVtbl->CloneMesh(mesh, tc[i].clone_options,
tc[i].new_declaration,
                                      test_context->device, &mesh_clone);
-        ok(hr == D3D_OK, "CloneMesh test case %d failed. Got %x\n, expected
D3D_OK\n", i, hr);
+        ok(hr == D3D_OK, "Test %u, got unexpected hr %#x.\n", i, hr);
 
         hr = mesh_clone->lpVtbl->GetDeclaration(mesh_clone, new_declaration);
-        ok(hr == D3D_OK, "GetDeclaration test case %d failed. Got %x\n, expected
D3D_OK\n", i, hr);
+        ok(hr == D3D_OK, "Test %u, got unexpected hr %#x.\n", i, hr);
         /* Check declaration elements */
         for (j = 0; tc[i].new_declaration[j].Stream != 0xFF; j++)
         {
@@ -10346,8 +10346,7 @@ static void test_valid_mesh(void)
         }
 
         hr = D3DXValidMesh(mesh, tc[i].adjacency, &errors_and_warnings);
-        todo_wine ok(hr == tc[i].exp_hr, "D3DXValidMesh test case %d failed. "
-                     "Got %x\n, expected %x\n", i, hr, tc[i].exp_hr);
+        todo_wine ok(hr == tc[i].exp_hr, "Test %u, got unexpected hr %#x, expected
%#x.\n", i, hr, tc[i].exp_hr);
 
         /* Note errors_and_warnings is deliberately not checked because that
          * would require copying wast amounts of the text output. */
@@ -10490,8 +10489,7 @@ static void test_optimize_faces(void)
         hr = D3DXOptimizeFaces(tc[i].indices, tc[i].num_faces,
                                tc[i].num_vertices, tc[i].indices_are_32bit,
                                face_remap);
-        ok(hr == D3D_OK, "D3DXOptimizeFaces test case %d failed. "
-           "Got %x\n, expected D3D_OK\n", i, hr);
+        ok(hr == D3D_OK, "Test %u, got unexpected hr %#x.\n", i, hr);
 
         /* Compare face remap with expected face remap */
         for (j = 0; j < tc[i].num_faces; j++)
@@ -10508,15 +10506,13 @@ static void test_optimize_faces(void)
     hr = D3DXOptimizeFaces(tc[0].indices, tc[0].num_faces,
                            tc[0].num_vertices, tc[0].indices_are_32bit,
                            NULL);
-    ok(hr == D3DERR_INVALIDCALL, "D3DXOptimizeFaces passed NULL face_remap "
-       "pointer. Got %x\n, expected D3DERR_INVALIDCALL\n", hr);
+    ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr);
 
     /* Number of faces must be smaller than 2^15 */
     hr = D3DXOptimizeFaces(tc[0].indices, 2 << 15,
                            tc[0].num_vertices, FALSE,
                            &smallest_face_remap);
-    ok(hr == D3DERR_INVALIDCALL, "D3DXOptimizeFaces should not accept 2^15 "
-    "faces when using 16-bit indices. Got %x\n, expected D3DERR_INVALIDCALL\n",
hr);
+    ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr);
 }
 
 static HRESULT clear_normals(ID3DXMesh *mesh)
diff --git a/sdk/tools/winesync/d3dx9.cfg b/sdk/tools/winesync/d3dx9.cfg
index 1627b9f1d99..385ddb20490 100644
--- a/sdk/tools/winesync/d3dx9.cfg
+++ b/sdk/tools/winesync/d3dx9.cfg
@@ -15,4 +15,4 @@ files: {include/d3dx9.h: sdk/include/dxsdk/d3dx9.h, include/d3dx9anim.h:
sdk/inc
   include/d3dx9mesh.h: sdk/include/dxsdk/d3dx9mesh.h, include/d3dx9of.h:
sdk/include/dxsdk/d3dx9of.h,
   include/d3dx9shader.h: sdk/include/dxsdk/d3dx9shader.h, include/d3dx9shape.h:
sdk/include/dxsdk/d3dx9shape.h,
   include/d3dx9tex.h: sdk/include/dxsdk/d3dx9tex.h, include/d3dx9xof.h:
sdk/include/dxsdk/d3dx9xof.h}
-tags: {wine: bb222133a81581622c88c0d34534bc88a556f1f2}
+tags: {wine: c1cf13a7512387885616684130b605a7640f5187}