[IMP]

- Updated the PEF header for NDK.
- Adding ICL parser for SCM (ToDo)
- Updated extensions of PEF.
- Updated start address for exes in PEF.

Signed-off-by: Amlal EL Mahrouss <amlalelmahrouss@icloud.com>

6 files changed, 23 insertions, 17 deletions

diff --git a/SCIKit/SCIBase.hxx b/SCIKit/SCIBase.hxx
index b084a17b..e8208c49 100644
--- a/SCIKit/SCIBase.hxx
+++ b/SCIKit/SCIBase.hxx
@@ -52,7 +52,7 @@ inline constexpr auto cLPCCloseMsgSyscall	 = 0x27;
 inline constexpr auto cLPCSanitizeMsgSyscall = 0x28;

 

 #ifdef __NEWOS_SYMS__

-#include <SCIKit/rtl.internal.inl>

+#include <SCIKit/scm.internal.inl>

 #else

 class UnknownInterface; // Refrenced from an IDB entry.

 class UnknownUCLSID;	// From the IDB, the constructor of the object, e.g: WordUCLSID.

diff --git a/SCIKit/SCM.drawio b/SCIKit/SCM.drawio
index 56974466..978ebb6d 100644
--- a/SCIKit/SCM.drawio
+++ b/SCIKit/SCM.drawio
@@ -1,15 +1,9 @@
 <mxfile host="65bd71144e">
     <diagram name="Page-1" id="_vc7fxBdNKI2W8YhI8VA">
-        <mxGraphModel dx="746" dy="307" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
+        <mxGraphModel dx="746" dy="563" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
             <root>
                 <mxCell id="0"/>
                 <mxCell id="1" parent="0"/>
-                <mxCell id="eRehIIeIVOPW1y23kRkx-7" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="eRehIIeIVOPW1y23kRkx-1" target="eRehIIeIVOPW1y23kRkx-6" edge="1">
-                    <mxGeometry relative="1" as="geometry"/>
-                </mxCell>
-                <mxCell id="eRehIIeIVOPW1y23kRkx-1" value="Kernel level interfaces" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-                    <mxGeometry x="431" y="450" width="226" height="60" as="geometry"/>
-                </mxCell>
                 <mxCell id="eRehIIeIVOPW1y23kRkx-9" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="eRehIIeIVOPW1y23kRkx-2" target="eRehIIeIVOPW1y23kRkx-8" edge="1">
                     <mxGeometry relative="1" as="geometry"/>
                 </mxCell>
@@ -19,20 +13,14 @@
                 <mxCell id="eRehIIeIVOPW1y23kRkx-4" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="eRehIIeIVOPW1y23kRkx-3" target="eRehIIeIVOPW1y23kRkx-2" edge="1">
                     <mxGeometry relative="1" as="geometry"/>
                 </mxCell>
-                <mxCell id="eRehIIeIVOPW1y23kRkx-5" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0;exitDx=0;exitDy=52.5;exitPerimeter=0;" parent="1" source="eRehIIeIVOPW1y23kRkx-3" target="eRehIIeIVOPW1y23kRkx-1" edge="1">
-                    <mxGeometry relative="1" as="geometry"/>
-                </mxCell>
                 <mxCell id="eRehIIeIVOPW1y23kRkx-3" value="IDB" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=15;" parent="1" vertex="1">
                     <mxGeometry x="283" y="290" width="60" height="80" as="geometry"/>
                 </mxCell>
-                <mxCell id="eRehIIeIVOPW1y23kRkx-6" value="HAL #1&lt;div&gt;Takes care of a specific device support.&lt;/div&gt;" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-                    <mxGeometry x="484" y="570" width="120" height="60" as="geometry"/>
-                </mxCell>
                 <mxCell id="eRehIIeIVOPW1y23kRkx-8" value="Program #2&lt;div&gt;Is a web browser, it uses an HTML parser component.&lt;/div&gt;" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
                     <mxGeometry x="253" y="570" width="120" height="60" as="geometry"/>
                 </mxCell>
                 <mxCell id="eRehIIeIVOPW1y23kRkx-10" value="&lt;h1 style=&quot;margin-top: 0px;&quot;&gt;System Component Model&lt;/h1&gt;&lt;p&gt;SCM is a standardized way of sharing code within DLLs in NewOS.&lt;/p&gt;" style="text;html=1;whiteSpace=wrap;overflow=hidden;rounded=0;" parent="1" vertex="1">
-                    <mxGeometry x="590" y="230" width="180" height="180" as="geometry"/>
+                    <mxGeometry x="430" y="240" width="180" height="180" as="geometry"/>
                 </mxCell>
             </root>
         </mxGraphModel>
diff --git a/SCIKit/build.json b/SCIKit/build.json
index 91e64384..770d1622 100644
--- a/SCIKit/build.json
+++ b/SCIKit/build.json
@@ -3,7 +3,7 @@
     "compiler_std": "c++20",

     "headers_path": ["../"],

     "sources_path": ["*.cxx"],

-    "output_name": "libSCI.lib",

+    "output_name": "libSCI.dll",

     "compiler_flags": ["-fPIC", "-shared", "-std=c++20"],

     "cpp_macros": ["__NEWOS_SYMS__"]

   }

diff --git a/SCIKit/makefile b/SCIKit/makefile
index 9a2b836e..7757440e 100644
--- a/SCIKit/makefile
+++ b/SCIKit/makefile
@@ -5,7 +5,7 @@
 

 CC=g++

 FLAGS=-I../ -shared -fPIC -D__NEWOS_SYMS__

-OUTPUT=libSCI.lib

+OUTPUT=libSCI.dll

 

 .PHONY: build-sci

 build-sci:

diff --git a/SCIKit/scm.iclparser.inl b/SCIKit/scm.iclparser.inl
new file mode 100644
index 00000000..acedc9d8
--- /dev/null
+++ b/SCIKit/scm.iclparser.inl
@@ -0,0 +1,18 @@
+/* -------------------------------------------

+

+Copyright ZKA Technologies.

+

+File: rt.internal.inl

+Purpose: Base code of SCM.

+

+------------------------------------------- */

+

+/// @internal

+

+#ifndef __ZECC__

+#define object class

+#define protocol class

+#define clsid(X) __attribute__((uuid(X)))

+

+#warning ! you may be using the clang version of the newos kit, please be cautious that some thing mayn't be present. !

+#endif // !__ZECC__
\ No newline at end of file
diff --git a/SCIKit/rtl.internal.inl b/SCIKit/scm.internal.inl
index b4e8e7dd..b4e8e7dd 100644
--- a/SCIKit/rtl.internal.inl
+++ b/SCIKit/scm.internal.inl