From 147c08bd71ab5b260f077ce96957b0a79c33fbad Mon Sep 17 00:00:00 2001 From: Yevhenii Holovachov <55396981+yevhenii44@users.noreply.github.com> Date: Tue, 23 Jun 2020 18:36:39 +0300 Subject: [PATCH] Added info to FancyZones, KeyboardManager and PowerLauncher projects (#4445) --- .../FancyZonesEditor/FancyZonesEditor.csproj | 10 +++-- src/modules/fancyzones/lib/fancyzones.rc | 22 +++++------ src/modules/fancyzones/lib/resource.h | 14 +++++++ .../tests/UnitTests/UnitTests-FancyZones.rc | 36 ++++++++++++++++++ .../tests/UnitTests/UnitTests.vcxproj | 4 ++ .../tests/UnitTests/UnitTests.vcxproj.filters | 8 ++++ .../fancyzones/tests/UnitTests/resource.h | 13 +++++++ .../keyboardmanager/dll/KeyboardManager.rc | 33 ++++++++-------- src/modules/keyboardmanager/dll/resource.h | 18 ++++++++- .../test/KeyboardManagerTest.rc | 36 ++++++++++++++++++ .../test/KeyboardManagerTest.vcxproj | 4 ++ .../test/KeyboardManagerTest.vcxproj.filters | 8 ++++ src/modules/keyboardmanager/test/resource.h | 13 +++++++ .../Microsoft.Launcher/Microsoft.Launcher.rc | Bin 2212 -> 2448 bytes .../Microsoft.Launcher.vcxproj.filters | 20 ++++++++-- .../launcher/Microsoft.Launcher/resource.h | 14 +++++++ .../PowerLauncher.Telemetry.csproj | 8 ++++ .../PowerLauncher/PowerLauncher.csproj | 8 ++++ 18 files changed, 231 insertions(+), 38 deletions(-) create mode 100644 src/modules/fancyzones/tests/UnitTests/UnitTests-FancyZones.rc create mode 100644 src/modules/fancyzones/tests/UnitTests/resource.h create mode 100644 src/modules/keyboardmanager/test/KeyboardManagerTest.rc create mode 100644 src/modules/keyboardmanager/test/resource.h diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/FancyZonesEditor.csproj b/src/modules/fancyzones/editor/FancyZonesEditor/FancyZonesEditor.csproj index 916a4767c1..416e76ec67 100644 --- a/src/modules/fancyzones/editor/FancyZonesEditor/FancyZonesEditor.csproj +++ b/src/modules/fancyzones/editor/FancyZonesEditor/FancyZonesEditor.csproj @@ -5,8 +5,10 @@ FancyZonesEditor + PowerToys FancyZones Editor Microsoft Corp. - Copyright (C) 2019 Microsoft Corp. + Copyright (C) 2020 Microsoft Corporation + PowerToys @@ -18,17 +20,19 @@ + - + - + + diff --git a/src/modules/fancyzones/lib/fancyzones.rc b/src/modules/fancyzones/lib/fancyzones.rc index b20220b8b3..0b1f9bb75e 100644 --- a/src/modules/fancyzones/lib/fancyzones.rc +++ b/src/modules/fancyzones/lib/fancyzones.rc @@ -1,5 +1,4 @@ -// Microsoft Visual C++ generated resource script. -// +#include #include "resource.h" #include "../../../common/version.h" @@ -30,33 +29,32 @@ BEGIN IDS_CANT_DRAG_ELEVATED L"We've detected an application running with administrator privileges. This blocks some functionality in PowerToys. Visit our wiki page to learn more." IDS_CANT_DRAG_ELEVATED_LEARN_MORE L"Learn more" IDS_CANT_DRAG_ELEVATED_DIALOG_DONT_SHOW_AGAIN L"Don't show again" - END 1 VERSIONINFO FILEVERSION FILE_VERSION PRODUCTVERSION PRODUCT_VERSION - FILEFLAGSMASK 0x3fL + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG - FILEFLAGS 0x1L + FILEFLAGS VS_FF_DEBUG #else FILEFLAGS 0x0L #endif - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L + FILEOS VOS_NT_WINDOWS32 + FILETYPE VFT_DLL + FILESUBTYPE VFT2_UNKNOWN BEGIN BLOCK "StringFileInfo" BEGIN BLOCK "040904b0" BEGIN VALUE "CompanyName", COMPANY_NAME - VALUE "FileDescription", "FancyZones PowerToy Module" + VALUE "FileDescription", FILE_DESCRIPTION VALUE "FileVersion", FILE_VERSION_STRING - VALUE "InternalName", "FancyZones PowerToy" + VALUE "InternalName", INTERNAL_NAME VALUE "LegalCopyright", COPYRIGHT_NOTE - VALUE "OriginalFilename", "fancyzones_powertoy.dll" - VALUE "ProductName", "FancyZones PowerToy" + VALUE "OriginalFilename", ORIGINAL_FILENAME + VALUE "ProductName", PRODUCT_NAME VALUE "ProductVersion", PRODUCT_VERSION_STRING END END diff --git a/src/modules/fancyzones/lib/resource.h b/src/modules/fancyzones/lib/resource.h index 8248448fb1..f017c93d78 100644 --- a/src/modules/fancyzones/lib/resource.h +++ b/src/modules/fancyzones/lib/resource.h @@ -1,3 +1,17 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by fancyzones.rc + +////////////////////////////// +// Non-localizable + +#define FILE_DESCRIPTION "PowerToys FancyZones" +#define INTERNAL_NAME "fancyzones" +#define ORIGINAL_FILENAME "fancyzones.dll" + +// Non-localizable +////////////////////////////// + #define IDS_SETTING_DESCRIPTION_SHIFTDRAG 101 #define IDS_SETTING_DESCRIPTION_MOUSESWITCH 102 #define IDS_SETTING_DESCRIPTION_OVERRIDE_SNAP_HOTKEYS 103 diff --git a/src/modules/fancyzones/tests/UnitTests/UnitTests-FancyZones.rc b/src/modules/fancyzones/tests/UnitTests/UnitTests-FancyZones.rc new file mode 100644 index 0000000000..5bbc01965c --- /dev/null +++ b/src/modules/fancyzones/tests/UnitTests/UnitTests-FancyZones.rc @@ -0,0 +1,36 @@ +#include +#include "resource.h" +#include "../../../../common/version.h" + +1 VERSIONINFO +FILEVERSION FILE_VERSION +PRODUCTVERSION PRODUCT_VERSION +FILEFLAGSMASK VS_FFI_FILEFLAGSMASK +#ifdef _DEBUG +FILEFLAGS VS_FF_DEBUG +#else +FILEFLAGS 0x0L +#endif +FILEOS VOS_NT_WINDOWS32 +FILETYPE VFT_DLL +FILESUBTYPE VFT2_UNKNOWN +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" // US English (0x0409), Unicode (0x04B0) charset + BEGIN + VALUE "CompanyName", COMPANY_NAME + VALUE "FileDescription", FILE_DESCRIPTION + VALUE "FileVersion", FILE_VERSION_STRING + VALUE "InternalName", INTERNAL_NAME + VALUE "LegalCopyright", COPYRIGHT_NOTE + VALUE "OriginalFilename", ORIGINAL_FILENAME + VALUE "ProductName", PRODUCT_NAME + VALUE "ProductVersion", PRODUCT_VERSION_STRING + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 // US English (0x0409), Unicode (1200) charset + END +END diff --git a/src/modules/fancyzones/tests/UnitTests/UnitTests.vcxproj b/src/modules/fancyzones/tests/UnitTests/UnitTests.vcxproj index 19efdb7522..6a7d8ba188 100644 --- a/src/modules/fancyzones/tests/UnitTests/UnitTests.vcxproj +++ b/src/modules/fancyzones/tests/UnitTests/UnitTests.vcxproj @@ -119,6 +119,7 @@ + @@ -132,6 +133,9 @@ + + + diff --git a/src/modules/fancyzones/tests/UnitTests/UnitTests.vcxproj.filters b/src/modules/fancyzones/tests/UnitTests/UnitTests.vcxproj.filters index a6affca694..abf9b1e1de 100644 --- a/src/modules/fancyzones/tests/UnitTests/UnitTests.vcxproj.filters +++ b/src/modules/fancyzones/tests/UnitTests/UnitTests.vcxproj.filters @@ -50,10 +50,18 @@ Header Files + + Header Files + Source Files + + + Resource Files + + \ No newline at end of file diff --git a/src/modules/fancyzones/tests/UnitTests/resource.h b/src/modules/fancyzones/tests/UnitTests/resource.h new file mode 100644 index 0000000000..f215fbadbe --- /dev/null +++ b/src/modules/fancyzones/tests/UnitTests/resource.h @@ -0,0 +1,13 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by UnitTests-FancyZones.rc + +////////////////////////////// +// Non-localizable + +#define FILE_DESCRIPTION "PowerToys UnitTests-FancyZones" +#define INTERNAL_NAME "UnitTests-FancyZones" +#define ORIGINAL_FILENAME "UnitTests-FancyZones.dll" + +// Non-localizable +////////////////////////////// diff --git a/src/modules/keyboardmanager/dll/KeyboardManager.rc b/src/modules/keyboardmanager/dll/KeyboardManager.rc index 25dc425d5b..d409965518 100644 --- a/src/modules/keyboardmanager/dll/KeyboardManager.rc +++ b/src/modules/keyboardmanager/dll/KeyboardManager.rc @@ -1,5 +1,4 @@ -// Microsoft Visual C++ generated resource script. -// +#include #include "resource.h" #include "../../../common/version.h" @@ -12,34 +11,34 @@ END IDS_KEYBOARDMANAGER_ICON ICON L"Keyboard.ico" 1 VERSIONINFO - FILEVERSION 0,1,0,0 - PRODUCTVERSION 0,1,0,0 - FILEFLAGSMASK 0x3fL +FILEVERSION FILE_VERSION +PRODUCTVERSION PRODUCT_VERSION +FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG - FILEFLAGS 0x1L +FILEFLAGS VS_FF_DEBUG #else - FILEFLAGS 0x0L +FILEFLAGS 0x0L #endif - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L +FILEOS VOS_NT_WINDOWS32 +FILETYPE VFT_DLL +FILESUBTYPE VFT2_UNKNOWN BEGIN BLOCK "StringFileInfo" BEGIN - BLOCK "040904b0" + BLOCK "040904b0" // US English (0x0409), Unicode (0x04B0) charset BEGIN VALUE "CompanyName", COMPANY_NAME - VALUE "FileDescription", "Keyboard Manager PowerToy Module" + VALUE "FileDescription", FILE_DESCRIPTION VALUE "FileVersion", FILE_VERSION_STRING - VALUE "InternalName", "Keyboard Manager PowerToy" + VALUE "InternalName", INTERNAL_NAME VALUE "LegalCopyright", COPYRIGHT_NOTE - VALUE "OriginalFilename", "KeyboardManager.dll" - VALUE "ProductName", "Keyboard Manager PowerToy" + VALUE "OriginalFilename", ORIGINAL_FILENAME + VALUE "ProductName", PRODUCT_NAME VALUE "ProductVersion", PRODUCT_VERSION_STRING END END BLOCK "VarFileInfo" BEGIN - VALUE "Translation", 0x409, 1200 + VALUE "Translation", 0x409, 1200 // US English (0x0409), Unicode (1200) charset END -END \ No newline at end of file +END diff --git a/src/modules/keyboardmanager/dll/resource.h b/src/modules/keyboardmanager/dll/resource.h index 9052e0d098..c0fcc67e86 100644 --- a/src/modules/keyboardmanager/dll/resource.h +++ b/src/modules/keyboardmanager/dll/resource.h @@ -1,3 +1,17 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by KeyboardManager.rc + +////////////////////////////// +// Non-localizable + +#define FILE_DESCRIPTION "PowerToys KeyboardManager" +#define INTERNAL_NAME "KeyboardManager" +#define ORIGINAL_FILENAME "KeyboardManager.dll" + +// Non-localizable +////////////////////////////// + #define IDS_SETTINGS_DESCRIPTION 101 -#define IDS_KEYBOARDMANAGER 102 -#define IDS_KEYBOARDMANAGER_ICON 103 +#define IDS_KEYBOARDMANAGER 102 +#define IDS_KEYBOARDMANAGER_ICON 103 diff --git a/src/modules/keyboardmanager/test/KeyboardManagerTest.rc b/src/modules/keyboardmanager/test/KeyboardManagerTest.rc new file mode 100644 index 0000000000..a08ecc180a --- /dev/null +++ b/src/modules/keyboardmanager/test/KeyboardManagerTest.rc @@ -0,0 +1,36 @@ +#include +#include "resource.h" +#include "../../../common/version.h" + +1 VERSIONINFO +FILEVERSION FILE_VERSION +PRODUCTVERSION PRODUCT_VERSION +FILEFLAGSMASK VS_FFI_FILEFLAGSMASK +#ifdef _DEBUG +FILEFLAGS VS_FF_DEBUG +#else +FILEFLAGS 0x0L +#endif +FILEOS VOS_NT_WINDOWS32 +FILETYPE VFT_DLL +FILESUBTYPE VFT2_UNKNOWN +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" // US English (0x0409), Unicode (0x04B0) charset + BEGIN + VALUE "CompanyName", COMPANY_NAME + VALUE "FileDescription", FILE_DESCRIPTION + VALUE "FileVersion", FILE_VERSION_STRING + VALUE "InternalName", INTERNAL_NAME + VALUE "LegalCopyright", COPYRIGHT_NOTE + VALUE "OriginalFilename", ORIGINAL_FILENAME + VALUE "ProductName", PRODUCT_NAME + VALUE "ProductVersion", PRODUCT_VERSION_STRING + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 // US English (0x0409), Unicode (1200) charset + END +END diff --git a/src/modules/keyboardmanager/test/KeyboardManagerTest.vcxproj b/src/modules/keyboardmanager/test/KeyboardManagerTest.vcxproj index a94c1026f5..da1423bce3 100644 --- a/src/modules/keyboardmanager/test/KeyboardManagerTest.vcxproj +++ b/src/modules/keyboardmanager/test/KeyboardManagerTest.vcxproj @@ -110,6 +110,7 @@ + @@ -126,6 +127,9 @@ + + + diff --git a/src/modules/keyboardmanager/test/KeyboardManagerTest.vcxproj.filters b/src/modules/keyboardmanager/test/KeyboardManagerTest.vcxproj.filters index 753ca8497f..a21c11516e 100644 --- a/src/modules/keyboardmanager/test/KeyboardManagerTest.vcxproj.filters +++ b/src/modules/keyboardmanager/test/KeyboardManagerTest.vcxproj.filters @@ -38,8 +38,16 @@ Header Files + + Header Files + + + + Resource Files + + \ No newline at end of file diff --git a/src/modules/keyboardmanager/test/resource.h b/src/modules/keyboardmanager/test/resource.h new file mode 100644 index 0000000000..a8534ead12 --- /dev/null +++ b/src/modules/keyboardmanager/test/resource.h @@ -0,0 +1,13 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by KeyboardManagerTest.rc + +////////////////////////////// +// Non-localizable + +#define FILE_DESCRIPTION "PowerToys KeyboardManagerTest" +#define INTERNAL_NAME "KeyboardManagerTest" +#define ORIGINAL_FILENAME "KeyboardManagerTest.dll" + +// Non-localizable +////////////////////////////// diff --git a/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.rc b/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.rc index f1be02592d381cd9b63181fa17b857a5e3fe9e2d..e207a1e89fdd70fc76fe301ede6a4b10f175efb6 100644 GIT binary patch delta 591 zcmb_ZOG`pw5ItV6DS?!fhCSp~o6N8@TSO6MK9EesM~_8ZL?eaBu%LF41nr`jXx*Ye z5dERH{ezaB@0!%2Wqi!{m^pLi%zQ7N`=R?`?`ConSHu<#0 zB&@B=sW$H3K?x>OTp5_s(#GUTn_5w?ERytQv4J!(27Ztx5{$)BVZ@DoOydy8EOMw` z@}Wg4z5M)lraDdJQ0Bf%?i?BNyp^zssKwFCC}ST5va5P23!k8dti^2F{r;{uN}dW? zwrGkc2Scvx4^;#6Tn1xGagqZ#qOvBnHTa&v0xoGW+A@Nevydl@*Eps+_5a4ii3-wF zV{R2~tG{#cIJ`3J3dpnWlRdpN(bL_XNeP=MvcCeAXONeOYlO&vBpjUq)pePgiaa-v zm1})TM*Hq2^HxUMnhO2aZ*-@xaN9_-W=J&WxI8)sJbSO5S3 delta 412 zcmbOryhLz<$VP`pjEoAC6`4$dWGIs(klfEC&8@&-z)--+pS+h@k{#q40|uXo2c;)-v6M}I#B$19iNTj4lOdU*h#? - - - - + + Header Files + + + + {5d14850e-4c90-4022-9ad1-9ca85dc4dc27} + + + {513da898-667d-48e4-bf15-74cf06f07ee1} + + + + + Resource Files + + \ No newline at end of file diff --git a/src/modules/launcher/Microsoft.Launcher/resource.h b/src/modules/launcher/Microsoft.Launcher/resource.h index aad6c4bbdc..1327743674 100644 --- a/src/modules/launcher/Microsoft.Launcher/resource.h +++ b/src/modules/launcher/Microsoft.Launcher/resource.h @@ -1,2 +1,16 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by Microsoft.Launcher.rc + +////////////////////////////// +// Non-localizable + +#define FILE_DESCRIPTION "PowerToys Microsoft.Launcher" +#define INTERNAL_NAME "Microsoft.Launcher" +#define ORIGINAL_FILENAME "Microsoft.Launcher.dll" + +// Non-localizable +////////////////////////////// + #define IDS_LAUNCHER_NAME 601 #define IDS_LAUNCHER_SETTINGS_DESC 602 diff --git a/src/modules/launcher/PowerLauncher.Telemetry/PowerLauncher.Telemetry.csproj b/src/modules/launcher/PowerLauncher.Telemetry/PowerLauncher.Telemetry.csproj index c641917cf2..b3b9eed530 100644 --- a/src/modules/launcher/PowerLauncher.Telemetry/PowerLauncher.Telemetry.csproj +++ b/src/modules/launcher/PowerLauncher.Telemetry/PowerLauncher.Telemetry.csproj @@ -5,6 +5,14 @@ x64 x64 $(Version).0 + Microsoft Corporation + PowerToys + PowerToys PowerLauncher Telemetry + Copyright (C) 2020 Microsoft Corporation + https://github.com/microsoft/PowerToys + Github + PowerToys + en-US diff --git a/src/modules/launcher/PowerLauncher/PowerLauncher.csproj b/src/modules/launcher/PowerLauncher/PowerLauncher.csproj index 77311a3eb3..9bec31fdf9 100644 --- a/src/modules/launcher/PowerLauncher/PowerLauncher.csproj +++ b/src/modules/launcher/PowerLauncher/PowerLauncher.csproj @@ -14,6 +14,14 @@ x64 uap10.0.18362 $(Version).0 + Microsoft Corporation + PowerToys + PowerToys PowerLauncher + Copyright (C) 2020 Microsoft Corporation + https://github.com/microsoft/PowerToys + Github + PowerToys + en-US