From f2370912f3ec3cf79eb38a7efa0eb8fd3b343434 Mon Sep 17 00:00:00 2001 From: Jaime Bernardo Date: Mon, 24 Feb 2025 21:12:42 +0000 Subject: [PATCH] [ci]Sign and fix KeyboardManagerEditorLibraryWrapper.dll (#37601) * [ci]Sign KeyboardManagerEditorLibraryWrapper.dll * Fix dll metadata --- .pipelines/ESRPSigning_core.json | 1 + .../KeyboardManagerEditorLibraryWrapper.rc | 40 +++++++++++++++++++ ...eyboardManagerEditorLibraryWrapper.vcxproj | 7 ++++ ...anagerEditorLibraryWrapper.vcxproj.filters | 8 ++++ .../resource.h | 13 ++++++ 5 files changed, 69 insertions(+) create mode 100644 src/modules/keyboardmanager/KeyboardManagerEditorLibraryWrapper/KeyboardManagerEditorLibraryWrapper.rc create mode 100644 src/modules/keyboardmanager/KeyboardManagerEditorLibraryWrapper/resource.h diff --git a/.pipelines/ESRPSigning_core.json b/.pipelines/ESRPSigning_core.json index 13181ebfd1..7b9af0a767 100644 --- a/.pipelines/ESRPSigning_core.json +++ b/.pipelines/ESRPSigning_core.json @@ -128,6 +128,7 @@ "PowerToys.KeyboardManager.dll", "KeyboardManagerEditor\\PowerToys.KeyboardManagerEditor.exe", "KeyboardManagerEngine\\PowerToys.KeyboardManagerEngine.exe", + "PowerToys.KeyboardManagerEditorLibraryWrapper.dll", "PowerToys.Launcher.dll", "PowerToys.PowerLauncher.dll", diff --git a/src/modules/keyboardmanager/KeyboardManagerEditorLibraryWrapper/KeyboardManagerEditorLibraryWrapper.rc b/src/modules/keyboardmanager/KeyboardManagerEditorLibraryWrapper/KeyboardManagerEditorLibraryWrapper.rc new file mode 100644 index 0000000000..5fa3c8b90d --- /dev/null +++ b/src/modules/keyboardmanager/KeyboardManagerEditorLibraryWrapper/KeyboardManagerEditorLibraryWrapper.rc @@ -0,0 +1,40 @@ +#include +#include "resource.h" +#include "../../../common/version/version.h" + +#define APSTUDIO_READONLY_SYMBOLS +#include "winres.h" +#undef APSTUDIO_READONLY_SYMBOLS + +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/KeyboardManagerEditorLibraryWrapper/KeyboardManagerEditorLibraryWrapper.vcxproj b/src/modules/keyboardmanager/KeyboardManagerEditorLibraryWrapper/KeyboardManagerEditorLibraryWrapper.vcxproj index 3de1e0cc1f..e82a21cb06 100644 --- a/src/modules/keyboardmanager/KeyboardManagerEditorLibraryWrapper/KeyboardManagerEditorLibraryWrapper.vcxproj +++ b/src/modules/keyboardmanager/KeyboardManagerEditorLibraryWrapper/KeyboardManagerEditorLibraryWrapper.vcxproj @@ -34,6 +34,9 @@ KeyboardManagerEditorLibraryWrapper 10.0 + + PowerToys.KeyboardManagerEditorLibraryWrapper + DynamicLibrary @@ -218,6 +221,7 @@ + @@ -231,6 +235,9 @@ Create + + + {d9b8fc84-322a-4f9f-bbb9-20915c47ddfd} diff --git a/src/modules/keyboardmanager/KeyboardManagerEditorLibraryWrapper/KeyboardManagerEditorLibraryWrapper.vcxproj.filters b/src/modules/keyboardmanager/KeyboardManagerEditorLibraryWrapper/KeyboardManagerEditorLibraryWrapper.vcxproj.filters index 2142cc32d6..738fb2919e 100644 --- a/src/modules/keyboardmanager/KeyboardManagerEditorLibraryWrapper/KeyboardManagerEditorLibraryWrapper.vcxproj.filters +++ b/src/modules/keyboardmanager/KeyboardManagerEditorLibraryWrapper/KeyboardManagerEditorLibraryWrapper.vcxproj.filters @@ -24,6 +24,9 @@ Header Files + + Resource Files + @@ -39,4 +42,9 @@ + + + Resource Files + + diff --git a/src/modules/keyboardmanager/KeyboardManagerEditorLibraryWrapper/resource.h b/src/modules/keyboardmanager/KeyboardManagerEditorLibraryWrapper/resource.h new file mode 100644 index 0000000000..9ce403f2c1 --- /dev/null +++ b/src/modules/keyboardmanager/KeyboardManagerEditorLibraryWrapper/resource.h @@ -0,0 +1,13 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by AlwaysOnTopModuleInterface.rc + +////////////////////////////// +// Non-localizable + +#define FILE_DESCRIPTION "PowerToys Keyboard Manager Editor Library Wrapper" +#define INTERNAL_NAME "PowerToys.KeyboardManagerEditorLibraryWrapper" +#define ORIGINAL_FILENAME "PowerToys.KeyboardManagerEditorLibraryWrapper.dll" + +// Non-localizable +//////////////////////////////