Merge commit '34122aa9b03145f73bf910ee6753d3e32508875c'

Author: Mirroring

src/System.Private.Windows.Core/src/Windows/Win32/System/Com/ComManagedStream.cs

@@ -19,6 +19,7 @@ internal ComManagedStream(Stream stream, bool makeSeekable = false)
             // Copy to a memory stream so we can seek
             MemoryStream memoryStream = new();
             stream.CopyTo(memoryStream);
+            memoryStream.Seek(0, SeekOrigin.Begin);
             _dataStream = memoryStream;
         }
         else

src/System.Private.Windows.Core/tests/System.Private.Windows.Core.Tests/Windows/Win32/System/Com/ComManagedStreamTests.cs

@@ -0,0 +1,36 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Windows.Win32.System.Com.Tests;
+
+public class ComManagedStreamTests
+{
+    [Fact]
+    public void Ctor_NonSeekableStream_WrapsWithSeekableStreamAtPositionZero()
+    {
+        using TestStream nonSeekableStream = new(canSeek: false, numBytes: 4);
+        ComManagedStream comManagedStream = new(nonSeekableStream, makeSeekable: true);
+        comManagedStream.GetDataStream().CanSeek.Should().Be(true);
+        comManagedStream.GetDataStream().Position.Should().Be(0);
+    }
+
+    [Fact]
+    public void Ctor_SeekableStream_UsesOriginalStream()
+    {
+        using TestStream seekableStream = new(canSeek: true, numBytes: 4);
+        ComManagedStream comManagedStream = new(seekableStream, makeSeekable: true);
+        comManagedStream.GetDataStream().Should().BeSameAs(seekableStream);
+    }
+
+    private class TestStream : MemoryStream
+    {
+        private readonly bool _canSeek;
+
+        public override bool CanSeek => _canSeek;
+
+        public TestStream(bool canSeek, int numBytes) : base(new byte[numBytes])
+        {
+            _canSeek = canSeek;
+        }
+    }
+}