Add Expected Return Code for InvalidParameter

schemas/JSON/manifests/v1.4.0/manifest.installer.1.4.0.json

@@ -228,6 +228,7 @@
               "missingDependency",
               "diskFull",
               "insufficientMemory",
+              "invalidParameter",
               "noNetwork",
               "contactSupport",
               "rebootRequiredToFinish",
@@ -237,6 +238,7 @@
               "alreadyInstalled",
               "downgrade",
               "blockedByPolicy",
+              "systemNotSupported",
               "custom"
             ]
           },

schemas/JSON/manifests/v1.4.0/manifest.singleton.1.4.0.json

@@ -270,6 +270,7 @@
               "missingDependency",
               "diskFull",
               "insufficientMemory",
+              "invalidParameter",
               "noNetwork",
               "contactSupport",
               "rebootRequiredToFinish",
@@ -279,6 +280,7 @@
               "alreadyInstalled",
               "downgrade",
               "blockedByPolicy",
+              "systemNotSupported",
               "custom"
             ]
           },

src/AppInstallerCLICore/Resources.h

@@ -156,13 +156,15 @@ namespace AppInstaller::CLI::Resource
         WINGET_DEFINE_RESOURCE_STRINGID(InstallFlowReturnCodeFileInUse);
         WINGET_DEFINE_RESOURCE_STRINGID(InstallFlowReturnCodeInstallInProgress);
         WINGET_DEFINE_RESOURCE_STRINGID(InstallFlowReturnCodeInsufficientMemory);
+        WINGET_DEFINE_RESOURCE_STRINGID(InstallFlowReturnCodeInvalidParameter);
         WINGET_DEFINE_RESOURCE_STRINGID(InstallFlowReturnCodeMissingDependency);
         WINGET_DEFINE_RESOURCE_STRINGID(InstallFlowReturnCodeNoNetwork);
         WINGET_DEFINE_RESOURCE_STRINGID(InstallFlowReturnCodePackageInUse);
         WINGET_DEFINE_RESOURCE_STRINGID(InstallFlowReturnCodePackageInUseByApplication);
         WINGET_DEFINE_RESOURCE_STRINGID(InstallFlowReturnCodeRebootInitiated);
         WINGET_DEFINE_RESOURCE_STRINGID(InstallFlowReturnCodeRebootRequiredForInstall);
         WINGET_DEFINE_RESOURCE_STRINGID(InstallFlowReturnCodeRebootRequiredToFinish);
+        WINGET_DEFINE_RESOURCE_STRINGID(InstallFlowReturnCodeSystemNotSupported);
         WINGET_DEFINE_RESOURCE_STRINGID(InstallFlowStartingPackageInstall);
         WINGET_DEFINE_RESOURCE_STRINGID(InstallLocationNotProvided);
         WINGET_DEFINE_RESOURCE_STRINGID(InstallScopeDescription);

src/AppInstallerCLICore/Workflows/InstallFlow.cpp

@@ -128,6 +128,8 @@ namespace AppInstaller::CLI::Workflow
                     return ExpectedReturnCode(returnCode, APPINSTALLER_CLI_ERROR_INSTALL_DISK_FULL, Resource::String::InstallFlowReturnCodeDiskFull);
                 case ExpectedReturnCodeEnum::InsufficientMemory:
                     return ExpectedReturnCode(returnCode, APPINSTALLER_CLI_ERROR_INSTALL_INSUFFICIENT_MEMORY, Resource::String::InstallFlowReturnCodeInsufficientMemory);
+                case ExpectedReturnCodeEnum::InvalidParameter:
+                    return ExpectedReturnCode(returnCode, APPINSTALLER_CLI_ERROR_INSTALL_INVALID_PARAMETER, Resource::String::InstallFlowReturnCodeInvalidParameter);
                 case ExpectedReturnCodeEnum::NoNetwork:
                     return ExpectedReturnCode(returnCode, APPINSTALLER_CLI_ERROR_INSTALL_NO_NETWORK, Resource::String::InstallFlowReturnCodeNoNetwork);
                 case ExpectedReturnCodeEnum::ContactSupport:
@@ -146,6 +148,8 @@ namespace AppInstaller::CLI::Workflow
                     return ExpectedReturnCode(returnCode, APPINSTALLER_CLI_ERROR_INSTALL_DOWNGRADE, Resource::String::InstallFlowReturnCodeDowngrade);
                 case ExpectedReturnCodeEnum::BlockedByPolicy:
                     return ExpectedReturnCode(returnCode, APPINSTALLER_CLI_ERROR_INSTALL_BLOCKED_BY_POLICY, Resource::String::InstallFlowReturnCodeBlockedByPolicy);
