Increase access permissions for Ava timezones (#4538 )

[Flatpak] Beautify multiline strings again & Add full git commit hash (#4535 )
* Don't destroy multiline strings * Use full git commit hash
2023-03-12 17:20:09 +01:00 · 2023-03-12 10:42:33 +01:00 · 2023-03-12 03:24:11 +01:00 · 2023-03-11 17:05:48 -03:00
22 changed files with 76 additions and 55 deletions
--- a/.github/workflows/flatpak.yml
+++ b/.github/workflows/flatpak.yml
@@ -35,7 +35,7 @@ jobs:
        id: version_info
        working-directory: Ryujinx
        run: |
-          echo "git_short_hash=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
+          echo "git_hash=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT

      - uses: actions/checkout@v3
        with:
@@ -84,7 +84,7 @@ jobs:
      - name: Update flatpak metadata
        id: metadata
        env:
-          RYUJINX_GIT_HASH: ${{ steps.version_info.outputs.git_short_hash }}
+          RYUJINX_GIT_HASH: ${{ steps.version_info.outputs.git_hash }}
        shell: python
        run: |
          import hashlib
@@ -94,7 +94,17 @@ jobs:
          import yaml
          from datetime import datetime
          from lxml import etree
-
+          
+          
+          # Ensure we don't destroy multiline strings
+          def str_presenter(dumper, data):
+            if len(data.splitlines()) > 1:
+              return dumper.represent_scalar("tag:yaml.org,2002:str", data, style="|")
+            return dumper.represent_scalar("tag:yaml.org,2002:str", data)
+            
+            
+          yaml.representer.SafeRepresenter.add_representer(str, str_presenter)
+  
          yaml_file = "flathub/org.ryujinx.Ryujinx.yml"
          xml_file = "flathub/org.ryujinx.Ryujinx.appdata.xml"

--- a/ARMeilleure/CodeGen/Arm64/CodeGenContext.cs
+++ b/ARMeilleure/CodeGen/Arm64/CodeGenContext.cs
@@ -265,7 +265,7 @@ namespace ARMeilleure.CodeGen.Arm64
            }
            else
            {
-                relocInfo = new RelocInfo(new RelocEntry[0]);
+                relocInfo = new RelocInfo(Array.Empty<RelocEntry>());
            }

            return (code, relocInfo);
--- a/ARMeilleure/CodeGen/RegisterAllocators/LinearScanAllocator.cs
+++ b/ARMeilleure/CodeGen/RegisterAllocators/LinearScanAllocator.cs
@@ -433,16 +433,11 @@ namespace ARMeilleure.CodeGen.RegisterAllocators

        private static int GetHighestValueIndex(Span<int> span)
        {
-            int highest = span[0];
-
-            if (highest == int.MaxValue)
-            {
-                return 0;
-            }
+            int highest = int.MinValue;

            int selected = 0;

-            for (int index = 1; index < span.Length; index++)
+            for (int index = 0; index < span.Length; index++)
            {
                int current = span[index];

--- a/ARMeilleure/Decoders/DecoderHelper.cs
+++ b/ARMeilleure/Decoders/DecoderHelper.cs
@@ -17,7 +17,7 @@ namespace ARMeilleure.Decoders
        {
            uint[] tbl = new uint[256];

-            for (int idx = 0; idx < 256; idx++)
+            for (int idx = 0; idx < tbl.Length; idx++)
            {
                tbl[idx] = ExpandImm8ToFP32((uint)idx);
            }
@@ -29,7 +29,7 @@ namespace ARMeilleure.Decoders
        {
            ulong[] tbl = new ulong[256];

-            for (int idx = 0; idx < 256; idx++)
+            for (int idx = 0; idx < tbl.Length; idx++)
            {
                tbl[idx] = ExpandImm8ToFP64((ulong)idx);
            }
--- a/ARMeilleure/Decoders/OpCodeTable.cs
+++ b/ARMeilleure/Decoders/OpCodeTable.cs
@@ -1301,7 +1301,7 @@ namespace ARMeilleure.Decoders
        {
            List<InstInfo>[] temp = new List<InstInfo>[FastLookupSize];

-            for (int index = 0; index < FastLookupSize; index++)
+            for (int index = 0; index < temp.Length; index++)
            {
                temp[index] = new List<InstInfo>();
            }
@@ -1311,7 +1311,7 @@ namespace ARMeilleure.Decoders
                int mask  = ToFastLookupIndex(inst.Mask);
                int value = ToFastLookupIndex(inst.Value);

-                for (int index = 0; index < FastLookupSize; index++)
+                for (int index = 0; index < temp.Length; index++)
                {
                    if ((index & mask) == value)
                    {
@@ -1320,7 +1320,7 @@ namespace ARMeilleure.Decoders
                }
            }

-            for (int index = 0; index < FastLookupSize; index++)
+            for (int index = 0; index < temp.Length; index++)
            {
                table[index] = temp[index].ToArray();
            }
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -12,7 +12,6 @@
    <PackageVersion Include="Avalonia.Svg.Skia" Version="0.10.18" />
    <PackageVersion Include="CommandLineParser" Version="2.9.1" />
    <PackageVersion Include="Concentus" Version="1.1.7" />
-    <PackageVersion Include="Crc32.NET" Version="1.2.0" />
    <PackageVersion Include="DiscordRichPresence" Version="1.1.3.18" />
    <PackageVersion Include="DynamicData" Version="7.12.11" />
    <PackageVersion Include="FluentAvaloniaUI" Version="1.4.5" />
@@ -45,10 +44,8 @@
    <PackageVersion Include="SPB" Version="0.0.4-build28" />
    <PackageVersion Include="System.Drawing.Common" Version="7.0.0" />
    <PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="6.27.0" />
-    <PackageVersion Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
+    <PackageVersion Include="System.IO.Hashing" Version="7.0.0" />
    <PackageVersion Include="System.Management" Version="7.0.0" />
-    <PackageVersion Include="System.Net.NameResolution" Version="4.3.0" />
-    <PackageVersion Include="System.Threading.ThreadPool" Version="4.3.0" />
    <PackageVersion Include="UnicornEngine.Unicorn" Version="2.0.2-rc1-f7c841d" />
    <PackageVersion Include="XamlNameReferenceGenerator" Version="1.5.1" />
  </ItemGroup>
--- a/Ryujinx.Audio/Common/AudioDeviceSession.cs
+++ b/Ryujinx.Audio/Common/AudioDeviceSession.cs
@@ -400,7 +400,9 @@ namespace Ryujinx.Audio.Common
        {
            uint bufferIndex = (_releasedBufferIndex - _bufferReleasedCount) % Constants.AudioDeviceBufferCountMax;

-            for (int i = 0; i < GetTotalBufferCount(); i++)
+            uint totalBufferCount = GetTotalBufferCount();
+
+            for (int i = 0; i < totalBufferCount; i++)
            {
                if (_buffers[bufferIndex].BufferTag == bufferTag)
                {
--- a/Ryujinx.Ava/UI/ViewModels/SettingsViewModel.cs
+++ b/Ryujinx.Ava/UI/ViewModels/SettingsViewModel.cs
@@ -236,7 +236,7 @@ namespace Ryujinx.Ava.UI.ViewModels

        public DateTimeOffset DateOffset { get; set; }
        public TimeSpan TimeOffset { get; set; }
-        private AvaloniaList<TimeZone> TimeZones { get; set; }
+        internal AvaloniaList<TimeZone> TimeZones { get; set; }
        public AvaloniaList<string> GameDirectories { get; set; }
        public ObservableCollection<ComboBoxItem> AvailableGpus { get; set; }

--- a/Ryujinx.Ava/UI/Windows/IconColorPicker.cs
+++ b/Ryujinx.Ava/UI/Windows/IconColorPicker.cs
@@ -125,7 +125,7 @@ namespace Ryujinx.Ava.UI.Windows

        public static Bgra32[] GetBuffer(Image<Bgra32> image)
        {
-            return image.TryGetSinglePixelSpan(out var data) ? data.ToArray() : new Bgra32[0];
+            return image.TryGetSinglePixelSpan(out var data) ? data.ToArray() : Array.Empty<Bgra32>();
        }

        private static int GetColorScore(Dictionary<int, int> dominantColorBin, int maxHitCount, PaletteColor color)
--- a/Ryujinx.Graphics.Vulkan/Queries/Counters.cs
+++ b/Ryujinx.Graphics.Vulkan/Queries/Counters.cs
@@ -17,7 +17,7 @@ namespace Ryujinx.Graphics.Vulkan.Queries

            _counterQueues = new CounterQueue[count];

-            for (int index = 0; index < count; index++)
+            for (int index = 0; index < _counterQueues.Length; index++)
            {
                CounterType type = (CounterType)index;
                _counterQueues[index] = new CounterQueue(gd, device, pipeline, type);
--- a/Ryujinx.Graphics.Vulkan/Ryujinx.Graphics.Vulkan.csproj
+++ b/Ryujinx.Graphics.Vulkan/Ryujinx.Graphics.Vulkan.csproj
@@ -29,9 +29,6 @@
    <PackageReference Include="Silk.NET.Vulkan" />
    <PackageReference Include="Silk.NET.Vulkan.Extensions.EXT" />
    <PackageReference Include="Silk.NET.Vulkan.Extensions.KHR" />
-    <PackageReference Include="System.IO.FileSystem.Primitives" />
-    <PackageReference Include="System.Net.NameResolution" />
-    <PackageReference Include="System.Threading.ThreadPool" />
  </ItemGroup>

  <ItemGroup>
--- a/Ryujinx.Graphics.Vulkan/SpecInfo.cs
+++ b/Ryujinx.Graphics.Vulkan/SpecInfo.cs
@@ -29,7 +29,7 @@ namespace Ryujinx.Graphics.Vulkan

            uint structSize = 0;

-            for (int i = 0; i < count; ++i)
+            for (int i = 0; i < Map.Length; ++i)
            {
                var typeSize = SizeOf(description[i].Type);
                Map[i] = new SpecializationMapEntry(description[i].Id, structSize, typeSize);
@@ -46,11 +46,10 @@ namespace Ryujinx.Graphics.Vulkan
        // For advanced mapping with overlapping or staggered fields
        public SpecDescription(SpecializationMapEntry[] map)
        {
-            int count = map.Length;
            Map = map;

            uint structSize = 0;
-            for (int i = 0; i < count; ++i)
+            for (int i = 0; i < map.Length; ++i)
            {
                structSize = Math.Max(structSize, map[i].Offset + (uint)map[i].Size);
            }
--- a/Ryujinx.Graphics.Vulkan/Window.cs
+++ b/Ryujinx.Graphics.Vulkan/Window.cs
@@ -60,10 +60,9 @@ namespace Ryujinx.Graphics.Vulkan
        private void RecreateSwapchain()
        {
            var oldSwapchain = _swapchain;
-            int imageCount = _swapchainImageViews.Length;
            _vsyncModeChanged = false;

-            for (int i = 0; i < imageCount; i++)
+            for (int i = 0; i < _swapchainImageViews.Length; i++)
            {
                _swapchainImageViews[i].Dispose();
            }
@@ -147,7 +146,7 @@ namespace Ryujinx.Graphics.Vulkan

            _swapchainImageViews = new Auto<DisposableImageView>[imageCount];

-            for (int i = 0; i < imageCount; i++)
+            for (int i = 0; i < _swapchainImageViews.Length; i++)
            {
                _swapchainImageViews[i] = CreateSwapchainImageView(_swapchainImages[i], surfaceFormat.Format);
            }
--- a/Ryujinx.HLE/HOS/Ipc/IpcHandleDesc.cs
+++ b/Ryujinx.HLE/HOS/Ipc/IpcHandleDesc.cs
@@ -49,12 +49,12 @@ namespace Ryujinx.HLE.HOS.Ipc

        public static IpcHandleDesc MakeCopy(params int[] handles)
        {
-            return new IpcHandleDesc(handles, new int[0]);
+            return new IpcHandleDesc(handles, Array.Empty<int>());
        }

        public static IpcHandleDesc MakeMove(params int[] handles)
        {
-            return new IpcHandleDesc(new int[0], handles);
+            return new IpcHandleDesc(Array.Empty<int>(), handles);
        }

        public byte[] GetBytes()
--- a/Ryujinx.HLE/HOS/Ipc/IpcMessage.cs
+++ b/Ryujinx.HLE/HOS/Ipc/IpcMessage.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
@@ -132,7 +133,7 @@ namespace Ryujinx.HLE.HOS.Ipc
                word0 |= (ReceiveBuff.Count  & 0xf) << 24;
                word0 |= (ExchangeBuff.Count & 0xf) << 28;

-                byte[] handleData = new byte[0];
+                byte[] handleData = Array.Empty<byte>();

                if (HandleDesc != null)
                {
@@ -202,7 +203,7 @@ namespace Ryujinx.HLE.HOS.Ipc
                word0 |= (ReceiveBuff.Count & 0xf) << 24;
                word0 |= (ExchangeBuff.Count & 0xf) << 28;

-                byte[] handleData = new byte[0];
+                byte[] handleData = Array.Empty<byte>();

                if (HandleDesc != null)
                {
--- a/Ryujinx.HLE/HOS/Kernel/Common/KTimeManager.cs
+++ b/Ryujinx.HLE/HOS/Kernel/Common/KTimeManager.cs
@@ -1,7 +1,6 @@
 using Ryujinx.Common;
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading;

 namespace Ryujinx.HLE.HOS.Kernel.Common
@@ -86,7 +85,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Common
                    {
                        Interlocked.Exchange(ref _enforceWakeupFromSpinWait, 0);

-                        next = _waitingObjects.OrderBy(x => x.TimePoint).FirstOrDefault();
+                        next = GetNextWaitingObject();
                    }

                    if (next != null)
@@ -140,6 +139,26 @@ namespace Ryujinx.HLE.HOS.Kernel.Common
            }
        }

+        private WaitingObject GetNextWaitingObject()
+        {
+            WaitingObject selected = null;
+            
+            long lowestTimePoint = long.MaxValue;
+
+            for (int index = _waitingObjects.Count - 1; index >= 0; index--)
+            {
+                WaitingObject current = _waitingObjects[index];
+
+                if (current.TimePoint <= lowestTimePoint)
+                {
+                    selected = current;
+                    lowestTimePoint = current.TimePoint;
+                }
+            }
+
+            return selected;
+        }
+
        public static long ConvertNanosecondsToMilliseconds(long time)
        {
            time /= 1000000;
--- a/Ryujinx.HLE/HOS/Services/Time/TimeZone/TimeZoneContentManager.cs
+++ b/Ryujinx.HLE/HOS/Services/Time/TimeZone/TimeZoneContentManager.cs
@@ -233,7 +233,7 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone
                // If the location name is too long, error out.
                if (locationName.Length > 0x24)
                {
-                    outLocationNameArray = new string[0];
+                    outLocationNameArray = Array.Empty<string>();

                    return ResultCode.LocationNameTooLong;
                }
--- a/Ryujinx.Input.SDL2/SDL2GamepadDriver.cs
+++ b/Ryujinx.Input.SDL2/SDL2GamepadDriver.cs
@@ -27,7 +27,9 @@ namespace Ryujinx.Input.SDL2
            SDL2Driver.Instance.OnJoystickDisconnected += HandleJoyStickDisconnected;

            // Add already connected gamepads
-            for (int joystickIndex = 0; joystickIndex < SDL_NumJoysticks(); joystickIndex++)
+            int numJoysticks = SDL_NumJoysticks();
+
+            for (int joystickIndex = 0; joystickIndex < numJoysticks; joystickIndex++)
            {
                HandleJoyStickConnected(joystickIndex, SDL_JoystickGetDeviceInstanceID(joystickIndex));
            }
--- a/Ryujinx.Input/Motion/CemuHook/Client.cs
+++ b/Ryujinx.Input/Motion/CemuHook/Client.cs
@@ -1,5 +1,4 @@
-using Force.Crc32;
-using Ryujinx.Common;
+using Ryujinx.Common;
 using Ryujinx.Common.Configuration.Hid;
 using Ryujinx.Common.Configuration.Hid.Controller;
 using Ryujinx.Common.Configuration.Hid.Controller.Motion;
@@ -9,6 +8,7 @@ using Ryujinx.Input.Motion.CemuHook.Protocol;
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.IO.Hashing;
 using System.Net;
 using System.Net.Sockets;
 using System.Numerics;
@@ -401,10 +401,10 @@ namespace Ryujinx.Input.Motion.CemuHook
                writer.Seek(6, SeekOrigin.Begin);
                writer.Write(header.Length);

-                header.Crc32 = Crc32Algorithm.Compute(stream.ToArray());
+                Crc32.Hash(stream.ToArray(), header.Crc32.AsSpan());

                writer.Seek(8, SeekOrigin.Begin);
-                writer.Write(header.Crc32);
+                writer.Write(header.Crc32.AsSpan());

                byte[] data = stream.ToArray();

@@ -440,10 +440,10 @@ namespace Ryujinx.Input.Motion.CemuHook
                writer.Seek(6, SeekOrigin.Begin);
                writer.Write(header.Length);

-                header.Crc32 = Crc32Algorithm.Compute(stream.ToArray());
+                Crc32.Hash(stream.ToArray(), header.Crc32.AsSpan());

                writer.Seek(8, SeekOrigin.Begin);
-                writer.Write(header.Crc32);
+                writer.Write(header.Crc32.AsSpan());

                byte[] data = stream.ToArray();

@@ -458,8 +458,7 @@ namespace Ryujinx.Input.Motion.CemuHook
                Id          = (uint)clientId,
                MagicString = Magic,
                Version     = Version,
-                Length      = 0,
-                Crc32       = 0
+                Length      = 0
            };

            return header;
--- a/Ryujinx.Input/Motion/CemuHook/Protocol/Header.cs
+++ b/Ryujinx.Input/Motion/CemuHook/Protocol/Header.cs
@@ -1,14 +1,15 @@
-using System.Runtime.InteropServices;
+using Ryujinx.Common.Memory;
+using System.Runtime.InteropServices;

 namespace Ryujinx.Input.Motion.CemuHook.Protocol
 {
    [StructLayout(LayoutKind.Sequential, Pack = 1)]
    public struct Header
    {
-        public uint   MagicString;
+        public uint MagicString;
        public ushort Version;
        public ushort Length;
-        public uint   Crc32;
-        public uint   Id;
+        public Array4<byte> Crc32;
+        public uint Id;
    }
 }
--- a/Ryujinx.Input/Ryujinx.Input.csproj
+++ b/Ryujinx.Input/Ryujinx.Input.csproj
@@ -6,7 +6,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Crc32.NET" />
+    <PackageReference Include="System.IO.Hashing" />
  </ItemGroup>

  <ItemGroup>
--- a/Ryujinx.Memory.Tests/MockVirtualMemoryManager.cs
+++ b/Ryujinx.Memory.Tests/MockVirtualMemoryManager.cs
@@ -78,7 +78,7 @@ namespace Ryujinx.Memory.Tests

        IEnumerable<MemoryRange> IVirtualMemoryManager.GetPhysicalRegions(ulong va, ulong size)
        {
-            return NoMappings ? new MemoryRange[0] : new MemoryRange[] { new MemoryRange(va, size) };
+            return NoMappings ? Array.Empty<MemoryRange>() : new MemoryRange[] { new MemoryRange(va, size) };
        }

        public bool IsMapped(ulong va)
Author	SHA1	Message	Date
MutantAura	eed17f963e	Increase access permissions for Ava timezones (#4538 )	2023-03-12 17:20:09 +01:00
TSRBerry	c09c0c002d	[Flatpak] Beautify multiline strings again & Add full git commit hash (#4535 ) * Don't destroy multiline strings * Use full git commit hash	2023-03-12 10:42:33 +01:00
Mary	d56d335c0b	misc: Some dependencies cleanup (#4507 ) * Remove dependencies on libraries provided by .NET standard library * Use System.IO.Hashing instead of Crc32.NET	2023-03-12 03:24:11 +01:00
jhorv	23c844b2aa	Misc performance tweaks (#4509 ) * use Array.Empty() where instead of allocating new zero-length arrays * structure for loops in a way that the JIT will elide array/Span bounds checking * avoiding function calls in for loop condition tests * avoid LINQ in a hot path * conform with code style * fix mistake in GetNextWaitingObject() * fix GetNextWaitingObject() possibility of returning null if all list items have TimePoint == long.MaxValue * make GetNextWaitingObject() behave FIFO behavior for multiple items with the same TimePoint	2023-03-11 17:05:48 -03:00