diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index c526e0a9..20f32830 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "6b2a080372ae49cdde6b7752de5de20142ce2a70"
+	echo "b922b55182ca2b51bf2599369c471b3920bfb635"
 }
 
 # Show version information
@@ -309,7 +309,6 @@ patch_enable_all ()
 	enable_user32_Refresh_MDI_Menus="$1"
 	enable_user32_ScrollWindowEx="$1"
 	enable_user32_SetCoalescableTimer="$1"
-	enable_user32_WM_CAPTURECHANGE="$1"
 	enable_user32_WM_MDICALCCHILDSCROLL="$1"
 	enable_user32_WndProc="$1"
 	enable_uxtheme_CloseThemeData="$1"
@@ -1067,9 +1066,6 @@ patch_enable ()
 		user32-SetCoalescableTimer)
 			enable_user32_SetCoalescableTimer="$2"
 			;;
-		user32-WM_CAPTURECHANGE)
-			enable_user32_WM_CAPTURECHANGE="$2"
-			;;
 		user32-WM_MDICALCCHILDSCROLL)
 			enable_user32_WM_MDICALCCHILDSCROLL="$2"
 			;;
@@ -6300,21 +6296,6 @@ if test "$enable_user32_SetCoalescableTimer" -eq 1; then
 	) >> "$patchlist"
 fi
 
-# Patchset user32-WM_CAPTURECHANGE
-# |
-# | This patchset fixes the following Wine bugs:
-# |   *	[#13683] Also send WM_CAPTURECHANGE when capture has not changed
-# |
-# | Modified files:
-# |   *	dlls/comctl32/toolbar.c, dlls/comctl32/trackbar.c, dlls/user32/button.c, dlls/user32/input.c, dlls/user32/tests/msg.c
-# |
-if test "$enable_user32_WM_CAPTURECHANGE" -eq 1; then
-	patch_apply user32-WM_CAPTURECHANGE/0001-user32-Also-send-WM_CAPTURECHANGE-when-capture-has-n.patch
-	(
-		echo '+    { "Christopher Thielen", "user32: Also send WM_CAPTURECHANGE when capture has not changed.", 1 },';
-	) >> "$patchlist"
-fi
-
 # Patchset user32-WM_MDICALCCHILDSCROLL
 # |
 # | Modified files:
