VirtualBox

Ignore:
Timestamp:
Sep 12, 2022 9:40:40 AM (3 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
153577
Message:

Add/Nt/Installer: Reduce the number of warnings to almost none.

Location:
trunk/src/VBox/Additions/WINNT/Installer
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Additions/WINNT/Installer/Makefile.kmk

    r96692 r96694  
    234234                $(PATH_SUB_CURRENT)/VBoxGuestAdditionsUninstall.nsh \
    235235                $(PATH_SUB_CURRENT)/VBoxGuestAdditionsUninstallOld.nsh \
     236                $(PATH_SUB_CURRENT)/VBoxGuestAdditionsNT4.nsh \
    236237                $(PATH_SUB_CURRENT)/VBoxGuestAdditionsW2KXP.nsh \
    237238                $(PATH_SUB_CURRENT)/VBoxGuestAdditionsVista.nsh \
    238                 $(PATH_SUB_CURRENT)/VBoxGuestAdditionsNT4.nsh \
     239                $(PATH_SUB_CURRENT)/dumplog.nsh \
     240                $(PATH_SUB_CURRENT)/ReplaceDLL.nsh \
     241                $(PATH_SUB_CURRENT)/servicepack.nsh \
     242                $(PATH_SUB_CURRENT)/strstr.nsh \
     243                $(PATH_SUB_CURRENT)/winver.nsh \
    239244                $(PATH_SUB_CURRENT)/Languages/English.nsh \
    240245                $(PATH_SUB_CURRENT)/Languages/German.nsh \
    … …  
    284289                $(PATH_SUB_CURRENT)/VBoxGuestAdditionsLog.nsh \
    285290                $(PATH_SUB_CURRENT)/VBoxGuestAdditionsUninstall.nsh \
    286                 $(PATH_SUB_CURRENT)/VBoxGuestAdditionsUninstallOld.nsh \
     291                $(PATH_SUB_CURRENT)/VBoxGuestAdditionsNT4.nsh \
    287292                $(PATH_SUB_CURRENT)/VBoxGuestAdditionsW2KXP.nsh \
    288293                $(PATH_SUB_CURRENT)/VBoxGuestAdditionsVista.nsh \
    289                 $(PATH_SUB_CURRENT)/VBoxGuestAdditionsNT4.nsh \
     294                $(PATH_SUB_CURRENT)/dumplog.nsh \
     295                $(PATH_SUB_CURRENT)/ReplaceDLL.nsh \
     296                $(PATH_SUB_CURRENT)/servicepack.nsh \
     297                $(PATH_SUB_CURRENT)/strstr.nsh \
     298                $(PATH_SUB_CURRENT)/winver.nsh \
    290299                $(PATH_SUB_CURRENT)/Languages/English.nsh \
    291300                $(PATH_SUB_CURRENT)/Languages/German.nsh \

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

    r96693 r96694  
    193193
    194194; Must come after MUI includes to have certain defines set for DumpLog
    195 !include "dumplog.nsh"        ; Dump log to file function
     195!include "dumplog.nsh"                  ; Dump log to file function
    196196
    197197; Language files
    … …  
    472472  Quit
    473473
     474!ifdef UNUSED_CODE
    474475done:
    475476
    … …  
    480481  ${LogVerbose} "Property: Logging enabled: $g_bLogEnable"
    481482!endif
     483!endif ;UNUSED_CODE
    482484
    483485exit:
    … …  
    786788
    787789skip:
    788 
    789   ; Nothing to do here right now
    790 
    791 exit:
    792790
    793791SectionEnd
    … …  
    10461044  Pop $0
    10471045  ${If} $0 <> 0 ; Wrong architecture? Tell the world
    1048 !if $%KBUILD_TARGET_ARCH% == "amd64"
     1046  !if $%KBUILD_TARGET_ARCH% == "amd64"
    10491047    MessageBox MB_ICONSTOP $(VBOX_NOTICE_ARCH_AMD64) /SD IDOK
    1050 !else
     1048  !else
    10511049    MessageBox MB_ICONSTOP $(VBOX_NOTICE_ARCH_X86) /SD IDOK
    1052 !endif
     1050  !endif
    10531051    Abort "$(VBOX_NOTICE_ARCH_AMD64)"
    10541052  ${EndIf}
    … …  
    11051103  ${EndIf}
    11061104
    1107 !ifdef USE_MUI
    1108   ; Display language selection dialog (will be hidden in silent mode!)
    1109   !ifdef VBOX_INSTALLER_ADD_LANGUAGES
    1110     !insertmacro MUI_LANGDLL_DISPLAY
     1105  !ifdef USE_MUI
     1106    ; Display language selection dialog (will be hidden in silent mode!)
     1107    !ifdef VBOX_INSTALLER_ADD_LANGUAGES
     1108      !insertmacro MUI_LANGDLL_DISPLAY
     1109    !endif
    11111110  !endif
    1112 !endif
    11131111
    11141112  Call SetAppMode64
    … …  
    11981196  Goto exit
    11991197
     1198!ifndef _DEBUG
    12001199restart:
     1200!endif
    12011201
    12021202  ${LogVerbose} "Rebooting ..."

  • trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsCommon.nsh

    r96693 r96694  
    220220FunctionEnd
    221221!macroend
    222 !insertmacro CheckArchitecture ""
    223 !insertmacro CheckArchitecture "un."
     222!ifndef UNINSTALLER_ONLY
     223  !insertmacro CheckArchitecture ""
     224  !insertmacro CheckArchitecture "un."
     225!endif
    224226
    225227;
    … …  
    266268FunctionEnd
    267269!macroend
    268 !insertmacro GetWindowsVersionEx ""
     270!ifndef UNINSTALLER_ONLY
     271  !insertmacro GetWindowsVersionEx ""
     272!endif
    269273!insertmacro GetWindowsVersionEx "un."
    270274
    … …  
    325329  Pop $g_strAddVerBuild
    326330
    327 exit:
    328 
    329331  Pop $1
    330332  Pop $0
    … …  
    524526FunctionEnd
    525527!macroend
    526 !insertmacro CheckForCapabilities ""
     528!ifndef UNINSTALLER_ONLY
     529  !insertmacro CheckForCapabilities ""
     530!endif
    527531!insertmacro CheckForCapabilities "un."
    528532
    … …  
    537541FunctionEnd
    538542!macroend
    539 !insertmacro SetAppMode32 ""
    540 !insertmacro SetAppMode32 "un."
     543!ifndef UNINSTALLER_ONLY
     544  !insertmacro SetAppMode32 ""
     545  !insertmacro SetAppMode32 "un."
     546!endif
    541547
    542548; Because this NSIS installer is always built in 32-bit mode, we have to

  • trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsNT4.nsh

    r96693 r96694  
    197197  ; Add the shared folders network provider
    198198  ;${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" netprovider add VBoxSF" 'non-zero-exitcode=abort'
    199 
    200   Goto done
    201 
    202 error:
    203   Abort "ERROR: Could not install files for Windows NT4! Installation aborted."
    204 
    205 done:
    206199
    207200FunctionEnd
    … …  
    286279FunctionEnd
    287280!macroend
    288 !insertmacro NT4_Uninstall ""
     281!ifndef UNINSTALLER_ONLY
     282  !insertmacro NT4_Uninstall ""
     283!endif
    289284!insertmacro NT4_Uninstall "un."

  • trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsUninstall.nsh

    r96693 r96694  
    134134FunctionEnd
    135135!macroend
    136 !insertmacro Uninstall ""
     136!ifndef UNINSTALLER_ONLY
     137  !insertmacro Uninstall ""
     138!endif
    137139!insertmacro Uninstall "un."
    138140

  • trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsVista.nsh

    r96693 r96694  
    7070  ; Nothing here yet
    7171
     72!ifdef UNUSED_CODE
    7273  Goto done
    7374
    … …  
    7778
    7879done:
     80!endif ; UNUSED_CODE
    7981
    8082FunctionEnd
    … …  
    115117FunctionEnd
    116118!macroend
    117 !insertmacro Vista_Uninstall ""
     119!ifndef UNINSTALLER_ONLY
     120  !insertmacro Vista_Uninstall ""
     121!endif
    118122!insertmacro Vista_Uninstall "un."
    119123

  • trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsW2KXP.nsh

    r96693 r96694  
    771771FunctionEnd
    772772!macroend
    773 !insertmacro W2K_Uninstall ""
     773!ifndef UNINSTALLER_ONLY
     774  !insertmacro W2K_Uninstall ""
     775!endif
    774776!insertmacro W2K_Uninstall "un."

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

    r76934 r96694  
    5252!macroend
    5353!insertmacro DumpLog ""
    54 !insertmacro DumpLog "un."
     54;!insertmacro DumpLog "un." - not used

  • trunk/src/VBox/Additions/WINNT/Installer/servicepack.nsh

    r69354 r96694  
    2727!macroend
    2828!insertmacro GetServicePack ""
    29 !insertmacro GetServicePack "un."
     29;!insertmacro GetServicePack "un." - unused

  • trunk/src/VBox/Additions/WINNT/Installer/strstr.nsh

    r33540 r96694  
    4343 FunctionEnd
    4444!macroend
    45 !insertmacro StrStr ""
     45!ifndef UNINSTALLER_ONLY
     46  !insertmacro StrStr ""
     47!endif
    4648!insertmacro StrStr "un."
    4749
    … …  
    304306!macroend
    305307!insertmacro StrStrAdv ""
    306 !insertmacro StrStrAdv "un."
     308;!insertmacro StrStrAdv "un."
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette