nold/nstool
1
0
Fork 0
mirror of https://github.com/jakcron/nstool synced 2024-11-15 02:06:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #36 from jakcron/nacp-development

Browse source 
[nx|nstool] Fix bugs in NACP processing.
This commit is contained in:
Jack 2018-07-31 14:27:23 +09:00 committed by GitHub
commit bc83c06c74
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 47 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/libnx/include/nx/ApplicationControlPropertyBinary.h
View file

@ -116,6 +116,9 @@ namespace nx
nacp::AttributeFlag getAttributeFlag() const; nacp::AttributeFlag getAttributeFlag() const;
void setAttributeFlag(nacp::AttributeFlag var); void setAttributeFlag(nacp::AttributeFlag var);
const fnd::List<nacp::Language>& getSupportedLanguages() const;
void setSupportedLanguages(const fnd::List<nacp::Language>& var);
nacp::ParentalControlFlag getParentalControlFlag() const; nacp::ParentalControlFlag getParentalControlFlag() const;
void setParentalControlFlag(nacp::ParentalControlFlag var); void setParentalControlFlag(nacp::ParentalControlFlag var);
@ -197,8 +200,8 @@ namespace nx
int64_t getCacheStorageDataAndJournalSizeMax() const; int64_t getCacheStorageDataAndJournalSizeMax() const;
void setCacheStorageDataAndJournalSizeMax(int64_t var); void setCacheStorageDataAndJournalSizeMax(int64_t var);
uint16_t getCacheStorageIndex() const; uint16_t getCacheStorageIndexMax() const;
void setCacheStorageIndex(uint16_t var); void setCacheStorageIndexMax(uint16_t var);
const fnd::List<uint64_t>& getPlayLogQueryableApplicationId() const; const fnd::List<uint64_t>& getPlayLogQueryableApplicationId() const;
void setPlayLogQueryableApplicationId(const fnd::List<uint64_t>& var); void setPlayLogQueryableApplicationId(const fnd::List<uint64_t>& var);
@ -226,6 +229,7 @@ namespace nx
nacp::TouchScreenUsageMode mTouchScreenUsageMode; nacp::TouchScreenUsageMode mTouchScreenUsageMode;
nacp::AocRegistrationType mAocRegistrationType; nacp::AocRegistrationType mAocRegistrationType;
nacp::AttributeFlag mAttributeFlag; nacp::AttributeFlag mAttributeFlag;
fnd::List<nx::nacp::Language> mSupportedLanguages;
nacp::ParentalControlFlag mParentalControlFlag; nacp::ParentalControlFlag mParentalControlFlag;
nacp::ScreenshotMode mScreenshotMode; nacp::ScreenshotMode mScreenshotMode;
nacp::VideoCaptureMode mVideoCaptureMode; nacp::VideoCaptureMode mVideoCaptureMode;
@ -253,7 +257,7 @@ namespace nx
int64_t mTemporaryStorageSize; int64_t mTemporaryStorageSize;
sStorageSize mCacheStorageSize; sStorageSize mCacheStorageSize;
int64_t mCacheStorageDataAndJournalSizeMax; int64_t mCacheStorageDataAndJournalSizeMax;
uint16_t mCacheStorageIndex; uint16_t mCacheStorageIndexMax;
fnd::List<uint64_t> mPlayLogQueryableApplicationId; fnd::List<uint64_t> mPlayLogQueryableApplicationId;
nacp::PlayLogQueryCapability mPlayLogQueryCapability; nacp::PlayLogQueryCapability mPlayLogQueryCapability;
nacp::RepairFlag mRepairFlag; nacp::RepairFlag mRepairFlag;

2
lib/libnx/include/nx/nacp.h
View file

@ -208,7 +208,7 @@ namespace nx
le_uint64_t cache_storage_size; le_uint64_t cache_storage_size;
le_uint64_t cache_storage_journal_size; le_uint64_t cache_storage_journal_size;
le_uint64_t cache_storage_data_and_journal_size_max; le_uint64_t cache_storage_data_and_journal_size_max;
le_uint16_t cache_storage_index; le_uint16_t cache_storage_index_max;
byte_t reserved_03[6]; byte_t reserved_03[6];
le_uint64_t play_log_queryable_application_id[nacp::kPlayLogQueryableApplicationIdCount]; le_uint64_t play_log_queryable_application_id[nacp::kPlayLogQueryableApplicationIdCount];
byte_t play_log_query_capability; byte_t play_log_query_capability;

54
lib/libnx/source/ApplicationControlPropertyBinary.cpp
View file

