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
dotnet:masterfrom
danmoseley:cleanup.hresults
Aug 28, 2017
Merged

Remove dead HResults.cs#13611
danmoseley merged 7 commits into
dotnet:masterfrom
danmoseley:cleanup.hresults

Conversation

@danmoseley
Copy link
Copy Markdown
Member

CoreRT is on the __HResults program as is most of the code.
I diffed HResults with __HResults and found a tpyo to fix also.

@jkotas
Copy link
Copy Markdown
Member

jkotas commented Aug 28, 2017

Should we rather change it other way around (delete __HResults and keep HResults)? HResults is consistent with CoreFX and with the coding conventions.

@danmoseley
Copy link
Copy Markdown
Member Author

OK, I changed to HResults, sorted, made case consistent, and combined into a single file, to match CoreRT. I'll put up a PR to do the same to CoreRT. After that, it can move into shared.

Copy link
Copy Markdown
Member

@jkotas jkotas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

internal const int CORSEC_E_NO_EXEC_PERM = unchecked((int)0x80131418);
internal const int CORSEC_E_POLICY_EXCEPTION = unchecked((int)0x80131416);
internal const int CORSEC_E_SIGNATURE_MISMATCH = unchecked((int)0x80131420);
internal const int CORSEC_E_XMLSYNTAX = unchecked((int)0x80131419);
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some of these look unused, like CORSEC_E_XMLSYNTAX. It can be nice to have follow up cleanup.

Copy link
Copy Markdown
Member Author

@danmoseley danmoseley Aug 28, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is used in CoreRT in this file which also uses many others CoreCLR does not have. When I share the file in a later change, I will have to include them.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think S.P.Interop in CoreRT should keep own non-shared copy of the file.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It may be useful to mark the eventual shared HResults as partial class so that different runtimes, different OSes, or different libraries can add to it own local codes.

@danmoseley danmoseley merged commit 0db6d91 into dotnet:master Aug 28, 2017
@danmoseley danmoseley deleted the cleanup.hresults branch August 28, 2017 06:42
dotnet-bot pushed a commit to dotnet/corert that referenced this pull request Aug 28, 2017
* Fix old copy paste mistake

* Remove dead HResults.cs

* Rename __HResults to HResults

* Rename other two __HResults classes

* Combine into single HResults class, to match CoreRT

* Make hex consistently uppercase

* Sort HResults

Signed-off-by: dotnet-bot <dotnet-bot@microsoft.com>
@karelz karelz modified the milestone: 2.1.0 Aug 28, 2017
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants