Merge pull request CosmosOS#2294 from CosmosOS/fix/ordinal-plug

Fix plugs
andsiu · Jun 13, 2022 · e371285 · e371285
2 parents 3f181f7 + a6ff577
commit e371285
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 90 deletions.
diff --git a/source/Cosmos.Core_Plugs/.editorconfig b/source/Cosmos.Core_Plugs/.editorconfig
@@ -1,5 +1,2 @@
 [*.cs]
 indent_size = 4
-
-[System/MulticastDelegateImpl.cs]
-indent_size = 2
diff --git a/source/Cosmos.Core_Plugs/Interop/GlobalizationImpl.cs b/source/Cosmos.Core_Plugs/Interop/GlobalizationImpl.cs
@@ -28,7 +28,7 @@ public static unsafe void ChangeCaseInvariant(char* aChar, int aInt, char* aChar
         {
             throw new NotImplementedException();
         }
-        [PlugMethod(Signature = "System_Void__Interop_Globalization_InitOrdinalCasingPage_System_Int32__System_Char__")]
+        [PlugMethod(Signature = "System_Void__Interop_Globalization_InitOrdinalCasingPage_System_Int32__System_Char#_")]
         public static void InitOrdinalCasingPage()
         {
             throw new NotImplementedException();

diff --git a/source/Cosmos.Core_Plugs/System/Globalization/OrdinalImpl.cs b/source/Cosmos.Core_Plugs/System/Globalization/OrdinalImpl.cs
@@ -2,25 +2,27 @@
 
 namespace Cosmos.Core_Plugs.System.Globalization
 {
+    [Plug(TargetName = "Interop+Globalization, System.Private.CoreLib")]
     class OrdinalImpl
     {
-        [PlugMethod(IsOptional =false, PlugRequired =true)]
+        [PlugMethod(Signature = "System_Int32__System_Globalization_Ordinal_CompareStringIgnoreCaseNonAscii__System_Char__System_Int32___System_Char__System_Int32_", PlugRequired = true, IsOptional =false)]
         public static unsafe int CompareStringIgnoreCaseNonAscii(char* aStrA, int aLengthA, char* aStrB, int aLengthB)
         {
-            if(aLengthA < aLengthB)
+            if (aLengthA < aLengthB)
             {
                 return -1;
-            } else if(aLengthA > aLengthB)
+            }
+            else if (aLengthA > aLengthB)
             {
                 return 1;
             }
             for (int i = 0; i < aLengthA; i++)
             {
-                if(aStrA[i] < aStrB[i])
+                if (aStrA[i] < aStrB[i])
                 {
                     return -1;
                 }
-                else if(aStrA[i] < aStrB[i])
+                else if (aStrA[i] < aStrB[i])
                 {
                     return 1;
                 }

diff --git a/source/Cosmos.Core_Plugs/System/MulticastDelegateImpl.cs b/source/Cosmos.Core_Plugs/System/MulticastDelegateImpl.cs
@@ -3,28 +3,13 @@
 
 namespace Cosmos.Core_Plugs.System
 {
-
-  [Plug(Target = typeof(MulticastDelegate))]
-  public class MulticastDelegateImpl
-  {
-    public static bool Equals(MulticastDelegate aThis, object aThat)
+    [Plug(Target = typeof(MulticastDelegate))]
+    public class MulticastDelegateImpl
     {
-      // todo: implement MulticastDelegate.Equals(MulticastDelegate)
-      return false;
-    }
-
-    public static bool TrySetSlot(MulticastDelegate multicastDelegate, object[] a, int index, object o)
-    {
-      if (a[index] == null)
-      {
-        a[index] = o;
-      }
-
-      if (a[index] != null)
-      {
-        return false;
-      }
-      return false;
+        public static bool Equals(MulticastDelegate aThis, object aThat)
+        {
+            // todo: implement MulticastDelegate.Equals(MulticastDelegate)
+            return false;
+        }
     }
-  }
 }
diff --git a/source/Cosmos.Core_Plugs/System/TimeZoneInfoImpl.cs b/source/Cosmos.Core_Plugs/System/TimeZoneInfoImpl.cs
@@ -32,10 +32,5 @@ public static TimeSpan GetLocalUtcOffset(DateTime aDateTime, TimeZoneInfoOptions
         {
             throw new NotImplementedException();
         }
-
-        public static string TryGetLocalizedNameByMuiNativeResource(string aString)
-        {
-            throw new NotImplementedException();
-        }
     }
 }
diff --git a/source/Cosmos.System2_Plugs/System/DateTimeImpl.cs b/source/Cosmos.System2_Plugs/System/DateTimeImpl.cs
@@ -21,10 +21,6 @@ public static class DateTimeImpl
         // TODO: get timezone
         public static DateTime UtcNow => Now;
 
-
-
-        public static long GetSystemTimeAsFileTime() => Now.Ticks;
-
         private static readonly string[] DaysOfWeekStrings = { "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"};
         private static readonly string[] MonthsStrings = { "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December" };
 

diff --git a/source/Cosmos.System2_Plugs/System/RandomImpl.cs b/source/Cosmos.System2_Plugs/System/RandomImpl.cs
@@ -65,18 +65,6 @@ public static void Ctor(Random aThis, int seed)
             seed = 1;
         }
 
-        public static int GenerateGlobalSeed()
-        {
-            counter++;
-
-            if (counter == Int32.MaxValue - 1)
-            {
-                counter = 0;
-            }
-
-            return counter + RTC.Second * 1000;
-        }
-
         private static double Sample()
         {
             //Including this division at the end gives us significantly improved

diff --git a/source/Cosmos.System2_Plugs/System/Runtime/InteropServices/MarshalImpl.cs b/source/Cosmos.System2_Plugs/System/Runtime/InteropServices/MarshalImpl.cs
diff --git a/source/Cosmos.System2_Plugs/System/Threading/ThreadImpl.cs b/source/Cosmos.System2_Plugs/System/Threading/ThreadImpl.cs
@@ -33,11 +33,6 @@ public static int GetCurrentProcessorNumber()
             throw new NotImplementedException();
         }
 
-        public static int GetOptimalMaxSpinWaitsPerSpinIterationInternal()
-        {
-            throw new NotImplementedException();
-        }
-
         public static Thread GetCurrentThreadNative()
         {
             return null;
@@ -53,21 +48,6 @@ public static void SetBackgroundNative(Thread aThis, bool aBool)
             throw new NotImplementedException();
         }
 
-        public static void StartupSetApartmentStateInternal(Thread aThis)
-        {
-            throw new NotImplementedException();
-        }
-
-        public static void StartInternal(Thread aThis)
-        {
-            throw new NotImplementedException();
-        }
-
-        public static void SetStart(Thread aThis, Delegate aDelegate, int aInt)
-        {
-            throw new NotImplementedException();
-        }
-
         public static void SpinWait(int aInt)
         {
             throw new NotImplementedException();