Use GeneratedDllImport in System.Diagnostics.FileVersionInfo and System.Runtime.InteropServices.RuntimeInformation #52739
Conversation
elinor-fung
force-pushed
the
convert-FileVersionInfo-RuntimeInformation
branch
from
834dbb1 to
1ade806
Compare
src/libraries/Common/src/Interop/Windows/Kernel32/Interop.SYSTEM_INFO.cs
Outdated
Show resolved
Hide resolved
|
|
||
| [DllImport(Libraries.SystemNative, EntryPoint = "SystemNative_Stat", SetLastError = true)] | ||
| internal static extern int Stat(string path, out FileStatus output); | ||
| [GeneratedDllImport(Libraries.SystemNative, EntryPoint = "SystemNative_Stat", CharSet = CharSet.Ansi, SetLastError = true)] |
There was a problem hiding this comment.
Why is CharSet = CharSet.Ansi needed here?
There was a problem hiding this comment.
We had the p/invoke source generators avoid making any assumptions about CharSet if it isn't set, so it requires explicitly specifying either CharSet or MarshalAs when marshalling string/char.
elinor-fung
force-pushed
the
convert-FileVersionInfo-RuntimeInformation
branch
from
1ade806 to
00b9f84
Compare
src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GetSystemInfo.cs
Outdated
Show resolved
Hide resolved
| @@ -8,6 +8,6 @@ internal static partial class Interop | |||
| internal static partial class Kernel32 | |||
| { | |||
| [DllImport(Libraries.Kernel32)] | |||
| internal static extern void GetSystemInfo(out SYSTEM_INFO lpSystemInfo); | |||
| internal static unsafe extern void GetSystemInfo(SYSTEM_INFO* lpSystemInfo); | |||
There was a problem hiding this comment.
Is unsafe change necessary? (it is still using the old DllImport)
There was a problem hiding this comment.
The parameter was switched to be a pointer - SYSTEM_INFO*
There was a problem hiding this comment.
yes but since title is "Use GeneratedDllImport..". this change and changes due to this change looked unrelated.
There was a problem hiding this comment.
The general goal of GeneratedDllImport (and this feature branch) is to remove p/invoke overhead - whether that is through using the DllImport source generator to generate the code or using it to find places where we could easily make the p/invoke inlinable.
ghost
locked as resolved and limited conversation to collaborators
System.Diagnostics.FileVersionInfo:System.Runtime.InteropServices.RuntimeInformation:cc @AaronRobinsonMSFT @jkoritzinsky