react-native-windows 0.67.5 → 0.67.8

package/CHANGELOG.json

@@ -1,6 +1,144 @@
 {
   "name": "react-native-windows",
   "entries": [
+    {
+      "date": "Mon, 25 Apr 2022 15:11:22 GMT",
+      "tag": "react-native-windows_v0.67.8",
+      "version": "0.67.8",
+      "comments": {
+        "patch": [
+          {
+            "author": "vmorozov@microsoft.com",
+            "package": "react-native-windows",
+            "commit": "d317482299129e89a8bdf57a8ccefe6238e0a541",
+            "comment": "Fix Sequential DispatchQueue deadlock on shutdown"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Mon, 04 Apr 2022 15:13:28 GMT",
+      "tag": "react-native-windows_v0.67.7",
+      "version": "0.67.7",
+      "comments": {
+        "patch": [
+          {
+            "author": "asklar@microsoft.com",
+            "package": "react-native-windows",
+            "commit": "not available",
+            "comment": "MustBeNoExceptVoidFunctor should depend on the template type parameter to avoid being evaluated too early (#9609)"
+          },
+          {
+            "author": "34109996+chiaramooney@users.noreply.github.com",
+            "package": "react-native-windows",
+            "commit": "not available",
+            "comment": "Promote 0.67 to legacy"
+          },
+          {
+            "author": "beachball",
+            "package": "react-native-windows",
+            "comment": "Bump @react-native-windows/cli to v0.67.2",
+            "commit": "4d4f19bef79e0fb2f6198b18c9e77d0da98a6938"
+          },
+          {
+            "author": "beachball",
+            "package": "react-native-windows",
+            "comment": "Bump @react-native-windows/virtualized-list to v0.67.1",
+            "commit": "4d4f19bef79e0fb2f6198b18c9e77d0da98a6938"
+          },
+          {
+            "author": "beachball",
+            "package": "react-native-windows",
+            "comment": "Bump @react-native-windows/codegen to v0.67.1",
+            "commit": "4d4f19bef79e0fb2f6198b18c9e77d0da98a6938"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Mon, 04 Apr 2022 15:12:55 GMT",
+      "tag": "react-native-windows_v0.67.7",
+      "version": "0.67.7",
+      "comments": {
+        "patch": [
+          {
+            "author": "asklar@microsoft.com",
+            "package": "react-native-windows",
+            "commit": "e92602643cb768e9ce34430e9800d76769a31a2a",
+            "comment": "MustBeNoExceptVoidFunctor should depend on the template type parameter to avoid being evaluated too early (#9609)"
+          },
+          {
+            "author": "34109996+chiaramooney@users.noreply.github.com",
+            "package": "react-native-windows",
+            "commit": "f4f970be35618e9942c5c96e6c15c88f8426c91c",
+            "comment": "Promote 0.67 to legacy"
+          },
+          {
+            "author": "beachball",
+            "package": "react-native-windows",
+            "comment": "Bump @react-native-windows/cli to v0.67.2",
+            "commit": "e92602643cb768e9ce34430e9800d76769a31a2a"
+          },
+          {
+            "author": "beachball",
+            "package": "react-native-windows",
+            "comment": "Bump @react-native-windows/virtualized-list to v0.67.1",
+            "commit": "e92602643cb768e9ce34430e9800d76769a31a2a"
+          },
+          {
+            "author": "beachball",
+            "package": "react-native-windows",
+            "comment": "Bump @react-native-windows/codegen to v0.67.1",
+            "commit": "e92602643cb768e9ce34430e9800d76769a31a2a"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Tue, 29 Mar 2022 17:35:30 GMT",
+      "tag": "react-native-windows_v0.67.6",
+      "version": "0.67.6",
+      "comments": {
+        "patch": [
+          {
+            "author": "asklar@microsoft.com",
+            "package": "react-native-windows",
+            "commit": "not available",
+            "comment": "Guard against crashes due to cancelations and other errors from BitmapSource/SvgImageSource SetSourceAsync"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Tue, 29 Mar 2022 17:35:16 GMT",
+      "tag": "react-native-windows_v0.67.6",
+      "version": "0.67.6",
+      "comments": {
+        "patch": [
+          {
+            "author": "asklar@microsoft.com",
+            "package": "react-native-windows",
+            "commit": "cca2db0ac45b646f7a157a34564e221846eaf55b",
+            "comment": "Guard against crashes due to cancelations and other errors from BitmapSource/SvgImageSource SetSourceAsync"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Mon, 21 Mar 2022 15:13:26 GMT",
+      "tag": "react-native-windows_v0.67.5",
+      "version": "0.67.5",
+      "comments": {
+        "patch": [
+          {
+            "author": "asklar@microsoft.com",
+            "package": "react-native-windows",
+            "commit": "not available",
+            "comment": "move some DLLs to delayload"
+          }
+        ]
+      }
+    },
     {
       "date": "Mon, 21 Mar 2022 15:13:12 GMT",
       "tag": "react-native-windows_v0.67.5",

package/CHANGELOG.md

@@ -1,17 +1,73 @@
 # Change Log - react-native-windows
 
-This log was last generated on Mon, 21 Mar 2022 15:13:12 GMT and should not be manually modified.
+This log was last generated on Mon, 25 Apr 2022 15:11:22 GMT and should not be manually modified.
 
 <!-- Start content -->
 
-## 0.67.5
+## 0.67.8
 
-Mon, 21 Mar 2022 15:13:12 GMT
+Mon, 25 Apr 2022 15:11:22 GMT
 
 ### Patches
 
-- move some DLLs to delayload (asklar@microsoft.com)
+- Fix Sequential DispatchQueue deadlock on shutdown (vmorozov@microsoft.com)
 
+## 0.67.7
+
+Mon, 04 Apr 2022 15:13:28 GMT
+
+### Patches
+
+- MustBeNoExceptVoidFunctor should depend on the template type parameter to avoid being evaluated too early (#9609) (asklar@microsoft.com)
+- Promote 0.67 to legacy (34109996+chiaramooney@users.noreply.github.com)
+- Bump @react-native-windows/cli to v0.67.2
+- Bump @react-native-windows/virtualized-list to v0.67.1
+- Bump @react-native-windows/codegen to v0.67.1
+
+## 0.67.7
+
+Mon, 04 Apr 2022 15:12:55 GMT
+
+### Patches
+
+- MustBeNoExceptVoidFunctor should depend on the template type parameter to avoid being evaluated too early (#9609) (asklar@microsoft.com)
+- Promote 0.67 to legacy (34109996+chiaramooney@users.noreply.github.com)
+- Bump @react-native-windows/cli to v0.67.2
+- Bump @react-native-windows/virtualized-list to v0.67.1
+- Bump @react-native-windows/codegen to v0.67.1
+
+## 0.67.6
+
+Tue, 29 Mar 2022 17:35:30 GMT
+
+### Patches
+
+- Guard against crashes due to cancelations and other errors from BitmapSource/SvgImageSource SetSourceAsync (asklar@microsoft.com)
+
+## 0.67.6
+
+Tue, 29 Mar 2022 17:35:16 GMT
+
+### Patches
+
+- Guard against crashes due to cancelations and other errors from BitmapSource/SvgImageSource SetSourceAsync (asklar@microsoft.com)
+
+## 0.67.5
+
+Mon, 21 Mar 2022 15:13:26 GMT
+
+### Patches
+
+- move some DLLs to delayload (asklar@microsoft.com)
+
+## 0.67.5
+
+Mon, 21 Mar 2022 15:13:12 GMT
+
+### Patches
+
+- move some DLLs to delayload (asklar@microsoft.com)
+
 ## 0.67.4
 
 Mon, 14 Mar 2022 15:14:00 GMT

package/Microsoft.ReactNative/Views/Image/ReactImage.cpp

@@ -184,7 +184,7 @@ winrt::IAsyncOperation<winrt::InMemoryRandomAccessStream> ReactImage::GetImageMe
 }
 template <typename TImage>
 std::wstring GetUriFromImage(const TImage &image) {
-  return image.UriSource().ToString().c_str();
+  return image.UriSource() ? image.UriSource().ToString().c_str() : L"<no Uri available>";
 }
 template <>
 std::wstring GetUriFromImage(const winrt::Uri &uri) {
@@ -193,7 +193,9 @@ std::wstring GetUriFromImage(const winrt::Uri &uri) {
 
 template <typename TImage>
 void ImageFailed(const TImage &image, const xaml::ExceptionRoutedEventArgs &args) {
+#ifdef DEBUG
   cdebug << L"Failed to load image " << GetUriFromImage(image) << L" (" << args.ErrorMessage().c_str() << L")\n";
+#endif
 }
 
 // TSourceFailedEventArgs can be either LoadedImageSourceLoadCompletedEventArgs or
@@ -203,10 +205,12 @@ void ImageFailed(const TImage &image, const xaml::ExceptionRoutedEventArgs &args
 template <typename TImage, typename TSourceFailedEventArgs>
 void ImageFailed(const TImage &image, const TSourceFailedEventArgs &args) {
   // https://docs.microsoft.com/en-us/uwp/api/windows.ui.xaml.media.loadedimagesourceloadstatus
+#ifdef DEBUG
   constexpr std::wstring_view statusNames[] = {L"Success", L"NetworkError", L"InvalidFormat", L"Other"};
   const auto status = (int)args.Status();
   assert(0 <= status && status < ARRAYSIZE(statusNames));
   cdebug << L"Failed to load image " << GetUriFromImage(image) << L" (" << statusNames[status] << L")\n";
+#endif
 }
 
 winrt::fire_and_forget ReactImage::SetBackground(bool fireLoadEndEvent) {
@@ -342,7 +346,22 @@ winrt::fire_and_forget ReactImage::SetBackground(bool fireLoadEndEvent) {
         }
 
         if (fromStream) {
-          co_await svgImageSource.SetSourceAsync(memoryStream);
+          try {
+            co_await svgImageSource.SetSourceAsync(memoryStream);
+          } catch (const winrt::hresult_error &) {
+            /*
+                winrt::hresult_canceled
+                If the app changes the image source again via SetSourceAsync, SetSource or UriSource while a
+               SetSourceAsync call is already in progress, the pending SetSourceAsync action will throw a
+               TaskCanceledException and set the Status to Canceled.
+
+                WINCODEC_ERR_BADIMAGE
+                In low memory situations (most likely on lower-memory phones), it is possible for an exception to be
+               raised with the message "The image is unrecognized" and an HRESULT of 0x88982F60. While this exception
+               ordinarily indicates bad data, if your app is close to its memory limit then the cause of the exception
+               is likely to be low memory. In that case, we recommend that you free memory and try again.
+            */
+          }
         } else {
           svgImageSource.UriSource(uri);
         }
@@ -385,7 +404,22 @@ winrt::fire_and_forget ReactImage::SetBackground(bool fireLoadEndEvent) {
         }
 
         if (fromStream) {
-          co_await bitmapImage.SetSourceAsync(memoryStream);
+          try {
+            co_await bitmapImage.SetSourceAsync(memoryStream);
+          } catch (const winrt::hresult_error &) {
+            /*
+                winrt::hresult_canceled
+                If the app changes the image source again via SetSourceAsync, SetSource or UriSource while a
+               SetSourceAsync call is already in progress, the pending SetSourceAsync action will throw a
+               TaskCanceledException and set the Status to Canceled.
+
+                WINCODEC_ERR_BADIMAGE
+                In low memory situations (most likely on lower-memory phones), it is possible for an exception to be
+               raised with the message "The image is unrecognized" and an HRESULT of 0x88982F60. While this exception
+               ordinarily indicates bad data, if your app is close to its memory limit then the cause of the exception
+               is likely to be low memory. In that case, we recommend that you free memory and try again.
+            */
+          }
         } else {
           bitmapImage.UriSource(uri);
 

package/Mso/dispatchQueue/dispatchQueue.h

@@ -723,9 +723,14 @@ inline DispatchTaskImpl<TInvoke, TOnCancel>::~DispatchTaskImpl() noexcept {
   }
 }
 
+namespace details {
+template <typename>
+constexpr bool always_false = false;
+}
+
 template <typename T>
 inline void MustBeNoExceptVoidFunctor() {
-  static_assert(false, __FUNCTION__ ": not a noexcept callable functor returning void");
+  static_assert(details::always_false<T>, __FUNCTION__ ": not a noexcept callable functor returning void");
 }
 
 template <typename TInvoke, typename TOnCancel>

package/Mso/src/dispatchQueue/threadPoolScheduler_win.cpp

@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
+#include <utility>
 #include "dispatchQueue/dispatchQueue.h"
 #include "queueService.h"
 
@@ -29,6 +30,13 @@ struct ThreadPoolSchedulerWin : Mso::UnknownObject<IDispatchQueueScheduler> {
   void Shutdown() noexcept override;
   void AwaitTermination() noexcept override;
 
+ public: // Used by test APIs
+  static void EnableThreadPoolWorkTracking(bool enable) noexcept;
+  static void WaitForThreadPoolWorkCompletion() noexcept;
+
+ private: // Used by test APIs
+  static void TrackThreadPoolWork(const std::shared_ptr<TP_WORK> &work) noexcept;
+
  private:
   struct ThreadAccessGuard {
     ThreadAccessGuard(ThreadPoolSchedulerWin *scheduler) noexcept;
@@ -42,12 +50,29 @@ struct ThreadPoolSchedulerWin : Mso::UnknownObject<IDispatchQueueScheduler> {
   };
 
  private:
-  std::unique_ptr<TP_WORK, ThreadPoolWorkDeleter> m_threadPoolWork;
+  std::shared_ptr<TP_WORK> m_threadPoolWork;
   Mso::WeakPtr<IDispatchQueueService> m_queue;
   const uint32_t m_maxThreads{1};
   std::atomic<uint32_t> m_usedThreads{0};
 
   constexpr static uint32_t MaxConcurrentThreads{64};
+
+ private:
+  static std::mutex s_threadPoolWorkMutex;
+  static bool s_enableThreadPoolWorkTracking;
+  static std::vector<std::shared_ptr<TP_WORK>> s_trackedThreadPoolWork;
+};
+
+// Track the ThreadPoolSchedulerWin instance used by current thread.
+// We use it to avoid a deadlock on queue shutdown.
+struct ThreadPoolSchedulerWinContext {
+  ThreadPoolSchedulerWinContext(ThreadPoolSchedulerWin *scheduler) noexcept;
+  ~ThreadPoolSchedulerWinContext() noexcept;
+  static ThreadPoolSchedulerWin *CurrentScheduler() noexcept;
+
+ private:
+  static thread_local ThreadPoolSchedulerWin *tls_scheduler;
+  ThreadPoolSchedulerWin *m_prevScheduler{nullptr};
 };
 
 //=============================================================================
@@ -64,9 +89,15 @@ void ThreadPoolWorkDeleter::operator()(TP_WORK *tpWork) noexcept {
 // ThreadPoolSchedulerWin implementation
 //=============================================================================
 
+std::mutex ThreadPoolSchedulerWin::s_threadPoolWorkMutex;
+bool ThreadPoolSchedulerWin::s_enableThreadPoolWorkTracking{false};
+std::vector<std::shared_ptr<TP_WORK>> ThreadPoolSchedulerWin::s_trackedThreadPoolWork;
+
 ThreadPoolSchedulerWin::ThreadPoolSchedulerWin(uint32_t maxThreads) noexcept
-    : m_threadPoolWork{::CreateThreadpoolWork(WorkCallback, this, nullptr)},
-      m_maxThreads{maxThreads == 0 ? MaxConcurrentThreads : maxThreads} {}
+    : m_threadPoolWork{::CreateThreadpoolWork(WorkCallback, this, nullptr), ThreadPoolWorkDeleter{}},
+      m_maxThreads{maxThreads == 0 ? MaxConcurrentThreads : maxThreads} {
+  TrackThreadPoolWork(m_threadPoolWork);
+}
 
 ThreadPoolSchedulerWin::~ThreadPoolSchedulerWin() noexcept {
   AwaitTermination();
@@ -78,6 +109,7 @@ ThreadPoolSchedulerWin::~ThreadPoolSchedulerWin() noexcept {
     _Inout_ PTP_WORK /*work*/) {
   // The ThreadPoolSchedulerWin is alive here because m_threadPoolWork must be completed before it is destroyed.
   ThreadPoolSchedulerWin *self = static_cast<ThreadPoolSchedulerWin *>(context);
+  ThreadPoolSchedulerWinContext schedulerContext(self);
 
   if (auto queue = self->m_queue.GetStrongPtr()) {
     auto endTime = std::chrono::steady_clock::now() + 100ms;
@@ -129,7 +161,38 @@ void ThreadPoolSchedulerWin::Shutdown() noexcept {
 }
 
 void ThreadPoolSchedulerWin::AwaitTermination() noexcept {
-  ::WaitForThreadpoolWorkCallbacks(m_threadPoolWork.get(), false);
+  // Avoid deadlock when the dispatch queue and ThreadPoolSchedulerWin are released from inside of a task.
+  if (ThreadPoolSchedulerWinContext::CurrentScheduler() != this) {
+    ::WaitForThreadpoolWorkCallbacks(m_threadPoolWork.get(), false);
+  }
+}
+
+void ThreadPoolSchedulerWin::EnableThreadPoolWorkTracking(bool enable) noexcept {
+  std::vector<std::shared_ptr<TP_WORK>> tpWorkToStopTracking;
+  {
+    std::scoped_lock lock{s_threadPoolWorkMutex};
+    s_enableThreadPoolWorkTracking = enable;
+    // Reset all previously tracked work
+    tpWorkToStopTracking = std::move(s_trackedThreadPoolWork);
+  }
+}
+
+void ThreadPoolSchedulerWin::WaitForThreadPoolWorkCompletion() noexcept {
+  std::vector<std::shared_ptr<TP_WORK>> tpWorkToTrack;
+  {
+    std::scoped_lock lock{s_threadPoolWorkMutex};
+    tpWorkToTrack = std::move(s_trackedThreadPoolWork);
+  }
+  for (std::shared_ptr<TP_WORK> &tpWork : tpWorkToTrack) {
+    ::WaitForThreadpoolWorkCallbacks(tpWork.get(), false);
+  }
+}
+
+void ThreadPoolSchedulerWin::TrackThreadPoolWork(const std::shared_ptr<TP_WORK> &tpWork) noexcept {
+  std::scoped_lock lock{s_threadPoolWorkMutex};
+  if (s_enableThreadPoolWorkTracking) {
+    s_trackedThreadPoolWork.push_back(tpWork);
+  }
 }
 
 //=============================================================================
@@ -151,6 +214,23 @@ ThreadPoolSchedulerWin::ThreadAccessGuard::~ThreadAccessGuard() noexcept {
   return tls_scheduler == scheduler;
 }
 
+//=============================================================================
+// ThreadPoolSchedulerWinContext implementation
+//=============================================================================
+
+thread_local ThreadPoolSchedulerWin *ThreadPoolSchedulerWinContext::tls_scheduler{nullptr};
+
+ThreadPoolSchedulerWinContext::ThreadPoolSchedulerWinContext(ThreadPoolSchedulerWin *scheduler) noexcept
+    : m_prevScheduler(std::exchange(tls_scheduler, scheduler)) {}
+
+ThreadPoolSchedulerWinContext::~ThreadPoolSchedulerWinContext() noexcept {
+  std::exchange(tls_scheduler, m_prevScheduler);
+}
+
+ThreadPoolSchedulerWin *ThreadPoolSchedulerWinContext::CurrentScheduler() noexcept {
+  return tls_scheduler;
+}
+
 //=============================================================================
 // DispatchQueueStatic::MakeThreadPoolScheduler implementation
 //=============================================================================
@@ -160,4 +240,16 @@ ThreadPoolSchedulerWin::ThreadAccessGuard::~ThreadAccessGuard() noexcept {
   return Mso::Make<ThreadPoolSchedulerWin, IDispatchQueueScheduler>(maxThreads);
 }
 
+//=============================================================================
+// Test specific functions
+//=============================================================================
+
+void Test_ThreadPoolSchedulerWin_EnableThreadPoolWorkTracking(bool enable) noexcept {
+  ThreadPoolSchedulerWin::EnableThreadPoolWorkTracking(enable);
+}
+
+void Test_ThreadPoolSchedulerWin_WaitForThreadPoolWorkCompletion() noexcept {
+  ThreadPoolSchedulerWin::WaitForThreadPoolWorkCompletion();
+}
+
 } // namespace Mso

package/PropertySheets/Generated/PackageVersion.g.props

@@ -10,10 +10,10 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ReactNativeWindowsVersion>0.67.5</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.67.8</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
     <ReactNativeWindowsMinor>67</ReactNativeWindowsMinor>
-    <ReactNativeWindowsPatch>5</ReactNativeWindowsPatch>
+    <ReactNativeWindowsPatch>8</ReactNativeWindowsPatch>
     <ReactNativeWindowsCanary>false</ReactNativeWindowsCanary>
   </PropertyGroup>
 </Project>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-windows",
-  "version": "0.67.5",
+  "version": "0.67.8",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -26,8 +26,8 @@
     "@react-native-community/cli": "^6.0.0",
     "@react-native-community/cli-platform-android": "^6.0.0",
     "@react-native-community/cli-platform-ios": "^6.0.0",
-    "@react-native-windows/cli": "0.67.1",
-    "@react-native-windows/virtualized-list": "0.67.0",
+    "@react-native-windows/cli": "0.67.2",
+    "@react-native-windows/virtualized-list": "0.67.1",
     "@react-native/assets": "1.0.0",
     "@react-native/normalize-color": "2.0.0",
     "@react-native/polyfills": "2.0.0",
@@ -57,7 +57,7 @@
     "ws": "^6.1.4"
   },
   "devDependencies": {
-    "@react-native-windows/codegen": "0.67.0",
+    "@react-native-windows/codegen": "0.67.1",
     "@rnw-scripts/eslint-config": "1.1.8",
     "@rnw-scripts/jest-out-of-tree-snapshot-resolver": "^1.0.2",
     "@rnx-kit/jest-preset": "^0.1.0",
@@ -83,7 +83,7 @@
     "react-native": "^0.67.0"
   },
   "beachball": {
-    "defaultNpmTag": "latest",
+    "defaultNpmTag": "v0.67-stable",
     "gitTags": true,
     "disallowedChangeTypes": [
       "major",