ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Józef Kucia 2016-03-25 14:26:26 +01:00 committed by Alexandre Julliard
parent 33147c9475
commit eb7fc363f8
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/d3dx9_36/volume.c
View File

@ -240,14 +240,16 @@ HRESULT WINAPI D3DXLoadVolumeFromFileInMemory(IDirect3DVolume9 *dst_volume,
D3DBOX box; D3DBOX box;
D3DXIMAGE_INFO image_info; 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", TRACE("dst_volume %p, dst_palette %p, dst_box %p, src_data %p, src_data_size %u, src_box %p, "
dst_volume, dst_palette, dst_box, src_data, src_data_size, src_box); "filter %#x, color_key 0x%08x, src_info %p.\n",
TRACE("filter %#x, color_key %#x, src_info %p.\n", filter, color_key, src_info); 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 = D3DXGetImageInfoFromFileInMemory(src_data, src_data_size, &image_info)))
if (FAILED(hr)) return hr; return hr;
if (src_box) if (src_box)
{ {