Miscellaneous Windows AppRuntime fixes

Author: bghgary

Core/AppRuntime/Source/AppRuntime_Chakra.cpp

@@ -20,30 +20,21 @@ namespace Babylon
 
     void AppRuntime::RunEnvironmentTier(const char*)
     {
-        using DispatchFunction = std::function<void(std::function<void()>)>;
-        DispatchFunction dispatchFunction{
-            [this](std::function<void()> action) {
-                Dispatch([action = std::move(action)](Napi::Env) {
-                    action();
-                });
-            }};
-
         JsRuntimeHandle jsRuntime;
         ThrowIfFailed(JsCreateRuntime(JsRuntimeAttributeNone, nullptr, &jsRuntime));
         JsContextRef context;
         ThrowIfFailed(JsCreateContext(jsRuntime, &context));
         ThrowIfFailed(JsSetCurrentContext(context));
         ThrowIfFailed(JsSetPromiseContinuationCallback([](JsValueRef task, void* callbackState) {
+            auto* pThis = reinterpret_cast<AppRuntime*>(callbackState);
             ThrowIfFailed(JsAddRef(task, nullptr));
-            auto* dispatch = reinterpret_cast<DispatchFunction*>(callbackState);
-            dispatch->operator()([task]() {
-                JsValueRef undefined;
-                ThrowIfFailed(JsGetUndefinedValue(&undefined));
-                ThrowIfFailed(JsCallFunction(task, &undefined, 1, nullptr));
+            pThis->Dispatch([task](auto) {
+                JsValueRef global;
+                ThrowIfFailed(JsGetGlobalObject(&global));
+                ThrowIfFailed(JsCallFunction(task, &global, 1, nullptr));
                 ThrowIfFailed(JsRelease(task, nullptr));
             });
-        },
-            &dispatchFunction));
+        }, this));
         ThrowIfFailed(JsProjectWinRTNamespace(L"Windows"));
 
 #if defined(_DEBUG)

Core/AppRuntime/Source/AppRuntime_Win32.cpp

@@ -1,7 +1,7 @@
 #include "AppRuntime.h"
 
-#include <Objbase.h>
-#include <Windows.h>
+#include <winrt/base.h>
+#include <roapi.h>
 
 #include <gsl/gsl>
 #include <cassert>
@@ -10,23 +10,14 @@
 
 namespace Babylon
 {
-    namespace
-    {
-        constexpr size_t FILENAME_BUFFER_SIZE = 1024;
-    }
-
     void AppRuntime::RunPlatformTier()
     {
-        HRESULT hr = CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED);
-        assert(SUCCEEDED(hr));
-        _CRT_UNUSED(hr);
-        auto coInitScopeGuard = gsl::finally([] { CoUninitialize(); });
+        winrt::check_hresult(Windows::Foundation::Initialize(RO_INIT_MULTITHREADED));
+
+        char executablePath[1024];
+        winrt::check_win32(GetModuleFileNameA(nullptr, executablePath, ARRAYSIZE(executablePath)));
 
-        char filename[FILENAME_BUFFER_SIZE];
-        auto result = GetModuleFileNameA(nullptr, filename, static_cast<DWORD>(std::size(filename)));
-        assert(result != 0);
-        (void)result;
-        RunEnvironmentTier(filename);
+        RunEnvironmentTier(executablePath);
     }
 
     void AppRuntime::DefaultUnhandledExceptionHandler(const std::exception& error)

Core/AppRuntime/Source/AppRuntime_WinRT.cpp

@@ -1,6 +1,7 @@
 #include "AppRuntime.h"
 
-#include <Windows.h>
+#include <winrt/base.h>
+#include <roapi.h>
 
 #include <exception>
 #include <sstream>
@@ -9,6 +10,8 @@ namespace Babylon
 {
     void AppRuntime::RunPlatformTier()
     {
+        winrt::check_hresult(Windows::Foundation::Initialize(RO_INIT_MULTITHREADED));
+
         RunEnvironmentTier();
     }