Windows specific cleanups

src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj

@@ -5,11 +5,6 @@
     <PackageId>Avalonia.Direct2D1</PackageId>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="..\Avalonia.Win32\Interop\UnmanagedMethods.cs">
-      <Link>UnmanagedMethods.cs</Link>
-    </Compile>
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\packages\Avalonia\Avalonia.csproj" />
     <ProjectReference Include="..\Avalonia.Win32\Avalonia.Win32.csproj" />
@@ -22,6 +17,7 @@
   <ItemGroup Label="InternalsVisibleTo">
     <InternalsVisibleTo Include="Avalonia.Direct2D1.RenderTests, PublicKey=$(AvaloniaPublicKey)" />
     <InternalsVisibleTo Include="Avalonia.Direct2D1.UnitTests, PublicKey=$(AvaloniaPublicKey)" />
+    <InternalsVisibleTo Include="Avalonia.Win32.Interop, PublicKey=$(AvaloniaPublicKey)"/>
   </ItemGroup>
 
   <ItemGroup>

src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs

@@ -27,7 +27,7 @@ namespace Avalonia
 
 namespace Avalonia.Direct2D1
 {
-    public class Direct2D1Platform : IPlatformRenderInterface
+    internal class Direct2D1Platform : IPlatformRenderInterface
     {
         private static readonly Direct2D1Platform s_instance = new Direct2D1Platform();
 

src/Windows/Avalonia.Direct2D1/Disposable.cs

@@ -1,33 +0,0 @@
-using System;
-
-namespace Avalonia.Direct2D1
-{
-    public class Disposable<T> : IDisposable where T : IDisposable
-    {
-        private readonly IDisposable _extra;
-
-        public Disposable(T inner)
-        {
-            Inner = inner;
-        }
-
-        public Disposable(T inner, IDisposable extra)
-        {
-            Inner = inner;
-            _extra = extra;
-        }
-
-        public T Inner { get; }
-
-        public static implicit operator T(Disposable<T> i)
-        {
-            return i.Inner;
-        }
-
-        public void Dispose()
-        {
-            Inner.Dispose();
-            _extra?.Dispose();
-        }
-    }
-}

src/Windows/Avalonia.Direct2D1/ILayerFactory.cs

@@ -2,7 +2,7 @@
 
 namespace Avalonia.Direct2D1
 {
-    public interface ILayerFactory
+    internal interface ILayerFactory
     {
         IDrawingContextLayerImpl CreateLayer(Size size);
     }

src/Windows/Avalonia.Direct2D1/Media/BrushImpl.cs

@@ -1,10 +1,8 @@
 using System;
-using Avalonia.Metadata;
 
 namespace Avalonia.Direct2D1.Media
 {
-    [Unstable]
+    internal abstract class BrushImpl : IDisposable
-    public abstract class BrushImpl : IDisposable
     {
         public SharpDX.Direct2D1.Brush PlatformBrush { get; set; }
 

src/Windows/Avalonia.Direct2D1/Media/DWriteResourceFontFileEnumerator.cs

@@ -6,7 +6,7 @@ namespace Avalonia.Direct2D1.Media
     /// <summary>
     /// Resource FontFileEnumerator.
     /// </summary>
-    public class DWriteResourceFontFileEnumerator : CallbackBase, FontFileEnumerator
+    internal class DWriteResourceFontFileEnumerator : CallbackBase, FontFileEnumerator
     {
         private readonly Factory _factory;
         private readonly FontFileLoader _loader;
@@ -64,4 +64,4 @@ namespace Avalonia.Direct2D1.Media
             }
         }
     }
-}
+}

src/Windows/Avalonia.Direct2D1/Media/DWriteResourceFontFileStream.cs

@@ -7,7 +7,7 @@ namespace Avalonia.Direct2D1.Media
     /// <summary>
     /// This FontFileStream implementation is reading data from a <see cref="DataStream"/>.
     /// </summary>
-    public class DWriteResourceFontFileStream : CallbackBase, FontFileStream
+    internal class DWriteResourceFontFileStream : CallbackBase, FontFileStream
     {
         private readonly DataStream _stream;
 

src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs

@@ -11,15 +11,13 @@ using SharpDX;
 using SharpDX.Direct2D1;
 using SharpDX.Mathematics.Interop;
 using BitmapInterpolationMode = Avalonia.Media.Imaging.BitmapInterpolationMode;
-using Avalonia.Metadata;
 
 namespace Avalonia.Direct2D1.Media
 {
     /// <summary>
     /// Draws using Direct2D1.
     /// </summary>
-    [Unstable]
+    internal class DrawingContextImpl : IDrawingContextImpl
-    public class DrawingContextImpl : IDrawingContextImpl
     {
         private readonly IVisualBrushRenderer _visualBrushRenderer;
         private readonly ILayerFactory _layerFactory;

src/Windows/Avalonia.Direct2D1/Media/GeometryImpl.cs

@@ -1,5 +1,4 @@
 using Avalonia.Logging;
-using Avalonia.Metadata;
 using Avalonia.Platform;
 using SharpDX.Direct2D1;
 
@@ -8,8 +7,7 @@ namespace Avalonia.Direct2D1.Media
     /// <summary>
     /// The platform-specific interface for <see cref="Avalonia.Media.Geometry"/>.
     /// </summary>
-    [Unstable]
+    internal abstract class GeometryImpl : IGeometryImpl
-    public abstract class GeometryImpl : IGeometryImpl
     {
         private const float ContourApproximation = 0.0001f;
 

src/Windows/Avalonia.Direct2D1/Media/GlyphTypefaceImpl.cs

@@ -1,6 +1,5 @@
 using System;
 using Avalonia.Media;
-using Avalonia.Metadata;
 using HarfBuzzSharp;
 using SharpDX.DirectWrite;
 using FontMetrics = Avalonia.Media.FontMetrics;
@@ -9,8 +8,7 @@ using GlyphMetrics = Avalonia.Media.GlyphMetrics;
 
 namespace Avalonia.Direct2D1.Media
 {
-    [Unstable]
+    internal class GlyphTypefaceImpl : IGlyphTypeface
-    public class GlyphTypefaceImpl : IGlyphTypeface
     {
         private bool _isDisposed;
 

src/Windows/Avalonia.Direct2D1/Media/ImageBrushImpl.cs

@@ -1,13 +1,11 @@
 using Avalonia.Media;
-using Avalonia.Metadata;
 using Avalonia.Rendering.Utilities;
 using Avalonia.Utilities;
 using SharpDX.Direct2D1;
 
 namespace Avalonia.Direct2D1.Media
 {
-    [Unstable]
+    internal sealed class ImageBrushImpl : BrushImpl
-    public sealed class ImageBrushImpl : BrushImpl
     {
         private readonly OptionalDispose<Bitmap> _bitmap;
 

src/Windows/Avalonia.Direct2D1/Media/Imaging/BitmapImpl.cs

@@ -1,13 +1,11 @@
 using System;
 using System.IO;
-using Avalonia.Metadata;
 using Avalonia.Platform;
 using D2DBitmap = SharpDX.Direct2D1.Bitmap;
 
 namespace Avalonia.Direct2D1.Media
 {
-    [Unstable]
+    internal abstract class BitmapImpl : IBitmapImpl, IDisposable
-    public abstract class BitmapImpl : IBitmapImpl, IDisposable
     {
         public abstract Vector Dpi { get; }
         public abstract PixelSize PixelSize { get; }

src/Windows/Avalonia.Direct2D1/Media/Imaging/D2DBitmapImpl.cs

@@ -1,6 +1,5 @@
 using System;
 using System.IO;
-using Avalonia.Metadata;
 using SharpDX.WIC;
 using Bitmap = SharpDX.Direct2D1.Bitmap;
 
@@ -9,8 +8,7 @@ namespace Avalonia.Direct2D1.Media
     /// <summary>
     /// A Direct2D Bitmap implementation that uses a GPU memory bitmap as its image.
     /// </summary>
-    [Unstable]
+    internal class D2DBitmapImpl : BitmapImpl
-    public class D2DBitmapImpl : BitmapImpl
     {
         private readonly Bitmap _direct2DBitmap;
 

src/Windows/Avalonia.Direct2D1/Media/Imaging/D2DRenderTargetBitmapImpl.cs

@@ -1,6 +1,5 @@
 using System;
 using System.IO;
-using Avalonia.Metadata;
 using Avalonia.Platform;
 using Avalonia.Rendering;
 using Avalonia.Utilities;
@@ -10,8 +9,7 @@ using D2DBitmap = SharpDX.Direct2D1.Bitmap;
 
 namespace Avalonia.Direct2D1.Media.Imaging
 {
-    [Unstable]
+    internal class D2DRenderTargetBitmapImpl : D2DBitmapImpl, IDrawingContextLayerImpl, ILayerFactory
-    public class D2DRenderTargetBitmapImpl : D2DBitmapImpl, IDrawingContextLayerImpl, ILayerFactory
     {
         private readonly BitmapRenderTarget _renderTarget;
 

src/Windows/Avalonia.Direct2D1/Media/Imaging/WicBitmapImpl.cs

@@ -6,7 +6,6 @@ using SharpDX.WIC;
 using APixelFormat = Avalonia.Platform.PixelFormat;
 using AlphaFormat = Avalonia.Platform.AlphaFormat;
 using D2DBitmap = SharpDX.Direct2D1.Bitmap;
-using Avalonia.Metadata;
 using Avalonia.Platform;
 using PixelFormat = SharpDX.WIC.PixelFormat;
 
@@ -15,8 +14,7 @@ namespace Avalonia.Direct2D1.Media
     /// <summary>
     /// A WIC implementation of a <see cref="Avalonia.Media.Imaging.Bitmap"/>.
     /// </summary>
-    [Unstable]
+    internal class WicBitmapImpl : BitmapImpl, IReadableBitmapImpl
-    public class WicBitmapImpl : BitmapImpl, IReadableBitmapImpl
     {
         private readonly BitmapDecoder _decoder;
 

src/Windows/Avalonia.Direct2D1/Media/Imaging/WicRenderTargetBitmapImpl.cs

@@ -1,13 +1,11 @@
 using System;
-using Avalonia.Metadata;
 using Avalonia.Platform;
 using Avalonia.Rendering;
 using SharpDX.Direct2D1;
 
 namespace Avalonia.Direct2D1.Media
 {
-    [Unstable]
+    internal class WicRenderTargetBitmapImpl : WicBitmapImpl, IDrawingContextLayerImpl
-    public class WicRenderTargetBitmapImpl : WicBitmapImpl, IDrawingContextLayerImpl
     {
         private readonly WicRenderTarget _renderTarget;
 

src/Windows/Avalonia.Direct2D1/Media/Imaging/WriteableWicBitmapImpl.cs

@@ -6,7 +6,7 @@ using PixelFormat = Avalonia.Platform.PixelFormat;
 
 namespace Avalonia.Direct2D1.Media.Imaging
 {
-    class WriteableWicBitmapImpl : WicBitmapImpl, IWriteableBitmapImpl
+    internal class WriteableWicBitmapImpl : WicBitmapImpl, IWriteableBitmapImpl
     {
         public WriteableWicBitmapImpl(Stream stream, int decodeSize, bool horizontal,
             Avalonia.Media.Imaging.BitmapInterpolationMode interpolationMode)

src/Windows/Avalonia.Direct2D1/Media/LinearGradientBrushImpl.cs

@@ -1,11 +1,9 @@
 using System.Linq;
 using Avalonia.Media;
-using Avalonia.Metadata;
 
 namespace Avalonia.Direct2D1.Media
 {
-    [Unstable]
+    internal class LinearGradientBrushImpl : BrushImpl
-    public class LinearGradientBrushImpl : BrushImpl
     {
         public LinearGradientBrushImpl(
             ILinearGradientBrush brush,

src/Windows/Avalonia.Direct2D1/Media/RadialGradientBrushImpl.cs

@@ -1,11 +1,9 @@
 using System.Linq;
 using Avalonia.Media;
-using Avalonia.Metadata;
 
 namespace Avalonia.Direct2D1.Media
 {
-    [Unstable]
+    internal class RadialGradientBrushImpl : BrushImpl
-    public class RadialGradientBrushImpl : BrushImpl
     {
         public RadialGradientBrushImpl(
             IRadialGradientBrush brush,

src/Windows/Avalonia.Direct2D1/Media/SolidColorBrushImpl.cs

@@ -1,10 +1,8 @@
 using Avalonia.Media;
-using Avalonia.Metadata;
 
 namespace Avalonia.Direct2D1.Media
 {
-    [Unstable]
+    internal class SolidColorBrushImpl : BrushImpl
-    public class SolidColorBrushImpl : BrushImpl
     {
         public SolidColorBrushImpl(ISolidColorBrush brush, SharpDX.Direct2D1.RenderTarget target)
         {

src/Windows/Avalonia.Direct2D1/Media/StreamGeometryContextImpl.cs

@@ -9,8 +9,7 @@ using SweepDirection = SharpDX.Direct2D1.SweepDirection;
 
 namespace Avalonia.Direct2D1.Media
 {
-    [Unstable]
+    internal class StreamGeometryContextImpl : IStreamGeometryContextImpl
-    public class StreamGeometryContextImpl : IStreamGeometryContextImpl
     {
         private readonly GeometrySink _sink;
 

src/Windows/Avalonia.Direct2D1/Media/StreamGeometryImpl.cs

@@ -1,4 +1,3 @@
-using Avalonia.Metadata;
 using Avalonia.Platform;
 using SharpDX.Direct2D1;
 
@@ -7,8 +6,7 @@ namespace Avalonia.Direct2D1.Media
     /// <summary>
     /// A Direct2D implementation of a <see cref="Avalonia.Media.StreamGeometry"/>.
     /// </summary>
-    [Unstable]
+    internal class StreamGeometryImpl : GeometryImpl, IStreamGeometryImpl
-    public class StreamGeometryImpl : GeometryImpl, IStreamGeometryImpl
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="StreamGeometryImpl"/> class.

src/Windows/Avalonia.Direct2D1/Media/TransformedGeometryImpl.cs

@@ -1,11 +1,9 @@
-using Avalonia.Metadata;
 using Avalonia.Platform;
 using SharpDX.Direct2D1;
 
 namespace Avalonia.Direct2D1.Media
 {
-    [Unstable]
+    internal class TransformedGeometryImpl : GeometryImpl, ITransformedGeometryImpl
-    public class TransformedGeometryImpl : GeometryImpl, ITransformedGeometryImpl
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="StreamGeometryImpl"/> class.

src/Windows/Avalonia.Direct2D1/OptionalDispose.cs

@@ -2,7 +2,7 @@
 
 namespace Avalonia.Direct2D1
 {
-    public readonly record struct OptionalDispose<T> : IDisposable where T : IDisposable
+    internal readonly record struct OptionalDispose<T> : IDisposable where T : IDisposable
     {
         private readonly bool _dispose;
 

src/Windows/Avalonia.Direct2D1/PrimitiveExtensions.cs

@@ -8,7 +8,7 @@ using DWrite = SharpDX.DirectWrite;
 
 namespace Avalonia.Direct2D1
 {
-    public static class PrimitiveExtensions
+    internal static class PrimitiveExtensions
     {
         /// <summary>
         /// The value for which all absolute numbers smaller than are considered equal to zero.

src/Windows/Avalonia.Direct2D1/RenderTarget.cs

@@ -5,7 +5,7 @@ using Avalonia.Rendering;
 
 namespace Avalonia.Direct2D1
 {
-    public class RenderTarget : IRenderTarget, ILayerFactory
+    internal class RenderTarget : IRenderTarget, ILayerFactory
     {
         /// <summary>
         /// The render target.

src/Windows/Avalonia.Direct2D1/SwapChainRenderTarget.cs

@@ -8,7 +8,7 @@ using SharpDX.DXGI;
 
 namespace Avalonia.Direct2D1
 {   
-    public abstract class SwapChainRenderTarget : IRenderTarget, ILayerFactory
+    internal abstract class SwapChainRenderTarget : IRenderTarget, ILayerFactory
     {
         private Size2 _savedSize;
         private Size2F _savedDpi;

src/Windows/Avalonia.Win32/Avalonia.Win32.csproj

@@ -29,5 +29,6 @@
   </PropertyGroup>
   <ItemGroup>
     <InternalsVisibleTo Include="Avalonia.Win32.Interop, PublicKey=$(AvaloniaPublicKey)"/>
+    <InternalsVisibleTo Include="Avalonia.Direct2D1, PublicKey=$(AvaloniaPublicKey)"/>
   </ItemGroup>
 </Project>

src/Windows/Avalonia.Win32/DirectX/DirectXStructs.cs

@@ -5,7 +5,7 @@ using static Avalonia.Win32.Interop.UnmanagedMethods;
 
 namespace Avalonia.Win32.DirectX
 {
-    public unsafe struct HANDLE
+    internal unsafe struct HANDLE
     {
         public readonly void* Value;
 

src/Windows/Avalonia.Win32/DirectX/DxgiConnection.cs

@@ -9,7 +9,7 @@ using MicroCom.Runtime;
 
 namespace Avalonia.Win32.DirectX
 {
-    public unsafe class DxgiConnection : IRenderTimer
+    internal unsafe class DxgiConnection : IRenderTimer
     {
         public const uint ENUM_CURRENT_SETTINGS = unchecked((uint)(-1));
 

src/Windows/Avalonia.Win32/DirectX/DxgiRenderTarget.cs

@@ -7,7 +7,7 @@ using static Avalonia.Win32.Interop.UnmanagedMethods;
 
 namespace Avalonia.Win32.DirectX
 {
-    public unsafe class DxgiRenderTarget : EglPlatformSurfaceRenderTargetBase
+    internal unsafe class DxgiRenderTarget : EglPlatformSurfaceRenderTargetBase
     {
         // DXGI_FORMAT_B8G8R8A8_UNORM is target texture format as per ANGLE documentation 
 

src/Windows/Avalonia.Win32/DirectX/DxgiSwapchainWindow.cs

@@ -9,7 +9,7 @@ using Avalonia.OpenGL.Surfaces;
 
 namespace Avalonia.Win32.DirectX
 {
-    public class DxgiSwapchainWindow : EglGlPlatformSurfaceBase
+    internal class DxgiSwapchainWindow : EglGlPlatformSurfaceBase
     {
         private DxgiConnection _connection;
         private EglGlPlatformSurface.IEglWindowGlPlatformSurfaceInfo _window;

src/Windows/Avalonia.Win32/PlatformConstants.cs

@@ -7,7 +7,7 @@ namespace Avalonia.Win32
         public const string WindowHandleType = "HWND";
         public const string CursorHandleType = "HCURSOR";
 
-        public static readonly Version Windows8 = new Version(6, 2);
+        internal static readonly Version Windows8 = new Version(6, 2);
-        public static readonly Version Windows7 = new Version(6, 1);
+        internal static readonly Version Windows7 = new Version(6, 1);
     }
 }

src/Windows/Avalonia.Win32/ScreenImpl.cs

@@ -7,8 +7,7 @@ using static Avalonia.Win32.Interop.UnmanagedMethods;
 
 namespace Avalonia.Win32
 {
-    [Unstable]
+    internal class ScreenImpl : IScreenImpl
-    public class ScreenImpl : IScreenImpl
     {
         private Screen[]? _allScreens;
 

src/Windows/Avalonia.Win32/TrayIconImpl.cs

@@ -13,8 +13,7 @@ using static Avalonia.Win32.Interop.UnmanagedMethods;
 
 namespace Avalonia.Win32
 {
-    [Unstable]
+    internal class TrayIconImpl : ITrayIconImpl
-    public class TrayIconImpl : ITrayIconImpl
     {
         private static readonly IntPtr s_emptyIcon = new System.Drawing.Bitmap(32, 32).GetHicon();
         private readonly int _uniqueId;

src/Windows/Avalonia.Win32/Win32Platform.cs

@@ -107,7 +107,7 @@ namespace Avalonia
 
 namespace Avalonia.Win32
 {
-    public class Win32Platform : IPlatformThreadingInterface, IWindowingPlatform, IPlatformIconLoader, IPlatformLifetimeEventsImpl
+    internal class Win32Platform : IPlatformThreadingInterface, IWindowingPlatform, IPlatformIconLoader, IPlatformLifetimeEventsImpl
     {
         private static readonly Win32Platform s_instance = new();
         private static Thread? s_uiThread;

src/Windows/Avalonia.Win32/WinRT/IBlurHost.cs

@@ -1,6 +1,6 @@
 namespace Avalonia.Win32.WinRT
 {
-    public enum BlurEffect
+    internal enum BlurEffect
     {
         None,
         Acrylic,

src/Windows/Avalonia.Win32/WinRT/WinRTColor.cs

@@ -4,7 +4,7 @@ using Avalonia.Media;
 namespace Avalonia.Win32.WinRT
 {
     [StructLayout(LayoutKind.Sequential, Pack = 1)]
-    public record struct WinRTColor
+    internal record struct WinRTColor
     {
         public byte A;
         public byte R;

src/Windows/Avalonia.Win32/WinScreen.cs

@@ -3,7 +3,7 @@ using Avalonia.Platform;
 
 namespace Avalonia.Win32
 {
-    public class WinScreen : Screen
+    internal class WinScreen : Screen
     {
         private readonly IntPtr _hMonitor;
 

src/Windows/Avalonia.Win32/WindowImpl.AppWndProc.cs

@@ -15,7 +15,7 @@ using static Avalonia.Win32.Interop.UnmanagedMethods;
 
 namespace Avalonia.Win32
 {
-    public partial class WindowImpl
+    internal partial class WindowImpl
     {
         [SuppressMessage("Microsoft.StyleCop.CSharp.NamingRules", "SA1305:FieldNamesMustNotUseHungarianNotation",
             Justification = "Using Win32 naming for consistency.")]

src/Windows/Avalonia.Win32/WindowImpl.CustomCaptionProc.cs

@@ -5,7 +5,7 @@ using static Avalonia.Win32.Interop.UnmanagedMethods;
 
 namespace Avalonia.Win32
 {
-    public partial class WindowImpl
+    internal partial class WindowImpl
     {
         // Hit test the frame for resizing and moving.
         private HitTestValues HitTestNCA(IntPtr hWnd, IntPtr wParam, IntPtr lParam)

src/Windows/Avalonia.Win32/WindowImpl.WndProc.cs

@@ -6,7 +6,7 @@ using Avalonia.Controls.Platform;
 
 namespace Avalonia.Win32
 {
-    public partial class WindowImpl
+    internal partial class WindowImpl
     {
         protected virtual unsafe IntPtr WndProc(IntPtr hWnd, uint msg, IntPtr wParam, IntPtr lParam)
         {

src/Windows/Avalonia.Win32/WindowImpl.cs

@@ -30,8 +30,7 @@ namespace Avalonia.Win32
     /// <summary>
     /// Window implementation for Win32 platform.
     /// </summary>
-    [Unstable]
+    internal partial class WindowImpl : IWindowImpl, EglGlPlatformSurface.IEglWindowGlPlatformSurfaceInfo
-    public partial class WindowImpl : IWindowImpl, EglGlPlatformSurface.IEglWindowGlPlatformSurfaceInfo
     {
         private static readonly List<WindowImpl> s_instances = new();
 

src/Windows/Avalonia.Win32/WindowsMountedVolumeInfoProvider.cs

@@ -4,7 +4,7 @@ using Avalonia.Controls.Platform;
 
 namespace Avalonia.Win32
 {
-    public class WindowsMountedVolumeInfoProvider : IMountedVolumeInfoProvider
+    internal class WindowsMountedVolumeInfoProvider : IMountedVolumeInfoProvider
     {
         public IDisposable Listen(ObservableCollection<MountedVolumeInfo> mountedDrives)
         {