Fixed: Oversight where current file pointer is not overwritten if Byt…

…eOffset specified.
tge-was-taken · Sep 11, 2022 · 20e7740 · 20e7740
1 parent 5e7bfb4
commit 20e7740
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/modloader/Redirectors/Cpk/CpkRedirector.cs b/modloader/Redirectors/Cpk/CpkRedirector.cs
@@ -96,7 +96,7 @@ public override unsafe Native.NtStatus NtReadFileImpl( IntPtr handle, IntPtr hEv
             var cpk = mCpkByHandle[ handle ];
             var effOffset = Utils.ResolveReadFileOffset( cpk.FilePointer, byteOffset );
             Unsafe.CopyBlock( buffer, (byte*)cpk.Instance.Native.Ptr + effOffset, length );
-            SetBytesRead( handle, (int)cpk.FilePointer, (int)length, ref ioStatus );
+            SetBytesRead( handle, (int)effOffset, (int)length, ref ioStatus );
             return NtStatus.Success;
         }
 

diff --git a/modloader/Redirectors/DwPack/DwPackRedirector.cs b/modloader/Redirectors/DwPack/DwPackRedirector.cs
@@ -250,7 +250,7 @@ public override unsafe Native.NtStatus NtReadFileImpl( IntPtr handle, IntPtr hEv
                 }
 
                 Unsafe.CopyBlock( buffer, pack.Native.Ptr + effOffset, length );
-                SetBytesRead( handle, ( int )offset, ( int )length, ref ioStatus );
+                SetBytesRead( handle, ( int )effOffset, ( int )length, ref ioStatus );
                 result = NtStatus.Success;
             }
             else if ( effOffset >= dataOffset && effOffset < pack.VirtualFileSize )

diff --git a/modloader/Redirectors/Xact/XactRedirector.cs b/modloader/Redirectors/Xact/XactRedirector.cs
@@ -334,7 +334,7 @@ public override unsafe Native.NtStatus NtReadFileImpl( IntPtr handle, IntPtr hEv
             {
                 // Header read
                 Unsafe.CopyBlock( buffer, waveBank.Native.Ptr + effOffset, length );
-                SetBytesRead( handle, (int)waveBank.FilePointer, (int)length, ref ioStatus );
+                SetBytesRead( handle, (int)effOffset, (int)length, ref ioStatus );
                 result = NtStatus.Success;
             }
             else if ( effOffset >= waveDataOffset && effOffset < waveBank.VirtualFileSize )