d3dx9: Avoid '\n' in middle of TRACE() message.

Signed-off-by: Józef Kucia <jkucia@codeweavers.com> Signed-off-by: Matteo Bruni <mbruni@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

d3dx9: Avoid '\n' in middle of TRACE() message.
eb7fc363 · Józef Kucia · Alexandre Julliard · 33147c94 · eb7fc363
Commit eb7fc363 authored Mar 25, 2016 by Józef Kucia Committed by Alexandre Julliard Mar 28, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 6 deletions

volume.c dlls/d3dx9_36/volume.c +8 -6

No files found.
--- a/dlls/d3dx9_36/volume.c
+++ b/dlls/d3dx9_36/volume.c
@@ -240,14 +240,16 @@ HRESULT WINAPI D3DXLoadVolumeFromFileInMemory(IDirect3DVolume9 *dst_volume,
    D3DBOX box;
    D3DXIMAGE_INFO image_info;

-    TRACE("dst_volume %p, dst_palette %p, dst_box %p, src_data %p, src_data_size %u, src_box %p,\n",
-            dst_volume, dst_palette, dst_box, src_data, src_data_size, src_box);
-    TRACE("filter %#x, color_key %#x, src_info %p.\n", filter, color_key, src_info);
+    TRACE("dst_volume %p, dst_palette %p, dst_box %p, src_data %p, src_data_size %u, src_box %p, "
+            "filter %#x, color_key 0x%08x, src_info %p.\n",
+            dst_volume, dst_palette, dst_box, src_data, src_data_size, src_box,
+            filter, color_key, src_info);

-    if (!dst_volume || !src_data) return D3DERR_INVALIDCALL;
+    if (!dst_volume || !src_data)
+        return D3DERR_INVALIDCALL;

-    hr = D3DXGetImageInfoFromFileInMemory(src_data, src_data_size, &image_info);
-    if (FAILED(hr)) return hr;
+    if (FAILED(hr = D3DXGetImageInfoFromFileInMemory(src_data, src_data_size, &image_info)))
+        return hr;

    if (src_box)
    {