Skip to content

Commit

Permalink
Merge refactored-versioning into master
Browse files Browse the repository at this point in the history
  • Loading branch information
LukeFZ committed Nov 14, 2024
2 parents e6307d0 + 5b0476f commit 97cbf24
Showing 1 changed file with 19 additions and 0 deletions.
19 changes: 19 additions & 0 deletions Il2CppInspector.Common/IL2CPP/Metadata.cs
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,25 @@ private void Initialize()
Header.AttributeDataRangeSize / Sizeof<Il2CppCustomAttributeDataRange>());
}

if (Version is 29 or 31)

Check failure on line 198 in Il2CppInspector.Common/IL2CPP/Metadata.cs

View workflow job for this annotation

GitHub Actions / build-gui

Cannot implicitly convert type 'int' to 'VersionedSerialization.StructVersion'

Check failure on line 198 in Il2CppInspector.Common/IL2CPP/Metadata.cs

View workflow job for this annotation

GitHub Actions / build-gui

Cannot implicitly convert type 'int' to 'VersionedSerialization.StructVersion'

Check failure on line 198 in Il2CppInspector.Common/IL2CPP/Metadata.cs

View workflow job for this annotation

GitHub Actions / build-cli (9.0.x, win-x64)

Cannot implicitly convert type 'int' to 'VersionedSerialization.StructVersion'

Check failure on line 198 in Il2CppInspector.Common/IL2CPP/Metadata.cs

View workflow job for this annotation

GitHub Actions / build-cli (9.0.x, win-x64)

Cannot implicitly convert type 'int' to 'VersionedSerialization.StructVersion'

Check failure on line 198 in Il2CppInspector.Common/IL2CPP/Metadata.cs

View workflow job for this annotation

GitHub Actions / build-cli (9.0.x, osx-arm64)

Cannot implicitly convert type 'int' to 'VersionedSerialization.StructVersion'

Check failure on line 198 in Il2CppInspector.Common/IL2CPP/Metadata.cs

View workflow job for this annotation

GitHub Actions / build-cli (9.0.x, osx-arm64)

