Rebase against f820c0942854c14fcd063c83225af03e73286334.

[dinput-DIPROP_USERNAME]
Removed patch to implement dinput device property DIPROP_USERNAME (accepted
upstream).

[kernel32-CreateFileA]
Removed patch to check for invalid filename pointers in CreateFileA in Win 9x
mode (accepted upstream).

[kernel32-ERROR_DLL_NOT_FOUND]
Removed patch to set ERROR_DLL_NOT_FOUND as error code for Win 9X instead of
ERROR_MOD_NOT_FOUND in load_library (accepted upstream).

[kernel32-GetOverlappedResult]
Removed patch to fix handling of GetOverlappedResult when status remains
STATUS_PENDING (accepted upstream).

[setupapi-SetupDiSetDeviceInstallParamsW]
Removed patch to add stub for setupapi.SetupDiSetDeviceInstallParamsW
(accepted upstream).

[user32-EnumDisplayMonitors]
Removed patch to set %ecx to address of rect in EnumDisplayMonitors callback
(accepted upstream).

patches/wined3d-resource_map/0001-wined3d-Rename-wined3d_resource_-un-map-to-wined3d_r.patch

@@ -1,4 +1,4 @@
-From 5163b8b210cd569b06937be135140e393faa4661 Mon Sep 17 00:00:00 2001
+From 0c9c1b424f62d37107a26397a0c8a29cf985abac Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Wed, 4 Nov 2015 19:31:30 +0100
 Subject: wined3d: Rename wined3d_resource_(un)map to
@@ -227,10 +227,10 @@ index 83457fc..7f51a1d 100644
  
          if (src_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_MIPMAP)
 diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
-index a9b9f0d..b772a9b 100644
+index ef8095f..9539e9c 100644
 --- a/dlls/wined3d/device.c
 +++ b/dlls/wined3d/device.c
-@@ -3561,7 +3561,7 @@ static HRESULT wined3d_device_update_texture_3d(struct wined3d_device *device,
+@@ -3570,7 +3570,7 @@ static HRESULT wined3d_device_update_texture_3d(struct wined3d_device *device,
  
      for (i = 0; i < level_count; ++i)
      {
@@ -239,16 +239,16 @@ index a9b9f0d..b772a9b 100644
                  src_level + i, &src, NULL, WINED3D_MAP_READONLY)))
              goto done;
  
