Merge remote-tracking branch 'origin/main' into feature/video-conference

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

@@ -112,7 +112,7 @@ AUTHN
 AUTHZ
 AUTOHIDE
 AUTOMATIONPROPERTIES
-autorun
+Autorun
 AUTOUPDATE
 AValid
 awakeness
@@ -136,6 +136,7 @@ BITMAPFILEHEADER
 bitmapimage
 BITMAPINFO
 BITMAPINFOHEADER
+Bitmaps
 bitmask
 BITSPIXEL
 bla
@@ -144,7 +145,7 @@ Blockquotes
 blogs
 Blt
 BLUEGRAY
-bluetooth
+Bluetooth
 BLURBEHIND
 BLURREGION
 bmi
@@ -1369,7 +1370,6 @@ pef
 PElems
 Pels
 PERCEIVEDFLAG
-Percision
 perfmon
 pesi
 petabyte

Cpp.Build.props

@@ -42,6 +42,9 @@
  <PreferredToolArchitecture Condition="'$(PROCESSOR_ARCHITECTURE)' == 'ARM64' or '$(PROCESSOR_ARCHITEW6432)' == 'ARM64'">arm64</PreferredToolArchitecture>
  <VcpkgEnabled>false</VcpkgEnabled>
  <ExternalIncludePath>$(MSBuildThisFileFullPath)\..\deps\;$(MSBuildThisFileFullPath)\..\packages\;$(ExternalIncludePath)</ExternalIncludePath>
+ <!-- Enable control flow guard for C++ projects that don't consume any C++ files -->
+ <!-- This covers the case where a .dll exports a .lib, but doesn't have any ClCompile entries. -->
+ <LinkControlFlowGuard>Guard</LinkControlFlowGuard>
  </PropertyGroup>
  <ItemDefinitionGroup>
  <ClCompile>
@@ -53,9 +56,12 @@
  <ConformanceMode>false</ConformanceMode>
  <TreatWarningAsError>true</TreatWarningAsError>
  <LanguageStandard>stdcpplatest</LanguageStandard>
- <BuildStlModules>false</BuildStlModules>
+ <BuildStlModules>false</BuildStlModules>
  <AdditionalOptions>/await %(AdditionalOptions)</AdditionalOptions>
  <PreprocessorDefinitions>_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <!-- CLR + CFG are not compatible >:{ -->
+ <ControlFlowGuard Condition="'$(CLRSupport)' == ''">Guard</ControlFlowGuard>
+ <DebugInformationFormat Condition="'%(ControlFlowGuard)' == 'Guard'">ProgramDatabase</DebugInformationFormat>
  </ClCompile>
  <Link>
  <SubSystem>Windows</SubSystem>

Directory.Packages.props

@@ -40,7 +40,7 @@
  <PackageVersion Include="Microsoft.Windows.CsWinRT" Version="2.0.3" />
  <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.756" />
  <PackageVersion Include="Microsoft.Windows.SDK.Contracts" Version="10.0.19041.1" />
- <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.4.230822000" />
+ <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.4.230913002" />
  <PackageVersion Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
  <PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
  <PackageVersion Include="ModernWpfUI" Version="0.9.4" />

NOTICE.md

@@ -341,7 +341,7 @@ SOFTWARE.
 - Microsoft.Windows.CsWinRT 2.0.3
 - Microsoft.Windows.SDK.BuildTools 10.0.22621.756
 - Microsoft.Windows.SDK.Contracts 10.0.19041.1
-- Microsoft.WindowsAppSDK 1.4.230822000
+- Microsoft.WindowsAppSDK 1.4.230913002
 - Microsoft.Xaml.Behaviors.WinUI.Managed 2.0.9
 - Microsoft.Xaml.Behaviors.Wpf 1.1.39
 - ModernWpfUI 0.9.4

doc/devdocs/modules/launcher/plugins/system.md

@@ -15,7 +15,7 @@ Available commands:
 * Hibernate
 * Open / Empty Recycle Bin
 * UEFI Firmware Settings (Only available on systems, that boot in UEFI mode.)
-* IP / MAC / Address => Show informations about network connections.
+* IP / MAC / Address => Show information about network connections.
 
 ## Optional plugin settings
 
@@ -46,7 +46,7 @@ Available commands:
 
 ### [`NetworkConnectionProperties.cs`](/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Components/NetworkConnectionProperties.cs)
 - The [`NetworkConnectionProperties`](/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Components/NetworkConnectionProperties.cs) class contains methods to get the properties of a network interface/connection.
-- An instance of this class collects/provides all required informations about one connection/adapter.
+- An instance of this class collects/provides all required information about one connection/adapter.
 
 ### [`SystemPluginContext.cs`](/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Components/SystemPluginContext.cs)
 - An instance of the class [`SystemPluginContext`](/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Components/SystemPluginContext.cs) contains/defines the context data of a system plugin result. We select the context menu based on the defined properties.

doc/devdocs/readme.md

@@ -2,35 +2,36 @@
 
 ## Fork, Clone, Branch and Create your PR
 
-Once you've discussed your proposed feature/fix/etc. with a team member, and you've agreed an approach or a spec has been written and approved, it's time to start development:
+Once you've discussed your proposed feature/fix/etc. with a team member, and an approach or a spec has been written and approved, it's time to start development:
 
-1. Fork the repo if you haven't already
+1. Fork the repo on GitHub if you haven't already
 1. Clone your fork locally
-1. Create & push a feature branch
-1. Create a [Draft Pull Request (PR)](https://github.blog/2019-02-14-introducing-draft-pull-requests/)
+1. Create a feature branch
 1. Work on your changes
+1. Create a [Draft Pull Request (PR)](https://github.blog/2019-02-14-introducing-draft-pull-requests/)
+1. When ready, mark your PR as "ready for review".
 
 ## Rules
 
 - **Follow the pattern of what you already see in the code.**
 - [Coding style](style.md).
-- Try to package new ideas/components into libraries that have nicely defined interfaces.
-- Package new ideas into classes or refactor existing ideas into a class as you extend.
-- When adding new classes/methods/changing existing code: add new unit tests or update the existing tests.
+- Try to package new functionality/components into libraries that have nicely defined interfaces.
+- Package new functionality into classes or refactor existing functionality into a class as you extend the code.
+- When adding new classes/methods/changing existing code, add new unit tests or update the existing tests.
 
 ## GitHub Workflow
 
 - Before starting to work on a fix/feature, make sure there is an open issue to track the work.
-- Add the `In progress` label to the issue, if not already present also add a `Cost-Small/Medium/Large` estimate and make sure all appropriate labels are set.
-- If you are a community contributor, you will not be able to add labels to the issue, in that case just add a comment saying that you started to work on the issue and try to give an estimate for the delivery date.
+- Add the `In progress` label to the issue, if not already present. Also add a `Cost-Small/Medium/Large` estimate and make sure all appropriate labels are set.
+- If you are a community contributor, you will not be able to add labels to the issue; in that case just add a comment saying that you have started work on the issue and try to give an estimate for the delivery date.
 - If the work item has a medium/large cost, using the markdown task list, list each sub item and update the list with a check mark after completing each sub item.
 - When opening a PR, follow the PR template.
-- When you'd like the team to take a look, (even if the work is not yet fully-complete), mark the PR as 'Ready For Review' so that the team can review your work and provide comments, suggestions, and request changes. It may take several cycles, but the end result will be solid, testable, conformant code that is safe for us to merge.
-- When the PR is approved, let the owner of the PR merge it. For community contributions the reviewer that approved the PR can also merge it.
-- Use the `Squash and merge` option to merge a PR, if you don't want to squash it because there are logically different commits, use `Rebase and merge`.
+- When you'd like the team to take a look (even if the work is not yet fully complete) mark the PR as 'Ready For Review' so that the team can review your work and provide comments, suggestions, and request changes. It may take several cycles, but the end result will be solid, testable, conformant code that is safe for us to merge.
+- When the PR is approved, let the owner of the PR merge it. For community contributions, the reviewer who approved the PR can also merge it.
+- Use the `Squash and merge` option to merge a PR. If you don't want to squash it because there are logically different commits, use `Rebase and merge`.
 - We don't close issues automatically when referenced in a PR, so after the PR is merged:
- - mark the issue(s), that the PR solved, with the `Resolution-Fix-Committed` label, remove the `In progress` label and if the issue is assigned to a project, move the item to the `Done` status.
- - don't close the issue if it's a bug in the current released version since users tend to not search for closed issues, we will close the resolved issues when a new version is released.
+ - mark the issue(s) that the PR solved with the `Resolution-Fix-Committed` label, remove the `In progress` label and if the issue is assigned to a project, move the item to the `Done` status.
+ - don't close the issue if it's a bug in the current released version; since users tend to not search for closed issues, we will close the resolved issues when a new version is released.
  - if it's not a code fix that effects the end user, the issue can be closed (for example a fix in the build or a code refactoring and so on).
 
 ## Compiling PowerToys
@@ -39,30 +40,36 @@ Once you've discussed your proposed feature/fix/etc. with a team member, and you
 
 1. Windows 10 April 2018 Update (version 1803) or newer
 1. Visual Studio Community/Professional/Enterprise 2022 17.4 or newer
-1. Git clone PowerToys repository 
+1. A local clone of the PowerToys repository
+
+### Install Visual Studio dependencies
+
 1. Open the `PowerToys.sln` file.
 1. If you see a dialog that says `install extra components` in the solution explorer pane, click `install`
 
 ### Get Submodules to compile
-We have submodules that need to be initialized before you can compile most parts of PowerToys. This should be a one time step.
+
+We have submodules that need to be initialized before you can compile most parts of PowerToys. This should be a one-time step.
 
 1. Open a terminal
 1. Navigate to the folder you cloned PowerToys to.
 1. Run `git submodule update --init --recursive`
 
 ### Compiling Source Code
 
-- Open `PowerToys.sln` in Visual Studio, in the `Solutions Configuration` drop-down menu select `Release` or `Debug`, from the `Build` menu choose `Build Solution`.
-- The PowerToys binaries will be in your repo under `x64\Release\`.
-- You can run `x64\Release\PowerToys.exe` directly without installing PowerToys, but some modules (i.e. PowerRename, ImageResizer, File Explorer extension etc.) will not be available unless you also build the installer and install PowerToys.
+- Open `PowerToys.sln` in Visual Studio.
+- In the `Solutions Configuration` drop-down menu select `Release` or `Debug`.
+- From the `Build` menu choose `Build Solution`, or press <kbd>Control</kbd>+<kbd>Shift</kbd>+<kbd>b</kbd> on your keyboard.
+- The build process may take several minutes depending on your computer's performance. Once it completes, the PowerToys binaries will be in your repo under `x64\Release\`.
+ - You can run `x64\Release\PowerToys.exe` directly without installing PowerToys, but some modules (i.e. PowerRename, ImageResizer, File Explorer extension etc.) will not be available unless you also build the installer and install PowerToys.
 
 ## Compile the installer
 
 Our installer is two parts, an EXE and an MSI. The EXE (Bootstrapper) contains the MSI and handles more complex installation logic. 
 - The EXE installs all prerequisites and installs PowerToys via the MSI. It has additional features such as the installation flags (see below).
 - The MSI installs the PowerToys binaries.
 
-The installer can only be compiled in `Release` mode, step 1 and 2 must be done before the MSI will be able to be compiled.
+The installer can only be compiled in `Release` mode; steps 1 and 2 must be performed before the MSI can be compiled.
 
 1. Compile `PowerToys.sln`. Instructions are listed above.
 1. Compile `BugReportTool.sln` tool. Path from root: `tools\BugReportTool\BugReportTool.sln` (details listed below)
@@ -76,9 +83,11 @@ The installer can only be compiled in `Release` mode, step 1 and 2 must be done
 1. Install the [WiX Toolset build tools](https://wixtoolset.org/docs/v3/releases/v3-14-0-6526/). (installer [direct link](https://wixtoolset.org/downloads/v3.14.0.6526/wix314.exe))
 1. Download [WiX binaries](https://wixtoolset.org/downloads/v3.14.0.6526/wix314-binaries.zip) and extract `wix.targets` to `C:\Program Files (x86)\WiX Toolset v3.14`.
 
-### Locally building the installer prerequisite projects all at once from the command-line
+### Building prerequisite projects
+
+#### From the command line
 
-1. Open a `Developer Command Prompt for VS 2022`
+1. From the start menu, open a `Developer Command Prompt for VS 2022`
 1. Ensure `nuget.exe` is in your `%path%`
 1. In the repo root, run these commands:
 
@@ -93,20 +102,16 @@ nuget restore .\tools\StylesReportTool\StylesReportTool.sln
 msbuild -p:Platform=x64 -p:Configuration=Release .\tools\StylesReportTool\StylesReportTool.sln
 ```
 
-### Locally compiling the Bug reporting tool
+#### From Visual Studio
+
+If you prefer, you can alternatively build prerequisite projects for the installer using the Visual Studio UI.
 
 1. Open `tools\BugReportTool\BugReportTool.sln`
 1. In Visual Studio, in the `Solutions Configuration` drop-down menu select `Release`
 1. From the `Build` menu, choose `Build Solution`.
-
-### Locally compiling the Webcam reporting tool
-
 1. Open `tools\WebcamReportTool\WebcamReportTool.sln`
 1. In Visual Studio, in the `Solutions Configuration` drop-down menu select `Release`
 1. From the `Build` menu, choose `Build Solution`.
-
-### Locally compiling the Window styles reporting tool
-
 1. Open `tools\StylesReportTool\StylesReportTool.sln`
 1. In Visual Studio, in the `Solutions Configuration` drop-down menu select `Release`
 1. From the `Build` menu, choose `Build Solution`.
@@ -125,14 +130,14 @@ Head over to the wiki to see the [full list of supported installer arguments][in
 
 ## Debugging
 
-The following configuration issue only applies if the user is a member of the Administrators group.
+To debug the PowerToys application in Visual Studio, set the `runner` project as your start-up project, then start the debugger.
 
-Some PowerToys modules require being run with the highest permission level if the current user is a member of the Administrators group. The highest permission level is required to be able to perform some actions when an elevated application (e.g. Task Manager) is in the foreground or is the target of an action. Without elevated privileges some PowerToys modules will still work but with some limitations:
+Some PowerToys modules must be run with the highest permission level if the current user is a member of the Administrators group. The highest permission level is required to be able to perform some actions when an elevated application (e.g. Task Manager) is in the foreground or is the target of an action. Without elevated privileges some PowerToys modules will still work but with some limitations:
 
-- The `FancyZones` module will be not be able to move an elevated window to a zone.
+- The `FancyZones` module will not be able to move an elevated window to a zone.
 - The `Shortcut Guide` module will not appear if the foreground window belongs to an elevated application.
 
-To run and debug PowerToys from Visual Studio when the user is a member of the Administrators group, Visual Studio has to be started with elevated privileges. If you want to avoid running Visual Studio with elevated privileges and don't mind the limitations described above, you can do the following: open the `runner` project properties and navigate to the `Linker -> Manifest File` settings, edit the `UAC Execution Level` property and change it from `highestAvailable (level='highestAvailable')` to `asInvoker (/level='asInvoker')`, save the changes.
+Therefore, it is recommended to run Visual Studio with elevated privileges when debugging these scenarios. If you want to avoid running Visual Studio with elevated privileges and don't mind the limitations described above, you can do the following: open the `runner` project properties and navigate to the `Linker -> Manifest File` settings, edit the `UAC Execution Level` property and change it from `highestAvailable (level='highestAvailable')` to `asInvoker (/level='asInvoker').
 
 ## How to create new PowerToys
 
@@ -155,12 +160,12 @@ It's responsible for:
 
 ### [`Interface`](modules/interface.md)
 
-Definition of the interface used by the [`runner`](/src/runner) to manage the PowerToys. All PowerToys must implement this interface.
+The definition of the interface used by the [`runner`](/src/runner) to manage the PowerToys. All PowerToys must implement this interface.
 
 ### [`Common`](common.md)
 
 The common lib, as the name suggests, contains code shared by multiple PowerToys components and modules, e.g. [json parsing](/src/common/json.h) and [IPC primitives](/src/common/two_way_pipe_message_ipc.h).
 
 ### [`Settings`](settingsv2/)
 
-Settings v2 is our current settings implementation. Please head over to the dev docs that goes into the current settings system.
+Settings v2 is our current settings implementation. Please head over to the dev docs that describe the current settings system.

src/common/GPOWrapper/GPOWrapper.vcxproj

@@ -111,6 +111,11 @@
  <ItemGroup>
  <ResourceCompile Include="GPOWrapper.rc" />
  </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\..\common\version\version.vcxproj">
+ <Project>{cc6e41ac-8174-4e8a-8d22-85dd7f4851df}</Project>
+ </ProjectReference>
+ </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  <Import Project="..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.221104.6\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.221104.6\build\native\Microsoft.Windows.CppWinRT.targets')" />

src/common/SettingsAPI/SettingsAPI.vcxproj

@@ -43,6 +43,11 @@
  <ItemGroup>
  <None Include="packages.config" />
  </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\..\common\version\version.vcxproj">
+ <Project>{cc6e41ac-8174-4e8a-8d22-85dd7f4851df}</Project>
+ </ProjectReference>
+ </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  <Import Project="..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.221104.6\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.221104.6\build\native\Microsoft.Windows.CppWinRT.targets')" />

src/common/UnitTests-CommonLib/UnitTests-CommonLib.vcxproj

@@ -48,9 +48,6 @@
  <ProjectReference Include="..\SettingsAPI\SettingsAPI.vcxproj">
  <Project>{6955446d-23f7-4023-9bb3-8657f904af99}</Project>
  </ProjectReference>
- <ProjectReference Include="..\version\version.vcxproj">
- <Project>{cc6e41ac-8174-4e8a-8d22-85dd7f4851df}</Project>
- </ProjectReference>
  </ItemGroup>
  <ItemGroup>
  <ResourceCompile Include="UnitTests-CommonLib.rc" />

src/common/interop/keyboard_layout.cpp

@@ -238,6 +238,7 @@ void LayoutMap::LayoutMapImpl::UpdateLayout()
  keyboardLayoutMap[VK_NONCONVERT] = L"IME Non-Convert";
  keyboardLayoutMap[VK_ACCEPT] = L"IME Kana";
  keyboardLayoutMap[VK_MODECHANGE] = L"IME Mode Change";
+ keyboardLayoutMap[VK_DECIMAL] = L". (Numpad)";
  keyboardLayoutMap[CommonSharedConstants::VK_DISABLED] = L"Disable";
 }
 

src/common/logger/logger.vcxproj

@@ -74,6 +74,9 @@
  <ProjectReference Include="..\..\logging\logging.vcxproj">
  <Project>{7e1e3f13-2bd6-3f75-a6a7-873a2b55c60f}</Project>
  </ProjectReference>
+ <ProjectReference Include="..\version\version.vcxproj">
+ <Project>{cc6e41ac-8174-4e8a-8d22-85dd7f4851df}</Project>
+ </ProjectReference>
  </ItemGroup>
  <ItemGroup>
  <None Include="packages.config" />