Henri Verbeet : d3d9: Use wined3d_resource_map() in d3d9_vertexbuffer_Lock ().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: a0400a686c148a92dd2191cd619a05686c0cfceb
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=a0400a686c148a92dd2191cd61...

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Tue Aug 30 11:48:19 2016 +0200

d3d9: Use wined3d_resource_map() in d3d9_vertexbuffer_Lock().

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

---

 dlls/d3d9/buffer.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c
index 469b345..53f2272 100644
--- a/dlls/d3d9/buffer.c
+++ b/dlls/d3d9/buffer.c
@@ -183,14 +183,20 @@ static HRESULT WINAPI d3d9_vertexbuffer_Lock(IDirect3DVertexBuffer9 *iface, UINT
         void **data, DWORD flags)
 {
     struct d3d9_vertexbuffer *buffer = impl_from_IDirect3DVertexBuffer9(iface);
+    struct wined3d_map_desc wined3d_map_desc;
+    struct wined3d_box wined3d_box = {0};
     HRESULT hr;
 
     TRACE("iface %p, offset %u, size %u, data %p, flags %#x.\n",
             iface, offset, size, data, flags);
 
+    wined3d_box.left = offset;
+    wined3d_box.right = offset + size;
     wined3d_mutex_lock();
-    hr = wined3d_buffer_map(buffer->wined3d_buffer, offset, size, (BYTE **)data, flags);
+    hr = wined3d_resource_map(wined3d_buffer_get_resource(buffer->wined3d_buffer),
+            0, &wined3d_map_desc, &wined3d_box, flags);
     wined3d_mutex_unlock();
+    *data = wined3d_map_desc.data;
 
     return hr;
 }