[VCM] Fix issues on certain systems (#12481)

- Don't depend on System.Windows.Forms in the Settings -> use callback instead
- Fix overlay image setting saving
- Use dynamic DLL loading in Interop
- Load VCM only when mf.dll is available

.github/actions/spell-check/expect.txt

@@ -399,6 +399,7 @@ ddd
 ddee
 ddf
 Deact
+DECLAR
 declspec
 decltype
 Dedup
@@ -1434,6 +1435,7 @@ ntdll
 NTFS
 NTSTATUS
 nuget
+null
 nullopt
 nullptr
 NUMLOCK
@@ -2311,6 +2313,7 @@ WINDOWPOSCHANGED
 WINDOWPOSCHANGING
 Windowsapp
 WINDOWSBUILDNUMBER
+Windowscodecs
 windowsdesktop
 windowssearch
 windowsx

installer/PowerToysSetup/Product.wxs

@@ -791,7 +791,7 @@
         <File Source="$(var.BinX64Dir)Settings\PowerToys.Settings.exe"/>
         <File Source="$(var.BinX64Dir)Settings\Microsoft.PowerToys.Settings.UI.exe"/>
         <!-- dll -->
-        <?foreach File in concrt140_app.dll;Microsoft.Bcl.AsyncInterfaces.dll;System.IO.Abstractions.dll;Microsoft.PowerToys.Settings.UI.Lib.dll;PowerToys.Settings.dll;Microsoft.Toolkit.dll;Microsoft.Toolkit.Uwp.dll;Microsoft.Toolkit.Uwp.UI.dll;Microsoft.Toolkit.Win32.UI.XamlHost.dll;Microsoft.Toolkit.Win32.UI.XamlHost.Managed.dll;Microsoft.Toolkit.Wpf.UI.Controls.dll;Microsoft.Toolkit.Wpf.UI.XamlHost.dll;Microsoft.UI.Xaml.dll;Microsoft.Xaml.Interactions.dll;Microsoft.Xaml.Interactivity.dll;msvcp140_1_app.dll;msvcp140_2_app.dll;msvcp140_app.dll;Newtonsoft.Json.dll;PowerToysInterop.dll;System.Runtime.CompilerServices.Unsafe.dll;System.Text.Encodings.Web.dll;System.Text.Json.dll;vcamp140_app.dll;vccorlib140_app.dll;vcomp140_app.dll;vcruntime140_1_app.dll;vcruntime140_app.dll;ManagedTelemetry.dll;ManagedCommon.dll;ColorCode.Core.dll;ColorCode.UWP.dll;Microsoft.Graphics.Canvas.winmd;Microsoft.Toolkit.Parsers.dll;Microsoft.Toolkit.Uwp.UI.Animations.dll;Microsoft.Toolkit.Uwp.UI.Controls.dll;System.Deployment.dll;System.Windows.Forms.dll;System.Runtime.Serialization.Formatters.Soap.dll?>
+        <?foreach File in concrt140_app.dll;Microsoft.Bcl.AsyncInterfaces.dll;System.IO.Abstractions.dll;Microsoft.PowerToys.Settings.UI.Lib.dll;PowerToys.Settings.dll;Microsoft.Toolkit.dll;Microsoft.Toolkit.Uwp.dll;Microsoft.Toolkit.Uwp.UI.dll;Microsoft.Toolkit.Win32.UI.XamlHost.dll;Microsoft.Toolkit.Win32.UI.XamlHost.Managed.dll;Microsoft.Toolkit.Wpf.UI.Controls.dll;Microsoft.Toolkit.Wpf.UI.XamlHost.dll;Microsoft.UI.Xaml.dll;Microsoft.Xaml.Interactions.dll;Microsoft.Xaml.Interactivity.dll;msvcp140_1_app.dll;msvcp140_2_app.dll;msvcp140_app.dll;Newtonsoft.Json.dll;PowerToysInterop.dll;System.Runtime.CompilerServices.Unsafe.dll;System.Text.Encodings.Web.dll;System.Text.Json.dll;vcamp140_app.dll;vccorlib140_app.dll;vcomp140_app.dll;vcruntime140_1_app.dll;vcruntime140_app.dll;ManagedTelemetry.dll;ManagedCommon.dll;ColorCode.Core.dll;ColorCode.UWP.dll;Microsoft.Graphics.Canvas.winmd;Microsoft.Toolkit.Parsers.dll;Microsoft.Toolkit.Uwp.UI.Animations.dll;Microsoft.Toolkit.Uwp.UI.Controls.dll?>
           <File Id="SettingsV2_$(var.File)" Source="$(var.BinX64Dir)Settings\$(var.File)" />
         <?endforeach?>
         <!-- json -->

src/common/interop/PowerToysInterop.vcxproj

@@ -55,7 +55,7 @@
       <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>Mf.lib;WindowsApp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>WindowsApp.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>

src/modules/videoconference/VideoConferenceModule/Video Conference.vcxproj

@@ -78,7 +78,7 @@
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <AdditionalDependencies>mfplat.lib;mf.lib;mfreadwrite.lib;mfuuid.lib;shlwapi.lib;gdiplus.lib;dwmapi.lib;uxtheme.lib;shcore.lib;Wtsapi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>shlwapi.lib;gdiplus.lib;dwmapi.lib;uxtheme.lib;shcore.lib;Wtsapi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
       <Command>xcopy /y /I  "$(ProjectDir)Icons\*" "$(OutDir)Icons"
@@ -101,7 +101,7 @@ xcopy /y /I  "$(ProjectDir)black.bmp*" "$(OutDir)"</Command>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <AdditionalDependencies>mfplat.lib;mf.lib;mfreadwrite.lib;mfuuid.lib;shlwapi.lib;gdiplus.lib;dwmapi.lib;uxtheme.lib;shcore.lib;Wtsapi32.lib;dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>shlwapi.lib;gdiplus.lib;dwmapi.lib;uxtheme.lib;shcore.lib;Wtsapi32.lib;dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
       <Command>xcopy /y /I  "$(ProjectDir)Icons\*" "$(OutDir)Icons"

src/modules/videoconference/VideoConferenceProxyFilter/ImageLoading.cpp

@@ -17,7 +17,6 @@
 #include <wil/resource.h>
 #include <wil/com.h>
 
-#include <mfapi.h>
 #include <mfidl.h>
 #include <mftransform.h>
 #include <dshow.h>

src/modules/videoconference/VideoConferenceProxyFilter/VideoConferenceProxyFilter.vcxproj

@@ -62,7 +62,7 @@
     </Lib>
     <PreBuildEvent Condition="'$(Platform)'=='x64'">
       <Command>call "$(ProjectDir)build_vcm_x86.cmd"</Command>
-    </PreBuildEvent>    
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <PropertyGroup Condition="'$(Platform)'!='Win32'">
     <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\modules\VideoConference\</OutDir>
@@ -87,7 +87,7 @@
       <RuntimeLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>$(OutDir)VideoConferenceShared.lib;mfplat.lib;Mfsensorgroup.lib;OneCoreUAP.lib;Mf.lib;Shlwapi.lib;Strmiids.lib;%(AdditionalDependencies);</AdditionalDependencies>
+      <AdditionalDependencies>$(OutDir)VideoConferenceShared.lib;Windowscodecs.lib;Wtsapi32.lib;mfplat.lib;WindowsApp.lib;Mfsensorgroup.lib;Mf.lib;Shlwapi.lib;Strmiids.lib;%(AdditionalDependencies);</AdditionalDependencies>
       <ModuleDefinitionFile>module.def</ModuleDefinitionFile>
     </Link>
   </ItemDefinitionGroup>

src/modules/videoconference/VideoConferenceShared/DLLProviderHelpers.h

@@ -0,0 +1,33 @@
+#pragma once
+
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
+
+#include <optional>
+#include <functional>
+#include <type_traits>
+
+#define DECLARE_DLL_FUNCTION(NAME) \
+    std::function<decltype(::NAME)> NAME = (std::add_pointer_t<decltype(::NAME)>)GetProcAddress(_library_handle, #NAME);
+
+#define DECLARE_DLL_PROVIDER_BEGIN(DLL_NAME)                       \
+    class DLL_NAME##APIProvider final                              \
+    {                                                              \
+        HMODULE _library_handle;                                   \
+        DLL_NAME##APIProvider(HMODULE h) : _library_handle{ h } {} \
+                                                                   \
+    public:                                                        \
+        ~DLL_NAME##APIProvider() { FreeLibrary(_library_handle); } \
+        static std::optional<DLL_NAME##APIProvider> create()       \
+        {                                                          \
+            HMODULE h = LoadLibraryA(#DLL_NAME ".dll");            \
+            std::optional<DLL_NAME##APIProvider> result;           \
+            if (!h)                                                \
+                return result;                                     \
+            result.emplace(DLL_NAME##APIProvider{ h });            \
+            return result;                                         \
+        }
+
+#define DECLAR_DLL_PROVIDER_END \
+    }                           \
+    ;

src/modules/videoconference/VideoConferenceShared/Logging.cpp

@@ -7,6 +7,7 @@
 #include <chrono>
 #include <filesystem>
 
+#include <initguid.h>
 #include <mfapi.h>
 
 #pragma warning(disable : 4127)

src/modules/videoconference/VideoConferenceShared/MediaFoundationAPIProvider.h

@@ -0,0 +1,14 @@
+#pragma once
+
+#include <mfapi.h>
+#include <mfidl.h>
+
+#include "DLLProviderHelpers.h"
+
+DECLARE_DLL_PROVIDER_BEGIN(mfplat)
+DECLARE_DLL_FUNCTION(MFCreateAttributes)
+DECLAR_DLL_PROVIDER_END
+
+DECLARE_DLL_PROVIDER_BEGIN(mf)
+DECLARE_DLL_FUNCTION(MFEnumDeviceSources)
+DECLAR_DLL_PROVIDER_END

src/modules/videoconference/VideoConferenceShared/VideoCaptureDeviceList.cpp

@@ -1,5 +1,6 @@
 #include "VideoCaptureDeviceList.h"
 #include "Logging.h"
+#include "MediaFoundationAPIProvider.h"
 #include <mfapi.h>
 #include <Mfidl.h>
 
@@ -32,11 +33,17 @@ HRESULT VideoCaptureDeviceList::EnumerateDevices()
     HRESULT hr = S_OK;
     wil::com_ptr<IMFAttributes> pAttributes;
     Clear();
+    auto mfplatAPI = mfplatAPIProvider::create();
+    auto mfAPI = mfAPIProvider::create();
+    if (!mfplatAPI || !mfAPI)
+    {
+        return ERROR_FILE_NOT_FOUND;
+    }
 
     // Initialize an attribute store. We will use this to
     // specify the enumeration parameters.
 
-    hr = MFCreateAttributes(&pAttributes, 1);
+    hr = mfplatAPI->MFCreateAttributes(&pAttributes, 1);
 
     // Ask for source type = video capture devices
     if (SUCCEEDED(hr))
@@ -52,14 +59,13 @@ HRESULT VideoCaptureDeviceList::EnumerateDevices()
     // Enumerate devices.
     if (SUCCEEDED(hr))
     {
-        hr = MFEnumDeviceSources(pAttributes.get(), &m_ppDevices, &m_numberDevices);
+        hr = mfAPI->MFEnumDeviceSources(pAttributes.get(), &m_ppDevices, &m_numberDevices);
     }
     else
     {
         LOG("VideoCaptureDeviceList::EnumerateDevices(): Couldn't SetGUID");
     }
 
-
     if (FAILED(hr))
     {
         LOG("VideoCaptureDeviceList::EnumerateDevices(): MFEnumDeviceSources failed");

src/modules/videoconference/VideoConferenceShared/VideoConferenceShared.vcxproj

@@ -21,7 +21,7 @@
   </ItemGroup>
   <ItemDefinitionGroup>
     <Link>
-      <AdditionalDependencies>mfplat.lib;Mfsensorgroup.lib;OneCoreUAP.lib;Mf.lib;Shlwapi.lib;Strmiids.lib;%(AdditionalDependencies);</AdditionalDependencies>
+      <AdditionalDependencies>mfplat.lib;Mfsensorgroup.lib;Mf.lib;Shlwapi.lib;Strmiids.lib;%(AdditionalDependencies);</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <PropertyGroup Label="Globals">
@@ -116,7 +116,9 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="CameraStateUpdateChannels.h" />
+    <ClInclude Include="DLLProviderHelpers.h" />
     <ClInclude Include="Logging.h" />
+    <ClInclude Include="MediaFoundationAPIProvider.h" />
     <ClInclude Include="SerializedSharedMemory.h" />
     <ClInclude Include="naming.h" />
     <ClInclude Include="MicrophoneDevice.h" />

src/runner/main.cpp

@@ -141,10 +141,16 @@ int runner(bool isProcessElevated, bool openSettings, bool openOobe)
             L"modules/PowerRename/PowerRenameExt.dll",
             L"modules/ShortcutGuide/ShortcutGuideModuleInterface/ShortcutGuideModuleInterface.dll",
             L"modules/ColorPicker/ColorPicker.dll",
-            L"modules/Awake/AwakeModuleInterface.dll",
-            // TODO(yuyoyuppe): uncomment when VCM should be enabled
-            //L"modules/VideoConference/VideoConferenceModule.dll"
+            L"modules/Awake/AwakeModuleInterface.dll"
+
         };
+        // TODO(yuyoyuppe): uncomment when VCM should be enabled
+        //const auto VCM_PATH = L"modules/VideoConference/VideoConferenceModule.dll";
+        //if (const auto mf = LoadLibraryA("mf.dll"))
+        //{
+        //    FreeLibrary(mf);
+        //    knownModules.emplace_back(VCM_PATH);
+        //}
 
         for (const auto& moduleSubdir : knownModules)
         {

src/settings-ui/Microsoft.PowerToys.Settings.UI.Library/Microsoft.PowerToys.Settings.UI.Library.csproj

@@ -59,10 +59,4 @@
     <ProjectReference Include="..\..\common\ManagedTelemetry\Telemetry\ManagedTelemetry.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="System.Windows.Forms">
-      <HintPath>C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\System.Windows.Forms.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
 </Project>

src/settings-ui/Microsoft.PowerToys.Settings.UI.Library/ViewModels/VideoConferenceViewModel.cs

@@ -8,7 +8,7 @@ using System.Linq;
 
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using System.Windows.Forms;
+using System.Threading.Tasks;
 using Microsoft.PowerToys.Settings.UI.Library;
 using Microsoft.PowerToys.Settings.UI.Library.Helpers;
 using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
@@ -28,10 +28,14 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
 
         private Func<string, int> SendConfigMSG { get; }
 
+        private Func<Task<string>> PickFileDialog { get; }
+
         private string _settingsConfigFileFolder = string.Empty;
 
-        public VideoConferenceViewModel(ISettingsUtils settingsUtils, ISettingsRepository<GeneralSettings> settingsRepository, Func<string, int> ipcMSGCallBackFunc, string configFileSubfolder = "")
+        public VideoConferenceViewModel(ISettingsUtils settingsUtils, ISettingsRepository<GeneralSettings> settingsRepository, Func<string, int> ipcMSGCallBackFunc, Func<Task<string>> pickFileDialog, string configFileSubfolder = "")
         {
+            PickFileDialog = pickFileDialog;
+
             if (settingsRepository == null)
             {
                 throw new ArgumentNullException(nameof(settingsRepository));
@@ -161,21 +165,11 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             RaisePropertyChanged(nameof(CameraImageOverlayPath));
         }
 
-        private void SelectOverlayImageAction()
+        private async void SelectOverlayImageAction()
         {
             try
             {
-                string pickedImage = null;
-                using (OpenFileDialog openFileDialog = new OpenFileDialog())
-                {
-                    openFileDialog.Filter = "Image Files (*.jpeg;*.jpg;*.png)|*.jpeg;*.jpg;*.png";
-                    openFileDialog.RestoreDirectory = true;
-                    if (openFileDialog.ShowDialog() == DialogResult.OK)
-                    {
-                        pickedImage = openFileDialog.FileName;
-                    }
-                }
-
+                string pickedImage = await PickFileDialog().ConfigureAwait(true);
                 if (pickedImage != null)
                 {
                     CameraImageOverlayPath = pickedImage;
@@ -417,8 +411,8 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             OnPropertyChanged(propertyName);
             SndVideoConferenceSettings outsettings = new SndVideoConferenceSettings(Settings);
             SndModuleSettings<SndVideoConferenceSettings> ipcMessage = new SndModuleSettings<SndVideoConferenceSettings>(outsettings);
-
             SendConfigMSG(ipcMessage.ToJsonString());
+            _settingsUtils.SaveSettings(Settings.ToJsonString(), GetSettingsSubPath());
         }
     }
 

src/settings-ui/Microsoft.PowerToys.Settings.UI/ViewModels/ShellViewModel.cs

@@ -6,6 +6,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using System.Windows.Input;
 using Microsoft.PowerToys.Settings.UI.Helpers;
@@ -37,11 +38,24 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             set { Set(ref isBackEnabled, value); }
         }
 
+        [DllImport("kernel32.dll", CharSet = CharSet.Unicode)]
+        private static extern IntPtr LoadLibrary(string dllToLoad);
+
+        [DllImport("kernel32.dll", CharSet = CharSet.Unicode)]
+        private static extern bool FreeLibrary(IntPtr hModule);
+
         public bool IsVideoConferenceBuild
         {
             get
             {
-                return this != null && File.Exists("modules/VideoConference/VideoConferenceModule.dll");
+                var mfHandle = LoadLibrary("mf.dll");
+                bool mfAvailable = mfHandle != null;
+                if (mfAvailable)
+                {
+                    FreeLibrary(mfHandle);
+                }
+
+                return this != null && File.Exists("modules/VideoConference/VideoConferenceModule.dll") && mfAvailable;
             }
         }
 

src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/VideoConference.xaml.cs

@@ -2,9 +2,12 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System;
+using System.Threading.Tasks;
 using Microsoft.PowerToys.Settings.UI.Library;
-using Microsoft.PowerToys.Settings.UI.Library.Utilities;
 using Microsoft.PowerToys.Settings.UI.ViewModels;
+using Windows.Storage;
+using Windows.Storage.Pickers;
 using Windows.UI.Xaml.Controls;
 
 namespace Microsoft.PowerToys.Settings.UI.Views
@@ -13,10 +16,24 @@ namespace Microsoft.PowerToys.Settings.UI.Views
     {
         private VideoConferenceViewModel ViewModel { get; set; }
 
+        private static async Task<string> PickFileDialog()
+        {
+            FileOpenPicker openPicker = new FileOpenPicker();
+            openPicker.ViewMode = PickerViewMode.Thumbnail;
+            openPicker.SuggestedStartLocation = PickerLocationId.PicturesLibrary;
+            openPicker.FileTypeFilter.Add(".jpg");
+            openPicker.FileTypeFilter.Add(".jpeg");
+            openPicker.FileTypeFilter.Add(".png");
+            ((IInitializeWithWindow)(object)openPicker).Initialize(System.Diagnostics.Process.GetCurrentProcess().MainWindowHandle);
+
+            StorageFile file = await openPicker.PickSingleFileAsync();
+            return file?.Path;
+        }
+
         public VideoConferencePage()
         {
             var settingsUtils = new SettingsUtils();
-            ViewModel = new VideoConferenceViewModel(settingsUtils, SettingsRepository<GeneralSettings>.GetInstance(settingsUtils), ShellPage.SendDefaultIPCMessage);
+            ViewModel = new VideoConferenceViewModel(settingsUtils, SettingsRepository<GeneralSettings>.GetInstance(settingsUtils), ShellPage.SendDefaultIPCMessage, PickFileDialog);
             DataContext = ViewModel;
             InitializeComponent();
         }