From f43d176f95601ff7524e06247166d4f3b6e61c05 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Fri, 2 Jul 2021 10:18:08 -0500 Subject: Make the BA responsible for parsing restart prompt behavior. Fixes #4975 --- src/burn/engine/core.cpp | 39 --------------------------------------- 1 file changed, 39 deletions(-) (limited to 'src/burn/engine/core.cpp') diff --git a/src/burn/engine/core.cpp b/src/burn/engine/core.cpp index 8b97952c..f71103a8 100644 --- a/src/burn/engine/core.cpp +++ b/src/burn/engine/core.cpp @@ -924,7 +924,6 @@ extern "C" HRESULT CoreRecreateCommandLine( __deref_inout_z LPWSTR* psczCommandLine, __in BOOTSTRAPPER_ACTION action, __in BOOTSTRAPPER_DISPLAY display, - __in BOOTSTRAPPER_RESTART restart, __in BOOTSTRAPPER_RELATION_TYPE relationType, __in BOOL fPassthrough, __in_z_opt LPCWSTR wzActiveParent, @@ -965,17 +964,6 @@ extern "C" HRESULT CoreRecreateCommandLine( } ExitOnFailure(hr, "Failed to append action state to command-line"); - switch (restart) - { - case BOOTSTRAPPER_RESTART_ALWAYS: - hr = StrAllocConcat(psczCommandLine, L" /forcerestart", 0); - break; - case BOOTSTRAPPER_RESTART_NEVER: - hr = StrAllocConcat(psczCommandLine, L" /norestart", 0); - break; - } - ExitOnFailure(hr, "Failed to append restart state to command-line"); - if (wzActiveParent) { if (*wzActiveParent) @@ -1246,32 +1234,10 @@ extern "C" HRESULT CoreParseCommandLine( CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, &argv[i][1], -1, L"silent", -1)) { pCommand->display = BOOTSTRAPPER_DISPLAY_NONE; - - if (BOOTSTRAPPER_RESTART_UNKNOWN == pCommand->restart) - { - pCommand->restart = BOOTSTRAPPER_RESTART_AUTOMATIC; - } } else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, &argv[i][1], -1, L"passive", -1)) { pCommand->display = BOOTSTRAPPER_DISPLAY_PASSIVE; - - if (BOOTSTRAPPER_RESTART_UNKNOWN == pCommand->restart) - { - pCommand->restart = BOOTSTRAPPER_RESTART_AUTOMATIC; - } - } - else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, &argv[i][1], -1, L"norestart", -1)) - { - pCommand->restart = BOOTSTRAPPER_RESTART_NEVER; - } - else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, &argv[i][1], -1, L"forcerestart", -1)) - { - pCommand->restart = BOOTSTRAPPER_RESTART_ALWAYS; - } - else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, &argv[i][1], -1, L"promptrestart", -1)) - { - pCommand->restart = BOOTSTRAPPER_RESTART_PROMPT; } else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, &argv[i][1], -1, L"layout", -1)) { @@ -1653,11 +1619,6 @@ extern "C" HRESULT CoreParseCommandLine( pCommand->display = BOOTSTRAPPER_DISPLAY_FULL; } - if (BOOTSTRAPPER_RESTART_UNKNOWN == pCommand->restart) - { - pCommand->restart = BOOTSTRAPPER_RESTART_PROMPT; - } - LExit: if (fInvalidCommandLine) { -- cgit v1.2.3-55-g6feb