react-native-windows 0.73.0-preview.3 → 0.73.0-preview.4

package/Microsoft.ReactNative/ReactHost/MsoReactContext.cpp

@@ -121,6 +121,42 @@ bool ReactSettingsSnapshot::UseDeveloperSupport() const noexcept {
   return false;
 }
 
+struct WeakRefPropertyBag : winrt::implements<WeakRefPropertyBag, winrt::Microsoft::ReactNative::IReactPropertyBag> {
+  WeakRefPropertyBag(winrt::Microsoft::ReactNative::IReactPropertyBag propertyBag) : m_wkPropBag(propertyBag) {}
+
+  IInspectable Get(winrt::Microsoft::ReactNative::IReactPropertyName const &name) noexcept {
+    if (auto propBag = m_wkPropBag.get()) {
+      return propBag.Get(name);
+    }
+    return nullptr;
+  }
+
+  IInspectable GetOrCreate(
+      winrt::Microsoft::ReactNative::IReactPropertyName const &name,
+      winrt::Microsoft::ReactNative::ReactCreatePropertyValue const &createValue) noexcept {
+    if (auto propBag = m_wkPropBag.get()) {
+      return propBag.GetOrCreate(name, createValue);
+    }
+    return nullptr;
+  }
+
+  IInspectable Set(winrt::Microsoft::ReactNative::IReactPropertyName const &name, IInspectable const &value) noexcept {
+    if (auto propBag = m_wkPropBag.get()) {
+      return propBag.Set(name, value);
+    }
+    return nullptr;
+  }
+
+  void CopyFrom(winrt::Microsoft::ReactNative::IReactPropertyBag const &value) noexcept {
+    if (auto propBag = m_wkPropBag.get()) {
+      return propBag.CopyFrom(value);
+    }
+  }
+
+ private:
+  winrt::weak_ref<winrt::Microsoft::ReactNative::IReactPropertyBag> m_wkPropBag;
+};
+
 //=============================================================================================
 // ReactContext implementation
 //=============================================================================================
@@ -131,7 +167,7 @@ ReactContext::ReactContext(
     winrt::Microsoft::ReactNative::IReactNotificationService const &notifications) noexcept
     : m_reactInstance{std::move(reactInstance)},
       m_settings{Mso::Make<ReactSettingsSnapshot>(Mso::Copy(m_reactInstance))},
