Module: wine Branch: master Commit: eb7fc363f8dec30dd40b4d7146310600571edc42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb7fc363f8dec30dd40b4d7146... Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 25 14:26:26 2016 +0100 d3dx9: Avoid '\n' in middle of TRACE() message. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/volume.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/volume.c b/dlls/d3dx9_36/volume.c index 5a006ef..7dc61cf 100644 --- 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) {