Merge remote-tracking branch 'ottercorp/cn' into cn

Author: zhyupe

FFXIVClientStructs/FFXIV/Client/Game/Control/TargetSystem.cs

@@ -63,7 +63,7 @@ public unsafe partial struct TargetSystem {
     [MemberFunction("E9 ?? ?? ?? ?? 48 8B 01 FF 50 08 48 8B C8")]
     public partial ulong InteractWithObject(GameObject* obj, bool checkLineOfSight = true);
 
-    [MemberFunction("E8 ?? ?? ?? ?? E9 ?? ?? ?? ?? 48 8B 94")]
+    [MemberFunction("E9 ?? ?? ?? ?? 8B C0 48 8D 0D ?? ?? ?? ?? 45 33 C9")]
     public partial void OpenObjectInteraction(GameObject* obj);
 
     [MemberFunction("E8 ?? ?? ?? ?? 48 8B D8 48 85 C0 74 50 48 8B CB")]

FFXIVClientStructs/FFXIV/Client/System/Framework/Framework.cs

@@ -21,7 +21,7 @@ namespace FFXIVClientStructs.FFXIV.Client.System.Framework;
 [VirtualTable("48 8D 05 ?? ?? ?? ?? 66 C7 41 ?? ?? ?? 48 89 01 48 8B F1", 3)]
 [StructLayout(LayoutKind.Explicit, Size = 0x35F0)]
 public unsafe partial struct Framework {
-    [StaticAddress("49 8B DC 48 89 1D ?? ?? ?? ??", 6, isPointer: true)]
+    [StaticAddress("48 8B 1D ?? ?? ?? ?? 8B 7C 24 64", 3, isPointer: true)]
     public static partial Framework* Instance();
 
     [FieldOffset(0x0010)] public SystemConfig SystemConfig;

FFXIVClientStructs/FFXIV/Client/System/Memory/IMemorySpace.cs

@@ -9,8 +9,9 @@ public interface ICreatable {
 [StructLayout(LayoutKind.Explicit, Size = 8)]
 public unsafe partial struct IMemorySpace {
     public T* Create<T>() where T : unmanaged, ICreatable {
-        var memory = Calloc<T>(1);
+        var memory = (T*)Malloc<T>();
         if (memory is null) return null;
+        Memset(memory, 0, (ulong)sizeof(T));
         memory->Ctor();
         return memory;
     }

FFXIVClientStructs/FFXIV/Client/UI/Agent/AgentContext.cs

@@ -49,7 +49,7 @@ public unsafe partial struct AgentContext {
     [FieldOffset(0x17D9)] public byte ContextMenuIndex;
     [FieldOffset(0x17DA)] public byte OpenAtPosition; // if true menu opens at Position else at cursor location
 
-    [MemberFunction("E8 ?? ?? ?? ?? 45 88 74 24")]
+    [MemberFunction("E8 ?? ?? ?? ?? 32 C0 EB 84")]
     public partial void OpenContextMenu(bool bindToOwner = true, bool closeExisting = true);
 
     [MemberFunction("41 0F B6 C0 89 91")]

FFXIVClientStructs/FFXIV/Client/UI/Agent/AgentMutelist.cs

@@ -13,7 +13,7 @@ public unsafe partial struct AgentMutelist {
     [FieldOffset(0x58)] public ulong SelectedPlayerAccountId;
     [FieldOffset(0x68)] public Utf8String SelectedPlayerFullName; // includes cross world icon
 
-    [MemberFunction("E8 ?? ?? ?? ?? EB 32 E8 ?? ?? ?? ?? 84 C0"), GenerateStringOverloads]
+    [MemberFunction("E8 ?? ?? ?? ?? 48 8B 5C 24 ?? 48 8B 7C 24 ?? 48 83 C4 30 5E C3 E8"), GenerateStringOverloads]
     public partial bool Add(ulong accountId, ulong contentId, CStringPointer name, short worldId);
 
     [MemberFunction("E8 ?? ?? ?? ?? 8B 54 24 50 48 8B CB E8 ?? ?? ?? ?? 48 8B 5C 24")]

FFXIVClientStructs/FFXIV/Client/UI/Misc/BannerHelper.cs

@@ -18,7 +18,7 @@ public unsafe partial struct BannerHelper {
 
     #region CharaView Helpers
 
-    [MemberFunction("48 89 5C 24 ?? 57 48 83 EC 30 41 0F B7 40")]
+    [MemberFunction("E8 ?? ?? ?? ?? 0F 2E F0 7A 13")]
     public partial void ExportedPortraitData_ApplyBannerModuleEntry(ExportedPortraitData* to, BannerModuleEntry* from);
 
     [MemberFunction("E8 ?? ?? ?? ?? F6 45 72 01")]

FFXIVClientStructs/FFXIV/Client/UI/Misc/RaptureLogModule.cs

@@ -68,7 +68,7 @@ public unsafe partial struct RaptureLogModule {
     [MemberFunction("E8 ?? ?? ?? ?? 40 80 C6 41"), GenerateStringOverloads]
     public partial void PrintString(CStringPointer str);
 
-    [MemberFunction("E8 ?? ?? ?? ?? 84 C0 0F 84 ?? ?? ?? ?? 48 8D 96 ?? ?? ?? ?? 48 8D 4C 24")]
+    [MemberFunction("E8 ?? ?? ?? ?? 84 C0 0F 84 ?? ?? ?? ?? 48 8D 4D B0 E8 ?? ?? ?? ?? 48 8B D0")]
     public partial bool GetLogMessage(int index, Utf8String* str);
 
     [MemberFunction("E8 ?? ?? ?? ?? 84 C0 74 51 44 0F B6 95")]

FFXIVClientStructs/FFXIV/Client/UI/RaptureAtkModule.cs

@@ -32,20 +32,20 @@ public unsafe partial struct RaptureAtkModule {
     [FieldOffset(0x86E0)] public Utf8String BoldOn; // <bold(1)>
     [FieldOffset(0x8748)] public Utf8String BoldOff; // <bold(0)>
 
-    [FieldOffset(0x87F7)] public AgentUpdateFlags AgentUpdateFlag; // reset happens in RaptureAtkModule_OnUpdate
-    [FieldOffset(0x87F8)] internal fixed byte AddonAllocators[0x28 * 917];
-    [FieldOffset(0x11740)] public StdVector<Utf8String> AddonNames;
-    [FieldOffset(0x11758)] public AddonConfig* AddonConfigPtr;
-
-    [FieldOffset(0x11810)] public UIModule* UIModulePtr;
-    [FieldOffset(0x11818)] public RaptureLogModule* RaptureLogModulePtr;
-    [FieldOffset(0x11820)] public AgentModule AgentModule;
-    [FieldOffset(0x12718)] public RaptureHotbarModule* RaptureHotbarModulePtr;
-    [FieldOffset(0x12720)] public RaptureAtkUnitManager RaptureAtkUnitManager;
-    [FieldOffset(0x1C438)] public RaptureAtkColorDataManager RaptureAtkColorDataManager;
-
-    [FieldOffset(0x1C6B8)] public int NameplateInfoCount;
-    [FieldOffset(0x1C6C0), FixedSizeArray] internal FixedSizeArray50<NamePlateInfo> _namePlateInfoEntries;
+    [FieldOffset(0x87F7 - 0x10)] public AgentUpdateFlags AgentUpdateFlag; // reset happens in RaptureAtkModule_OnUpdate
+    [FieldOffset(0x87F8 - 0x10)] internal fixed byte AddonAllocators[0x28 * 917];
+    [FieldOffset(0x11740 - 0x10)] public StdVector<Utf8String> AddonNames;
+    [FieldOffset(0x11758 - 0x10)] public AddonConfig* AddonConfigPtr;
+
+    [FieldOffset(0x11810 - 0x10)] public UIModule* UIModulePtr;
+    [FieldOffset(0x11818 - 0x10)] public RaptureLogModule* RaptureLogModulePtr;
+    [FieldOffset(0x11820 - 0x10)] public AgentModule AgentModule;
+    [FieldOffset(0x12718 - 0x10)] public RaptureHotbarModule* RaptureHotbarModulePtr;
+    [FieldOffset(0x12720 - 0x10)] public RaptureAtkUnitManager RaptureAtkUnitManager;
+    [FieldOffset(0x1C438 - 0x10)] public RaptureAtkColorDataManager RaptureAtkColorDataManager;
+
+    [FieldOffset(0x1C6B8 - 0x10)] public int NameplateInfoCount;
+    [FieldOffset(0x1C6C0 - 0x10), FixedSizeArray] internal FixedSizeArray50<NamePlateInfo> _namePlateInfoEntries;
 
     [FieldOffset(0x23B38), FixedSizeArray] internal FixedSizeArray18<CrystalCache> _crystalItemCache;
     [FieldOffset(0x245E8)] public ItemCache* KeyItemCache; // ptr to 120 entries

FFXIVClientStructs/FFXIV/Component/GUI/AtkModule.cs

@@ -38,7 +38,7 @@ public unsafe partial struct AtkModule {
     [FieldOffset(0x72A0)] public StdMap<uint, AddonCallbackEntry> AddonCallbackMapping; // Key is UnitBase->Id
     [FieldOffset(0x72B0)] public AtkMessageBoxManager* AtkMessageBoxManager;
     [FieldOffset(0x72B8)] public TextService TextService;
-    [FieldOffset(0x72E8)] public AtkTextInput TextInput;
+    [FieldOffset(0x72D8)] public AtkTextInput TextInput;
     [FieldOffset(0x7FA8)] internal Utf8String Unk7FA8;
     [FieldOffset(0x8010)] internal Utf8String Unk8010;
     [FieldOffset(0x8078)] internal Utf8String Unk8078;

FFXIVClientStructs/FFXIVClientStructs.csproj

@@ -50,6 +50,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="JetBrains.Annotations" Version="2024.2.0" />
     <ProjectReference Include="..\FFXIVClientStructs.Generators\FFXIVClientStructs.Generators.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
     <ProjectReference Include="..\InteropGenerator\InteropGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
     <ProjectReference Include="..\InteropGenerator.Runtime\InteropGenerator.Runtime.csproj" />