diff --git a/patches/user32-WM_CAPTURECHANGE/0001-user32-Also-send-WM_CAPTURECHANGE-when-capture-has-n.patch b/patches/user32-WM_CAPTURECHANGE/0001-user32-Also-send-WM_CAPTURECHANGE-when-capture-has-n.patch
deleted file mode 100644
index 04bb2578..00000000
--- a/patches/user32-WM_CAPTURECHANGE/0001-user32-Also-send-WM_CAPTURECHANGE-when-capture-has-n.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From 5bfd73ad3ec48deae92927e8116fce81ac31cf66 Mon Sep 17 00:00:00 2001
-From: Christopher Thielen <cthielen@gmail.com>
-Date: Mon, 23 Nov 2015 21:48:26 -0800
-Subject: user32: Also send WM_CAPTURECHANGE when capture has not changed.
-
-Fixes https://bugs.winehq.org/show_bug.cgi?id=13683
-
-A window may be notified with WM_CAPTURECHANGED about itself
-gaining mouse capture if it calls SetCapture() twice.
-
-Signed-off-by: Christopher Thielen <cthielen@gmail.com>
-Signed-off-by: Sebastian Lackner <sebastian@fds-team.de>
----
- dlls/comctl32/toolbar.c  |  1 +
- dlls/comctl32/trackbar.c |  1 +
- dlls/user32/button.c     |  1 +
- dlls/user32/input.c      |  2 +-
- dlls/user32/tests/msg.c  | 27 +++++++++++++++++++++++++++
- 5 files changed, 31 insertions(+), 1 deletion(-)
-
-diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c
-index 890c18e..3251682 100644
---- a/dlls/comctl32/toolbar.c
-+++ b/dlls/comctl32/toolbar.c
-@@ -6807,6 +6807,7 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
- 	    return TOOLBAR_MouseLeave (infoPtr);
- 
- 	case WM_CAPTURECHANGED:
-+            if (lParam == (LPARAM)hwnd) return 0;
- 	    return TOOLBAR_CaptureChanged(infoPtr);
- 
- 	case WM_NCACTIVATE:
-diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c
-index 6d092a3..4d19a70 100644
---- a/dlls/comctl32/trackbar.c
-+++ b/dlls/comctl32/trackbar.c
-@@ -1976,6 +1976,7 @@ TRACKBAR_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
- 
- 
-     case WM_CAPTURECHANGED:
-+        if (lParam == (LPARAM)hwnd) return 0;
-         return TRACKBAR_CaptureChanged (infoPtr);
- 
-     case WM_CREATE:
-diff --git a/dlls/user32/button.c b/dlls/user32/button.c
-index 890d154..2fee3c8 100644
---- a/dlls/user32/button.c
-+++ b/dlls/user32/button.c
-@@ -364,6 +364,7 @@ LRESULT ButtonWndProc_common(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam,
- 
-     case WM_CAPTURECHANGED:
-         TRACE("WM_CAPTURECHANGED %p\n", hWnd);
-+        if (lParam == (LPARAM)hWnd) break;
-         state = get_button_state( hWnd );
-         if (state & BUTTON_BTNPRESSED)
-         {
-diff --git a/dlls/user32/input.c b/dlls/user32/input.c
-index 40e35a9..63fae67 100644
---- a/dlls/user32/input.c
-+++ b/dlls/user32/input.c
-@@ -108,7 +108,7 @@ BOOL set_capture_window( HWND hwnd, UINT gui_flags, HWND *prev_ret )
-     {
-         USER_Driver->pSetCapture( hwnd, gui_flags );
- 
--        if (previous && previous != hwnd)
-+        if (previous)
-             SendMessageW( previous, WM_CAPTURECHANGED, 0, (LPARAM)hwnd );
- 
-         if (prev_ret) *prev_ret = previous;
-diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c
-index b90f8d0..151b77a 100644
---- a/dlls/user32/tests/msg.c
-+++ b/dlls/user32/tests/msg.c
-@@ -14906,6 +14906,32 @@ else
-     flush_sequence();
- }
- 
-+static const struct message DoubleSetCaptureSeq[] =
-+{
-+    { WM_CAPTURECHANGED, sent },
-+    { 0 }
-+};
-+
-+static void test_DoubleSetCapture(void)
-+{
-+    HWND hwnd;
-+
-+    hwnd = CreateWindowExA(0, "TestWindowClass", "Test DoubleSetCapture",
-+                           WS_OVERLAPPEDWINDOW | WS_VISIBLE,
-+                           100, 100, 200, 200, 0, 0, 0, NULL);
-+    ok(hwnd != 0, "Failed to create overlapped window\n");
-+
-+    ShowWindow( hwnd, SW_SHOW );
-+    flush_sequence();
-+
-+    SetCapture(hwnd);
-+    ok_sequence(WmEmptySeq, "SetCapture(hwnd) empty sequence", FALSE);
-+    SetCapture(hwnd);
-+    ok_sequence(DoubleSetCaptureSeq, "SetCapture(hwnd) twice", FALSE);
-+
-+    DestroyWindow(hwnd);
-+}
-+
- static void init_funcs(void)
- {
-     HMODULE hKernel32 = GetModuleHandleA("kernel32.dll");
-@@ -15045,6 +15071,7 @@ START_TEST(msg)
-     test_layered_window();
-     test_TrackPopupMenu();
-     test_TrackPopupMenuEmpty();
-+    test_DoubleSetCapture();
-     /* keep it the last test, under Windows it tends to break the tests
-      * which rely on active/foreground windows being correct.
-      */
--- 
-2.6.2
-
diff --git a/patches/user32-WM_CAPTURECHANGE/definition b/patches/user32-WM_CAPTURECHANGE/definition
deleted file mode 100644
index c5a0c9e4..00000000
--- a/patches/user32-WM_CAPTURECHANGE/definition
+++ /dev/null
@@ -1 +0,0 @@
-Fixes: [13683] Also send WM_CAPTURECHANGE when capture has not changed
diff --git a/patches/wined3d-CSMT_Main/9999-IfDefined.patch b/patches/wined3d-CSMT_Main/9999-IfDefined.patch
index 2fe1a3e9..5e075984 100644
--- a/patches/wined3d-CSMT_Main/9999-IfDefined.patch
+++ b/patches/wined3d-CSMT_Main/9999-IfDefined.patch
@@ -70,7 +70,7 @@ diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader
              shader_arb_ps_local_constants(compiled, context, state, rt_height);
          }
  
-@@ -7864,7 +7872,11 @@
+@@ -7872,7 +7880,11 @@
  
      /* Now load the surface */
      if (wined3d_settings.offscreen_rendering_mode != ORM_FBO
@@ -82,7 +82,7 @@ diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader
              == WINED3D_LOCATION_DRAWABLE
              && !wined3d_resource_is_offscreen(&src_surface->container->resource))
      {
-@@ -7902,6 +7914,7 @@
+@@ -7910,6 +7922,7 @@
      /* Leave the opengl state valid for blitting */
      arbfp_blit_unset(context->gl_info);
  
@@ -90,7 +90,7 @@ diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader
      if (wined3d_settings.cs_multithreaded)
          context->gl_info->gl_ops.gl.p_glFinish();
      else if (wined3d_settings.strict_draw_ordering
-@@ -7913,6 +7926,17 @@
+@@ -7921,6 +7934,17 @@
  
      wined3d_resource_validate_location(&dst_surface->resource, dst_surface->container->resource.draw_binding);
      wined3d_resource_invalidate_location(&dst_surface->resource, ~dst_surface->container->resource.draw_binding);
@@ -4671,7 +4671,7 @@ diff --git a/dlls/wined3d/sampler.c b/dlls/wined3d/sampler.c
 diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
 --- a/dlls/wined3d/shader.c
 +++ b/dlls/wined3d/shader.c
-@@ -1951,7 +1951,11 @@
+@@ -2072,7 +2072,11 @@
      }
  }
  
@@ -4683,7 +4683,7 @@ diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
  {
      HeapFree(GetProcessHeap(), 0, shader->output_signature.elements);
      HeapFree(GetProcessHeap(), 0, shader->input_signature.elements);
-@@ -2210,10 +2214,16 @@
+@@ -2331,10 +2335,16 @@
  
      if (!refcount)
      {
@@ -4700,7 +4700,7 @@ diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
      }
  
      return refcount;
-@@ -2496,7 +2506,11 @@
+@@ -2617,7 +2627,11 @@
      memset(args, 0, sizeof(*args)); /* FIXME: Make sure all bits are set. */
      if (!gl_info->supported[ARB_FRAMEBUFFER_SRGB] && state->render_states[WINED3D_RS_SRGBWRITEENABLE])
      {
@@ -9147,7 +9147,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
  };
  
  extern struct wined3d_settings wined3d_settings DECLSPEC_HIDDEN;
-@@ -1071,9 +1101,14 @@
+@@ -1103,9 +1133,14 @@
      WORD use_map; /* MAX_ATTRIBS, 16 */
  };
  
@@ -9162,7 +9162,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
  DWORD get_flexible_vertex_size(DWORD d3dvtVertexType) DECLSPEC_HIDDEN;
  
  #define eps 1e-8f
-@@ -1161,8 +1196,10 @@
+@@ -1193,8 +1228,10 @@
      struct list entry;
      GLuint id;
      struct wined3d_context *context;
@@ -9173,7 +9173,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
  };
  
  union wined3d_gl_query_object
-@@ -1198,6 +1235,7 @@
+@@ -1230,6 +1267,7 @@
      struct list entry;
      GLuint id;
      struct wined3d_context *context;
@@ -9181,7 +9181,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
      UINT64 timestamp;
  };
  
