Rebase against 4807a8f588c67e2296474399368a96c0046120fd.

patches/mfplat-streaming-support/0033-HACK-Switch-between-all-selection-streams-on-MF_SOUR.patch

@@ -1,48 +0,0 @@
-From d087bd05fe0f24fdce30b355b7f574e7006aec7b Mon Sep 17 00:00:00 2001
-From: Derek Lesho <dlesho@codeweavers.com>
-Date: Tue, 12 May 2020 16:48:52 -0500
-Subject: [PATCH 33/45] HACK: Switch between all selection streams on
- MF_SOURCE_READER_ANY_STREAM.
-
----
- dlls/mfreadwrite/reader.c | 24 +++++++++++++++++++++++-
- 1 file changed, 23 insertions(+), 1 deletion(-)
-
-diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c
-index 9d86a5a0f8f..41880fa3289 100644
---- a/dlls/mfreadwrite/reader.c
-+++ b/dlls/mfreadwrite/reader.c
-@@ -1046,7 +1046,29 @@ static HRESULT source_reader_get_stream_read_index(struct source_reader *reader,
-             {
-                 /* Cycle through all selected streams once, next pick first selected. */
-                 if (FAILED(hr = source_reader_get_first_selected_stream(reader, STREAM_FLAG_REQUESTED_ONCE, stream_index)))
--                    hr = source_reader_get_first_selected_stream(reader, 0, stream_index);
-+                {
-+                    //hr = source_reader_get_first_selected_stream(reader, 0, stream_index);
-+                    static int last_selection = -1;
-+                    int i;
-+                    BOOL selected;
-+
-+                    for (i = 0; i < (int) reader->stream_count; ++i)
-+                    {
-+                        source_reader_get_stream_selection(reader, i, &selected);
-+                        if (selected && i > last_selection)
-+                        {
-+                            last_selection = i;
-+                            *stream_index = i;
-+                            hr = S_OK;
-+                            break;
-+                        }
-+                    }
-+                    if (i == reader->stream_count)
-+                    {
-+                        hr = source_reader_get_first_selected_stream(reader, 0, stream_index);
-+                        last_selection = hr == S_OK ? *stream_index : -1;
-+                    }
-+                }
-             }
-             return hr;
-         default:
--- 
-2.28.0
-

patches/msctf-ITfActiveLanguageProfileNotifySink/0001-msctf-Added-ITfActiveLanguageProfileNotifySink-suppo.patch

@@ -1,55 +0,0 @@
-From 48b2daa4ddeb8c3a88611bc494a0e1405fad37af Mon Sep 17 00:00:00 2001
-From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-Date: Fri, 12 Jul 2019 09:50:00 +1000
-Subject: [PATCH] msctf: Added ITfActiveLanguageProfileNotifySink support in
- ITfSource.
-
-Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44502
----
- dlls/msctf/msctf_internal.h |  1 +
- dlls/msctf/threadmgr.c      | 10 +++++++++-
- 2 files changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/dlls/msctf/msctf_internal.h b/dlls/msctf/msctf_internal.h
-index 584bb1044ed..9d60e18e6f3 100644
---- a/dlls/msctf/msctf_internal.h
-+++ b/dlls/msctf/msctf_internal.h
-@@ -34,6 +34,7 @@
- #define COOKIE_MAGIC_KEYTRACESINK 0x0090
- #define COOKIE_MAGIC_UIELEMENTSINK 0x00a0
- #define COOKIE_MAGIC_INPUTPROCESSORPROFILEACTIVATIONSINK 0x00b0
-+#define COOKIE_MAGIC_ACTIVELANGSINK 0x00c0
- 
- extern DWORD tlsIndex DECLSPEC_HIDDEN;
- extern TfClientId processId DECLSPEC_HIDDEN;
-diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c
-index 2c208fbc04f..16e261539ac 100644
---- a/dlls/msctf/threadmgr.c
-+++ b/dlls/msctf/threadmgr.c
-@@ -621,6 +621,13 @@ static HRESULT WINAPI ThreadMgrSource_AdviseSink(ITfSource *iface,
-         return advise_sink(&This->ThreadFocusSink, &IID_ITfThreadFocusSink, COOKIE_MAGIC_THREADFOCUSSINK, punk, pdwCookie);
-     }
- 
-+    if (IsEqualIID(riid, &IID_ITfActiveLanguageProfileNotifySink))
-+    {
-+        WARN("semi-stub for ITfActiveLanguageProfileNotifySink: sink won't be used.\n");
-+        return advise_sink(&This->ActiveLanguageProfileNotifySink, &IID_ITfActiveLanguageProfileNotifySink,
-+                            COOKIE_MAGIC_ACTIVELANGSINK, punk, pdwCookie);
-+    }
-+
-     if (IsEqualIID(riid, &IID_ITfKeyTraceEventSink))
-     {
-         WARN("semi-stub for ITfKeyTraceEventSink: sink won't be used.\n");
-@@ -656,7 +663,8 @@ static HRESULT WINAPI ThreadMgrSource_UnadviseSink(ITfSource *iface, DWORD pdwCo
-     magic = get_Cookie_magic(pdwCookie);
-     if (magic != COOKIE_MAGIC_TMSINK && magic != COOKIE_MAGIC_THREADFOCUSSINK
-         && magic != COOKIE_MAGIC_KEYTRACESINK && magic != COOKIE_MAGIC_UIELEMENTSINK
--        && magic != COOKIE_MAGIC_INPUTPROCESSORPROFILEACTIVATIONSINK)
-+        && magic != COOKIE_MAGIC_INPUTPROCESSORPROFILEACTIVATIONSINK
-+        && magic != COOKIE_MAGIC_KEYTRACESINK)
-         return E_INVALIDARG;
- 
-     return unadvise_sink(pdwCookie);
--- 
-2.17.1
-

patches/msctf-ITfActiveLanguageProfileNotifySink/definition

@@ -1 +0,0 @@
-Fixes: [44502] msctf: Added ITfActiveLanguageProfileNotifySink support in ITfSource.

patches/patchinstall.sh

@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "bedfb9cae224a369efa4588332a5518dbee57035"
+	echo "4807a8f588c67e2296474399368a96c0046120fd"
 }
 
 # Show version information
@@ -146,7 +146,6 @@ patch_enable_all ()
 	enable_mmsystem_dll16_MIDIHDR_Refcount="$1"
 	enable_mountmgr_DosDevices="$1"
 	enable_mscoree_CorValidateImage="$1"
-	enable_msctf_ITfActiveLanguageProfileNotifySink="$1"
 	enable_mshtml_HTMLLocation_put_hash="$1"
 	enable_mshtml_TranslateAccelerator="$1"
 	enable_msi_msi_vcl_get_cost="$1"
@@ -515,9 +514,6 @@ patch_enable ()
 		mscoree-CorValidateImage)
 			enable_mscoree_CorValidateImage="$2"
 			;;
