From c8a2abdcf090d35bdf781dbe104d99b1d722f6ae Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Thu, 1 Feb 2024 09:47:27 -0800
Subject: [PATCH] NSIS: Miscellaneous Logray fixes

[skip ci]
---
 packaging/nsis/logray-common.nsh    | 2 +-
 packaging/nsis/logray-config.nsh.in | 2 ++
 packaging/nsis/logray.nsi           | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/packaging/nsis/logray-common.nsh b/packaging/nsis/logray-common.nsh
index 4eaacd5cae..0f5a02fefc 100644
--- a/packaging/nsis/logray-common.nsh
+++ b/packaging/nsis/logray-common.nsh
@@ -23,7 +23,7 @@ ManifestDPIAware true
 !define DISPLAY_NAME "${PROGRAM_NAME} ${VERSION} ${WIRESHARK_TARGET_PLATFORM}"
 Name "${DISPLAY_NAME}"
 
-!define PROGRAM_FULL_NAME "The ${PROGRAM_NAME} Log Analyzer"
+!define PROGRAM_FULL_NAME "The ${PROGRAM_NAME} System Call and Log Analyzer"
 !define PROGRAM_NAME_PATH "${PROGRAM_NAME}.exe"
 
 !define UNINSTALLER_NAME "uninstall-logray.exe"
diff --git a/packaging/nsis/logray-config.nsh.in b/packaging/nsis/logray-config.nsh.in
index c881483bc9..0bac1e1c56 100644
--- a/packaging/nsis/logray-config.nsh.in
+++ b/packaging/nsis/logray-config.nsh.in
@@ -32,3 +32,5 @@
 #cmakedefine SMI_DIR "@SMI_DIR@"
 
 #cmakedefine QT_DIR "@QT_DIR@"
+
+#cmakedefine ENABLE_SIGNED_NSIS
diff --git a/packaging/nsis/logray.nsi b/packaging/nsis/logray.nsi
index 469c2f141a..a3ff0817c0 100644
--- a/packaging/nsis/logray.nsi
+++ b/packaging/nsis/logray.nsi
@@ -439,7 +439,7 @@ Section "-Required"
 SetShellVarContext all
 
 SetOutPath $INSTDIR
-WriteUninstaller "${STAGING_DIR}\${UNINSTALLER_NAME}"
+WriteUninstaller "$INSTDIR\${UNINSTALLER_NAME}"
 File "${STAGING_DIR}\libwiretap.dll"
 File "${STAGING_DIR}\libwireshark.dll"
 File "${STAGING_DIR}\libwsutil.dll"