Józef Kucia : d3dx9/tests: Improve test failure messages for check_dds_pixel_format.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 95b822d6725b4d9a9a4d621ca1b7d1585fca4ac6
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=95b822d6725b4d9a9a4d621ca1...

Author: Józef Kucia 
Date:   Tue Jun 19 01:35:48 2012 +0200

d3dx9/tests: Improve test failure messages for check_dds_pixel_format.

---

dlls/d3dx9_36/tests/surface.c |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c
index 325f6b0..84b1c56 100644
--- a/dlls/d3dx9_36/tests/surface.c
+++ b/dlls/d3dx9_36/tests/surface.c
@@ -211,9 +211,12 @@ static void fill_dds_header(struct dds_header *header)
     header->caps = DDS_CAPS_TEXTURE;
 }

-static void check_dds_pixel_format(DWORD flags, DWORD fourcc, DWORD bpp,
-                                   DWORD rmask, DWORD gmask, DWORD bmask, DWORD amask,
-                                   D3DFORMAT expected_format)
+#define check_dds_pixel_format(flags, fourcc, bpp, rmask, gmask, bmask, amask, format) \
+        check_dds_pixel_format_(__LINE__, flags, fourcc, bpp, rmask, gmask, bmask, amask, format)
+static void check_dds_pixel_format_(unsigned int line,
+                                    DWORD flags, DWORD fourcc, DWORD bpp,
+                                    DWORD rmask, DWORD gmask, DWORD bmask, DWORD amask,
+                                    D3DFORMAT expected_format)
 {
     HRESULT hr;
     D3DXIMAGE_INFO info;
@@ -234,9 +237,13 @@ static void check_dds_pixel_format(DWORD flags, DWORD fourcc, DWORD bpp,
     memset(dds.data, 0, sizeof(dds.data));

hr = D3DXGetImageInfoFromFileInMemory(&dds, sizeof(dds), &info);
-    ok(hr == D3D_OK, "D3DXGetImageInfoFromFileInMemory returned %#x for pixel format %#x, expected %#x\n", hr, expected_format, D3D_OK);
+    ok_(__FILE__, line)(hr == D3D_OK, "D3DXGetImageInfoFromFileInMemory returned %#x for pixel format %#x, expected %#x\n",
+            hr, expected_format, D3D_OK);
     if (SUCCEEDED(hr))
-        ok(info.Format == expected_format, "D3DXGetImageInfoFromFileInMemory returned format %#x, expected %#x\n", info.Format, expected_format);
+    {
+        ok_(__FILE__, line)(info.Format == expected_format, "D3DXGetImageInfoFromFileInMemory returned format %#x, expected %#x\n",
+                info.Format, expected_format);
+    }
 }

static void test_dds_header_handling(void)