-		msctf-ITfActiveLanguageProfileNotifySink)
-			enable_msctf_ITfActiveLanguageProfileNotifySink="$2"
-			;;
 		mshtml-HTMLLocation_put_hash)
 			enable_mshtml_HTMLLocation_put_hash="$2"
 			;;
@@ -2755,7 +2751,6 @@ if test "$enable_mfplat_streaming_support" -eq 1; then
 	patch_apply mfplat-streaming-support/0030-Report-streams-backwards-and-only-select-one-of-each.patch
 	patch_apply mfplat-streaming-support/0031-winegstreamer-Implement-IMFMediaSource-Stop.patch
 	patch_apply mfplat-streaming-support/0032-winegstreamer-Introduce-MPEG-4-Section-2-video-decod.patch
-	patch_apply mfplat-streaming-support/0033-HACK-Switch-between-all-selection-streams-on-MF_SOUR.patch
 	patch_apply mfplat-streaming-support/0034-winegstreamer-Introduce-WMA-audio-decoder.patch
 	patch_apply mfplat-streaming-support/0035-Support-stereo-down-folding.patch
 	patch_apply mfplat-streaming-support/0036-winegstreamer-Implement-MF_SD_LANGUAGE.patch
@@ -2807,18 +2802,6 @@ if test "$enable_mscoree_CorValidateImage" -eq 1; then
 	patch_apply mscoree-CorValidateImage/0001-mscoree-Implement-_CorValidateImage.patch
 fi
 
-# Patchset msctf-ITfActiveLanguageProfileNotifySink
-# |
-# | This patchset fixes the following Wine bugs:
-# |   *	[#44502] msctf: Added ITfActiveLanguageProfileNotifySink support in ITfSource.
-# |
-# | Modified files:
-# |   *	dlls/msctf/msctf_internal.h, dlls/msctf/threadmgr.c
-# |
-if test "$enable_msctf_ITfActiveLanguageProfileNotifySink" -eq 1; then
-	patch_apply msctf-ITfActiveLanguageProfileNotifySink/0001-msctf-Added-ITfActiveLanguageProfileNotifySink-suppo.patch
-fi
-
 # Patchset mshtml-HTMLLocation_put_hash
 # |
 # | This patchset fixes the following Wine bugs:

staging/upstream-commit

@@ -1 +1 @@
-bedfb9cae224a369efa4588332a5518dbee57035
+4807a8f588c67e2296474399368a96c0046120fd