Compare commits

...

4 Commits

Author SHA1 Message Date
Michael Scire
5a7eecc3ad loader: provide default arguments (zero byte) to NSOs
Certain newer unity games (Terraria, Pokemon Mystery Dungeon) require
that the argument region be populated. Failure to do so results in
an integer underflow in argument count, and eventually an unmapped
read at 0x800000000. Providing this default fixes this.

Note that the behavior of official software is as yet unverified,
arguments-wise.
2020-01-22 20:14:06 -08:00
Zach Hilman
d8e0d839bd Merge pull request #3339 from Simek/dark-theme-update
GUI: fix minor issues with dark themes + rename and reorder themes
2020-01-22 18:39:21 -05:00
Bartosz Kaszubowski
c7055f3670 fix qss stylesheet whitespaces 2020-01-22 22:36:42 +01:00
Bartosz Kaszubowski
9a22b6dced GUI: fix minor issues with dark themes
GUI: rename and reorder themes
2020-01-22 21:12:45 +01:00
4 changed files with 30 additions and 22 deletions

View File

@@ -181,7 +181,7 @@ QMenu::icon {
}
QMenu::item {
padding: 5px 30px 5px 30px;
padding: 5px 16px 5px 40px;
border: 1px solid transparent;
/* reserve space for selection border */
}
@@ -192,12 +192,13 @@ QMenu::item:selected {
QMenu::separator {
height: 2px;
background: lightblue;
background: #76797C;
margin-left: 10px;
margin-right: 5px;
}
QMenu::indicator {
margin: 0 -26px 0 8px;
width: 18px;
height: 18px;
}
@@ -252,7 +253,7 @@ QWidget:disabled {
}
QAbstractItemView {
alternate-background-color: #31363b;
alternate-background-color: #2c2f32;
color: #eff0f1;
border: 1px solid #3A3939;
border-radius: 2px;
@@ -577,8 +578,6 @@ QTreeView:hover {
}
QComboBox:on {
padding-top: 3px;
padding-left: 4px;
selection-background-color: #4a4a4a;
}
@@ -703,10 +702,10 @@ QTabBar::close-button:pressed {
QTabBar::tab:top {
color: #eff0f1;
border: 1px solid #76797C;
border-bottom: 1px transparent black;
border-bottom: 2px transparent;
background-color: #31363b;
padding: 5px;
min-width: 50px;
padding: 4px 16px 2px;
min-width: 38px;
border-top-left-radius: 2px;
border-top-right-radius: 2px;
}
@@ -1078,7 +1077,7 @@ QListView::item:selected:active {
}
QHeaderView {
background-color: #31363b;
background-color: #403F3F;
border: 1px transparent;
border-radius: 0px;
margin: 0px;
@@ -1086,30 +1085,32 @@ QHeaderView {
}
QHeaderView::section {
background-color: #31363b;
background-color: #232629;
color: #eff0f1;
padding: 5px;
border: 1px solid #76797C;
padding: 0 5px;
border: 1px solid #403F3F;
border-bottom: 0;
border-radius: 0px;
text-align: center;
}
QHeaderView::section::vertical::first,
QHeaderView::section::vertical::only-one {
border-top: 1px solid #76797C;
border-top: 1px solid #31363b;
}
QHeaderView::section::vertical {
border-top: transparent;
}
QHeaderView::section::horizontal,
QHeaderView::section::horizontal::first,
QHeaderView::section::horizontal::only-one {
border-left: 1px solid #76797C;
border-left: transparent;
}
QHeaderView::section::horizontal {
border-left: transparent;
QHeaderView::section::horizontal::last {
border-right: transparent;
}
QHeaderView::section:checked {

View File

@@ -97,7 +97,8 @@ std::optional<VAddr> AppLoader_NSO::LoadModule(Kernel::Process& process,
if (nso_header.IsSegmentCompressed(i)) {
data = DecompressSegment(data, nso_header.segments[i]);
}
program_image.resize(nso_header.segments[i].location + data.size());
program_image.resize(nso_header.segments[i].location +
PageAlignSize(static_cast<u32>(data.size())));
std::memcpy(program_image.data() + nso_header.segments[i].location, data.data(),
data.size());
codeset.segments[i].addr = nso_header.segments[i].location;
@@ -105,8 +106,12 @@ std::optional<VAddr> AppLoader_NSO::LoadModule(Kernel::Process& process,
codeset.segments[i].size = PageAlignSize(static_cast<u32>(data.size()));
}
if (should_pass_arguments && !Settings::values.program_args.empty()) {
const auto arg_data = Settings::values.program_args;
if (should_pass_arguments) {
std::vector<u8> arg_data{Settings::values.program_args.begin(),
Settings::values.program_args.end()};
if (arg_data.empty()) {
arg_data.resize(NSO_ARGUMENT_DEFAULT_SIZE);
}
codeset.DataSegment().size += NSO_ARGUMENT_DATA_ALLOCATION_SIZE;
NSOArgumentHeader args_header{
NSO_ARGUMENT_DATA_ALLOCATION_SIZE, static_cast<u32_le>(arg_data.size()), {}};

View File

@@ -56,6 +56,8 @@ static_assert(sizeof(NSOHeader) == 0x100, "NSOHeader has incorrect size.");
static_assert(std::is_trivially_copyable_v<NSOHeader>, "NSOHeader must be trivially copyable.");
constexpr u64 NSO_ARGUMENT_DATA_ALLOCATION_SIZE = 0x9000;
// NOTE: Official software default argument state is unverified.
constexpr u64 NSO_ARGUMENT_DEFAULT_SIZE = 1;
struct NSOArgumentHeader {
u32_le allocated_size;

View File

@@ -7,10 +7,10 @@
namespace UISettings {
const Themes themes{{
{"Default", "default"},
{"Light", "default"},
{"Light Colorful", "colorful"},
{"Dark", "qdarkstyle"},
{"Colorful", "colorful"},
{"Colorful Dark", "colorful_dark"},
{"Dark Colorful", "colorful_dark"},
}};
Values values = {};