ToxicMushroom/Penumbra
1
0
Fork 0
mirror of https://github.com/xivdev/Penumbra.git synced 2025-12-13 12:14:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix changed offset and sig for 5.55

Browse source
This commit is contained in:
Ottermandias 2021-05-25 19:01:39 +02:00
parent b22ca96bbd
commit 04c42b7842
2 changed files with 20 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

34
Penumbra/Hooks/ResourceLoader.cs
View file

@ -66,7 +66,7 @@ namespace Penumbra.Hooks
scanner.ScanText( "E8 ?? ?? ?? ?? EB 05 E8 ?? ?? ?? ?? 84 C0 0F 84 ?? 00 00 00 4C 8B C3" ); scanner.ScanText( "E8 ?? ?? ?? ?? EB 05 E8 ?? ?? ?? ?? 84 C0 0F 84 ?? 00 00 00 4C 8B C3" );
var getResourceSyncAddress = var getResourceSyncAddress =
scanner.ScanText( "E8 ?? ?? 00 00 48 8D 4F ?? 48 89 87 ?? ?? 00 00" ); scanner.ScanText( "E8 ?? ?? 00 00 48 8D 8F ?? ?? 00 00 48 89 87 ?? ?? 00 00" );
var getResourceAsyncAddress = var getResourceAsyncAddress =
scanner.ScanText( "E8 ?? ?? ?? 00 48 8B D8 EB ?? F0 FF 83 ?? ?? 00 00" ); scanner.ScanText( "E8 ?? ?? ?? 00 48 8B D8 EB ?? F0 FF 83 ?? ?? 00 00" );
@ -131,31 +131,35 @@ namespace Penumbra.Hooks
} }
private unsafe void* GetResourceHandler( private unsafe void* GetResourceHandler(
bool isSync, bool isSync,
IntPtr pFileManager, IntPtr pFileManager,
uint* pCategoryId, uint* pCategoryId,
char* pResourceType, char* pResourceType,
uint* pResourceHash, uint* pResourceHash,
char* pPath, char* pPath,
void* pUnknown, void* pUnknown,
bool isUnknown bool isUnknown
) )
{ {
var gameFsPath = GamePath.GenerateUncheckedLower( Marshal.PtrToStringAnsi( new IntPtr( pPath ) )! );
if( LogAllFiles )
{
PluginLog.Log( "[GetResourceHandler] {0}", gameFsPath );
}
var modManager = Service< ModManager >.Get(); var modManager = Service< ModManager >.Get();
if( !Plugin!.Configuration!.IsEnabled || modManager == null ) if( !Plugin!.Configuration!.IsEnabled || modManager == null )
{ {
if( LogAllFiles )
{
PluginLog.Log( "[GetResourceHandler] {0}",
GamePath.GenerateUncheckedLower( Marshal.PtrToStringAnsi( new IntPtr( pPath ) )! ) );
}
return CallOriginalHandler( isSync, pFileManager, pCategoryId, pResourceType, pResourceHash, pPath, pUnknown, isUnknown ); return CallOriginalHandler( isSync, pFileManager, pCategoryId, pResourceType, pResourceHash, pPath, pUnknown, isUnknown );
} }
var gameFsPath = GamePath.GenerateUncheckedLower( Marshal.PtrToStringAnsi( new IntPtr( pPath ) )! );
var replacementPath = modManager.ResolveSwappedOrReplacementFilePath( gameFsPath ); var replacementPath = modManager.ResolveSwappedOrReplacementFilePath( gameFsPath );
if( LogAllFiles )
{
PluginLog.Log( "[GetResourceHandler] {0}", gameFsPath );
}
// path must be < 260 because statically defined array length :( // path must be < 260 because statically defined array length :(
if( replacementPath == null ) if( replacementPath == null )

2
Penumbra/Structs/SeFileDescriptor.cs
View file

@ -15,7 +15,7 @@ namespace Penumbra.Structs
public ResourceHandle* ResourceHandle; // public ResourceHandle* ResourceHandle; //
[FieldOffset( 0x68 )] [FieldOffset( 0x70 )]
public byte UtfFileName; // public byte UtfFileName; //
} }
} }