diff --git a/patches/d3dx9_36-D3DXOptimizeVertices/0001-d3dx9_36-tests-Remove-useless-n-within-some-ok-messa.patch b/patches/d3dx9_36-D3DXOptimizeVertices/0001-d3dx9_36-tests-Remove-useless-n-within-some-ok-messa.patch
index 5642fbb9..24a6f6e2 100644
--- a/patches/d3dx9_36-D3DXOptimizeVertices/0001-d3dx9_36-tests-Remove-useless-n-within-some-ok-messa.patch
+++ b/patches/d3dx9_36-D3DXOptimizeVertices/0001-d3dx9_36-tests-Remove-useless-n-within-some-ok-messa.patch
@@ -1,4 +1,4 @@
-From 0c19922d2d7f8f14cfa8642f06b3f76e5a07029e Mon Sep 17 00:00:00 2001
+From cdcb9581d105a7964b06ca9c5525e28db25d6206 Mon Sep 17 00:00:00 2001
 From: Christian Costa <titan.costa@gmail.com>
 Date: Sun, 16 Jul 2017 17:39:28 +0200
 Subject: d3dx9_36/tests: Remove useless \n within some ok messages.
@@ -8,46 +8,46 @@ Subject: d3dx9_36/tests: Remove useless \n within some ok messages.
  1 file changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c
-index f803938537f..07c978265c8 100644
+index 95dd06e4662..b1ab0aaf594 100644
 --- a/dlls/d3dx9_36/tests/mesh.c
 +++ b/dlls/d3dx9_36/tests/mesh.c
-@@ -10403,10 +10403,10 @@ static void test_clone_mesh(void)
+@@ -10195,10 +10195,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, "CloneMesh test case %d failed. Got %x, expected D3D_OK\n", i, hr);
++        ok(hr == D3D_OK, "CloneMesh test case %d failed. Got %x, expected D3D_OK.\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, "GetDeclaration test case %d failed. Got %x, expected D3D_OK\n", i, hr);
++        ok(hr == D3D_OK, "GetDeclaration test case %d failed. Got %x, expected D3D_OK.\n", i, hr);
          /* Check declaration elements */
          for (j = 0; tc[i].new_declaration[j].Stream != 0xFF; j++)
          {
-@@ -10593,7 +10593,7 @@ static void test_valid_mesh(void)
+@@ -10385,7 +10385,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);
-+                     "Got %x, expected %x\n", i, hr, tc[i].exp_hr);
++                "Got %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. */
-@@ -10758,7 +10758,7 @@ static void test_optimize_faces(void)
+@@ -10529,7 +10529,7 @@ static void test_optimize_faces(void)
                                 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);
-+           "Got %x, expected D3D_OK\n", i, hr);
++                "Got %x, expected D3D_OK.\n", i, hr);
  
          /* Compare face remap with expected face remap */
          for (j = 0; j < tc[i].num_faces; j++)
-@@ -10776,14 +10776,14 @@ static void test_optimize_faces(void)
+@@ -10547,14 +10547,14 @@ static void test_optimize_faces(void)
                             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);
-+       "pointer. Got %x, expected D3DERR_INVALIDCALL\n", hr);
++            "pointer. Got %x, expected D3DERR_INVALIDCALL.\n", hr);
  
      /* Number of faces must be smaller than 2^15 */
      hr = D3DXOptimizeFaces(tc[0].indices, 2 << 15,
@@ -55,7 +55,7 @@ index f803938537f..07c978265c8 100644
                             &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);
-+       "faces when using 16-bit indices. Got %x, expected D3DERR_INVALIDCALL\n", hr);
++            "faces when using 16-bit indices. Got %x, expected D3DERR_INVALIDCALL.\n", hr);
  }
  
  static HRESULT clear_normals(ID3DXMesh *mesh)
diff --git a/patches/d3dx9_36-D3DXOptimizeVertices/0002-d3dx9_36-Add-semi-stub-for-D3DXOptimizeVertices.patch b/patches/d3dx9_36-D3DXOptimizeVertices/0002-d3dx9_36-Add-semi-stub-for-D3DXOptimizeVertices.patch
index 89087c5e..d3e3ced7 100644
--- a/patches/d3dx9_36-D3DXOptimizeVertices/0002-d3dx9_36-Add-semi-stub-for-D3DXOptimizeVertices.patch
+++ b/patches/d3dx9_36-D3DXOptimizeVertices/0002-d3dx9_36-Add-semi-stub-for-D3DXOptimizeVertices.patch
@@ -1,4 +1,4 @@
-From aec6c09b537e7fe3bc9c3ad2d298798aa495aaa6 Mon Sep 17 00:00:00 2001
+From 9953d63a9b6250e72c618ea12ece1bc281790c6f Mon Sep 17 00:00:00 2001
 From: Christian Costa <titan.costa@gmail.com>
 Date: Sun, 16 Jul 2017 18:13:31 +0200
 Subject: d3dx9_36: Add semi-stub for D3DXOptimizeVertices.
