diff --git a/...surface-locations-into-the-resource.patch → ...surface-locations-into-the-resource.patch b/...surface-locations-into-the-resource.patch → ...surface-locations-into-the-resource.patch
diff --git a/...3d-Remove-surface_validate_location.patch → ...3d-Remove-surface_validate_location.patch b/...3d-Remove-surface_validate_location.patch → ...3d-Remove-surface_validate_location.patch
@@ -1,4 +1,4 @@
-From 4aad31fd3b9d3949b86cc73e4b4b5f98cce42ea2 Mon Sep 17 00:00:00 2001
+From 0d24fc66a870c629094b145ba89ef41389f8e3be Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Stefan=20D=C3=B6singer?= <stefan@codeweavers.com>
 Date: Sat, 4 Jan 2014 00:53:47 +0100
 Subject: wined3d: Remove surface_validate_location.
@@ -7,16 +7,16 @@ Subject: wined3d: Remove surface_validate_location.
  dlls/wined3d/arb_program_shader.c |  2 +-
  dlls/wined3d/device.c             |  4 ++--
  dlls/wined3d/surface.c            | 31 ++++++++++++-------------------
- dlls/wined3d/swapchain.c          |  4 ++--
+ dlls/wined3d/swapchain.c          |  8 ++++----
  dlls/wined3d/texture.c            |  4 +---
  dlls/wined3d/wined3d_private.h    |  1 -
- 6 files changed, 18 insertions(+), 28 deletions(-)
+ 6 files changed, 20 insertions(+), 30 deletions(-)
 
 diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c
-index 7731230..78f24cd 100644
+index 90f2183..60d2560 100644
 --- a/dlls/wined3d/arb_program_shader.c
 +++ b/dlls/wined3d/arb_program_shader.c
-@@ -7902,7 +7902,7 @@ static void arbfp_blit_surface(struct wined3d_device *device, enum wined3d_blit_
+@@ -7918,7 +7918,7 @@ static void arbfp_blit_surface(struct wined3d_device *device, enum wined3d_blit_
 
      context_release(context);
 
@@ -26,7 +26,7 @@ index 7731230..78f24cd 100644
  }
 
 diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
-index 7c9e96d..613235d 100644
+index 5e37a2d..ff02a32 100644
 --- a/dlls/wined3d/device.c
 +++ b/dlls/wined3d/device.c
 @@ -398,7 +398,7 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c
@@ -38,7 +38,7 @@ index 7c9e96d..613235d 100644
                  surface_invalidate_location(rt, ~rt->container->resource.draw_binding);
              }
          }
-@@ -4124,7 +4124,7 @@ void CDECL wined3d_device_update_sub_resource(struct wined3d_device *device, str
+@@ -4114,7 +4114,7 @@ void CDECL wined3d_device_update_sub_resource(struct wined3d_device *device, str
 
      context_release(context);
 
@@ -48,10 +48,10 @@ index 7c9e96d..613235d 100644
  }
 
 diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
-index ea601ff..516b50f1 100644
+index dd5c469..a955902 100644
 --- a/dlls/wined3d/surface.c
 +++ b/dlls/wined3d/surface.c
-@@ -1134,14 +1134,14 @@ static void surface_unload(struct wined3d_resource *resource)
+@@ -1140,14 +1140,14 @@ static void surface_unload(struct wined3d_resource *resource)
           * and all flags get lost */
          if (resource->usage & WINED3DUSAGE_DEPTHSTENCIL)
          {
@@ -68,7 +68,7 @@ index ea601ff..516b50f1 100644
              surface_invalidate_location(surface, ~WINED3D_LOCATION_SYSMEM);
          }
      }
-@@ -1677,7 +1677,7 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P
+@@ -1686,7 +1686,7 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P
 
      context_release(context);
 
@@ -77,7 +77,7 @@ index ea601ff..516b50f1 100644
      surface_invalidate_location(dst_surface, ~WINED3D_LOCATION_TEXTURE_RGB);
 
      return WINED3D_OK;
-@@ -2115,7 +2115,7 @@ HRESULT wined3d_surface_update_desc(struct wined3d_surface *surface,
+@@ -1961,7 +1961,7 @@ HRESULT wined3d_surface_update_desc(struct wined3d_surface *surface,
          valid_location = WINED3D_LOCATION_SYSMEM;
      }
 
@@ -86,7 +86,7 @@ index ea601ff..516b50f1 100644
 
      return WINED3D_OK;
  }
