Fix ArgumentException with FromWidth/Height options in InteropBitmap

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/BitmapSizeOptions.cs

@@ -189,25 +189,21 @@ public static BitmapSizeOptions FromRotation(Rotation rotation)
 
         // Note: In this method, newWidth, newHeight are not affected by the
         // rotation angle.
-        internal void GetScaledWidthAndHeight(
-            uint width,
-            uint height,
-            out uint newWidth,
-            out uint newHeight)
+        internal void GetScaledWidthAndHeight(uint width, uint height, out uint newWidth, out uint newHeight)
         {
             if (_pixelWidth == 0 && _pixelHeight != 0)
             {
                 Debug.Assert(_preservesAspectRatio == true);
 
-                newWidth = (uint)((_pixelHeight * width)/height);
+                newWidth = (uint)((_pixelHeight * width) / height);
                 newHeight = (uint)_pixelHeight;
             }
             else if (_pixelWidth != 0 && _pixelHeight == 0)
             {
                 Debug.Assert(_preservesAspectRatio == true);
 
                 newWidth = (uint)_pixelWidth;
-                newHeight = (uint)((_pixelWidth * height)/width);
+                newHeight = (uint)((_pixelWidth * height) / width);
             }
             else if (_pixelWidth != 0 && _pixelHeight != 0)
             {

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/InteropBitmapSource.cs

@@ -368,17 +368,21 @@ internal override void FinalizeCreation()
                     if (_sizeOptions.DoesScale)
                     {
                         Debug.Assert(_sizeOptions.Rotation == Rotation.Rotate0);
+
                         uint width, height;
 
-                        _sizeOptions.GetScaledWidthAndHeight(
-                            (uint)_sizeOptions.PixelWidth,
-                            (uint)_sizeOptions.PixelHeight,
-                            out width,
-                            out height);
+                        // In case the source clip is Int32.Empty but we're asked to scale, we must scale the original source values
+                        if (_sourceRect.IsEmpty)
+                        {
+                            HRESULT.Check(UnsafeNativeMethods.WICBitmapSource.GetSize(_unmanagedSource, out width, out height));
+                            _sizeOptions.GetScaledWidthAndHeight(width, height, out width, out height);
+                        }
+                        else
+                        {
+                            _sizeOptions.GetScaledWidthAndHeight((uint)_sourceRect.Width, (uint)_sourceRect.Height, out width, out height);
+                        }
 
-                        HRESULT.Check(UnsafeNativeMethods.WICImagingFactory.CreateBitmapScaler(
-                                wicFactory,
-                                out wicTransformer));
+                        HRESULT.Check(UnsafeNativeMethods.WICImagingFactory.CreateBitmapScaler(wicFactory, out wicTransformer));
 
                         lock (_syncObject)
                         {

src/Microsoft.DotNet.Wpf/tests/UnitTests/PresentationCore.Tests/NativeMethods.txt

@@ -0,0 +1,2 @@
+DeleteObject
+DestroyIcon

src/Microsoft.DotNet.Wpf/tests/UnitTests/PresentationCore.Tests/PresentationCore.Tests.csproj

@@ -28,6 +28,10 @@
     <MicrosoftPrivateWinFormsReference Include="System.Private.Windows.Core" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Windows.CsWin32" Version="$(MicrosoftWindowsCsWin32PackageVersion)" PrivateAssets="all" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Moq" Version="$(MoqPackageVersion)" />
     <PackageReference Include="xunit.stafact" Version="$(XUnitStaFactPackageVersion)" />