Henri Verbeet : d3d9: Do not add map access indiscriminately in d3d9_device_create_surface().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 84f64598441ea59f83cc49ac471119312cdbd4db
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=84f64598441ea59f83cc49ac471119312cdbd4db

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Thu Nov 22 15:21:04 2018 +0330

d3d9: Do not add map access indiscriminately in d3d9_device_create_surface().

Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/d3d9/device.c       | 3 +--
 dlls/d3d9/tests/device.c | 6 ++----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c
index eed3a04..0dec4ce 100644
--- a/dlls/d3d9/device.c
+++ b/dlls/d3d9/device.c
@@ -1399,8 +1399,7 @@ static HRESULT d3d9_device_create_surface(struct d3d9_device *device, UINT width
     if (pool == D3DPOOL_SCRATCH)
         desc.usage |= WINED3DUSAGE_SCRATCH;
     desc.bind_flags = wined3d_bind_flags_from_d3d9_usage(usage);
-    desc.access = wined3daccess_from_d3dpool(pool, usage)
-            | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W;
+    desc.access = wined3daccess_from_d3dpool(pool, usage);
     desc.width = width;
     desc.height = height;
     desc.depth = 1;
diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c
index cb38aea..6edf2b3 100644
--- a/dlls/d3d9/tests/device.c
+++ b/dlls/d3d9/tests/device.c
@@ -12877,11 +12877,9 @@ static void test_resource_access(void)
                 expected_hr = D3D_OK;
             else
                 expected_hr = D3DERR_INVALIDCALL;
-            todo_wine_if(expected_hr != D3D_OK && surface_types[i].type != SURFACE_2D
-                    && surface_types[i].type != SURFACE_CUBE)
-                ok(hr == expected_hr, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr);
+            ok(hr == expected_hr, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr);
             hr = IDirect3DSurface9_UnlockRect(surface);
-            todo_wine_if(expected_hr != D3D_OK && surface_types[i].type != SURFACE_CUBE)
+            todo_wine_if(expected_hr != D3D_OK && surface_types[i].type == SURFACE_2D)
                 ok(hr == expected_hr, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr);
 
             if (SUCCEEDED(IDirect3DSurface9_GetContainer(surface, &IID_IDirect3DBaseTexture9, (void **)&texture)))