Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Remove dead HResults.cs #13611

Merged
danmoseley merged 7 commits into from
Aug 28, 2017
Merged

Remove dead HResults.cs #13611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d68f092
Fix old copy paste mistake
danmoseley Aug 26, 2017
ed4a9dd
Remove dead HResults.cs
danmoseley Aug 26, 2017
6dd24df
Rename __HResults to HResults
danmoseley Aug 28, 2017
9d06396
Rename other two __HResults classes
danmoseley Aug 28, 2017
c053ebf
Combine into single HResults class, to match CoreRT
danmoseley Aug 28, 2017
2c6300e
Make hex consistently uppercase
danmoseley Aug 28, 2017
a733c0a
Sort HResults
danmoseley Aug 28, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/coreclr/hosts/corerun/logger.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ void PrintAsHResult(int val) {
case 0x80131416: str = W("CORSEC_E_POLICY_EXCEPTION"); break;
case 0x80131417: str = W("CORSEC_E_MIN_GRANT_FAIL"); break;
case 0x80131418: str = W("CORSEC_E_NO_EXEC_PERM"); break;
//case 0x80131418: str = W("CORSEC_E_XMLSYNTAX"); break;
//case 0x80131419: str = W("CORSEC_E_XMLSYNTAX"); break;
case 0x80131430: str = W("CORSEC_E_CRYPTO"); break;
case 0x80131431: str = W("CORSEC_E_CRYPTO_UNEX_OPER"); break;
case 0x80131500: str = W("COR_E_EXCEPTION"); break;
Expand Down
5 changes: 1 addition & 4 deletions src/mscorlib/System.Private.CoreLib.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,8 +294,6 @@
<Compile Include="$(BclSourcesRoot)\System\OutOfMemoryException.cs" />
<Compile Include="$(BclSourcesRoot)\System\Delegate.cs" />
<Compile Include="$(BclSourcesRoot)\System\MulticastDelegate.cs" />
<Compile Include="$(BclSourcesRoot)\System\__HResults.cs" />
<Compile Include="$(BclSourcesRoot)\System\HResults.cs" />
<Compile Include="$(BclSourcesRoot)\System\BCLDebug.cs" />
<Compile Include="$(BclSourcesRoot)\System\Activator.cs" />
<Compile Include="$(BclSourcesRoot)\System\AccessViolationException.cs" />
Expand All @@ -316,6 +314,7 @@
<Compile Include="$(BclSourcesRoot)\System\Environment.cs" />
<Compile Include="$(BclSourcesRoot)\System\GC.cs" />
<Compile Include="$(BclSourcesRoot)\System\Guid.CoreCLR.cs" />
<Compile Include="$(BclSourcesRoot)\System\HResults.cs" />
<Compile Include="$(BclSourcesRoot)\System\InsufficientMemoryException.cs" />
<Compile Include="$(BclSourcesRoot)\System\IntPtr.cs" />
<Compile Include="$(BclSourcesRoot)\System\Internal.cs" />
Expand Down Expand Up @@ -498,7 +497,6 @@
</ItemGroup>
<ItemGroup>
<Compile Include="$(BclSourcesRoot)\System\IO\__Error.cs" />
<Compile Include="$(BclSourcesRoot)\System\IO\__HResults.cs" />
<Compile Include="$(BclSourcesRoot)\System\IO\BinaryReader.cs" />
<Compile Include="$(BclSourcesRoot)\System\IO\Directory.cs" />
<Compile Include="$(BclSourcesRoot)\System\IO\SearchOption.cs" />
Expand Down Expand Up @@ -567,7 +565,6 @@
</ItemGroup>
<ItemGroup>
<Compile Include="$(BclSourcesRoot)\System\Resources\__FastResourceComparer.cs" />
<Compile Include="$(BclSourcesRoot)\System\Resources\__HResults.cs" />
<Compile Include="$(BclSourcesRoot)\System\Resources\FileBasedResourceGroveler.cs" />
<Compile Include="$(BclSourcesRoot)\System\Resources\IResourceGroveler.cs" />
<Compile Include="$(BclSourcesRoot)\System\Resources\ManifestBasedResourceGroveler.cs" />
Expand Down
6 changes: 3 additions & 3 deletions src/mscorlib/shared/System/ApplicationException.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public class ApplicationException : Exception
public ApplicationException()
: base(SR.Arg_ApplicationException)
{
HResult = __HResults.COR_E_APPLICATION;
HResult = HResults.COR_E_APPLICATION;
}

// Creates a new ApplicationException with its message string set to
Expand All @@ -41,13 +41,13 @@ public ApplicationException()
public ApplicationException(String message)
: base(message)
{
HResult = __HResults.COR_E_APPLICATION;
HResult = HResults.COR_E_APPLICATION;
}

public ApplicationException(String message, Exception innerException)
: base(message, innerException)
{
HResult = __HResults.COR_E_APPLICATION;
HResult = HResults.COR_E_APPLICATION;
}

protected ApplicationException(SerializationInfo info, StreamingContext context) : base(info, context)
Expand Down
10 changes: 5 additions & 5 deletions src/mscorlib/shared/System/ArgumentException.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public class ArgumentException : SystemException
public ArgumentException()
: base(SR.Arg_ArgumentException)
{
HResult = __HResults.COR_E_ARGUMENT;
HResult = HResults.COR_E_ARGUMENT;
}

// Creates a new ArgumentException with its message
Expand All @@ -38,27 +38,27 @@ public ArgumentException()
public ArgumentException(String message)
: base(message)
{
HResult = __HResults.COR_E_ARGUMENT;
HResult = HResults.COR_E_ARGUMENT;
}

public ArgumentException(String message, Exception innerException)
: base(message, innerException)
{
HResult = __HResults.COR_E_ARGUMENT;
HResult = HResults.COR_E_ARGUMENT;
}

public ArgumentException(String message, String paramName, Exception innerException)
: base(message, innerException)
{
_paramName = paramName;
HResult = __HResults.COR_E_ARGUMENT;
HResult = HResults.COR_E_ARGUMENT;
}

public ArgumentException(String message, String paramName)
: base(message)
{
_paramName = paramName;
HResult = __HResults.COR_E_ARGUMENT;
HResult = HResults.COR_E_ARGUMENT;
}

protected ArgumentException(SerializationInfo info, StreamingContext context)
Expand Down
8 changes: 4 additions & 4 deletions src/mscorlib/shared/System/ArgumentNullException.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,25 +26,25 @@ public ArgumentNullException()
: base(SR.ArgumentNull_Generic)
{
// Use E_POINTER - COM used that for null pointers. Description is "invalid pointer"
HResult = __HResults.E_POINTER;
HResult = HResults.E_POINTER;
}

public ArgumentNullException(String paramName)
: base(SR.ArgumentNull_Generic, paramName)
{
HResult = __HResults.E_POINTER;
HResult = HResults.E_POINTER;
}

public ArgumentNullException(String message, Exception innerException)
: base(message, innerException)
{
HResult = __HResults.E_POINTER;
HResult = HResults.E_POINTER;
}

public ArgumentNullException(String paramName, String message)
: base(message, paramName)
{
HResult = __HResults.E_POINTER;
HResult = HResults.E_POINTER;
}

protected ArgumentNullException(SerializationInfo info, StreamingContext context) : base(info, context)
Expand Down
10 changes: 5 additions & 5 deletions src/mscorlib/shared/System/ArgumentOutOfRangeException.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,25 +27,25 @@ public class ArgumentOutOfRangeException : ArgumentException
public ArgumentOutOfRangeException()
: base(SR.Arg_ArgumentOutOfRangeException)
{
HResult = __HResults.COR_E_ARGUMENTOUTOFRANGE;
HResult = HResults.COR_E_ARGUMENTOUTOFRANGE;
}

public ArgumentOutOfRangeException(String paramName)
: base(SR.Arg_ArgumentOutOfRangeException, paramName)
{
HResult = __HResults.COR_E_ARGUMENTOUTOFRANGE;
HResult = HResults.COR_E_ARGUMENTOUTOFRANGE;
}

public ArgumentOutOfRangeException(String paramName, String message)
: base(message, paramName)
{
HResult = __HResults.COR_E_ARGUMENTOUTOFRANGE;
HResult = HResults.COR_E_ARGUMENTOUTOFRANGE;
}

public ArgumentOutOfRangeException(String message, Exception innerException)
: base(message, innerException)
{
HResult = __HResults.COR_E_ARGUMENTOUTOFRANGE;
HResult = HResults.COR_E_ARGUMENTOUTOFRANGE;
}

// We will not use this in the classlibs, but we'll provide it for
Expand All @@ -55,7 +55,7 @@ public ArgumentOutOfRangeException(String paramName, Object actualValue, String
: base(message, paramName)
{
_actualValue = actualValue;
HResult = __HResults.COR_E_ARGUMENTOUTOFRANGE;
HResult = HResults.COR_E_ARGUMENTOUTOFRANGE;
}

protected ArgumentOutOfRangeException(SerializationInfo info, StreamingContext context)
Expand Down
6 changes: 3 additions & 3 deletions src/mscorlib/shared/System/ArithmeticException.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public class ArithmeticException : SystemException
public ArithmeticException()
: base(SR.Arg_ArithmeticException)
{
HResult = __HResults.COR_E_ARITHMETIC;
HResult = HResults.COR_E_ARITHMETIC;
}

// Creates a new ArithmeticException with its message string set to
Expand All @@ -36,13 +36,13 @@ public ArithmeticException()
public ArithmeticException(String message)
: base(message)
{
HResult = __HResults.COR_E_ARITHMETIC;
HResult = HResults.COR_E_ARITHMETIC;
}

public ArithmeticException(String message, Exception innerException)
: base(message, innerException)
{
HResult = __HResults.COR_E_ARITHMETIC;
HResult = HResults.COR_E_ARITHMETIC;
}

protected ArithmeticException(SerializationInfo info, StreamingContext context) : base(info, context)
Expand Down
6 changes: 3 additions & 3 deletions src/mscorlib/shared/System/ArrayTypeMismatchException.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public class ArrayTypeMismatchException : SystemException
public ArrayTypeMismatchException()
: base(SR.Arg_ArrayTypeMismatchException)
{
HResult = __HResults.COR_E_ARRAYTYPEMISMATCH;
HResult = HResults.COR_E_ARRAYTYPEMISMATCH;
}

// Creates a new ArrayMismatchException with its message string set to
Expand All @@ -36,13 +36,13 @@ public ArrayTypeMismatchException()
public ArrayTypeMismatchException(String message)
: base(message)
{
HResult = __HResults.COR_E_ARRAYTYPEMISMATCH;
HResult = HResults.COR_E_ARRAYTYPEMISMATCH;
}

public ArrayTypeMismatchException(String message, Exception innerException)
: base(message, innerException)
{
HResult = __HResults.COR_E_ARRAYTYPEMISMATCH;
HResult = HResults.COR_E_ARRAYTYPEMISMATCH;
}

protected ArrayTypeMismatchException(SerializationInfo info, StreamingContext context) : base(info, context)
Expand Down
12 changes: 6 additions & 6 deletions src/mscorlib/shared/System/BadImageFormatException.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,31 +25,31 @@ public partial class BadImageFormatException : SystemException
public BadImageFormatException()
: base(SR.Arg_BadImageFormatException)
{
HResult = __HResults.COR_E_BADIMAGEFORMAT;
HResult = HResults.COR_E_BADIMAGEFORMAT;
}

public BadImageFormatException(String message)
: base(message)
{
HResult = __HResults.COR_E_BADIMAGEFORMAT;
HResult = HResults.COR_E_BADIMAGEFORMAT;
}

public BadImageFormatException(String message, Exception inner)
: base(message, inner)
{
HResult = __HResults.COR_E_BADIMAGEFORMAT;
HResult = HResults.COR_E_BADIMAGEFORMAT;
}

public BadImageFormatException(String message, String fileName) : base(message)
{
HResult = __HResults.COR_E_BADIMAGEFORMAT;
HResult = HResults.COR_E_BADIMAGEFORMAT;
_fileName = fileName;
}

public BadImageFormatException(String message, String fileName, Exception inner)
: base(message, inner)
{
HResult = __HResults.COR_E_BADIMAGEFORMAT;
HResult = HResults.COR_E_BADIMAGEFORMAT;
_fileName = fileName;
}

Expand Down Expand Up @@ -78,7 +78,7 @@ private void SetMessageField()
if (_message == null)
{
if ((_fileName == null) &&
(HResult == __HResults.COR_E_EXCEPTION))
(HResult == HResults.COR_E_EXCEPTION))
_message = SR.Arg_BadImageFormatException;

else
Expand Down
6 changes: 3 additions & 3 deletions src/mscorlib/shared/System/Collections/Generic/KeyNotFoundException.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,19 @@ public class KeyNotFoundException : SystemException
public KeyNotFoundException()
: base(SR.Arg_KeyNotFound)
{
HResult = __HResults.COR_E_KEYNOTFOUND;
HResult = HResults.COR_E_KEYNOTFOUND;
}

public KeyNotFoundException(String message)
: base(message)
{
HResult = __HResults.COR_E_KEYNOTFOUND;
HResult = HResults.COR_E_KEYNOTFOUND;
}

public KeyNotFoundException(String message, Exception innerException)
: base(message, innerException)
{
HResult = __HResults.COR_E_KEYNOTFOUND;
HResult = HResults.COR_E_KEYNOTFOUND;
}

protected KeyNotFoundException(SerializationInfo info, StreamingContext context) : base(info, context)
Expand Down
6 changes: 3 additions & 3 deletions src/mscorlib/shared/System/DataMisalignedException.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,19 @@ public sealed class DataMisalignedException : SystemException
public DataMisalignedException()
: base(SR.Arg_DataMisalignedException)
{
HResult = __HResults.COR_E_DATAMISALIGNED;
HResult = HResults.COR_E_DATAMISALIGNED;
}

public DataMisalignedException(String message)
: base(message)
{
HResult = __HResults.COR_E_DATAMISALIGNED;
HResult = HResults.COR_E_DATAMISALIGNED;
}

public DataMisalignedException(String message, Exception innerException)
: base(message, innerException)
{
HResult = __HResults.COR_E_DATAMISALIGNED;
HResult = HResults.COR_E_DATAMISALIGNED;
}
}
}
6 changes: 3 additions & 3 deletions src/mscorlib/shared/System/DivideByZeroException.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,19 @@ public class DivideByZeroException : ArithmeticException
public DivideByZeroException()
: base(SR.Arg_DivideByZero)
{
HResult = __HResults.COR_E_DIVIDEBYZERO;
HResult = HResults.COR_E_DIVIDEBYZERO;
}

