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

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

@@ -106,7 +106,7 @@
     <ClInclude Include="$(ReactNativeDir)\ReactCommon\cxxreact\SystraceSection.h" />
     <ClInclude Include="$(ReactNativeDir)\ReactCommon\jsiexecutor\jsireact\JSIExecutor.h" />
     <ClInclude Include="$(ReactNativeDir)\ReactCommon\jsiexecutor\jsireact\JSINativeModules.h" />
-    <ClInclude Include="$(ReactNativeDir)\ReactCommon\jsinspector\InspectorInterfaces.h" />
+    <ClInclude Include="$(ReactNativeDir)\ReactCommon\jsinspector-modern\InspectorInterfaces.h" />
     <ClInclude Include="$(ReactNativeDir)\ReactCommon\logger\react_native_log.h" />
     <ClInclude Include="$(YogaDir)\yoga\YGEnums.h" />
     <ClInclude Include="$(YogaDir)\yoga\YGMacros.h" />
@@ -128,7 +128,7 @@
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\jsi\jsi\JSIDynamic.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\jsiexecutor\jsireact\JSIExecutor.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\jsiexecutor\jsireact\JSINativeModules.cpp" />
-    <ClCompile Include="$(ReactNativeDir)\ReactCommon\jsinspector\InspectorInterfaces.cpp" />
+    <ClCompile Include="$(ReactNativeDir)\ReactCommon\jsinspector-modern\InspectorInterfaces.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\logger\react_native_log.cpp" />
     <CLCompile Include="$(ReactNativeDir)\ReactCommon\reactperflogger\reactperflogger\BridgeNativeModulePerfLogger.cpp" />
     <ClCompile Include="$(YogaDir)\yoga\YGEnums.cpp" />
@@ -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

@@ -10,7 +10,7 @@
 #include <NodeApiJsiRuntime.h>
 #include <crash/verifyElseCrash.h>
 #include <cxxreact/SystraceSection.h>
-#include <jsinspector/InspectorInterfaces.h>
+#include <jsinspector-modern/InspectorInterfaces.h>
 #include <mutex>
 #include "SafeLoadLibrary.h"
 
@@ -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));
@@ -230,10 +230,10 @@ class HermesScriptCache {
   std::shared_ptr<facebook::jsi::PreparedScriptStore> scriptStore_;
 };
 
