Use bcp47mrm header

Author: stefansjfw

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

@@ -5,12 +5,11 @@
 #include "ApplicationLanguages.h"
 #include "Microsoft.Windows.Globalization.ApplicationLanguages.g.cpp"
 
+#include <bcp47mrm.h>
 #include <winrt/Windows.Globalization.h>
 
 #include <AppModel.Identity.h>
 
-#include "Helper.h"
-
 namespace winrt::Microsoft::Windows::Globalization::implementation
 {
     hstring ApplicationLanguages::m_language;
@@ -42,7 +41,7 @@ namespace winrt::Microsoft::Windows::Globalization::implementation
 
     void ApplicationLanguages::PrimaryLanguageOverride(hstring const& language)
     {
-        bool isValidLanguageTag = _DefIsWellFormedTag(language.c_str());
+        bool isValidLanguageTag = IsWellFormedTag(language.c_str());
 
         THROW_HR_IF_MSG(E_INVALIDARG, !isValidLanguageTag, "The parameter is incorrect");
 

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

@@ -86,67 +86,3 @@ HRESULT GetDefaultPriFile(winrt::hstring& filePath)
     bool isPackaged = (hr != HRESULT_FROM_WIN32(APPMODEL_ERROR_NO_PACKAGE));
     return GetDefaultPriFileForCurentModule(isPackaged, filePath);
 }
-
-// Taken from Platform.h/.cpp
-typedef bool(WINAPI* IsWellFormedTagFunc)(PCWSTR);
-HMODULE g_bcp47 = (HMODULE)(-1);
-
-HMODULE LoadBcp47ModuleFrom(_In_ PCWSTR moduleName)
-{
-    HMODULE module = LoadLibraryExW(moduleName, nullptr, LOAD_LIBRARY_SEARCH_SYSTEM32);
-    if (module != nullptr)
-    {
-        // All BCP47 APIs we are interested are always exported from the same dll together. So we just pick anyone for probe.
-        IsWellFormedTagFunc func = (IsWellFormedTagFunc)(GetProcAddress(module, "IsWellFormedTag"));
-        if (func != nullptr)
-        {
-            return module;
-        }
-        FreeLibrary(module);
-    }
-
-    return nullptr;
-}
-
-HMODULE LoadBcp47Module()
-{
-    HMODULE module = LoadBcp47ModuleFrom(L"bcp47mrm.dll");
-    if (module == nullptr)
-    {
-        // In downlevel OS, the API is exposed by bcp47langs.dll.
-        module = LoadBcp47ModuleFrom(L"bcp47langs.dll");
-    }
-
-    return module;
-}
-
-void InitializeBcp47Module()
-{
-    HMODULE comparand = (HMODULE)(-1);
-    if (InterlockedCompareExchangePointer(reinterpret_cast<PVOID*>(&g_bcp47), comparand, comparand) == comparand)
-    {
-        HMODULE module = LoadBcp47Module();
-        InterlockedExchangePointer(reinterpret_cast<PVOID*>(&g_bcp47), module);
-    }
-}
-
-BOOLEAN _DefIsWellFormedTag(_In_ PCWSTR tag)
-{
-    // Before new SDK is released, we need to use LoadLibrary/GetProcAddress
-    InitializeBcp47Module();
-
-    if (g_bcp47 == nullptr)
-    {
-        // Didn't find an implementation. Just return TRUE.
-        return TRUE;
-    }
-
-    IsWellFormedTagFunc func = (IsWellFormedTagFunc)(GetProcAddress(g_bcp47, "IsWellFormedTag"));
-    if (func != nullptr)
-    {
-        return func(tag);
-    }
-
-    // Should not reach here.
-    return TRUE;
-}

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

@@ -4,4 +4,3 @@
 #pragma once
 bool IsResourceNotFound(HRESULT hr);
 HRESULT GetDefaultPriFile(winrt::hstring& path);
-BOOLEAN _DefIsWellFormedTag(_In_ PCWSTR tag);

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

@@ -17,7 +17,7 @@
     <DefaultLanguage>en-US</DefaultLanguage>
     <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
     <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion Condition=" '$(WindowsTargetPlatformVersion)' == '' ">10.0.18362.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition=" '$(WindowsTargetPlatformVersion)' == '' ">10.0.20348.0</WindowsTargetPlatformVersion>
     <WindowsTargetPlatformMinVersion>10.0.17134.0</WindowsTargetPlatformMinVersion>
     <!-- Need to add this otherwise the ADO build won't copy mrm.dll to output directory, and eventually the file will miss in ManagedTest.build.appxrecipe and make
          the tests fail to run in ADO pipeline -->
@@ -96,7 +96,7 @@
       <SubSystem>Console</SubSystem>
       <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
       <ModuleDefinitionFile>Microsoft.Windows.ApplicationModel.Resources.def</ModuleDefinitionFile>
-      <AdditionalDependencies>$(OutDir)..\mrm\MRM.lib;onecoreuap.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>$(OutDir)..\mrm\MRM.lib;onecoreuap.lib;bcp47mrm.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">