diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index ee9f7686..eefb7fc1 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -7165,7 +7165,7 @@ fi
 # |   *	[#20776] Add stubs for QUERY_TYPE_SO_STATISTICS and QUERY_TYPE_SO_OVERFLOW
 # |
 # | Modified files:
-# |   *	dlls/wined3d/query.c, include/wine/wined3d.h
+# |   *	dlls/d3d10core/tests/device.c, dlls/d3d11/tests/d3d11.c, dlls/wined3d/query.c, include/wine/wined3d.h
 # |
 if test "$enable_wined3d_QUERY_Stubs" -eq 1; then
 	patch_apply wined3d-QUERY_Stubs/0001-wined3d-Add-stubs-for-QUERY_TYPE_SO_STATISTICS-and-Q.patch
diff --git a/patches/wined3d-QUERY_Stubs/0001-wined3d-Add-stubs-for-QUERY_TYPE_SO_STATISTICS-and-Q.patch b/patches/wined3d-QUERY_Stubs/0001-wined3d-Add-stubs-for-QUERY_TYPE_SO_STATISTICS-and-Q.patch
index 05205929..c8d6d661 100644
--- a/patches/wined3d-QUERY_Stubs/0001-wined3d-Add-stubs-for-QUERY_TYPE_SO_STATISTICS-and-Q.patch
+++ b/patches/wined3d-QUERY_Stubs/0001-wined3d-Add-stubs-for-QUERY_TYPE_SO_STATISTICS-and-Q.patch
@@ -1,14 +1,46 @@
-From 4eb44bc7f251082d2e0c37ac6487fa702f7de013 Mon Sep 17 00:00:00 2001
+From 87853b8ab0339815073318e2684db38475571f02 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sat, 16 Apr 2016 18:18:54 +0200
 Subject: wined3d: Add stubs for QUERY_TYPE_SO_STATISTICS and
  QUERY_TYPE_SO_OVERFLOW.
 
 ---
- dlls/wined3d/query.c   | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++
- include/wine/wined3d.h |  6 +++++
- 2 files changed, 68 insertions(+)
+ dlls/d3d10core/tests/device.c |  4 +--
+ dlls/d3d11/tests/d3d11.c      |  4 +--
+ dlls/wined3d/query.c          | 62 +++++++++++++++++++++++++++++++++++++++++++
+ include/wine/wined3d.h        |  6 +++++
+ 4 files changed, 72 insertions(+), 4 deletions(-)
 
+diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c
+index 8e69656..f5f010c 100644
+--- a/dlls/d3d10core/tests/device.c
++++ b/dlls/d3d10core/tests/device.c
+@@ -2391,8 +2391,8 @@ static void test_create_query(void)
+         {D3D10_QUERY_TIMESTAMP_DISJOINT,    FALSE, FALSE},
+         {D3D10_QUERY_PIPELINE_STATISTICS,   FALSE, TRUE},
+         {D3D10_QUERY_OCCLUSION_PREDICATE,   TRUE,  FALSE},
+-        {D3D10_QUERY_SO_STATISTICS,         FALSE, TRUE},
+-        {D3D10_QUERY_SO_OVERFLOW_PREDICATE, TRUE,  TRUE},
++        {D3D10_QUERY_SO_STATISTICS,         FALSE, FALSE},
++        {D3D10_QUERY_SO_OVERFLOW_PREDICATE, TRUE,  FALSE},
+     };
+ 
+     ULONG refcount, expected_refcount;
+diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c
+index 03b6113..cee4bb7 100644
+--- a/dlls/d3d11/tests/d3d11.c
++++ b/dlls/d3d11/tests/d3d11.c
+@@ -3270,8 +3270,8 @@ static void test_create_query(void)
+         {D3D11_QUERY_TIMESTAMP_DISJOINT,            D3D_FEATURE_LEVEL_10_0, FALSE, FALSE, FALSE},
+         {D3D11_QUERY_PIPELINE_STATISTICS,           D3D_FEATURE_LEVEL_10_0, FALSE, FALSE, TRUE},
+         {D3D11_QUERY_OCCLUSION_PREDICATE,           D3D_FEATURE_LEVEL_10_0, TRUE,  TRUE,  FALSE},
+-        {D3D11_QUERY_SO_STATISTICS,                 D3D_FEATURE_LEVEL_10_0, FALSE, FALSE, TRUE},
+-        {D3D11_QUERY_SO_OVERFLOW_PREDICATE,         D3D_FEATURE_LEVEL_10_0, TRUE,  TRUE,  TRUE},
++        {D3D11_QUERY_SO_STATISTICS,                 D3D_FEATURE_LEVEL_10_0, FALSE, FALSE, FALSE},
++        {D3D11_QUERY_SO_OVERFLOW_PREDICATE,         D3D_FEATURE_LEVEL_10_0, TRUE,  TRUE,  FALSE},
+         {D3D11_QUERY_SO_STATISTICS_STREAM0,         D3D_FEATURE_LEVEL_11_0, FALSE, FALSE, TRUE},
+         {D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM0, D3D_FEATURE_LEVEL_11_0, TRUE,  FALSE, TRUE},
+         {D3D11_QUERY_SO_STATISTICS_STREAM1,         D3D_FEATURE_LEVEL_11_0, FALSE, FALSE, TRUE},
 diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c
 index 410ce6c..0c56b23 100644
 --- a/dlls/wined3d/query.c
@@ -97,10 +129,10 @@ index 410ce6c..0c56b23 100644
              TRACE("Timestamp query.\n");
              if (!gl_info->supported[ARB_TIMER_QUERY])
 diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
-index cf2715c..c61bf17 100644
+index 4cfe1e0..e245e82 100644
 --- a/include/wine/wined3d.h
 +++ b/include/wine/wined3d.h
-@@ -702,6 +702,12 @@ struct wined3d_query_data_timestamp_disjoint
+@@ -700,6 +700,12 @@ struct wined3d_query_data_timestamp_disjoint
      BOOL disjoint;
  };
  
@@ -114,5 +146,5 @@ index cf2715c..c61bf17 100644
  #define WINED3DISSUE_END                                        (1u << 0)
  #define WINED3DGETDATA_FLUSH                                    (1u << 0)
 -- 
-2.7.1
+2.8.0