wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against b77688102a84e1c7b7278340c46f53db3e1cda00.

Browse Source
This commit is contained in:
Sebastian Lackner
2017-05-12 00:36:30 +02:00
parent d6c145fbf5
commit 975205155e
6 changed files with 68 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patches/wined3d-context_reacquire/0001-wined3d-Avoid-crash-if-context_reacquire-is-called-w.patch
View File

@@ -1,4 +1,4 @@
From 7b9c1fda3cbebc0d87518458bd41c59a045bb02e Mon Sep 17 00:00:00 2001
From 719070152c6e0a17b7ab6c916298c8d5b221d68e Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Tue, 25 Apr 2017 06:01:04 +0000
Subject: wined3d: Avoid crash if context_reacquire is called with NULL
@@ -18,10 +18,10 @@ Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
2 files changed, 58 insertions(+), 1 deletion(-)
diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c
index 30450d88f6d..a2d79478e50 100644
index bdb13b9db5..33e0268c98 100644
--- a/dlls/d3d11/tests/d3d11.c
+++ b/dlls/d3d11/tests/d3d11.c
@@ -18402,6 +18402,62 @@ done:
@@ -17947,6 +17947,62 @@ static void test_fractional_viewports(void)
release_test_context(&test_context);
}
@@ -84,17 +84,17 @@ index 30450d88f6d..a2d79478e50 100644
START_TEST(d3d11)
{
test_create_device();
@@ -18493,4 +18549,5 @@ START_TEST(d3d11)
test_fl10_stream_output_desc();
@@ -18037,4 +18093,5 @@ START_TEST(d3d11)
test_stream_output_resume();
test_gather();
test_fractional_viewports();
+ test_destroyed_context_query_poll();
}
diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
index b6e8096fffb..27bff98be45 100644
index 5a899e56d1..76f0fdcc2b 100644
--- a/dlls/wined3d/context.c
+++ b/dlls/wined3d/context.c
@@ -3987,7 +3987,7 @@ struct wined3d_context *context_reacquire(const struct wined3d_device *device,
@@ -3968,7 +3968,7 @@ struct wined3d_context *context_reacquire(const struct wined3d_device *device,
{
struct wined3d_context *current_context;