Workaround access_token issue. More tests.

Author: DefaultRyan

strings/base_security.h

@@ -69,31 +69,38 @@ WINRT_EXPORT namespace winrt
             check_bool(WINRT_IMPL_SetThreadToken(nullptr, get()));
         }
 
-        auto operator()() const
-        {
-            struct guard
-            {
-                guard(access_token&& previous) noexcept : m_previous(std::move(previous))
-                {
-                }
-
-                ~guard()
-                {
-                    m_previous.revert();
-                }
-
-                guard(guard const&)
-                {
-                    // A Visual C++ compiler bug (550631) requires the copy constructor even though it is never called.
-                    WINRT_ASSERT(false);
-                }
+        auto operator()() const;
+    };
+}
 
-            private:
+WINRT_EXPORT namespace winrt
+{
+    struct access_token_guard
+    {
+        access_token_guard(handle&& previous) noexcept : m_previous(std::move(previous))
+        {
+        }
 
-                access_token const m_previous;
-            };
+        ~access_token_guard()
+        {
+            check_bool(WINRT_IMPL_SetThreadToken(nullptr, m_previous.get()));
+        }
 
-            return guard(impersonate());
+        access_token_guard(access_token_guard const&)
+        {
+            // A Visual C++ compiler bug (550631) requires the copy constructor even though it is never called.
+            WINRT_ASSERT(false);
         }
+
+    private:
+        // Work around modules bug that claims access_token is undefined/incomplete here.
+        handle m_previous;
     };
+
+    inline auto access_token::operator()() const
+    {
+        auto previous = thread();
+        check_bool(WINRT_IMPL_SetThreadToken(nullptr, get()));
+        return access_token_guard(std::move(previous));
+    }
 }

test/old_tests/UnitTests/Security.cpp

@@ -1,6 +1,14 @@
+#ifndef WINRT_TEST_MODULES
 #include "pch.h"
+#endif
 #include "catch.hpp"
 
+#ifdef WINRT_TEST_MODULES
+#include <Windows.h>
+import std;
+import winrt;
+#endif
+
 using namespace winrt;
 using namespace Windows::Foundation;
 

test/test/await_adapter.cpp

@@ -1,5 +1,12 @@
+#ifdef WINRT_TEST_MODULES
+#include <catch.hpp>
+#include <Windows.h>
+import std;
+import winrt;
+#else
 #include "pch.h"
 #include "winrt/Windows.System.h"
+#endif
 
 using namespace std::literals;
 using namespace winrt;

test/test/coro_threadpool.cpp

@@ -1,8 +1,12 @@
 // Intentionally not using pch...
 #include "catch.hpp"
 
+#ifdef WINRT_TEST_MODULES
+import winrt;
+#else
 // Only need winrt/base.h for coroutine thread pool support.
 #include "winrt/base.h"
+#endif
 
 using namespace winrt;
 

test/test_cpp20_module/test_cpp20_module.vcxproj

@@ -99,7 +99,7 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalIncludeDirectories>$(OutputPath);..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NOMINMAX;WINRT_LEAN_AND_MEAN;WINRT_IMPORT_STD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NOMINMAX;WINRT_LEAN_AND_MEAN;WINRT_IMPORT_STD;WINRT_TEST_MODULES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <BuildStlModules>true</BuildStlModules>
     </ClCompile>
@@ -127,11 +127,14 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="$(OutDir)winrt\winrt.ixx" />
+    <ClCompile Include="..\old_tests\UnitTests\Security.cpp" />
+    <ClCompile Include="..\test\await_adapter.cpp" />
+    <ClCompile Include="..\test\coro_threadpool.cpp" />
     <ClCompile Include="async.cpp" />
     <ClCompile Include="interop.cpp" />
     <ClCompile Include="main.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>