Sebastian Lackner : wined3d: Shutdown CS thread before deallocating resources.

[Alexandre Julliard]

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

Author: Sebastian Lackner <sebastian(a)fds-team.de>
Date:   Wed May 10 20:00:43 2017 +0200

wined3d: Shutdown CS thread before deallocating resources.

Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/wined3d/cs.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c
index 91a99b7..d1d654c 100644
--- a/dlls/wined3d/cs.c
+++ b/dlls/wined3d/cs.c
@@ -2561,10 +2561,6 @@ fail:
 
 void wined3d_cs_destroy(struct wined3d_cs *cs)
 {
-    state_cleanup(&cs->state);
-    HeapFree(GetProcessHeap(), 0, cs->fb.render_targets);
-    HeapFree(GetProcessHeap(), 0, cs->data);
-
     if (cs->thread)
     {
         wined3d_cs_emit_stop(cs);
@@ -2573,5 +2569,8 @@ void wined3d_cs_destroy(struct wined3d_cs *cs)
             ERR("Closing event failed.\n");
     }
 
+    state_cleanup(&cs->state);
+    HeapFree(GetProcessHeap(), 0, cs->fb.render_targets);
+    HeapFree(GetProcessHeap(), 0, cs->data);
     HeapFree(GetProcessHeap(), 0, cs);
 }