From 4bcad12279aab875bb9f871e7dd984a43bebe86e Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Thu, 14 Feb 2019 18:49:59 -0800
Subject: [PATCH] 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>
---
 packaging/nsis/wireshark.nsi | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
index 9a7c1d5339..88182cfc7e 100644
--- a/packaging/nsis/wireshark.nsi
+++ b/packaging/nsis/wireshark.nsi
@@ -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}