-      m_properties{properties},
+      m_properties{winrt::make<WeakRefPropertyBag>(properties)},
       m_notifications{notifications} {}
 
 void ReactContext::Destroy() noexcept {

package/Microsoft.ReactNative/ReactHost/React.h

@@ -275,6 +275,9 @@ struct ReactOptions {
       winrt::Microsoft::ReactNative::IReactPropertyBag const &properties,
       JSIEngine value) noexcept;
 
+  bool JsiEngineV8NodeApi() const noexcept;
+  static bool JsiEngineV8NodeApi(winrt::Microsoft::ReactNative::IReactPropertyBag const &properties) noexcept;
+
   //! Enable live reload to load the source bundle from the React Native packager.
   //! When the file is saved, the packager will trigger reloading.
   void SetUseLiveReload(bool enable) noexcept;

package/Microsoft.ReactNative/ReactHost/ReactHost.cpp

@@ -3,6 +3,7 @@
 
 #include "ReactHost.h"
 #include <Future/FutureWait.h>
+#include <ReactPropertyBag.h>
 #include <winrt/Windows.Foundation.h>
 
 namespace Mso::React {
@@ -35,6 +36,12 @@ winrt::Microsoft::ReactNative::IReactPropertyName JSIEngineProperty() noexcept {
   return propName;
 }
 
+winrt::Microsoft::ReactNative::ReactPropertyId<bool> JSIEngineV8NodeApiProperty() noexcept {
+  static winrt::Microsoft::ReactNative::ReactPropertyId<bool> propId{
+      L"ReactNative.ReactOptions", L"JSIEngineV8NodeApi"};
+  return propId;
+}
+
 winrt::Microsoft::ReactNative::IReactPropertyName LiveReloadEnabledProperty() noexcept {
   static winrt::Microsoft::ReactNative::IReactPropertyName propName =
       winrt::Microsoft::ReactNative::ReactPropertyBagHelper::GetName(
@@ -137,6 +144,15 @@ void ReactOptions::SetJsiEngine(JSIEngine value) noexcept {
   properties.Set(JSIEngineProperty(), winrt::box_value(static_cast<uint32_t>(value)));
 }
 
+/*static*/ bool ReactOptions::JsiEngineV8NodeApi(
+    winrt::Microsoft::ReactNative::IReactPropertyBag const &properties) noexcept {
+  return winrt::Microsoft::ReactNative::ReactPropertyBag(properties).Get(JSIEngineV8NodeApiProperty()).value_or(false);
+}
+
+bool ReactOptions::JsiEngineV8NodeApi() const noexcept {
+  return JsiEngineV8NodeApi(Properties);
+}
+
 /*static*/ void ReactOptions::SetUseFastRefresh(
     winrt::Microsoft::ReactNative::IReactPropertyBag const &properties,
     bool value) noexcept {

package/Microsoft.ReactNative/ReactHost/ReactInstanceWin.cpp

@@ -76,7 +76,9 @@
 
 #if defined(USE_V8)
 #include <winrt/Windows.Storage.h>
+#include "BaseScriptStoreImpl.h"
 #include "JSI/V8RuntimeHolder.h"
+#include "V8JSIRuntimeHolder.h"
 #endif // USE_V8
 
 #include "RedBox.h"
@@ -253,6 +255,11 @@ ReactInstanceWin::ReactInstanceWin(
   m_whenDestroyedResult =
       m_whenDestroyed.AsFuture().Then<Mso::Executors::Inline>([whenLoaded = m_whenLoaded,
                                                                onDestroyed = m_options.OnInstanceDestroyed,
+                                                               // instance might be the only thing keeping
+                                                               // the propertyBag alive.
+                                                               // We want it to remain alive for the
+                                                               // InstanceDestroyed callbacks
+                                                               propBag = m_options.Properties,
                                                                reactContext = m_reactContext]() noexcept {
         whenLoaded.TryCancel(); // It only has an effect if whenLoaded was not set before
         Microsoft::ReactNative::HermesRuntimeHolder::storeTo(ReactPropertyBag(reactContext->Properties()), nullptr);
@@ -491,7 +498,6 @@ void ReactInstanceWin::Initialize() noexcept {
 
           switch (m_options.JsiEngine()) {
             case JSIEngine::Hermes: {
-              // TODO: Should we use UwpPreparedScriptStore?
               if (Microsoft::ReactNative::HasPackageIdentity()) {
                 preparedScriptStore =
                     std::make_unique<facebook::react::BasePreparedScriptStoreImpl>(getApplicationTempFolder());
@@ -529,8 +535,18 @@ void ReactInstanceWin::Initialize() noexcept {
               enableMultiThreadSupport = Microsoft::ReactNative::IsFabricEnabled(m_reactContext->Properties());
 #endif // USE_FABRIC
 
-              devSettings->jsiRuntimeHolder = std::make_shared<Microsoft::ReactNative::V8RuntimeHolder>(
-                  devSettings, m_jsMessageThread.Load(), std::move(preparedScriptStore), enableMultiThreadSupport);
+              if (m_options.JsiEngineV8NodeApi()) {
+                devSettings->jsiRuntimeHolder = std::make_shared<Microsoft::ReactNative::V8RuntimeHolder>(
+                    devSettings, m_jsMessageThread.Load(), std::move(preparedScriptStore), enableMultiThreadSupport);
+              } else {
+                devSettings->jsiRuntimeHolder = std::make_shared<facebook::react::V8JSIRuntimeHolder>(
+                    devSettings,
+                    m_jsMessageThread.Load(),
+                    std::move(scriptStore),
+                    std::move(preparedScriptStore),
+                    enableMultiThreadSupport);
+              }
+
               break;
             }
 #endif // USE_V8

package/Microsoft.ReactNative.Cxx/Microsoft.ReactNative.Cxx.vcxitems

@@ -36,6 +36,7 @@
         $(NodeApiJsiSrcDir);
         %(AdditionalIncludeDirectories)
       </AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>JSI_VERSION=10;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Midl>
       <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

package/PropertySheets/External/Microsoft.ReactNative.Composition.Common.props

@@ -8,5 +8,13 @@
   Do not make any changes here unless it applies to ALL such projects.
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Target Name="EnsureUseHermes" BeforeTargets="PrepareForBuild" Condition="'$(UseHermes)' == 'false'">
+    <Warning Text="Property 'UseHermes' was set to 'false'. Projects built against Microsoft.ReactNative.Composition require Hermes and it will be set to true." />
+  </Target>
+
+  <PropertyGroup>
+    <UseHermes>true</UseHermes>
+  </PropertyGroup>
+
   <Import Project="$(MSBuildThisFileDirectory)Microsoft.ReactNative.Common.props" />
 </Project>

package/PropertySheets/Generated/PackageVersion.g.props

@@ -10,11 +10,11 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ReactNativeWindowsVersion>0.73.0-preview.3</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.73.0-preview.4</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
     <ReactNativeWindowsMinor>73</ReactNativeWindowsMinor>
     <ReactNativeWindowsPatch>0</ReactNativeWindowsPatch>
     <ReactNativeWindowsCanary>false</ReactNativeWindowsCanary>
-    <ReactNativeWindowsCommitId>727387f5fd3b039d39d3b58d600b08204690b6e7</ReactNativeWindowsCommitId>
+    <ReactNativeWindowsCommitId>cbdae1dd7cb7fd0ce521e3812e81d8c646d9ca6a</ReactNativeWindowsCommitId>
   </PropertyGroup>
 </Project>

package/PropertySheets/JSEngine.props

@@ -12,7 +12,7 @@
   <PropertyGroup>
     <JsEnginePropsDefined>true</JsEnginePropsDefined>
     <!-- Enabling this will (1) Include hermes glues in the Microsoft.ReactNative binaries AND (2) Make hermes the default engine -->
-    <UseHermes Condition="'$(UseHermes)' == ''">false</UseHermes>
+    <UseHermes Condition="'$(UseHermes)' == ''">true</UseHermes>
     <!-- This will be true if (1) the client want to use hermes by setting UseHermes to true OR (2) We are building for UWP where dynamic switching is enabled -->
     <HermesVersion Condition="'$(HermesVersion)' == ''">0.1.15</HermesVersion>
     <HermesPackage Condition="'$(HermesPackage)' == '' And Exists('$(PkgMicrosoft_JavaScript_Hermes)')">$(PkgMicrosoft_JavaScript_Hermes)</HermesPackage>
@@ -24,9 +24,10 @@
     <EnableDevServerHBCBundles Condition="'$(EnableDevServerHBCBundles)' == ''">false</EnableDevServerHBCBundles>
 
     <UseV8 Condition="'$(UseV8)' == ''">false</UseV8>
-    <V8Version Condition="'$(V8Version)' == ''">0.71.5</V8Version>
+    <V8Version Condition="'$(V8Version)' == ''">0.71.8</V8Version>
     <V8PackageName>ReactNative.V8Jsi.Windows</V8PackageName>
     <V8PackageName Condition="'$(V8AppPlatform)' != 'win32'">$(V8PackageName).UWP</V8PackageName>
+    <V8Package>$(NuGetPackageRoot)\$(V8PackageName).$(V8Version)</V8Package>
   </PropertyGroup>
 
 </Project>

package/PropertySheets/React.Cpp.props

@@ -56,6 +56,7 @@
       <PreprocessorDefinitions Condition="'$(EnableDevServerHBCBundles)'=='true'">ENABLE_DEVSERVER_HBCBUNDLES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(UseV8)'=='true'">USE_V8;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(UseFabric)'=='true'">USE_FABRIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>JSI_VERSION=10;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
 

package/ReactCommon/ReactCommon.vcxproj

@@ -241,8 +241,8 @@
   <!-- Reenable this task if we need to temporarily replace any folly files for fixes, while we wait for PRs to land in folly -->
   <Target Name="ApplyReactCommonTemporaryPatch" BeforeTargets="PrepareForBuild" DependsOnTargets="UnzipNodeApiJsi">
     <ItemGroup>
-      <NodeApiJsiFiles Include="$([MSBuild]::NormalizePath($(NodeApiJsiDir)..))\jsi\**\*.*" />
-   </ItemGroup>
+      <NodeApiJsiFiles Include="$([MSBuild]::NormalizePath($(NodeApiJsiDir)))\jsi\**\*.*" />
+    </ItemGroup>
     <Copy DestinationFiles="@(NodeApiJsiFiles->'$(ReactNativeDir)\ReactCommon\jsi\%(RecursiveDir)%(Filename)%(Extension)')" SourceFiles="@(NodeApiJsiFiles)" />
     <Copy DestinationFiles="@(TemporaryReactCommonPatchFiles->'$(ReactNativeDir)\ReactCommon\%(RecursiveDir)%(Filename)%(Extension)')" SourceFiles="@(TemporaryReactCommonPatchFiles)" />
   </Target>

package/ReactCommon/TEMP_UntilReactCommonUpdate/react/renderer/uimanager/UIManagerBinding.cpp

@@ -650,10 +650,10 @@ jsi::Value UIManagerBinding::get(
 
           onSuccessFunction.call(
               runtime,
-              {jsi::Value{runtime, (double)frame.origin.x},
-               jsi::Value{runtime, (double)frame.origin.y},
-               jsi::Value{runtime, (double)frame.size.width},
-               jsi::Value{runtime, (double)frame.size.height}});
+              {jsi::Value{(double)frame.origin.x},
+               jsi::Value{(double)frame.origin.y},
+               jsi::Value{(double)frame.size.width},
+               jsi::Value{(double)frame.size.height}});
           return jsi::Value::undefined();
         });
   }
@@ -695,12 +695,12 @@ jsi::Value UIManagerBinding::get(
           auto frame = layoutMetrics.frame;
           onSuccessFunction.call(
               runtime,
-              {jsi::Value{runtime, (double)originRelativeToParent.x},
-               jsi::Value{runtime, (double)originRelativeToParent.y},
-               jsi::Value{runtime, (double)frame.size.width},
-               jsi::Value{runtime, (double)frame.size.height},
-               jsi::Value{runtime, (double)frame.origin.x},
-               jsi::Value{runtime, (double)frame.origin.y}});
+              {jsi::Value{(double)originRelativeToParent.x},
+               jsi::Value{(double)originRelativeToParent.y},
+               jsi::Value{(double)frame.size.width},
+               jsi::Value{(double)frame.size.height},
+               jsi::Value{(double)frame.origin.x},
+               jsi::Value{(double)frame.origin.y}});
           return jsi::Value::undefined();
         });
   }
@@ -736,10 +736,10 @@ jsi::Value UIManagerBinding::get(
           auto frame = layoutMetrics.frame;
           onSuccessFunction.call(
               runtime,
-              {jsi::Value{runtime, (double)frame.origin.x},
-               jsi::Value{runtime, (double)frame.origin.y},
-               jsi::Value{runtime, (double)frame.size.width},
-               jsi::Value{runtime, (double)frame.size.height}});
+              {jsi::Value{(double)frame.origin.x},
+               jsi::Value{(double)frame.origin.y},
+               jsi::Value{(double)frame.size.width},
+               jsi::Value{(double)frame.size.height}});
           return jsi::Value::undefined();
         });
   }
@@ -886,10 +886,10 @@ jsi::Value UIManagerBinding::get(
           auto frame = layoutMetrics.frame;
           return jsi::Array::createWithElements(
               runtime,
-              jsi::Value{runtime, (double)frame.origin.x},
-              jsi::Value{runtime, (double)frame.origin.y},
-              jsi::Value{runtime, (double)frame.size.width},
-              jsi::Value{runtime, (double)frame.size.height});
+              jsi::Value{(double)frame.origin.x},
+              jsi::Value{(double)frame.origin.y},
+              jsi::Value{(double)frame.size.width},
+              jsi::Value{(double)frame.size.height});
         });
   }
 
