Call RoInitialize

Author: ShortDevelopment

lib/Runtime/Base/DelayLoadLibrary.cpp

@@ -209,11 +209,32 @@ namespace Js
         return E_NOTIMPL;
     }
 
+    HRESULT DelayLoadWinRtFoundation::RoInitialize(
+        _In_ DelayLoadWinRtFoundation::RO_INIT_TYPE initType
+    )
+    {
+        if (m_hModule)
+        {
+            if (m_pfnRoInitialize == nullptr)
+            {
+                m_pfnRoInitialize = (PFNRoInitialize)GetFunction("RoInitialize");
+                if (m_pfnRoInitialize == nullptr)
+                {
+                    return E_UNEXPECTED;
+                }
+            }
+            Assert(m_pfnRoInitialize != nullptr);
+            return m_pfnRoInitialize(initType);
+        }
+        return E_NOTIMPL;
+    }
+
 #ifdef INTL_WINGLOB
-    void DelayLoadWindowsGlobalization::Ensure(Js::DelayLoadWinRtString *winRTStringLibrary)
+    void DelayLoadWindowsGlobalization::Ensure(Js::DelayLoadWinRtFoundation *winRTFoundationLibrary, Js::DelayLoadWinRtString *winRTStringLibrary)
     {
         if (!this->m_isInit)
         {
+            winRTFoundationLibrary->RoInitialize(DelayLoadWinRtFoundation::RO_INIT_TYPE::RO_INIT_MULTITHREADED);
             DelayLoadLibrary::EnsureFromSystemDirOnly();
 
 #if DBG
@@ -234,6 +255,7 @@ namespace Js
                 hasGlobalizationDllLoaded = true;
             }
             this->winRTStringLibrary = winRTStringLibrary;
+            this->winRTFoundationLibrary = winRTFoundationLibrary;
             this->winRTStringsPresent = GetFunction("WindowsDuplicateString") != nullptr;
         }
     }

lib/Runtime/Base/DelayLoadLibrary.h

@@ -5,7 +5,6 @@
 //-------------------------------------------------------------------------------------------------------
 #pragma once
 
-//#include <roapi.h>
 #include "activation.h"
 #include <winstring.h>
 
@@ -63,6 +62,8 @@ namespace Js
     };
 
 #ifdef INTL_WINGLOB
