Rebase against ef267f115f76a3041e0da4a0f0dbd7ffb4a022e1.

patches/d3d9-Tests/0002-d3d9-tests-Avoid-crash-when-surface-and-texture-crea.patch

@@ -1,4 +1,4 @@
-From d4c757fd049018cad57ad8d6ef304b9dd2220ae0 Mon Sep 17 00:00:00 2001
+From 7d03c720e909d4b620bde26ebc78eb4d37557db5 Mon Sep 17 00:00:00 2001
 From: Christian Costa <titan.costa@gmail.com>
 Date: Fri, 13 Mar 2015 23:42:20 +0100
 Subject: d3d9/tests: Avoid crash when surface and texture creation fails.
@@ -8,10 +8,10 @@ Subject: d3d9/tests: Avoid crash when surface and texture creation fails.
  1 file changed, 11 insertions(+)
 
 diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c
-index f1c75e4..46612f5 100644
+index 89ea7721bf1..8624ac3153c 100644
 --- a/dlls/d3d9/tests/device.c
 +++ b/dlls/d3d9/tests/device.c
-@@ -7779,8 +7779,14 @@ static void test_surface_blocks(void)
+@@ -8583,8 +8583,14 @@ static void test_surface_blocks(void)
                      break;
  
                  default:
@@ -26,7 +26,7 @@ index f1c75e4..46612f5 100644
  
              if (formats[i].block_width > 1)
              {
-@@ -8661,6 +8667,11 @@ static void test_volume_blocks(void)
+@@ -9534,6 +9540,11 @@ static void test_volume_blocks(void)
          hr = IDirect3DDevice9_CreateVolumeTexture(device, 24, 8, 8, 1, 0,
                  formats[i].fmt, D3DPOOL_SCRATCH, &texture, NULL);
          ok(SUCCEEDED(hr), "Failed to create volume texture, hr %#x.\n", hr);
@@ -37,7 +37,7 @@ index f1c75e4..46612f5 100644
 +        }
  
          /* Test lockrect offset */
-         for (j = 0; j < sizeof(offset_tests) / sizeof(*offset_tests); j++)
+         for (j = 0; j < ARRAY_SIZE(offset_tests); j++)
 -- 
-2.3.2
+2.12.2