admin/PowerShell-PowerShell
1
0
Fork 0
mirror of https://github.com/PowerShell/PowerShell synced 2026-06-08 12:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't use ArgumentList when creating COM object as it's not applicable to the COM parameter set (#15915)

Browse Source
This commit is contained in:
Dongbo Wang
2021-08-14 07:32:51 -07:00
committed by GitHub
parent dda6c156d2
commit 05e64135d2
1 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Microsoft.PowerShell.Commands.Utility/commands/utility/New-Object.cs
+18 -16
View File
@@ -238,7 +238,7 @@ namespace Microsoft.PowerShell.Commands
WriteObject(_newObject);
return;
}
else if (type.GetTypeInfo().IsValueType)
else if (type.IsValueType)
{
// This is for default parameterless struct ctor which is not returned by
// Type.GetConstructor(System.Type.EmptyTypes).
@@ -351,12 +351,12 @@ namespace Microsoft.PowerShell.Commands
#if !UNIX
#region Com
private object SafeCreateInstance(Type t, object[] args)
private object SafeCreateInstance(Type t)
{
object result = null;
try
{
result = Activator.CreateInstance(t, args);
result = Activator.CreateInstance(t);
}
// Does not catch InvalidComObjectException because ComObject is obtained from GetTypeFromProgID
catch (ArgumentException e)
@@ -430,13 +430,10 @@ namespace Microsoft.PowerShell.Commands
ComCreateInfo info = (ComCreateInfo)createstruct;
try
{
Type type = null;
PSArgumentException mshArgE = null;
type = Type.GetTypeFromCLSID(_comObjectClsId);
Type type = Type.GetTypeFromCLSID(_comObjectClsId);
if (type == null)
{
mshArgE = PSTraceSource.NewArgumentException(
PSArgumentException mshArgE = PSTraceSource.NewArgumentException(
"ComObject",
NewObjectStrings.CannotLoadComObjectType,
ComObject);
@@ -446,7 +443,7 @@ namespace Microsoft.PowerShell.Commands
return;
}
info.objectCreated = SafeCreateInstance(type, ArgumentList);
info.objectCreated = SafeCreateInstance(type);
info.success = true;
}
catch (Exception e)
@@ -458,20 +455,25 @@ namespace Microsoft.PowerShell.Commands
private object CreateComObject()
{
Type type = null;
PSArgumentException mshArgE = null;
try
{
type = Marshal.GetTypeFromCLSID(_comObjectClsId);
Type type = Marshal.GetTypeFromCLSID(_comObjectClsId);
if (type == null)
{
mshArgE = PSTraceSource.NewArgumentException("ComObject", NewObjectStrings.CannotLoadComObjectType, ComObject);
PSArgumentException mshArgE = PSTraceSource.NewArgumentException(
"ComObject",
NewObjectStrings.CannotLoadComObjectType,
ComObject);
ThrowTerminatingError(
new ErrorRecord(mshArgE, "CannotLoadComObjectType", ErrorCategory.InvalidType, null));
new ErrorRecord(
mshArgE,
"CannotLoadComObjectType",
ErrorCategory.InvalidType,
targetObject: null));
}
return SafeCreateInstance(type, ArgumentList);
return SafeCreateInstance(type);
}
catch (COMException e)
{