-class HermesLocalConnection : public facebook::react::ILocalConnection {
+class HermesLocalConnection : public facebook::react::jsinspector_modern::ILocalConnection {
  public:
   HermesLocalConnection(
-      std::unique_ptr<facebook::react::IRemoteConnection> remoteConnection,
+      std::unique_ptr<facebook::react::jsinspector_modern::IRemoteConnection> remoteConnection,
       void *connectFunc) noexcept {
     CRASH_ON_ERROR(getHermesApi().hermes_create_local_connection(
         connectFunc,
@@ -259,15 +259,15 @@ class HermesLocalConnection : public facebook::react::ILocalConnection {
 
  private:
   static void NAPI_CDECL OnRemoteConnectionSendMessage(hermes_remote_connection remoteConnection, const char *message) {
-    reinterpret_cast<facebook::react::IRemoteConnection *>(remoteConnection)->onMessage(message);
+    reinterpret_cast<facebook::react::jsinspector_modern::IRemoteConnection *>(remoteConnection)->onMessage(message);
   }
 
   static void NAPI_CDECL OnRemoteConnectionDisconnect(hermes_remote_connection remoteConnection) {
-    reinterpret_cast<facebook::react::IRemoteConnection *>(remoteConnection)->onDisconnect();
+    reinterpret_cast<facebook::react::jsinspector_modern::IRemoteConnection *>(remoteConnection)->onDisconnect();
   }
 
   static void NAPI_CDECL OnRemoteConnectionDelete(void *remoteConnection, void * /*deleterData*/) {
-    delete reinterpret_cast<facebook::react::IRemoteConnection *>(remoteConnection);
+    delete reinterpret_cast<facebook::react::jsinspector_modern::IRemoteConnection *>(remoteConnection);
   }
 
  private:
@@ -275,18 +275,18 @@ class HermesLocalConnection : public facebook::react::ILocalConnection {
 };
 
 int32_t NAPI_CDECL addInspectorPage(const char *title, const char *vm, void *connectFunc) noexcept {
-  return facebook::react::getInspectorInstance().addPage(
+  return facebook::react::jsinspector_modern::getInspectorInstance().addPage(
       title,
       vm,
-      [connectFunc,
-       hermesApi = HermesApi::current()](std::unique_ptr<facebook::react::IRemoteConnection> remoteConnection) {
+      [connectFunc, hermesApi = HermesApi::current()](
+          std::unique_ptr<facebook::react::jsinspector_modern::IRemoteConnection> remoteConnection) {
         HermesApi::Scope apiScope(hermesApi);
         return std::make_unique<HermesLocalConnection>(std::move(remoteConnection), connectFunc);
       });
 }
 
 void NAPI_CDECL removeInspectorPage(int32_t pageId) noexcept {
-  facebook::react::getInspectorInstance().removePage(pageId);
+  facebook::react::jsinspector_modern::getInspectorInstance().removePage(pageId);
 }
 
 } // namespace

package/Shared/InspectorPackagerConnection.cpp

@@ -72,10 +72,10 @@ struct InspectorProtocol {
   }
 
   static folly::dynamic constructGetPagesResponsePayloadForPackager(
-      const std::vector<facebook::react::InspectorPage> &pages,
+      const std::vector<facebook::react::jsinspector_modern::InspectorPage> &pages,
       InspectorPackagerConnection::BundleStatus bundleStatus) {
     folly::dynamic payload = folly::dynamic::array;
-    for (const facebook::react::InspectorPage &page : pages) {
+    for (const facebook::react::jsinspector_modern::InspectorPage &page : pages) {
       folly::dynamic pageDyn = folly::dynamic::object;
       pageDyn["id"] = page.id;
       pageDyn["title"] = page.title;
@@ -167,62 +167,63 @@ winrt::fire_and_forget InspectorPackagerConnection::connectAsync() {
   m_packagerWebSocketConnection->SetOnConnect(
       []() { facebook::react::tracing::log("Inspector: Websocket connection succeeded."); });
 
-  m_packagerWebSocketConnection->SetOnMessage([self = shared_from_this()](
-                                                  size_t /*length*/, const std::string &message, bool isBinary) {
-    assert(!isBinary && "We don't expect any binary messages !");
-    folly::dynamic messageDyn = folly::parseJson(message);
-
-    InspectorProtocol::EventType eventType = InspectorProtocol::getEventType(messageDyn);
-    switch (eventType) {
-      case InspectorProtocol::EventType::GetPages: {
-        std::vector<facebook::react::InspectorPage> inspectorPages = facebook::react::getInspectorInstance().getPages();
-        folly::dynamic response = InspectorProtocol::constructResponseForPackager(
-            InspectorProtocol::EventType::GetPages,
-            InspectorProtocol::constructGetPagesResponsePayloadForPackager(
-                inspectorPages, self->m_bundleStatusProvider->getBundleStatus()));
-
-        std::string responsestr = folly::toJson(response);
-        self->sendMessageToPackager(std::move(responsestr));
-        break;
-      }
-
-      case InspectorProtocol::EventType::WrappedEvent: {
-        folly::dynamic payload = messageDyn[InspectorProtocol::Message_PAYLOAD];
-        int32_t pageId = static_cast<int32_t>(payload[InspectorProtocol::Message_PAGEID].asInt());
-
-        if (self->m_localConnections.find(pageId) == self->m_localConnections.end()) {
-          break;
-        }
-
-        std::string wrappedEvent = payload[InspectorProtocol::Message_eventName_wrappedEvent].getString();
-        self->sendMessageToVM(pageId, std::move(wrappedEvent));
-        break;
-      }
-
-      case InspectorProtocol::EventType::Connect: {
-        folly::dynamic payload = messageDyn[InspectorProtocol::Message_PAYLOAD];
-        int32_t pageId = static_cast<int32_t>(payload[InspectorProtocol::Message_PAGEID].asInt());
-
-        if (self->m_localConnections.find(pageId) != self->m_localConnections.end()) {
-          break;
-        }
-
-        self->m_localConnections[pageId] =
-            facebook::react::getInspectorInstance().connect(pageId, std::make_unique<RemoteConnection>(pageId, *self));
-        break;
-      }
-
-      case InspectorProtocol::EventType::Disconnect: {
-        folly::dynamic payload = messageDyn[InspectorProtocol::Message_PAYLOAD];
-        int32_t pageId = static_cast<int32_t>(payload[InspectorProtocol::Message_PAGEID].asInt());
-        if (self->m_localConnections.find(pageId) != self->m_localConnections.end()) {
-          self->m_localConnections[pageId]->disconnect();
-          self->m_localConnections.erase(pageId);
+  m_packagerWebSocketConnection->SetOnMessage(
+      [self = shared_from_this()](size_t /*length*/, const std::string &message, bool isBinary) {
+        assert(!isBinary && "We don't expect any binary messages !");
+        folly::dynamic messageDyn = folly::parseJson(message);
+
+        InspectorProtocol::EventType eventType = InspectorProtocol::getEventType(messageDyn);
+        switch (eventType) {
+          case InspectorProtocol::EventType::GetPages: {
+            std::vector<facebook::react::jsinspector_modern::InspectorPage> inspectorPages =
+                facebook::react::jsinspector_modern::getInspectorInstance().getPages();
+            folly::dynamic response = InspectorProtocol::constructResponseForPackager(
+                InspectorProtocol::EventType::GetPages,
+                InspectorProtocol::constructGetPagesResponsePayloadForPackager(
+                    inspectorPages, self->m_bundleStatusProvider->getBundleStatus()));
+
+            std::string responsestr = folly::toJson(response);
+            self->sendMessageToPackager(std::move(responsestr));
+            break;
+          }
+
+          case InspectorProtocol::EventType::WrappedEvent: {
+            folly::dynamic payload = messageDyn[InspectorProtocol::Message_PAYLOAD];
+            int32_t pageId = static_cast<int32_t>(payload[InspectorProtocol::Message_PAGEID].asInt());
+
+            if (self->m_localConnections.find(pageId) == self->m_localConnections.end()) {
+              break;
+            }
+
+            std::string wrappedEvent = payload[InspectorProtocol::Message_eventName_wrappedEvent].getString();
+            self->sendMessageToVM(pageId, std::move(wrappedEvent));
+            break;
+          }
+
+          case InspectorProtocol::EventType::Connect: {
+            folly::dynamic payload = messageDyn[InspectorProtocol::Message_PAYLOAD];
+            int32_t pageId = static_cast<int32_t>(payload[InspectorProtocol::Message_PAGEID].asInt());
+
+            if (self->m_localConnections.find(pageId) != self->m_localConnections.end()) {
+              break;
+            }
+
+            self->m_localConnections[pageId] = facebook::react::jsinspector_modern::getInspectorInstance().connect(
+                pageId, std::make_unique<RemoteConnection>(pageId, *self));
+            break;
+          }
+
+          case InspectorProtocol::EventType::Disconnect: {
+            folly::dynamic payload = messageDyn[InspectorProtocol::Message_PAYLOAD];
+            int32_t pageId = static_cast<int32_t>(payload[InspectorProtocol::Message_PAGEID].asInt());
+            if (self->m_localConnections.find(pageId) != self->m_localConnections.end()) {
+              self->m_localConnections[pageId]->disconnect();
+              self->m_localConnections.erase(pageId);
+            }
+            break;
+          }
         }
-        break;
-      }
-    }
-  });
+      });
 
   Microsoft::React::Networking::IWebSocketResource::Protocols protocols;
   Microsoft::React::Networking::IWebSocketResource::Options options;

package/Shared/InspectorPackagerConnection.h

@@ -4,7 +4,7 @@
 #pragma once
 
 #include <Networking/WinRTWebSocketResource.h>
-#include <jsinspector/InspectorInterfaces.h>
+#include <jsinspector-modern/InspectorInterfaces.h>
 
 namespace Microsoft::ReactNative {
 
@@ -40,13 +40,14 @@ class InspectorPackagerConnection final : public std::enable_shared_from_this<In
   void sendMessageToVM(int32_t pageId, std::string &&message);
 
  private:
-  std::unordered_map<int32_t, std::unique_ptr<facebook::react::ILocalConnection>> m_localConnections;
+  std::unordered_map<int32_t, std::unique_ptr<facebook::react::jsinspector_modern::ILocalConnection>>
+      m_localConnections;
   std::shared_ptr<Microsoft::React::Networking::WinRTWebSocketResource> m_packagerWebSocketConnection;
   std::shared_ptr<IBundleStatusProvider> m_bundleStatusProvider;
   std::string m_url;
 };
 
-class RemoteConnection final : public facebook::react::IRemoteConnection {
+class RemoteConnection final : public facebook::react::jsinspector_modern::IRemoteConnection {
  public:
   RemoteConnection(int32_t pageId, const InspectorPackagerConnection &packagerConnection);
   void onMessage(std::string message) override;

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/Networking/DefaultBlobResource.cpp

@@ -140,15 +140,19 @@ void DefaultBlobResource::Release(string &&blobId) noexcept /*override*/ {
 void DefaultBlobResource::AddNetworkingHandler() noexcept /*override*/ {
   auto propId = msrn::ReactPropertyId<msrn::ReactNonAbiValue<weak_ptr<IHttpModuleProxy>>>{L"HttpModule.Proxy"};
 
+  bool handlerAdded = false;
   if (auto prop = m_propertyBag.Get(propId)) {
     if (auto httpHandler = prop.Value().lock()) {
       httpHandler->AddRequestBodyHandler(m_requestBodyHandler);
       httpHandler->AddResponseHandler(m_responseHandler);
+      handlerAdded = true;
     }
-  } else {
-    // #11439 - The absence of HttpModule.Proxy may be caused by a module initialization race condition.
-    // Best-effort approach to set up the request/response handlers by exposing this interface to dependents
-    // (i.e. IHttpResource).
+  }
+
+  // #11439 - The absence of HttpModule.Proxy may be caused by a module initialization race condition.
+  // Best-effort approach to set up the request/response handlers by exposing this interface to dependents
+  // (i.e. IHttpResource).
+  if (!handlerAdded) {
     auto propId = msrn::ReactPropertyId<msrn::ReactNonAbiValue<weak_ptr<IBlobResource>>>{L"Blob.Resource"};
     m_propertyBag.Set(propId, weak_ptr<IBlobResource>(shared_from_this()));
   }

package/Shared/Networking/WinRTHttpResource.cpp

@@ -545,7 +545,7 @@ WinRTHttpResource::PerformSendRequest(HttpMethod &&method, Uri &&rtUri, IInspect
           if (self->m_onComplete) {
             self->m_onComplete(reqArgs->RequestId);
           }
-          co_return;
+          co_return self->UntrackResponse(reqArgs->RequestId);
         }
       }
 

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" />