+    class DelayLoadWinRtFoundation;
+
     class DelayLoadWindowsGlobalization sealed : public DelayLoadWinRtString
     {
     private:
@@ -72,13 +73,15 @@ namespace Js
         PFNCWDllGetActivationFactory m_pfnFNCWDllGetActivationFactory;
 
         Js::DelayLoadWinRtString *winRTStringLibrary;
+        Js::DelayLoadWinRtFoundation *winRTFoundationLibrary;
         bool winRTStringsPresent;
         bool hasGlobalizationDllLoaded;
 
     public:
         DelayLoadWindowsGlobalization() : DelayLoadWinRtString(),
             m_pfnFNCWDllGetActivationFactory(nullptr),
             winRTStringLibrary(nullptr),
+            winRTFoundationLibrary(nullptr),
             winRTStringsPresent(false),
             hasGlobalizationDllLoaded(false) { }
 
@@ -92,7 +95,7 @@ namespace Js
         {
             return _u("jsIntl.dll");
         }
-        void Ensure(Js::DelayLoadWinRtString *winRTStringLibrary);
+        void Ensure(Js::DelayLoadWinRtFoundation *winRTFoundationLibrary, Js::DelayLoadWinRtString *winRTStringLibrary);
 
         HRESULT DllGetActivationFactory(_In_ HSTRING activatibleClassId, _Out_ IActivationFactory** factory);
         bool HasGlobalizationDllLoaded();
@@ -108,6 +111,12 @@ namespace Js
 
     class DelayLoadWinRtFoundation sealed : public DelayLoadLibrary
     {
+    public:
+        enum class RO_INIT_TYPE {
+            // COM calls objects on any thread.
+            RO_INIT_MULTITHREADED = 1
+        };
+
     private:
 
         // DelayLoadWindowsFoundation specific functions
@@ -116,14 +125,22 @@ namespace Js
         typedef FNCWRoGetActivationFactory* PFNCWRoGetActivationFactory;
         PFNCWRoGetActivationFactory m_pfnFNCWRoGetActivationFactory;
 
+        typedef HRESULT(*PFNRoInitialize)(RO_INIT_TYPE);
+        PFNRoInitialize m_pfnRoInitialize;
+
     public:
-        DelayLoadWinRtFoundation() : DelayLoadLibrary(),
-            m_pfnFNCWRoGetActivationFactory(nullptr) { }
+        DelayLoadWinRtFoundation()
+            : DelayLoadLibrary(),
+            m_pfnFNCWRoGetActivationFactory(nullptr),
+            m_pfnRoInitialize(nullptr)
+        {
+        }
 
-        virtual ~DelayLoadWinRtFoundation() { }
+        virtual ~DelayLoadWinRtFoundation() {}
 
         LPCTSTR GetLibraryName() const { return _u("api-ms-win-core-winrt-l1-1-0.dll"); }
 
+        HRESULT RoInitialize(_In_ RO_INIT_TYPE initType);
         HRESULT RoGetActivationFactory(
             _In_ HSTRING activatibleClassId,
             _In_ REFIID iid,

lib/Runtime/Base/ThreadContext.cpp

@@ -4595,7 +4595,7 @@ Js::WindowsGlobalizationAdapter* ThreadContext::GetWindowsGlobalizationAdapter()
 
 Js::DelayLoadWindowsGlobalization* ThreadContext::GetWindowsGlobalizationLibrary()
 {
-    delayLoadWindowsGlobalizationLibrary.Ensure(this->GetWinRTStringLibrary());
+    delayLoadWindowsGlobalizationLibrary.Ensure(this->GetWinRtFoundationLibrary(), this->GetWinRTStringLibrary());
 
     return &delayLoadWindowsGlobalizationLibrary;
 }
@@ -4607,7 +4607,8 @@ Js::WindowsFoundationAdapter* ThreadContext::GetWindowsFoundationAdapter()
 {
     return &windowsFoundationAdapter;
 }
-
+#endif
+#if defined(ENABLE_FOUNDATION_OBJECT) || defined(INTL_WINGLOB)
 Js::DelayLoadWinRtFoundation* ThreadContext::GetWinRtFoundationLibrary()
 {
     delayLoadWinRtFoundationLibrary.EnsureFromSystemDirOnly();

lib/Runtime/Base/ThreadContext.h

@@ -779,8 +779,10 @@ class ThreadContext sealed :
     Js::WindowsGlobalizationAdapter windowsGlobalizationAdapter;
 #endif
 #endif
-#ifdef ENABLE_FOUNDATION_OBJECT
+#if defined(ENABLE_FOUNDATION_OBJECT) || defined(ENABLE_GLOBALIZATION)
     Js::DelayLoadWinRtFoundation delayLoadWinRtFoundationLibrary;
+#endif
+#ifdef ENABLE_FOUNDATION_OBJECT
     Js::WindowsFoundationAdapter windowsFoundationAdapter;
 #endif
 #endif
@@ -892,8 +894,10 @@ class ThreadContext sealed :
     Js::WindowsGlobalizationAdapter *GetWindowsGlobalizationAdapter();
 #endif
 #endif
-#ifdef ENABLE_FOUNDATION_OBJECT
+#if defined(ENABLE_FOUNDATION_OBJECT) || defined(ENABLE_GLOBALIZATION)
     Js::DelayLoadWinRtFoundation *GetWinRtFoundationLibrary();
+#endif
+#ifdef ENABLE_FOUNDATION_OBJECT
     Js::WindowsFoundationAdapter *GetWindowsFoundationAdapter();
 #endif
 #endif