+                case ExpectedReturnCodeEnum::SystemNotSupported:
+                    return ExpectedReturnCode(returnCode, APPINSTALLER_CLI_ERROR_INSTALL_SYSTEM_NOT_SUPPORTED, Resource::String::InstallFlowReturnCodeSystemNotSupported);
                 default:
                     THROW_HR(E_UNEXPECTED);
                 }

src/AppInstallerCLIPackage/Shared/Strings/en-us/winget.resw

@@ -1197,6 +1197,9 @@ Do you agree to the terms?</value>
   <data name="InstallFlowReturnCodeInsufficientMemory" xml:space="preserve">
     <value>There's not enough memory available to install. Close other applications then try again.</value>
   </data>
+  <data name="InstallFlowReturnCodeInvalidParameter" xml:space="preserve">
+    <value>One of the installation parameters is invalid. The package installation log may have additional details.</value>
+  </data>
   <data name="InstallFlowReturnCodeNoNetwork" xml:space="preserve">
     <value>This application requires internet connectivity. Connect to a network then try again.</value>
   </data>
@@ -1224,6 +1227,9 @@ Do you agree to the terms?</value>
   <data name="InstallFlowReturnCodeBlockedByPolicy" xml:space="preserve">
     <value>Organization policies are preventing installation. Contact your admin.</value>
   </data>
+  <data name="InstallFlowReturnCodeSystemNotSupported" xml:space="preserve">
+    <value>The current system configuration does not support the installation of this package.</value>
+  </data>
   <data name="InstallAbandoned" xml:space="preserve">
     <value>Installation abandoned</value>
   </data>

src/AppInstallerCommonCore/Manifest/ManifestCommon.cpp

@@ -311,7 +311,7 @@ namespace AppInstaller::Manifest
         {
             result = ExpectedReturnCodeEnum::PackageInUse;
         }
-        if (inStrLower == "packageinusebyapplication")
+        else if (inStrLower == "packageinusebyapplication")
         {
             result = ExpectedReturnCodeEnum::PackageInUseByApplication;
         }
@@ -335,6 +335,10 @@ namespace AppInstaller::Manifest
         {
             result = ExpectedReturnCodeEnum::InsufficientMemory;
         }
+        else if (inStrLower == "invalidparameter")
+        {
+            result = ExpectedReturnCodeEnum::InvalidParameter;
+        }
         else if (inStrLower == "nonetwork")
         {
             result = ExpectedReturnCodeEnum::NoNetwork;
@@ -371,6 +375,10 @@ namespace AppInstaller::Manifest
         {
             result = ExpectedReturnCodeEnum::BlockedByPolicy;
         }
+        else if (inStrLower == "systemnotsupported")
+        {
+            result = ExpectedReturnCodeEnum::SystemNotSupported;
+        }
         else if (inStrLower == "custom")
         {
             result = ExpectedReturnCodeEnum::Custom;
@@ -593,7 +601,18 @@ namespace AppInstaller::Manifest
                 { ERROR_SUCCESS_REBOOT_INITIATED, ExpectedReturnCodeEnum::RebootInitiated },
                 { ERROR_INSTALL_USEREXIT, ExpectedReturnCodeEnum::CancelledByUser },
                 { ERROR_PRODUCT_VERSION, ExpectedReturnCodeEnum::AlreadyInstalled },
-                { ERROR_INSTALL_REJECTED, ExpectedReturnCodeEnum::BlockedByPolicy },
+                { ERROR_INSTALL_REJECTED, ExpectedReturnCodeEnum::SystemNotSupported },
+                { ERROR_INSTALL_PACKAGE_REJECTED, ExpectedReturnCodeEnum::BlockedByPolicy },
+                { ERROR_INSTALL_TRANSFORM_REJECTED, ExpectedReturnCodeEnum::BlockedByPolicy },
+                { ERROR_PATCH_PACKAGE_REJECTED, ExpectedReturnCodeEnum::BlockedByPolicy },
+                { ERROR_PATCH_REMOVAL_DISALLOWED, ExpectedReturnCodeEnum::BlockedByPolicy },
+                { ERROR_INSTALL_REMOTE_DISALLOWED, ExpectedReturnCodeEnum::BlockedByPolicy },
+                { ERROR_INVALID_PARAMETER, ExpectedReturnCodeEnum::InvalidParameter },
+                { ERROR_INVALID_TABLE, ExpectedReturnCodeEnum::InvalidParameter },
+                { ERROR_INVALID_COMMAND_LINE, ExpectedReturnCodeEnum::InvalidParameter },
+                { ERROR_INVALID_PATCH_XML, ExpectedReturnCodeEnum::InvalidParameter },
+                { ERROR_INSTALL_LANGUAGE_UNSUPPORTED, ExpectedReturnCodeEnum::SystemNotSupported },
+                { ERROR_INSTALL_PLATFORM_UNSUPPORTED, ExpectedReturnCodeEnum::SystemNotSupported },
             };
         case InstallerTypeEnum::Inno:
             // See https://jrsoftware.org/ishelp/index.php?topic=setupexitcodes
@@ -614,6 +633,13 @@ namespace AppInstaller::Manifest
                 { HRESULT_FROM_WIN32(ERROR_INSTALL_CANCEL), ExpectedReturnCodeEnum::CancelledByUser },
                 { HRESULT_FROM_WIN32(ERROR_PACKAGE_ALREADY_EXISTS), ExpectedReturnCodeEnum::AlreadyInstalled },
                 { HRESULT_FROM_WIN32(ERROR_INSTALL_PACKAGE_DOWNGRADE), ExpectedReturnCodeEnum::Downgrade },
+                { HRESULT_FROM_WIN32(ERROR_DEPLOYMENT_BLOCKED_BY_POLICY), ExpectedReturnCodeEnum::BlockedByPolicy},
+                { HRESULT_FROM_WIN32(ERROR_INSTALL_POLICY_FAILURE), ExpectedReturnCodeEnum::BlockedByPolicy},
+                { HRESULT_FROM_WIN32(ERROR_PACKAGES_IN_USE), ExpectedReturnCodeEnum::PackageInUse },
+                { HRESULT_FROM_WIN32(ERROR_INSTALL_WRONG_PROCESSOR_ARCHITECTURE), ExpectedReturnCodeEnum::SystemNotSupported },
+                { HRESULT_FROM_WIN32(ERROR_PACKAGE_NOT_SUPPORTED_ON_FILESYSTEM), ExpectedReturnCodeEnum::SystemNotSupported },
+                { HRESULT_FROM_WIN32(ERROR_DEPLOYMENT_OPTION_NOT_SUPPORTED), ExpectedReturnCodeEnum::SystemNotSupported },
+                { HRESULT_FROM_WIN32(ERROR_PACKAGE_LACKS_CAPABILITY_TO_DEPLOY_ON_HOST), ExpectedReturnCodeEnum::SystemNotSupported },
             };
         default:
             return {};

src/AppInstallerCommonCore/Public/AppInstallerErrors.h

@@ -128,6 +128,8 @@
 #define APPINSTALLER_CLI_ERROR_INSTALL_BLOCKED_BY_POLICY        ((HRESULT)0x8A15010F)
 #define APPINSTALLER_CLI_ERROR_INSTALL_DEPENDENCIES             ((HRESULT)0x8A150110)
 #define APPINSTALLER_CLI_ERROR_INSTALL_PACKAGE_IN_USE_BY_APPLICATION ((HRESULT)0x8A150111)
+#define APPINSTALLER_CLI_ERROR_INSTALL_INVALID_PARAMETER        ((HRESULT)0x8A150112)
+#define APPINSTALLER_CLI_ERROR_INSTALL_SYSTEM_NOT_SUPPORTED     ((HRESULT)0x8A150113)
 
 // Status values for check package installed status results.
 // Partial success has the success bit(first bit) set to 0.

src/AppInstallerCommonCore/Public/winget/ManifestCommon.h

@@ -129,6 +129,7 @@ namespace AppInstaller::Manifest
         MissingDependency,
         DiskFull,
         InsufficientMemory,
+        InvalidParameter,
         NoNetwork,
         ContactSupport,
         RebootRequiredToFinish,
@@ -138,6 +139,7 @@ namespace AppInstaller::Manifest
         AlreadyInstalled,
         Downgrade,
         BlockedByPolicy,
+        SystemNotSupported,
         Custom,
     };
 

src/AppInstallerRepositoryCore/Rest/Schema/1_4/Json/ManifestDeserializer_1_4.cpp

@@ -59,6 +59,14 @@ namespace AppInstaller::Repository::Rest::Schema::V1_4::Json
         {
             return ExpectedReturnCodeEnum::PackageInUseByApplication;
         }
+        else if (inStrLower == "invalidparameter")
+        {
+            return ExpectedReturnCodeEnum::InvalidParameter;
+        }
+        else if (inStrLower == "systemnotsupported")
+        {
+            return ExpectedReturnCodeEnum::SystemNotSupported;
+        }
 
         return V1_1::Json::ManifestDeserializer::ConvertToExpectedReturnCodeEnum(inStrLower);
     }