Cannot implicitly convert type 'int' to 'VersionedSerialization.StructVersion'
{
// 29.2/31.2 added a new isUnmanagedCallersOnly flag to Il2CppMethodDefinition.
// This offsets all subsequent entries by one - we can detect this by checking the
// top token byte (which should always be 0x06).

if (Methods.Length >= 2)
{
var secondToken = Methods[1].token;

Check failure on line 206 in Il2CppInspector.Common/IL2CPP/Metadata.cs

View workflow job for this annotation

GitHub Actions / build-gui

'Il2CppMethodDefinition' does not contain a definition for 'token' and no accessible extension method 'token' accepting a first argument of type 'Il2CppMethodDefinition' could be found (are you missing a using directive or an assembly reference?)

Check failure on line 206 in Il2CppInspector.Common/IL2CPP/Metadata.cs

View workflow job for this annotation

GitHub Actions / build-cli (9.0.x, win-x64)

'Il2CppMethodDefinition' does not contain a definition for 'token' and no accessible extension method 'token' accepting a first argument of type 'Il2CppMethodDefinition' could be found (are you missing a using directive or an assembly reference?)

Check failure on line 206 in Il2CppInspector.Common/IL2CPP/Metadata.cs

View workflow job for this annotation

GitHub Actions / build-cli (9.0.x, osx-arm64)

'Il2CppMethodDefinition' does not contain a definition for 'token' and no accessible extension method 'token' accepting a first argument of type 'Il2CppMethodDefinition' could be found (are you missing a using directive or an assembly reference?)
if (secondToken >> 24 != 0x6)
{
Version += 0.2;

Check failure on line 209 in Il2CppInspector.Common/IL2CPP/Metadata.cs

View workflow job for this annotation

GitHub Actions / build-gui

Operator '+=' cannot be applied to operands of type 'StructVersion' and 'double'

Check failure on line 209 in Il2CppInspector.Common/IL2CPP/Metadata.cs

View workflow job for this annotation

GitHub Actions / build-cli (9.0.x, win-x64)

Operator '+=' cannot be applied to operands of type 'StructVersion' and 'double'

Check failure on line 209 in Il2CppInspector.Common/IL2CPP/Metadata.cs

View workflow job for this annotation

GitHub Actions / build-cli (9.0.x, osx-arm64)

Operator '+=' cannot be applied to operands of type 'StructVersion' and 'double'

Methods = ReadArray<Il2CppMethodDefinition>(Header.methodsOffset,

Check failure on line 211 in Il2CppInspector.Common/IL2CPP/Metadata.cs

View workflow job for this annotation

GitHub Actions / build-gui

'Il2CppGlobalMetadataHeader' does not contain a definition for 'methodsOffset' and no accessible extension method 'methodsOffset' accepting a first argument of type 'Il2CppGlobalMetadataHeader' could be found (are you missing a using directive or an assembly reference?)

Check failure on line 211 in Il2CppInspector.Common/IL2CPP/Metadata.cs

View workflow job for this annotation

GitHub Actions / build-cli (9.0.x, win-x64)

'Il2CppGlobalMetadataHeader' does not contain a definition for 'methodsOffset' and no accessible extension method 'methodsOffset' accepting a first argument of type 'Il2CppGlobalMetadataHeader' could be found (are you missing a using directive or an assembly reference?)

Check failure on line 211 in Il2CppInspector.Common/IL2CPP/Metadata.cs

View workflow job for this annotation

GitHub Actions / build-cli (9.0.x, osx-arm64)

'Il2CppGlobalMetadataHeader' does not contain a definition for 'methodsOffset' and no accessible extension method 'methodsOffset' accepting a first argument of type 'Il2CppGlobalMetadataHeader' could be found (are you missing a using directive or an assembly reference?)
Header.methodsCount / Sizeof(typeof(Il2CppMethodDefinition)));

Check failure on line 212 in Il2CppInspector.Common/IL2CPP/Metadata.cs

View workflow job for this annotation

GitHub Actions / build-gui

'Il2CppGlobalMetadataHeader' does not contain a definition for 'methodsCount' and no accessible extension method 'methodsCount' accepting a first argument of type 'Il2CppGlobalMetadataHeader' could be found (are you missing a using directive or an assembly reference?)

Check failure on line 212 in Il2CppInspector.Common/IL2CPP/Metadata.cs

View workflow job for this annotation

GitHub Actions / build-gui

No overload for method 'Sizeof' takes 1 arguments

Check failure on line 212 in Il2CppInspector.Common/IL2CPP/Metadata.cs

View workflow job for this annotation

GitHub Actions / build-cli (9.0.x, win-x64)

'Il2CppGlobalMetadataHeader' does not contain a definition for 'methodsCount' and no accessible extension method 'methodsCount' accepting a first argument of type 'Il2CppGlobalMetadataHeader' could be found (are you missing a using directive or an assembly reference?)

Check failure on line 212 in Il2CppInspector.Common/IL2CPP/Metadata.cs

View workflow job for this annotation

GitHub Actions / build-cli (9.0.x, win-x64)

No overload for method 'Sizeof' takes 1 arguments

Check failure on line 212 in Il2CppInspector.Common/IL2CPP/Metadata.cs

View workflow job for this annotation

GitHub Actions / build-cli (9.0.x, osx-arm64)

'Il2CppGlobalMetadataHeader' does not contain a definition for 'methodsCount' and no accessible extension method 'methodsCount' accepting a first argument of type 'Il2CppGlobalMetadataHeader' could be found (are you missing a using directive or an assembly reference?)

Check failure on line 212 in Il2CppInspector.Common/IL2CPP/Metadata.cs

View workflow job for this annotation

GitHub Actions / build-cli (9.0.x, osx-arm64)

No overload for method 'Sizeof' takes 1 arguments
}
}
}

// Get all metadata strings
var pluginGetStringsResult = PluginHooks.GetStrings(this);
if (pluginGetStringsResult.IsDataModified && !pluginGetStringsResult.IsInvalid)
Expand Down

0 comments on commit 97cbf24

Please sign in to comment.