@@ -29,7 +29,7 @@ Subject: d3dx9_36: Add semi-stub for D3DXOptimizeVertices.
  22 files changed, 69 insertions(+), 20 deletions(-)
 
 diff --git a/dlls/d3dx9_24/d3dx9_24.spec b/dlls/d3dx9_24/d3dx9_24.spec
-index cf4218acccf..7b91655cff4 100644
+index b524fadf93d..88cbcc30db5 100644
 --- a/dlls/d3dx9_24/d3dx9_24.spec
 +++ b/dlls/d3dx9_24/d3dx9_24.spec
 @@ -226,7 +226,7 @@
@@ -42,7 +42,7 @@ index cf4218acccf..7b91655cff4 100644
  @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
  @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
 diff --git a/dlls/d3dx9_25/d3dx9_25.spec b/dlls/d3dx9_25/d3dx9_25.spec
-index f2c0bb970c6..d3e2422b4de 100644
+index 9344e44d687..55ee0ab1f4f 100644
 --- a/dlls/d3dx9_25/d3dx9_25.spec
 +++ b/dlls/d3dx9_25/d3dx9_25.spec
 @@ -226,7 +226,7 @@
@@ -55,7 +55,7 @@ index f2c0bb970c6..d3e2422b4de 100644
  @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
  @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
 diff --git a/dlls/d3dx9_26/d3dx9_26.spec b/dlls/d3dx9_26/d3dx9_26.spec
-index f8fc25a2625..cc8ec706d81 100644
+index 7a28ca6e7ee..11b64446c8a 100644
 --- a/dlls/d3dx9_26/d3dx9_26.spec
 +++ b/dlls/d3dx9_26/d3dx9_26.spec
 @@ -230,7 +230,7 @@
@@ -68,7 +68,7 @@ index f8fc25a2625..cc8ec706d81 100644
  @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
  @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
 diff --git a/dlls/d3dx9_27/d3dx9_27.spec b/dlls/d3dx9_27/d3dx9_27.spec
-index f8fc25a2625..cc8ec706d81 100644
+index 7a28ca6e7ee..11b64446c8a 100644
 --- a/dlls/d3dx9_27/d3dx9_27.spec
 +++ b/dlls/d3dx9_27/d3dx9_27.spec
 @@ -230,7 +230,7 @@
@@ -81,7 +81,7 @@ index f8fc25a2625..cc8ec706d81 100644
  @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
  @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
 diff --git a/dlls/d3dx9_28/d3dx9_28.spec b/dlls/d3dx9_28/d3dx9_28.spec
-index 697f9349d56..4f018a48a6d 100644
+index da49c9e23b5..936c00152b3 100644
 --- a/dlls/d3dx9_28/d3dx9_28.spec
 +++ b/dlls/d3dx9_28/d3dx9_28.spec
 @@ -230,7 +230,7 @@
@@ -94,7 +94,7 @@ index 697f9349d56..4f018a48a6d 100644
  @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
  @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
 diff --git a/dlls/d3dx9_29/d3dx9_29.spec b/dlls/d3dx9_29/d3dx9_29.spec
-index 697f9349d56..4f018a48a6d 100644
+index da49c9e23b5..936c00152b3 100644
 --- a/dlls/d3dx9_29/d3dx9_29.spec
 +++ b/dlls/d3dx9_29/d3dx9_29.spec
 @@ -230,7 +230,7 @@
@@ -107,7 +107,7 @@ index 697f9349d56..4f018a48a6d 100644
  @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
  @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
 diff --git a/dlls/d3dx9_30/d3dx9_30.spec b/dlls/d3dx9_30/d3dx9_30.spec
-index cae13b0a787..2b2af51d028 100644
+index c8648fb984f..a5a972c2dc5 100644
 --- a/dlls/d3dx9_30/d3dx9_30.spec
 +++ b/dlls/d3dx9_30/d3dx9_30.spec
 @@ -230,7 +230,7 @@
