Skip to content

Use GeneratedDllImport in Microsoft.Extensions.Hosting.WindowsServices, System.Drawing.Primitives, System.Management, System.Security.Cryptography.ProtectedData, System.Speech, System.Windows.Extensions #61949

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

Merged
elinor-fung merged 8 commits into from
Nov 23, 2021
Merged

Use GeneratedDllImport in Microsoft.Extensions.Hosting.WindowsServices, System.Drawing.Primitives, System.Management, System.Security.Cryptography.ProtectedData, System.Speech, System.Windows.Extensions #61949

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
923d766
Use GeneratedDllImport in System.Windows.Extensions
elinor-fung Nov 22, 2021
c74d383
Move System.Speech p/invokes into common directory
elinor-fung Nov 22, 2021
9fbcbaf
Use GeneratedDllImport in System.Speech
elinor-fung Nov 22, 2021
5d52cbb
System.Security.Cryptography.ProtectedData
elinor-fung Nov 22, 2021
1ef89ec
Microsoft.Extensions.Hosting.WindowsServices
elinor-fung Nov 22, 2021
d0c9c52
System.Management
elinor-fung Nov 23, 2021
8debe77
System.Drawing.Primitives
elinor-fung Nov 23, 2021
93baf88
PR feedback
elinor-fung Nov 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use GeneratedDllImport in System.Speech
  • Loading branch information
@elinor-fung
elinor-fung committed Nov 22, 2021
commit 9fbcbafacfdc05f5e5929e58f120f6f90177a306
4 changes: 2 additions & 2 deletions src/libraries/Common/src/Interop/Windows/WinMm/Interop.waveOutClose.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ internal static partial class WinMM
/// <param name="hwo">Handle to the waveform-audio output device. If the function
/// succeeds, the handle is no longer valid after this call.</param>
/// <returns>MMSYSERR</returns>
[DllImport(Libraries.WinMM)]
internal static extern MMSYSERR waveOutClose(IntPtr hwo);
[GeneratedDllImport(Libraries.WinMM)]
internal static partial MMSYSERR waveOutClose(IntPtr hwo);
}
}
3 changes: 3 additions & 0 deletions src/libraries/Common/src/Interop/Windows/WinMm/Interop.waveOutGetDevCaps.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,10 @@ internal struct WAVEOUTCAPS
/// information about the capabilities of the device.</param>
/// <param name="cbwoc">Size, in bytes, of the WAVEOUTCAPS structure.</param>
/// <returns>MMSYSERR</returns>
#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.
[DllImport(Libraries.WinMM)]
internal static extern MMSYSERR waveOutGetDevCaps(IntPtr uDeviceID, ref WAVEOUTCAPS caps, int cbwoc);
#pragma warning restore DLLIMPORTGENANALYZER015
}
}
4 changes: 2 additions & 2 deletions src/libraries/Common/src/Interop/Windows/WinMm/Interop.waveOutGetNumDevs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ internal static partial class WinMM
/// </summary>
/// <returns>The number of devices indicates success. Zero indicates that
/// no devices are present or that an error occurred.</returns>
[DllImport(Libraries.WinMM)]
internal static extern int waveOutGetNumDevs();
[GeneratedDllImport(Libraries.WinMM)]
internal static partial int waveOutGetNumDevs();
}
}
4 changes: 2 additions & 2 deletions src/libraries/Common/src/Interop/Windows/WinMm/Interop.waveOutOpen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ internal enum MM_MSG
/// mechanism.</param>
/// <param name="fdwOpen">Flags for opening the device.</param>
/// <returns>MMSYSERR</returns>
[DllImport(Libraries.WinMM)]
internal static extern MMSYSERR waveOutOpen(ref IntPtr phwo, int uDeviceID, byte[] pwfx, WaveOutProc dwCallback, IntPtr dwInstance, uint fdwOpen);
[GeneratedDllImport(Libraries.WinMM)]
internal static partial MMSYSERR waveOutOpen(ref IntPtr phwo, int uDeviceID, byte[] pwfx, WaveOutProc dwCallback, IntPtr dwInstance, uint fdwOpen);
}
}
4 changes: 2 additions & 2 deletions src/libraries/Common/src/Interop/Windows/WinMm/Interop.waveOutPause.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ internal static partial class WinMM
/// </summary>
/// <param name="hwo">Handle to the waveform-audio output device.</param>
/// <returns>MMSYSERR</returns>
[DllImport(Libraries.WinMM)]
internal static extern MMSYSERR waveOutPause(IntPtr hwo);
[GeneratedDllImport(Libraries.WinMM)]
internal static partial MMSYSERR waveOutPause(IntPtr hwo);
}
}
8 changes: 4 additions & 4 deletions src/libraries/Common/src/Interop/Windows/WinMm/Interop.waveOutPrepareHeader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ internal struct WAVEHDR
/// respect to the sample size.</param>
/// <param name="cbwh">Size, in bytes, of the WaveHeader structure.</param>
/// <returns>MMSYSERR</returns>
[DllImport(Libraries.WinMM)]
internal static extern MMSYSERR waveOutPrepareHeader(IntPtr hwo, IntPtr pwh, int cbwh);
[GeneratedDllImport(Libraries.WinMM)]
internal static partial MMSYSERR waveOutPrepareHeader(IntPtr hwo, IntPtr pwh, int cbwh);

/// <summary>
/// This function cleans up the preparation performed by waveOutPrepareHeader.
Expand All @@ -46,7 +46,7 @@ internal struct WAVEHDR
/// to be cleaned up.</param>
/// <param name="cbwh">Size, in bytes, of the WaveHeader structure.</param>
/// <returns>MMSYSERR</returns>
[DllImport(Libraries.WinMM)]
internal static extern MMSYSERR waveOutUnprepareHeader(IntPtr hwo, IntPtr pwh, int cbwh);
[GeneratedDllImport(Libraries.WinMM)]
internal static partial MMSYSERR waveOutUnprepareHeader(IntPtr hwo, IntPtr pwh, int cbwh);
}
}
4 changes: 2 additions & 2 deletions src/libraries/Common/src/Interop/Windows/WinMm/Interop.waveOutReset.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ internal static partial class WinMM
/// </summary>
/// <param name="hwo">Handle to the waveform-audio output device.</param>
/// <returns>MMSYSERR</returns>
[DllImport(Libraries.WinMM)]
internal static extern MMSYSERR waveOutReset(IntPtr hwo);
[GeneratedDllImport(Libraries.WinMM)]
internal static partial MMSYSERR waveOutReset(IntPtr hwo);
}
}
4 changes: 2 additions & 2 deletions src/libraries/Common/src/Interop/Windows/WinMm/Interop.waveOutRestart.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ internal static partial class WinMM
/// </summary>
/// <param name="hwo">Handle to the waveform-audio output device.</param>
/// <returns>MMSYSERR</returns>
[DllImport(Libraries.WinMM)]
internal static extern MMSYSERR waveOutRestart(IntPtr hwo);
[GeneratedDllImport(Libraries.WinMM)]
internal static partial MMSYSERR waveOutRestart(IntPtr hwo);
}
}
4 changes: 2 additions & 2 deletions src/libraries/Common/src/Interop/Windows/WinMm/Interop.waveOutWrite.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ internal static partial class WinMM
/// about the data block.</param>
/// <param name="cbwh">Size, in bytes, of the WaveHeader structure.</param>
/// <returns>MMSYSERR</returns>
[DllImport(Libraries.WinMM)]
internal static extern MMSYSERR waveOutWrite(IntPtr hwo, IntPtr pwh, int cbwh);
[GeneratedDllImport(Libraries.WinMM)]
internal static partial MMSYSERR waveOutWrite(IntPtr hwo, IntPtr pwh, int cbwh);
}
}
6 changes: 4 additions & 2 deletions src/libraries/System.Speech/src/System.Speech.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
<TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0</TargetFrameworks>
<!-- CS0649: uninitialized interop type fields -->
<!-- SA1129: https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/3277 -->
<NoWarn>$(NoWarn);CS0649;SA1129;CA1847</NoWarn>
<!-- CA1846: Prefer 'AsSpan' over 'Substring' when span-based overloads are available -->
<NoWarn>$(NoWarn);CS0649;SA1129;CA1846;CA1847</NoWarn>
<Nullable>annotations</Nullable>
<SetIsTrimmable>false</SetIsTrimmable>
<IsPackable>true</IsPackable>
Expand Down Expand Up @@ -259,14 +260,15 @@ System.Speech.Recognition.SpeechRecognizer</PackageDescription>
<Reference Include="System.Diagnostics.Debug" />
<Reference Include="System.Diagnostics.TraceSource" />
<Reference Include="System.IO.FileSystem" />
<Reference Include="System.Memory" />
<Reference Include="System.Net.Primitives" />
<Reference Include="System.Net.Requests" />
<Reference Include="System.Net.WebClient" />
<Reference Include="System.ObjectModel" />
<Reference Include="System.Resources.ResourceManager" />
<Reference Include="System.Runtime" />
<Reference Include="System.Runtime.Extensions" />
<Reference Include="System.Runtime.InteropServices" />
<Reference Include="System.Runtime.CompilerServices.Unsafe" />
<Reference Include="System.Runtime.InteropServices" />
<Reference Include="System.Runtime.Serialization.Formatters" />
<Reference Include="System.Threading" />
Expand Down