Skip to content

Commit f411dbd

Browse files
committed
Fix size_t offsets for x86 (synced from rebrand)
1 parent d81457d commit f411dbd

File tree

11 files changed

+23
-23
lines changed

11 files changed

+23
-23
lines changed

UnhollowerBaseLib/Runtime/VersionSpecific/Class/Class_24_4.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ internal unsafe struct Il2CppClass_24_4
4949
public uint initializationExceptionGCHandle;
5050
public uint cctor_started;
5151
public uint cctor_finished;
52-
public ulong cctor_thread;
52+
public IntPtr cctor_thread;
5353
public int genericContainerIndex;
5454
public uint instance_size;
5555
public uint actualSize;

UnhollowerBaseLib/Runtime/VersionSpecific/Class/Class_27_0.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ internal unsafe struct Il2CppClass_27_0
4949
public uint initializationExceptionGCHandle;
5050
public uint cctor_started;
5151
public uint cctor_finished;
52-
public ulong cctor_thread;
52+
public IntPtr cctor_thread;
5353
public Il2CppMetadataGenericContainerHandle genericContainerHandle;
5454
public uint instance_size;
5555
public uint actualSize;

UnhollowerBaseLib/Runtime/VersionSpecific/Class/Class_27_1.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ internal unsafe struct Il2CppClass_27_1
4949
public uint initializationExceptionGCHandle;
5050
public uint cctor_started;
5151
public uint cctor_finished;
52-
public ulong cctor_thread;
52+
public IntPtr cctor_thread;
5353
public Il2CppMetadataGenericContainerHandle genericContainerHandle;
5454
public uint instance_size;
5555
public uint actualSize;

UnhollowerBaseLib/Runtime/VersionSpecific/Class/Class_27_2.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ internal unsafe struct Il2CppClass_27_2
4949
public uint initializationExceptionGCHandle;
5050
public uint cctor_started;
5151
public uint cctor_finished;
52-
public ulong cctor_thread;
52+
public IntPtr cctor_thread;
5353
public Il2CppMetadataGenericContainerHandle genericContainerHandle;
5454
public uint instance_size;
5555
public uint actualSize;

UnhollowerBaseLib/Runtime/VersionSpecific/Class/Class_27_3.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ internal unsafe struct Il2CppClass_27_3
4949
public uint initializationExceptionGCHandle;
5050
public uint cctor_started;
5151
public uint cctor_finished;
52-
public ulong cctor_thread;
52+
public IntPtr cctor_thread;
5353
public Il2CppMetadataGenericContainerHandle genericContainerHandle;
5454
public uint instance_size;
5555
public uint actualSize;

UnhollowerBaseLib/Runtime/VersionSpecific/Class/Class_29_0.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ internal unsafe struct Il2CppClass_29_0
4949
public uint initializationExceptionGCHandle;
5050
public uint cctor_started;
5151
public uint cctor_finished_or_no_cctor;
52-
public ulong cctor_thread;
52+
public IntPtr cctor_thread;
5353
public Il2CppMetadataGenericContainerHandle genericContainerHandle;
5454
public uint instance_size;
5555
public uint actualSize;

UnhollowerBaseLib/Runtime/VersionSpecific/Class/Class_29_1.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ internal unsafe struct Il2CppClass_29_1
4949
public uint initializationExceptionGCHandle;
5050
public uint cctor_started;
5151
public uint cctor_finished_or_no_cctor;
52-
public ulong cctor_thread;
52+
public IntPtr cctor_thread;
5353
public Il2CppMetadataGenericContainerHandle genericContainerHandle;
5454
public uint instance_size;
5555
public uint stack_slot_size;

UnhollowerBaseLib/Runtime/VersionSpecific/Image/Image_27_0.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public INativeImageStruct CreateNewStruct()
1212
Il2CppImage_27_0* _ = (Il2CppImage_27_0*)ptr;
1313
*_ = default;
1414
Il2CppImageGlobalMetadata* metadata = (Il2CppImageGlobalMetadata*)Marshal.AllocHGlobal(sizeof(Il2CppImageGlobalMetadata));
15-
metadata->image = (Il2CppImage*)ptr;
15+
metadata->image = (Il2CppImage*)_;
1616
*(Il2CppImageGlobalMetadata**)&_->metadataHandle = metadata;
1717
return new NativeStructWrapper(ptr);
1818
}

