DOWNLOAD is not a valid packaging value.
Sean Hall committed
Apr 25, 2021 at 21:47 UTC
dd16dd2344ca3c750a8fc52c1e27a605fd25940d
2 files changed
+3
-11
src/engine/payload.cpp
+3
-10
@@ -67,11 +67,7 @@ extern "C" HRESULT PayloadsParseFromXml(
67
hr = XmlGetAttributeEx(pixnNode, L"Packaging", &scz);
68
ExitOnFailure(hr, "Failed to get @Packaging.");
69
70
- if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, scz, -1, L"download", -1))
71
- {
72
- pPayload->packaging = BURN_PAYLOAD_PACKAGING_DOWNLOAD;
73
- }
74
- else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, scz, -1, L"embedded", -1))
70
+ if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, scz, -1, L"embedded", -1))
71
{
72
pPayload->packaging = BURN_PAYLOAD_PACKAGING_EMBEDDED;
73
}
@@ -108,14 +104,11 @@ extern "C" HRESULT PayloadsParseFromXml(
104
105
// @SourcePath
106
hr = XmlGetAttributeEx(pixnNode, L"SourcePath", &pPayload->sczSourcePath);
111
- if (E_NOTFOUND != hr || BURN_PAYLOAD_PACKAGING_DOWNLOAD != pPayload->packaging)
112
- {
113
- ExitOnFailure(hr, "Failed to get @SourcePath.");
114
- }
107
+ ExitOnFailure(hr, "Failed to get @SourcePath.");
108
109
// @DownloadUrl
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)
112
{
113
ExitOnFailure(hr, "Failed to get @DownloadUrl.");
114
}
src/engine/payload.h
-1
@@ -12,7 +12,6 @@ extern "C" {
12
enum BURN_PAYLOAD_PACKAGING
13
{
14
BURN_PAYLOAD_PACKAGING_NONE,
15
- BURN_PAYLOAD_PACKAGING_DOWNLOAD,
15
BURN_PAYLOAD_PACKAGING_EMBEDDED,
16
BURN_PAYLOAD_PACKAGING_EXTERNAL,
17
};