osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

NSIS: Add ERROR_PRODUCT_VERSION to the vcredist checks. 

If the Visual C++ Redistributable installer returns 1638
(ERROR_PRODUCT_VERSION) treat it as a success.

Bug: 15509
Change-Id: I136704ddc3266abc1a79f0fdcdd0b6cb7e33266e
Reviewed-on: https://code.wireshark.org/review/32041
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Gerald Combs 2019-02-14 18:49:59 -08:00 committed by Anders Broman
parent 35dde308c4
commit 4bcad12279
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packaging/nsis/wireshark.nsi
View File

@ -519,9 +519,11 @@ DetailPrint "vcredist_${TARGET_MACHINE} returned $0"
; https://docs.microsoft.com/en-us/windows/desktop/Msi/error-codes
!define ERROR_SUCCESS 0
!define ERROR_SUCCESS_REBOOT_INITIATED 1641
!define ERROR_PRODUCT_VERSION 1638
!define ERROR_SUCCESS_REBOOT_REQUIRED 3010
${Switch} $0
${Case} ${ERROR_SUCCESS}
${Case} ${ERROR_PRODUCT_VERSION}
${Break}
${Case} ${ERROR_SUCCESS_REBOOT_INITIATED} ; Shouldn't happen.
${Case} ${ERROR_SUCCESS_REBOOT_REQUIRED}