@ -19,6 +19,7 @@ void nx::ApplicationControlPropertyBinary::operator=(const ApplicationControlPro
mTouchScreenUsageMode = other.mTouchScreenUsageMode; mTouchScreenUsageMode = other.mTouchScreenUsageMode;
mAocRegistrationType = other.mAocRegistrationType; mAocRegistrationType = other.mAocRegistrationType;
mAttributeFlag = other.mAttributeFlag; mAttributeFlag = other.mAttributeFlag;
mSupportedLanguages = other.mSupportedLanguages;
mParentalControlFlag = other.mParentalControlFlag; mParentalControlFlag = other.mParentalControlFlag;
mScreenshotMode = other.mScreenshotMode; mScreenshotMode = other.mScreenshotMode;
mVideoCaptureMode = other.mVideoCaptureMode; mVideoCaptureMode = other.mVideoCaptureMode;
@ -46,7 +47,7 @@ void nx::ApplicationControlPropertyBinary::operator=(const ApplicationControlPro
mTemporaryStorageSize = other.mTemporaryStorageSize; mTemporaryStorageSize = other.mTemporaryStorageSize;
mCacheStorageSize = other.mCacheStorageSize; mCacheStorageSize = other.mCacheStorageSize;
mCacheStorageDataAndJournalSizeMax = other.mCacheStorageDataAndJournalSizeMax; mCacheStorageDataAndJournalSizeMax = other.mCacheStorageDataAndJournalSizeMax;
mCacheStorageIndex = other.mCacheStorageIndex; mCacheStorageIndexMax = other.mCacheStorageIndexMax;
mPlayLogQueryableApplicationId = other.mPlayLogQueryableApplicationId; mPlayLogQueryableApplicationId = other.mPlayLogQueryableApplicationId;
mPlayLogQueryCapability = other.mPlayLogQueryCapability; mPlayLogQueryCapability = other.mPlayLogQueryCapability;
mRepairFlag = other.mRepairFlag; mRepairFlag = other.mRepairFlag;
@ -61,6 +62,7 @@ bool nx::ApplicationControlPropertyBinary::operator==(const ApplicationControlPr
&& (mTouchScreenUsageMode == other.mTouchScreenUsageMode) \ && (mTouchScreenUsageMode == other.mTouchScreenUsageMode) \
&& (mAocRegistrationType == other.mAocRegistrationType) \ && (mAocRegistrationType == other.mAocRegistrationType) \
&& (mAttributeFlag == other.mAttributeFlag) \ && (mAttributeFlag == other.mAttributeFlag) \
&& (mSupportedLanguages == other.mSupportedLanguages) \
&& (mParentalControlFlag == other.mParentalControlFlag) \ && (mParentalControlFlag == other.mParentalControlFlag) \
&& (mScreenshotMode == other.mScreenshotMode) \ && (mScreenshotMode == other.mScreenshotMode) \
&& (mVideoCaptureMode == other.mVideoCaptureMode) \ && (mVideoCaptureMode == other.mVideoCaptureMode) \
@ -88,7 +90,7 @@ bool nx::ApplicationControlPropertyBinary::operator==(const ApplicationControlPr
&& (mTemporaryStorageSize == other.mTemporaryStorageSize) \ && (mTemporaryStorageSize == other.mTemporaryStorageSize) \
&& (mCacheStorageSize == other.mCacheStorageSize) \ && (mCacheStorageSize == other.mCacheStorageSize) \
&& (mCacheStorageDataAndJournalSizeMax == other.mCacheStorageDataAndJournalSizeMax) \ && (mCacheStorageDataAndJournalSizeMax == other.mCacheStorageDataAndJournalSizeMax) \
&& (mCacheStorageIndex == other.mCacheStorageIndex) \ && (mCacheStorageIndexMax == other.mCacheStorageIndexMax) \
&& (mPlayLogQueryableApplicationId == other.mPlayLogQueryableApplicationId) \ && (mPlayLogQueryableApplicationId == other.mPlayLogQueryableApplicationId) \
&& (mPlayLogQueryCapability == other.mPlayLogQueryCapability) \ && (mPlayLogQueryCapability == other.mPlayLogQueryCapability) \
&& (mRepairFlag == other.mRepairFlag) \ && (mRepairFlag == other.mRepairFlag) \
@ -107,13 +109,17 @@ void nx::ApplicationControlPropertyBinary::toBytes()
sApplicationControlProperty* data = (sApplicationControlProperty*)mRawBinary.data(); sApplicationControlProperty* data = (sApplicationControlProperty*)mRawBinary.data();
// strings // strings
uint32_t supported_langs = 0;
for (size_t i = 0; i < mTitle.size(); i++) for (size_t i = 0; i < mTitle.size(); i++)
{ {
supported_langs = _BIT(mTitle[i].language);
strncpy(data->title[mTitle[i].language].name, mTitle[i].name.c_str(), nacp::kNameLength); strncpy(data->title[mTitle[i].language].name, mTitle[i].name.c_str(), nacp::kNameLength);
strncpy(data->title[mTitle[i].language].publisher, mTitle[i].publisher.c_str(), nacp::kPublisherLength); strncpy(data->title[mTitle[i].language].publisher, mTitle[i].publisher.c_str(), nacp::kPublisherLength);
} }
uint32_t supported_langs = 0;
for (size_t i = 0; i < mSupportedLanguages.size(); i++)
{
supported_langs |= _BIT(mSupportedLanguages[i]);
}
data->supported_language_flag = supported_langs; data->supported_language_flag = supported_langs;
strncpy(data->isbn, mIsbn.c_str(), nacp::kIsbnLength); strncpy(data->isbn, mIsbn.c_str(), nacp::kIsbnLength);
@ -157,7 +163,7 @@ void nx::ApplicationControlPropertyBinary::toBytes()
{ {
data->play_log_queryable_application_id[i] = mPlayLogQueryableApplicationId[i]; data->play_log_queryable_application_id[i] = mPlayLogQueryableApplicationId[i];
} }
data->cache_storage_index = mCacheStorageIndex; data->cache_storage_index_max = mCacheStorageIndexMax;
data->program_index = mProgramIndex; data->program_index = mProgramIndex;
// sizes // sizes
@ -195,17 +201,22 @@ void nx::ApplicationControlPropertyBinary::fromBytes(const byte_t* bytes, size_t
{ {
if (_HAS_BIT(data->supported_language_flag.get(), i)) if (_HAS_BIT(data->supported_language_flag.get(), i))
{ {
mTitle.addElement({(nacp::Language)i, std::string(data->title[i].name, nacp::kNameLength), std::string(data->title[i].publisher, nacp::kPublisherLength)}); mSupportedLanguages.addElement((nacp::Language)i);
}
if (data->title[i].name[0] != '\0' && data->title[i].publisher[0] != '\0')
{
mTitle.addElement({ (nacp::Language)i, std::string(data->title[i].name, _MIN(strlen(data->title[i].name), nacp::kNameLength)), std::string(data->title[i].publisher, _MIN(strlen(data->title[i].publisher), nacp::kPublisherLength)) });
} }
} }
if (data->isbn[0] != 0) if (data->isbn[0] != 0)
mIsbn = std::string(data->isbn, nacp::kIsbnLength); mIsbn = std::string(data->isbn, _MIN(strlen(data->isbn), nacp::kIsbnLength));
if (data->display_version[0] != 0) if (data->display_version[0] != 0)
mDisplayVersion = std::string(data->display_version, nacp::kDisplayVersionLength); mDisplayVersion = std::string(data->display_version, _MIN(strlen(data->display_version), nacp::kDisplayVersionLength));
if (data->application_error_code_category[0] != 0) if (data->application_error_code_category[0] != 0)
mApplicationErrorCodeCategory = std::string(data->application_error_code_category, nacp::kApplicationErrorCodeCategoryLength); mApplicationErrorCodeCategory = std::string(data->application_error_code_category, _MIN(strlen(data->application_error_code_category), nacp::kApplicationErrorCodeCategoryLength));
if (data->bcat_passphrase[0] != 0) if (data->bcat_passphrase[0] != 0)
mBcatPassphase = std::string(data->bcat_passphrase, nacp::kBcatPassphraseLength); mBcatPassphase = std::string(data->bcat_passphrase, _MIN(strlen(data->bcat_passphrase), nacp::kBcatPassphraseLength));
// enum type casts // enum type casts
mStartupUserAccount = (nacp::StartupUserAccount)data->startup_user_account; mStartupUserAccount = (nacp::StartupUserAccount)data->startup_user_account;
@ -245,7 +256,7 @@ void nx::ApplicationControlPropertyBinary::fromBytes(const byte_t* bytes, size_t
if (data->play_log_queryable_application_id[i].get() != 0) if (data->play_log_queryable_application_id[i].get() != 0)
mPlayLogQueryableApplicationId.addElement(data->play_log_queryable_application_id[i].get()); mPlayLogQueryableApplicationId.addElement(data->play_log_queryable_application_id[i].get());
} }
mCacheStorageIndex = data->cache_storage_index.get(); mCacheStorageIndexMax = data->cache_storage_index_max.get();
mProgramIndex = data->program_index; mProgramIndex = data->program_index;
// sizes // sizes
@ -278,6 +289,7 @@ void nx::ApplicationControlPropertyBinary::clear()
mTouchScreenUsageMode = nacp::TOUCH_None; mTouchScreenUsageMode = nacp::TOUCH_None;
mAocRegistrationType = nacp::AOC_AllOnLaunch; mAocRegistrationType = nacp::AOC_AllOnLaunch;
mAttributeFlag = nacp::ATTR_None; mAttributeFlag = nacp::ATTR_None;
mSupportedLanguages.clear();
mParentalControlFlag = nacp::PC_None; mParentalControlFlag = nacp::PC_None;
mScreenshotMode = nacp::SCRN_Allow; mScreenshotMode = nacp::SCRN_Allow;
mVideoCaptureMode = nacp::VCAP_Disable; mVideoCaptureMode = nacp::VCAP_Disable;
@ -305,7 +317,7 @@ void nx::ApplicationControlPropertyBinary::clear()
mTemporaryStorageSize = 0; mTemporaryStorageSize = 0;
mCacheStorageSize = {0, 0}; mCacheStorageSize = {0, 0};
mCacheStorageDataAndJournalSizeMax = 0; mCacheStorageDataAndJournalSizeMax = 0;
mCacheStorageIndex = 0; mCacheStorageIndexMax = 0;
mPlayLogQueryableApplicationId.clear(); mPlayLogQueryableApplicationId.clear();
mPlayLogQueryCapability = nacp::PLQC_None; mPlayLogQueryCapability = nacp::PLQC_None;
mRepairFlag = nacp::REPF_None; mRepairFlag = nacp::REPF_None;
@ -372,6 +384,16 @@ void nx::ApplicationControlPropertyBinary::setAttributeFlag(nacp::AttributeFlag
mAttributeFlag = var; mAttributeFlag = var;
} }
const fnd::List<nx::nacp::Language>& nx::ApplicationControlPropertyBinary::getSupportedLanguages() const
{
return mSupportedLanguages;
}
void nx::ApplicationControlPropertyBinary::setSupportedLanguages(const fnd::List<nacp::Language>& var)
{
mSupportedLanguages = var;
}
nx::nacp::ParentalControlFlag nx::ApplicationControlPropertyBinary::getParentalControlFlag() const nx::nacp::ParentalControlFlag nx::ApplicationControlPropertyBinary::getParentalControlFlag() const
{ {
return mParentalControlFlag; return mParentalControlFlag;
@ -642,14 +664,14 @@ void nx::ApplicationControlPropertyBinary::setCacheStorageDataAndJournalSizeMax(
mCacheStorageDataAndJournalSizeMax = var; mCacheStorageDataAndJournalSizeMax = var;
} }
uint16_t nx::ApplicationControlPropertyBinary::getCacheStorageIndex() const uint16_t nx::ApplicationControlPropertyBinary::getCacheStorageIndexMax() const
{ {
return mCacheStorageIndex; return mCacheStorageIndexMax;
} }
void nx::ApplicationControlPropertyBinary::setCacheStorageIndex(uint16_t var) void nx::ApplicationControlPropertyBinary::setCacheStorageIndexMax(uint16_t var)
{ {
mCacheStorageIndex = var; mCacheStorageIndexMax = var;
} }
const fnd::List<uint64_t>& nx::ApplicationControlPropertyBinary::getPlayLogQueryableApplicationId() const const fnd::List<uint64_t>& nx::ApplicationControlPropertyBinary::getPlayLogQueryableApplicationId() const

2
programs/nstool/source/NacpProcess.cpp
View file

@ -569,7 +569,7 @@ void NacpProcess::displayNacp()
printf(" Size: %s\n", getSaveDataSizeStr(mNacp.getCacheStorageSize().size).c_str()); printf(" Size: %s\n", getSaveDataSizeStr(mNacp.getCacheStorageSize().size).c_str());
printf(" JournalSize: %s\n", getSaveDataSizeStr(mNacp.getCacheStorageSize().journal_size).c_str()); printf(" JournalSize: %s\n", getSaveDataSizeStr(mNacp.getCacheStorageSize().journal_size).c_str());
printf(" MaxDataAndJournalSize: %s\n", getSaveDataSizeStr(mNacp.getCacheStorageDataAndJournalSizeMax()).c_str()); printf(" MaxDataAndJournalSize: %s\n", getSaveDataSizeStr(mNacp.getCacheStorageDataAndJournalSizeMax()).c_str());
printf(" StorageIndex: 0x%" PRIx16 "\n", mNacp.getCacheStorageIndex()); printf(" StorageIndexMax: 0x%" PRIx16 "\n", mNacp.getCacheStorageIndexMax());
} }
printf(" Other Flags:\n"); printf(" Other Flags:\n");
printf(" StartupUserAccount: %s\n", getStartupUserAccountStr(mNacp.getStartupUserAccount())); printf(" StartupUserAccount: %s\n", getStartupUserAccountStr(mNacp.getStartupUserAccount()));