Stefan Dösinger : wined3d: Catch invalid buffer map parameters.
Alexandre Julliard
julliard at winehq.org
Fri Jan 29 10:56:35 CST 2010
Module: wine
Branch: master
Commit: d499073c10da4a91053508205a73eaebc968a776
URL: http://source.winehq.org/git/wine.git/?a=commit;h=d499073c10da4a91053508205a73eaebc968a776
Author: Stefan Dösinger <stefan at codeweavers.com>
Date: Wed Jan 27 23:04:01 2010 +0100
wined3d: Catch invalid buffer map parameters.
---
dlls/wined3d/buffer.c | 35 ++++++++++++++++++++++++++++++++++-
1 files changed, 34 insertions(+), 1 deletions(-)
diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c
index e38a861..e0cefc9 100644
--- a/dlls/wined3d/buffer.c
+++ b/dlls/wined3d/buffer.c
@@ -56,7 +56,13 @@ static inline BOOL buffer_add_dirty_area(struct wined3d_buffer *This, UINT offse
}
}
- if(!offset && !size)
+ if(offset > This->resource.size || offset + size > This->resource.size)
+ {
+ WARN("Invalid range dirtified, marking entire buffer dirty\n");
+ offset = 0;
+ size = This->resource.size;
+ }
+ else if(!offset && !size)
{
size = This->resource.size;
}
@@ -1026,6 +1032,32 @@ static WINED3DRESOURCETYPE STDMETHODCALLTYPE buffer_GetType(IWineD3DBuffer *ifac
/* IWineD3DBuffer methods */
+static DWORD buffer_sanitize_flags(DWORD flags)
+{
+ /* Not all flags make sense together, but Windows never returns an error. Catch the
+ * cases that could cause issues */
+ if(flags & WINED3DLOCK_READONLY)
+ {
+ if(flags & WINED3DLOCK_DISCARD)
+ {
+ WARN("WINED3DLOCK_READONLY combined with WINED3DLOCK_DISCARD, ignoring flags\n");
+ return 0;
+ }
+ if(flags & WINED3DLOCK_NOOVERWRITE)
+ {
+ WARN("WINED3DLOCK_READONLY combined with WINED3DLOCK_NOOVERWRITE, ignoring flags\n");
+ return 0;
+ }
+ }
+ else if((flags & (WINED3DLOCK_DISCARD | WINED3DLOCK_NOOVERWRITE)) == (WINED3DLOCK_DISCARD | WINED3DLOCK_NOOVERWRITE))
+ {
+ WARN("WINED3DLOCK_DISCARD and WINED3DLOCK_NOOVERWRITE used together, ignoring\n");
+ return 0;
+ }
+
+ return flags;
+}
+
static HRESULT STDMETHODCALLTYPE buffer_Map(IWineD3DBuffer *iface, UINT offset, UINT size, BYTE **data, DWORD flags)
{
struct wined3d_buffer *This = (struct wined3d_buffer *)iface;
@@ -1033,6 +1065,7 @@ static HRESULT STDMETHODCALLTYPE buffer_Map(IWineD3DBuffer *iface, UINT offset,
TRACE("iface %p, offset %u, size %u, data %p, flags %#x\n", iface, offset, size, data, flags);
+ flags = buffer_sanitize_flags(flags);
if (!buffer_add_dirty_area(This, offset, size)) return E_OUTOFMEMORY;
count = InterlockedIncrement(&This->lock_count);
More information about the wine-cvs
mailing list