From f51ee065c2fe1a45e63ffb01e40098cf169c4391 Mon Sep 17 00:00:00 2001 From: Andrey Nekrasov Date: Thu, 7 Oct 2021 16:48:45 +0300 Subject: [PATCH] [VCM] Activate the module (#13662) --- .pipelines/pipeline.user.windows.yml | 16 +++++++--------- installer/PowerToysSetup/Product.wxs | 15 ++++++--------- src/runner/main.cpp | 13 ++++++------- .../OOBE/Views/OobeShellPage.xaml.cs | 5 ++--- .../Views/ShellPage.xaml | 7 +++---- 5 files changed, 24 insertions(+), 32 deletions(-) diff --git a/.pipelines/pipeline.user.windows.yml b/.pipelines/pipeline.user.windows.yml index 1c6d88345..504ce43f7 100644 --- a/.pipelines/pipeline.user.windows.yml +++ b/.pipelines/pipeline.user.windows.yml @@ -62,11 +62,10 @@ build: - 'x64/**/*.pdb' exclude: - 'x64/Release/obj/**/*.pdb' - # TODO(yuyoyuppe): uncomment when VCM should be enabled - #- from: 'x86/Release' - # to: 'Build_Output' - # include: - # - 'modules\VideoConference\VideoConferenceProxyFilter_x86.dll' + - from: 'x86/Release' + to: 'Build_Output' + include: + - 'modules\VideoConference\VideoConferenceProxyFilter_x86.dll' - from: 'x64/Release' to: 'Build_Output' include: @@ -170,10 +169,9 @@ build: - 'modules\PowerRename\PowerRenameExt.dll' - 'modules\ShortcutGuide\ShortcutGuide\PowerToys.ShortcutGuide.exe' - 'modules\ShortcutGuide\ShortcutGuideModuleInterface\ShortcutGuideModuleInterface.dll' - # TODO(yuyoyuppe): uncomment when VCM should be enabled - #- 'modules\VideoConference\VideoConferenceModule.dll' - #- 'modules\VideoConference\VideoConferenceProxyFilter_x64.dll' - #- 'modules\VideoConference\VideoConferenceProxyFilter_x86.dll' + - 'modules\VideoConference\VideoConferenceModule.dll' + - 'modules\VideoConference\VideoConferenceProxyFilter_x64.dll' + - 'modules\VideoConference\VideoConferenceProxyFilter_x86.dll' - 'Settings\ManagedTelemetry.dll' - 'Settings\Microsoft.PowerToys.Settings.UI.exe' - 'Settings\Microsoft.PowerToys.Settings.UI.Lib.dll' diff --git a/installer/PowerToysSetup/Product.wxs b/installer/PowerToysSetup/Product.wxs index 40f13e744..4752b7c34 100644 --- a/installer/PowerToysSetup/Product.wxs +++ b/installer/PowerToysSetup/Product.wxs @@ -242,10 +242,9 @@ - - + @@ -707,8 +706,7 @@ - - + @@ -993,9 +991,8 @@ - - + + diff --git a/src/runner/main.cpp b/src/runner/main.cpp index 070028c12..31ae57914 100644 --- a/src/runner/main.cpp +++ b/src/runner/main.cpp @@ -144,13 +144,12 @@ int runner(bool isProcessElevated, bool openSettings, bool openOobe) 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); - //} + 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) { diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeShellPage.xaml.cs b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeShellPage.xaml.cs index 61a87c195..a587ec156 100644 --- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeShellPage.xaml.cs +++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeShellPage.xaml.cs @@ -180,8 +180,7 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Views Link = "https://aka.ms/PowerToysOverview_ShortcutGuide", }); - // TODO(yuyoyuppe): uncomment when VCM should be enabled - /* Modules.Insert((int)PowerToysModulesEnum.VideoConference, new OobePowerToysModule() + Modules.Insert((int)PowerToysModulesEnum.VideoConference, new OobePowerToysModule() { ModuleName = loader.GetString("Oobe_VideoConference"), Tag = "VideoConference", @@ -192,7 +191,7 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Views Description = loader.GetString("Oobe_VideoConference_Description"), PreviewImageSource = "ms-appx:///Assets/Modules/OOBE/VideoConferenceMute.png", Link = "https://aka.ms/PowerToysOverview_VideoConference", - }); */ + }); } public void OnClosing() diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ShellPage.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ShellPage.xaml index cacefb2b5..187368167 100644 --- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ShellPage.xaml +++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ShellPage.xaml @@ -119,15 +119,14 @@ - - + @@ -154,4 +153,4 @@ - \ No newline at end of file +