public DivideByZeroException(String message)
: base(message)
{
HResult = __HResults.COR_E_DIVIDEBYZERO;
HResult = HResults.COR_E_DIVIDEBYZERO;
}

public DivideByZeroException(String message, Exception innerException)
: base(message, innerException)
{
HResult = __HResults.COR_E_DIVIDEBYZERO;
HResult = HResults.COR_E_DIVIDEBYZERO;
}

protected DivideByZeroException(SerializationInfo info, StreamingContext context) : base(info, context)
Expand Down
6 changes: 3 additions & 3 deletions src/mscorlib/shared/System/DllNotFoundException.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,19 @@ public class DllNotFoundException : TypeLoadException
public DllNotFoundException()
: base(SR.Arg_DllNotFoundException)
{
HResult = __HResults.COR_E_DLLNOTFOUND;
HResult = HResults.COR_E_DLLNOTFOUND;
}

public DllNotFoundException(String message)
: base(message)
{
HResult = __HResults.COR_E_DLLNOTFOUND;
HResult = HResults.COR_E_DLLNOTFOUND;
}

public DllNotFoundException(String message, Exception inner)
: base(message, inner)
{
HResult = __HResults.COR_E_DLLNOTFOUND;
HResult = HResults.COR_E_DLLNOTFOUND;
}

protected DllNotFoundException(SerializationInfo info, StreamingContext context) : base(info, context)
Expand Down
8 changes: 4 additions & 4 deletions src/mscorlib/shared/System/DuplicateWaitObjectException.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,25 +37,25 @@ private static String DuplicateWaitObjectMessage
public DuplicateWaitObjectException()
: base(DuplicateWaitObjectMessage)
{
HResult = __HResults.COR_E_DUPLICATEWAITOBJECT;
HResult = HResults.COR_E_DUPLICATEWAITOBJECT;
}

public DuplicateWaitObjectException(String parameterName)
: base(DuplicateWaitObjectMessage, parameterName)
{
HResult = __HResults.COR_E_DUPLICATEWAITOBJECT;
HResult = HResults.COR_E_DUPLICATEWAITOBJECT;
}

public DuplicateWaitObjectException(String parameterName, String message)
: base(message, parameterName)
{
HResult = __HResults.COR_E_DUPLICATEWAITOBJECT;
HResult = HResults.COR_E_DUPLICATEWAITOBJECT;
}

public DuplicateWaitObjectException(String message, Exception innerException)
: base(message, innerException)
{
HResult = __HResults.COR_E_DUPLICATEWAITOBJECT;
HResult = HResults.COR_E_DUPLICATEWAITOBJECT;
}

protected DuplicateWaitObjectException(SerializationInfo info, StreamingContext context) : base(info, context)
Expand Down
Loading