From 933d1ef6721903895b15c45917a0fc705763fbf5 Mon Sep 17 00:00:00 2001
From: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>
Date: Mon, 19 Aug 2024 10:14:36 +0200
Subject: [IMP]

+ Fixed big parts of the user manager's code.
+ Fixed New FS kernel support.
+ Allocate 2GB of RAM for kernel.

- Reported bug to Jira regarding UserManager's TryLogin method.

Signed-off-by: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>
---
 dev/SCI/SCIBase.cxx         |  7 -------
 dev/SCI/SCIBase.hxx         | 20 ++++++++++----------
 dev/SCI/SCIErr.cxx          |  9 ---------
 dev/SCI/SCIErr.hxx          |  2 +-
 dev/SCI/Sources/SCIBase.cxx |  7 +++++++
 dev/SCI/Sources/SCIErr.cxx  |  9 +++++++++
 dev/SCI/build.json          | 31 +++++++++++++++++++++----------
 7 files changed, 48 insertions(+), 37 deletions(-)
 delete mode 100644 dev/SCI/SCIBase.cxx
 delete mode 100644 dev/SCI/SCIErr.cxx
 create mode 100644 dev/SCI/Sources/SCIBase.cxx
 create mode 100644 dev/SCI/Sources/SCIErr.cxx

(limited to 'dev/SCI')

diff --git a/dev/SCI/SCIBase.cxx b/dev/SCI/SCIBase.cxx
deleted file mode 100644
index 628bfd67..00000000
--- a/dev/SCI/SCIBase.cxx
+++ /dev/null
@@ -1,7 +0,0 @@
-/* -------------------------------------------
-
-	Copyright ZKA Technologies.
-
-------------------------------------------- */
-
-#include <SCIKit/SCIBase.hxx>
\ No newline at end of file
diff --git a/dev/SCI/SCIBase.hxx b/dev/SCI/SCIBase.hxx
index b902b5fa..fca89a1a 100644
--- a/dev/SCI/SCIBase.hxx
+++ b/dev/SCI/SCIBase.hxx
@@ -12,7 +12,7 @@ Purpose: SCI/M core header file (C++)
 
 #ifdef __cplusplus
 
-#include <SCIKit/Hint.hxx>
+#include <SCI/Hint.hxx>
 
 #define IMPORT_CXX extern "C++"
 #define IMPORT_C   extern "C"
@@ -39,7 +39,7 @@ typedef __UINTPTR_TYPE__ UIntPtr;
 typedef char			 Char;
 
 #ifdef __SCI_IMPL__
-#include <SCIKit/scm.internal.inl>
+#include <SCI/scm.internal.inl>
 #else
 class UnknownInterface; // Refrenced from an IDB entry.
 class UnknownUCLSID;	// From the IDB, the constructor of the object, e.g: WordUCLSID.
@@ -113,14 +113,14 @@ typedef NEW_OBJECT COMP_OBJECT;
 IMPORT_C VoidPtr RtlGetDLLProc(_Input const Char* symbol, _Input NEW_OBJECT dll_handle);
 
 /// @brief Open DLL handle.
-/// @param path 
-/// @param drv 
-/// @return 
+/// @param path
+/// @param drv
+/// @return
 IMPORT_C NEW_OBJECT RtlOpenDLL(_Input const Char* path, _Input const Char* drive_letter);
 
 /// @brief Close DLL handle
-/// @param dll_handle 
-/// @return 
+/// @param dll_handle
+/// @return
 IMPORT_C UInt0 RtlCloseDLL(_Input NEW_OBJECT dll_handle);
 
 /// @note Part of NK file API.
@@ -133,7 +133,7 @@ IMPORT_C NEW_OBJECT RtlOpenFile(const Char* fs_path, const Char* drive_letter);
 
 /// @brief Closes a file and flushes its content.
 /// @param file_desc the file descriptor.
-/// @return 
+/// @return
 IMPORT_C UInt0 RtlCloseFile(_Input NEW_OBJECT file_desc);
 
 /// @brief Installs the TIB and GIB inside the current process.
