From 1bff889d059802b93e469ccbfa200fd3ec832beb Mon Sep 17 00:00:00 2001 From: Maschell Date: Fri, 2 Aug 2024 18:57:20 +0200 Subject: [PATCH 1/2] nn_idb: Fix copy headers, fix nn::idb::IDBReader::Initialize --- Makefile | 1 + libraries/nn_idb/src/IDBReader.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 0e6526d4a..38cb70b3c 100644 --- a/Makefile +++ b/Makefile @@ -109,6 +109,7 @@ dist-bin: all @tar --exclude=*~ -cjf wut-$(VERSION).tar.bz2 \ include lib share \ -C libraries/libwhb include \ + -C ../nn_idb include \ -C ../libgfd include \ -C ../libirc include diff --git a/libraries/nn_idb/src/IDBReader.cpp b/libraries/nn_idb/src/IDBReader.cpp index c6828641f..1d95771db 100644 --- a/libraries/nn_idb/src/IDBReader.cpp +++ b/libraries/nn_idb/src/IDBReader.cpp @@ -83,7 +83,7 @@ namespace nn::idb { bool IDBReader::Initialize() { uint64_t menuTid = _SYSGetSystemApplicationTitleId(SYSTEM_APP_ID_WII_U_MENU); - auto *menuTidPtr = (uint32_t *) menuTid; + auto *menuTidPtr = (uint32_t *) &menuTid; char path[90]; snprintf(path, sizeof(path), "fs:/vol/storage_mlc01/usr/save/%08X/%08X/user/common/BaristaIconDataBase.dat", menuTidPtr[0], menuTidPtr[1]); From 48eaf62035902b007aafcfc179ef324d88fe0ac5 Mon Sep 17 00:00:00 2001 From: Maschell Date: Fri, 2 Aug 2024 19:55:46 +0200 Subject: [PATCH 2/2] Update libraries/nn_idb/src/IDBReader.cpp Co-authored-by: GaryOderNichts <12049776+GaryOderNichts@users.noreply.github.com> --- libraries/nn_idb/src/IDBReader.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libraries/nn_idb/src/IDBReader.cpp b/libraries/nn_idb/src/IDBReader.cpp index 1d95771db..66b111e92 100644 --- a/libraries/nn_idb/src/IDBReader.cpp +++ b/libraries/nn_idb/src/IDBReader.cpp @@ -83,9 +83,8 @@ namespace nn::idb { bool IDBReader::Initialize() { uint64_t menuTid = _SYSGetSystemApplicationTitleId(SYSTEM_APP_ID_WII_U_MENU); - auto *menuTidPtr = (uint32_t *) &menuTid; char path[90]; - snprintf(path, sizeof(path), "fs:/vol/storage_mlc01/usr/save/%08X/%08X/user/common/BaristaIconDataBase.dat", menuTidPtr[0], menuTidPtr[1]); + snprintf(path, sizeof(path), "fs:/vol/storage_mlc01/usr/save/%08X/%08X/user/common/BaristaIconDataBase.dat", (uint32_t) (menuTid >> 32), (uint32_t) (menuTid & 0xffffffff)); return Initialize(path); }