Henri Verbeet : d3d8: Fix some return values.
Alexandre Julliard
julliard at winehq.org
Tue Nov 16 12:45:46 CST 2010
Module: wine
Branch: master
Commit: f024e2372f091f1d1a071d6dcac7f30042d864ac
URL: http://source.winehq.org/git/wine.git/?a=commit;h=f024e2372f091f1d1a071d6dcac7f30042d864ac
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Tue Nov 16 12:09:31 2010 +0100
d3d8: Fix some return values.
---
dlls/d3d8/device.c | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c
index 7700dfb..67edb06 100644
--- a/dlls/d3d8/device.c
+++ b/dlls/d3d8/device.c
@@ -464,9 +464,10 @@ static HRESULT WINAPI IDirect3DDevice8Impl_SetCursorProperties(LPDIRECT3DDEVICE8
TRACE("iface %p, hotspot_x %u, hotspot_y %u, bitmap %p.\n",
iface, XHotSpot, YHotSpot, pCursorBitmap);
- if(!pCursorBitmap) {
- WARN("No cursor bitmap, returning WINED3DERR_INVALIDCALL\n");
- return WINED3DERR_INVALIDCALL;
+ if (!pCursorBitmap)
+ {
+ WARN("No cursor bitmap, returning D3DERR_INVALIDCALL.\n");
+ return D3DERR_INVALIDCALL;
}
wined3d_mutex_lock();
@@ -903,11 +904,15 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CopyRects(LPDIRECT3DDEVICE8 iface, ID
destFormat = winedesc.format;
/* Check that the source and destination formats match */
- if (srcFormat != destFormat && WINED3DFMT_UNKNOWN != destFormat) {
- WARN("(%p) source %p format must match the dest %p format, returning WINED3DERR_INVALIDCALL\n", iface, pSourceSurface, pDestinationSurface);
+ if (srcFormat != destFormat && WINED3DFMT_UNKNOWN != destFormat)
+ {
+ WARN("Source %p format must match the dest %p format, returning D3DERR_INVALIDCALL.\n",
+ pSourceSurface, pDestinationSurface);
wined3d_mutex_unlock();
- return WINED3DERR_INVALIDCALL;
- } else if (WINED3DFMT_UNKNOWN == destFormat) {
+ return D3DERR_INVALIDCALL;
+ }
+ else if (WINED3DFMT_UNKNOWN == destFormat)
+ {
TRACE("(%p) : Converting destination surface from WINED3DFMT_UNKNOWN to the source format\n", iface);
IWineD3DSurface_SetFormat(Dest->wineD3DSurface, srcFormat);
}
More information about the wine-cvs
mailing list