Fix various build issues (#572)

Co-authored-by: PabloMK7 <hackyglitch2@gmail.com>

.ci/macos-universal.sh

@@ -11,7 +11,7 @@ BASE_ARTIFACT_ARCH="${BASE_ARTIFACT##*-}"
 mv $BASE_ARTIFACT $BUNDLE_DIR
 
 # Executable binary paths that need to be combined.
-BIN_PATHS=(citra citra-room citra-qt.app/Contents/MacOS/citra-qt)
+BIN_PATHS=(azahar-room azahar.app/Contents/MacOS/azahar)
 
 # Dylib paths that need to be combined.
 IFS=$'\n'
@@ -37,7 +37,7 @@ for OTHER_ARTIFACT in "${ARTIFACTS_LIST[@]:1}"; do
 done
 
 # Re-sign executables and bundles after combining.
-APP_PATHS=(citra citra-room citra-qt.app)
+APP_PATHS=(azahar-room azahar.app)
 for APP_PATH in "${APP_PATHS[@]}"; do
     codesign --deep -fs - $BUNDLE_DIR/$APP_PATH
 done

src/android/app/src/main/jni/native.cpp

@@ -1,4 +1,4 @@
-// Copyright 2019 Citra Emulator Project
+// Copyright Citra Emulator Project / Azahar Emulator Project
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
@@ -449,12 +449,8 @@ jlongArray Java_org_citra_citra_1emu_NativeLibrary_getSystemTitleIds(JNIEnv* env
 jobject Java_org_citra_citra_1emu_NativeLibrary_downloadTitleFromNus([[maybe_unused]] JNIEnv* env,
                                                                      [[maybe_unused]] jobject obj,
                                                                      jlong title) {
-    const auto title_id = static_cast<u64>(title);
-    Service::AM::InstallStatus status = Service::AM::InstallFromNus(title_id);
-    if (status != Service::AM::InstallStatus::Success) {
-        return IDCache::GetJavaCiaInstallStatus(status);
-    }
-    return IDCache::GetJavaCiaInstallStatus(Service::AM::InstallStatus::Success);
+    [[maybe_unused]] const auto title_id = static_cast<u64>(title);
+    return IDCache::GetJavaCiaInstallStatus(Service::AM::InstallStatus::ErrorAborted);
 }
 
 [[maybe_unused]] static bool CheckKgslPresent() {

src/common/hacks/hack_manager.cpp

@@ -1,7 +1,8 @@
-// Copyright 2024 Azahar Emulator Project
+// Copyright Citra Emulator Project / Azahar Emulator Project
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
+#include <algorithm>
 #include "hack_manager.h"
 
 namespace Common::Hacks {

src/core/file_sys/certificate.cpp

@@ -1,9 +1,10 @@
-// Copyright 2024 Azahar Emulator Project
+// Copyright Citra Emulator Project / Azahar Emulator Project
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
 #include <cryptopp/oids.h>
 #include "common/alignment.h"
+#include "common/assert.h"
 #include "common/logging/log.h"
 #include "core/file_sys/certificate.h"
 #include "core/file_sys/signature.h"

src/core/file_sys/otp.h

@@ -1,4 +1,4 @@
-// Copyright 2024 Azahar Emulator Project
+// Copyright Citra Emulator Project / Azahar Emulator Project
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
@@ -84,6 +84,6 @@ public:
     }
 
 private:
-    OTPBin otp = {0};
+    OTPBin otp{};
 };
-} // namespace FileSys
+} // namespace FileSys

src/core/file_sys/ticket.cpp

