Rebase against upstream changes.

debian/changelog

@@ -2,6 +2,7 @@ wine-staging (1.7.39) UNRELEASED; urgency=low
   * Added patch for tests of RtlIpv6StringToAddress, RtlIpv{4,6}StringToAddressEx (by Mark Jansen).
   * Added patch to fix multithreading issues with fullscreen clipping.
   * Added patch with tests for VerQueryValueA (by Mark Jansen).
+  * Removed patch to avoid hardcoded values for sizeof(GUID) (accepted upstream).
  -- Sebastian Lackner <sebastian@fds-team.de>  Mon, 09 Mar 2015 16:52:35 +0100
 
 wine-staging (1.7.38) unstable; urgency=low

patches/d3dxof-Cleanup/0001-d3dxof-Use-straight-assignement-instead-of-using-mem.patch

@@ -1,44 +0,0 @@
-From d18752b72603e91c7bbbbfa623c83f3d13112ca1 Mon Sep 17 00:00:00 2001
-From: Christian Costa <titan.costa@gmail.com>
-Date: Mon, 22 Oct 2012 21:00:52 +0200
-Subject: d3dxof: Use straight assignement instead of using memcpy with
- hardcoded size.
-
----
- dlls/d3dxof/d3dxof.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c
-index 88647cf..8888d8b 100644
---- a/dlls/d3dxof/d3dxof.c
-+++ b/dlls/d3dxof/d3dxof.c
-@@ -619,7 +619,7 @@ static HRESULT WINAPI IDirectXFileDataImpl_GetId(IDirectXFileData* iface, LPGUID
-   if (!pGuid)
-     return DXFILEERR_BADVALUE;
- 
--  memcpy(pGuid, &This->pobj->class_id, 16);
-+  *pGuid = This->pobj->class_id;
- 
-   return DXFILE_OK;
- }
-@@ -667,7 +667,7 @@ static HRESULT WINAPI IDirectXFileDataImpl_GetType(IDirectXFileData* iface, cons
-   if (!pguid)
-     return DXFILEERR_BADVALUE;
- 
--  memcpy(&guid, &This->pobj->type, 16);
-+  guid = This->pobj->type;
-   *pguid = &guid;
- 
-   return DXFILE_OK;
-@@ -886,7 +886,7 @@ static HRESULT WINAPI IDirectXFileDataReferenceImpl_GetId(IDirectXFileDataRefere
-   if (!pGuid)
-     return DXFILEERR_BADVALUE;
- 
--  memcpy(pGuid, &This->ptarget->class_id, 16);
-+  *pGuid = This->ptarget->class_id;
- 
-   return DXFILE_OK;
- }
--- 
-2.3.0
-

patches/patchinstall.sh

@@ -84,7 +84,6 @@ patch_enable_all ()
 	enable_d3dx9_36_Optimize_Inplace="$1"
 	enable_d3dx9_36_Texture_Align="$1"
 	enable_d3dx9_36_UpdateSkinnedMesh="$1"
-	enable_d3dxof_Cleanup="$1"
 	enable_dbghelp_Debug_Symbols="$1"
 	enable_ddraw_Hotpatch="$1"
 	enable_ddraw_d3d_execute_buffer="$1"
@@ -296,9 +295,6 @@ patch_enable ()
 		d3dx9_36-UpdateSkinnedMesh)
 			enable_d3dx9_36_UpdateSkinnedMesh="$2"
 			;;
-		d3dxof-Cleanup)
-			enable_d3dxof_Cleanup="$2"
-			;;
 		dbghelp-Debug_Symbols)
 			enable_dbghelp_Debug_Symbols="$2"
 			;;
@@ -1551,18 +1547,6 @@ if test "$enable_d3dx9_36_UpdateSkinnedMesh" -eq 1; then
 	) >> "$patchlist"
 fi
 
-# Patchset d3dxof-Cleanup
-# |
-# | Modified files:
-# |   *	dlls/d3dxof/d3dxof.c
-# |
-if test "$enable_d3dxof_Cleanup" -eq 1; then
-	patch_apply d3dxof-Cleanup/0001-d3dxof-Use-straight-assignement-instead-of-using-mem.patch
-	(
-		echo '+    { "Christian Costa", "d3dxof: Use straight assignement instead of using memcpy with hardcoded size.", 1 },';
-	) >> "$patchlist"
-fi
-
 # Patchset dbghelp-Debug_Symbols
 # |
 # | Modified files:
@@ -1647,6 +1631,18 @@ if test "$enable_dxgi_GetDesc" -eq 1; then
 	) >> "$patchlist"
 fi
 
+# Patchset makedep-PARENTSPEC
+# |
+# | Modified files:
+# |   *	tools/makedep.c
+# |
+if test "$enable_makedep_PARENTSPEC" -eq 1; then
+	patch_apply makedep-PARENTSPEC/0001-makedep-Add-support-for-PARENTSPEC-Makefile-variable.patch
+	(
+		echo '+    { "Sebastian Lackner", "makedep: Add support for PARENTSPEC Makefile variable.", 1 },';
+	) >> "$patchlist"
+fi
+
 # Patchset ntdll-DllRedirects
 # |
 # | Modified files:
@@ -1667,18 +1663,6 @@ if test "$enable_ntdll_DllRedirects" -eq 1; then
 	) >> "$patchlist"
 fi
 
-# Patchset makedep-PARENTSPEC
-# |
-# | Modified files:
-# |   *	tools/makedep.c
-# |
-if test "$enable_makedep_PARENTSPEC" -eq 1; then
-	patch_apply makedep-PARENTSPEC/0001-makedep-Add-support-for-PARENTSPEC-Makefile-variable.patch
-	(
-		echo '+    { "Sebastian Lackner", "makedep: Add support for PARENTSPEC Makefile variable.", 1 },';
-	) >> "$patchlist"
-fi
-
 # Patchset wined3d-CSMT_Helper
 # |
 # | Modified files:

patches/wined3d-CSMT_Main/9999-IfDefined.patch

@@ -1204,7 +1204,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);
          }
  
-@@ -7651,7 +7659,11 @@
+@@ -7654,7 +7662,11 @@
  
      /* Now load the surface */
      if (wined3d_settings.offscreen_rendering_mode != ORM_FBO
@@ -1216,7 +1216,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))
      {
-@@ -7681,6 +7693,7 @@
+@@ -7684,6 +7696,7 @@
      /* Leave the opengl state valid for blitting */
      arbfp_blit_unset(context->gl_info);
  
@@ -1224,7 +1224,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
-@@ -7692,6 +7705,17 @@
+@@ -7695,6 +7708,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);

patches/wined3d-Revert_PixelFormat/0002-Revert-wined3d-Track-if-a-context-s-hdc-is-private-s.patch

@@ -1,4 +1,4 @@
-From 65c52a9b806970acd90fc23461373a3df6632c76 Mon Sep 17 00:00:00 2001
+From cb2d95c1590eb4e9e8eb18ad81297d30dc8b9f85 Mon Sep 17 00:00:00 2001
 From: Ken Thomases <ken@codeweavers.com>
 Date: Sun, 14 Sep 2014 19:47:03 -0500
 Subject: Revert "wined3d: Track if a context's hdc is private so we never need
@@ -11,7 +11,7 @@ This reverts commit 272873823e9beff91ea1a62845fc7e5f94a9636f.
  2 files changed, 9 insertions(+), 15 deletions(-)
 
 diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
-index 11c8804..f49c9b9 100644
+index 40b5ef1..0e3d539 100644
 --- a/dlls/wined3d/context.c
 +++ b/dlls/wined3d/context.c
 @@ -797,7 +797,7 @@ static BOOL context_restore_pixel_format(struct wined3d_context *ctx)
@@ -83,7 +83,7 @@ index 11c8804..f49c9b9 100644
  
 @@ -1456,9 +1454,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain,
      {
-         WARN("Failed to retireve device context, trying swapchain backup.\n");
+         WARN("Failed to retrieve device context, trying swapchain backup.\n");
  
 -        if ((hdc = swapchain_get_backup_dc(swapchain)))
 -            hdc_is_private = TRUE;
@@ -110,10 +110,10 @@ index 11c8804..f49c9b9 100644
      ret->needs_set = 1;
  
 diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
-index d98fcae..1c6c345 100644
+index 0b9b767..926f1dc 100644
 --- a/dlls/wined3d/wined3d_private.h
 +++ b/dlls/wined3d/wined3d_private.h
-@@ -1157,9 +1157,8 @@ struct wined3d_context
+@@ -1159,9 +1159,8 @@ struct wined3d_context
      DWORD lowest_disabled_stage : 4;    /* Max MAX_TEXTURES, 8 */
      DWORD rebind_fbo : 1;
      DWORD needs_set : 1;
@@ -125,5 +125,5 @@ index d98fcae..1c6c345 100644
      DWORD constant_update_mask;
      DWORD                   numbered_array_mask;
 -- 
-2.2.1
+2.3.1
 

patches/ws2_32-APC_Performance/0001-ws2_32-Reuse-old-async-ws2_async_io-structures-if-po.patch

@@ -23,8 +23,8 @@ index 5bfdecf..4538948 100644
  {
      /* first free remaining previous fileinfos */
  
--    struct ws2_async_io *io = interlocked_xchg_ptr( (void **)&async_io_freelist, NULL );
-+    struct ws2_async_io *old_io = interlocked_xchg_ptr( (void **)&async_io_freelist, NULL );
+-    struct ws2_async_io *io = InterlockedExchangePointer( (void **)&async_io_freelist, NULL );
++    struct ws2_async_io *old_io = InterlockedExchangePointer( (void **)&async_io_freelist, NULL );
 +    struct ws2_async_io *io = NULL;
  
 -    while (io)