Changeset 76934 in vbox for trunk/src/VBox/Additions

Timestamp:

Jan 22, 2019 12:13:49 PM (6 years ago)

Author:

vboxsync

Message:

Windows guest installer: Preparations for NSIS 3.x.

Location:

trunk/src/VBox/Additions/WINNT/Installer

Files:

• VBoxGuestAdditions.nsi (modified) (3 diffs)
• dumplog.nsh (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditions.nsi

@@ -85 +85 @@
 !define REPLACEDLL_NOREGISTER ; Replace in use DLL function
 !include "ReplaceDLL.nsh"
-!include "dumplog.nsh"        ; Dump log to file function
 
 !if $%BUILD_TARGET_ARCH% == "amd64"
@@ -177 +176 @@
 !endif
 
+; Must come after MUI includes to have certain defines set for DumpLog
+!include "dumplog.nsh"        ; Dump log to file function
+
 ; Language files
 !include "Languages\English.nsh"
@@ -202 +204 @@
 ShowUnInstDetails show
 RequestExecutionLevel highest
+
+; Whether to use the Unicode version of NSIS
+; Note: Using Unicode will result in the installer not working on a Windows 95/98/ME guest
+;Unicode true
 
 ; Internal parameters

trunk/src/VBox/Additions/WINNT/Installer/dumplog.nsh

@@ -1 @@
-!define LVM_GETITEMCOUNT 0x1004
-!define LVM_GETITEMTEXT 0x102D
+!ifndef LVM_GETITEMCOUNT
+  !define LVM_GETITEMCOUNT 0x1004
+!endif
+!ifndef LVM_GETITEMTEXT
+  !define LVM_GETITEMTEXT 0x102D
+!endif
 
 !macro DumpLog un