-@@ -1233,6 +1271,12 @@
+@@ -1265,6 +1303,12 @@
      for (i = 0; i < min(dst->rt_size, src->rt_size); i++)
          dst->render_targets[i] = src->render_targets[i];
  }
@@ -9194,7 +9194,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
  
  struct wined3d_context
  {
-@@ -1248,7 +1292,9 @@
+@@ -1280,7 +1324,9 @@
      DWORD                   dirtyArray[STATE_HIGHEST + 1]; /* Won't get bigger than that, a state is never marked dirty 2 times */
      DWORD                   numDirtyEntries;
      DWORD isStateDirty[STATE_HIGHEST / (sizeof(DWORD) * CHAR_BIT) + 1]; /* Bitmap to find out quickly if a state is dirty */
@@ -9204,7 +9204,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
  
      struct wined3d_swapchain *swapchain;
      struct wined3d_surface *current_rt;
-@@ -1346,8 +1392,17 @@
+@@ -1378,8 +1424,17 @@
      GLfloat                 fog_coord_value;
      GLfloat                 color[4], fogstart, fogend, fogcolor[4];
      GLuint                  dummy_arbfp_prog;
@@ -9222,7 +9222,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
  };
  
  typedef void (*APPLYSTATEFUNC)(struct wined3d_context *ctx, const struct wined3d_state *state, DWORD state_id);
