From 2f921f57ec48cc8c98882d7150a08c354b60bb72 Mon Sep 17 00:00:00 2001
From: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>
Date: Thu, 13 Jun 2024 09:41:32 +0200
Subject: MHR-31: initial commit.

Signed-off-by: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>
---
 Kernel/Sources/FS/NewFS.cxx |  2 ++
 Kernel/Sources/KeMain.cxx   | 24 ++++++++++++------------
 2 files changed, 14 insertions(+), 12 deletions(-)

(limited to 'Kernel/Sources')

diff --git a/Kernel/Sources/FS/NewFS.cxx b/Kernel/Sources/FS/NewFS.cxx
index f015673d..2938c53f 100644
--- a/Kernel/Sources/FS/NewFS.cxx
+++ b/Kernel/Sources/FS/NewFS.cxx
@@ -593,6 +593,8 @@ _Output NewCatalog* NewFSParser::FindCatalog(_Input const char* catalogName,
 	if (!sMountpointInterface.GetAddressOf(this->fDriveIndex))
 		return nullptr;
 
+	kcout << "newoskrnl: start finding catalog...\r";
+
 	Char* sectorBuf = new Char[sizeof(NewPartitionBlock)];
 	auto  drive		= sMountpointInterface.GetAddressOf(this->fDriveIndex);
 
diff --git a/Kernel/Sources/KeMain.cxx b/Kernel/Sources/KeMain.cxx
index f4f9f44c..e2f41464 100644
--- a/Kernel/Sources/KeMain.cxx
+++ b/Kernel/Sources/KeMain.cxx
@@ -39,7 +39,7 @@ namespace NewOS::Detail
 			{
 				/// Mounted partition, cool!
 				NewOS::kcout
-					<< "New OS: No need to create for a NewFS partition here...\r";
+					<< "newoskrnl: No need to create for a NewFS partition here...\r";
 			}
 			else
 			{
@@ -51,11 +51,11 @@ namespace NewOS::Detail
 
 				if (fNewFS->GetParser())
 				{
-					constexpr auto cFolderInfo		  = "Metadata";
+					constexpr auto cFolderInfo		  = "META-INF";
 					const auto	   cDirCount		  = 8;
 					const char*	   cDirStr[cDirCount] = {
-						   "/Boot/", "/System/", "/Support/", "/Applications/",
-						   "/Users/", "/Library/", "/Mount/", "/Assistants/"};
+						   "\\Boot\\", "\\System\\", "\\Support\\", "\\Applications\\",
+						   "\\Users\\", "\\Library\\", "\\Mount\\", "\\DCIM\\"};
 
 					for (NewOS::SizeT dirIndx = 0UL; dirIndx < cDirCount; ++dirIndx)
 					{
@@ -113,9 +113,9 @@ namespace NewOS::Detail
 				}
 
 				NewCatalog* catalogDisk =
-					this->fNewFS->GetParser()->GetCatalog("/Mount/This Disk");
+					this->fNewFS->GetParser()->GetCatalog("\\Mount\\This Disk");
 
-				const NewOS::Char* cSrcName = "DiskInfo";
+				const NewOS::Char* cSrcName = "DISK-INF";
 
 				if (catalogDisk)
 				{
@@ -128,14 +128,14 @@ namespace NewOS::Detail
 				else
 				{
 					catalogDisk =
-						(NewCatalog*)this->Leak()->CreateAlias("/Mount/This Disk");
+						(NewCatalog*)this->Leak()->CreateAlias("\\Mount\\This Disk");
 
 					NewOS::StringView diskFolder(kNewFSSectorSz);
 
 					diskFolder +=
-						"<p>Kind: alias to disk</p>\r<p>Created by: system</p>\r<p>Edited "
+						"<p>Kind: alias to disk</p>\r<p>Created by: newoskrnl</p>\r<p>Edited "
 						"by: "
-						"system</p>\r<p>Volume Type: New OS Standard</p>\r";
+						"N/A</p>\r<p>Volume Type: New OS Standard</p>\r";
 
 					diskFolder += "<p>Original Path: ";
 					diskFolder += NewOS::NewFilesystemHelper::Root();
@@ -184,7 +184,7 @@ namespace NewOS::Detail
 	/// @return void no return value.
 	STATIC NewOS::Void SystemLauncher_Main(NewOS::Void)
 	{
-		NewOS::PEFLoader lockScreen("/System/LockScreen");
+		NewOS::PEFLoader lockScreen("\\System\\LockScreen");
 
 		if (!lockScreen.IsLoaded())
 		{
@@ -194,7 +194,7 @@ namespace NewOS::Detail
 		NewOS::Utils::execute_from_image(lockScreen,
 										 NewOS::ProcessHeader::kAppKind);
 
-		NewOS::PEFLoader stageBoard("/System/StageBoard");
+		NewOS::PEFLoader stageBoard("\\System\\StageBoard");
 
 		if (!stageBoard.IsLoaded())
 		{
@@ -221,7 +221,7 @@ EXTERN_C NewOS::Void KeMain(NewOS::Void)
 	auto cLoaderName = "SystemLauncher";
 	NewOS::execute_from_image(NewOS::Detail::SystemLauncher_Main, cLoaderName);
 
-	while (true) 
+	while (true)
 	{
 		NewOS::ProcessScheduler::The().Leak().Run();
 	}
-- 
cgit v1.2.3