Henri Verbeet : wined3d: Sanitise map flags in wined3d_surface_map().

[Alexandre Julliard]

Module: wine
Branch: stable
Commit: bf1a2f63d30f3acb32d77f3d4978047a6d2efb5e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=bf1a2f63d30f3acb32d77f3d4978047a6d2efb5e

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Tue Mar  8 15:51:14 2016 +0100

wined3d: Sanitise map flags in wined3d_surface_map().

Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
(cherry picked from commit c5d47bd6fe0ab6d6d9f47ea85b245b586270d7c2)
Conflicts:
	dlls/wined3d/surface.c
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>

---

 dlls/wined3d/surface.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 201a0c4..6f3ad01 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -2524,6 +2524,8 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface,
         }
     }
 
+    flags = wined3d_resource_sanitize_map_flags(&surface->resource, flags);
+
     surface_prepare_map_memory(surface);
     if (flags & WINED3D_MAP_DISCARD)
     {