Commit f024e237 authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard

d3d8: Fix some return values.

parent 06581b45
...@@ -464,9 +464,10 @@ static HRESULT WINAPI IDirect3DDevice8Impl_SetCursorProperties(LPDIRECT3DDEVICE8 ...@@ -464,9 +464,10 @@ static HRESULT WINAPI IDirect3DDevice8Impl_SetCursorProperties(LPDIRECT3DDEVICE8
TRACE("iface %p, hotspot_x %u, hotspot_y %u, bitmap %p.\n", TRACE("iface %p, hotspot_x %u, hotspot_y %u, bitmap %p.\n",
iface, XHotSpot, YHotSpot, pCursorBitmap); iface, XHotSpot, YHotSpot, pCursorBitmap);
if(!pCursorBitmap) { if (!pCursorBitmap)
WARN("No cursor bitmap, returning WINED3DERR_INVALIDCALL\n"); {
return WINED3DERR_INVALIDCALL; WARN("No cursor bitmap, returning D3DERR_INVALIDCALL.\n");
return D3DERR_INVALIDCALL;
} }
wined3d_mutex_lock(); wined3d_mutex_lock();
...@@ -903,11 +904,15 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CopyRects(LPDIRECT3DDEVICE8 iface, ID ...@@ -903,11 +904,15 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CopyRects(LPDIRECT3DDEVICE8 iface, ID
destFormat = winedesc.format; destFormat = winedesc.format;
/* Check that the source and destination formats match */ /* Check that the source and destination formats match */
if (srcFormat != destFormat && WINED3DFMT_UNKNOWN != destFormat) { if (srcFormat != destFormat && WINED3DFMT_UNKNOWN != destFormat)
WARN("(%p) source %p format must match the dest %p format, returning WINED3DERR_INVALIDCALL\n", iface, pSourceSurface, pDestinationSurface); {
WARN("Source %p format must match the dest %p format, returning D3DERR_INVALIDCALL.\n",
pSourceSurface, pDestinationSurface);
wined3d_mutex_unlock(); wined3d_mutex_unlock();
return WINED3DERR_INVALIDCALL; return D3DERR_INVALIDCALL;
} else if (WINED3DFMT_UNKNOWN == destFormat) { }
else if (WINED3DFMT_UNKNOWN == destFormat)
{
TRACE("(%p) : Converting destination surface from WINED3DFMT_UNKNOWN to the source format\n", iface); TRACE("(%p) : Converting destination surface from WINED3DFMT_UNKNOWN to the source format\n", iface);
IWineD3DSurface_SetFormat(Dest->wineD3DSurface, srcFormat); IWineD3DSurface_SetFormat(Dest->wineD3DSurface, srcFormat);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment