Henri Verbeet : wined3d: Change an ERR to a WARN in IWineD3DVolumeImpl_UnlockBox().
Alexandre Julliard
julliard at winehq.org
Thu Dec 17 10:37:07 CST 2009
Module: wine
Branch: master
Commit: 35d5e7669e6f6b122d6a215db07b74267e15173d
URL: http://source.winehq.org/git/wine.git/?a=commit;h=35d5e7669e6f6b122d6a215db07b74267e15173d
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Wed Dec 16 19:55:57 2009 +0100
wined3d: Change an ERR to a WARN in IWineD3DVolumeImpl_UnlockBox().
Trying to unlock a volume that isn't locked is questionable behaviour on the
side of the application, but not an internal error.
---
dlls/wined3d/volume.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c
index fa4cb29..7f65f2a 100644
--- a/dlls/wined3d/volume.c
+++ b/dlls/wined3d/volume.c
@@ -281,9 +281,10 @@ static HRESULT WINAPI IWineD3DVolumeImpl_LockBox(IWineD3DVolume *iface, WINED3DL
static HRESULT WINAPI IWineD3DVolumeImpl_UnlockBox(IWineD3DVolume *iface) {
IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface;
- if (!This->locked) {
- ERR("trying to lock unlocked volume@%p\n", This);
- return WINED3DERR_INVALIDCALL;
+ if (!This->locked)
+ {
+ WARN("Trying to unlock unlocked volume %p.\n", iface);
+ return WINED3DERR_INVALIDCALL;
}
TRACE("(%p) : unlocking volume\n", This);
This->locked = FALSE;
More information about the wine-cvs
mailing list