Zebediah Figura : d3d9: Pass a valid map box to wined3d_resource_map().
Alexandre Julliard
julliard at winehq.org
Mon Sep 27 15:21:46 CDT 2021
Module: wine
Branch: master
Commit: b19cdef00e5d633e10c2357f8ec42808aee635d9
URL: https://source.winehq.org/git/wine.git/?a=commit;h=b19cdef00e5d633e10c2357f8ec42808aee635d9
Author: Zebediah Figura <zfigura at codeweavers.com>
Date: Fri Sep 24 16:47:41 2021 -0500
d3d9: Pass a valid map box to wined3d_resource_map().
Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/d3d9/buffer.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c
index 7af652e7d1a..07bdfa9320e 100644
--- a/dlls/d3d9/buffer.c
+++ b/dlls/d3d9/buffer.c
@@ -191,14 +191,14 @@ static HRESULT WINAPI d3d9_vertexbuffer_Lock(IDirect3DVertexBuffer9 *iface, UINT
struct d3d9_vertexbuffer *buffer = impl_from_IDirect3DVertexBuffer9(iface);
struct wined3d_resource *wined3d_resource;
struct wined3d_map_desc wined3d_map_desc;
- struct wined3d_box wined3d_box = {0};
+ struct wined3d_box wined3d_box;
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_box_set(&wined3d_box, offset, 0, offset + size, 1, 0, 1);
+
wined3d_mutex_lock();
wined3d_resource = wined3d_buffer_get_resource(buffer->wined3d_buffer);
hr = wined3d_resource_map(wined3d_resource, 0, &wined3d_map_desc, &wined3d_box,
@@ -527,14 +527,14 @@ static HRESULT WINAPI d3d9_indexbuffer_Lock(IDirect3DIndexBuffer9 *iface,
struct d3d9_indexbuffer *buffer = impl_from_IDirect3DIndexBuffer9(iface);
struct wined3d_resource *wined3d_resource;
struct wined3d_map_desc wined3d_map_desc;
- struct wined3d_box wined3d_box = {0};
+ struct wined3d_box wined3d_box;
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_box_set(&wined3d_box, offset, 0, offset + size, 1, 0, 1);
+
wined3d_mutex_lock();
wined3d_resource = wined3d_buffer_get_resource(buffer->wined3d_buffer);
hr = wined3d_resource_map(wined3d_resource, 0, &wined3d_map_desc, &wined3d_box,
More information about the wine-cvs
mailing list