From 7d343e646f72fde3f1f5b5f0593d32cdf7c22a87 Mon Sep 17 00:00:00 2001 From: Yoshi Askharoun Date: Sat, 25 Jul 2026 15:31:58 -0500 Subject: [PATCH] Remove previous native attempts --- MicrosoftIris.sln | 42 ---------------- .../UIXrender.Engine.Tests.csproj | 4 -- .../Microsoft/Iris/Render/EffectElement.cs | 1 - .../Iris/Render/Protocol/EngineApi.cs | 4 -- UIX.RenderApi/UIX.RenderApi.csproj | 6 --- UIX/Accessibility/IAccessible.cs | 1 - UIX/Microsoft/Iris/Layouts/DefaultLayout.cs | 1 - UIX/Microsoft/Iris/Markup/UIX/ByteSchema.cs | 1 - UIX/Microsoft/Iris/Markup/UIX/DoubleSchema.cs | 1 - UIX/Microsoft/Iris/Markup/UIX/InsetSchema.cs | 1 - UIX/Microsoft/Iris/Markup/UIX/Int32Schema.cs | 1 - UIX/Microsoft/Iris/Markup/UIX/Int64Schema.cs | 1 - .../Iris/Markup/UIX/RectangleSchema.cs | 1 - UIX/Microsoft/Iris/Markup/UIX/SingleSchema.cs | 1 - .../Iris/Markup/UIX/Vector2Schema.cs | 1 - .../Iris/Markup/Validation/ValidateUI.cs | 1 - UIX/Microsoft/Iris/OS/ClrDllResources.cs | 1 - .../Iris/RenderAPI/Drawing/PointF.cs | 1 - UIX/Microsoft/Iris/RenderAPI/HRESULT.cs | 1 - UIX/Microsoft/Iris/UI/UIClass.cs | 1 - UIXInterop/NativeString.cs | 37 -------------- UIXInterop/UIXInterop.csproj | 14 ------ UIXrender/UIXrender.csproj | 37 -------------- UIXsup/DebugCategory.cs | 48 ------------------- UIXsup/UIXsup.csproj | 14 ------ 25 files changed, 222 deletions(-) delete mode 100644 UIXInterop/NativeString.cs delete mode 100644 UIXInterop/UIXInterop.csproj delete mode 100644 UIXrender/UIXrender.csproj delete mode 100644 UIXsup/DebugCategory.cs delete mode 100644 UIXsup/UIXsup.csproj diff --git a/MicrosoftIris.sln b/MicrosoftIris.sln index f105956..58ac607 100644 --- a/MicrosoftIris.sln +++ b/MicrosoftIris.sln @@ -18,12 +18,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Directory.Build.props = Directory.Build.props EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UIXrender", "UIXrender\UIXrender.csproj", "{1EFC7739-215B-45DA-852B-3B02C79749BE}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UIXsup", "UIXsup\UIXsup.csproj", "{9428B81F-24D7-4EB4-B5EC-9780321A8D90}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UIXInterop", "UIXInterop\UIXInterop.csproj", "{78410B10-0076-4B65-A2F5-F74B512D3A12}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UIXrender.Interop.Tests", "Tests\UIXrender.Interop.Tests\UIXrender.Interop.Tests.csproj", "{D8DA0828-9ACC-430F-9A12-E09ECE63823C}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UIXrender.Engine.Tests", "Tests\UIXrender.Engine.Tests\UIXrender.Engine.Tests.csproj", "{568E8DCD-CAB3-499B-A264-C62B1E1082B7}" @@ -88,42 +82,6 @@ Global {96FB9772-5619-47AD-93FC-F26319EC6BB1}.Release|x64.Build.0 = Release|Any CPU {96FB9772-5619-47AD-93FC-F26319EC6BB1}.Release|x86.ActiveCfg = Release|Any CPU {96FB9772-5619-47AD-93FC-F26319EC6BB1}.Release|x86.Build.0 = Release|Any CPU - {1EFC7739-215B-45DA-852B-3B02C79749BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1EFC7739-215B-45DA-852B-3B02C79749BE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1EFC7739-215B-45DA-852B-3B02C79749BE}.Debug|x64.ActiveCfg = Debug|x64 - {1EFC7739-215B-45DA-852B-3B02C79749BE}.Debug|x64.Build.0 = Debug|x64 - {1EFC7739-215B-45DA-852B-3B02C79749BE}.Debug|x86.ActiveCfg = Debug|x86 - {1EFC7739-215B-45DA-852B-3B02C79749BE}.Debug|x86.Build.0 = Debug|x86 - {1EFC7739-215B-45DA-852B-3B02C79749BE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1EFC7739-215B-45DA-852B-3B02C79749BE}.Release|Any CPU.Build.0 = Release|Any CPU - {1EFC7739-215B-45DA-852B-3B02C79749BE}.Release|x64.ActiveCfg = Release|x64 - {1EFC7739-215B-45DA-852B-3B02C79749BE}.Release|x64.Build.0 = Release|x64 - {1EFC7739-215B-45DA-852B-3B02C79749BE}.Release|x86.ActiveCfg = Release|x86 - {1EFC7739-215B-45DA-852B-3B02C79749BE}.Release|x86.Build.0 = Release|x86 - {9428B81F-24D7-4EB4-B5EC-9780321A8D90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9428B81F-24D7-4EB4-B5EC-9780321A8D90}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9428B81F-24D7-4EB4-B5EC-9780321A8D90}.Debug|x64.ActiveCfg = Debug|x64 - {9428B81F-24D7-4EB4-B5EC-9780321A8D90}.Debug|x64.Build.0 = Debug|x64 - {9428B81F-24D7-4EB4-B5EC-9780321A8D90}.Debug|x86.ActiveCfg = Debug|x86 - {9428B81F-24D7-4EB4-B5EC-9780321A8D90}.Debug|x86.Build.0 = Debug|x86 - {9428B81F-24D7-4EB4-B5EC-9780321A8D90}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9428B81F-24D7-4EB4-B5EC-9780321A8D90}.Release|Any CPU.Build.0 = Release|Any CPU - {9428B81F-24D7-4EB4-B5EC-9780321A8D90}.Release|x64.ActiveCfg = Release|x64 - {9428B81F-24D7-4EB4-B5EC-9780321A8D90}.Release|x64.Build.0 = Release|x64 - {9428B81F-24D7-4EB4-B5EC-9780321A8D90}.Release|x86.ActiveCfg = Release|x86 - {9428B81F-24D7-4EB4-B5EC-9780321A8D90}.Release|x86.Build.0 = Release|x86 - {78410B10-0076-4B65-A2F5-F74B512D3A12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {78410B10-0076-4B65-A2F5-F74B512D3A12}.Debug|Any CPU.Build.0 = Debug|Any CPU - {78410B10-0076-4B65-A2F5-F74B512D3A12}.Debug|x64.ActiveCfg = Debug|x64 - {78410B10-0076-4B65-A2F5-F74B512D3A12}.Debug|x64.Build.0 = Debug|x64 - {78410B10-0076-4B65-A2F5-F74B512D3A12}.Debug|x86.ActiveCfg = Debug|x86 - {78410B10-0076-4B65-A2F5-F74B512D3A12}.Debug|x86.Build.0 = Debug|x86 - {78410B10-0076-4B65-A2F5-F74B512D3A12}.Release|Any CPU.ActiveCfg = Release|Any CPU - {78410B10-0076-4B65-A2F5-F74B512D3A12}.Release|Any CPU.Build.0 = Release|Any CPU - {78410B10-0076-4B65-A2F5-F74B512D3A12}.Release|x64.ActiveCfg = Release|x64 - {78410B10-0076-4B65-A2F5-F74B512D3A12}.Release|x64.Build.0 = Release|x64 - {78410B10-0076-4B65-A2F5-F74B512D3A12}.Release|x86.ActiveCfg = Release|x86 - {78410B10-0076-4B65-A2F5-F74B512D3A12}.Release|x86.Build.0 = Release|x86 {D8DA0828-9ACC-430F-9A12-E09ECE63823C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D8DA0828-9ACC-430F-9A12-E09ECE63823C}.Debug|Any CPU.Build.0 = Debug|Any CPU {D8DA0828-9ACC-430F-9A12-E09ECE63823C}.Debug|x64.ActiveCfg = Debug|x64 diff --git a/Tests/UIXrender.Engine.Tests/UIXrender.Engine.Tests.csproj b/Tests/UIXrender.Engine.Tests/UIXrender.Engine.Tests.csproj index 237d242..ac62016 100644 --- a/Tests/UIXrender.Engine.Tests/UIXrender.Engine.Tests.csproj +++ b/Tests/UIXrender.Engine.Tests/UIXrender.Engine.Tests.csproj @@ -4,8 +4,4 @@ Exe enable - - - - diff --git a/UIX.RenderApi/Microsoft/Iris/Render/EffectElement.cs b/UIX.RenderApi/Microsoft/Iris/Render/EffectElement.cs index 650ba35..d6e63e5 100644 --- a/UIX.RenderApi/Microsoft/Iris/Render/EffectElement.cs +++ b/UIX.RenderApi/Microsoft/Iris/Render/EffectElement.cs @@ -6,7 +6,6 @@ using Microsoft.Iris.Render.Common; using Microsoft.Iris.Render.Graphics; -using System; using System.Globalization; namespace Microsoft.Iris.Render diff --git a/UIX.RenderApi/Microsoft/Iris/Render/Protocol/EngineApi.cs b/UIX.RenderApi/Microsoft/Iris/Render/Protocol/EngineApi.cs index f425c0a..4e49554 100644 --- a/UIX.RenderApi/Microsoft/Iris/Render/Protocol/EngineApi.cs +++ b/UIX.RenderApi/Microsoft/Iris/Render/Protocol/EngineApi.cs @@ -10,10 +10,6 @@ using System.Runtime.InteropServices; using System.Security; using Microsoft.Iris.Render.Common; using Microsoft.Iris.Render.Internal; -#if !NETFRAMEWORK -using Microsoft.Iris.Render.Engine; -using Iface = Microsoft.Iris.Render.Interop; -#endif namespace Microsoft.Iris.Render.Protocol { diff --git a/UIX.RenderApi/UIX.RenderApi.csproj b/UIX.RenderApi/UIX.RenderApi.csproj index 815da8d..36eadfb 100644 --- a/UIX.RenderApi/UIX.RenderApi.csproj +++ b/UIX.RenderApi/UIX.RenderApi.csproj @@ -10,10 +10,4 @@ true - - - - - \ No newline at end of file diff --git a/UIX/Accessibility/IAccessible.cs b/UIX/Accessibility/IAccessible.cs index 9622312..c15caca 100644 --- a/UIX/Accessibility/IAccessible.cs +++ b/UIX/Accessibility/IAccessible.cs @@ -1,6 +1,5 @@ #if NET6_0_OR_GREATER -using System; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; diff --git a/UIX/Microsoft/Iris/Layouts/DefaultLayout.cs b/UIX/Microsoft/Iris/Layouts/DefaultLayout.cs index 5383f65..df8aa8b 100644 --- a/UIX/Microsoft/Iris/Layouts/DefaultLayout.cs +++ b/UIX/Microsoft/Iris/Layouts/DefaultLayout.cs @@ -6,7 +6,6 @@ using Microsoft.Iris.Layout; using Microsoft.Iris.Render; -using System; namespace Microsoft.Iris.Layouts { diff --git a/UIX/Microsoft/Iris/Markup/UIX/ByteSchema.cs b/UIX/Microsoft/Iris/Markup/UIX/ByteSchema.cs index 5296b8a..c9130c4 100644 --- a/UIX/Microsoft/Iris/Markup/UIX/ByteSchema.cs +++ b/UIX/Microsoft/Iris/Markup/UIX/ByteSchema.cs @@ -5,7 +5,6 @@ // Assembly location: C:\Program Files\Zune\UIX.dll using Microsoft.Iris.Library; -using System; using System.Globalization; namespace Microsoft.Iris.Markup.UIX diff --git a/UIX/Microsoft/Iris/Markup/UIX/DoubleSchema.cs b/UIX/Microsoft/Iris/Markup/UIX/DoubleSchema.cs index a2195f0..ae568c7 100644 --- a/UIX/Microsoft/Iris/Markup/UIX/DoubleSchema.cs +++ b/UIX/Microsoft/Iris/Markup/UIX/DoubleSchema.cs @@ -5,7 +5,6 @@ // Assembly location: C:\Program Files\Zune\UIX.dll using Microsoft.Iris.Library; -using System; using System.Globalization; namespace Microsoft.Iris.Markup.UIX diff --git a/UIX/Microsoft/Iris/Markup/UIX/InsetSchema.cs b/UIX/Microsoft/Iris/Markup/UIX/InsetSchema.cs index e3c5720..21b3ecf 100644 --- a/UIX/Microsoft/Iris/Markup/UIX/InsetSchema.cs +++ b/UIX/Microsoft/Iris/Markup/UIX/InsetSchema.cs @@ -7,7 +7,6 @@ using Microsoft.Iris.Data; using Microsoft.Iris.Library; using Microsoft.Iris.Render; -using System; using System.Globalization; namespace Microsoft.Iris.Markup.UIX diff --git a/UIX/Microsoft/Iris/Markup/UIX/Int32Schema.cs b/UIX/Microsoft/Iris/Markup/UIX/Int32Schema.cs index 8a95768..fdaafea 100644 --- a/UIX/Microsoft/Iris/Markup/UIX/Int32Schema.cs +++ b/UIX/Microsoft/Iris/Markup/UIX/Int32Schema.cs @@ -6,7 +6,6 @@ using Microsoft.Iris.CodeModel.Cpp; using Microsoft.Iris.Library; -using System; using System.Globalization; namespace Microsoft.Iris.Markup.UIX diff --git a/UIX/Microsoft/Iris/Markup/UIX/Int64Schema.cs b/UIX/Microsoft/Iris/Markup/UIX/Int64Schema.cs index a176a63..7aa8166 100644 --- a/UIX/Microsoft/Iris/Markup/UIX/Int64Schema.cs +++ b/UIX/Microsoft/Iris/Markup/UIX/Int64Schema.cs @@ -5,7 +5,6 @@ // Assembly location: C:\Program Files\Zune\UIX.dll using Microsoft.Iris.Library; -using System; using System.Globalization; namespace Microsoft.Iris.Markup.UIX diff --git a/UIX/Microsoft/Iris/Markup/UIX/RectangleSchema.cs b/UIX/Microsoft/Iris/Markup/UIX/RectangleSchema.cs index 314e2ea..fe09878 100644 --- a/UIX/Microsoft/Iris/Markup/UIX/RectangleSchema.cs +++ b/UIX/Microsoft/Iris/Markup/UIX/RectangleSchema.cs @@ -6,7 +6,6 @@ using Microsoft.Iris.Library; using Microsoft.Iris.Render; -using System; using System.Globalization; namespace Microsoft.Iris.Markup.UIX diff --git a/UIX/Microsoft/Iris/Markup/UIX/SingleSchema.cs b/UIX/Microsoft/Iris/Markup/UIX/SingleSchema.cs index 7ad87cd..35e80c2 100644 --- a/UIX/Microsoft/Iris/Markup/UIX/SingleSchema.cs +++ b/UIX/Microsoft/Iris/Markup/UIX/SingleSchema.cs @@ -5,7 +5,6 @@ // Assembly location: C:\Program Files\Zune\UIX.dll using Microsoft.Iris.Library; -using System; using System.Globalization; namespace Microsoft.Iris.Markup.UIX diff --git a/UIX/Microsoft/Iris/Markup/UIX/Vector2Schema.cs b/UIX/Microsoft/Iris/Markup/UIX/Vector2Schema.cs index 5dfbeb6..7731842 100644 --- a/UIX/Microsoft/Iris/Markup/UIX/Vector2Schema.cs +++ b/UIX/Microsoft/Iris/Markup/UIX/Vector2Schema.cs @@ -7,7 +7,6 @@ using Microsoft.Iris.Data; using Microsoft.Iris.Library; using Microsoft.Iris.Render; -using System; using System.Globalization; namespace Microsoft.Iris.Markup.UIX diff --git a/UIX/Microsoft/Iris/Markup/Validation/ValidateUI.cs b/UIX/Microsoft/Iris/Markup/Validation/ValidateUI.cs index 09b7387..01aa006 100644 --- a/UIX/Microsoft/Iris/Markup/Validation/ValidateUI.cs +++ b/UIX/Microsoft/Iris/Markup/Validation/ValidateUI.cs @@ -5,7 +5,6 @@ // Assembly location: C:\Program Files\Zune\UIX.dll using Microsoft.Iris.Markup.UIX; -using System; namespace Microsoft.Iris.Markup.Validation { diff --git a/UIX/Microsoft/Iris/OS/ClrDllResources.cs b/UIX/Microsoft/Iris/OS/ClrDllResources.cs index d1a3ead..4083884 100644 --- a/UIX/Microsoft/Iris/OS/ClrDllResources.cs +++ b/UIX/Microsoft/Iris/OS/ClrDllResources.cs @@ -2,7 +2,6 @@ using Microsoft.Iris.Library; using Microsoft.Iris.Markup; using Microsoft.Iris.Session; -using System; using System.Collections.Generic; using System.IO; using System.Reflection; diff --git a/UIX/Microsoft/Iris/RenderAPI/Drawing/PointF.cs b/UIX/Microsoft/Iris/RenderAPI/Drawing/PointF.cs index a90b3e4..e508a53 100644 --- a/UIX/Microsoft/Iris/RenderAPI/Drawing/PointF.cs +++ b/UIX/Microsoft/Iris/RenderAPI/Drawing/PointF.cs @@ -5,7 +5,6 @@ // Assembly location: C:\Program Files\Zune\UIX.dll using Microsoft.Iris.Render; -using System; using System.Globalization; using System.Text; diff --git a/UIX/Microsoft/Iris/RenderAPI/HRESULT.cs b/UIX/Microsoft/Iris/RenderAPI/HRESULT.cs index 9bd6c95..8574dbd 100644 --- a/UIX/Microsoft/Iris/RenderAPI/HRESULT.cs +++ b/UIX/Microsoft/Iris/RenderAPI/HRESULT.cs @@ -4,7 +4,6 @@ // MVID: A56C6C9D-B7F6-46A9-8BDE-B3D9B8D60B11 // Assembly location: C:\Program Files\Zune\UIX.dll -using System; using System.Globalization; using System.Runtime.InteropServices; diff --git a/UIX/Microsoft/Iris/UI/UIClass.cs b/UIX/Microsoft/Iris/UI/UIClass.cs index 7362729..6766dcb 100644 --- a/UIX/Microsoft/Iris/UI/UIClass.cs +++ b/UIX/Microsoft/Iris/UI/UIClass.cs @@ -18,7 +18,6 @@ using Microsoft.Iris.Render; using Microsoft.Iris.RenderAPI.Drawing; using Microsoft.Iris.Session; using Microsoft.Iris.ViewItems; -using System; using System.Collections; using System.Collections.Generic; using System.Collections.Specialized; diff --git a/UIXInterop/NativeString.cs b/UIXInterop/NativeString.cs deleted file mode 100644 index 30f7bc6..0000000 --- a/UIXInterop/NativeString.cs +++ /dev/null @@ -1,37 +0,0 @@ -using System; -using System.Collections.Concurrent; -using System.Runtime.InteropServices; - -namespace Microsoft.Iris.Interop; - -// [UnmanagedCallersOnly] methods can't take `string` params (not blittable) -- callers -// take raw pointers and go through here instead, so the "which encoding" decision (read -// from each P/Invoke call site's CharSet, see per-module logs) is made in one place. -public static unsafe class NativeString -{ - public static string AnsiToString(byte* p) => p == null ? null : Marshal.PtrToStringAnsi((IntPtr)p); - - public static string UniToString(char* p) => p == null ? null : Marshal.PtrToStringUni((IntPtr)p); - - // Interned, caller-does-not-free native copies. Several exports hand a `char*` back - // out (SpQueryTypeName, SpQueryPropertyName, SpQueryMethodName, SpQueryEnumName, ...) - // and their managed declarations never free what they receive -- so the callee has to - // own the memory for the process lifetime. Interning by value keeps that bounded: - // these are schema names drawn from a fixed set of registered types, so the pool - // stops growing once every name has been asked for once, instead of leaking a fresh - // allocation per call. - private static readonly ConcurrentDictionary s_interned = new(StringComparer.Ordinal); - - public static char* InternUni(string value) - { - if (value == null) - return null; - - return (char*)s_interned.GetOrAdd(value, static v => Marshal.StringToHGlobalUni(v)); - } - - // Non-interned copy, for values that are genuinely per-call (query results, converted - // strings) rather than fixed schema names. The caller frees these via SpMemFree. - public static char* AllocUni(string value) => - value == null ? null : (char*)Marshal.StringToHGlobalUni(value); -} diff --git a/UIXInterop/UIXInterop.csproj b/UIXInterop/UIXInterop.csproj deleted file mode 100644 index adb9e22..0000000 --- a/UIXInterop/UIXInterop.csproj +++ /dev/null @@ -1,14 +0,0 @@ - - - - Library - UIXInterop - Microsoft.Iris.Interop - true - true - - - - diff --git a/UIXrender/UIXrender.csproj b/UIXrender/UIXrender.csproj deleted file mode 100644 index 3f70386..0000000 --- a/UIXrender/UIXrender.csproj +++ /dev/null @@ -1,37 +0,0 @@ - - - - Library - UIXrender - Microsoft.Iris.Render - true - true - - - - - - - - - - - - - - all - runtime; build; native; contentfiles; analyzers - - - - - - - - \ No newline at end of file diff --git a/UIXsup/DebugCategory.cs b/UIXsup/DebugCategory.cs deleted file mode 100644 index 8ef3be9..0000000 --- a/UIXsup/DebugCategory.cs +++ /dev/null @@ -1,48 +0,0 @@ -namespace Microsoft.Iris.Support; - -// Mirrors Microsoft.Iris.Render.DebugCategory (UIX.RenderApi/Microsoft/Iris/Render/DebugCategory.cs) -// field-for-field: ordinal values are part of the wire contract with the already-shipped -// managed callers (DebugGetCategoryLevel/DebugSetCategoryLevel pass this by value), so -// the order here must match exactly, not just the names. -public enum DebugCategory -{ - Animation, - Critical, - Deprecated, - Dispatcher, - Dump, - Dx9Wrapper, - DynamicSurface, - Failure, - FormWindow, - GraphicsCache, - IFC, - ObjectCache, - Performance, - Profile, - Queues, - Render, - Sounds, - Surface, - SurfacePool, - SurfaceRestoration, - Timeouts, - Transport, - WindowState, - Effect, - HTTP, - ExternalCount, - Protocol, - RenderHost, - DumpException, - Focus, - Input, - TreeDisposal, - VisualSizePos, - Visual, - Painting, - RenderWindow, - ImageLoad, - ImageCache, - TotalCount, -} diff --git a/UIXsup/UIXsup.csproj b/UIXsup/UIXsup.csproj deleted file mode 100644 index 8673abc..0000000 --- a/UIXsup/UIXsup.csproj +++ /dev/null @@ -1,14 +0,0 @@ - - - - Library - UIXsup - Microsoft.Iris.Support - true - true - - - - - - \ No newline at end of file