tristan/ZealOS
1
0
Fork 0
mirror of https://github.com/Zeal-Operating-System/ZealOS.git synced 2025-06-07 08:14:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix DoDistro hanging at AHCIPortIdentify.

Browse Source 
Fix hardcoded screen resolution in K.CC.
Begin implementing OS system upgrade feature.
This commit is contained in:
TomAwezome 2021-06-30 02:57:20 -04:00
parent 0778e2dd16
commit e5596ee2bf
3 changed files with 86 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Zenith-latest-2021-06-29-18_04_38.iso → Zenith-latest-2021-06-30-02_54_42.iso
View File

Binary file not shown.

10
src/Home/K.CC
View File

@ -20,21 +20,19 @@ for (i = 0; i < AHCI_MAX_PORTS; i++)
if (ata_drive < 0)
throw('No ATA');
In("CC\n%d\n\n5\n\n\n", ata_drive);
In("CC\n%d\n\n1024\n768\n\n\n", ata_drive);
BootHDIns;
"\n\nSuccessful? ";
if (YorN)
{
Once( "CursorRemove(\"/*\");;;"
"#include \"DoDistro\";;"
"PopUp(\"#include \\\"DoDistro\\\";;"
"if (DriveIsWritable)"
"{"
"Del(\"~/Registry.CC\");"
"Del(\\\"~/Registry.CC\\\");"
"OutU16(0x4004, 0x3400);"
"}");
"}\");");
// Once(
// "#include \"DoDistro\";;");
BootRAM;
}

82
src/Misc/OSMerge.CC Executable file
View File

@ -0,0 +1,82 @@
CDirEntry OSFilesMGFind(CDirEntry *needle_entry, CDirEntry *haystack_list)
{
while (haystack_list)
{
if (!StrCompare(needle_entry->name, haystack_list->name))
return haystack_list;
haystack_list = haystack_list->next;
}
return NULL;
}
U0 OSFilesMergeInner(CDirEntry *tmpde1, CDirEntry *tmpde2, I64 *_fuf_flags, I64 *_df_flags)
{
CDirEntry *tmpde;
U8 *new;
while (tmpde1 && !(*_df_flags & DF_ABORT_ALL_FILES))
{
tmpde = OSFilesMGFind(tmpde1, tmpde2);
if (!tmpde)
{
"$$BROWN$$Does Not Exist:%s$$FG$$\n", tmpde1->full_name;
new = StrNew(tmpde1->full_name);
new[0] = tmpde2->full_name[0]; // shortcut to quickly get drive letter
Copy(tmpde1->full_name, new);
Free(new);
}
else
{
if (tmpde1->attr & RS_ATTR_DIR)
OSFilesMergeInner(tmpde1->sub, tmpde->sub, _fuf_flags, _df_flags);
else
{
if (AbsI64(tmpde1->datetime - tmpde->datetime) > CDATE_FREQ * 2) {//slop
"%s", tmpde1->full_name;
'\n';
if (Bt(_fuf_flags, FUf_DIFF))
{
if (FilesFindMatch(tmpde1->full_name, FILEMASK_TXT))
Diff(tmpde->full_name, tmpde1->full_name, _df_flags);
}
}
}
}
tmpde1 = tmpde1->next;
}
}
U0 OSFilesMerge(U8 *dst_files_find_mask="/*", U8 *src_files_find_mask="/*", U8 *fu_flags=NULL)
{ // See $LK+PU,"Merge",A="FF:::/Zenith/Utils/Merge.CC,public U0 Merge"$.
I64 df_flags = 0, fuf_flags = 0;
CDirEntry *tmpde1 = NULL, *tmpde2 = NULL;
FlagsScan(&fuf_flags, Define("ST_FILE_UTIL_FLAGS"), "+r");
FlagsScan(&fuf_flags, Define("ST_FILE_UTIL_FLAGS"), fu_flags);
if (fuf_flags & ~(FUG_FILES_FIND | FUF_DIFF))
throw('FUF');
PrintWarn("This is based strictly on file dates.\n");
tmpde1 = FilesFind(src_files_find_mask, fuf_flags & FUG_FILES_FIND);
tmpde2 = FilesFind(dst_files_find_mask, fuf_flags & FUG_FILES_FIND);
fuf_flags &= FUF_DIFF;
OSFilesMergeInner(tmpde1, tmpde2, &fuf_flags, &df_flags);
DirTreeDel(tmpde1);
DirTreeDel(tmpde2);
}
U0 OSMerge(U8 dst_drv, U8 src_drv=':')
{
U8 *dst = MStrPrint("%C:/", dst_drv);
U8 *src = MStrPrint("%C:/", src_drv);
CopyTree(src, "B:/");
OSFilesMerge("B:/", dst, "+d");
"Format %C:/ ? ", dst_drv;
Format(dst_drv);
CopyTree("B:/", dst);
BootHDIns(dst_drv);
}