Rebase against bedfb9cae224a369efa4588332a5518dbee57035.

patches/mfplat-streaming-support/0044-HACK-Shutdown-media-sinks-on-session-shutdown.patch

@@ -1,7 +1,7 @@
-From e7999e5e011156c517ca17d284ed10473b584890 Mon Sep 17 00:00:00 2001
+From dabbfa4c200fc70b497bed6a79840531e1ace2b0 Mon Sep 17 00:00:00 2001
 From: Derek Lesho <dlesho@codeweavers.com>
 Date: Wed, 14 Oct 2020 11:07:34 -0500
-Subject: [PATCH 44/45] HACK: Shutdown media sinks on session shutdown.
+Subject: [PATCH] HACK: Shutdown media sinks on session shutdown.
 
 TODO: We should be doing this through IMFActivate.
 ---
@@ -9,18 +9,18 @@ TODO: We should be doing this through IMFActivate.
  1 file changed, 5 insertions(+)
 
 diff --git a/dlls/mf/session.c b/dlls/mf/session.c
-index 2f1b589a1aa..6fce432da72 100644
+index fa6ed13db0c..ae5a600109c 100644
 --- a/dlls/mf/session.c
 +++ b/dlls/mf/session.c
-@@ -1637,6 +1637,7 @@ static HRESULT WINAPI mfsession_Close(IMFMediaSession *iface)
+@@ -1845,6 +1845,7 @@ static HRESULT WINAPI mfsession_Close(IMFMediaSession *iface)
  static HRESULT WINAPI mfsession_Shutdown(IMFMediaSession *iface)
  {
      struct media_session *session = impl_from_IMFMediaSession(iface);
 +    struct media_sink *sink;
      HRESULT hr = S_OK;
  
-     FIXME("%p.\n", iface);
-@@ -1648,6 +1649,10 @@ static HRESULT WINAPI mfsession_Shutdown(IMFMediaSession *iface)
+     TRACE("%p.\n", iface);
+@@ -1856,6 +1857,10 @@ static HRESULT WINAPI mfsession_Shutdown(IMFMediaSession *iface)
          IMFMediaEventQueue_Shutdown(session->event_queue);
          if (session->quality_manager)
              IMFQualityManager_Shutdown(session->quality_manager);
@@ -28,9 +28,9 @@ index 2f1b589a1aa..6fce432da72 100644
 +        {
 +            IMFMediaSink_Shutdown(sink->sink);
 +        }
-     }
-     LeaveCriticalSection(&session->cs);
- 
+         MFShutdownObject((IUnknown *)session->clock);
+         IMFPresentationClock_Release(session->clock);
+         session->clock = NULL;
 -- 
-2.28.0
+2.29.2
 

patches/ntdll-RtlQueryPackageIdentity/0003-ntdll-tests-Add-basic-tests-for-RtlQueryPackageIdent.patch

@@ -1,4 +1,4 @@
-From 72955906074bbc00e27f3a2493b6cb5b17662f02 Mon Sep 17 00:00:00 2001
+From 8250683de1ca5e4c1c975e6365f7a817b33461b4 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sun, 17 Jan 2016 00:50:50 +0100
 Subject: [PATCH] ntdll/tests: Add basic tests for RtlQueryPackageIdentity.
@@ -9,7 +9,7 @@ Subject: [PATCH] ntdll/tests: Add basic tests for RtlQueryPackageIdentity.
  2 files changed, 81 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/ntdll/tests/Makefile.in b/dlls/ntdll/tests/Makefile.in
-index ed15c51339f3..e4ae568532ea 100644
+index ed15c51339f..e4ae568532e 100644
 --- a/dlls/ntdll/tests/Makefile.in
 +++ b/dlls/ntdll/tests/Makefile.in
 @@ -1,5 +1,5 @@
@@ -20,7 +20,7 @@ index ed15c51339f3..e4ae568532ea 100644
  C_SRCS = \
  	atom.c \
 diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c
-index 94c6b582f36b..c9482e782069 100644
+index 897be4fcd12..e7fef1a79ad 100644
 --- a/dlls/ntdll/tests/rtl.c
 +++ b/dlls/ntdll/tests/rtl.c
 @@ -27,6 +27,9 @@
@@ -53,8 +53,8 @@ index 94c6b582f36b..c9482e782069 100644
          pLdrRegisterDllNotification = (void *)GetProcAddress(hntdll, "LdrRegisterDllNotification");
          pLdrUnregisterDllNotification = (void *)GetProcAddress(hntdll, "LdrUnregisterDllNotification");
      }
-@@ -3483,6 +3492,76 @@ static void test_LdrRegisterDllNotification(void)
-     pLdrUnregisterDllNotification(cookie);
+@@ -3664,6 +3673,76 @@ static void test_RtlDestroyHeap(void)
+     RtlRemoveVectoredExceptionHandler( handler );
  }
  
 +static void test_RtlQueryPackageIdentity(void)
@@ -130,14 +130,14 @@ index 94c6b582f36b..c9482e782069 100644
  START_TEST(rtl)
  {
      InitFunctionPtrs();
-@@ -3521,6 +3600,7 @@ START_TEST(rtl)
+@@ -3702,6 +3781,7 @@ START_TEST(rtl)
      test_RtlInitializeCriticalSectionEx();
      test_RtlLeaveCriticalSection();
      test_LdrEnumerateLoadedModules();
 +    test_RtlQueryPackageIdentity();
      test_RtlMakeSelfRelativeSD();
      test_LdrRegisterDllNotification();
- }
+     test_DbgPrint();
 -- 
-2.26.2
+2.29.2
 

patches/patchinstall.sh

@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "65d917402f43d6c061668cff811f5fd6729d5750"
+	echo "bedfb9cae224a369efa4588332a5518dbee57035"
 }
 
 # Show version information
@@ -2843,7 +2843,7 @@ fi
 # |   *	[#37149] Calculate msvcrt exponential math operations with higher precision
 # |
 # | Modified files:
-# |   *	dlls/msvcrt/math.c, dlls/msvcrt/unixlib.c
+# |   *	dlls/msvcrt/unixlib.c
 # |
 if test "$enable_msvcrt_Math_Precision" -eq 1; then
 	patch_apply msvcrt-Math_Precision/0001-msvcrt-Calculate-sinh-cosh-exp-pow-with-higher-preci.patch

staging/upstream-commit

@@ -1 +1 @@
-65d917402f43d6c061668cff811f5fd6729d5750
+bedfb9cae224a369efa4588332a5518dbee57035