[CPU/Kernel] Correct parsing of XEX_HEADER_IMPORT_LIBRARIES.

2018-11-24 04:05:41 -06:00
parent b3d509eb01
commit 207589e5a1
3 changed files with 51 additions and 39 deletions
--- a/src/xenia/kernel/util/xex2_info.h
+++ b/src/xenia/kernel/util/xex2_info.h
@@ -474,10 +474,12 @@ struct xex2_opt_execution_info {
 static_assert_size(xex2_opt_execution_info, 0x18);

 struct xex2_opt_import_libraries {
-  xe::be<uint32_t> section_size;       // 0x0
-  xe::be<uint32_t> string_table_size;  // 0x4
-  xe::be<uint32_t> library_count;      // 0x8
-  char string_table[1];                // 0xC string_table_size bytes
+  xe::be<uint32_t> size;  // 0x0
+  struct {
+    xe::be<uint32_t> size;   // 0x4
+    xe::be<uint32_t> count;  // 0x8
+    char data[1];            // 0xC string_table_size bytes
+  } string_table;
 };

 struct xex2_import_library {