Release v5.17.2

Fix compile error on older systems.

patches/mfplat-streaming-support/0054-winegstreamer-Support-older-versions.patch

@@ -0,0 +1,48 @@
+From 4275e2569a44939e04098fca9cf8beab4cb3941e Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Sun, 13 Sep 2020 13:39:07 +1000
+Subject: [PATCH] winegstreamer: Support older versions
+
+---
+ configure.ac                      | 4 +++-
+ dlls/winegstreamer/media_source.c | 2 ++
+ 3 files changed, 14 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 5d882b94d99..8abd50e6690 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1665,7 +1665,9 @@ then
+               AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gst/gst.h>]],
+                                                  [[static int a[sizeof(gint64) > 4 ? 1 : -1]; if (a[0]) return 0;]])],
+                 [AC_MSG_RESULT([yes])
+-                 AC_CHECK_LIB(gstreamer-1.0,gst_pad_new,[:],,[$GSTREAMER_LIBS])],
++                 AC_CHECK_LIB(gstreamer-1.0,gst_pad_new,[:],,[$GSTREAMER_LIBS])
++                 WINE_CHECK_LIB_FUNCS([gst_structure_get_list], [$GSTREAMER_LIBS])
++                 ],
+                 [AC_MSG_RESULT([no])
+                  ac_glib2_broken=yes
+                  WINE_NOTICE([glib-2.0 pkgconfig configuration is for the wrong architecture, winegstreamer won't be built.])])])])
+diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c
+index 07c16ac8a07..3ef258937dc 100644
+--- a/dlls/winegstreamer/media_source.c
++++ b/dlls/winegstreamer/media_source.c
+@@ -1087,6 +1087,7 @@ static HRESULT media_stream_init_desc(struct media_stream *stream)
+ 
+     if (!strcmp(gst_structure_get_name(gst_caps_get_structure(stream->their_caps, 0)), "video/x-raw"))
+     {
++#ifdef HAVE_GST_STRUCTURE_GET_LIST
+         GstElementFactory *videoconvert_factory = gst_element_factory_find("videoconvert");
+         /* output every format supported by videoconvert */
+         const GList *template_list = gst_element_factory_get_static_pad_templates(videoconvert_factory);
+@@ -1118,6 +1119,7 @@ static HRESULT media_stream_init_desc(struct media_stream *stream)
+             gst_caps_unref(src_caps);
+             break;
+         }
++#endif
+     }
+     else if (!strcmp(gst_structure_get_name(gst_caps_get_structure(stream->their_caps, 0)), "audio/x-raw"))
+     {
+-- 
+2.28.0
+

patches/ntdll-Junction_Points/0001-ntdll-Add-support-for-junction-point-creation.patch

@@ -1,4 +1,4 @@
-From 6e22c1cc4c615e07ac3570e152d15f22aab9eead Mon Sep 17 00:00:00 2001
+From d81e8108c6c13eb865b9588eca19a777b6e22986 Mon Sep 17 00:00:00 2001
 From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
 Date: Thu, 16 Jan 2014 20:56:49 -0700
 Subject: [PATCH] ntdll: Add support for junction point creation.
@@ -6,18 +6,18 @@ Subject: [PATCH] ntdll: Add support for junction point creation.
 Signed-off-by: Erich E. Hoover <erich.e.hoover@gmail.com>
 ---
  configure.ac            |   2 +
- dlls/ntdll/tests/file.c | 101 ++++++++++++++++++++++++++
- dlls/ntdll/unix/file.c  | 155 ++++++++++++++++++++++++++++++++++++++++
+ dlls/ntdll/tests/file.c | 101 +++++++++++++++++++++++++
+ dlls/ntdll/unix/file.c  | 159 ++++++++++++++++++++++++++++++++++++++++
  include/Makefile.in     |   1 +
  include/ntifs.h         |  42 +++++++++++
- 5 files changed, 301 insertions(+)
+ 5 files changed, 305 insertions(+)
  create mode 100644 include/ntifs.h
 
 diff --git a/configure.ac b/configure.ac
-index aef00416461..15c0b7e4c26 100644
+index cf3df03cc9..ed2ebcd653 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2230,6 +2230,8 @@ AC_CHECK_FUNCS(\
+@@ -2210,6 +2210,8 @@ AC_CHECK_FUNCS(\
  	pwrite \
  	readdir \
  	readlink \
@@ -27,7 +27,7 @@ index aef00416461..15c0b7e4c26 100644
  	select \
  	setproctitle \
 diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c
-index 1492797b0c9..10bdef5d810 100644
+index 1492797b0c..10bdef5d81 100644
 --- a/dlls/ntdll/tests/file.c
 +++ b/dlls/ntdll/tests/file.c
 @@ -38,6 +38,7 @@
@@ -152,7 +152,7 @@ index 1492797b0c9..10bdef5d810 100644
      test_mailslot_name();
  }
 diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c
-index 290e18e54c5..c2243975e4b 100644
+index 290e18e54c..c0a3dee181 100644
 --- a/dlls/ntdll/unix/file.c
 +++ b/dlls/ntdll/unix/file.c
 @@ -36,6 +36,7 @@
@@ -171,7 +171,18 @@ index 290e18e54c5..c2243975e4b 100644
  
  WINE_DEFAULT_DEBUG_CHANNEL(file);
  WINE_DECLARE_DEBUG_CHANNEL(winediag);
-@@ -457,6 +459,32 @@ static int xattr_set( const char *path, const char *name, void *value, size_t si
+@@ -146,6 +148,10 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag);
+ #undef EXT2_IOC_GETFLAGS
+ #undef EXT4_CASEFOLD_FL
+ 
++#ifndef RENAME_EXCHANGE
++#define RENAME_EXCHANGE		(1 << 1)
++#endif
++
+ #ifdef linux
+ 
+ /* We want the real kernel dirent structure, not the libc one */
+@@ -457,6 +463,32 @@ static int xattr_set( const char *path, const char *name, void *value, size_t si
  #endif
  }
  
@@ -204,7 +215,7 @@ index 290e18e54c5..c2243975e4b 100644
  /* get space from the current directory data buffer, allocating a new one if necessary */
  static void *get_dir_data_space( struct dir_data *data, unsigned int size )
  {
-@@ -5731,6 +5759,116 @@ static void ignore_server_ioctl_struct_holes( ULONG code, const void *in_buffer,
+@@ -5731,6 +5763,116 @@ static void ignore_server_ioctl_struct_holes( ULONG code, const void *in_buffer,
  }
  
  
@@ -321,7 +332,7 @@ index 290e18e54c5..c2243975e4b 100644
  /******************************************************************************
   *              NtFsControlFile   (NTDLL.@)
   */
-@@ -5813,6 +5951,23 @@ NTSTATUS WINAPI NtFsControlFile( HANDLE handle, HANDLE event, PIO_APC_ROUTINE ap
+@@ -5813,6 +5955,23 @@ NTSTATUS WINAPI NtFsControlFile( HANDLE handle, HANDLE event, PIO_APC_ROUTINE ap
          break;
      }
  
@@ -346,7 +357,7 @@ index 290e18e54c5..c2243975e4b 100644
          TRACE("FSCTL_SET_SPARSE: Ignoring request\n");
          io->Information = 0;
 diff --git a/include/Makefile.in b/include/Makefile.in
-index 49b174ed319..2dbf84e6c36 100644
+index 91a02645c3..9345b75c00 100644
 --- a/include/Makefile.in
 +++ b/include/Makefile.in
 @@ -523,6 +523,7 @@ SOURCES = \
@@ -359,7 +370,7 @@ index 49b174ed319..2dbf84e6c36 100644
  	ntsecapi.h \
 diff --git a/include/ntifs.h b/include/ntifs.h
 new file mode 100644
-index 00000000000..21d42e17325
+index 0000000000..21d42e1732
 --- /dev/null
 +++ b/include/ntifs.h
 @@ -0,0 +1,42 @@

patches/patchinstall.sh

@@ -57,7 +57,7 @@ upstream_commit()
 # Show version information
 version()
 {
-	echo "Wine Staging 5.17"
+	echo "Wine Staging 5.17.2"
 	echo "Copyright (C) 2014-2019 the Wine Staging project authors."
 	echo "Copyright (C) 2018-2020 Alistair Leslie-Hughes"
 	echo ""
@@ -2700,14 +2700,14 @@ fi
 # |   *	[#49692] mfplat: Improved support for multiple video formats.
 # |
 # | Modified files:
-# |   *	dlls/mf/Makefile.in, dlls/mf/handler.c, dlls/mf/handler.h, dlls/mf/main.c, dlls/mf/sar.c, dlls/mf/session.c,
-# | 	dlls/mf/tests/mf.c, dlls/mf/topology.c, dlls/mfplat/mediatype.c, dlls/mfplat/tests/mfplat.c, dlls/mfplat/tests/test.mp4,
-# | 	dlls/mfreadwrite/reader.c, dlls/mfreadwrite/tests/mfplat.c, dlls/mfreadwrite/tests/resource.rc,
-# | 	dlls/mfreadwrite/tests/test.mp4, dlls/winegstreamer/Makefile.in, dlls/winegstreamer/audioconvert.c,
-# | 	dlls/winegstreamer/colorconvert.c, dlls/winegstreamer/gst_cbs.c, dlls/winegstreamer/gst_cbs.h,
-# | 	dlls/winegstreamer/gst_private.h, dlls/winegstreamer/main.c, dlls/winegstreamer/media_source.c,
-# | 	dlls/winegstreamer/mf_decode.c, dlls/winegstreamer/mfplat.c, dlls/winegstreamer/winegstreamer_classes.idl,
-# | 	include/mfidl.idl, tools/make_makefiles, tools/makedep.c
+# |   *	configure.ac, dlls/mf/Makefile.in, dlls/mf/handler.c, dlls/mf/handler.h, dlls/mf/main.c, dlls/mf/sar.c,
+# | 	dlls/mf/session.c, dlls/mf/tests/mf.c, dlls/mf/topology.c, dlls/mfplat/mediatype.c, dlls/mfplat/tests/mfplat.c,
+# | 	dlls/mfplat/tests/test.mp4, dlls/mfreadwrite/reader.c, dlls/mfreadwrite/tests/mfplat.c,
+# | 	dlls/mfreadwrite/tests/resource.rc, dlls/mfreadwrite/tests/test.mp4, dlls/winegstreamer/Makefile.in,
+# | 	dlls/winegstreamer/audioconvert.c, dlls/winegstreamer/colorconvert.c, dlls/winegstreamer/gst_cbs.c,
+# | 	dlls/winegstreamer/gst_cbs.h, dlls/winegstreamer/gst_private.h, dlls/winegstreamer/main.c,
+# | 	dlls/winegstreamer/media_source.c, dlls/winegstreamer/mf_decode.c, dlls/winegstreamer/mfplat.c,
+# | 	dlls/winegstreamer/winegstreamer_classes.idl, include/mfidl.idl, tools/make_makefiles, tools/makedep.c
 # |
 if test "$enable_mfplat_streaming_support" -eq 1; then
 	patch_apply mfplat-streaming-support/0001-winegstreamer-Add-a-GstPad-wrapping-the-media-source.patch
@@ -2763,6 +2763,7 @@ if test "$enable_mfplat_streaming_support" -eq 1; then
 	patch_apply mfplat-streaming-support/0051-mf-sar-Compare-against-native-media-type-in-IsMediaT.patch
 	patch_apply mfplat-streaming-support/0052-winegstreamer-Implement-audio-conversion-MFT.patch
 	patch_apply mfplat-streaming-support/0053-winegstreamer-Support-eAVEncH264VProfile_Constrained.patch
+	patch_apply mfplat-streaming-support/0054-winegstreamer-Support-older-versions.patch
 fi
 
 # Patchset mmsystem.dll16-MIDIHDR_Refcount

staging/VERSION

@@ -1 +1 @@
-Wine Staging 5.17
+Wine Staging 5.17.2