From d660a82997f24747b54e4ecea141c241d8336bcb Mon Sep 17 00:00:00 2001
From: Gliniak <Gliniak93@gmail.com>
Date: Sun, 5 Jan 2025 17:59:15 +0100
Subject: [PATCH] [XContent] Aggregate license mask from all licenses while
 installing package

This should fix issues with some DLCs
---
 src/xenia/vfs/devices/stfs_xbox.h                 | 4 +++-
 src/xenia/vfs/devices/xcontent_container_device.h | 8 +++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/xenia/vfs/devices/stfs_xbox.h b/src/xenia/vfs/devices/stfs_xbox.h
index cc63c0c34..913db3390 100644
--- a/src/xenia/vfs/devices/stfs_xbox.h
+++ b/src/xenia/vfs/devices/stfs_xbox.h
@@ -468,10 +468,12 @@ struct XContentMetadata {
 };
 static_assert_size(XContentMetadata, 0x93D6);
 
+static constexpr uint8_t license_count = 0x10;
+
 struct XContentHeader {
   be<XContentPackageType> magic;
   uint8_t signature[0x228];
-  XContentLicense licenses[0x10];
+  XContentLicense licenses[license_count];
   uint8_t content_id[0x14];
   be<uint32_t> header_size;
 
diff --git a/src/xenia/vfs/devices/xcontent_container_device.h b/src/xenia/vfs/devices/xcontent_container_device.h
index 26c074fe9..7faa6ea76 100644
--- a/src/xenia/vfs/devices/xcontent_container_device.h
+++ b/src/xenia/vfs/devices/xcontent_container_device.h
@@ -65,7 +65,13 @@ class XContentContainerDevice : public Device {
 
   kernel::xam::XCONTENT_AGGREGATE_DATA content_header() const;
   uint32_t license_mask() const {
-    return header_->content_header.licenses[0].license_bits;
+    uint32_t final_license = 0;
+    for (uint8_t i = 0; i < license_count; i++) {
+      if (header_->content_header.licenses[i].license_flags) {
+        final_license |= header_->content_header.licenses[i].license_bits;
+      }
+    }
+    return final_license;
   }
 
  protected: