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

Add version number to telemetry event

Browse Source 
use defines from version.h in .rc files and other places.
This commit is contained in:
Enrico Giordani
2019-10-14 19:22:14 +02:00
committed by GitHub
parent eb1ef65fac
commit f9be71eca5
14 changed files with 39 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/common.cpp
View File

@@ -4,6 +4,7 @@
#pragma comment(lib, "dwmapi.lib")
#include <strsafe.h>
#include <sddl.h>
#include "version.h"
std::optional<RECT> get_button_pos(HWND hwnd) {
RECT button;
@@ -290,3 +291,10 @@ std::wstring get_process_path(HWND window) noexcept {
}
return name;
}
std::wstring get_product_version() {
static std::wstring version = std::to_wstring(VERSION_MAJOR) +
L"." + std::to_wstring(VERSION_MINOR) +
L"." + std::to_wstring(VERSION_REVISION);
return version;
}

2
src/common/common.h
View File

@@ -48,3 +48,5 @@ bool drop_elevated_privileges();
std::wstring get_process_path(DWORD pid) noexcept;
// Get the executable path or module name for modern apps
std::wstring get_process_path(HWND hwnd) noexcept;
std::wstring get_product_version();

1
src/common/common.vcxproj
View File

@@ -107,6 +107,7 @@
<ClInclude Include="Telemetry\ProjectTelemetry.h" />
<ClInclude Include="Telemetry\TraceLoggingDefines.h" />
<ClInclude Include="two_way_pipe_message_ipc.h" />
<ClInclude Include="version.h" />
<ClInclude Include="windows_colors.h" />
</ItemGroup>
<ItemGroup>

3
src/common/common.vcxproj.filters
View File

@@ -66,6 +66,9 @@
<ClInclude Include="dpi_aware.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="version.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="d2d_svg.cpp">

19
src/common/version.h Normal file
View File

@@ -0,0 +1,19 @@
#pragma once
#define STRINGIZE2(s) #s
#define STRINGIZE(s) STRINGIZE2(s)
#define VERSION_MAJOR 0
#define VERSION_MINOR 11
#define VERSION_REVISION 0
#define VERSION_BUILD 0
#define FILE_VERSION VERSION_MAJOR, VERSION_MINOR, VERSION_REVISION, VERSION_BUILD
#define FILE_VERSION_STRING STRINGIZE(VERSION_MAJOR) "." STRINGIZE(VERSION_MINOR) "." STRINGIZE(VERSION_REVISION) "." STRINGIZE(VERSION_BUILD)
#define PRODUCT_VERSION FILE_VERSION
#define PRODUCT_VERSION_STRING FILE_VERSION_STRING
#define COMPANY_NAME "Microsoft Corporation"
#define COPYRIGHT_NOTE "Copyright (C) 2019 Microsoft Corporation"