Use GeneratedDllImport in System.DirectoryServices #61975
Conversation
elinor-fung
force-pushed
the
convertSystemDirectoryServices
branch
from
ace3523 to
8b3815e
Compare
| public int wki100_ver_minor; | ||
| }; | ||
|
|
||
| [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)] |
There was a problem hiding this comment.
Is the CharSet needed here?
| using System.Text; | ||
| using System.Diagnostics.CodeAnalysis; | ||
|
|
||
| using Kernel32 = Interop.Kernel32; |
There was a problem hiding this comment.
We generally don't do this elsewhere. Can we just spell out Interop.Kernel32 at each use site?
There was a problem hiding this comment.
I did it because there is also System.DirectoryServices.Interop and having global::Interop.* everywhere looked obnoxious to me. I can do global::Interop.* at each use site if that is preferred.
| using Microsoft.Win32.SafeHandles; | ||
|
|
||
| using Advapi32 = Interop.Advapi32; | ||
| using Kernel32 = Interop.Kernel32; |
| [DllImport(global::Interop.Libraries.Kernel32, EntryPoint = "GetVersionExW", CharSet = CharSet.Unicode, SetLastError = true)] | ||
| internal static extern bool GetVersionEx( | ||
| [In, Out] OSVersionInfoEx ver); | ||
| [GeneratedDllImport(global::Interop.Libraries.Dnsapi, CharSet = CharSet.Unicode)] |
There was a problem hiding this comment.
Why is the global:: needed on all of these?
There was a problem hiding this comment.
Yeah, I had wondered the same thing - there's a System.DirectoryServices.Interop, so these all had the global::
| internal static partial uint LsaCallAuthenticationPackage( | ||
| LsaLogonProcessSafeHandle lsaHandle, | ||
| int authenticationPackage, | ||
| in NegotiateCallerNameRequest protocolSubmitBuffer, |
There was a problem hiding this comment.
How are we choosing when to use 'in' and when to use 'ref'? There was another recent PR where this was discussed and IIRC that one stayed ref even though it was previously similarly '[In]'.
There was a problem hiding this comment.
It has been somewhat opportunistic on our end as a 'could be nice to do' thing where we change it if we notice it would make sense to be in instead of ref (in a recent PR, when @jkoritzinsky pointed it out, I did switch the ref to in).
src/libraries/Common/src/Microsoft/Win32/SafeHandles/SafeLibraryHandle.cs
Show resolved
Hide resolved
jkoritzinsky
left a comment
jkoritzinsky
left a comment
There was a problem hiding this comment.
LGTM once @stephentoub's feedback is resolved.
ghost
locked as resolved and limited conversation to collaborators
3 participants
I didn't try to move all the existing p/invokes into Common - that can be done separately. I wanted to get through the switch to
GeneratedDllImportfirst.@AaronRobinsonMSFT @jkoritzinsky