UnhollowerBaseLib/Runtime/VersionSpecific/ParameterInfo/ParameterInfo_16_0.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,26 @@ internal class NativeParameterInfoStructHandler_16_0 : INativeParameterInfoStruc
99
public unsafe int Size() => sizeof(Il2CppParameterInfo_16_0);
1010
public unsafe Il2CppParameterInfo*[] CreateNewParameterInfoArray(int paramCount)
1111
{
12-
var ptr = (Il2CppParameterInfo_16_0*) Marshal.AllocHGlobal(Marshal.SizeOf<Il2CppParameterInfo_16_0>() * paramCount);
12+
var ptr = (Il2CppParameterInfo_16_0*)Marshal.AllocHGlobal(Marshal.SizeOf<Il2CppParameterInfo_16_0>() * paramCount);
1313
var res = new Il2CppParameterInfo*[paramCount];
1414
for (var i = 0; i < paramCount; i++)
1515
{
1616
ptr[i] = default;
17-
res[i] = (Il2CppParameterInfo*) &ptr[i];
17+
res[i] = (Il2CppParameterInfo*)&ptr[i];
1818
}
1919
return res;
2020
}
2121

22-
public unsafe INativeParameterInfoStruct Wrap(Il2CppParameterInfo* paramInfoPointer)
22+
public unsafe INativeParameterInfoStruct? Wrap(Il2CppParameterInfo* paramInfoPointer)
2323
{
2424
if ((IntPtr)paramInfoPointer == IntPtr.Zero) return null;
25-
else return new NativeParameterInfoStructWrapper((IntPtr) paramInfoPointer);
25+
else return new NativeParameterInfoStructWrapper((IntPtr)paramInfoPointer);
2626
}
2727

28-
public unsafe INativeParameterInfoStruct Wrap(Il2CppParameterInfo* paramInfoListBegin, int index)
28+
public unsafe INativeParameterInfoStruct? Wrap(Il2CppParameterInfo* paramInfoListBegin, int index)
2929
{
3030
if ((IntPtr)paramInfoListBegin == IntPtr.Zero) return null;
31-
else return new NativeParameterInfoStructWrapper((IntPtr) paramInfoListBegin + (Marshal.SizeOf<Il2CppParameterInfo_16_0>() * index));
31+
else return new NativeParameterInfoStructWrapper((IntPtr)paramInfoListBegin + (Marshal.SizeOf<Il2CppParameterInfo_16_0>() * index));
3232
}
3333

3434
public bool HasNamePosToken => true;

UnhollowerBaseLib/Runtime/VersionSpecific/ParameterInfo/ParameterInfo_24_1.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,26 @@ internal class NativeParameterInfoStructHandler_24_1 : INativeParameterInfoStruc
99
public unsafe int Size() => sizeof(Il2CppParameterInfo_24_1);
1010
public unsafe Il2CppParameterInfo*[] CreateNewParameterInfoArray(int paramCount)
1111
{
12-
var ptr = (Il2CppParameterInfo_24_1*) Marshal.AllocHGlobal(Marshal.SizeOf<Il2CppParameterInfo_24_1>() * paramCount);
12+
var ptr = (Il2CppParameterInfo_24_1*)Marshal.AllocHGlobal(Marshal.SizeOf<Il2CppParameterInfo_24_1>() * paramCount);
1313
var res = new Il2CppParameterInfo*[paramCount];
1414
for (var i = 0; i < paramCount; i++)
1515
{
1616
ptr[i] = default;
17-
res[i] = (Il2CppParameterInfo*) &ptr[i];
17+
res[i] = (Il2CppParameterInfo*)&ptr[i];
1818
}
1919
return res;
2020
}
2121

22-
public unsafe INativeParameterInfoStruct Wrap(Il2CppParameterInfo* paramInfoPointer)
22+
public unsafe INativeParameterInfoStruct? Wrap(Il2CppParameterInfo* paramInfoPointer)
2323
{
2424
if ((IntPtr)paramInfoPointer == IntPtr.Zero) return null;
25-
else return new NativeParameterInfoStructWrapper((IntPtr) paramInfoPointer);
25+
else return new NativeParameterInfoStructWrapper((IntPtr)paramInfoPointer);
2626
}
2727

28-
public unsafe INativeParameterInfoStruct Wrap(Il2CppParameterInfo* paramInfoListBegin, int index)
28+
public unsafe INativeParameterInfoStruct? Wrap(Il2CppParameterInfo* paramInfoListBegin, int index)
2929
{
3030
if ((IntPtr)paramInfoListBegin == IntPtr.Zero) return null;
31-
else return new NativeParameterInfoStructWrapper((IntPtr) paramInfoListBegin + (Marshal.SizeOf<Il2CppParameterInfo_24_1>() * index));
31+
else return new NativeParameterInfoStructWrapper((IntPtr)paramInfoListBegin + (Marshal.SizeOf<Il2CppParameterInfo_24_1>() * index));
3232
}
3333

3434
public bool HasNamePosToken => true;

0 commit comments

Comments
 (0)