diff options
| -rw-r--r-- | dev/comm/xpcom_sms.idl | 3 | ||||
| -rw-r--r-- | dev/prm/pdf.hxx (renamed from dev/pdm/pdf_pdm.hxx) | 5 | ||||
| -rw-r--r-- | dev/prm/prm.json (renamed from dev/pdm/pdm.json) | 10 | ||||
| -rw-r--r-- | dev/prm/src/pdf.cxx (renamed from dev/pdm/src/pdm_pdf.cxx) | 2 | ||||
| -rw-r--r-- | dev/sci/sci_base.hxx | 41 | ||||
| -rw-r--r-- | dev/zka/doc/Explicit Partition Map.pdf (renamed from dev/zka/Docs/Explicit Partition Map.pdf) | bin | 12326 -> 12326 bytes | |||
| -rw-r--r-- | dev/zka/doc/SPECIFICATION.md (renamed from dev/zka/Docs/SPECIFICATION.md) | 0 | ||||
| -rw-r--r-- | dev/zka/doc/TODO-LIST.md (renamed from dev/zka/Docs/TODO-LIST.md) | 0 | ||||
| -rw-r--r-- | meta/sdk_install.iss | 23 |
9 files changed, 54 insertions, 30 deletions
diff --git a/dev/comm/xpcom_sms.idl b/dev/comm/xpcom_sms.idl index 796b476a..2cfa53ba 100644 --- a/dev/comm/xpcom_sms.idl +++ b/dev/comm/xpcom_sms.idl @@ -2,6 +2,7 @@ Copyright ZKA Technologies.
+File: xpcom_sms.idl
Purpose: SMS XPCOM interface
------------------------------------------- */
@@ -11,10 +12,12 @@ Purpose: SMS XPCOM interface #define protocol class
#define interface private
#define interface_method
+
#define CONST const
#define CHAR char
#define INT32 __INT32_TYPE__
#define SIZE_T __SIZE_TYPE__
+
#define _Output
#define _Input
#define clsid(X)
diff --git a/dev/pdm/pdf_pdm.hxx b/dev/prm/pdf.hxx index 044c7468..24d5be01 100644 --- a/dev/pdm/pdf_pdm.hxx +++ b/dev/prm/pdf.hxx @@ -30,6 +30,11 @@ namespace Kernel::PDF virtual IPDFDocument* GetPage(const UInt32& page_number); + virtual Void SetProducer(const Char*) = 0; + virtual Void SetTitle(const Char*) = 0; + virtual Void SetAuthor(const Char*) = 0; + virtual Void SetSubject(const Char*) = 0; + virtual const Char* GetProducer() = 0; virtual const Char* GetTitle() = 0; virtual const Char* GetAuthor() = 0; diff --git a/dev/pdm/pdm.json b/dev/prm/prm.json index 790ab0f1..25665c7c 100644 --- a/dev/pdm/pdm.json +++ b/dev/prm/prm.json @@ -3,7 +3,7 @@ "compiler_std": "c++20", "headers_path": ["../", "../zka"], "sources_path": ["src/*.cxx"], - "output_name": "pdm.sys", + "output_name": "prm.sys", "compiler_flags": [ "-fPIC", "-ffreestanding", @@ -13,11 +13,11 @@ "-Wl,--subsystem=17" ], "cpp_macros": [ - "__PDM_IMPL__", + "__PRM_IMPL__", "__NEWOSKRNL__", "__ZKA_AMD64__", - "cPDMVersion=0x0100", - "cPDMVersionHighest=0x0100", - "cPDMVersionLowest=0x0100" + "cPRMVersion=0x0100", + "cPRMVersionHighest=0x0100", + "cPRMVersionLowest=0x0100" ] } diff --git a/dev/pdm/src/pdm_pdf.cxx b/dev/prm/src/pdf.cxx index 4932923e..3d9cfdf2 100644 --- a/dev/pdm/src/pdm_pdf.cxx +++ b/dev/prm/src/pdf.cxx @@ -4,4 +4,4 @@ ------------------------------------------- */ -#include <pdm/pdf_pdm.hxx> +#include <prm/pdf.hxx> diff --git a/dev/sci/sci_base.hxx b/dev/sci/sci_base.hxx index 92a959a7..7638ca1a 100644 --- a/dev/sci/sci_base.hxx +++ b/dev/sci/sci_base.hxx @@ -14,8 +14,9 @@ Purpose: sci/M core header file (C++) #define ATTRIBUTE(X) __attribute__((X))
-#define IMPORT_CXX extern "C++"
-#define IMPORT_C extern "C"
+#define IMPORT_XPCOM extern "XPCOM"
+#define IMPORT_CXX extern "C++"
+#define IMPORT_C extern "C"
typedef bool Bool;
typedef void UInt0;
@@ -82,13 +83,13 @@ class IEventListener : public ClsID /// @note Handle types.
// ------------------------------------------------------------------------------------------ //
-typedef VoidPtr ZKAObject;
+typedef VoidPtr Object;
-typedef ZKAObject ZKADLLObject;
-typedef ZKAObject ZKAIOObject;
-typedef ZKAObject ZKASCMObject;
-typedef ZKAObject ZKAThreadObject;
-typedef ZKAObject ZKASocketObject;
+typedef Object DLLObject;
+typedef Object IOObject;
+typedef Object SCMObject;
+typedef Object ThreadObject;
+typedef Object SocketObject;
// ------------------------------------------------------------------------------------------ //
@@ -100,18 +101,18 @@ typedef ZKAObject ZKASocketObject; /// @param symbol the symbol to look for
/// @param dll_handle the DLL handle.
/// @return the proc pointer.
-IMPORT_C ZKAObject LdrGetDLLProc(_Input const Char* symbol, _Input ZKAObject dll_handle);
+IMPORT_C Object LdrGetDLLProc(_Input const Char* symbol, _Input Object dll_handle);
/// @brief Open DLL handle.
/// @param path
/// @param drv
/// @return
-IMPORT_C ZKAObject LdrOpenDLL(_Input const Char* path, _Input const Char* drive_letter);
+IMPORT_C Object LdrOpenDLL(_Input const Char* path, _Input const Char* drive_letter);
/// @brief Close DLL handle
/// @param dll_handle
/// @return
-IMPORT_C UInt0 LdrCloseDLL(_Input ZKAObject dll_handle);
+IMPORT_C UInt0 LdrCloseDLL(_Input Object dll_handle);
// ------------------------------------------------------------------------------------------ //
// File API.
@@ -121,22 +122,22 @@ IMPORT_C UInt0 LdrCloseDLL(_Input ZKAObject dll_handle); /// @param fs_path the filesystem path.
/// @param drive_letter drive name, use NULL to use default one.
/// @return the file descriptor of the file.
-IMPORT_C ZKAObject IoOpenFile(const Char* fs_path, const Char* drive_letter);
+IMPORT_C Object IoOpenFile(const Char* fs_path, const Char* drive_letter);
/// @brief Closes a file and flushes its content.
/// @param file_desc the file descriptor.
/// @return void.
-IMPORT_C UInt0 IoCloseFile(_Input ZKAObject file_desc);
+IMPORT_C UInt0 IoCloseFile(_Input Object file_desc);
-IMPORT_C UInt32 IoWriteFile(_Input ZKAObject file_desc, _Output VoidPtr out_data, SizeT sz_data);
+IMPORT_C UInt32 IoWriteFile(_Input Object file_desc, _Output VoidPtr out_data, SizeT sz_data);
-IMPORT_C UInt32 IoReadFile(_Input ZKAObject file_desc, _Output VoidPtr* out_data, SizeT sz_data);
+IMPORT_C UInt32 IoReadFile(_Input Object file_desc, _Output VoidPtr* out_data, SizeT sz_data);
-IMPORT_C UInt64 IoRewindFile(_Input ZKAObject file_desc);
+IMPORT_C UInt64 IoRewindFile(_Input Object file_desc);
-IMPORT_C UInt64 IoTellFile(_Input ZKAObject file_desc);
+IMPORT_C UInt64 IoTellFile(_Input Object file_desc);
-IMPORT_C UInt64 IoSeekFile(_Input ZKAObject file_desc, UInt64 file_offset);
+IMPORT_C UInt64 IoSeekFile(_Input Object file_desc, UInt64 file_offset);
// ------------------------------------------------------------------------
// TLS API.
@@ -171,11 +172,11 @@ SInt32 XPCOMReleaseClass(_Input TCLS* cls); /// @brief Creates an XPCOM instance in the process.
/// @param handle_instance the XPCOM handle.
/// @param flags the XPCOM flags.
-IMPORT_C SInt32 XPCOMCreateInstance(_Input UInt32 flags, _Output ZKAObject* handle_instance);
+IMPORT_C SInt32 XPCOMCreateInstance(_Input UInt32 flags, _Output Object* handle_instance);
/// @brief Destroys an XPCOM instance of the process.
/// @param handle_instance the XPCOM handle.
-IMPORT_C UInt0 XPCOMDestroyInstance(_Input ZKAObject handle_instance);
+IMPORT_C UInt0 XPCOMDestroyInstance(_Input Object handle_instance);
#endif // !__SCI_IMPL__
diff --git a/dev/zka/Docs/Explicit Partition Map.pdf b/dev/zka/doc/Explicit Partition Map.pdf Binary files differindex 1e2f5318..1e2f5318 100644 --- a/dev/zka/Docs/Explicit Partition Map.pdf +++ b/dev/zka/doc/Explicit Partition Map.pdf diff --git a/dev/zka/Docs/SPECIFICATION.md b/dev/zka/doc/SPECIFICATION.md index c38fa122..c38fa122 100644 --- a/dev/zka/Docs/SPECIFICATION.md +++ b/dev/zka/doc/SPECIFICATION.md diff --git a/dev/zka/Docs/TODO-LIST.md b/dev/zka/doc/TODO-LIST.md index 2b4ea96c..2b4ea96c 100644 --- a/dev/zka/Docs/TODO-LIST.md +++ b/dev/zka/doc/TODO-LIST.md diff --git a/meta/sdk_install.iss b/meta/sdk_install.iss index a22447bb..9d25ce01 100644 --- a/meta/sdk_install.iss +++ b/meta/sdk_install.iss @@ -1,7 +1,7 @@ ; Script generated by the Inno Setup Script Wizard.
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
-#define ZkaAppName "ZKA OS C/C++ and XPCOM Headers."
+#define ZkaAppName "ZKA SDK"
#define ZkaAppVersion "1.00"
#define ZkaAppPublisher "ZKA Software B.V"
#define ZkaAppURL "https://www.zka-software.com/"
@@ -33,12 +33,27 @@ SetupIconFile=.\setup.ico Name: "english"; MessagesFile: "compiler:Default.isl"
[Files]
-Source: "..\dev\sci\*.hxx"; DestDir: "{app}\sci"; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "..\dev\crt\*.hxx"; DestDir: "{app}\crt"; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "..\dev\comm\*.idl"; DestDir: "{app}\comm"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "..\dev\sci\*.hxx"; DestDir: "{app}\sci"; Flags: ignoreversion
+Source: "..\dev\crt\*.hxx"; DestDir: "{app}\crt"; Flags: ignoreversion
+Source: "..\dev\comm\*.idl"; DestDir: "{app}\comm"; Flags: ignoreversion
+Source: "..\..\cl-dev\*.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
+Source: "..\..\cl-dev\tools\*.exe"; DestDir: "{app}\bin"; Flags: ignoreversion
; NOTE: Don't use "Flags: ignoreversion" on any shared system files
+[Icons]
+Name: "{userdesktop}\ZKA Uninstaller."; Filename: "{app}\unins000.exe"; \
+ IconFilename: "shell32.dll"; IconIndex: 161
+
+[Icons]
+Name: "{userdesktop}\ZKA Linker (CLI)"; Filename: "{app}\bin\link.exe"; \
+ IconFilename: "shell32.dll"; IconIndex: 12
+
+Name: "{userdesktop}\ZKA C++ Compiler (CLI)"; Filename: "{app}\bin\cl.exe"; \
+ IconFilename: "shell32.dll"; IconIndex: 12
+
+Name: "{userdesktop}\ZKA Assembler (CLI)"; Filename: "{app}\bin\asm.exe"; \
+ IconFilename: "shell32.dll"; IconIndex: 12
[Files]
Source: ".\background.bmp"; Flags: dontcopy
|