@@ -1150,8 +1150,8 @@ jsi::Value UIManagerBinding::get(
           return jsi::Array::createWithElements(
               runtime,
               (*newestParentOfShadowNode).getInstanceHandle(runtime),
-              jsi::Value{runtime, (double)offsetTop},
-              jsi::Value{runtime, (double)offsetLeft});
+              jsi::Value{(double)offsetTop},
+              jsi::Value{(double)offsetLeft});
         });
   }
 
@@ -1217,12 +1217,8 @@ jsi::Value UIManagerBinding::get(
 
           return jsi::Array::createWithElements(
               runtime,
-              jsi::Value{
-                  runtime,
-                  scrollPosition.x == 0 ? 0 : (double)-scrollPosition.x},
-              jsi::Value{
-                  runtime,
-                  scrollPosition.y == 0 ? 0 : (double)-scrollPosition.y});
+              jsi::Value{scrollPosition.x == 0 ? 0 : (double)-scrollPosition.x},
+              jsi::Value{scrollPosition.y == 0 ? 0 : (double)-scrollPosition.y});
         });
   }
 
@@ -1291,8 +1287,8 @@ jsi::Value UIManagerBinding::get(
 
           return jsi::Array::createWithElements(
               runtime,
-              jsi::Value{runtime, std::round(scrollSize.width)},
-              jsi::Value{runtime, std::round(scrollSize.height)});
+              jsi::Value{(double)std::round(scrollSize.width)},
+              jsi::Value{(double)std::round(scrollSize.height)});
         });
   }
 
