Henri Verbeet : d3d9: Avoid a dead assignment in d3d9_device_SetStreamSource() (Coverity).

Alexandre Julliard julliard at winehq.org
Tue Mar 3 16:24:55 CST 2020


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

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Tue Mar  3 19:24:15 2020 +0330

d3d9: Avoid a dead assignment in d3d9_device_SetStreamSource() (Coverity).

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

---

 dlls/d3d9/device.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c
index 8d85a43523..a651a63f02 100644
--- a/dlls/d3d9/device.c
+++ b/dlls/d3d9/device.c
@@ -3688,17 +3688,18 @@ static HRESULT WINAPI d3d9_device_SetStreamSource(IDirect3DDevice9Ex *iface,
         const struct wined3d_stream_state *stream;
         state = wined3d_stateblock_get_state(device->state);
         stream = &state->streams[stream_idx];
-        wined3d_buffer = stream->buffer;
         offset = stream->offset;
         stride = stream->stride;
-    }
-
-    if (!buffer_impl)
         wined3d_buffer = NULL;
+    }
     else if (buffer_impl->draw_buffer)
+    {
         wined3d_buffer = buffer_impl->draw_buffer;
+    }
     else
+    {
         wined3d_buffer = buffer_impl->wined3d_buffer;
+    }
 
     hr = wined3d_stateblock_set_stream_source(device->update_state, stream_idx, wined3d_buffer, offset, stride);
     if (SUCCEEDED(hr) && !device->recording)




More information about the wine-cvs mailing list