Rebase against 302153117e20b62c9170aed62aa33e83cacfaf59.

patches/msi-MsiGetDatabaseState/0002-msi-tests-Add-custom-action-test-framework-and-check.patch

@@ -1,4 +1,4 @@
-From b75ee56387ae6b9f65041dc7583d4a59bed5e152 Mon Sep 17 00:00:00 2001
+From e2219e6b393f458d41f3b1d98ac7fb86d56aa235 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Wed, 31 May 2017 03:55:24 +0200
 Subject: msi/tests: Add custom action test framework and check
@@ -17,10 +17,10 @@ Subject: msi/tests: Add custom action test framework and check
  create mode 100644 dlls/msi/tests/custom.dll/main.c
 
 diff --git a/configure.ac b/configure.ac
-index 5aaa20c22b6..f44d20c2e69 100644
+index f5a617c1c33..21de7fc3103 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3326,6 +3326,7 @@ WINE_CONFIG_DLL(mshtml,,[clean,implib])
+@@ -3276,6 +3276,7 @@ WINE_CONFIG_DLL(mshtml,,[clean,implib])
  WINE_CONFIG_TEST(dlls/mshtml/tests,[clean])
  WINE_CONFIG_DLL(msi,,[clean,implib])
  WINE_CONFIG_TEST(dlls/msi/tests)
@@ -164,7 +164,7 @@ index 00000000000..91ee2d77b5b
 +    return TRUE;
 +}
 diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c
-index 9d4fecc3eeb..23c1ce6d28c 100644
+index e4290397fe7..f1c1af9f2b6 100644
 --- a/dlls/msi/tests/install.c
 +++ b/dlls/msi/tests/install.c
 @@ -1031,6 +1031,26 @@ static const CHAR uc_install_exec_seq_dat[] = "Action\tCondition\tSequence\n"
@@ -194,8 +194,8 @@ index 9d4fecc3eeb..23c1ce6d28c 100644
  static const char mixed_feature_dat[] =
      "Feature\tFeature_Parent\tTitle\tDescription\tDisplay\tLevel\tDirectory_\tAttributes\n"
      "s38\tS38\tL64\tL255\tI2\ti2\tS72\ti2\n"
-@@ -1939,6 +1959,19 @@ static const msi_table ft_tables[] =
-     ADD_TABLE(property)
+@@ -1973,6 +1993,19 @@ static const msi_table da_tables[] =
+     ADD_TABLE(da_custom_action),
  };
 
 +static const msi_table ca_tables[] =
@@ -214,8 +214,8 @@ index 9d4fecc3eeb..23c1ce6d28c 100644
  /* cabinet definitions */
 
  /* make the max size large so there is only one cab file */
-@@ -6045,6 +6078,186 @@ static void test_feature_tree(void)
-     DeleteFileA( msifile );
+@@ -6100,6 +6133,186 @@ error:
+     DeleteFileA(msifile);
  }
 
 +/* extracts a file from a resource to the specified filename */