@@ -1343,8 +1339,8 @@ jsi::Value UIManagerBinding::get(
 
           return jsi::Array::createWithElements(
               runtime,
-              jsi::Value{runtime, std::round(paddingFrame.size.width)},
-              jsi::Value{runtime, std::round(paddingFrame.size.height)});
+              jsi::Value{(double)std::round(paddingFrame.size.width)},
+              jsi::Value{(double)std::round(paddingFrame.size.height)});
         });
   }
 
@@ -1395,10 +1391,10 @@ jsi::Value UIManagerBinding::get(
 
           return jsi::Array::createWithElements(
               runtime,
-              jsi::Value{runtime, std::round(layoutMetrics.borderWidth.top)},
-              jsi::Value{runtime, std::round(layoutMetrics.borderWidth.right)},
-              jsi::Value{runtime, std::round(layoutMetrics.borderWidth.bottom)},
-              jsi::Value{runtime, std::round(layoutMetrics.borderWidth.left)});
+              jsi::Value{(double)std::round(layoutMetrics.borderWidth.top)},
+              jsi::Value{(double)std::round(layoutMetrics.borderWidth.right)},
+              jsi::Value{(double)std::round(layoutMetrics.borderWidth.bottom)},
+              jsi::Value{(double)std::round(layoutMetrics.borderWidth.left)});
         });
   }
 

package/Shared/HermesRuntimeHolder.cpp