@@ -1,4 +1,4 @@
-// Copyright 2018 Citra Emulator Project
+// Copyright Citra Emulator Project / Azahar Emulator Project
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
@@ -93,8 +93,9 @@ Loader::ResultStatus Ticket::Load(std::span<const u8> file_data, std::size_t off
         return Loader::ResultStatus::Error;
 
     // Read content index size from the second u32 into it. Actual format is undocumented.
-    const size_t content_index_size = *reinterpret_cast<const u32_be*>(
-        &file_data[offset + content_index_start + 1 * sizeof(u32)]);
+    const size_t content_index_size =
+        static_cast<size_t>(static_cast<u32>(*reinterpret_cast<const u32_be*>(
+            &file_data[offset + content_index_start + 1 * sizeof(u32)])));
     const size_t content_index_end = content_index_start + content_index_size;
 
     if (total_size < content_index_end)

src/core/hle/service/ac/ac.h

@@ -1,4 +1,4 @@
-// Copyright 2016 Citra Emulator Project
+// Copyright Citra Emulator Project / Azahar Emulator Project
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
@@ -187,6 +187,7 @@ protected:
     std::shared_ptr<Kernel::Event> disconnect_event;
 
 private:
+    [[maybe_unused]]
     Core::System& system;
 
     template <class Archive>

src/core/hle/service/am/am.cpp

@@ -1,4 +1,4 @@
-// Copyright 2015 Citra Emulator Project
+// Copyright Citra Emulator Project / Azahar Emulator Project
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
@@ -322,8 +322,8 @@ void NCCHCryptoFile::Write(const u8* buffer, std::size_t length) {
                 if (is_encrypted) {
                     std::vector<u8> temp(to_write);
 
-                    std::array<u8, 16>* key;
-                    std::array<u8, 16>* ctr;
+                    std::array<u8, 16>* key = nullptr;
+                    std::array<u8, 16>* ctr = nullptr;
 
                     if (reg->type == CryptoRegion::EXHEADER) {
                         key = &primary_key;
@@ -2313,6 +2313,8 @@ void Module::Interface::GetNumImportTitleContextsImpl(IPC::RequestParser& rp,
     IPC::RequestBuilder rb = rp.MakeBuilder(3, 0);
     rb.Push(ResultSuccess);
 
+    // TODO: Make this actually do something:
+    /*
     u32 count = 0;
     for (auto it = am->import_title_contexts.begin(); it != am->import_title_contexts.end(); it++) {
         if ((include_installing &&
@@ -2323,6 +2325,7 @@ void Module::Interface::GetNumImportTitleContextsImpl(IPC::RequestParser& rp,
             count++;
         }
     }
+    */
 
     rb.Push<u32>(static_cast<u32>(am->import_title_contexts.size()));
 }

src/core/hle/service/am/am.h

@@ -1,4 +1,4 @@
-// Copyright 2015 Citra Emulator Project
+// Copyright Citra Emulator Project / Azahar Emulator Project
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
@@ -319,9 +319,6 @@ private:
     u64 written = 0;
     std::shared_ptr<CurrentImportingTitle> importing_title;
     u16 index;
-
-    NCCH_Header ncch_header;
-    size_t ncch_copied = 0;
 };
 
 /**

src/core/hw/ecc.cpp

@@ -1,12 +1,14 @@
-// Copyright 2024 Azahar Emulator Project
+// Copyright Citra Emulator Project / Azahar Emulator Project
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
 #include <sstream>
 #include <boost/iostreams/device/file_descriptor.hpp>
 #include <boost/iostreams/stream.hpp>
+#include "common/assert.h"
 #include "common/common_paths.h"
 #include "common/file_util.h"
+#include "common/logging/log.h"
 #include "common/string_util.h"
 #include "core/hw/aes/key.h"
 #include "core/hw/ecc.h"

src/core/hw/unique_data.cpp

@@ -1,8 +1,9 @@
-// Copyright 2024 Azahar Emulator Project
+// Copyright Citra Emulator Project / Azahar Emulator Project
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
 #include "common/common_paths.h"
+#include "common/logging/log.h"
 #include "core/file_sys/certificate.h"
 #include "core/file_sys/otp.h"
 #include "core/hw/aes/key.h"