-@@ -3570,7 +3570,7 @@ static HRESULT wined3d_device_update_texture_3d(struct wined3d_device *device,
+@@ -3579,7 +3579,7 @@ static HRESULT wined3d_device_update_texture_3d(struct wined3d_device *device,
          wined3d_volume_upload_data(dst_texture->sub_resources[i].u.volume, context, &data);
-         wined3d_volume_invalidate_location(dst_texture->sub_resources[i].u.volume, ~WINED3D_LOCATION_TEXTURE_RGB);
+         wined3d_texture_invalidate_location(dst_texture, i, ~WINED3D_LOCATION_TEXTURE_RGB);
  
 -        if (FAILED(hr = wined3d_resource_unmap(&src_texture->resource, src_level + i)))
 +        if (FAILED(hr = wined3d_resource_sub_resource_unmap(&src_texture->resource, src_level + i)))
              goto done;
      }
  
-@@ -4282,7 +4282,7 @@ static struct wined3d_texture *wined3d_device_create_cursor_texture(struct wined
+@@ -4291,7 +4291,7 @@ static struct wined3d_texture *wined3d_device_create_cursor_texture(struct wined
      struct wined3d_texture *texture;
      HRESULT hr;
  
@@ -257,7 +257,7 @@ index a9b9f0d..b772a9b 100644
      {
          ERR("Failed to map source texture.\n");
          return NULL;
-@@ -4305,7 +4305,7 @@ static struct wined3d_texture *wined3d_device_create_cursor_texture(struct wined
+@@ -4314,7 +4314,7 @@ static struct wined3d_texture *wined3d_device_create_cursor_texture(struct wined
  
      hr = wined3d_texture_create(device, &desc, 1, WINED3D_TEXTURE_CREATE_MAPPABLE,
              &data, NULL, &wined3d_null_parent_ops, &texture);
@@ -266,7 +266,7 @@ index a9b9f0d..b772a9b 100644
      if (FAILED(hr))
      {
          ERR("Failed to create cursor texture.\n");
-@@ -4386,7 +4386,7 @@ HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device
+@@ -4395,7 +4395,7 @@ HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device
              return E_OUTOFMEMORY;
          memset(mask_bits, 0xff, mask_size);
  
@@ -275,7 +275,7 @@ index a9b9f0d..b772a9b 100644
                  WINED3D_MAP_NO_DIRTY_UPDATE | WINED3D_MAP_READONLY);
          cursor_info.fIcon = FALSE;
          cursor_info.xHotspot = x_hotspot;
-@@ -4395,7 +4395,7 @@ HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device
+@@ -4404,7 +4404,7 @@ HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device
                  cursor_image->resource.height, 1, 1, mask_bits);
          cursor_info.hbmColor = CreateBitmap(cursor_image->resource.width,
                  cursor_image->resource.height, 1, 32, map_desc.data);
@@ -307,10 +307,10 @@ index 423d162..0821fde 100644
      TRACE("resource %p, sub_resource_idx %u.\n", resource, sub_resource_idx);
  
 diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
-index abbab26..4b17d32 100644
+index 6d0e147..8b13a2f 100644
 --- a/dlls/wined3d/surface.c
 +++ b/dlls/wined3d/surface.c
-@@ -1759,25 +1759,25 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr
+@@ -1760,25 +1760,25 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr
      memset(&src_map, 0, sizeof(src_map));
      memset(&dst_map, 0, sizeof(dst_map));
  
@@ -341,7 +341,7 @@ index abbab26..4b17d32 100644
  
      return dst_texture;
  }
-@@ -3683,7 +3683,7 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int
+@@ -3669,7 +3669,7 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int
      if (src_texture == dst_texture && src_sub_resource_idx == dst_sub_resource_idx)
      {
          same_sub_resource = TRUE;
@@ -350,7 +350,7 @@ index abbab26..4b17d32 100644
          src_map = dst_map;
          src_format = dst_texture->resource.format;
          dst_format = src_format;
-@@ -3708,7 +3708,7 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int
+@@ -3694,7 +3694,7 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int
                  src_texture = converted_texture;
                  src_sub_resource_idx = 0;
              }
@@ -359,7 +359,7 @@ index abbab26..4b17d32 100644
              src_format = src_texture->resource.format;
              src_fmt_flags = src_texture->resource.format_flags;
          }
-@@ -3718,7 +3718,7 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int
+@@ -3704,7 +3704,7 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int
              src_fmt_flags = dst_fmt_flags;
          }
  
@@ -368,7 +368,7 @@ index abbab26..4b17d32 100644
      }
  
      bpp = dst_format->byte_count;
-@@ -4134,9 +4134,9 @@ error:
+@@ -4120,9 +4120,9 @@ error:
          FIXME("    Unsupported flags %#x.\n", flags);
  
  release:
@@ -398,10 +398,10 @@ index 21cb0db..cfdc1c6 100644
  @ cdecl wined3d_rendertarget_view_create(ptr ptr ptr ptr ptr)
  @ cdecl wined3d_rendertarget_view_create_from_sub_resource(ptr long ptr ptr ptr)
 diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
-index cb057ab..cc35a2a 100644
+index 9bdd16d..88cddc2 100644
 --- a/include/wine/wined3d.h
 +++ b/include/wine/wined3d.h
-@@ -2348,11 +2348,11 @@ void __cdecl wined3d_resource_get_desc(const struct wined3d_resource *resource,
+@@ -2360,11 +2360,11 @@ void __cdecl wined3d_resource_get_desc(const struct wined3d_resource *resource,
          struct wined3d_resource_desc *desc);
  void * __cdecl wined3d_resource_get_parent(const struct wined3d_resource *resource);
  DWORD __cdecl wined3d_resource_get_priority(const struct wined3d_resource *resource);