From dd16dd2344ca3c750a8fc52c1e27a605fd25940d Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Sun, 25 Apr 2021 21:47:32 -0500 Subject: DOWNLOAD is not a valid packaging value. --- src/engine/payload.cpp | 13 +++---------- src/engine/payload.h | 1 - 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( hr = XmlGetAttributeEx(pixnNode, L"Packaging", &scz); ExitOnFailure(hr, "Failed to get @Packaging."); - if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, scz, -1, L"download", -1)) - { - pPayload->packaging = BURN_PAYLOAD_PACKAGING_DOWNLOAD; - } - else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, scz, -1, L"embedded", -1)) + if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, scz, -1, L"embedded", -1)) { pPayload->packaging = BURN_PAYLOAD_PACKAGING_EMBEDDED; } @@ -108,14 +104,11 @@ extern "C" HRESULT PayloadsParseFromXml( // @SourcePath hr = XmlGetAttributeEx(pixnNode, L"SourcePath", &pPayload->sczSourcePath); - if (E_NOTFOUND != hr || BURN_PAYLOAD_PACKAGING_DOWNLOAD != pPayload->packaging) - { - ExitOnFailure(hr, "Failed to get @SourcePath."); - } + ExitOnFailure(hr, "Failed to get @SourcePath."); // @DownloadUrl hr = XmlGetAttributeEx(pixnNode, L"DownloadUrl", &pPayload->downloadSource.sczUrl); - if (E_NOTFOUND != hr || BURN_PAYLOAD_PACKAGING_DOWNLOAD == pPayload->packaging) + if (E_NOTFOUND != hr) { ExitOnFailure(hr, "Failed to get @DownloadUrl."); } 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" { enum BURN_PAYLOAD_PACKAGING { BURN_PAYLOAD_PACKAGING_NONE, - BURN_PAYLOAD_PACKAGING_DOWNLOAD, BURN_PAYLOAD_PACKAGING_EMBEDDED, BURN_PAYLOAD_PACKAGING_EXTERNAL, }; -- cgit v1.2.3-55-g6feb