Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-04 10:16:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Runner logging (#8068)

Browse Source
This commit is contained in:
Mykhailo Pylyp
2020-11-18 12:15:14 +02:00
committed by GitHub
parent 60a5c3f946
commit 613d1fdf2a
24 changed files with 464 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj
View File

@@ -120,6 +120,9 @@
<ProjectReference Include="..\..\..\common\common.vcxproj">
<Project>{74485049-c722-400f-abe5-86ac52d929b3}</Project>
</ProjectReference>
<ProjectReference Include="..\..\..\common\logger\logger.vcxproj">
<Project>{d9b8fc84-322a-4f9f-bbb9-20915c47ddfd}</Project>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="Generated Files\Microsoft.Launcher.rc" />
@@ -132,6 +135,7 @@
<None Include="Resources.resx" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<Import Project="..\..\..\..\deps\spdlog.props" />
<ImportGroup Label="ExtensionTargets">
<Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.targets')" />
</ImportGroup>

1
src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj.filters
View File

@@ -11,6 +11,7 @@
<ClInclude Include="Generated Files\resource.h">
<Filter>Generated Files</Filter>
</ClInclude>
<ClInclude Include="LauncherConstants.h" />
</ItemGroup>
<ItemGroup>
<Filter Include="Resource Files">

20
src/modules/launcher/Microsoft.Launcher/dllmain.cpp
View File

@@ -7,6 +7,9 @@
#include "Generated Files/resource.h"
#include <common/os-detect.h>
#include <launcher\Microsoft.Launcher\LauncherConstants.h>
#include <common/logger/logger.h>
#include <common\settings_helpers.h>
#include <filesystem>
extern "C" IMAGE_DOS_HEADER __ImageBase;
@@ -75,12 +78,18 @@ private:
// Handle to event used to invoke the Runner
HANDLE m_hEvent;
std::shared_ptr<Logger> logger;
public:
// Constructor
Microsoft_Launcher()
{
app_name = GET_RESOURCE_STRING(IDS_LAUNCHER_NAME);
app_key = LauncherConstants::ModuleKey;
std::filesystem::path logFilePath(PTSettingsHelper::get_module_save_folder_location(this->app_key));
logFilePath.append("logging.txt");
logger = std::make_shared<Logger>("launcher", logFilePath.wstring(), PTSettingsHelper::get_log_settings_file_location());
logger->info("Launcher object is constructing");
init_settings();
SECURITY_ATTRIBUTES sa;
@@ -92,6 +101,8 @@ public:
~Microsoft_Launcher()
{
logger->info("Launcher object is destroying");
logger.reset();
if (m_enabled)
{
terminateProcess();
@@ -172,6 +183,7 @@ public:
// Enable the powertoy
virtual void enable()
{
this->logger->info("Launcher is enabling");
ResetEvent(m_hEvent);
// Start PowerLauncher.exe only if the OS is 19H1 or higher
if (UseNewSettings())
@@ -243,6 +255,7 @@ public:
// Disable the powertoy
virtual void disable()
{
this->logger->info("Launcher is disabling");
if (m_enabled)
{
ResetEvent(m_hEvent);
@@ -311,7 +324,12 @@ public:
void terminateProcess()
{
DWORD processID = GetProcessId(m_hProcess);
TerminateProcess(m_hProcess, 1);
if (TerminateProcess(m_hProcess, 1) == 0)
{
auto err = get_last_error_message(GetLastError());
this->logger->error(L"Launcher process was not terminated. {}", err.has_value() ? err.value() : L"");
}
// Temporarily disable sending a message to close
/*
EnumWindows(&requestMainWindowClose, processID);