Add RoGetActivationFactory to NanaZip.Frieren.RuntimeObjectWrapper.

M2Team · Sep 22, 2024 · 2e3a07e · 2e3a07e
1 parent beddaab
commit 2e3a07e
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 1 deletion.
diff --git a/NanaZip.Frieren/NanaZip.Frieren.RuntimeObjectWrapper.cpp b/NanaZip.Frieren/NanaZip.Frieren.RuntimeObjectWrapper.cpp
@@ -50,6 +50,23 @@ namespace
         return CachedResult;
     }
 
+    static FARPROC GetRoGetActivationFactoryProcAddress()
+    {
+        static FARPROC CachedResult = ([]() -> FARPROC
+        {
+            HMODULE ModuleHandle = ::GetComBaseModuleHandle();
+            if (ModuleHandle)
+            {
+                return ::GetProcAddress(
+                    ModuleHandle,
+                    "RoGetActivationFactory");
+            }
+            return nullptr;
+        }());
+
+        return CachedResult;
+    }
+
     static FARPROC GetRoOriginateLanguageExceptionProcAddress()
     {
         static FARPROC CachedResult = ([]() -> FARPROC
@@ -170,6 +187,25 @@ namespace
     }
 }
 
+EXTERN_C HRESULT WINAPI RoGetActivationFactory(
+    _In_ HSTRING activatableClassId,
+    _In_ REFIID iid,
+    _Out_ LPVOID* factory)
+{
+    using ProcType = decltype(::RoGetActivationFactory)*;
+
+    ProcType ProcAddress = reinterpret_cast<ProcType>(
+        ::GetRoGetActivationFactoryProcAddress());
+
+    if (ProcAddress)
+    {
+        return ProcAddress(activatableClassId, iid, factory);
+    }
+
+    *factory = nullptr;
+    return CLASS_E_CLASSNOTAVAILABLE;
+}
+
 EXTERN_C BOOL WINAPI RoOriginateLanguageException(
     _In_ HRESULT error,
     _In_opt_ HSTRING message,

diff --git a/NanaZip.UI.Classic/NanaZip.vcxproj b/NanaZip.UI.Classic/NanaZip.vcxproj
@@ -34,7 +34,7 @@
     </ClCompile>
     <Link>
       <LargeAddressAware>true</LargeAddressAware>
-      <AdditionalDependencies>comctl32.lib;htmlhelp.lib;comdlg32.lib;Mpr.lib;%(AdditionalDependencies);runtimeobject.lib;</AdditionalDependencies>
+      <AdditionalDependencies>comctl32.lib;htmlhelp.lib;comdlg32.lib;Mpr.lib;%(AdditionalDependencies);</AdditionalDependencies>
       <DelayLoadDLLs>mpr.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
     </Link>
   </ItemDefinitionGroup>