Skip to content

Commit 25e0405

Browse files
authored
Merge pull request #1396 from microsoft/renovate/microsoft.windows.cswin32-0.x
Update dependency Microsoft.Windows.CsWin32 to 0.3.162
2 parents 0b7ee6f + 15cfcdb commit 25e0405

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

Directory.Packages.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<PackageVersion Include="Microsoft.VisualStudio.Shell.Framework" Version="17.4.33103.184" />
3232
<PackageVersion Include="Microsoft.VisualStudio.Validation" Version="17.8.8" />
3333
<PackageVersion Include="Microsoft.Win32.Registry" Version="5.0.0" />
34-
<PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.3.106" />
34+
<PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.3.162" />
3535
<PackageVersion Include="Nullable" Version="1.3.1" />
3636
<PackageVersion Include="System.Collections.Immutable" Version="8.0.0" />
3737
<PackageVersion Include="System.Memory" Version="4.6.0" />

src/Microsoft.VisualStudio.Threading/NoMessagePumpSyncContext.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public static SynchronizationContext Default
4747
/// <returns>
4848
/// The array index of the object that satisfied the wait.
4949
/// </returns>
50-
public override int Wait(IntPtr[] waitHandles, bool waitAll, int millisecondsTimeout)
50+
public override unsafe int Wait(IntPtr[] waitHandles, bool waitAll, int millisecondsTimeout)
5151
{
5252
Requires.NotNull(waitHandles, nameof(waitHandles));
5353

@@ -61,7 +61,10 @@ public override int Wait(IntPtr[] waitHandles, bool waitAll, int millisecondsTim
6161
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
6262
#endif
6363
{
64-
return (int)PInvoke.WaitForMultipleObjects(MemoryMarshal.Cast<IntPtr, HANDLE>(waitHandles), waitAll, (uint)millisecondsTimeout);
64+
fixed (IntPtr* pHandles = waitHandles)
65+
{
66+
return (int)PInvoke.WaitForMultipleObjects((uint)waitHandles.Length, (HANDLE*)pHandles, waitAll, (uint)millisecondsTimeout);
67+
}
6568
}
6669
else
6770
{

0 commit comments

Comments
 (0)