@@ -401,14 +401,14 @@ index 9d4fecc3eeb..23c1ce6d28c 100644
  START_TEST(install)
  {
      DWORD len;
-@@ -6133,6 +6346,7 @@ START_TEST(install)
-     test_shared_component();
+@@ -6189,6 +6402,7 @@ START_TEST(install)
      test_remove_upgrade_code();
      test_feature_tree();
+     test_deferred_action();
 +    test_custom_action();
 
      DeleteFileA(log_file);
 
 -- 
-2.13.1
+2.14.1
 

patches/msvcrt-Math_Precision/0001-msvcrt-Calculate-sinh-cosh-exp-pow-with-higher-preci.patch

@@ -1,4 +1,4 @@
-From eed82dcb03b097fe5e35ad02299977c7298c08aa Mon Sep 17 00:00:00 2001
+From 2712050d88f9b75e0b10e845d1ad21809a9d6dae Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Fri, 10 Apr 2015 07:51:16 +0200
 Subject: msvcrt: Calculate sinh/cosh/exp/pow with higher precision. (v2)
@@ -9,7 +9,7 @@ Based on a patch by Zheng Chen.
  1 file changed, 59 insertions(+), 4 deletions(-)
 
 diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c
-index a94c34ac80e..6736f03ec4c 100644
+index 60ce4e659f5..140bf08828b 100644
 --- a/dlls/msvcrt/math.c
 +++ b/dlls/msvcrt/math.c
 @@ -64,6 +64,61 @@ static MSVCRT_matherr_func MSVCRT_default_matherr_func = NULL;
@@ -74,7 +74,7 @@ index a94c34ac80e..6736f03ec4c 100644
  void msvcrt_init_math(void)
  {
      sse2_supported = sse2_enabled = IsProcessorFeaturePresent( PF_XMMI64_INSTRUCTIONS_AVAILABLE );
-@@ -476,7 +531,7 @@ double CDECL MSVCRT_cos( double x )
+@@ -478,7 +533,7 @@ double CDECL MSVCRT_cos( double x )
   */
  double CDECL MSVCRT_cosh( double x )
  {
@@ -83,7 +83,7 @@ index a94c34ac80e..6736f03ec4c 100644
    if (isnan(x)) math_error(_DOMAIN, "cosh", x, 0, ret);
    return ret;
  }
-@@ -486,7 +541,7 @@ double CDECL MSVCRT_cosh( double x )
+@@ -488,7 +543,7 @@ double CDECL MSVCRT_cosh( double x )
   */
  double CDECL MSVCRT_exp( double x )
  {
@@ -92,16 +92,16 @@ index a94c34ac80e..6736f03ec4c 100644
    if (isnan(x)) math_error(_DOMAIN, "exp", x, 0, ret);
    else if (isfinite(x) && !ret) math_error(_UNDERFLOW, "exp", x, 0, ret);
    else if (isfinite(x) && !isfinite(ret)) math_error(_OVERFLOW, "exp", x, 0, ret);
-@@ -531,7 +586,7 @@ double CDECL MSVCRT_log10( double x )
+@@ -532,7 +587,7 @@ double CDECL MSVCRT_log10( double x )
+  */
  double CDECL MSVCRT_pow( double x, double y )
  {
-   /* FIXME: If x < 0 and y is not integral, set EDOM */
 -  double z = pow(x,y);
-+  double z = precise_pow(x, y);
-   if (!isfinite(z)) math_error(_DOMAIN, "pow", x, y, z);
-   return z;
- }
-@@ -551,7 +606,7 @@ double CDECL MSVCRT_sin( double x )
++  double z = precise_pow(x,y);
+   if (x < 0 && y != floor(y)) math_error(_DOMAIN, "pow", x, y, z);
+   else if (!x && isfinite(y) && y < 0) math_error(_SING, "pow", x, y, z);
+   else if (isfinite(x) && isfinite(y) && !isfinite(z)) math_error(_OVERFLOW, "pow", x, y, z);
+@@ -555,7 +610,7 @@ double CDECL MSVCRT_sin( double x )
   */
  double CDECL MSVCRT_sinh( double x )
  {
@@ -111,5 +111,5 @@ index a94c34ac80e..6736f03ec4c 100644
    return ret;
  }
 -- 
-2.13.1
+2.14.1
 

patches/patchinstall.sh

@@ -52,13 +52,13 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "bb16263fe1974851f495435fef9a3d57fa2d4aa9"
+	echo "302153117e20b62c9170aed62aa33e83cacfaf59"
 }
 
 # Show version information
 version()
 {
-	echo "Wine Staging 2.17"
+	echo "Wine Staging 2.18 (unreleased)"
 	echo "Copyright (C) 2014-2017 the Wine Staging project authors."
 	echo ""
 	echo "Patchset to be applied on upstream Wine:"
@@ -465,7 +465,6 @@ patch_enable_all ()
 	enable_wined3d_WINED3DFMT_R32G32_UINT="$1"
 	enable_wined3d_WINED3D_RS_COLORWRITEENABLE="$1"
 	enable_wined3d_buffer_create="$1"
-	enable_wined3d_cpu_blitter_blit="$1"
 	enable_wined3d_draw_primitive_arrays="$1"
 	enable_wined3d_sample_c_lz="$1"
 	enable_wined3d_wined3d_guess_gl_vendor="$1"
@@ -1674,9 +1673,6 @@ patch_enable ()
 		wined3d-buffer_create)
 			enable_wined3d_buffer_create="$2"
 			;;
-		wined3d-cpu_blitter_blit)
-			enable_wined3d_cpu_blitter_blit="$2"
-			;;
 		wined3d-draw_primitive_arrays)
 			enable_wined3d_draw_primitive_arrays="$2"
 			;;
@@ -9106,8 +9102,6 @@ fi
 # | 	dlls/windowscodecs/tests/converter.c, dlls/windowscodecs/tests/pngformat.c, dlls/windowscodecs/tiffformat.c
 # |
 if test "$enable_windowscodecs_Palette_Images" -eq 1; then
-	patch_apply windowscodecs-Palette_Images/0005-windowscodecs-Add-support-for-palette-image-formats-.patch
-	patch_apply windowscodecs-Palette_Images/0011-windowscodecs-tests-Add-some-tests-for-encoding-1bpp.patch
 	patch_apply windowscodecs-Palette_Images/0012-windowscodecs-tests-Add-tests-for-encoding-2bpp-4bpp.patch
 	patch_apply windowscodecs-Palette_Images/0013-windowscodecs-Use-V_UI1-instead-of-V_UNION-to-assign.patch
 	patch_apply windowscodecs-Palette_Images/0014-windowscodecs-Add-support-for-palette-image-formats-.patch
@@ -9117,8 +9111,6 @@ if test "$enable_windowscodecs_Palette_Images" -eq 1; then
 	patch_apply windowscodecs-Palette_Images/0020-windowscodecs-find_decoder-should-return-an-error-it.patch
 	patch_apply windowscodecs-Palette_Images/0021-windowscodecs-PNG-decoder-should-return-WINCODEC_ERR.patch
 	(
-		printf '%s\n' '+    { "Dmitry Timoshkov", "windowscodecs: Add support for palette image formats to PNG encoder.", 1 },';
-		printf '%s\n' '+    { "Dmitry Timoshkov", "windowscodecs/tests: Add some tests for encoding 1bpp/8bpp images with a palette.", 1 },';
 		printf '%s\n' '+    { "Dmitry Timoshkov", "windowscodecs/tests: Add tests for encoding 2bpp/4bpp images with a palette.", 1 },';
 		printf '%s\n' '+    { "Dmitry Timoshkov", "windowscodecs: Use V_UI1() instead of V_UNION() to assign a VT_UI1 variant member.", 1 },';
 		printf '%s\n' '+    { "Dmitry Timoshkov", "windowscodecs: Add support for palette image formats to TIFF encoder.", 1 },';
@@ -9929,21 +9921,6 @@ if test "$enable_wined3d_buffer_create" -eq 1; then
 	) >> "$patchlist"
 fi
 
-# Patchset wined3d-cpu_blitter_blit
-# |
-# | This patchset fixes the following Wine bugs:
-# |   *	[#43701] Don't claim SYSMEM location to be current if memory was evicted
-# |
-# | Modified files:
-# |   *	dlls/wined3d/surface.c
-# |
-if test "$enable_wined3d_cpu_blitter_blit" -eq 1; then
-	patch_apply wined3d-cpu_blitter_blit/0001-wined3d-Don-t-claim-SYSMEM-location-to-be-current-if.patch
-	(
-		printf '%s\n' '+    { "Matteo Bruni", "wined3d: Don'\''t claim SYSMEM location to be current if memory was evicted.", 1 },';
-	) >> "$patchlist"
-fi
-
 # Patchset wined3d-sample_c_lz
 # |
 # | This patchset fixes the following Wine bugs:

patches/secur32-Zero_Buffer_Length/0001-secur32-Set-output-buffer-size-to-zero-during-handsh.patch

@@ -1,4 +1,4 @@
-From 365725a03e12ff7df73851d787398b62f3e10ddf Mon Sep 17 00:00:00 2001
+From 366f728c4ddfe2f4c23f049f572ff6858b3ceca5 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sun, 8 May 2016 21:52:06 +0200
 Subject: secur32: Set output buffer size to zero during handshake when no data
@@ -10,14 +10,14 @@ Subject: secur32: Set output buffer size to zero during handshake when no data
  2 files changed, 20 insertions(+), 9 deletions(-)
 
 diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c