@@ -178,8 +178,8 @@ UInt0 RtlDestroyHeap(_Input VoidPtr heap);
 
 #else
 
-#include <SCIKit/SCIBase.h>
+#include <SCI/SCIBase.h>
 
 #endif // ifdef __cplusplus
 
-#endif // ifndef __SCI_BASE_HXX__
\ No newline at end of file
+#endif // ifndef __SCI_BASE_HXX__
diff --git a/dev/SCI/SCIErr.cxx b/dev/SCI/SCIErr.cxx
deleted file mode 100644
index b0766944..00000000
--- a/dev/SCI/SCIErr.cxx
+++ /dev/null
@@ -1,9 +0,0 @@
-/* -------------------------------------------
-
-	Copyright ZKA Technologies.
-
-------------------------------------------- */
-
-#include <SCIKit/SCIErr.hxx>
-
-NEW_ERROR_TYPE kLastError = 0;
\ No newline at end of file
diff --git a/dev/SCI/SCIErr.hxx b/dev/SCI/SCIErr.hxx
index aa3e72e4..af5d54fd 100644
--- a/dev/SCI/SCIErr.hxx
+++ b/dev/SCI/SCIErr.hxx
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <SCIKit/SCIBase.hxx>
+#include <SCI/SCIBase.hxx>
 
 #define ErrLocalIsOk()	 (kLastError == kErrorSuccess)
 #define ErrLocalFailed() (kLastError != kErrorSuccess)
diff --git a/dev/SCI/Sources/SCIBase.cxx b/dev/SCI/Sources/SCIBase.cxx
new file mode 100644
index 00000000..b103886c
--- /dev/null
+++ b/dev/SCI/Sources/SCIBase.cxx
@@ -0,0 +1,7 @@
+/* -------------------------------------------
+
+	Copyright ZKA Technologies.
+
+------------------------------------------- */
+
+#include <SCI/SCIBase.hxx>
diff --git a/dev/SCI/Sources/SCIErr.cxx b/dev/SCI/Sources/SCIErr.cxx
new file mode 100644
index 00000000..509ccd6d
--- /dev/null
+++ b/dev/SCI/Sources/SCIErr.cxx
@@ -0,0 +1,9 @@
+/* -------------------------------------------
+
+	Copyright ZKA Technologies.
+
+------------------------------------------- */
+
+#include <SCI/SCIErr.hxx>
+
+NEW_ERROR_TYPE kLastError = 0;
diff --git a/dev/SCI/build.json b/dev/SCI/build.json
index 9bc72bfa..0c367bd6 100644
--- a/dev/SCI/build.json
+++ b/dev/SCI/build.json
@@ -1,10 +1,21 @@
-{
-    "compiler_path": "x86_64-w64-mingw32-g++.exe",
-    "compiler_std": "c++20",
-    "headers_path": ["../"],
-    "sources_path": ["*.cxx"],
-    "output_name": "sci.dll",
-    "compiler_flags": ["-fPIC", "-ffreestanding",  "-shared", "-fno-rtti",  "-fno-exceptions", "-Wl,--subsystem=17"],
-    "cpp_macros": ["__SCI_IMPL__", "cSCIVersion=0x0100", "cSCIVersionHighest=0x0100", "cSCIVersionLowest=0x0100"]
-  }
-  
\ No newline at end of file
+{
+  "compiler_path": "x86_64-w64-mingw32-g++",
+  "compiler_std": "c++20",
+  "headers_path": ["../"],
+  "sources_path": ["Sources/*.cxx"],
+  "output_name": "sci.dll",
+  "compiler_flags": [
+    "-fPIC",
+    "-ffreestanding",
+    "-shared",
+    "-fno-rtti",
+    "-fno-exceptions",
+    "-Wl,--subsystem=17"
+  ],
+  "cpp_macros": [
+    "__SCI_IMPL__",
+    "cSCIVersion=0x0100",
+    "cSCIVersionHighest=0x0100",
+    "cSCIVersionLowest=0x0100"
+  ]
+}
-- 
cgit v1.2.3