aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2021-04-25 21:47:32 -0500
committerSean Hall <r.sean.hall@gmail.com>2021-04-25 22:58:23 -0500
commitdd16dd2344ca3c750a8fc52c1e27a605fd25940d (patch)
tree990ba798fd0d02471d0283e5f8c3cf3104484d91
parentabdde5b4193ecedadcc772f00ff314e1880475b6 (diff)
downloadwix-dd16dd2344ca3c750a8fc52c1e27a605fd25940d.tar.gz
wix-dd16dd2344ca3c750a8fc52c1e27a605fd25940d.tar.bz2
wix-dd16dd2344ca3c750a8fc52c1e27a605fd25940d.zip
DOWNLOAD is not a valid packaging value.
-rw-r--r--src/engine/payload.cpp13
-rw-r--r--src/engine/payload.h1
2 files changed, 3 insertions, 11 deletions
diff --git a/src/engine/payload.cpp b/src/engine/payload.cpp
index 28ab6f45..f29fa2bd 100644
--- a/src/engine/payload.cpp
+++ b/src/engine/payload.cpp
@@ -67,11 +67,7 @@ extern "C" HRESULT PayloadsParseFromXml(
67 hr = XmlGetAttributeEx(pixnNode, L"Packaging", &scz); 67 hr = XmlGetAttributeEx(pixnNode, L"Packaging", &scz);
68 ExitOnFailure(hr, "Failed to get @Packaging."); 68 ExitOnFailure(hr, "Failed to get @Packaging.");
69 69
70 if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, scz, -1, L"download", -1)) 70 if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, scz, -1, L"embedded", -1))
71 {
72 pPayload->packaging = BURN_PAYLOAD_PACKAGING_DOWNLOAD;
73 }
74 else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, scz, -1, L"embedded", -1))
75 { 71 {
76 pPayload->packaging = BURN_PAYLOAD_PACKAGING_EMBEDDED; 72 pPayload->packaging = BURN_PAYLOAD_PACKAGING_EMBEDDED;
77 } 73 }
@@ -108,14 +104,11 @@ extern "C" HRESULT PayloadsParseFromXml(
108 104
109 // @SourcePath 105 // @SourcePath
110 hr = XmlGetAttributeEx(pixnNode, L"SourcePath", &pPayload->sczSourcePath); 106 hr = XmlGetAttributeEx(pixnNode, L"SourcePath", &pPayload->sczSourcePath);
111 if (E_NOTFOUND != hr || BURN_PAYLOAD_PACKAGING_DOWNLOAD != pPayload->packaging) 107 ExitOnFailure(hr, "Failed to get @SourcePath.");
112 {
113 ExitOnFailure(hr, "Failed to get @SourcePath.");
114 }
115 108
116 // @DownloadUrl 109 // @DownloadUrl
117 hr = XmlGetAttributeEx(pixnNode, L"DownloadUrl", &pPayload->downloadSource.sczUrl); 110 hr = XmlGetAttributeEx(pixnNode, L"DownloadUrl", &pPayload->downloadSource.sczUrl);
118 if (E_NOTFOUND != hr || BURN_PAYLOAD_PACKAGING_DOWNLOAD == pPayload->packaging) 111 if (E_NOTFOUND != hr)
119 { 112 {
120 ExitOnFailure(hr, "Failed to get @DownloadUrl."); 113 ExitOnFailure(hr, "Failed to get @DownloadUrl.");
121 } 114 }
diff --git a/src/engine/payload.h b/src/engine/payload.h
index aa174d66..ad10509d 100644
--- a/src/engine/payload.h
+++ b/src/engine/payload.h
@@ -12,7 +12,6 @@ extern "C" {
12enum BURN_PAYLOAD_PACKAGING 12enum BURN_PAYLOAD_PACKAGING
13{ 13{
14 BURN_PAYLOAD_PACKAGING_NONE, 14 BURN_PAYLOAD_PACKAGING_NONE,
15 BURN_PAYLOAD_PACKAGING_DOWNLOAD,
16 BURN_PAYLOAD_PACKAGING_EMBEDDED, 15 BURN_PAYLOAD_PACKAGING_EMBEDDED,
17 BURN_PAYLOAD_PACKAGING_EXTERNAL, 16 BURN_PAYLOAD_PACKAGING_EXTERNAL,
18}; 17};