-@@ -2662,7 +2662,7 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface,
+@@ -2503,7 +2503,7 @@ HRESULT wined3d_surface_map(struct wined3d_surface *surface, struct wined3d_map_
      {
          TRACE("WINED3D_MAP_DISCARD flag passed, marking %s as up to date.\n",
                  wined3d_debug_location(surface->resource.map_binding));
@@ -95,7 +95,7 @@ index ea601ff..516b50f1 100644
      }
      else
      {
-@@ -3144,7 +3144,7 @@ static void fb_copy_to_texture_direct(struct wined3d_surface *dst_surface, struc
+@@ -2917,7 +2917,7 @@ static void fb_copy_to_texture_direct(struct wined3d_surface *dst_surface, struc
 
      /* The texture is now most up to date - If the surface is a render target
       * and has a drawable, this path is never entered. */
@@ -104,7 +104,7 @@ index ea601ff..516b50f1 100644
      surface_invalidate_location(dst_surface, ~WINED3D_LOCATION_TEXTURE_RGB);
  }
 
-@@ -3417,7 +3417,7 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st
+@@ -3190,7 +3190,7 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st
 
      /* The texture is now most up to date - If the surface is a render target
       * and has a drawable, this path is never entered. */
@@ -113,7 +113,7 @@ index ea601ff..516b50f1 100644
      surface_invalidate_location(dst_surface, ~WINED3D_LOCATION_TEXTURE_RGB);
  }
 
-@@ -3895,13 +3895,6 @@ void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_co
+@@ -3685,13 +3685,6 @@ void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_co
      surface->ds_current_size.cy = surface->resource.height;
  }
 
@@ -127,7 +127,7 @@ index ea601ff..516b50f1 100644
  void surface_invalidate_location(struct wined3d_surface *surface, DWORD location)
  {
      TRACE("surface %p, location %s.\n", surface, wined3d_debug_location(location));
-@@ -4296,7 +4289,7 @@ void surface_load_location(struct wined3d_surface *surface, struct wined3d_conte
+@@ -4086,7 +4079,7 @@ void surface_load_location(struct wined3d_surface *surface, struct wined3d_conte
              break;
      }
 
@@ -136,7 +136,7 @@ index ea601ff..516b50f1 100644
 
      if (location != WINED3D_LOCATION_SYSMEM && (surface->resource.locations & WINED3D_LOCATION_SYSMEM))
          surface_evict_sysmem(surface);
-@@ -4479,7 +4472,7 @@ static void ffp_blit_blit_surface(struct wined3d_device *device, enum wined3d_bl
+@@ -4250,7 +4243,7 @@ static void ffp_blit_blit_surface(struct wined3d_device *device, enum wined3d_bl
      wined3d_texture_set_color_key(src_surface->container, WINED3D_CKEY_SRC_BLT,
              (old_color_key_flags & WINED3D_CKEY_SRC_BLT) ? &old_blt_key : NULL);
 
@@ -145,7 +145,7 @@ index ea601ff..516b50f1 100644
      surface_invalidate_location(dst_surface, ~dst_surface->container->resource.draw_binding);
  }
 
-@@ -5456,7 +5449,7 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC
+@@ -5204,7 +5197,7 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst
                          dst_surface, dst_surface->container->resource.draw_binding, dst_rect);
                  context_release(context);
 
@@ -154,7 +154,7 @@ index ea601ff..516b50f1 100644
                  surface_invalidate_location(dst_surface, ~dst_surface->container->resource.draw_binding);
 
                  return WINED3D_OK;
-@@ -5543,7 +5536,7 @@ static HRESULT surface_init(struct wined3d_surface *surface, struct wined3d_text
+@@ -5291,7 +5284,7 @@ static HRESULT surface_init(struct wined3d_surface *surface, struct wined3d_text
      }
 
      surface->container = container;
@@ -163,7 +163,7 @@ index ea601ff..516b50f1 100644
      list_init(&surface->renderbuffers);
      list_init(&surface->overlays);
 
-@@ -5575,7 +5568,7 @@ static HRESULT surface_init(struct wined3d_surface *surface, struct wined3d_text
+@@ -5323,7 +5316,7 @@ static HRESULT surface_init(struct wined3d_surface *surface, struct wined3d_text
      if (surface->resource.map_binding == WINED3D_LOCATION_DIB)
      {
          wined3d_resource_free_sysmem(&surface->resource);
@@ -173,10 +173,28 @@ index ea601ff..516b50f1 100644
      }
 
 diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c
-index 7728cdc..a97d1f7 100644
+index 3fe5d71..8ee0f82 100644
 --- a/dlls/wined3d/swapchain.c
 +++ b/dlls/wined3d/swapchain.c
-@@ -570,7 +570,7 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT
+@@ -452,7 +452,7 @@ static void wined3d_swapchain_rotate(struct wined3d_swapchain *swapchain, struct
+         swapchain->back_buffers[i - 1]->texture_rgb = swapchain->back_buffers[i]->texture_rgb;
+         surface_prev->rb_multisample = surface->rb_multisample;
+
+-        surface_validate_location(surface_prev, surface->resource.locations & supported_locations);
++        wined3d_resource_validate_location(&surface_prev->resource, surface->resource.locations & supported_locations);
+         surface_invalidate_location(surface_prev, ~(surface->resource.locations & supported_locations));
+
+         surface_prev = surface;
+@@ -461,7 +461,7 @@ static void wined3d_swapchain_rotate(struct wined3d_swapchain *swapchain, struct
+     swapchain->back_buffers[i - 1]->texture_rgb = tex0;
+     surface_prev->rb_multisample = rb0;
+
+-    surface_validate_location(surface_prev, locations0 & supported_locations);
++    wined3d_resource_validate_location(&surface_prev->resource, locations0 & supported_locations);
+     surface_invalidate_location(surface_prev, ~(locations0 & supported_locations));
+
+     device_invalidate_state(swapchain->device, STATE_FRAMEBUFFER);
+@@ -617,7 +617,7 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT
 
      front = surface_from_resource(wined3d_texture_get_sub_resource(swapchain->front_buffer, 0));
 
@@ -185,7 +203,7 @@ index 7728cdc..a97d1f7 100644
      surface_invalidate_location(front, ~WINED3D_LOCATION_DRAWABLE);
      /* If the swapeffect is DISCARD, the back buffer is undefined. That means the SYSMEM
       * and INTEXTURE copies can keep their old content if they have any defined content.
-@@ -843,7 +843,7 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3
+@@ -890,7 +890,7 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3
      front_buffer = surface_from_resource(wined3d_texture_get_sub_resource(swapchain->front_buffer, 0));
      if (!(device->wined3d->flags & WINED3D_NO3D))
      {
@@ -195,10 +213,10 @@ index 7728cdc..a97d1f7 100644
      }
 
 diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
-index 093cc56..40b668c 100644
+index 14d5645..8c8d098 100644
 --- a/dlls/wined3d/texture.c
 +++ b/dlls/wined3d/texture.c
-@@ -795,9 +795,7 @@ static void texture2d_sub_resource_invalidate_location(struct wined3d_resource *
+@@ -835,9 +835,7 @@ static void texture2d_sub_resource_invalidate_location(struct wined3d_resource *
 
  static void texture2d_sub_resource_validate_location(struct wined3d_resource *sub_resource, DWORD location)
  {
@@ -210,10 +228,10 @@ index 093cc56..40b668c 100644
 
  static void texture2d_sub_resource_upload_data(struct wined3d_resource *sub_resource,
 diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
-index f03e8a1..d912668 100644
+index 1113eaa..e0ff3b1 100644
 --- a/dlls/wined3d/wined3d_private.h
 +++ b/dlls/wined3d/wined3d_private.h
-@@ -2505,7 +2505,6 @@ HRESULT wined3d_surface_update_desc(struct wined3d_surface *surface,
+@@ -2594,7 +2594,6 @@ HRESULT wined3d_surface_update_desc(struct wined3d_surface *surface,
          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;
@@ -222,5 +240,5 @@ index f03e8a1..d912668 100644
          GLenum target, unsigned int level, unsigned int layer, DWORD flags,
          struct wined3d_surface **surface) DECLSPEC_HIDDEN;
 -- 
-2.7.0
+2.7.1
 
diff --git a/...e-invalidate_location-to-resource.c.patch → ...e-invalidate_location-to-resource.c.patch b/...e-invalidate_location-to-resource.c.patch → ...e-invalidate_location-to-resource.c.patch
diff --git a/...-Invalidate-containers-via-callback.patch → ...-Invalidate-containers-via-callback.patch b/...-Invalidate-containers-via-callback.patch → ...-Invalidate-containers-via-callback.patch
diff --git a/...-Remove-surface_invalidate_location.patch → ...-Remove-surface_invalidate_location.patch b/...-Remove-surface_invalidate_location.patch → ...-Remove-surface_invalidate_location.patch
@@ -1,4 +1,4 @@
-From 03998dcf5391b8b5da7b8cecbfe2ac6b82c77502 Mon Sep 17 00:00:00 2001
+From 17d147ac91bdf126f87fea0e4da5365fba35dd63 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Stefan=20D=C3=B6singer?= <stefan@codeweavers.com>
 Date: Sat, 4 Jan 2014 01:02:15 +0100
 Subject: wined3d: Remove surface_invalidate_location.
@@ -9,10 +9,10 @@ Subject: wined3d: Remove surface_invalidate_location.
  dlls/wined3d/device.c             |  4 ++--
  dlls/wined3d/drawprim.c           |  2 +-
  dlls/wined3d/surface.c            | 43 ++++++++++++++++-----------------------
- dlls/wined3d/swapchain.c          |  6 +++---
+ dlls/wined3d/swapchain.c          | 10 ++++-----
  dlls/wined3d/texture.c            | 10 ++++-----
  dlls/wined3d/wined3d_private.h    |  1 -
- 8 files changed, 29 insertions(+), 41 deletions(-)
+ 8 files changed, 31 insertions(+), 43 deletions(-)
 
 diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c
 index 60d2560..eb09795 100644
@@ -28,10 +28,10 @@ index 60d2560..eb09795 100644
 
  static HRESULT arbfp_blit_color_fill(struct wined3d_device *device, struct wined3d_rendertarget_view *view,
 diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
-index 490c20f..9408cd9 100644
+index d0deff9..6ff5f4a 100644
 --- a/dlls/wined3d/context.c
 +++ b/dlls/wined3d/context.c
-@@ -3322,7 +3322,7 @@ static void context_setup_target(struct wined3d_context *context, struct wined3d
+@@ -3443,7 +3443,7 @@ static void context_setup_target(struct wined3d_context *context, struct wined3d
              if (texture->texture_srgb.name)
                  wined3d_texture_load(texture, context, TRUE);
              wined3d_texture_load(texture, context, FALSE);
@@ -41,7 +41,7 @@ index 490c20f..9408cd9 100644
      }
 
 diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
-index 3cfff6e..1f061fd 100644
+index d4c0009..300a903 100644
 --- a/dlls/wined3d/device.c
 +++ b/dlls/wined3d/device.c
 @@ -399,7 +399,7 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c
@@ -53,7 +53,7 @@ index 3cfff6e..1f061fd 100644
              }
          }
 
-@@ -4140,7 +4140,7 @@ void CDECL wined3d_device_update_sub_resource(struct wined3d_device *device, str
+@@ -4115,7 +4115,7 @@ void CDECL wined3d_device_update_sub_resource(struct wined3d_device *device, str
      context_release(context);
 
      wined3d_resource_validate_location(&surface->resource, WINED3D_LOCATION_TEXTURE_RGB);
@@ -76,10 +76,10 @@ index 75489db..9ba6ef7 100644
              else
              {
 diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
-index c4b9cac..b292adc 100644
+index 9712d63..babc5fd 100644
 --- a/dlls/wined3d/surface.c
 +++ b/dlls/wined3d/surface.c
-@@ -597,7 +597,7 @@ static void surface_evict_sysmem(struct wined3d_surface *surface)
+@@ -585,7 +585,7 @@ static void surface_evict_sysmem(struct wined3d_surface *surface)
          return;
 
      wined3d_resource_free_sysmem(&surface->resource);
@@ -88,7 +88,7 @@ index c4b9cac..b292adc 100644
  }
 
  static BOOL surface_use_pbo(const struct wined3d_surface *surface)
-@@ -1111,7 +1111,7 @@ static void surface_remove_pbo(struct wined3d_surface *surface, const struct win
+@@ -1093,7 +1093,7 @@ static void surface_remove_pbo(struct wined3d_surface *surface, const struct win
      checkGLcall("glDeleteBuffers(1, &surface->pbo)");
 
      surface->pbo = 0;
@@ -97,7 +97,7 @@ index c4b9cac..b292adc 100644
  }
 
  static ULONG surface_resource_incref(struct wined3d_resource *resource)
-@@ -1159,21 +1159,21 @@ static void surface_unload(struct wined3d_resource *resource)
+@@ -1141,21 +1141,21 @@ static void surface_unload(struct wined3d_resource *resource)
          if (resource->usage & WINED3DUSAGE_DEPTHSTENCIL)
          {
              wined3d_resource_validate_location(&surface->resource, WINED3D_LOCATION_DISCARDED);
@@ -122,7 +122,7 @@ index c4b9cac..b292adc 100644
      }
 
      /* Destroy PBOs, but load them into real sysmem before */
-@@ -1224,7 +1224,10 @@ static HRESULT surface_resource_sub_resource_unmap(struct wined3d_resource *reso
+@@ -1209,7 +1209,10 @@ static HRESULT surface_resource_sub_resource_unmap(struct wined3d_resource *reso
 
  static void wined3d_surface_location_invalidated(struct wined3d_resource *resource, DWORD location)
  {
@@ -134,7 +134,7 @@ index c4b9cac..b292adc 100644
  }
 
  static const struct wined3d_resource_ops surface_resource_ops =
-@@ -1708,7 +1711,7 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P
+@@ -1693,7 +1696,7 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P
      context_release(context);
 
      wined3d_resource_validate_location(&dst_surface->resource, WINED3D_LOCATION_TEXTURE_RGB);
@@ -143,7 +143,7 @@ index c4b9cac..b292adc 100644
 
      return WINED3D_OK;
  }
-@@ -2677,7 +2680,7 @@ HRESULT wined3d_surface_map(struct wined3d_surface *surface, struct wined3d_map_
+@@ -2526,7 +2529,7 @@ HRESULT wined3d_surface_map(struct wined3d_surface *surface, struct wined3d_map_
      }
 
      if (!(flags & (WINED3D_MAP_NO_DIRTY_UPDATE | WINED3D_MAP_READONLY)))
@@ -152,7 +152,7 @@ index c4b9cac..b292adc 100644
 
      switch (surface->resource.map_binding)
      {
-@@ -3069,7 +3072,7 @@ static void fb_copy_to_texture_direct(struct wined3d_surface *dst_surface, struc
+@@ -2924,7 +2927,7 @@ static void fb_copy_to_texture_direct(struct wined3d_surface *dst_surface, struc
      /* The texture is now most up to date - If the surface is a render target
       * and has a drawable, this path is never entered. */
      wined3d_resource_validate_location(&dst_surface->resource, WINED3D_LOCATION_TEXTURE_RGB);
@@ -161,7 +161,7 @@ index c4b9cac..b292adc 100644
  }
 
  /* Uses the hardware to stretch and flip the image */
-@@ -3137,7 +3140,7 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st
+@@ -2992,7 +2995,7 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st
          checkGLcall("glEnable(texture_target)");
 
          /* For now invalidate the texture copy of the back buffer. Drawable and sysmem copy are untouched */
@@ -170,7 +170,7 @@ index c4b9cac..b292adc 100644
      }
 
      /* Make sure that the top pixel is always above the bottom pixel, and keep a separate upside down flag
-@@ -3342,7 +3345,7 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st
+@@ -3197,7 +3200,7 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st
      /* The texture is now most up to date - If the surface is a render target
       * and has a drawable, this path is never entered. */
      wined3d_resource_validate_location(&dst_surface->resource, WINED3D_LOCATION_TEXTURE_RGB);
@@ -179,7 +179,7 @@ index c4b9cac..b292adc 100644
  }
 
  /* Front buffer coordinates are always full screen coordinates, but our GL
-@@ -3836,18 +3839,6 @@ void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_co
+@@ -3691,18 +3694,6 @@ void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_co
      surface->ds_current_size.cy = surface->resource.height;
  }
 
@@ -198,7 +198,7 @@ index c4b9cac..b292adc 100644
  static DWORD resource_access_from_location(DWORD location)
  {
      switch (location)
-@@ -4395,7 +4386,7 @@ static void ffp_blit_blit_surface(struct wined3d_device *device, enum wined3d_bl
+@@ -4250,7 +4241,7 @@ static void ffp_blit_blit_surface(struct wined3d_device *device, enum wined3d_bl
              (old_color_key_flags & WINED3D_CKEY_SRC_BLT) ? &old_blt_key : NULL);
 
      wined3d_resource_validate_location(&dst_surface->resource, dst_surface->container->resource.draw_binding);
@@ -207,7 +207,7 @@ index c4b9cac..b292adc 100644
  }
 
  const struct blit_shader ffp_blit =  {
-@@ -5373,7 +5364,7 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst
+@@ -5204,7 +5195,7 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst
                  context_release(context);
 
                  wined3d_resource_validate_location(&dst_surface->resource, dst_surface->container->resource.draw_binding);
@@ -216,7 +216,7 @@ index c4b9cac..b292adc 100644
 
                  return WINED3D_OK;
              }
-@@ -5492,7 +5483,7 @@ static HRESULT surface_init(struct wined3d_surface *surface, struct wined3d_text
+@@ -5323,7 +5314,7 @@ static HRESULT surface_init(struct wined3d_surface *surface, struct wined3d_text
      {
          wined3d_resource_free_sysmem(&surface->resource);
          wined3d_resource_validate_location(&surface->resource, WINED3D_LOCATION_DIB);
@@ -226,10 +226,28 @@ index c4b9cac..b292adc 100644
 
      return hr;
 diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c
-index a97d1f7..a054c05 100644
+index 8ee0f82..dae2aa5 100644
 --- a/dlls/wined3d/swapchain.c
 +++ b/dlls/wined3d/swapchain.c
-@@ -526,7 +526,7 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT
+@@ -453,7 +453,7 @@ static void wined3d_swapchain_rotate(struct wined3d_swapchain *swapchain, struct
+         surface_prev->rb_multisample = surface->rb_multisample;
+
+         wined3d_resource_validate_location(&surface_prev->resource, surface->resource.locations & supported_locations);
+-        surface_invalidate_location(surface_prev, ~(surface->resource.locations & supported_locations));
++        wined3d_resource_invalidate_location(&surface_prev->resource, ~(surface->resource.locations & supported_locations));
+
+         surface_prev = surface;
+     }
+@@ -462,7 +462,7 @@ static void wined3d_swapchain_rotate(struct wined3d_swapchain *swapchain, struct
+     surface_prev->rb_multisample = rb0;
+
+     wined3d_resource_validate_location(&surface_prev->resource, locations0 & supported_locations);
+-    surface_invalidate_location(surface_prev, ~(locations0 & supported_locations));
++    wined3d_resource_invalidate_location(&surface_prev->resource, ~(locations0 & supported_locations));
+
+     device_invalidate_state(swapchain->device, STATE_FRAMEBUFFER);
+ }
+@@ -571,7 +571,7 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT
      if (!swapchain->render_to_fbo && render_to_fbo && wined3d_settings.offscreen_rendering_mode == ORM_FBO)
      {
          surface_load_location(back_buffer, context, WINED3D_LOCATION_TEXTURE_RGB);
@@ -238,7 +256,7 @@ index a97d1f7..a054c05 100644
          swapchain->render_to_fbo = TRUE;
          swapchain_update_draw_bindings(swapchain);
      }
-@@ -571,7 +571,7 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT
+@@ -618,7 +618,7 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT
      front = surface_from_resource(wined3d_texture_get_sub_resource(swapchain->front_buffer, 0));
 
      wined3d_resource_validate_location(&front->resource, WINED3D_LOCATION_DRAWABLE);
@@ -247,7 +265,7 @@ index a97d1f7..a054c05 100644
      /* If the swapeffect is DISCARD, the back buffer is undefined. That means the SYSMEM
       * and INTEXTURE copies can keep their old content if they have any defined content.
       * If the swapeffect is COPY, the content remains the same.
-@@ -844,7 +844,7 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3
+@@ -891,7 +891,7 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3
      if (!(device->wined3d->flags & WINED3D_NO3D))
      {
          wined3d_resource_validate_location(&front_buffer->resource, WINED3D_LOCATION_DRAWABLE);
@@ -257,10 +275,10 @@ index a97d1f7..a054c05 100644
 
      /* MSDN says we're only allowed a single fullscreen swapchain per device,
 diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
-index 535159a..da1bbbb 100644
+index 373c906..9b5bd1b 100644
 --- a/dlls/wined3d/texture.c
 +++ b/dlls/wined3d/texture.c
-@@ -776,7 +776,7 @@ static void texture2d_sub_resource_add_dirty_region(struct wined3d_resource *sub
+@@ -816,7 +816,7 @@ static void texture2d_sub_resource_add_dirty_region(struct wined3d_resource *sub
      context = context_acquire(surface->resource.device, NULL);
      surface_load_location(surface, context, surface->resource.map_binding);
      context_release(context);
@@ -269,7 +287,7 @@ index 535159a..da1bbbb 100644
  }
 
  static void texture2d_sub_resource_cleanup(struct wined3d_resource *sub_resource)
-@@ -788,9 +788,7 @@ static void texture2d_sub_resource_cleanup(struct wined3d_resource *sub_resource
+@@ -828,9 +828,7 @@ static void texture2d_sub_resource_cleanup(struct wined3d_resource *sub_resource
 
  static void texture2d_sub_resource_invalidate_location(struct wined3d_resource *sub_resource, DWORD location)
  {
@@ -280,7 +298,7 @@ index 535159a..da1bbbb 100644
  }
 
  static void texture2d_sub_resource_validate_location(struct wined3d_resource *sub_resource, DWORD location)
-@@ -1560,7 +1558,7 @@ HRESULT CDECL wined3d_texture_get_dc(struct wined3d_texture *texture, unsigned i
+@@ -1698,7 +1696,7 @@ HRESULT CDECL wined3d_texture_get_dc(struct wined3d_texture *texture, unsigned i
      }
 
      surface_load_location(surface, context, WINED3D_LOCATION_DIB);
@@ -289,7 +307,7 @@ index 535159a..da1bbbb 100644
 
      if (context)
          context_release(context);
-@@ -1623,7 +1621,7 @@ HRESULT CDECL wined3d_texture_release_dc(struct wined3d_texture *texture, unsign
+@@ -1761,7 +1759,7 @@ HRESULT CDECL wined3d_texture_release_dc(struct wined3d_texture *texture, unsign
              context = context_acquire(device, NULL);
 
          surface_load_location(surface, context, surface->resource.map_binding);
@@ -299,10 +317,10 @@ index 535159a..da1bbbb 100644
              context_release(context);
      }
 diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
-index dc24c36..428eadd 100644
+index 0039805..36a82f8 100644
 --- a/dlls/wined3d/wined3d_private.h
 +++ b/dlls/wined3d/wined3d_private.h
-@@ -2544,7 +2544,6 @@ HRESULT surface_create_dib_section(struct wined3d_surface *surface) DECLSPEC_HID
+@@ -2572,7 +2572,6 @@ HRESULT surface_create_dib_section(struct wined3d_surface *surface) DECLSPEC_HID
  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;
@@ -311,5 +329,5 @@ index dc24c36..428eadd 100644
  void surface_load_ds_location(struct wined3d_surface *surface,
          struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN;
 -- 
-2.7.0
+2.7.1
 
diff --git a/...ap_data-and-user_memory-into-the-re.patch → ...ap_data-and-user_memory-into-the-re.patch b/...ap_data-and-user_memory-into-the-re.patch → ...ap_data-and-user_memory-into-the-re.patch
diff --git a/...ove-load_location-into-the-resource.patch → ...ove-load_location-into-the-resource.patch b/...ove-load_location-into-the-resource.patch → ...ove-load_location-into-the-resource.patch
diff --git a/...urface_load_location-with-resource_.patch → ...urface_load_location-with-resource_.patch b/...urface_load_location-with-resource_.patch → ...urface_load_location-with-resource_.patch
diff --git a/...-helper-functions-for-mapping-volum.patch → ...-helper-functions-for-mapping-volum.patch b/...-helper-functions-for-mapping-volum.patch → ...-helper-functions-for-mapping-volum.patch
diff --git a/...me-PBO-infrastructure-into-the-reso.patch → ...me-PBO-infrastructure-into-the-reso.patch b/...me-PBO-infrastructure-into-the-reso.patch → ...me-PBO-infrastructure-into-the-reso.patch
diff --git a/...ain/0022-wined3d-Remove-surface-pbo.patch → ...ain/0023-wined3d-Remove-surface-pbo.patch b/...ain/0022-wined3d-Remove-surface-pbo.patch → ...ain/0023-wined3d-Remove-surface-pbo.patch
diff --git a/...rce-buffer-mapping-facilities-in-su.patch → ...rce-buffer-mapping-facilities-in-su.patch b/...rce-buffer-mapping-facilities-in-su.patch → ...rce-buffer-mapping-facilities-in-su.patch
diff --git a/...e-buffer-creation-into-the-resource.patch → ...e-buffer-creation-into-the-resource.patch b/...e-buffer-creation-into-the-resource.patch → ...e-buffer-creation-into-the-resource.patch
diff --git a/...NED3D_LOCATION_DISCARDED-in-surface.patch → ...NED3D_LOCATION_DISCARDED-in-surface.patch b/...NED3D_LOCATION_DISCARDED-in-surface.patch → ...NED3D_LOCATION_DISCARDED-in-surface.patch
diff --git a/...CATION_DISCARDED-in-surface_load_dr.patch → ...CATION_DISCARDED-in-surface_load_dr.patch b/...CATION_DISCARDED-in-surface_load_dr.patch → ...CATION_DISCARDED-in-surface_load_dr.patch
diff --git a/...NED3D_LOCATION_DISCARDED-for-sysmem.patch → ...NED3D_LOCATION_DISCARDED-for-sysmem.patch b/...NED3D_LOCATION_DISCARDED-for-sysmem.patch → ...NED3D_LOCATION_DISCARDED-for-sysmem.patch
diff --git a/...Discard-implicit-surfaces-on-unload.patch → ...Discard-implicit-surfaces-on-unload.patch b/...Discard-implicit-surfaces-on-unload.patch → ...Discard-implicit-surfaces-on-unload.patch
diff --git a/...-to-flip-sysmem-copies-in-swapchain.patch → ...-to-flip-sysmem-copies-in-swapchain.patch b/...-to-flip-sysmem-copies-in-swapchain.patch → ...-to-flip-sysmem-copies-in-swapchain.patch
diff --git a/...-the-backbuffer-in-discard-presents.patch → ...-the-backbuffer-in-discard-presents.patch b/...-the-backbuffer-in-discard-presents.patch → ...-the-backbuffer-in-discard-presents.patch
diff --git a/...-a-function-to-retrieve-resource-me.patch → ...-a-function-to-retrieve-resource-me.patch b/...-a-function-to-retrieve-resource-me.patch → ...-a-function-to-retrieve-resource-me.patch
diff --git a/...ace_ops-unmap-specific-for-front-bu.patch → ...ace_ops-unmap-specific-for-front-bu.patch b/...ace_ops-unmap-specific-for-front-bu.patch → ...ace_ops-unmap-specific-for-front-bu.patch
diff --git a/...ove-check_block_align-to-resource.c.patch → ...ove-check_block_align-to-resource.c.patch b/...ove-check_block_align-to-resource.c.patch → ...ove-check_block_align-to-resource.c.patch
diff --git a/...urface-alloc-functions-with-resourc.patch → ...urface-alloc-functions-with-resourc.patch b/...urface-alloc-functions-with-resourc.patch → ...urface-alloc-functions-with-resourc.patch
diff --git a/...elete-the-buffer-in-surface_cleanup.patch → ...elete-the-buffer-in-surface_cleanup.patch b/...elete-the-buffer-in-surface_cleanup.patch → ...elete-the-buffer-in-surface_cleanup.patch
diff --git a/...resource-facilities-to-destroy-PBOs.patch → ...resource-facilities-to-destroy-PBOs.patch b/...resource-facilities-to-destroy-PBOs.patch → ...resource-facilities-to-destroy-PBOs.patch
diff --git a/...le-location-copying-to-the-resource.patch → ...le-location-copying-to-the-resource.patch b/...le-location-copying-to-the-resource.patch → ...le-location-copying-to-the-resource.patch
diff --git a/...ve-most-of-volume_map-to-resource.c.patch → ...ve-most-of-volume_map-to-resource.c.patch b/...ve-most-of-volume_map-to-resource.c.patch → ...ve-most-of-volume_map-to-resource.c.patch
diff --git a/patches/wined3d-CSMT_Main/0040-wined3d-Don-t-call-the-public-map-function-in-surfac.patch b/patches/wined3d-CSMT_Main/0040-wined3d-Don-t-call-the-public-map-function-in-surfac.patch
diff --git a/...3d-Use-resource_map-for-surface_map.patch → ...3d-Use-resource_map-for-surface_map.patch b/...3d-Use-resource_map-for-surface_map.patch → ...3d-Use-resource_map-for-surface_map.patch
diff --git a/patches/wined3d-CSMT_Main/0041-wined3d-Don-t-call-the-public-map-function-in-surfac.patch b/patches/wined3d-CSMT_Main/0041-wined3d-Don-t-call-the-public-map-function-in-surfac.patch
diff --git a/patches/wined3d-CSMT_Main/0042-wined3d-Don-t-call-the-public-map-function-in-surfac.patch b/patches/wined3d-CSMT_Main/0042-wined3d-Don-t-call-the-public-map-function-in-surfac.patch
@@ -0,0 +1,282 @@
+From 47ef978f9df066194e25874a30f54033105e520b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Stefan=20D=C3=B6singer?= <stefan@codeweavers.com>
+Date: Tue, 24 Sep 2013 00:31:39 +0200
+Subject: wined3d: Don't call the public map function in surface_cpu_blt.
+
+---
+ dlls/wined3d/surface.c | 108 ++++++++++++++++++++++++++++++++-----------------
+ 1 file changed, 72 insertions(+), 36 deletions(-)
+
+diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
+index ca15221..eb1397e 100644
+--- a/dlls/wined3d/surface.c
++++ b/dlls/wined3d/surface.c
+@@ -4067,26 +4067,40 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT *
+         struct wined3d_surface *src_surface, const RECT *src_rect, DWORD flags,
+         const struct wined3d_blt_fx *fx, enum wined3d_texture_filter_type filter)
+ {
+-    const struct wined3d_box dst_box = {dst_rect->left, dst_rect->top, dst_rect->right, dst_rect->bottom, 0, 1};
+     int bpp, srcheight, srcwidth, dstheight, dstwidth, width;
+     const struct wined3d_format *src_format, *dst_format;
+     unsigned int src_fmt_flags, dst_fmt_flags;
+     struct wined3d_texture *src_texture = NULL;
+-    struct wined3d_map_desc dst_map, src_map;
++    void *src_data = NULL, *dst_data = NULL;
++    UINT src_row_pitch, src_slice_pitch, dst_row_pitch, dst_slice_pitch;
+     const BYTE *sbase = NULL;
+     HRESULT hr = WINED3D_OK;
+     const BYTE *sbuf;
+     BYTE *dbuf;
+     int x, y;
++    struct wined3d_device *device = dst_surface->resource.device;
++    struct wined3d_context *context = NULL;
+
+     TRACE("dst_surface %p, dst_rect %s, src_surface %p, src_rect %s, flags %#x, fx %p, filter %s.\n",
+             dst_surface, wine_dbgstr_rect(dst_rect), src_surface, wine_dbgstr_rect(src_rect),
+             flags, fx, debug_d3dtexturefiltertype(filter));
+
++    if (device->d3d_initialized)
++        context = context_acquire(device, NULL);
++
++    if (!wined3d_resource_prepare_map_memory(&dst_surface->resource, context))
++    {
++        hr = E_OUTOFMEMORY;
++        goto error;
++    }
++    wined3d_resource_load_location(&dst_surface->resource, context, dst_surface->resource.map_binding);
++
+     if (src_surface == dst_surface)
+     {
+-        wined3d_surface_map(dst_surface, &dst_map, NULL, 0);
+-        src_map = dst_map;
++        dst_data = wined3d_resource_get_map_ptr(&dst_surface->resource, context, 0);
++        wined3d_resource_get_pitch(&dst_surface->resource, &dst_row_pitch, &dst_slice_pitch);
++        src_data = dst_data;
++        src_row_pitch = dst_row_pitch;
+         src_format = dst_surface->resource.format;
+         dst_format = src_format;
+         dst_fmt_flags = dst_surface->container->resource.format_flags;
+@@ -4098,6 +4112,12 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT *
+         dst_fmt_flags = dst_surface->container->resource.format_flags;
+         if (src_surface)
+         {
++            if (!wined3d_resource_prepare_map_memory(&src_surface->resource, context))
++            {
++                hr = E_OUTOFMEMORY;
++                goto error;
++            }
++
+             if (dst_surface->resource.format->id != src_surface->resource.format->id)
+             {
+                 if (!(src_texture = surface_convert_format(src_surface, dst_format->id)))
+@@ -4108,7 +4128,9 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT *
+                 }
+                 src_surface = surface_from_resource(wined3d_texture_get_sub_resource(src_texture, 0));
+             }
+-            wined3d_surface_map(src_surface, &src_map, NULL, WINED3D_MAP_READONLY);
++            wined3d_resource_load_location(&src_surface->resource, context, src_surface->resource.map_binding);
++            wined3d_resource_get_pitch(&src_surface->resource, &src_row_pitch, &src_slice_pitch);
++            src_data = wined3d_resource_get_map_ptr(&src_surface->resource, context, 0);
+             src_format = src_surface->resource.format;
+             src_fmt_flags = src_surface->container->resource.format_flags;
+         }
+@@ -4118,7 +4140,8 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT *
+             src_fmt_flags = dst_fmt_flags;
+         }
+
+-        wined3d_surface_map(dst_surface, &dst_map, &dst_box, 0);
++        wined3d_resource_get_pitch(&dst_surface->resource, &dst_row_pitch, &dst_slice_pitch);
++        dst_data = wined3d_resource_get_map_ptr(&dst_surface->resource, context, 0);
+     }
+
+     bpp = dst_surface->resource.format->byte_count;
+@@ -4129,15 +4152,12 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT *
+     width = (dst_rect->right - dst_rect->left) * bpp;
+
+     if (src_surface)
+-        sbase = (BYTE *)src_map.data
+-                + ((src_rect->top / src_format->block_height) * src_map.row_pitch)
++        sbase = (BYTE *)src_data
++                + ((src_rect->top / src_format->block_height) * src_row_pitch)
+                 + ((src_rect->left / src_format->block_width) * src_format->block_byte_count);
+-    if (src_surface != dst_surface)
+-        dbuf = dst_map.data;
+-    else
+-        dbuf = (BYTE *)dst_map.data
+-                + ((dst_rect->top / dst_format->block_height) * dst_map.row_pitch)
+-                + ((dst_rect->left / dst_format->block_width) * dst_format->block_byte_count);
++    dbuf = (BYTE *)dst_data
++            + ((dst_rect->top / dst_format->block_height) * dst_row_pitch)
++            + ((dst_rect->left / dst_format->block_width) * dst_format->block_byte_count);
+
+     if (src_fmt_flags & dst_fmt_flags & WINED3DFMT_FLAG_BLOCKS)
+     {
+@@ -4172,7 +4192,7 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT *
+         }
+
+         hr = surface_cpu_blt_compressed(sbase, dbuf,
+-                src_map.row_pitch, dst_map.row_pitch, dstwidth, dstheight,
++                src_row_pitch, dst_row_pitch, dstwidth, dstheight,
+                 src_format, flags, fx);
+         goto release;
+     }
+@@ -4180,7 +4200,7 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT *
+     /* First, all the 'source-less' blits */
+     if (flags & WINED3D_BLT_COLOR_FILL)
+     {
+-        hr = _Blt_ColorFill(dbuf, dstwidth, dstheight, bpp, dst_map.row_pitch, fx->fill_color);
++        hr = _Blt_ColorFill(dbuf, dstwidth, dstheight, bpp, dst_row_pitch, fx->fill_color);
+         flags &= ~WINED3D_BLT_COLOR_FILL;
+     }
+
+@@ -4224,19 +4244,19 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT *
+                         for (y = 0; y < dstheight; ++y)
+                         {
+                             memcpy(dbuf, sbuf, width);
+-                            sbuf += src_map.row_pitch;
+-                            dbuf += dst_map.row_pitch;
++                            sbuf += src_row_pitch;
++                            dbuf += dst_row_pitch;
+                         }
+                     }
+                     else if (dst_rect->top > src_rect->top)
+                     {
+                         /* Copy from bottom upwards. */
+-                        sbuf += src_map.row_pitch * dstheight;
+-                        dbuf += dst_map.row_pitch * dstheight;
++                        sbuf += src_row_pitch * dstheight;
++                        dbuf += dst_row_pitch * dstheight;
+                         for (y = 0; y < dstheight; ++y)
+                         {
+-                            sbuf -= src_map.row_pitch;
+-                            dbuf -= dst_map.row_pitch;
++                            sbuf -= src_row_pitch;
++                            dbuf -= dst_row_pitch;
+                             memcpy(dbuf, sbuf, width);
+                         }
+                     }
+@@ -4246,8 +4266,8 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT *
+                         for (y = 0; y < dstheight; ++y)
+                         {
+                             memmove(dbuf, sbuf, width);
+-                            sbuf += src_map.row_pitch;
+-                            dbuf += dst_map.row_pitch;
++                            sbuf += src_row_pitch;
++                            dbuf += dst_row_pitch;
+                         }
+                     }
+                 }
+@@ -4256,9 +4276,9 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT *
+                     /* Stretching in y direction only. */
+                     for (y = sy = 0; y < dstheight; ++y, sy += yinc)
+                     {
+-                        sbuf = sbase + (sy >> 16) * src_map.row_pitch;
++                        sbuf = sbase + (sy >> 16) * src_row_pitch;
+                         memcpy(dbuf, sbuf, width);
+-                        dbuf += dst_map.row_pitch;
++                        dbuf += dst_row_pitch;
+                     }
+                 }
+             }
+@@ -4268,13 +4288,13 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT *
+                 int last_sy = -1;
+                 for (y = sy = 0; y < dstheight; ++y, sy += yinc)
+                 {
+-                    sbuf = sbase + (sy >> 16) * src_map.row_pitch;
++                    sbuf = sbase + (sy >> 16) * src_row_pitch;
+
+                     if ((sy >> 16) == (last_sy >> 16))
+                     {
+                         /* This source row is the same as last source row -
+                          * Copy the already stretched row. */
+-                        memcpy(dbuf, dbuf - dst_map.row_pitch, width);
++                        memcpy(dbuf, dbuf - dst_row_pitch, width);
+                     }
+                     else
+                     {
+@@ -4321,14 +4341,14 @@ do { \
+                         }
+ #undef STRETCH_ROW
+                     }
+-                    dbuf += dst_map.row_pitch;
++                    dbuf += dst_row_pitch;
+                     last_sy = sy;
+                 }
+             }
+         }
+         else
+         {
+-            LONG dstyinc = dst_map.row_pitch, dstxinc = bpp;
++            LONG dstyinc = dst_row_pitch, dstxinc = bpp;
+             DWORD keylow = 0xffffffff, keyhigh = 0, keymask = 0xffffffff;
+             DWORD destkeylow = 0x0, destkeyhigh = 0xffffffff, destkeymask = 0xffffffff;
+             if (flags & (WINED3D_BLT_SRC_CKEY | WINED3D_BLT_DST_CKEY
+@@ -4380,7 +4400,7 @@ do { \
+                 LONG tmpxy;
+                 dTopLeft     = dbuf;
+                 dTopRight    = dbuf + ((dstwidth - 1) * bpp);
+-                dBottomLeft  = dTopLeft + ((dstheight - 1) * dst_map.row_pitch);
++                dBottomLeft  = dTopLeft + ((dstheight - 1) * dst_row_pitch);
+                 dBottomRight = dBottomLeft + ((dstwidth - 1) * bpp);
+
+                 if (fx->fx & WINEDDBLTFX_ARITHSTRETCHY)
+@@ -4463,7 +4483,7 @@ do { \
+     type *d = (type *)dbuf, *dx, tmp; \
+     for (y = sy = 0; y < dstheight; ++y, sy += yinc) \
+     { \
+-        s = (const type *)(sbase + (sy >> 16) * src_map.row_pitch); \
++        s = (const type *)(sbase + (sy >> 16) * src_row_pitch); \
+         dx = d; \
+         for (x = sx = 0; x < dstwidth; ++x, sx += xinc) \
+         { \
+@@ -4496,7 +4516,7 @@ do { \
+                     BYTE *d = dbuf, *dx;
+                     for (y = sy = 0; y < dstheight; ++y, sy += yinc)
+                     {
+-                        sbuf = sbase + (sy >> 16) * src_map.row_pitch;
++                        sbuf = sbase + (sy >> 16) * src_row_pitch;
+                         dx = d;
+                         for (x = sx = 0; x < dstwidth; ++x, sx+= xinc)
+                         {
+@@ -4527,6 +4547,10 @@ do { \
+         }
+     }
+
++    wined3d_resource_invalidate_location(&dst_surface->resource, ~dst_surface->resource.map_binding);
++    if (dst_surface->container)
++        wined3d_texture_set_dirty(dst_surface->container);
++
+ error:
+     if (flags && FIXME_ON(d3d_surface))
+     {
+@@ -4534,12 +4558,24 @@ error:
+     }
+
+ release:
+-    wined3d_surface_unmap(dst_surface);
+-    if (src_surface && src_surface != dst_surface)
+-        wined3d_surface_unmap(src_surface);
++    if (dst_data)
++    {
++        wined3d_resource_release_map_ptr(&dst_surface->resource, context);
++
++        if (dst_surface->container->swapchain
++                && dst_surface->container == dst_surface->container->swapchain->front_buffer)
++        {
++            dst_surface->lockedRect = *dst_rect;
++            dst_surface->surface_ops->surface_frontbuffer_updated(dst_surface);
++        }
++    }
++    if (src_surface && src_surface != dst_surface && src_data)
++        wined3d_resource_release_map_ptr(&src_surface->resource, context);
+     /* Release the converted surface, if any. */
+     if (src_texture)
+         wined3d_texture_decref(src_texture);
++    if (context)
++        context_release(context);
+
+     return hr;
+ }
+-- 
+2.7.1
+
diff --git a/...-the-framebuffer-into-wined3d_state.patch → ...-the-framebuffer-into-wined3d_state.patch b/...-the-framebuffer-into-wined3d_state.patch → ...-the-framebuffer-into-wined3d_state.patch
diff --git a/...f-state-access-in-shader_generate_g.patch → ...f-state-access-in-shader_generate_g.patch b/...f-state-access-in-shader_generate_g.patch → ...f-state-access-in-shader_generate_g.patch
diff --git a/...d-buffers-if-streamsrc-is-not-dirty.patch → ...d-buffers-if-streamsrc-is-not-dirty.patch b/...d-buffers-if-streamsrc-is-not-dirty.patch → ...d-buffers-if-streamsrc-is-not-dirty.patch
diff --git a/...ntroduce-a-multithreaded-command-st.patch → ...ntroduce-a-multithreaded-command-st.patch b/...ntroduce-a-multithreaded-command-st.patch → ...ntroduce-a-multithreaded-command-st.patch
diff --git a/...resource-updates-to-finish-when-usi.patch → ...resource-updates-to-finish-when-usi.patch b/...resource-updates-to-finish-when-usi.patch → ...resource-updates-to-finish-when-usi.patch
@@ -1,4 +1,4 @@
-From ff3ebefd7ff7834c3c1a7c9b7998592929e40714 Mon Sep 17 00:00:00 2001
+From 7be737c0da2f427cb2dae44d83f6baf57a95e73d Mon Sep 17 00:00:00 2001
 From: Henri Verbeet <hverbeet@codeweavers.com>
 Date: Sat, 8 Dec 2012 19:28:54 +0100
 Subject: wined3d: Wait for resource updates to finish when using the
@@ -17,10 +17,10 @@ then it's probably useful for debugging.
  6 files changed, 40 insertions(+), 13 deletions(-)
 
 diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c
-index 9f29aa4..59c3409 100644
+index 21290d8..260228f 100644
 --- a/dlls/wined3d/arb_program_shader.c
 +++ b/dlls/wined3d/arb_program_shader.c
-@@ -7679,7 +7679,9 @@ HRESULT arbfp_blit_surface(struct wined3d_device *device, DWORD filter,
+@@ -7911,7 +7911,9 @@ static void arbfp_blit_surface(struct wined3d_device *device, enum wined3d_blit_
      /* Leave the opengl state valid for blitting */
      arbfp_blit_unset(context->gl_info);
 
@@ -32,7 +32,7 @@ index 9f29aa4..59c3409 100644
              && (dst_surface->container->swapchain->front_buffer == dst_surface->container)))
          context->gl_info->gl_ops.gl.p_glFlush(); /* Flush to ensure ordering across contexts. */
 diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c
-index 3de580e..41bc6f0 100644
+index 7eef51e..fa1ddc4 100644
 --- a/dlls/wined3d/buffer.c
 +++ b/dlls/wined3d/buffer.c
 @@ -1100,7 +1100,9 @@ void CDECL wined3d_buffer_unmap(struct wined3d_buffer *buffer)
@@ -47,10 +47,10 @@ index 3de580e..41bc6f0 100644
          context_release(context);
 
 diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
-index e33d0c0..b9935e0 100644
+index 68163e5..ebee608 100644
 --- a/dlls/wined3d/device.c
 +++ b/dlls/wined3d/device.c
-@@ -463,7 +463,9 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c
+@@ -493,7 +493,9 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c
          }
      }
 
@@ -61,7 +61,7 @@ index e33d0c0..b9935e0 100644
              && target->container->swapchain && target->container->swapchain->front_buffer == target->container))
          gl_info->gl_ops.gl.p_glFlush(); /* Flush to ensure ordering across contexts. */
 
-@@ -3247,7 +3249,10 @@ HRESULT CDECL wined3d_device_end_scene(struct wined3d_device *device)
+@@ -3357,7 +3359,10 @@ HRESULT CDECL wined3d_device_end_scene(struct wined3d_device *device)
 
      context = context_acquire(device, NULL);
      /* We only have to do this if we need to read the, swapbuffers performs a flush for us */
@@ -74,10 +74,10 @@ index e33d0c0..b9935e0 100644
       * fails. */
      context_release(context);
 diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c
-index 98261f9..d3a9e03 100644
+index 4e66f01..ab4ab49 100644
 --- a/dlls/wined3d/drawprim.c
 +++ b/dlls/wined3d/drawprim.c
-@@ -781,7 +781,9 @@ void draw_primitive(struct wined3d_device *device, UINT start_idx, UINT index_co
+@@ -796,7 +796,9 @@ void draw_primitive(struct wined3d_device *device, UINT start_idx, UINT index_co
          wined3d_event_query_issue(context->buffer_queries[i], device);
      }
 
@@ -89,10 +89,10 @@ index 98261f9..d3a9e03 100644
 
      context_release(context);
 diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
-index 1aafda1..caf9618 100644
+index 2de931f..fd8c5d5 100644
 --- a/dlls/wined3d/surface.c
 +++ b/dlls/wined3d/surface.c
-@@ -687,7 +687,9 @@ static void surface_depth_blt_fbo(const struct wined3d_device *device,
+@@ -669,7 +669,9 @@ static void surface_depth_blt_fbo(const struct wined3d_device *device,
              dst_rect->left, dst_rect->top, dst_rect->right, dst_rect->bottom, gl_mask, GL_NEAREST);
      checkGLcall("glBlitFramebuffer()");
 
@@ -103,7 +103,7 @@ index 1aafda1..caf9618 100644
          gl_info->gl_ops.gl.p_glFlush(); /* Flush to ensure ordering across contexts. */
 
      context_release(context);
-@@ -816,7 +818,9 @@ static void surface_blt_fbo(const struct wined3d_device *device,
+@@ -796,7 +798,9 @@ static void surface_blt_fbo(const struct wined3d_device *device,
              dst_rect.left, dst_rect.top, dst_rect.right, dst_rect.bottom, GL_COLOR_BUFFER_BIT, gl_filter);
      checkGLcall("glBlitFramebuffer()");
 
@@ -114,7 +114,7 @@ index 1aafda1..caf9618 100644
              || (dst_location == WINED3D_LOCATION_DRAWABLE
              && dst_surface->container->swapchain->front_buffer == dst_surface->container))
          gl_info->gl_ops.gl.p_glFlush();
-@@ -1393,7 +1397,9 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w
+@@ -1341,7 +1345,9 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w
          checkGLcall("glBindBuffer");
      }
 
@@ -125,7 +125,7 @@ index 1aafda1..caf9618 100644
          gl_info->gl_ops.gl.p_glFlush();
 
      if (gl_info->quirks & WINED3D_QUIRK_FBO_TEX_UPDATE)
-@@ -3337,7 +3343,9 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st
+@@ -2896,7 +2902,9 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st
          checkGLcall("glDeleteTextures(1, &backup)");
      }
 
@@ -136,7 +136,7 @@ index 1aafda1..caf9618 100644
          gl_info->gl_ops.gl.p_glFlush(); /* Flush to ensure ordering across contexts. */
 
      context_release(context);
-@@ -3452,7 +3460,9 @@ static void surface_blt_to_drawable(const struct wined3d_device *device,
+@@ -3004,7 +3012,9 @@ static void surface_blt_to_drawable(const struct wined3d_device *device,
      /* Leave the opengl state valid for blitting */
      device->blitter->unset_shader(context->gl_info);
 
@@ -147,7 +147,7 @@ index 1aafda1..caf9618 100644
              || (dst_surface->container->swapchain
              && dst_surface->container->swapchain->front_buffer == dst_surface->container))
          gl_info->gl_ops.gl.p_glFlush(); /* Flush to ensure ordering across contexts. */
-@@ -3873,7 +3883,9 @@ void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_co
+@@ -3369,7 +3379,9 @@ void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_co
 
          context_invalidate_state(context, STATE_FRAMEBUFFER);
 
@@ -158,7 +158,7 @@ index 1aafda1..caf9618 100644
              gl_info->gl_ops.gl.p_glFlush(); /* Flush to ensure ordering across contexts. */
      }
      else if (location == WINED3D_LOCATION_DRAWABLE)
-@@ -3889,7 +3901,9 @@ void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_co
+@@ -3385,7 +3397,9 @@ void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_co
 
          context_invalidate_state(context, STATE_FRAMEBUFFER);
 
@@ -170,10 +170,10 @@ index 1aafda1..caf9618 100644
      }
      else
 diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c
-index ed2964e..60504ef 100644
+index 335e12c..c50f1f7 100644
 --- a/dlls/wined3d/swapchain.c
 +++ b/dlls/wined3d/swapchain.c
-@@ -531,8 +531,10 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT
+@@ -590,8 +590,10 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT
          swapchain_blit(swapchain, context, &src_rect, &dst_rect);
      }
 
@@ -184,7 +184,7 @@ index ed2964e..60504ef 100644
 +        gl_info->gl_ops.gl.p_glFlush();
 
      /* call wglSwapBuffers through the gl table to avoid confusing the Steam overlay */
-     gl_info->gl_ops.wgl.p_wglSwapBuffers(context->hdc); /* TODO: cycle through the swapchain buffers */
+     gl_info->gl_ops.wgl.p_wglSwapBuffers(context->hdc);
 -- 
-2.2.1
+2.7.1
 
diff --git a/...re-pointers-in-struct-wined3d_cs_pr.patch → ...re-pointers-in-struct-wined3d_cs_pr.patch b/...re-pointers-in-struct-wined3d_cs_pr.patch → ...re-pointers-in-struct-wined3d_cs_pr.patch
diff --git a/...-rectangle-pointers-into-wined3d_cs.patch → ...-rectangle-pointers-into-wined3d_cs.patch b/...-rectangle-pointers-into-wined3d_cs.patch → ...-rectangle-pointers-into-wined3d_cs.patch
diff --git a/...-color-in-clear-ops-instead-of-a-po.patch → ...-color-in-clear-ops-instead-of-a-po.patch b/...-color-in-clear-ops-instead-of-a-po.patch → ...-color-in-clear-ops-instead-of-a-po.patch
diff --git a/...3d-Pass-the-state-to-draw_primitive.patch → ...3d-Pass-the-state-to-draw_primitive.patch b/...3d-Pass-the-state-to-draw_primitive.patch → ...3d-Pass-the-state-to-draw_primitive.patch
diff --git a/...or-the-cs-before-destroying-objects.patch → ...or-the-cs-before-destroying-objects.patch b/...or-the-cs-before-destroying-objects.patch → ...or-the-cs-before-destroying-objects.patch
diff --git a/...2-wined3d-Give-the-cs-its-own-state.patch → ...3-wined3d-Give-the-cs-its-own-state.patch b/...2-wined3d-Give-the-cs-its-own-state.patch → ...3-wined3d-Give-the-cs-its-own-state.patch
diff --git a/...t-constant-updates-through-the-comm.patch → ...t-constant-updates-through-the-comm.patch b/...t-constant-updates-through-the-comm.patch → ...t-constant-updates-through-the-comm.patch
diff --git a/...-glFinish-before-modifying-resource.patch → ...-glFinish-before-modifying-resource.patch b/...-glFinish-before-modifying-resource.patch → ...-glFinish-before-modifying-resource.patch
diff --git a/...e-cs-before-changing-the-texture-lo.patch → ...e-cs-before-changing-the-texture-lo.patch b/...e-cs-before-changing-the-texture-lo.patch → ...e-cs-before-changing-the-texture-lo.patch
diff --git a/...3d-Don-t-call-glFinish-after-clears.patch → ...3d-Don-t-call-glFinish-after-clears.patch b/...3d-Don-t-call-glFinish-after-clears.patch → ...3d-Don-t-call-glFinish-after-clears.patch
diff --git a/...d3d-Don-t-call-glFinish-after-draws.patch → ...d3d-Don-t-call-glFinish-after-draws.patch b/...d3d-Don-t-call-glFinish-after-draws.patch → ...d3d-Don-t-call-glFinish-after-draws.patch
diff --git a/...vice-offscreenBuffer-in-the-context.patch → ...vice-offscreenBuffer-in-the-context.patch b/...vice-offscreenBuffer-in-the-context.patch → ...vice-offscreenBuffer-in-the-context.patch
diff --git a/...ess-the-stateblock-in-find_draw_buf.patch → ...ess-the-stateblock-in-find_draw_buf.patch b/...ess-the-stateblock-in-find_draw_buf.patch → ...ess-the-stateblock-in-find_draw_buf.patch
diff --git a/...-depth-stencil-to-swapchain-present.patch → ...-depth-stencil-to-swapchain-present.patch b/...-depth-stencil-to-swapchain-present.patch → ...-depth-stencil-to-swapchain-present.patch
diff --git a/...re-viewport-pointers-in-the-command.patch → ...re-viewport-pointers-in-the-command.patch b/...re-viewport-pointers-in-the-command.patch → ...re-viewport-pointers-in-the-command.patch
diff --git a/...k-of-the-onscreen-depth-stencil-in-.patch → ...k-of-the-onscreen-depth-stencil-in-.patch b/...k-of-the-onscreen-depth-stencil-in-.patch → ...k-of-the-onscreen-depth-stencil-in-.patch
diff --git a/...-vertex-index-updates-through-the-c.patch → ...-vertex-index-updates-through-the-c.patch b/...-vertex-index-updates-through-the-c.patch → ...-vertex-index-updates-through-the-c.patch
diff --git a/...itive-type-updates-through-the-comm.patch → ...itive-type-updates-through-the-comm.patch b/...itive-type-updates-through-the-comm.patch → ...itive-type-updates-through-the-comm.patch
diff --git a/...-constant-updates-through-the-comma.patch → ...-constant-updates-through-the-comma.patch b/...-constant-updates-through-the-comma.patch → ...-constant-updates-through-the-comma.patch
diff --git a/...constant-updates-through-the-comman.patch → ...constant-updates-through-the-comman.patch b/...constant-updates-through-the-comman.patch → ...constant-updates-through-the-comman.patch
diff --git a/...t-updates-through-the-command-strea.patch → ...t-updates-through-the-command-strea.patch b/...t-updates-through-the-command-strea.patch → ...t-updates-through-the-command-strea.patch
diff --git a/...he-command-stream-from-running-ahea.patch → ...he-command-stream-from-running-ahea.patch b/...he-command-stream-from-running-ahea.patch → ...he-command-stream-from-running-ahea.patch
diff --git a/...the-cs-to-finish-before-destroying-.patch → ...the-cs-to-finish-before-destroying-.patch b/...the-cs-to-finish-before-destroying-.patch → ...the-cs-to-finish-before-destroying-.patch
diff --git a/...0-wined3d-Run-the-cs-asynchronously.patch → ...1-wined3d-Run-the-cs-asynchronously.patch b/...0-wined3d-Run-the-cs-asynchronously.patch → ...1-wined3d-Run-the-cs-asynchronously.patch
diff --git a/...nd-blits-through-the-command-stream.patch → ...nd-blits-through-the-command-stream.patch b/...nd-blits-through-the-command-stream.patch → ...nd-blits-through-the-command-stream.patch
diff --git a/...d3d-Get-rid-of-WINED3D_BUFFER_FLUSH.patch → ...d3d-Get-rid-of-WINED3D_BUFFER_FLUSH.patch b/...d3d-Get-rid-of-WINED3D_BUFFER_FLUSH.patch → ...d3d-Get-rid-of-WINED3D_BUFFER_FLUSH.patch
diff --git a/...ce-strict-draw-ordering-for-multith.patch → ...ce-strict-draw-ordering-for-multith.patch b/...ce-strict-draw-ordering-for-multith.patch → ...ce-strict-draw-ordering-for-multith.patch
diff --git a/...er-target-view-clears-through-the-c.patch → ...er-target-view-clears-through-the-c.patch b/...er-target-view-clears-through-the-c.patch → ...er-target-view-clears-through-the-c.patch
diff --git a/...75-wined3d-Wait-for-the-CS-in-GetDC.patch → ...76-wined3d-Wait-for-the-CS-in-GetDC.patch b/...75-wined3d-Wait-for-the-CS-in-GetDC.patch → ...76-wined3d-Wait-for-the-CS-in-GetDC.patch
diff --git a/...urce-maps-through-the-command-strea.patch → ...urce-maps-through-the-command-strea.patch b/...urce-maps-through-the-command-strea.patch → ...urce-maps-through-the-command-strea.patch
diff --git a/...d-of-the-end_scene-flush-and-finish.patch → ...d-of-the-end_scene-flush-and-finish.patch b/...d-of-the-end_scene-flush-and-finish.patch → ...d-of-the-end_scene-flush-and-finish.patch
diff --git a/...-the-linked-lists-with-a-ringbuffer.patch → ...-the-linked-lists-with-a-ringbuffer.patch b/...-the-linked-lists-with-a-ringbuffer.patch → ...-the-linked-lists-with-a-ringbuffer.patch
diff --git a/...ed3d-Don-t-preload-buffers-on-unmap.patch → ...ed3d-Don-t-preload-buffers-on-unmap.patch b/...ed3d-Don-t-preload-buffers-on-unmap.patch → ...ed3d-Don-t-preload-buffers-on-unmap.patch
diff --git a/...Don-t-call-glFinish-before-swapping.patch → ...Don-t-call-glFinish-before-swapping.patch b/...Don-t-call-glFinish-before-swapping.patch → ...Don-t-call-glFinish-before-swapping.patch
diff --git a/...d-wined3d_-_query_issue-never-fails.patch → ...d-wined3d_-_query_issue-never-fails.patch b/...d-wined3d_-_query_issue-never-fails.patch → ...d-wined3d_-_query_issue-never-fails.patch
diff --git a/...query-support-to-the-command-stream.patch → ...query-support-to-the-command-stream.patch b/...query-support-to-the-command-stream.patch → ...query-support-to-the-command-stream.patch
diff --git a/...-CS-state-to-find-out-if-a-query-is.patch → ...-CS-state-to-find-out-if-a-query-is.patch b/...-CS-state-to-find-out-if-a-query-is.patch → ...-CS-state-to-find-out-if-a-query-is.patch
diff --git a/...oll-queries-automatically-in-the-CS.patch → ...oll-queries-automatically-in-the-CS.patch b/...oll-queries-automatically-in-the-CS.patch → ...oll-queries-automatically-in-the-CS.patch
diff --git a/...-a-separate-queue-for-priority-comm.patch → ...-a-separate-queue-for-priority-comm.patch b/...-a-separate-queue-for-priority-comm.patch → ...-a-separate-queue-for-priority-comm.patch
diff --git a/...ed3d-Destroy-queries-through-the-CS.patch → ...ed3d-Destroy-queries-through-the-CS.patch b/...ed3d-Destroy-queries-through-the-CS.patch → ...ed3d-Destroy-queries-through-the-CS.patch
diff --git a/...-main-and-worker-thread-query-state.patch → ...-main-and-worker-thread-query-state.patch b/...-main-and-worker-thread-query-state.patch → ...-main-and-worker-thread-query-state.patch
diff --git a/...t-poll-queries-that-failed-to-start.patch → ...t-poll-queries-that-failed-to-start.patch b/...t-poll-queries-that-failed-to-start.patch → ...t-poll-queries-that-failed-to-start.patch
diff --git a/...restated-queries-from-the-poll-list.patch → ...restated-queries-from-the-poll-list.patch b/...restated-queries-from-the-poll-list.patch → ...restated-queries-from-the-poll-list.patch
diff --git a/...et-the-query-state-if-it-doesn-t-ha.patch → ...et-the-query-state-if-it-doesn-t-ha.patch b/...et-the-query-state-if-it-doesn-t-ha.patch → ...et-the-query-state-if-it-doesn-t-ha.patch
diff --git a/...-Put-this-into-the-query-poll-patch.patch → ...-Put-this-into-the-query-poll-patch.patch b/...-Put-this-into-the-query-poll-patch.patch → ...-Put-this-into-the-query-poll-patch.patch
diff --git a/...end-texture-preloads-through-the-CS.patch → ...end-texture-preloads-through-the-CS.patch b/...end-texture-preloads-through-the-CS.patch → ...end-texture-preloads-through-the-CS.patch
diff --git a/...update_texture-calls-through-the-CS.patch → ...update_texture-calls-through-the-CS.patch b/...update_texture-calls-through-the-CS.patch → ...update_texture-calls-through-the-CS.patch
diff --git a/...of-the-surface_upload_data-glFinish.patch → ...of-the-surface_upload_data-glFinish.patch b/...of-the-surface_upload_data-glFinish.patch → ...of-the-surface_upload_data-glFinish.patch
diff --git a/...k-the-src-volume-in-device_update_v.patch → ...k-the-src-volume-in-device_update_v.patch b/...k-the-src-volume-in-device_update_v.patch → ...k-the-src-volume-in-device_update_v.patch
diff --git a/...it_managed_resources-through-the-CS.patch → ...it_managed_resources-through-the-CS.patch b/...it_managed_resources-through-the-CS.patch → ...it_managed_resources-through-the-CS.patch
diff --git a/...-wined3d-Introduce-resource-fencing.patch → ...-wined3d-Introduce-resource-fencing.patch b/...-wined3d-Introduce-resource-fencing.patch → ...-wined3d-Introduce-resource-fencing.patch
diff --git a/...ate_texture-and-update_surface-call.patch → ...ate_texture-and-update_surface-call.patch b/...ate_texture-and-update_surface-call.patch → ...ate_texture-and-update_surface-call.patch
diff --git a/...-wined3d-Dirtify-resources-on-unmap.patch → ...-wined3d-Dirtify-resources-on-unmap.patch b/...-wined3d-Dirtify-resources-on-unmap.patch → ...-wined3d-Dirtify-resources-on-unmap.patch
diff --git a/...ined3d-Fence-texture-reads-in-draws.patch → ...ined3d-Fence-texture-reads-in-draws.patch b/...ined3d-Fence-texture-reads-in-draws.patch → ...ined3d-Fence-texture-reads-in-draws.patch
diff --git a/...e-render-targets-and-depth-stencils.patch → ...e-render-targets-and-depth-stencils.patch b/...e-render-targets-and-depth-stencils.patch → ...e-render-targets-and-depth-stencils.patch
diff --git a/.../0102-wined3d-Fence-blit-operations.patch → .../0103-wined3d-Fence-blit-operations.patch b/.../0102-wined3d-Fence-blit-operations.patch → .../0103-wined3d-Fence-blit-operations.patch
diff --git a/...wined3d-Fence-color_fill-operations.patch → ...wined3d-Fence-color_fill-operations.patch b/...wined3d-Fence-color_fill-operations.patch → ...wined3d-Fence-color_fill-operations.patch
diff --git a/...Main/0104-wined3d-Fence-clear-calls.patch → ...Main/0105-wined3d-Fence-clear-calls.patch b/...Main/0104-wined3d-Fence-clear-calls.patch → ...Main/0105-wined3d-Fence-clear-calls.patch
diff --git a/...in/0105-wined3d-Fence-present-calls.patch → ...in/0106-wined3d-Fence-present-calls.patch b/...in/0105-wined3d-Fence-present-calls.patch → ...in/0106-wined3d-Fence-present-calls.patch
diff --git a/...urce-maps-and-unmaps-a-priority-com.patch → ...urce-maps-and-unmaps-a-priority-com.patch b/...urce-maps-and-unmaps-a-priority-com.patch → ...urce-maps-and-unmaps-a-priority-com.patch
diff --git a/...hanged-textures-through-the-command.patch → ...hanged-textures-through-the-command.patch b/...hanged-textures-through-the-command.patch → ...hanged-textures-through-the-command.patch
diff --git a/...-wined3d-Wrap-GL-BOs-in-a-structure.patch → ...-wined3d-Wrap-GL-BOs-in-a-structure.patch b/...-wined3d-Wrap-GL-BOs-in-a-structure.patch → ...-wined3d-Wrap-GL-BOs-in-a-structure.patch
diff --git a/...arate-resource-map-and-draw-buffers.patch → ...arate-resource-map-and-draw-buffers.patch b/...arate-resource-map-and-draw-buffers.patch → ...arate-resource-map-and-draw-buffers.patch
diff --git a/...-DISCARD-resource-maps-with-buffers.patch → ...-DISCARD-resource-maps-with-buffers.patch b/...-DISCARD-resource-maps-with-buffers.patch → ...-DISCARD-resource-maps-with-buffers.patch
diff --git a/...-DISCARD-resource-maps-with-heap-me.patch → ...-DISCARD-resource-maps-with-heap-me.patch b/...-DISCARD-resource-maps-with-heap-me.patch → ...-DISCARD-resource-maps-with-heap-me.patch
diff --git a/...-some-objects-in-state_init_default.patch → ...-some-objects-in-state_init_default.patch b/...-some-objects-in-state_init_default.patch → ...-some-objects-in-state_init_default.patch
diff --git a/...uest-the-frontbuffer-to-create-dumm.patch → ...uest-the-frontbuffer-to-create-dumm.patch b/...uest-the-frontbuffer-to-create-dumm.patch → ...uest-the-frontbuffer-to-create-dumm.patch
diff --git a/...e-buffered-buffers-for-multithreade.patch → ...e-buffered-buffers-for-multithreade.patch b/...e-buffered-buffers-for-multithreade.patch → ...e-buffered-buffers-for-multithreade.patch
diff --git a/...synchronize-NOOVERWRITE-buffer-maps.patch → ...synchronize-NOOVERWRITE-buffer-maps.patch b/...synchronize-NOOVERWRITE-buffer-maps.patch → ...synchronize-NOOVERWRITE-buffer-maps.patch
diff --git a/...buffer-map-write-and-draw-read-memo.patch → ...buffer-map-write-and-draw-read-memo.patch b/...buffer-map-write-and-draw-read-memo.patch → ...buffer-map-write-and-draw-read-memo.patch
diff --git a/...ed3d-Accelerate-DISCARD-buffer-maps.patch → ...ed3d-Accelerate-DISCARD-buffer-maps.patch b/...ed3d-Accelerate-DISCARD-buffer-maps.patch → ...ed3d-Accelerate-DISCARD-buffer-maps.patch
diff --git a/...d3d-Accelerate-READONLY-buffer-maps.patch → ...d3d-Accelerate-READONLY-buffer-maps.patch b/...d3d-Accelerate-READONLY-buffer-maps.patch → ...d3d-Accelerate-READONLY-buffer-maps.patch
diff --git a/...e-buffer-dirty-areas-through-the-CS.patch → ...e-buffer-dirty-areas-through-the-CS.patch b/...e-buffer-dirty-areas-through-the-CS.patch → ...e-buffer-dirty-areas-through-the-CS.patch
diff --git a/...buffer-resource.map_count-in-the-CS.patch → ...buffer-resource.map_count-in-the-CS.patch b/...buffer-resource.map_count-in-the-CS.patch → ...buffer-resource.map_count-in-the-CS.patch
diff --git a/...Send-buffer-preloads-through-the-CS.patch → ...Send-buffer-preloads-through-the-CS.patch b/...Send-buffer-preloads-through-the-CS.patch → ...Send-buffer-preloads-through-the-CS.patch
diff --git a/...ferSubData-instead-of-glMapBufferRa.patch → ...ferSubData-instead-of-glMapBufferRa.patch b/...ferSubData-instead-of-glMapBufferRa.patch → ...ferSubData-instead-of-glMapBufferRa.patch
diff --git a/...GL-buffer-discard-control-from-igno.patch → ...GL-buffer-discard-control-from-igno.patch b/...GL-buffer-discard-control-from-igno.patch → ...GL-buffer-discard-control-from-igno.patch
diff --git a/...-Create-buffers-before-mapping-them.patch → ...-Create-buffers-before-mapping-them.patch b/...-Create-buffers-before-mapping-them.patch → ...-Create-buffers-before-mapping-them.patch
diff --git a/...ined3d-Destroy-views-through-the-CS.patch → ...ined3d-Destroy-views-through-the-CS.patch b/...ined3d-Destroy-views-through-the-CS.patch → ...ined3d-Destroy-views-through-the-CS.patch
diff --git a/...126-wined3d-Remove-another-glFinish.patch → ...127-wined3d-Remove-another-glFinish.patch b/...126-wined3d-Remove-another-glFinish.patch → ...127-wined3d-Remove-another-glFinish.patch
diff --git a/...-vertex-declarations-through-the-CS.patch → ...-vertex-declarations-through-the-CS.patch b/...-vertex-declarations-through-the-CS.patch → ...-vertex-declarations-through-the-CS.patch
diff --git a/...ed3d-Destroy-shaders-through-the-CS.patch → ...ed3d-Destroy-shaders-through-the-CS.patch b/...ed3d-Destroy-shaders-through-the-CS.patch → ...ed3d-Destroy-shaders-through-the-CS.patch
diff --git a/...ate-VBOs-through-the-command-stream.patch → ...ate-VBOs-through-the-command-stream.patch b/...ate-VBOs-through-the-command-stream.patch → ...ate-VBOs-through-the-command-stream.patch
diff --git a/...ean-up-resource-data-through-the-CS.patch → ...ean-up-resource-data-through-the-CS.patch b/...ean-up-resource-data-through-the-CS.patch → ...ean-up-resource-data-through-the-CS.patch
diff --git a/...buffer-resource-data-through-the-CS.patch → ...buffer-resource-data-through-the-CS.patch b/...buffer-resource-data-through-the-CS.patch → ...buffer-resource-data-through-the-CS.patch
diff --git a/...volume-resource-data-through-the-CS.patch → ...volume-resource-data-through-the-CS.patch b/...volume-resource-data-through-the-CS.patch → ...volume-resource-data-through-the-CS.patch
diff --git a/...3d-Clean-up-surfaces-through-the-cs.patch → ...3d-Clean-up-surfaces-through-the-cs.patch b/...3d-Clean-up-surfaces-through-the-cs.patch → ...3d-Clean-up-surfaces-through-the-cs.patch
diff --git a/...up-texture-resources-through-the-cs.patch → ...up-texture-resources-through-the-cs.patch b/...up-texture-resources-through-the-cs.patch → ...up-texture-resources-through-the-cs.patch
diff --git a/...sources-through-the-CS-in-uninit_3d.patch → ...sources-through-the-CS-in-uninit_3d.patch b/...sources-through-the-CS-in-uninit_3d.patch → ...sources-through-the-CS-in-uninit_3d.patch
diff --git a/...sources-through-the-CS-in-device_re.patch → ...sources-through-the-CS-in-device_re.patch b/...sources-through-the-CS-in-device_re.patch → ...sources-through-the-CS-in-device_re.patch
diff --git a/...-glFinish-after-a-depth-buffer-blit.patch → ...-glFinish-after-a-depth-buffer-blit.patch b/...-glFinish-after-a-depth-buffer-blit.patch → ...-glFinish-after-a-depth-buffer-blit.patch
diff --git a/...ed3d-Remove-software-cursor-support.patch → ...ed3d-Remove-software-cursor-support.patch b/...ed3d-Remove-software-cursor-support.patch → ...ed3d-Remove-software-cursor-support.patch
diff --git a/...reate-dummy-textures-through-the-CS.patch → ...reate-dummy-textures-through-the-CS.patch b/...reate-dummy-textures-through-the-CS.patch → ...reate-dummy-textures-through-the-CS.patch
diff --git a/...-the-initial-context-through-the-CS.patch → ...-the-initial-context-through-the-CS.patch b/...-the-initial-context-through-the-CS.patch → ...-the-initial-context-through-the-CS.patch
diff --git a/...ctx-and-dummy-textures-through-the-.patch → ...ctx-and-dummy-textures-through-the-.patch b/...ctx-and-dummy-textures-through-the-.patch → ...ctx-and-dummy-textures-through-the-.patch
diff --git a/...NED3D_MAP_NO_DIRTY_UPDATE-in-resour.patch → ...NED3D_MAP_NO_DIRTY_UPDATE-in-resour.patch b/...NED3D_MAP_NO_DIRTY_UPDATE-in-resour.patch → ...NED3D_MAP_NO_DIRTY_UPDATE-in-resour.patch
diff --git a/...GL-contexts-through-the-CS-in-reset.patch → ...GL-contexts-through-the-CS-in-reset.patch b/...GL-contexts-through-the-CS-in-reset.patch → ...GL-contexts-through-the-CS-in-reset.patch
diff --git a/...-contexts-through-the-CS-in-uninit_.patch → ...-contexts-through-the-CS-in-uninit_.patch b/...-contexts-through-the-CS-in-uninit_.patch → ...-contexts-through-the-CS-in-uninit_.patch
diff --git a/...rface_unload-through-the-CS-in-wine.patch → ...rface_unload-through-the-CS-in-wine.patch b/...rface_unload-through-the-CS-in-wine.patch → ...rface_unload-through-the-CS-in-wine.patch
diff --git a/...ent-to-block-the-worker-thread-when.patch → ...ent-to-block-the-worker-thread-when.patch b/...ent-to-block-the-worker-thread-when.patch → ...ent-to-block-the-worker-thread-when.patch
diff --git a/...47-wined3d-Fence-preload-operations.patch → ...48-wined3d-Fence-preload-operations.patch b/...47-wined3d-Fence-preload-operations.patch → ...48-wined3d-Fence-preload-operations.patch
diff --git a/...K_NO_DIRTY_UPDATE-on-managed-textur.patch → ...K_NO_DIRTY_UPDATE-on-managed-textur.patch b/...K_NO_DIRTY_UPDATE-on-managed-textur.patch → ...K_NO_DIRTY_UPDATE-on-managed-textur.patch
diff --git a/...K_NO_DIRTY_UPDATE-on-managed-textur.patch → ...K_NO_DIRTY_UPDATE-on-managed-textur.patch b/...K_NO_DIRTY_UPDATE-on-managed-textur.patch → ...K_NO_DIRTY_UPDATE-on-managed-textur.patch
diff --git a/...Completely-reset-the-state-on-reset.patch → ...Completely-reset-the-state-on-reset.patch b/...Completely-reset-the-state-on-reset.patch → ...Completely-reset-the-state-on-reset.patch
diff --git a/...c-and-releasedc-through-the-command.patch → ...c-and-releasedc-through-the-command.patch b/...c-and-releasedc-through-the-command.patch → ...c-and-releasedc-through-the-command.patch
diff --git a/...eap_memory-NULL-when-allocating-a-P.patch → ...eap_memory-NULL-when-allocating-a-P.patch b/...eap_memory-NULL-when-allocating-a-P.patch → ...eap_memory-NULL-when-allocating-a-P.patch
diff --git a/...Wait-only-for-the-buffer-to-be-idle.patch → ...Wait-only-for-the-buffer-to-be-idle.patch b/...Wait-only-for-the-buffer-to-be-idle.patch → ...Wait-only-for-the-buffer-to-be-idle.patch
diff --git a/...d-a-comment-about-worker-thread-lag.patch → ...d-a-comment-about-worker-thread-lag.patch b/...d-a-comment-about-worker-thread-lag.patch → ...d-a-comment-about-worker-thread-lag.patch
diff --git a/...Remove-the-texture-destroy-glFinish.patch → ...Remove-the-texture-destroy-glFinish.patch b/...Remove-the-texture-destroy-glFinish.patch → ...Remove-the-texture-destroy-glFinish.patch
diff --git a/...-destruction-into-the-worker-thread.patch → ...-destruction-into-the-worker-thread.patch b/...-destruction-into-the-worker-thread.patch → ...-destruction-into-the-worker-thread.patch
diff --git a/...ref-decref-textures-in-color-depth-.patch → ...ref-decref-textures-in-color-depth-.patch b/...ref-decref-textures-in-color-depth-.patch → ...ref-decref-textures-in-color-depth-.patch
diff --git a/...158-Winex11-complain-about-glfinish.patch → ...159-Winex11-complain-about-glfinish.patch b/...158-Winex11-complain-about-glfinish.patch → ...159-Winex11-complain-about-glfinish.patch
diff --git a/...-the-new-window-is-set-up-before-se.patch → ...-the-new-window-is-set-up-before-se.patch b/...-the-new-window-is-set-up-before-se.patch → ...-the-new-window-is-set-up-before-se.patch
diff --git a/...move-the-device_reset-CS-sync-fixme.patch → ...move-the-device_reset-CS-sync-fixme.patch b/...move-the-device_reset-CS-sync-fixme.patch → ...move-the-device_reset-CS-sync-fixme.patch
diff --git a/...PLE_flush_buffer_range-syncing-back.patch → ...PLE_flush_buffer_range-syncing-back.patch b/...PLE_flush_buffer_range-syncing-back.patch → ...PLE_flush_buffer_range-syncing-back.patch
diff --git a/...the-resource-to-be-idle-when-destro.patch → ...the-resource-to-be-idle-when-destro.patch b/...the-resource-to-be-idle-when-destro.patch → ...the-resource-to-be-idle-when-destro.patch
diff --git a/...n-t-sync-on-redundant-discard-calls.patch → ...n-t-sync-on-redundant-discard-calls.patch b/...n-t-sync-on-redundant-discard-calls.patch → ...n-t-sync-on-redundant-discard-calls.patch
diff --git a/...4-wined3d-Don-t-discard-new-buffers.patch → ...5-wined3d-Don-t-discard-new-buffers.patch b/...4-wined3d-Don-t-discard-new-buffers.patch → ...5-wined3d-Don-t-discard-new-buffers.patch
diff --git a/...-to-sync-VBOs-manually-on-OSX-with-.patch → ...-to-sync-VBOs-manually-on-OSX-with-.patch b/...-to-sync-VBOs-manually-on-OSX-with-.patch → ...-to-sync-VBOs-manually-on-OSX-with-.patch
diff --git a/...166-wined3d-Render-target-lock-hack.patch → ...167-wined3d-Render-target-lock-hack.patch b/...166-wined3d-Render-target-lock-hack.patch → ...167-wined3d-Render-target-lock-hack.patch
diff --git a/...ling-wined3d_surface_blt-from-surfa.patch → ...ling-wined3d_surface_blt-from-surfa.patch b/...ling-wined3d_surface_blt-from-surfa.patch → ...ling-wined3d_surface_blt-from-surfa.patch
diff --git a/...nly-discard-buffers-that-are-in-use.patch → ...nly-discard-buffers-that-are-in-use.patch b/...nly-discard-buffers-that-are-in-use.patch → ...nly-discard-buffers-that-are-in-use.patch
diff --git a/...samplers-through-the-command-stream.patch → ...samplers-through-the-command-stream.patch b/...samplers-through-the-command-stream.patch → ...samplers-through-the-command-stream.patch
diff --git a/...k-to-reject-unsupported-color-fills.patch → ...k-to-reject-unsupported-color-fills.patch b/...k-to-reject-unsupported-color-fills.patch → ...k-to-reject-unsupported-color-fills.patch
diff --git a/...-buffer-map-array-before-mapping-th.patch → ...-buffer-map-array-before-mapping-th.patch b/...-buffer-map-array-before-mapping-th.patch → ...-buffer-map-array-before-mapping-th.patch
diff --git a/...te_sub_resource-calls-through-the-c.patch → ...te_sub_resource-calls-through-the-c.patch b/...te_sub_resource-calls-through-the-c.patch → ...te_sub_resource-calls-through-the-c.patch
diff --git a/patches/wined3d-CSMT_Main/9999-IfDefined.patch b/patches/wined3d-CSMT_Main/9999-IfDefined.patch
diff --git a/patches/wined3d-CSMT_Main/definition b/patches/wined3d-CSMT_Main/definition
@@ -5,6 +5,7 @@ Fixes: [11674] Support for CSMT (command stream) to increase graphic performance
 Apply-After: dlls/wined3d/*
 Depends: wined3d-CSMT_Helper
 IfDefined: STAGING_CSMT
+Disabled: true
 
 # Known issues:
 # https://bugs.wine-staging.com/buglist.cgi?component=Bugs&keywords=csmt%2C%20&keywords_type=allwords&list_id=3690&query_format=advanced&resolution=---
diff --git a/patches/wpcap-Dynamic_Linking/0001-wpcap-Load-libpcap-dynamically.patch b/patches/wpcap-Dynamic_Linking/0001-wpcap-Load-libpcap-dynamically.patch
@@ -1,21 +1,21 @@
-From b5186872d7485ef90c957e855af6a2124fc40834 Mon Sep 17 00:00:00 2001
+From 1fee677cce6255628039d2e6b9e9fc12e57b998c Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andr=C3=A9=20Hentschel?= <nerv@dawncrow.de>
 Date: Tue, 26 Aug 2014 00:59:37 +0200
 Subject: wpcap: Load libpcap dynamically.
 
 This is intended for packagers, without this patch libpcap easily becomes a fixed dependency of wine.
 Something we don't want i guess.
 ---
- configure.ac           |   6 +-
+ configure.ac           |   4 +-
  dlls/wpcap/Makefile.in |   1 -
  dlls/wpcap/wpcap.c     | 171 +++++++++++++++++++++++++++++++++++++++----------
- 3 files changed, 140 insertions(+), 38 deletions(-)
+ 3 files changed, 139 insertions(+), 37 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 811e2aa..30b500a 100644
+index 1e6bba3..f0a3b55 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1182,11 +1182,11 @@ test "x$ac_cv_lib_OpenCL_clGetPlatformInfo" != xyes && enable_opencl=${enable_op
+@@ -1174,9 +1174,9 @@ WINE_NOTICE_WITH(opencl,[test "x$ac_cv_lib_OpenCL_clGetPlatformInfo" != xyes],
  dnl **** Check for libpcap ****
  if test "$ac_cv_header_pcap_pcap_h" = "yes"
  then
@@ -24,11 +24,8 @@ index 811e2aa..30b500a 100644
  fi
 -WINE_NOTICE_WITH(pcap,[test "x$ac_cv_lib_pcap_pcap_create" != xyes],
 +WINE_NOTICE_WITH(pcap,[test "x$ac_cv_lib_soname_pcap" = "x"],
-                  [pcap ${notice_platform}development files not found, wpcap won't be supported.])
--test "x$ac_cv_lib_pcap_pcap_create" != xyes && enable_wpcap=${enable_wpcap:-no}
-+test "x$ac_cv_lib_soname_pcap" = "x" && enable_wpcap=${enable_wpcap:-no}
-
- dnl **** Check for libxml2 ****
+                  [pcap ${notice_platform}development files not found, wpcap won't be supported.],
+                  [enable_wpcap])
 
 diff --git a/dlls/wpcap/Makefile.in b/dlls/wpcap/Makefile.in
 index 91b4a95..aeef71a 100644