Updated async_decompress_file_section

Also `c_simple_io_result` and `c_xor_cache_file_decompressor `
twist84 · Dec 15, 2024 · 384ee40 · 384ee40
1 parent 0b4ebcc
commit 384ee40
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 29 deletions.
diff --git a/game/source/cache/cache_file_codec_work.cpp b/game/source/cache/cache_file_codec_work.cpp
@@ -3,28 +3,28 @@
 long __cdecl async_decompress_file_section(
 	e_async_priority priority,
 	s_file_handle file_handle,
-	dword a3,
-	dword processed_compressed_size,
-	dword* hash,
-	c_basic_buffer<void> a6,
+	dword offset,
+	dword size,
+	dword const* verify_decompression_hash,
+	c_basic_buffer<void> decompression_scratch_buffer,
 	c_cache_file_decompressor* decompressor,
-	c_basic_buffer<void> a10,
+	c_basic_buffer<void> uncompressed_output_buffer,
 	bool* out_decompression_success,
 	c_synchronized_long* in_abort_signal,
-	c_synchronized_long* a13,
-	c_synchronized_long* done)
+	c_synchronized_long* out_bytes_read,
+	c_synchronized_long* out_done)
 {
 	return INVOKE(0x006ECD80, async_decompress_file_section, priority,
 		file_handle,
-		a3,
-		processed_compressed_size,
-		hash,
-		a6,
+		offset,
+		size,
+		verify_decompression_hash,
+		decompression_scratch_buffer,
 		decompressor,
-		a10,
+		uncompressed_output_buffer,
 		out_decompression_success,
 		in_abort_signal,
-		a13,
-		done);
+		out_bytes_read,
+		out_done);
 }
 
diff --git a/game/source/cache/cache_file_codec_work.hpp b/game/source/cache/cache_file_codec_work.hpp
@@ -33,14 +33,14 @@ enum e_async_priority;
 long __cdecl async_decompress_file_section(
 	e_async_priority priority,
 	s_file_handle file_handle,
-	dword a3,
-	dword processed_compressed_size,
-	dword* hash,
-	c_basic_buffer<void> a6,
+	dword offset,
+	dword size,
+	dword const* verify_decompression_hash,
+	c_basic_buffer<void> decompression_scratch_buffer,
 	c_cache_file_decompressor* decompressor,
-	c_basic_buffer<void> a10,
+	c_basic_buffer<void> uncompressed_output_buffer,
 	bool* out_decompression_success,
 	c_synchronized_long* in_abort_signal,
-	c_synchronized_long* a13,
-	c_synchronized_long* done);
+	c_synchronized_long* out_bytes_read,
+	c_synchronized_long* out_done);
 
diff --git a/game/source/cache/cache_file_io_failure.cpp b/game/source/cache/cache_file_io_failure.cpp
@@ -9,11 +9,11 @@ c_io_result::c_io_result()
 
 c_simple_io_result::c_simple_io_result() :
 	c_io_result(),
-	__unknown4(false),
+	m_any_progress(false),
 	m_fail_boat(false),
 	m_disk_failure(false),
 	m_checksum_failure(false),
-	m_check_success(false)
+	m_checked_failure(false)
 {
 	//DECLFUNC(0x005FB380, c_simple_io_result*, __thiscall, c_simple_io_result*)(this);
 }
@@ -29,7 +29,7 @@ bool c_simple_io_result::check_success()
 {
 	//return INVOKE_CLASS_MEMBER(0x005FB3B0, c_simple_io_result, check_success);
 
-	m_check_success = true;
+	m_checked_failure = true;
 	return !m_disk_failure && !m_fail_boat && !m_checksum_failure;
 }
 

diff --git a/game/source/cache/cache_file_io_failure.hpp b/game/source/cache/cache_file_io_failure.hpp
@@ -29,11 +29,11 @@ struct c_simple_io_result :
 	bool unknown_failure() const;
 
 protected:
-	bool __unknown4;
+	bool m_any_progress;
 	bool m_fail_boat;
 	bool m_disk_failure;
 	bool m_checksum_failure;
-	bool m_check_success;
+	bool m_checked_failure;
 
 	static bool m_halt_and_display_error;
 };

diff --git a/game/source/cache/cache_file_xor_codec.hpp b/game/source/cache/cache_file_xor_codec.hpp
@@ -18,9 +18,9 @@ struct c_xor_cache_file_decompressor :
 		throw;
 	}
 
-	c_basic_buffer<void> __buffer0;
-	c_basic_buffer<void> __buffer8;
-	byte __unknownC; // xor value, *i++ ^= __unknownC
+	c_basic_buffer<void> m_output_buffer;
+	c_basic_buffer<void> m_buffer_left;
+	char const m_xor_value;
 };
 static_assert(sizeof(c_xor_cache_file_decompressor) == sizeof(c_cache_file_decompressor) + 0x14);