Remove GetLanguagesForUser

Thread safe PrimaryLanguageOverride for un-packaged
Use W.G.PrimaryLanguageOverride for packaged

Author: stefansjfw

dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/src/ApplicationLanguages.cpp

@@ -7,6 +7,8 @@
 
 #include <winrt/Windows.Globalization.h>
 
+#include <AppModel.Identity.h>
+
 namespace winrt::Microsoft::Windows::ApplicationModel::Resources::implementation
 {
     hstring ApplicationLanguages::m_language;
@@ -23,17 +25,24 @@ namespace winrt::Microsoft::Windows::ApplicationModel::Resources::implementation
 
     hstring ApplicationLanguages::PrimaryLanguageOverride()
     {
+        static wil::srwlock lock;
+
+        auto criticalSection{ lock.lock_shared() };
         return m_language;
     }
 
     void ApplicationLanguages::PrimaryLanguageOverride(hstring const& language)
     {
-        m_language = language;
-    }
-
-    winrt::Windows::Foundation::Collections::IVectorView<hstring> ApplicationLanguages::GetLanguagesForUser(winrt::Windows::System::User const& user)
-    {
-        return winrt::Windows::Globalization::ApplicationLanguages::GetLanguagesForUser(user);
+        if (AppModel::Identity::IsPackagedProcess())
+        {
+            winrt::Windows::Globalization::ApplicationLanguages::PrimaryLanguageOverride(language);
+        }
+        else
+        {
+            static wil::srwlock lock;
+
+            auto criticalSection{ lock.lock_exclusive() };
+            m_language = language;
+        }
     }
-
 } // namespace winrt::Microsoft::Windows::ApplicationModel::Resources::implementation

dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/src/ApplicationLanguages.h

@@ -14,7 +14,6 @@ namespace winrt::Microsoft::Windows::ApplicationModel::Resources::implementation
         static winrt::Windows::Foundation::Collections::IVectorView<hstring> ManifestLanguages();
         static hstring PrimaryLanguageOverride();
         static void PrimaryLanguageOverride(hstring const& language);
-        static winrt::Windows::Foundation::Collections::IVectorView<hstring> GetLanguagesForUser(winrt::Windows::System::User const& user);
 
     private:
         static hstring m_language;

dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/src/Microsoft.Windows.ApplicationModel.Resources.idl

@@ -120,8 +120,6 @@ namespace Microsoft.Windows.ApplicationModel.Resources
         static IVectorView<String> Languages { get; };
         static IVectorView<String> ManifestLanguages { get; };
         static String PrimaryLanguageOverride;
-
-        static IVectorView<String> GetLanguagesForUser(Windows.System.User user);
     }
 
 } // namespace Microsoft.Windows.ApplicationModel. Resources

dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/src/Microsoft.Windows.ApplicationModel.Resources.vcxproj

@@ -90,6 +90,7 @@
       </DisableSpecificWarnings>
       <PreprocessorDefinitions>_WINRT_DLL;WIN32_LEAN_AND_MEAN;WINRT_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
+      <AdditionalIncludeDirectories>$(RepoRoot)\dev\Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -173,6 +174,7 @@
     <Import Project="$(NugetPackageDirectory)\Microsoft.SourceLink.Common.$(MicrosoftSourceLinkCommonVersion)\build\Microsoft.SourceLink.Common.targets" Condition="Exists('$(NugetPackageDirectory)\Microsoft.SourceLink.Common.$(MicrosoftSourceLinkCommonVersion)\build\Microsoft.SourceLink.Common.targets')" />
     <Import Project="$(NugetPackageDirectory)\Microsoft.Build.Tasks.Git.$(MicrosoftBuildTasksGitVersion)\build\Microsoft.Build.Tasks.Git.targets" Condition="Exists('$(NugetPackageDirectory)\Microsoft.Build.Tasks.Git.$(MicrosoftBuildTasksGitVersion)\build\Microsoft.Build.Tasks.Git.targets')" />
     <Import Project="$(NugetPackageDirectory)\Microsoft.SourceLink.GitHub.$(MicrosoftSourceLinkGitHubVersion)\build\Microsoft.SourceLink.GitHub.targets" Condition="Exists('$(NugetPackageDirectory)\Microsoft.SourceLink.GitHub.$(MicrosoftSourceLinkGitHubVersion)\build\Microsoft.SourceLink.GitHub.targets')" />
+    <Import Project="$(NugetPackageDirectory)\Microsoft.Windows.ImplementationLibrary.$(MicrosoftWindowsImplementationLibraryVersion)\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(NugetPackageDirectory)\Microsoft.Windows.ImplementationLibrary.$(MicrosoftWindowsImplementationLibraryVersion)\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
@@ -187,5 +189,6 @@
     <Error Condition="!Exists('$(NugetPackageDirectory)\Microsoft.Build.Tasks.Git.$(MicrosoftBuildTasksGitVersion)\build\Microsoft.Build.Tasks.Git.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NugetPackageDirectory)\Microsoft.Build.Tasks.Git.$(MicrosoftBuildTasksGitVersion)\build\Microsoft.Build.Tasks.Git.targets'))" />
     <Error Condition="!Exists('$(NugetPackageDirectory)\Microsoft.SourceLink.GitHub.$(MicrosoftSourceLinkGitHubVersion)\build\Microsoft.SourceLink.GitHub.props')" Text="$([System.String]::Format('$(ErrorText)', '$(NugetPackageDirectory)\Microsoft.SourceLink.GitHub.$(MicrosoftSourceLinkGitHubVersion)\build\Microsoft.SourceLink.GitHub.props'))" />
     <Error Condition="!Exists('$(NugetPackageDirectory)\Microsoft.SourceLink.GitHub.$(MicrosoftSourceLinkGitHubVersion)\build\Microsoft.SourceLink.GitHub.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NugetPackageDirectory)\Microsoft.SourceLink.GitHub.$(MicrosoftSourceLinkGitHubVersion)\build\Microsoft.SourceLink.GitHub.targets'))" />
+    <Error Condition="!Exists('$(NugetPackageDirectory)\Microsoft.Windows.ImplementationLibrary.$(MicrosoftWindowsImplementationLibraryVersion)\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NugetPackageDirectory)\Microsoft.Windows.ImplementationLibrary.$(MicrosoftWindowsImplementationLibraryVersion)\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
   </Target>
 </Project>

dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/src/packages.config

@@ -4,4 +4,5 @@
   <package id="Microsoft.SourceLink.Common" version="1.1.1" targetFramework="native" developmentDependency="true" />
   <package id="Microsoft.SourceLink.GitHub" version="1.1.1" targetFramework="native" developmentDependency="true" />
   <package id="Microsoft.Windows.CppWinRT" version="2.0.230706.1" targetFramework="native" />
-</packages>
+  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.220914.1" targetFramework="native" />
+</packages>

dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/src/pch.h

@@ -7,6 +7,9 @@
 #include <winrt/Windows.Foundation.Collections.h>
 #include "..\..\core\src\MRM.h"
 
+#include <wil/result_macros.h>
+#include <wil/resource.h>
+
 struct StringResourceFreer
 {
     void operator()(wchar_t* resource) { MrmFreeResource(resource); }