Fix lookup for factories

shmuelie · Dec 17, 2023 · 5866423 · 5866423
1 parent e33dac2
commit 5866423
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 2 deletions.
diff --git a/src/Shmuelie.WinRTServer/NativeMethods.txt b/src/Shmuelie.WinRTServer/NativeMethods.txt
@@ -21,4 +21,5 @@ RoInitialize
 RoRegisterActivationFactories
 RoRevokeActivationFactories
 S_FALSE
-GLOBALOPT_RO_FLAGS
+GLOBALOPT_RO_FLAGS
+WindowsGetStringRawBuffer
diff --git a/src/Shmuelie.WinRTServer/WinRtServer.cs b/src/Shmuelie.WinRTServer/WinRtServer.cs
@@ -183,7 +183,7 @@ private unsafe HRESULT ActivationFactoryCallback(HSTRING activatableClassId, IAc
             return HRESULT.E_INVALIDARG;
         }
 
-        if (!factories.TryGetValue(activatableClassId.ToString(), out BaseActivationFactory? managedFactory))
+        if (!factories.TryGetValue(activatableClassId.AsString(), out BaseActivationFactory? managedFactory))
         {
             factory = null;
             return HRESULT.E_NOINTERFACE;

diff --git a/src/Shmuelie.WinRTServer/Windows/winrt/HSTRING.cs b/src/Shmuelie.WinRTServer/Windows/winrt/HSTRING.cs
@@ -0,0 +1,24 @@
+using Windows.Win32.Foundation;
+using Windows.Win32.System.WinRT;
+using static Windows.Win32.PInvoke;
+
+namespace Shmuelie.Interop.Windows;
+
+internal static class HSTRING_
+{
+#if !NETSTANDARD
+    [System.Runtime.Versioning.SupportedOSPlatform("windows8.0")]
+#endif
+    public unsafe static string AsString(this HSTRING @this)
+    {
+        if (@this.IsNull)
+        {
+            return string.Empty;
+        }
+
+        uint characterCount;
+        PCWSTR characters = WindowsGetStringRawBuffer(@this, &characterCount);
+
+        return characters.ToString();
+    }
+}