Skip to content

fix(windows): add manifest to insthelper and set trustinfo to asInvoker #16430

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rc-swag wants to merge 2 commits into
base: master
Choose a base branch
from
+11 −15
Open

fix(windows): add manifest to insthelper and set trustinfo to asInvoker #16430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3597a55
fix(windows): insthelp trustinfo and add manifest
rc-swag Aug 25, 2026
16a1a6e
fix(windows): remove old TODO comments
rc-swag Aug 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions windows/src/desktop/insthelp/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@ builder_describe_outputs \
function do_build() {
create-windows-output-folders
build_version.res
# TODO: why no manifest?
# build_manifest.res
build_manifest.res
delphi_msbuild insthelp.dproj "//p:Platform=Win32"
sentrytool_delphiprep "$WIN32_TARGET" insthelp.dpr
tds2dbg "$WIN32_TARGET"
Expand All @@ -38,8 +37,7 @@ function do_build() {

function do_publish() {
# test that (a) linked manifest exists and correct
# TODO: no manifest included?
# wrap-mt -nologo -inputresource:"$WINDOWS_PROGRAM_APP/insthelp.exe" -validate_manifest
wrap-mt -nologo -inputresource:"$WINDOWS_PROGRAM_APP/insthelp.exe" -validate_manifest

wrap-signcode //d "Keyman for Windows Install Helper" "$WINDOWS_PROGRAM_APP/insthelp.exe"
wrap-symstore "$WINDOWS_PROGRAM_APP/insthelp.exe" //t keyman-windows
Expand Down
2 changes: 1 addition & 1 deletion windows/src/desktop/insthelp/insthelp.dpr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ uses
UserMessages in '..\..\..\..\common\windows\delphi\general\UserMessages.pas';

{$R version.res}
{-R manifest.res}
{$R manifest.res}

begin
CoInitializeEx(nil, COINIT_APARTMENTTHREADED);
Expand Down
18 changes: 8 additions & 10 deletions windows/src/desktop/insthelp/manifest.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,13 @@
version="$VersionWin"
processorArchitecture="x86"/>
<description>Keyman Installation Assistant</description>
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
<security>
<requestedPrivileges>
<requestedExecutionLevel
level="requireAdministrator"
uiAccess="false"/>
</requestedPrivileges>
</security>
</trustInfo>
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
<security>
<requestedPrivileges>
<requestedExecutionLevel level="asInvoker" uiAccess="false"/>
</requestedPrivileges>
</security>
</trustInfo>

<!-- Switch on various compatibility values -->

Expand All @@ -27,4 +25,4 @@
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/><!-- Windows 10 -->
</application>
</compatibility>
</assembly>
</assembly>