nold/hekate
1
0
Fork 0
mirror of https://github.com/CTCaer/hekate synced 2024-12-22 19:31:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

nyx: Fix stray color tags (lvgl heap corruption)

Browse source
This commit is contained in:
Kostas Missos 2019-09-10 17:05:52 +03:00
parent b74b449601
commit 50ebcee45d
4 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nyx/nyx_gui/frontend/fe_emmc_tools.c
View file

@ -258,7 +258,7 @@ static int _dump_emmc_verify(emmc_tool_gui_t *gui, sdmmc_storage_t *storage, u32
{ {
s_printf(gui->txt_buf, s_printf(gui->txt_buf,
"#FF0000 SD & eMMC data (@LBA %08X) do not match!#\n" "#FF0000 SD & eMMC data (@LBA %08X) do not match!#\n"
"#FF0000 \nVerification failed..#\n", "\n#FF0000 Verification failed..#\n",
lba_curr); lba_curr);
lv_label_ins_text(gui->label_log, LV_LABEL_POS_LAST, gui->txt_buf); lv_label_ins_text(gui->label_log, LV_LABEL_POS_LAST, gui->txt_buf);
manual_system_maintenance(true); manual_system_maintenance(true);
@ -664,7 +664,7 @@ static int _dump_emmc_part(emmc_tool_gui_t *gui, char *sd_path, sdmmc_storage_t
btn = btn_wait_timeout(0, BTN_VOL_DOWN | BTN_VOL_UP); btn = btn_wait_timeout(0, BTN_VOL_DOWN | BTN_VOL_UP);
if ((btn & BTN_VOL_DOWN) && (btn & BTN_VOL_UP)) if ((btn & BTN_VOL_DOWN) && (btn & BTN_VOL_UP))
{ {
s_printf(gui->txt_buf, "\n#FFDD00 The backup was cancelled!\n"); s_printf(gui->txt_buf, "\n#FFDD00 The backup was cancelled!#\n");
lv_label_ins_text(gui->label_log, LV_LABEL_POS_LAST, gui->txt_buf); lv_label_ins_text(gui->label_log, LV_LABEL_POS_LAST, gui->txt_buf);
manual_system_maintenance(true); manual_system_maintenance(true);

8
nyx/nyx_gui/frontend/gui.c
View file

@ -1026,7 +1026,7 @@ static void _create_tab_options(lv_theme_t *th, lv_obj_t *parent)
lv_label_set_recolor(label_btn, true); lv_label_set_recolor(label_btn, true);
lv_btn_set_fit(btn, true, true); lv_btn_set_fit(btn, true, true);
lv_btn_set_toggle(btn, true); lv_btn_set_toggle(btn, true);
lv_label_set_static_text(label_btn, SYMBOL_GPS" Auto Boot #00ffc9 ON #"); lv_label_set_static_text(label_btn, SYMBOL_GPS" Auto Boot #00FFC9 ON #");
lv_btn_set_action(btn, LV_BTN_ACTION_CLICK, _autoboot_hide_delay_action); lv_btn_set_action(btn, LV_BTN_ACTION_CLICK, _autoboot_hide_delay_action);
lv_obj_align(btn, label_sep, LV_ALIGN_OUT_BOTTOM_LEFT, LV_DPI / 4, -LV_DPI / 18 + 6); lv_obj_align(btn, label_sep, LV_ALIGN_OUT_BOTTOM_LEFT, LV_DPI / 4, -LV_DPI / 18 + 6);
lv_btn_set_fit(btn, false, false); lv_btn_set_fit(btn, false, false);
@ -1689,14 +1689,14 @@ static lv_res_t _create_window_home_launch(lv_obj_t *btn)
if (!more_cfg) if (!more_cfg)
{ {
lv_label_set_static_text(label_error, lv_label_set_static_text(label_error,
"#FFDD00 No main boot entries found...\n" "#FFDD00 No main boot entries found...#\n"
"You can use the following entry to boot stock,\n" "You can use the following entry to boot stock,\n"
"or use #C7EA46 More configs# button for more boot entries."); "or use #C7EA46 More configs# button for more boot entries.");
} }
else else
{ {
lv_label_set_static_text(label_error, lv_label_set_static_text(label_error,
"#FFDD00 No .ini or boot entries found...\n" "#FFDD00 No .ini or boot entries found...#\n"
"Check that a .ini file exists in #96FF00 /bootloader/ini/#,\n" "Check that a .ini file exists in #96FF00 /bootloader/ini/#,\n"
"and that it contains at least one entry."); "and that it contains at least one entry.");
} }
@ -1719,7 +1719,7 @@ static void _create_tab_home(lv_theme_t *th, lv_obj_t *parent)
// Set brand label. // Set brand label.
lv_obj_t *label_brand = lv_label_create(parent, NULL); lv_obj_t *label_brand = lv_label_create(parent, NULL);
lv_label_set_recolor(label_brand, true); lv_label_set_recolor(label_brand, true);
lv_label_set_static_text(label_brand, "#00EDBA hekate"); lv_label_set_static_text(label_brand, "#00EDBA hekate#");
lv_obj_set_pos(label_brand, 50, 48); lv_obj_set_pos(label_brand, 50, 48);
// Set tagline label. // Set tagline label.

2
nyx/nyx_gui/frontend/gui_info.c
View file

@ -388,7 +388,7 @@ static lv_res_t _create_window_bootrom_info_status(lv_obj_t *btn)
char *txt_buf = (char *)malloc(0x1000); char *txt_buf = (char *)malloc(0x1000);
ipatches_txt = txt_buf; ipatches_txt = txt_buf;
s_printf(txt_buf, "#00DDFF Ipatches:#\n#FF8000 Address "SYMBOL_DOT" Val "SYMBOL_DOT" Instruction\n"); s_printf(txt_buf, "#00DDFF Ipatches:#\n#FF8000 Address "SYMBOL_DOT" Val "SYMBOL_DOT" Instruction#\n");
u32 res = fuse_read_ipatch(_ipatch_process); u32 res = fuse_read_ipatch(_ipatch_process);
if (res != 0) if (res != 0)

7
nyx/nyx_gui/frontend/gui_tools.c
View file

@ -375,7 +375,8 @@ static lv_res_t _create_window_dump_pk12_tool(lv_obj_t *btn)
// Dump package1 in its encrypted state if unknown. // Dump package1 in its encrypted state if unknown.
if (!pkg1_id) if (!pkg1_id)
{ {
s_printf(txt_buf + strlen(txt_buf), "#FFDD00 Unknown pkg1 version for reading\nTSEC firmware!#"); s_printf(txt_buf + strlen(txt_buf),
"#FFDD00 Unknown pkg1 version for reading#\n#FFDD00 TSEC firmware!#");
lv_label_set_array_text(lb_desc, txt_buf, 0x1000); lv_label_set_array_text(lb_desc, txt_buf, 0x1000);
manual_system_maintenance(true); manual_system_maintenance(true);
@ -408,7 +409,7 @@ static lv_res_t _create_window_dump_pk12_tool(lv_obj_t *btn)
if (!reboot_to_sept((u8 *)tsec_ctxt.fw, kb)) if (!reboot_to_sept((u8 *)tsec_ctxt.fw, kb))
{ {
lv_label_set_static_text(lb_desc, "FFDD00 Failed to run sept#\n"); lv_label_set_static_text(lb_desc, "#FFDD00 Failed to run sept#\n");
goto out_free; goto out_free;
} }
} }
@ -508,7 +509,7 @@ static lv_res_t _create_window_dump_pk12_tool(lv_obj_t *btn)
pkg2_hdr_t *pkg2_hdr = pkg2_decrypt(pkg2); pkg2_hdr_t *pkg2_hdr = pkg2_decrypt(pkg2);
if (!pkg2_hdr) if (!pkg2_hdr)
{ {
s_printf(txt_buf + strlen(txt_buf), "FFDD00 Pkg2 decryption failed!#"); s_printf(txt_buf + strlen(txt_buf), "#FFDD00 Pkg2 decryption failed!#");
lv_label_set_array_text(lb_desc, txt_buf, 0x1000); lv_label_set_array_text(lb_desc, txt_buf, 0x1000);
manual_system_maintenance(true); manual_system_maintenance(true);