Rebase against 0647abc5071913506e681bfc5239f9a6078dca54.

patches/mfplat-MFTRegister/0001-mfplat-Fix-invalid-memory-access.patch

@@ -1,25 +0,0 @@
-From d4d2a048787580327efdeaad7baac703a1993b63 Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Wed, 10 May 2017 02:13:01 +0200
-Subject: mfplat: Fix invalid memory access.
-
----
- dlls/mfplat/main.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c
-index c1c700368f..56bc2840f0 100644
---- a/dlls/mfplat/main.c
-+++ b/dlls/mfplat/main.c
-@@ -262,7 +262,7 @@ static BOOL match_type(const WCHAR *clsid_str, const WCHAR *type_str, MFT_REGIST
-     if (RegQueryValueExW(hfilter, type_str, NULL, &reg_type, (LPBYTE)info, &size) != ERROR_SUCCESS)
-         goto out;
- 
--    for (i = 0; i < size / sizeof(MFT_REGISTER_TYPE_INFO) + 1; i++)
-+    for (i = 0; i < size / sizeof(MFT_REGISTER_TYPE_INFO); i++)
-     {
-         if (IsEqualGUID(&info[i].guidMajorType, &type->guidMajorType) &&
-             IsEqualGUID(&info[i].guidSubtype,   &type->guidSubtype))
--- 
-2.12.2
-

patches/patchinstall.sh

@@ -52,7 +52,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "8ef79b023a06f00ca6ab37afb8089d358b277d73"
+	echo "0647abc5071913506e681bfc5239f9a6078dca54"
 }
 
 # Show version information
@@ -299,7 +299,6 @@ patch_enable_all ()
 	enable_oleaut32_x86_64_Marshaller="$1"
 	enable_opengl32_Revert_Disable_Ext="$1"
 	enable_opengl32_glDebugMessageCallback="$1"
-	enable_qcap_O_CLOEXEC="$1"
 	enable_quartz_MediaSeeking_Positions="$1"
 	enable_quartz_Silence_FIXMEs="$1"
 	enable_riched20_Class_Tests="$1"
@@ -1129,9 +1128,6 @@ patch_enable ()
 		opengl32-glDebugMessageCallback)
 			enable_opengl32_glDebugMessageCallback="$2"
 			;;
-		qcap-O_CLOEXEC)
-			enable_qcap_O_CLOEXEC="$2"
-			;;
 		quartz-MediaSeeking_Positions)
 			enable_quartz_MediaSeeking_Positions="$2"
 			;;
@@ -5009,13 +5005,11 @@ fi
 # | 	dlls/mfplat/mfplat.spec, include/mfidl.idl, include/rpcndr.h
 # |
 if test "$enable_mfplat_MFTRegister" -eq 1; then
-	patch_apply mfplat-MFTRegister/0001-mfplat-Fix-invalid-memory-access.patch
 	patch_apply mfplat-MFTRegister/0006-mf-Add-stub-for-MFCreateMediaSession.patch
 	patch_apply mfplat-MFTRegister/0007-include-rpcndr.h-Fix-definition-of-EXTERN_GUID.patch
 	patch_apply mfplat-MFTRegister/0008-mf-Implement-IMFMediaSession-stub-interface.patch
 	patch_apply mfplat-MFTRegister/0009-mfplat-Add-stub-for-MFCreateSourceResolver.patch
 	(
-		printf '%s\n' '+    { "Sebastian Lackner", "mfplat: Fix invalid memory access.", 1 },';
 		printf '%s\n' '+    { "Michael Müller", "mf: Add stub for MFCreateMediaSession.", 1 },';
 		printf '%s\n' '+    { "Michael Müller", "include/rpcndr.h: Fix definition of EXTERN_GUID.", 1 },';
 		printf '%s\n' '+    { "Michael Müller", "mf: Implement IMFMediaSession stub interface.", 1 },';
@@ -6586,21 +6580,6 @@ if test "$enable_opengl32_glDebugMessageCallback" -eq 1; then
 	) >> "$patchlist"
 fi
 
-# Patchset qcap-O_CLOEXEC
-# |
-# | This patchset fixes the following Wine bugs:
-# |   *	[#42478] Fix compile error when O_CLOEXEC is not defined
-# |
-# | Modified files:
-# |   *	dlls/qcap/v4l.c
-# |
-if test "$enable_qcap_O_CLOEXEC" -eq 1; then
-	patch_apply qcap-O_CLOEXEC/0001-qcap-Fix-compile-error-when-O_CLOEXEC-is-not-defined.patch
-	(
-		printf '%s\n' '+    { "Sebastian Lackner", "qcap: Fix compile error when O_CLOEXEC is not defined.", 1 },';
-	) >> "$patchlist"
-fi
-
 # Patchset quartz-MediaSeeking_Positions
 # |
 # | Modified files:

patches/qcap-O_CLOEXEC/0001-qcap-Fix-compile-error-when-O_CLOEXEC-is-not-defined.patch

@@ -1,35 +0,0 @@
-From 9cdd8a9d8249736dc06f43edb70ca52a7ac63851 Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Sun, 5 Mar 2017 19:37:00 +0100
-Subject: qcap: Fix compile error when O_CLOEXEC is not defined.
-
----
- dlls/qcap/v4l.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c
-index d67df73b0cd..bbe3a8b1da5 100644
---- a/dlls/qcap/v4l.c
-+++ b/dlls/qcap/v4l.c
-@@ -71,6 +71,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(qcap_v4l);
- 
- #ifdef VIDIOCMCAPTURE
- 
-+#ifndef O_CLOEXEC
-+#define O_CLOEXEC 0
-+#endif
-+
- static typeof(open) *video_open = open;
- static typeof(close) *video_close = close;
- static typeof(ioctl) *video_ioctl = ioctl;
-@@ -806,6 +810,7 @@ Capture * qcap_driver_init( IPin *pOut, USHORT card )
-         goto error;
-     }
- 
-+    fcntl(capBox->fd, F_SETFD, FD_CLOEXEC);
-     memset(&capa, 0, sizeof(capa));
- 
-     if (xioctl(capBox->fd, VIDIOCGCAP, &capa) == -1)
--- 
-2.11.0
-

patches/qcap-O_CLOEXEC/definition

@@ -1 +0,0 @@
-Fixes: [42478] Fix compile error when O_CLOEXEC is not defined