ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2026-02-25 14:11:48 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Cleanup some warnings

Browse source
This commit is contained in:
wolfcomp 2026-01-27 16:24:05 +01:00 • committed by GitHub
parent 31e6b831c4
commit a403db67e8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Dalamud/Hooking/Internal/Verification/HookVerifier.cs
View file

@ -32,7 +32,6 @@ internal static class HookVerifier
private delegate void ActorControlSelfDelegate(uint category, uint eventId, uint param1, uint param2, uint param3, uint param4, uint param5, uint param6, uint param7, uint param8, ulong targetId, byte param9); // TODO: change this to CS delegate private delegate void ActorControlSelfDelegate(uint category, uint eventId, uint param1, uint param2, uint param3, uint param4, uint param5, uint param6, uint param7, uint param8, ulong targetId, byte param9); // TODO: change this to CS delegate
/// <summary> /// <summary>
/// Initializes a new instance of the <see cref="HookVerifier"/> class. /// Initializes a new instance of the <see cref="HookVerifier"/> class.
/// </summary> /// </summary>
@ -114,7 +113,8 @@ internal static class HookVerifier
return sameType || SizeOf(paramLeft) == SizeOf(paramRight); return sameType || SizeOf(paramLeft) == SizeOf(paramRight);
} }
private static int SizeOf(Type type) { private static int SizeOf(Type type)
{
return type switch { return type switch {
_ when type == typeof(sbyte) || type == typeof(byte) || type == typeof(bool) => 1, _ when type == typeof(sbyte) || type == typeof(byte) || type == typeof(bool) => 1,
_ when type == typeof(char) || type == typeof(short) || type == typeof(ushort) || type == typeof(Half) => 2, _ when type == typeof(char) || type == typeof(short) || type == typeof(ushort) || type == typeof(Half) => 2,
@ -125,19 +125,24 @@ internal static class HookVerifier
_ when IsStruct(type) && !type.IsGenericType && (type.StructLayoutAttribute?.Value ?? LayoutKind.Sequential) != LayoutKind.Sequential => type.StructLayoutAttribute?.Size ?? (int?)typeof(Unsafe).GetMethod("SizeOf")?.MakeGenericMethod(type).Invoke(null, null) ?? 0, _ when IsStruct(type) && !type.IsGenericType && (type.StructLayoutAttribute?.Value ?? LayoutKind.Sequential) != LayoutKind.Sequential => type.StructLayoutAttribute?.Size ?? (int?)typeof(Unsafe).GetMethod("SizeOf")?.MakeGenericMethod(type).Invoke(null, null) ?? 0,
_ when type.IsEnum => SizeOf(Enum.GetUnderlyingType(type)), _ when type.IsEnum => SizeOf(Enum.GetUnderlyingType(type)),
_ when type.IsGenericType => Marshal.SizeOf(Activator.CreateInstance(type)!), _ when type.IsGenericType => Marshal.SizeOf(Activator.CreateInstance(type)!),
_ => GetSizeOf(type) _ => GetSizeOf(type),
}; };
} }
private static int GetSizeOf(Type type) { private static int GetSizeOf(Type type)
try { {
try
{
return Marshal.SizeOf(Activator.CreateInstance(type)!); return Marshal.SizeOf(Activator.CreateInstance(type)!);
} catch { }
catch
{
return 0; return 0;
} }
} }
private static bool IsStruct(Type type) { private static bool IsStruct(Type type)
{
return type != typeof(decimal) && type is { IsValueType: true, IsPrimitive: false, IsEnum: false }; return type != typeof(decimal) && type is { IsValueType: true, IsPrimitive: false, IsEnum: false };
} }