@@ -38,7 +38,7 @@ void NAPI_CDECL removeInspectorPage(int32_t pageId) noexcept;
 
 class HermesFuncResolver : public IFuncResolver {
  public:
-  HermesFuncResolver() : libHandle_(SafeLoadLibrary(L"hermes.dll")) {}
+  HermesFuncResolver() : libHandle_(LoadLibraryAsPeerFirst(L"hermes.dll")) {}
 
   FuncPtr getFuncPtr(const char *funcName) override {
     return reinterpret_cast<FuncPtr>(GetProcAddress(libHandle_, funcName));

package/Shared/JSI/V8RuntimeHolder.cpp

@@ -16,7 +16,7 @@ namespace {
 
 class V8FuncResolver : public IFuncResolver {
  public:
-  V8FuncResolver() : libHandle_(SafeLoadLibrary(L"v8jsi.dll")) {}
+  V8FuncResolver() : libHandle_(LoadLibraryAsPeerFirst(L"v8jsi.dll")) {}
 
   FuncPtr getFuncPtr(const char *funcName) override {
     return reinterpret_cast<FuncPtr>(GetProcAddress(libHandle_, funcName));

package/Shared/OInstance.cpp

@@ -52,6 +52,7 @@
 
 #if defined(USE_V8)
 #include <JSI/V8RuntimeHolder.h>
+#include "V8JSIRuntimeHolder.h"
 #endif
 #include <ReactCommon/CallInvoker.h>
 #include <ReactCommon/TurboModuleBinding.h>
@@ -319,7 +320,24 @@ InstanceImpl::InstanceImpl(
               m_devSettings, m_jsThread, std::move(preparedScriptStore));
           break;
         }
-        case JSIEngineOverride::V8:
+        case JSIEngineOverride::V8: {
+#if defined(USE_V8)
+          std::shared_ptr<facebook::jsi::PreparedScriptStore> preparedScriptStore;
+
+          wchar_t tempPath[MAX_PATH];
+          if (GetTempPathW(MAX_PATH, tempPath)) {
+            preparedScriptStore =
+                std::make_shared<facebook::react::BasePreparedScriptStoreImpl>(winrt::to_string(tempPath));
+          }
+
+          m_devSettings->jsiRuntimeHolder = std::make_shared<facebook::react::V8JSIRuntimeHolder>(
+              m_devSettings, m_jsThread, nullptr, std::move(preparedScriptStore), /*multithreading*/ false);
+          break;
+#else
+          assert(false); // V8 is not available in this build, fallthrough
+          [[fallthrough]];
+#endif
+        }
         case JSIEngineOverride::V8NodeApi: {
 #if defined(USE_V8)
           std::shared_ptr<facebook::jsi::PreparedScriptStore> preparedScriptStore;

package/Shared/SafeLoadLibrary.cpp

@@ -2,19 +2,22 @@
 // Licensed under the MIT License.
 
 #include "SafeLoadLibrary.h"
+#include "PathCch.h"
+
+EXTERN_C IMAGE_DOS_HEADER __ImageBase;
 
 namespace Microsoft::ReactNative {
 
 // Unsafe calls to LoadLibrary/LoadLibraryEx.
 // The default behavior of LoadLibrary, or LoadLibraryEx without flags, is to try and find the dependency by iterating
 // through a search order. This search order contains the current working directory. In the classic attack, a malicious
-// DLL is dropped in the likely - controllable current working directory.The malicious DLL has the same name as a
-// missing dependency or dependency that is not in the same directory as the executable.When the call to LoadLibrary is
-// reached, the malicious DLL is loaded preferentially, and code execution occurs.
+// DLL is dropped in the likely - controllable current working directory. The malicious DLL has the same name as a
+// missing dependency or dependency that is not in the same directory as the executable. When the call to LoadLibrary
+// is reached, the malicious DLL is loaded preferentially, and code execution occurs.
 //
 // The SafeLoadLibrary is the preferred ways to manually load dependencies.
 // The API does not search the current working directory when resolving dependencies.
-// It is "borrowed" from Office Mso code.
+// The implementation is "borrowed" from Office MsoSafeLoadLibrary.
 
 /**
       List of new flags that control where to search for DLLs. Requires KB2533623.
@@ -22,20 +25,53 @@ namespace Microsoft::ReactNative {
 const DWORD SafeLoadLibraryFlags = LOAD_LIBRARY_SEARCH_APPLICATION_DIR | LOAD_LIBRARY_SEARCH_DEFAULT_DIRS |
     LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR | LOAD_LIBRARY_SEARCH_SYSTEM32 | LOAD_LIBRARY_SEARCH_USER_DIRS;
 
-HMODULE SafeLoadLibrary(const wchar_t *wzFileName, HANDLE hFile, DWORD dwFlags) noexcept {
+HMODULE SafeLoadLibrary(const wchar_t *fileName, DWORD dwFlags) noexcept {
   // When calling LoadLibrary, OR in LOAD_LIBRARY_SEARCH_DEFAULT_DIRS which enables all of the
   // safe behaviors. Note that this flag is not compatible with LOAD_WITH_ALTERED_SEARCH_PATH.
+#pragma push_macro("LoadLibraryExW")
+#undef LoadLibraryExW
   HMODULE module =
-      LoadLibraryExW(wzFileName, hFile, (dwFlags | LOAD_LIBRARY_SEARCH_DEFAULT_DIRS) & ~LOAD_WITH_ALTERED_SEARCH_PATH);
+      ::LoadLibraryExW(fileName, 0, (dwFlags | LOAD_LIBRARY_SEARCH_DEFAULT_DIRS) & ~LOAD_WITH_ALTERED_SEARCH_PATH);
   if (module == nullptr && GetLastError() == ERROR_INVALID_PARAMETER) {
     // Could have failed with actual bad parameters or an unpatched OS without KB2533623.
-    if (GetProcAddress(GetModuleHandleW(L"kernel32.dll"), "AddDllDirectory") == nullptr) {
+    if (::GetProcAddress(::GetModuleHandleW(L"kernel32.dll"), "AddDllDirectory") == nullptr) {
       // Unpatched OS, remove all new flags.
-      module = LoadLibraryExW(wzFileName, hFile, dwFlags & ~SafeLoadLibraryFlags);
+      module = ::LoadLibraryExW(fileName, 0, dwFlags & ~SafeLoadLibraryFlags);
     }
   }
+#pragma pop_macro("LoadLibraryExW")
 
   return module;
 }
 
+// Gets the full file name in the same directory as the current DLL.
+// It returns nullptr if we cannot create the full file name.
+wchar_t *GePeerFullFileName(const wchar_t *fileName, wchar_t *buffer, size_t bufferSize) {
+  size_t nameSize =
+      ::GetModuleFileNameW(reinterpret_cast<HINSTANCE>(&__ImageBase), buffer, static_cast<DWORD>(bufferSize));
+  if (nameSize == 0 || nameSize == bufferSize)
+    return nullptr;
+
+  if (::PathCchRemoveFileSpec(buffer, bufferSize) != S_OK)
+    return nullptr;
+  if (::PathCchCombineEx(buffer, bufferSize, buffer, fileName, PATHCCH_ALLOW_LONG_PATHS) != S_OK)
+    return nullptr;
+
+  return buffer;
+}
+
+HMODULE LoadLibraryAsPeerFirst(const wchar_t *fileName) noexcept {
+  HMODULE lib{nullptr};
+  constexpr size_t nameBufferSize = 4096;
+  wchar_t nameBuffer[nameBufferSize] = L"";
+
+  if (wchar_t *fullFileName = GePeerFullFileName(fileName, nameBuffer, nameBufferSize))
+    lib = SafeLoadLibrary(fullFileName);
+
+  if (!lib)
+    lib = SafeLoadLibrary(fileName);
+
+  return lib;
+}
+
 } // namespace Microsoft::ReactNative

package/Shared/SafeLoadLibrary.h

@@ -10,6 +10,10 @@
 namespace Microsoft::ReactNative {
 
 // Safe LoadLibraryEx wrapper that must be used instead of LoadLibrary.
-extern HMODULE SafeLoadLibrary(const wchar_t *wzFileName, HANDLE hFile = nullptr, DWORD dwFlags = 0) noexcept;
+extern HMODULE SafeLoadLibrary(const wchar_t *fileName, DWORD flags = 0) noexcept;
+
+// Try to load the dll from the same folder as the current DLL first,
+// and if it is not found, then use the SafeLoadLibrary.
+extern HMODULE LoadLibraryAsPeerFirst(const wchar_t *fileName) noexcept;
 
 } // namespace Microsoft::ReactNative

package/Shared/Shared.vcxitems

@@ -223,6 +223,9 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)TurboModuleManager.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)Utils.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)Utils\WinRTConversions.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)V8JSIRuntimeHolder.cpp">
+      <ExcludedFromBuild Condition="'$(UseV8)' != 'true'">true</ExcludedFromBuild>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="$(MSBuildThisFileDirectory)..\codegen\react\components\rnwcore\EventEmitters.h" />
@@ -396,6 +399,7 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)Utils.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)Utils\CppWinrtLessExceptions.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)Utils\WinRTConversions.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)V8JSIRuntimeHolder.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)WebSocketJSExecutorFactory.h" />
     <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\DevSettingsModule.cpp" />
     <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Modules\ReactRootViewTagGenerator.cpp" />

package/Shared/Shared.vcxitems.filters

@@ -270,6 +270,7 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)JSI\V8RuntimeHolder.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)SafeLoadLibrary.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)Hasher.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)V8JSIRuntimeHolder.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)Networking\DefaultBlobResource.cpp">
       <Filter>Source Files\Networking</Filter>
     </ClCompile>
@@ -331,6 +332,9 @@
     <Filter Include="Source Files\Networking">
       <UniqueIdentifier>{71196e04-aca0-48d6-99e4-f418c957b50f}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Hermes">
+      <UniqueIdentifier>{b32590e6-ae3d-4388-ab98-767345ce38c9}</UniqueIdentifier>
+    </Filter>
     <Filter Include="Header Files\Fabric">
       <UniqueIdentifier>{e045612e-bca3-4844-bce8-e75f83e89e05}</UniqueIdentifier>
     </Filter>
@@ -728,17 +732,6 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\platform\react\renderer\core\graphicsConversions.h">
       <Filter>Header Files\Fabric\platform\react\renderer\core</Filter>
     </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)HermesRuntimeHolder.h">
-      <Filter>Hermes</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)HermesSamplingProfiler.h">
-      <Filter>Hermes</Filter>
-    </ClInclude>
-    <ClInclude Include="$(NodeApiJsiDir)src\ApiLoaders\HermesApi.h" />
-    <ClInclude Include="$(NodeApiJsiDir)src\ApiLoaders\HermesApi.inc" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\JsiApi.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)JSI\V8RuntimeHolder.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)SafeLoadLibrary.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)Modules\WebSocketTurboModule.h">
       <Filter>Header Files\Modules</Filter>
     </ClInclude>
@@ -756,6 +749,18 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)Modules\BlobCollector.h">
       <Filter>Header Files\Modules</Filter>
     </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)HermesRuntimeHolder.h">
+      <Filter>Hermes</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)HermesSamplingProfiler.h">
+      <Filter>Hermes</Filter>
+    </ClInclude>
+    <ClInclude Include="$(NodeApiJsiDir)src\ApiLoaders\HermesApi.h" />
+    <ClInclude Include="$(NodeApiJsiDir)src\ApiLoaders\HermesApi.inc" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\JsiApi.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)JSI\V8RuntimeHolder.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)SafeLoadLibrary.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)V8JSIRuntimeHolder.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="$(MSBuildThisFileDirectory)tracing\rnw.wprp">

package/Shared/V8JSIRuntimeHolder.cpp

@@ -0,0 +1,71 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#include "pch.h"
+
+#include <V8JsiRuntime.h>
+#include "V8JSIRuntimeHolder.h"
+
+#include <atomic>
+#include <queue>
+
+using namespace facebook;
+using namespace facebook::react;
+
+namespace facebook {
+namespace react {
+
+class TaskRunnerAdapter : public v8runtime::JSITaskRunner {
+ public:
+  TaskRunnerAdapter(std::shared_ptr<facebook::react::MessageQueueThread> jsQueue) : jsQueue_(std::move(jsQueue)) {}
+
+  void postTask(std::unique_ptr<v8runtime::JSITask> task) override {
+    std::shared_ptr<v8runtime::JSITask> shared_task(task.release());
+    jsQueue_->runOnQueue([shared_task2 = std::move(shared_task)]() { shared_task2->run(); });
+  }
+
+ private:
+  TaskRunnerAdapter(const TaskRunnerAdapter &) = delete;
+  TaskRunnerAdapter &operator=(const TaskRunnerAdapter &) = delete;
+
+  std::shared_ptr<facebook::react::MessageQueueThread> jsQueue_;
+};
+
+facebook::react::JSIEngineOverride V8JSIRuntimeHolder::getRuntimeType() noexcept {
+  return facebook::react::JSIEngineOverride::V8;
+}
+
+std::shared_ptr<facebook::jsi::Runtime> V8JSIRuntimeHolder::getRuntime() noexcept {
+  std::call_once(once_flag_, [this]() { initRuntime(); });
+
+  if (!runtime_)
+    std::terminate();
+
+  // V8JsiRuntime is not thread safe as of now.
+  if (own_thread_id_ != std::this_thread::get_id())
+    std::terminate();
+
+  return runtime_;
+}
+
+void V8JSIRuntimeHolder::initRuntime() noexcept {
+  v8runtime::V8RuntimeArgs args{};
+
+  if (debuggerPort_ > 0)
+    args.inspectorPort = debuggerPort_;
+
+  args.flags.enableInspector = useDirectDebugger_;
+  args.flags.waitForDebugger = debuggerBreakOnNextLine_;
+  args.debuggerRuntimeName = debuggerRuntimeName_;
+
+  args.foreground_task_runner = std::make_shared<TaskRunnerAdapter>(jsQueue_);
+  args.preparedScriptStore = std::move(preparedScriptStore_);
+  args.flags.enableMultiThread = enableMultiThreadingSupport_;
+
+  runtime_ = v8runtime::makeV8Runtime(std::move(args));
+
+  own_thread_id_ = std::this_thread::get_id();
+}
+
+} // namespace react
+} // namespace facebook

package/Shared/V8JSIRuntimeHolder.h

@@ -0,0 +1,56 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#pragma once
+
+#include <DevSettings.h>
+
+#include <JSI/RuntimeHolder.h>
+#include <JSI/ScriptStore.h>
+
+#include <Logging.h>
+
+namespace facebook {
+namespace react {
+
+class V8JSIRuntimeHolder : public Microsoft::JSI::RuntimeHolderLazyInit {
+ public:
+  std::shared_ptr<facebook::jsi::Runtime> getRuntime() noexcept override;
+  facebook::react::JSIEngineOverride getRuntimeType() noexcept override;
+
+  V8JSIRuntimeHolder(
+      std::shared_ptr<facebook::react::DevSettings> devSettings,
+      std::shared_ptr<facebook::react::MessageQueueThread> jsQueue,
+      std::unique_ptr<facebook::jsi::ScriptStore> &&scriptStore,
+      std::shared_ptr<facebook::jsi::PreparedScriptStore> &&preparedScriptStore,
+      bool enableMultiThreadingSupport) noexcept
+      : useDirectDebugger_(devSettings->useDirectDebugger),
+        debuggerBreakOnNextLine_(devSettings->debuggerBreakOnNextLine),
+        debuggerPort_(devSettings->debuggerPort),
+        debuggerRuntimeName_(devSettings->debuggerRuntimeName),
+        jsQueue_(std::move(jsQueue)),
+        scriptStore_(std::move(scriptStore)),
+        preparedScriptStore_(std::move(preparedScriptStore)),
+        enableMultiThreadingSupport_(enableMultiThreadingSupport) {}
+
+ private:
+  void initRuntime() noexcept;
+
+  std::shared_ptr<facebook::jsi::Runtime> runtime_;
+  std::shared_ptr<facebook::react::MessageQueueThread> jsQueue_;
+
+  std::unique_ptr<facebook::jsi::ScriptStore> scriptStore_;
+  std::shared_ptr<facebook::jsi::PreparedScriptStore> preparedScriptStore_;
+
+  std::once_flag once_flag_;
+  std::thread::id own_thread_id_;
+
+  uint16_t debuggerPort_;
+  bool useDirectDebugger_;
+  bool debuggerBreakOnNextLine_;
+  std::string debuggerRuntimeName_;
+  bool enableMultiThreadingSupport_;
+};
+
+} // namespace react
+} // namespace facebook

package/metro.config.js

@@ -19,4 +19,4 @@ if (
 }
 
 const {makeMetroConfig} = require('@rnw-scripts/metro-dev-config');
-module.exports = makeMetroConfig();
+module.exports = makeMetroConfig({projectRoot: __dirname});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-windows",
-  "version": "0.73.0-preview.3",
+  "version": "0.73.0-preview.4",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -26,7 +26,7 @@
     "@react-native-community/cli": "12.0.0-alpha.17",
     "@react-native-community/cli-platform-android": "12.0.0-alpha.17",
     "@react-native-community/cli-platform-ios": "12.0.0-alpha.17",
-    "@react-native-windows/cli": "0.73.0-preview.1",
+    "@react-native-windows/cli": "0.73.0-preview.2",
     "@react-native/assets": "1.0.0",
     "@react-native/assets-registry": "^0.73.1",
     "@react-native/codegen": "^0.73.1",

package/templates/cpp-app/windows/ExperimentalFeatures.props

@@ -2,7 +2,6 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup Label="Microsoft.ReactNative Experimental Features">
-    <UseHermes>true</UseHermes>
     <UseFabric>true</UseFabric>
     <UseWinUI3>false</UseWinUI3>
 

package/templates/old/generateWrapper.js

@@ -20,7 +20,7 @@ function makeGenerateWindowsWrapper(
         })`
       : `React Native Windows Application (Old Arch, UWP, ${
           language === 'cs' ? 'C#' : 'C++'
-        }, Chakra)`;
+        }, Hermes)`;
   const description =
     projectType === 'lib'
       ? `A RNW module written in ${
@@ -28,7 +28,7 @@ function makeGenerateWindowsWrapper(
         }, targeting UWP and RN's old architecture.`
       : `A RNW app written in ${
           language === 'cs' ? 'C#' : 'C++'
-        }, targeting UWP and RN's old architecture, with the Chakra JS engine.`;
+        }, targeting UWP and RN's old architecture, with the Hermes JS engine.`;
 
   const postInstall = async (config = {}, options = {}) => {
     const experimentalFeatures = config?.project?.windows?.experimentalFeatures;
@@ -40,7 +40,7 @@ function makeGenerateWindowsWrapper(
       experimentalNuGetDependency:
         experimentalFeatures?.UseExperimentalNuget ?? false,
       useWinUI3: experimentalFeatures?.UseWinUI3 ?? false,
-      useHermes: experimentalFeatures?.UseHermes ?? false,
+      useHermes: experimentalFeatures?.UseHermes ?? true,
       useDevMode: false,
       verbose: !!options.logging,
       telemetry: !!options.telemetry,

package/templates/old/uwp-cpp-lib/template.config.js

@@ -12,4 +12,4 @@
 
 const {makeGenerateWindowsWrapper} = require('../generateWrapper');
 
-module.exports = makeGenerateWindowsWrapper('cpp', 'lib', false);
+module.exports = makeGenerateWindowsWrapper('cpp', 'lib');