-@@ -1490,8 +1545,12 @@
+@@ -1522,8 +1577,12 @@
  void context_apply_blit_state(struct wined3d_context *context, const struct wined3d_device *device) DECLSPEC_HIDDEN;
  BOOL context_apply_clear_state(struct wined3d_context *context, const struct wined3d_device *device,
          UINT rt_count, const struct wined3d_fb_state *fb) DECLSPEC_HIDDEN;
@@ -9235,7 +9235,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
  void context_apply_fbo_state_blit(struct wined3d_context *context, GLenum target,
          struct wined3d_surface *render_target, struct wined3d_surface *depth_stencil, DWORD location) DECLSPEC_HIDDEN;
  void context_active_texture(struct wined3d_context *context, const struct wined3d_gl_info *gl_info,
-@@ -2074,7 +2133,11 @@
+@@ -2106,7 +2165,11 @@
  struct wined3d_state
  {
      DWORD flags;
@@ -9247,7 +9247,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
  
      struct wined3d_vertex_declaration *vertex_declaration;
      struct wined3d_stream_output stream_output[MAX_STREAM_OUT];
-@@ -2119,6 +2182,7 @@
+@@ -2151,6 +2214,7 @@
      DWORD render_states[WINEHIGHEST_RENDER_STATE + 1];
  };
  
@@ -9255,7 +9255,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
  struct wined3d_gl_bo
  {
      GLuint name;
-@@ -2127,6 +2191,7 @@
+@@ -2159,6 +2223,7 @@
      UINT size;
  };
  
@@ -9263,7 +9263,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
  #define WINED3D_UNMAPPED_STAGE ~0U
  
  /* Multithreaded flag. Removed from the public header to signal that
-@@ -2182,11 +2247,23 @@
+@@ -2214,11 +2279,23 @@
      struct wined3d_rendertarget_view *back_buffer_view;
      struct wined3d_swapchain **swapchains;
      UINT swapchain_count;
@@ -9287,7 +9287,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
  
      /* For rendering to a texture using glCopyTexImage */
      GLuint                  depth_blt_texture;
-@@ -2197,6 +2274,9 @@
+@@ -2229,6 +2306,9 @@
      UINT                    xScreenSpace;
      UINT                    yScreenSpace;
      UINT                    cursorWidth, cursorHeight;
@@ -9297,7 +9297,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
      HCURSOR                 hardwareCursor;
  
      /* The Wine logo texture */
-@@ -2231,6 +2311,7 @@
+@@ -2263,6 +2343,7 @@
          UINT message, WPARAM wparam, LPARAM lparam, WNDPROC proc) DECLSPEC_HIDDEN;
  void device_resource_add(struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN;
  void device_resource_released(struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN;
@@ -9305,7 +9305,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
  void device_invalidate_state(const struct wined3d_device *device, DWORD state) DECLSPEC_HIDDEN;
  void device_invalidate_shader_constants(const struct wined3d_device *device, DWORD mask) DECLSPEC_HIDDEN;
  void device_exec_update_texture(struct wined3d_context *context, struct wined3d_texture *src_texture,
-@@ -2243,6 +2324,11 @@
+@@ -2275,6 +2356,11 @@
  void device_create_default_sampler(struct wined3d_device *device);
  void device_delete_opengl_contexts_cs(struct wined3d_device *device,
          struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN;
@@ -9317,7 +9317,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
  
  static inline BOOL isStateDirty(const struct wined3d_context *context, DWORD state)
  {
-@@ -2262,9 +2348,11 @@
+@@ -2294,9 +2380,11 @@
      HRESULT (*resource_sub_resource_map)(struct wined3d_resource *resource, unsigned int sub_resource_idx,
              struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags);
      HRESULT (*resource_sub_resource_unmap)(struct wined3d_resource *resource, unsigned int sub_resource_idx);
@@ -9329,7 +9329,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
  };
  
  struct wined3d_resource
-@@ -2289,6 +2377,7 @@
+@@ -2321,6 +2409,7 @@
      UINT depth;
      UINT size;
      DWORD priority;
@@ -9337,7 +9337,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
      void *heap_memory, *map_heap_memory, *user_memory, *bitmap_data;
      UINT custom_row_pitch, custom_slice_pitch;
      struct wined3d_gl_bo *buffer, *map_buffer;
-@@ -2296,6 +2385,10 @@
+@@ -2328,6 +2417,10 @@
      DWORD locations;
      LONG access_fence;
      BOOL unmap_dirtify;
@@ -9348,7 +9348,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
  
      void *parent;
      const struct wined3d_parent_ops *parent_ops;
-@@ -2320,6 +2413,7 @@
+@@ -2352,6 +2445,7 @@
          void *parent, const struct wined3d_parent_ops *parent_ops,
          const struct wined3d_resource_ops *resource_ops) DECLSPEC_HIDDEN;
  void resource_unload(struct wined3d_resource *resource) DECLSPEC_HIDDEN;
@@ -9356,7 +9356,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
  DWORD wined3d_resource_access_from_location(DWORD location) DECLSPEC_HIDDEN;
  BOOL wined3d_resource_allocate_sysmem(struct wined3d_resource *resource) DECLSPEC_HIDDEN;
  void wined3d_resource_changed(struct wined3d_resource *resource,
-@@ -2368,6 +2462,15 @@
+@@ -2400,6 +2494,15 @@
  {
      while(InterlockedCompareExchange(&resource->access_fence, 0, 0));
  }
@@ -9372,7 +9372,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
  
  /* Tests show that the start address of resources is 32 byte aligned */
  #define RESOURCE_ALIGNMENT 16
-@@ -2452,7 +2555,9 @@
+@@ -2484,7 +2587,9 @@
  
  void wined3d_texture_apply_sampler_desc(struct wined3d_texture *texture,
          const struct wined3d_sampler_desc *sampler_desc, const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN;
@@ -9382,7 +9382,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
  void wined3d_texture_bind(struct wined3d_texture *texture,
          struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN;
  void wined3d_texture_bind_and_dirtify(struct wined3d_texture *texture,
-@@ -2484,8 +2589,15 @@
+@@ -2516,8 +2621,15 @@
      struct wined3d_resource resource;
      struct wined3d_texture *container;
  
@@ -9398,7 +9398,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
  };
  
  static inline struct wined3d_volume *volume_from_resource(struct wined3d_resource *resource)
-@@ -2493,6 +2605,7 @@
+@@ -2525,6 +2637,7 @@
      return CONTAINING_RECORD(resource, struct wined3d_volume, resource);
  }
  
@@ -9406,7 +9406,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
  HRESULT wined3d_volume_create(struct wined3d_texture *container, const struct wined3d_resource_desc *desc,
          unsigned int level, struct wined3d_volume **volume) DECLSPEC_HIDDEN;
  void wined3d_volume_destroy(struct wined3d_volume *volume) DECLSPEC_HIDDEN;
-@@ -2508,6 +2621,27 @@
+@@ -2540,6 +2653,27 @@
  struct wined3d_surface_dib
  {
      HBITMAP DIBsection;
@@ -9434,7 +9434,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
      UINT bitmap_size;
  };
  
-@@ -2533,7 +2667,11 @@
+@@ -2565,7 +2699,11 @@
  struct wined3d_surface_ops
  {
      HRESULT (*surface_private_setup)(struct wined3d_surface *surface);
@@ -9446,7 +9446,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
  };
  
  struct wined3d_surface
-@@ -2541,12 +2679,26 @@
+@@ -2573,12 +2711,26 @@
      struct wined3d_resource resource;
      const struct wined3d_surface_ops *surface_ops;
      struct wined3d_texture *container;
@@ -9473,7 +9473,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
      GLuint rb_multisample;
      GLuint rb_resolved;
      GLenum texture_target;
-@@ -2594,11 +2746,22 @@
+@@ -2626,11 +2778,22 @@
  GLenum surface_get_gl_buffer(const struct wined3d_surface *surface) DECLSPEC_HIDDEN;
  void surface_get_drawable_size(const struct wined3d_surface *surface, const struct wined3d_context *context,
          unsigned int *width, unsigned int *height) DECLSPEC_HIDDEN;
@@ -9496,7 +9496,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
  void surface_modify_ds_location(struct wined3d_surface *surface, DWORD location, UINT w, UINT h) DECLSPEC_HIDDEN;
  void wined3d_surface_prepare(struct wined3d_surface *surface, struct wined3d_context *context,
          DWORD location) DECLSPEC_HIDDEN;
-@@ -2610,6 +2773,7 @@
+@@ -2642,6 +2805,7 @@
          const struct wined3d_gl_info *gl_info, void *mem, unsigned int pitch) DECLSPEC_HIDDEN;
  HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const POINT *dst_point,
          struct wined3d_surface *src_surface, const RECT *src_rect) DECLSPEC_HIDDEN;
@@ -9504,7 +9504,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
  HRESULT wined3d_surface_create(struct wined3d_texture *container, const struct wined3d_resource_desc *desc,
          GLenum target, unsigned int level, unsigned int layer, DWORD flags,
          struct wined3d_surface **surface) DECLSPEC_HIDDEN;
-@@ -2624,6 +2788,17 @@
+@@ -2656,6 +2820,17 @@
  void wined3d_surface_cleanup_cs(struct wined3d_surface *surface) DECLSPEC_HIDDEN;
  void wined3d_surface_getdc_cs(struct wined3d_surface *surface) DECLSPEC_HIDDEN;
  void wined3d_surface_releasedc_cs(struct wined3d_surface *surface) DECLSPEC_HIDDEN;
@@ -9522,7 +9522,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
  
  void draw_textured_quad(const struct wined3d_surface *src_surface, struct wined3d_context *context,
          const RECT *src_rect, const RECT *dst_rect, enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN;
-@@ -2644,8 +2819,10 @@
+@@ -2676,8 +2851,10 @@
      GLuint name;
  };
  
@@ -9533,7 +9533,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
  struct wined3d_vertex_declaration_element
  {
      const struct wined3d_format *format;
-@@ -2674,8 +2851,10 @@
+@@ -2706,8 +2883,10 @@
      BOOL half_float_conv_needed;
  };
  
@@ -9544,7 +9544,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
  struct wined3d_saved_states
  {
      DWORD transform[(HIGHEST_TRANSFORMSTATE >> 5) + 1];
-@@ -2743,6 +2922,7 @@
+@@ -2775,6 +2954,7 @@
  void stateblock_init_contained_states(struct wined3d_stateblock *stateblock) DECLSPEC_HIDDEN;
  
  void state_cleanup(struct wined3d_state *state) DECLSPEC_HIDDEN;
@@ -9552,7 +9552,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
  HRESULT state_init(struct wined3d_state *state, const struct wined3d_gl_info *gl_info,
          const struct wined3d_d3d_info *d3d_info, DWORD flags) DECLSPEC_HIDDEN;
  void state_unbind_resources(struct wined3d_state *state) DECLSPEC_HIDDEN;
-@@ -2793,6 +2973,32 @@
+@@ -2825,6 +3005,32 @@
  void wined3d_cs_destroy(struct wined3d_cs *cs) DECLSPEC_HIDDEN;
  void wined3d_cs_switch_onscreen_ds(struct wined3d_cs *cs, struct wined3d_context *context,
          struct wined3d_surface *depth_stencil) DECLSPEC_HIDDEN;
@@ -9585,7 +9585,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
  
  void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT *rects,
          DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) DECLSPEC_HIDDEN;
-@@ -2842,6 +3048,7 @@
+@@ -2874,6 +3080,7 @@
  void wined3d_cs_emit_set_vertex_declaration(struct wined3d_cs *cs,
          struct wined3d_vertex_declaration *declaration) DECLSPEC_HIDDEN;
  void wined3d_cs_emit_set_viewport(struct wined3d_cs *cs, const struct wined3d_viewport *viewport) DECLSPEC_HIDDEN;
@@ -9593,7 +9593,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
  void wined3d_cs_emit_set_consts_f(struct wined3d_cs *cs, UINT start_register, const float *constants,
          UINT vector4f_count, enum wined3d_shader_type type) DECLSPEC_HIDDEN;
  void wined3d_cs_emit_set_consts_b(struct wined3d_cs *cs, UINT start_register,
-@@ -2904,6 +3111,7 @@
+@@ -2936,6 +3143,7 @@
  void wined3d_cs_emit_update_sub_resource(struct wined3d_cs *cs, struct wined3d_resource *resource,
          unsigned int sub_resource_idx, const struct wined3d_box *box, const void *data, unsigned int row_pitch,
          unsigned int depth_pitch) DECLSPEC_HIDDEN;
@@ -9601,7 +9601,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
  
  /* Direct3D terminology with little modifications. We do not have an issued state
   * because only the driver knows about it, but we have a created state because d3d
-@@ -2918,8 +3126,12 @@
+@@ -2950,8 +3158,12 @@
  struct wined3d_query_ops
  {
      HRESULT (*query_get_data)(struct wined3d_query *query, void *data, DWORD data_size, DWORD flags);
@@ -9614,7 +9614,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
  };
  
  struct wined3d_query
-@@ -2933,12 +3145,16 @@
+@@ -2965,12 +3177,16 @@
      enum wined3d_query_type type;
      DWORD data_size;
      void                     *extendedData;
@@ -9631,7 +9631,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
  
  /* TODO: Add tests and support for FLOAT16_4 POSITIONT, D3DCOLOR position, other
   * fixed function semantics as D3DCOLOR or FLOAT16 */
-@@ -2965,7 +3181,9 @@
+@@ -2997,7 +3213,9 @@
      GLenum buffer_object_usage;
      GLenum buffer_type_hint;
      DWORD flags;
@@ -9641,7 +9641,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
      void *map_ptr;
  
      struct wined3d_map_range *maps;
-@@ -2990,11 +3208,15 @@
+@@ -3022,11 +3240,15 @@
  BYTE *buffer_get_sysmem(struct wined3d_buffer *This, struct wined3d_context *context) DECLSPEC_HIDDEN;
  void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_context *context,
          const struct wined3d_state *state) DECLSPEC_HIDDEN;
@@ -9657,7 +9657,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
  HRESULT wined3d_buffer_upload_data(struct wined3d_buffer *buffer,
          const struct wined3d_box *box, const void *data) DECLSPEC_HIDDEN;
  
-@@ -3032,8 +3254,10 @@
+@@ -3064,8 +3286,10 @@
      return surface_from_resource(resource);
  }
  
@@ -9668,7 +9668,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
  struct wined3d_shader_resource_view
  {
      LONG refcount;
-@@ -3046,8 +3270,12 @@
+@@ -3078,8 +3302,12 @@
  struct wined3d_swapchain_ops
  {
      void (*swapchain_present)(struct wined3d_swapchain *swapchain, const RECT *src_rect,
@@ -9681,7 +9681,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
  };
  
  struct wined3d_swapchain
-@@ -3086,8 +3314,10 @@
+@@ -3118,8 +3346,10 @@
  void swapchain_destroy_contexts(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN;
  HDC swapchain_get_backup_dc(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN;
  void swapchain_update_draw_bindings(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN;
@@ -9692,7 +9692,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
  
  /*****************************************************************************
   * Utility function prototypes
-@@ -3290,7 +3520,9 @@
+@@ -3322,7 +3552,9 @@
  void shader_generate_main(const struct wined3d_shader *shader, struct wined3d_string_buffer *buffer,
          const struct wined3d_shader_reg_maps *reg_maps, const DWORD *byte_code, void *backend_ctx) DECLSPEC_HIDDEN;
  BOOL shader_match_semantic(const char *semantic_name, enum wined3d_decl_usage usage) DECLSPEC_HIDDEN;