Rebase against 84cae8c3ea2614fce65d5d499159de9d530444ef.

[ntdll-x86_64_set_cpu_context]
Removed patch to allow to set debug registers separately in NtSetContextThread
(accepted upstream).

patches/wined3d-CSMT_Main/0006-wined3d-Move-surface-locations-into-the-resource.patch

@@ -1,4 +1,4 @@
-From 5fd25633a2e78ad336af898e466f4afc2e2ab1a0 Mon Sep 17 00:00:00 2001
+From 188253a48866f5120620f71087ace68b16e8ab10 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Stefan=20D=C3=B6singer?= <stefan@codeweavers.com>
 Date: Tue, 21 Jan 2014 12:22:30 +0100
 Subject: wined3d: Move surface locations into the resource.
@@ -60,7 +60,7 @@ index 3761830..943a829 100644
              else
                  SetRectEmpty(&current_rect);
 diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
-index 94934a5..c971031 100644
+index 51cf4f7..8611f9c 100644
 --- a/dlls/wined3d/surface.c
 +++ b/dlls/wined3d/surface.c
 @@ -556,7 +556,7 @@ static void surface_prepare_system_memory(struct wined3d_surface *surface)
@@ -153,15 +153,14 @@ index 94934a5..c971031 100644
      {
          w = surface->ds_current_size.cx;
          h = surface->ds_current_size.cy;
-@@ -3810,21 +3811,21 @@ void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_co
-         return;
+@@ -3811,20 +3812,20 @@ void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_co
      }
  
+     wined3d_surface_prepare(surface, context, location);
 -    if (surface->locations & WINED3D_LOCATION_DISCARDED)
 +    if (surface->resource.locations & WINED3D_LOCATION_DISCARDED)
      {
          TRACE("Surface was discarded, no need copy data.\n");
-         wined3d_surface_prepare(surface, context, location);
 -        surface->locations &= ~WINED3D_LOCATION_DISCARDED;
 -        surface->locations |= location;
 +        surface->resource.locations &= ~WINED3D_LOCATION_DISCARDED;
@@ -414,10 +413,10 @@ index 94934a5..c971031 100644
                  /* Upload */
                  if (scale)
 diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
-index 93ede78..91a5495 100644
+index 6e55345..d174690 100644
 --- a/dlls/wined3d/wined3d_private.h
 +++ b/dlls/wined3d/wined3d_private.h
-@@ -2409,7 +2409,6 @@ struct wined3d_surface
+@@ -2410,7 +2410,6 @@ struct wined3d_surface
      const struct wined3d_surface_ops *surface_ops;
      struct wined3d_texture *container;
      void *user_memory;
@@ -426,5 +425,5 @@ index 93ede78..91a5495 100644
      DWORD flags;
  
 -- 
-2.6.2
+2.7.1