summaryrefslogtreecommitdiff
path: root/src/burn/engine/exeengine.cpp
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2022-03-07 16:23:59 -0600
committerSean Hall <r.sean.hall@gmail.com>2022-03-07 17:00:05 -0600
commitfc41b90c2746c78ec7b1d7f9a14686ddc09fed12 (patch)
tree262dc1bfe541aa3fa78381cdef14498632f232c0 /src/burn/engine/exeengine.cpp
parent5a6c681b28c953d809292b4b85c80af300d7902f (diff)
downloadwix-fc41b90c2746c78ec7b1d7f9a14686ddc09fed12.tar.gz
wix-fc41b90c2746c78ec7b1d7f9a14686ddc09fed12.tar.bz2
wix-fc41b90c2746c78ec7b1d7f9a14686ddc09fed12.zip
Read Uninstallable from manifest and add test for non-uninstallable exe
Last part of 6459
Diffstat (limited to 'src/burn/engine/exeengine.cpp')
-rw-r--r--src/burn/engine/exeengine.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/burn/engine/exeengine.cpp b/src/burn/engine/exeengine.cpp
index b13650e5..c984f5a7 100644
--- a/src/burn/engine/exeengine.cpp
+++ b/src/burn/engine/exeengine.cpp
@@ -37,11 +37,8 @@ extern "C" HRESULT ExeEngineParsePackageFromXml(
37 ExitOnOptionalXmlQueryFailure(hr, fFoundXml, "Failed to get @Repairable."); 37 ExitOnOptionalXmlQueryFailure(hr, fFoundXml, "Failed to get @Repairable.");
38 38
39 // @Uninstallable 39 // @Uninstallable
40 pPackage->Exe.fUninstallable = TRUE; // TODO: https://github.com/wixtoolset/issues/issues/6459 40 hr = XmlGetYesNoAttribute(pixnExePackage, L"Uninstallable", &pPackage->Exe.fUninstallable);
41 /*
42 hr = XmlGetYesNoAttribute(pixnNode, L"Uninstallable", &pPackage->Exe.fUninstallable);
43 ExitOnOptionalXmlQueryFailure(hr, fFoundXml, "Failed to get @Uninstallable."); 41 ExitOnOptionalXmlQueryFailure(hr, fFoundXml, "Failed to get @Uninstallable.");
44 */
45 42
46 // @Protocol 43 // @Protocol
47 hr = XmlGetAttributeEx(pixnExePackage, L"Protocol", &scz); 44 hr = XmlGetAttributeEx(pixnExePackage, L"Protocol", &scz);