Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.
/ corefx Public archive

Fix interop for RTL_OSVERSIONINFOEX #32433

Merged
merged 1 commit into from
Sep 24, 2018
Merged

Conversation

jkotas
Copy link
Member

@jkotas jkotas commented Sep 24, 2018

  • Ensure that the OS version string is marshaled as Unicode
  • Avoid allocating the version string when it is not needed

Fixes #32423

- Ensure that the OS version string is marshaled as Unicode
- Avoid allocating the version string when it is not needed

Fixes #32423
[StructLayout(LayoutKind.Sequential)]
private struct RTL_OSVERSIONINFOEX
[StructLayout(LayoutKind.Sequential, CharSet=CharSet.Unicode)]
private unsafe struct RTL_OSVERSIONINFOEX
Copy link
Member

Choose a reason for hiding this comment

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

Why don't we include src/Common/src/Interop/Windows/NtDll/Interop.RTL_OSVERSIONINFOEX.cs to avoid the duplication here?

Copy link
Member Author

Choose a reason for hiding this comment

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

This file has duplicate local interop definitions for everything it calls - CloseHandle, GetCurrentProcess, ... . I do not know why it was done this way. If there is a good reason to clean it up, it should be separate PR.

Copy link
Member

Choose a reason for hiding this comment

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

@ViktorHofer
Copy link
Member

Unrelated UWP failure ERROR_WINHTTP_CONNECTION_ERROR/WININET_E_CONNECTION_ABORTED 0x80072EFE.

@ViktorHofer ViktorHofer merged commit 1a7ef6f into dotnet:master Sep 24, 2018
ViktorHofer added a commit that referenced this pull request Sep 24, 2018
@jkotas jkotas deleted the issue-32423 branch September 24, 2018 21:25
@karelz karelz added this to the 3.0 milestone Oct 8, 2018
picenka21 pushed a commit to picenka21/runtime that referenced this pull request Feb 18, 2022
- Ensure that the OS version string is marshaled as Unicode
- Avoid allocating the version string when it is not needed

Fixes dotnet/corefx#32423

Commit migrated from dotnet/corefx@1a7ef6f
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