Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Switch over miscellaneous DllImports to GeneratedDllImport. #62353

Merged
merged 13 commits into from Dec 9, 2021
Merged

Switch over miscellaneous DllImports to GeneratedDllImport. #62353

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
f2006ec
Switch over miscellaneous DllImports to GeneratedDllImport.
jkoritzinsky Dec 3, 2021
114246b
Apply suggestions from code review
jkoritzinsky Dec 3, 2021
9211cba
Fix build breaks and enable DllImportGenerator in all projects that r…
jkoritzinsky Dec 3, 2021
6eae8bf
Fix live ref pack enable condition
jkoritzinsky Dec 3, 2021
e094856
Make sure that we only try to enable the generator in source projects.
jkoritzinsky Dec 3, 2021
c0022e1
Use the "item" to enable the generator for this case since import ord…
jkoritzinsky Dec 3, 2021
8c553b9
Fix downlevel .NETCoreApp support
jkoritzinsky Dec 6, 2021
5f8d4e2
More build fixes
jkoritzinsky Dec 6, 2021
aa2acef
Merge branch 'main' into misc-gendllimport
jkoritzinsky Dec 7, 2021
d2c6cd9
Fix another extern/partial typo
jkoritzinsky Dec 7, 2021
4e61dd8
Update src/libraries/Common/src/Interop/Unix/System.Native/Interop.Ge…
jkoritzinsky Dec 8, 2021
d949d7b
Fix bad definition of GetNodeName (C# char != native char, ref instea…
jkoritzinsky Dec 8, 2021
311568e
Merge branch 'misc-gendllimport' of github.com:jkoritzinsky/runtime i…
jkoritzinsky Dec 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/libraries/Common/src/Interop/Android/Interop.Logcat.cs
View file
Open in desktop
Expand Up @@ -8,8 +8,8 @@ internal static partial class Interop
{
internal static partial class Logcat
{
[DllImport(Libraries.Liblog)]
private static extern void __android_log_print(LogLevel level, string? tag, string format, string args, IntPtr ptr);
[GeneratedDllImport(Libraries.Liblog, CharSet = CharSet.Ansi)]
private static partial void __android_log_print(LogLevel level, string? tag, string format, string args, IntPtr ptr);

internal static void AndroidLogPrint(LogLevel level, string? tag, string message) =>
__android_log_print(level, tag, "%s", message, IntPtr.Zero);
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/Common/src/Interop/Interop.ICU.iOS.cs
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@ internal static partial class Interop
{
internal static partial class Globalization
{
[DllImport(Libraries.GlobalizationNative, EntryPoint = "GlobalizationNative_LoadICUData")]
[GeneratedDllImport(Libraries.GlobalizationNative, EntryPoint = "GlobalizationNative_LoadICUData", CharSet = CharSet.Ansi)]
internal static extern int LoadICUData(string path);
}
}
2 changes: 1 addition & 1 deletion src/libraries/Common/src/Interop/OSX/System.Native/Interop.SearchPath.cs
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@ internal static partial class Interop
{
internal static partial class Sys
{
[DllImport(Libraries.SystemNative, EntryPoint = "SystemNative_SearchPath")]
[GeneratedDllImport(Libraries.SystemNative, EntryPoint = "SystemNative_SearchPath", CharSet = CharSet.Ansi)]
internal static extern string? SearchPath(NSSearchPathDirectory folderId);

internal enum NSSearchPathDirectory
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/Common/src/Interop/OSX/System.Native/Interop.iOSSupportVersion.cs
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@ internal static partial class Interop
{
internal static partial class Sys
{
[DllImport(Libraries.SystemNative, EntryPoint = "SystemNative_iOSSupportVersion")]
internal static extern string iOSSupportVersion();
[GeneratedDllImport(Libraries.SystemNative, EntryPoint = "SystemNative_iOSSupportVersion", CharSet = CharSet.Ansi)]
internal static partial string iOSSupportVersion();
}
}
2 changes: 1 addition & 1 deletion src/libraries/Common/src/Interop/Unix/System.Native/Interop.GetNodeName.cs
View file
Open in desktop
Expand Up @@ -10,7 +10,7 @@ internal static partial class Interop
{
internal static partial class Sys
{
[DllImport(Libraries.SystemNative, EntryPoint = "SystemNative_GetNodeName", SetLastError = true)]
[GeneratedDllImport(Libraries.SystemNative, EntryPoint = "SystemNative_GetNodeName", SetLastError = true)]
private static extern unsafe int GetNodeName(char* name, out int len);

internal static unsafe string GetNodeName()
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/Common/src/Interop/Unix/System.Native/Interop.MemSet.cs
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@ internal static partial class Interop
{
internal static partial class Sys
{
[DllImport(Libraries.SystemNative, EntryPoint = "SystemNative_MemSet")]
[GeneratedDllImport(Libraries.SystemNative, EntryPoint = "SystemNative_MemSet")]
internal static extern unsafe void* MemSet(void *s, int c, UIntPtr n);
}
}
9 changes: 6 additions & 3 deletions src/libraries/Common/src/Interop/Windows/Advapi32/Interop.ChangeServiceConfig2.cs
View file
Open in desktop
Expand Up @@ -9,10 +9,13 @@ internal static partial class Interop
{
internal static partial class Advapi32
{
[DllImport(Libraries.Advapi32, CharSet = CharSet.Unicode, SetLastError = true)]
public static extern bool ChangeServiceConfig2(SafeServiceHandle serviceHandle, uint infoLevel, ref SERVICE_DESCRIPTION serviceDesc);
[GeneratedDllImport(Libraries.Advapi32, EntryPoint = "ChangeServiceConfig2W", SetLastError = true)]
jkoritzinsky marked this conversation as resolved.
Show resolved Hide resolved
public static partial bool ChangeServiceConfig2(SafeServiceHandle serviceHandle, uint infoLevel, ref SERVICE_DESCRIPTION serviceDesc);

[DllImport(Libraries.Advapi32, CharSet = CharSet.Unicode, SetLastError = true)]
#pragma warning disable DLLIMPORTGENANALYZER015 // Use 'GeneratedDllImportAttribute' instead of 'DllImportAttribute' to generate P/Invoke marshalling code at compile time
// TODO: [DllImportGenerator] Switch to use GeneratedDllImport once we support non-blittable types.
Copy link
Contributor

Choose a reason for hiding this comment

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

Would be better to reference tracking issue

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 is the comment pattern we've used even migrating over the rest of the DllImports, so I'd prefer to match that.

[DllImport(Libraries.Advapi32, EntryPoint = "ChangeServiceConfig2W", SetLastError = true)]
public static extern bool ChangeServiceConfig2(SafeServiceHandle serviceHandle, uint infoLevel, ref SERVICE_DELAYED_AUTOSTART_INFO serviceDesc);
#pragma warning restore DLLIMPORTGENANALYZER015
}
}
2 changes: 1 addition & 1 deletion src/libraries/Common/src/Interop/Windows/Advapi32/Interop.CreateService.cs
View file
Open in desktop
Expand Up @@ -9,7 +9,7 @@ internal static partial class Interop
{
internal static partial class Advapi32
{
[DllImport(Libraries.Advapi32, CharSet = CharSet.Unicode, SetLastError = true)]
[GeneratedDllImport(Libraries.Advapi32, CharSet = CharSet.Unicode, SetLastError = true)]
public static extern IntPtr CreateService(SafeServiceHandle databaseHandle, string serviceName, string displayName, int access, int serviceType,
int startType, int errorControl, string binaryPath, string loadOrderGroup, IntPtr pTagId, string dependencies,
string servicesStartName, string password);
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/Common/src/Interop/Windows/Advapi32/Interop.DeleteService.cs
View file
Open in desktop
Expand Up @@ -9,7 +9,7 @@ internal static partial class Interop
{
internal static partial class Advapi32
{
[DllImport(Libraries.Advapi32, CharSet = CharSet.Unicode, SetLastError = true)]
public static extern bool DeleteService(SafeServiceHandle serviceHandle);
[GeneratedDllImport(Libraries.Advapi32, SetLastError = true)]
public static partial bool DeleteService(SafeServiceHandle serviceHandle);
}
}
4 changes: 2 additions & 2 deletions src/libraries/Common/src/Interop/Windows/Kernel32/Interop.CheckTokenMembershipEx.cs
View file
Open in desktop
Expand Up @@ -11,7 +11,7 @@ internal static partial class Kernel32
{
internal const uint CTMF_INCLUDE_APPCONTAINER = 0x00000001;

[DllImport(Interop.Libraries.Kernel32, SetLastError = true)]
internal static extern bool CheckTokenMembershipEx(SafeAccessTokenHandle TokenHandle, byte[] SidToCheck, uint Flags, ref bool IsMember);
[GeneratedDllImport(Interop.Libraries.Kernel32, SetLastError = true)]
internal static partial bool CheckTokenMembershipEx(SafeAccessTokenHandle TokenHandle, byte[] SidToCheck, uint Flags, ref bool IsMember);
}
}
2 changes: 1 addition & 1 deletion src/libraries/Common/src/Interop/Windows/Kernel32/Interop.GlobalFree.cs
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@ internal static partial class Interop
{
internal static partial class Kernel32
{
[DllImport(Libraries.Kernel32, ExactSpelling = true, SetLastError = true)]
[GeneratedDllImport(Libraries.Kernel32, ExactSpelling = true, SetLastError = true)]
public static extern IntPtr GlobalFree(IntPtr handle);

public static IntPtr GlobalFree(HandleRef handle)
Expand Down
40 changes: 20 additions & 20 deletions src/libraries/Common/src/Interop/Windows/Kernel32/Interop.Threading.cs
View file
Open in desktop
Expand Up @@ -11,40 +11,40 @@ internal static partial class Kernel32
{
internal const int WAIT_FAILED = unchecked((int)0xFFFFFFFF);

[DllImport(Libraries.Kernel32)]
internal static extern uint WaitForMultipleObjectsEx(uint nCount, IntPtr lpHandles, BOOL bWaitAll, uint dwMilliseconds, BOOL bAlertable);
[GeneratedDllImport(Libraries.Kernel32)]
internal static partial uint WaitForMultipleObjectsEx(uint nCount, IntPtr lpHandles, BOOL bWaitAll, uint dwMilliseconds, BOOL bAlertable);

[DllImport(Libraries.Kernel32)]
internal static extern uint WaitForSingleObject(IntPtr hHandle, uint dwMilliseconds);
[GeneratedDllImport(Libraries.Kernel32)]
internal static partial uint WaitForSingleObject(IntPtr hHandle, uint dwMilliseconds);

[DllImport(Libraries.Kernel32)]
internal static extern uint SignalObjectAndWait(IntPtr hObjectToSignal, IntPtr hObjectToWaitOn, uint dwMilliseconds, BOOL bAlertable);
[GeneratedDllImport(Libraries.Kernel32)]
internal static partial uint SignalObjectAndWait(IntPtr hObjectToSignal, IntPtr hObjectToWaitOn, uint dwMilliseconds, BOOL bAlertable);

[DllImport(Libraries.Kernel32)]
internal static extern void Sleep(uint milliseconds);
[GeneratedDllImport(Libraries.Kernel32)]
internal static partial void Sleep(uint milliseconds);

internal const uint CREATE_SUSPENDED = 0x00000004;
internal const uint STACK_SIZE_PARAM_IS_A_RESERVATION = 0x00010000;

[DllImport(Libraries.Kernel32)]
internal static extern unsafe SafeWaitHandle CreateThread(
[GeneratedDllImport(Libraries.Kernel32)]
internal static unsafe partial SafeWaitHandle CreateThread(
IntPtr lpThreadAttributes,
IntPtr dwStackSize,
delegate* unmanaged<IntPtr, uint> lpStartAddress,
IntPtr lpParameter,
uint dwCreationFlags,
out uint lpThreadId);

[DllImport(Libraries.Kernel32)]
internal static extern uint ResumeThread(SafeWaitHandle hThread);
[GeneratedDllImport(Libraries.Kernel32)]
internal static partial uint ResumeThread(SafeWaitHandle hThread);

[DllImport(Libraries.Kernel32)]
internal static extern IntPtr GetCurrentThread();
[GeneratedDllImport(Libraries.Kernel32)]
internal static partial IntPtr GetCurrentThread();

internal const int DUPLICATE_SAME_ACCESS = 2;

[DllImport(Libraries.Kernel32, SetLastError = true)]
internal static extern bool DuplicateHandle(
[GeneratedDllImport(Libraries.Kernel32, SetLastError = true)]
internal static partial bool DuplicateHandle(
IntPtr hSourceProcessHandle,
IntPtr hSourceHandle,
IntPtr hTargetProcessHandle,
Expand All @@ -66,10 +66,10 @@ internal enum ThreadPriority : int
ErrorReturn = 0x7FFFFFFF
}

[DllImport(Libraries.Kernel32)]
internal static extern ThreadPriority GetThreadPriority(SafeWaitHandle hThread);
[GeneratedDllImport(Libraries.Kernel32)]
internal static partial ThreadPriority GetThreadPriority(SafeWaitHandle hThread);

[DllImport(Libraries.Kernel32)]
internal static extern bool SetThreadPriority(SafeWaitHandle hThread, int nPriority);
[GeneratedDllImport(Libraries.Kernel32)]
internal static partial bool SetThreadPriority(SafeWaitHandle hThread, int nPriority);
}
}
4 changes: 2 additions & 2 deletions src/libraries/Common/src/Interop/Windows/User32/Interop.GetDC.cs
View file
Open in desktop
Expand Up @@ -8,8 +8,8 @@ internal static partial class Interop
{
internal static partial class User32
{
[DllImport(Libraries.User32, ExactSpelling = true)]
public static extern IntPtr GetDC(IntPtr hWnd);
[GeneratedDllImport(Libraries.User32, ExactSpelling = true)]
jkoritzinsky marked this conversation as resolved.
Show resolved Hide resolved
public static partial IntPtr GetDC(IntPtr hWnd);

public static IntPtr GetDC(HandleRef hWnd)
{
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/Common/src/Interop/Windows/User32/Interop.ReleaseDC.cs
View file
Open in desktop
Expand Up @@ -8,8 +8,8 @@ internal static partial class Interop
{
internal static partial class User32
{
[DllImport(Libraries.User32, ExactSpelling = true)]
public static extern int ReleaseDC(IntPtr hWnd, IntPtr hDC);
[GeneratedDllImport(Libraries.User32, ExactSpelling = true)]
jkoritzinsky marked this conversation as resolved.
Show resolved Hide resolved
public static partial int ReleaseDC(IntPtr hWnd, IntPtr hDC);

public static int ReleaseDC(HandleRef hWnd, IntPtr hDC)
{
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/Common/src/Interop/Windows/User32/Interop.SystemParametersInfo.cs
View file
Open in desktop
Expand Up @@ -14,7 +14,7 @@ public enum SystemParametersAction : uint
SPI_GETNONCLIENTMETRICS = 0x29
}

[DllImport(Libraries.User32, ExactSpelling = true, CharSet = CharSet.Unicode)]
public static extern unsafe bool SystemParametersInfoW(SystemParametersAction uiAction, uint uiParam, void* pvParam, uint fWinIni);
[GeneratedDllImport(Libraries.User32, ExactSpelling = true)]
jkoritzinsky marked this conversation as resolved.
Show resolved Hide resolved
public static unsafe partial bool SystemParametersInfoW(SystemParametersAction uiAction, uint uiParam, void* pvParam, uint fWinIni);
}
}
4 changes: 2 additions & 2 deletions src/libraries/Common/src/Interop/Windows/User32/Interop.WindowFromDC.cs
View file
Open in desktop
Expand Up @@ -8,8 +8,8 @@ internal static partial class Interop
{
internal static partial class User32
{
[DllImport(Libraries.User32, ExactSpelling = true)]
public static extern IntPtr WindowFromDC(IntPtr hDC);
[GeneratedDllImport(Libraries.User32, ExactSpelling = true)]
jkoritzinsky marked this conversation as resolved.
Show resolved Hide resolved
public static partial IntPtr WindowFromDC(IntPtr hDC);

public static IntPtr WindowFromDC(HandleRef hDC)
{
Expand Down
8 changes: 4 additions & 4 deletions ...agnostics.Tracing.EventSource.Redist/src/Microsoft/Diagnostics/Tracing/StubEnvironment.cs
View file
Open in desktop
Expand Up @@ -65,10 +65,10 @@ internal static partial class Interop
[SuppressUnmanagedCodeSecurityAttribute]
internal static partial class Kernel32
{
[DllImport("kernel32.dll", CharSet = CharSet.Auto)]
internal static extern int GetCurrentThreadId();
[GeneratedDllImport("kernel32.dll")]
jkoritzinsky marked this conversation as resolved.
Show resolved Hide resolved
internal static partial int GetCurrentThreadId();

[DllImport("kernel32.dll", CharSet = CharSet.Auto)]
internal static extern uint GetCurrentProcessId();
[GeneratedDllImport("kernel32.dll")]
jkoritzinsky marked this conversation as resolved.
Show resolved Hide resolved
internal static partial uint GetCurrentProcessId();
}
}
4 changes: 2 additions & 2 deletions src/libraries/Microsoft.Extensions.Hosting.Systemd/src/SystemdHelpers.cs
View file
Open in desktop
Expand Up @@ -46,7 +46,7 @@ private static bool CheckParentIsSystemd()
return false;
}

[DllImport("libc", EntryPoint = "getppid")]
private static extern int GetParentPid();
[GeneratedDllImport("libc", EntryPoint = "getppid")]
private static partial int GetParentPid();
}
}