-index 71f219c7a3c..007f7183928 100644
+index 88b6521a7d8..cbfbc32ba1e 100644
 --- a/dlls/secur32/schannel.c
 +++ b/dlls/secur32/schannel.c
-@@ -899,6 +899,18 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW(
+@@ -901,6 +901,18 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW(
      /* Perform the TLS handshake */
      ret = schan_imp_handshake(ctx->session);
 
-+    out_buffers = &transport.out;
++    out_buffers = &ctx->transport.out;
 +    if (out_buffers->current_buffer_idx != -1)
 +    {
 +        SecBuffer *buffer = &out_buffers->desc->pBuffers[out_buffers->current_buffer_idx];
@@ -29,14 +29,14 @@ index 71f219c7a3c..007f7183928 100644
 +        buffer->cbBuffer = 0;
 +    }
 +
-     if(transport.in.offset && transport.in.offset != pInput->pBuffers[0].cbBuffer) {
+     if(ctx->transport.in.offset && ctx->transport.in.offset != pInput->pBuffers[0].cbBuffer) {
          if(pInput->cBuffers<2 || pInput->pBuffers[1].BufferType!=SECBUFFER_EMPTY)
              return SEC_E_INVALID_TOKEN;
-@@ -907,13 +919,6 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW(
-         pInput->pBuffers[1].cbBuffer = pInput->pBuffers[0].cbBuffer-transport.in.offset;
+@@ -909,13 +921,6 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW(
+         pInput->pBuffers[1].cbBuffer = pInput->pBuffers[0].cbBuffer-ctx->transport.in.offset;
      }
 
--    out_buffers = &transport.out;
+-    out_buffers = &ctx->transport.out;
 -    if (out_buffers->current_buffer_idx != -1)
 -    {
 -        SecBuffer *buffer = &out_buffers->desc->pBuffers[out_buffers->current_buffer_idx];
@@ -47,18 +47,18 @@ index 71f219c7a3c..007f7183928 100644
      if (ctx->req_ctx_attr & ISC_REQ_REPLAY_DETECT)
          *pfContextAttr |= ISC_RET_REPLAY_DETECT;
 diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c
-index ead0e8c8b5b..f7c0e2d5c45 100644
+index b5ed169a978..110d4d8c397 100644
 --- a/dlls/secur32/tests/schannel.c
 +++ b/dlls/secur32/tests/schannel.c
-@@ -770,7 +770,6 @@ todo_wine
+@@ -771,7 +771,6 @@ todo_wine
              ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM,
              0, 0, &buffers[1], 0, NULL, &buffers[0], &attrs, NULL);
      ok(status == SEC_E_INVALID_TOKEN, "Expected SEC_E_INVALID_TOKEN, got %08x\n", status);
 -todo_wine
      ok(buffers[0].pBuffers[0].cbBuffer == 0, "Output buffer size was not set to 0.\n");
 
      buffers[0].pBuffers[0].cbBuffer = 0;
-@@ -780,9 +779,15 @@ todo_wine
+@@ -781,9 +780,15 @@ todo_wine
  todo_wine
      ok(status == SEC_E_INSUFFICIENT_MEMORY || status == SEC_E_INVALID_TOKEN,
         "Expected SEC_E_INSUFFICIENT_MEMORY or SEC_E_INVALID_TOKEN, got %08x\n", status);
@@ -75,7 +75,7 @@ index ead0e8c8b5b..f7c0e2d5c45 100644
      status = InitializeSecurityContextA(&cred_handle, NULL, (SEC_CHAR *)"localhost",
              ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM,
              0, 0, NULL, 0, &context, &buffers[0], &attrs, NULL);
-@@ -855,6 +860,7 @@ todo_wine
+@@ -858,6 +863,7 @@ todo_wine
          buffers[1].pBuffers[0].cbBuffer = buf_size;
      }
 
@@ -84,5 +84,5 @@ index ead0e8c8b5b..f7c0e2d5c45 100644
          "InitializeSecurityContext failed: %08x\n", status);
      if(status != SEC_E_OK) {
 -- 
-2.11.0
+2.14.1