From d67e7ccda56998d1d60bdaa4e5940a0c501ead23 Mon Sep 17 00:00:00 2001
From: Alexey Semenyuk <asemenyuk@openjdk.org>
Date: Tue, 19 Jul 2022 17:01:01 +0000
Subject: [PATCH] 8290402: jpackage exe uninstallers don't return correct exit
 code in case of failure

Reviewed-by: almatvee
---
 src/jdk.jpackage/windows/native/msiwrapper/MsiWrapper.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/jdk.jpackage/windows/native/msiwrapper/MsiWrapper.cpp b/src/jdk.jpackage/windows/native/msiwrapper/MsiWrapper.cpp
index e93d9e241fa..405a4cbf0a9 100644
--- a/src/jdk.jpackage/windows/native/msiwrapper/MsiWrapper.cpp
+++ b/src/jdk.jpackage/windows/native/msiwrapper/MsiWrapper.cpp
@@ -50,8 +50,9 @@ void launchApp() {
                 (const char*)productCodeUtf8.data(), productCodeUtf8.size()));
 
         // Uninstall product.
-        msi::uninstall().setProductCode(productCode)();
-        exitCode = 0;
+        msi::SuppressUI suppressUI;
+        exitCode = (int)msi::uninstall().setProductCode(productCode)(
+                                                    std::nothrow).getValue();
         return;
     }