@@ -120,7 +120,7 @@ index cae13b0a787..2b2af51d028 100644
  @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
  @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
 diff --git a/dlls/d3dx9_31/d3dx9_31.spec b/dlls/d3dx9_31/d3dx9_31.spec
-index 9560477f139..63c6eb3d321 100644
+index 7f881ddaf8e..29b51c1b82f 100644
 --- a/dlls/d3dx9_31/d3dx9_31.spec
 +++ b/dlls/d3dx9_31/d3dx9_31.spec
 @@ -227,7 +227,7 @@
@@ -133,7 +133,7 @@ index 9560477f139..63c6eb3d321 100644
  @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
  @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
 diff --git a/dlls/d3dx9_32/d3dx9_32.spec b/dlls/d3dx9_32/d3dx9_32.spec
-index c9e5619b680..2e16e627fd1 100644
+index 2f51ece333d..57112ecc1e4 100644
 --- a/dlls/d3dx9_32/d3dx9_32.spec
 +++ b/dlls/d3dx9_32/d3dx9_32.spec
 @@ -227,7 +227,7 @@
@@ -146,7 +146,7 @@ index c9e5619b680..2e16e627fd1 100644
  @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
  @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
 diff --git a/dlls/d3dx9_33/d3dx9_33.spec b/dlls/d3dx9_33/d3dx9_33.spec
-index c9e5619b680..2e16e627fd1 100644
+index 2f51ece333d..57112ecc1e4 100644
 --- a/dlls/d3dx9_33/d3dx9_33.spec
 +++ b/dlls/d3dx9_33/d3dx9_33.spec
 @@ -227,7 +227,7 @@
@@ -159,7 +159,7 @@ index c9e5619b680..2e16e627fd1 100644
  @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
  @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
 diff --git a/dlls/d3dx9_34/d3dx9_34.spec b/dlls/d3dx9_34/d3dx9_34.spec
-index c9e5619b680..2e16e627fd1 100644
+index 2f51ece333d..57112ecc1e4 100644
 --- a/dlls/d3dx9_34/d3dx9_34.spec
 +++ b/dlls/d3dx9_34/d3dx9_34.spec
 @@ -227,7 +227,7 @@
@@ -172,7 +172,7 @@ index c9e5619b680..2e16e627fd1 100644
  @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
  @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
 diff --git a/dlls/d3dx9_35/d3dx9_35.spec b/dlls/d3dx9_35/d3dx9_35.spec
-index c9e5619b680..2e16e627fd1 100644
+index 2f51ece333d..57112ecc1e4 100644
 --- a/dlls/d3dx9_35/d3dx9_35.spec
 +++ b/dlls/d3dx9_35/d3dx9_35.spec
 @@ -227,7 +227,7 @@
@@ -185,7 +185,7 @@ index c9e5619b680..2e16e627fd1 100644
  @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
  @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
 diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec
-index 6bae090b179..94bde9fa2f2 100644
+index 0408ff9ffd0..83319500063 100644
 --- a/dlls/d3dx9_36/d3dx9_36.spec
 +++ b/dlls/d3dx9_36/d3dx9_36.spec
 @@ -229,7 +229,7 @@
@@ -198,10 +198,10 @@ index 6bae090b179..94bde9fa2f2 100644
  @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
  @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
 diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c
-index a206e06a976..30b812b6c35 100644
+index c26aa7271f0..138d60a20a0 100644
 --- a/dlls/d3dx9_36/mesh.c
 +++ b/dlls/d3dx9_36/mesh.c
-@@ -7193,6 +7193,33 @@ cleanup:
+@@ -7184,6 +7184,33 @@ cleanup:
      return hr;
  }
  
@@ -236,10 +236,10 @@ index a206e06a976..30b812b6c35 100644
   * D3DXOptimizeFaces    (D3DX9_36.@)
   *
 diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c
-index 2d9d89a231b..07c978265c8 100644
+index b1ab0aaf594..870285ad6ae 100644
 --- a/dlls/d3dx9_36/tests/mesh.c
 +++ b/dlls/d3dx9_36/tests/mesh.c
-@@ -10611,6 +10611,27 @@ cleanup:
+@@ -10403,6 +10403,27 @@ cleanup:
      free_test_context(test_context);
  }
  
@@ -261,13 +261,13 @@ index 2d9d89a231b..07c978265c8 100644
 +                              num_vertices, FALSE,
 +                              NULL);
 +    ok(hr == D3DERR_INVALIDCALL, "D3DXOptimizeVertices passed NULL vertex_remap "
-+       "pointer. Got %x, expected D3DERR_INVALIDCALL.\n", hr);
++            "pointer. Got %x, expected D3DERR_INVALIDCALL.\n", hr);
 +}
 +
  static void test_optimize_faces(void)
  {
      HRESULT hr;
-@@ -11426,6 +11447,7 @@ START_TEST(mesh)
+@@ -11216,6 +11237,7 @@ START_TEST(mesh)
      test_weld_vertices();
      test_clone_mesh();
      test_valid_mesh();
@@ -276,7 +276,7 @@ index 2d9d89a231b..07c978265c8 100644
      test_compute_normals();
  }
 diff --git a/dlls/d3dx9_37/d3dx9_37.spec b/dlls/d3dx9_37/d3dx9_37.spec
-index 6bae090b179..94bde9fa2f2 100644
+index 0408ff9ffd0..83319500063 100644
 --- a/dlls/d3dx9_37/d3dx9_37.spec
 +++ b/dlls/d3dx9_37/d3dx9_37.spec
 @@ -229,7 +229,7 @@
@@ -289,7 +289,7 @@ index 6bae090b179..94bde9fa2f2 100644
  @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
  @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
 diff --git a/dlls/d3dx9_38/d3dx9_38.spec b/dlls/d3dx9_38/d3dx9_38.spec
-index 6bae090b179..94bde9fa2f2 100644
+index 0408ff9ffd0..83319500063 100644
 --- a/dlls/d3dx9_38/d3dx9_38.spec
 +++ b/dlls/d3dx9_38/d3dx9_38.spec
 @@ -229,7 +229,7 @@
@@ -302,7 +302,7 @@ index 6bae090b179..94bde9fa2f2 100644
  @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
  @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
 diff --git a/dlls/d3dx9_39/d3dx9_39.spec b/dlls/d3dx9_39/d3dx9_39.spec
-index 6bae090b179..94bde9fa2f2 100644
+index 0408ff9ffd0..83319500063 100644
 --- a/dlls/d3dx9_39/d3dx9_39.spec
 +++ b/dlls/d3dx9_39/d3dx9_39.spec
 @@ -229,7 +229,7 @@
@@ -315,7 +315,7 @@ index 6bae090b179..94bde9fa2f2 100644
  @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
  @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
 diff --git a/dlls/d3dx9_40/d3dx9_40.spec b/dlls/d3dx9_40/d3dx9_40.spec
-index 6bae090b179..94bde9fa2f2 100644
+index 0408ff9ffd0..83319500063 100644
 --- a/dlls/d3dx9_40/d3dx9_40.spec
 +++ b/dlls/d3dx9_40/d3dx9_40.spec
 @@ -229,7 +229,7 @@
@@ -328,7 +328,7 @@ index 6bae090b179..94bde9fa2f2 100644
  @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
  @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
 diff --git a/dlls/d3dx9_41/d3dx9_41.spec b/dlls/d3dx9_41/d3dx9_41.spec
-index 6bae090b179..94bde9fa2f2 100644
+index 0408ff9ffd0..83319500063 100644
 --- a/dlls/d3dx9_41/d3dx9_41.spec
 +++ b/dlls/d3dx9_41/d3dx9_41.spec
 @@ -229,7 +229,7 @@
@@ -341,7 +341,7 @@ index 6bae090b179..94bde9fa2f2 100644
  @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
  @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
 diff --git a/dlls/d3dx9_42/d3dx9_42.spec b/dlls/d3dx9_42/d3dx9_42.spec
-index 82a6d6498a5..19306d0573d 100644
+index 23bb40d7b11..b1162de3d73 100644
 --- a/dlls/d3dx9_42/d3dx9_42.spec
 +++ b/dlls/d3dx9_42/d3dx9_42.spec
 @@ -222,7 +222,7 @@
@@ -354,7 +354,7 @@ index 82a6d6498a5..19306d0573d 100644
  @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
  @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
 diff --git a/dlls/d3dx9_43/d3dx9_43.spec b/dlls/d3dx9_43/d3dx9_43.spec
-index 82a6d6498a5..19306d0573d 100644
+index 23bb40d7b11..b1162de3d73 100644
 --- a/dlls/d3dx9_43/d3dx9_43.spec
 +++ b/dlls/d3dx9_43/d3dx9_43.spec
 @@ -222,7 +222,7 @@