summaryrefslogtreecommitdiffhomepage
path: root/Public
diff options
context:
space:
mode:
authorAmlal El Mahrouss <amlal@el-mahrouss-logic.com>2024-03-20 03:53:47 +0100
committerAmlal El Mahrouss <amlal@el-mahrouss-logic.com>2024-03-20 03:53:47 +0100
commit834ba2852f69e4dceec1a0a63400fe5171a97c48 (patch)
treea35794c9892e4f44285f6d29950b4a97e4a3965c /Public
parent0fb009de376a89aab2a7c0839d1c17442d9257e2 (diff)
unstable: Add ODF header, still in WiP, althougth priority is on the
AHCI driver and HCFS/NewFS support. Signed-off-by: Amlal El Mahrouss <amlal@el-mahrouss-logic.com>
Diffstat (limited to 'Public')
-rw-r--r--Public/Kits/System.Core/Containers/ODF.hxx43
-rw-r--r--Public/Kits/System.Core/Containers/XIFF.hxx24
-rw-r--r--Public/Kits/System.Graphics/Frame.hxx7
3 files changed, 59 insertions, 15 deletions
diff --git a/Public/Kits/System.Core/Containers/ODF.hxx b/Public/Kits/System.Core/Containers/ODF.hxx
new file mode 100644
index 00000000..3c4e81fc
--- /dev/null
+++ b/Public/Kits/System.Core/Containers/ODF.hxx
@@ -0,0 +1,43 @@
+/** ===========================================
+ (C) Mahrouss Logic
+ ===========================================*/
+
+#ifndef __ODF__
+#define __ODF__
+
+#include <System.Core/Defs.hxx>
+
+/**
+ * @brief Open Document Format
+ * @file ODF.hxx
+*/
+
+/// @brief four-character code for ODF.
+#define kFourCCLength_ODF 4
+
+/// @brief Document file header.
+typedef struct ODFFileHeader
+{
+ CHAR f_Ident[kFourCCLength_ODF];
+
+ INT32 f_DocumentKind;
+ INT32 f_DocumentSize;
+
+ INT64 f_MetaForkOffset;
+ INT64 f_DocumentForkOffset;
+
+ CHAR f_Padding[4];
+} PACKED ODFFileHeader;
+
+/// @brief ODF Fork header
+typedef struct ODFForkHeader
+{
+ CHAR f_MetadataName[255];
+
+ INT32 f_MetadataKind;
+ INT32 f_MetadataSize;
+
+ CHAR f_Padding;
+} PACKED ODFForkHeader;
+
+#endif // !__ODF__ \ No newline at end of file
diff --git a/Public/Kits/System.Core/Containers/XIFF.hxx b/Public/Kits/System.Core/Containers/XIFF.hxx
index b9fa741e..622a5a87 100644
--- a/Public/Kits/System.Core/Containers/XIFF.hxx
+++ b/Public/Kits/System.Core/Containers/XIFF.hxx
@@ -17,26 +17,26 @@
/// @brief four-character code for XIFF.
#define kFourCCLength_XIFF 4
+#define kXIFFContainerVideo "XVFF"
+#define kXIFFContainerAudio "XAFF"
+#define kXIFFContainerInstaller "XNFF"
+#define kXIFFContainerGeneric "XIFF"
+#define kXIFFContainerBinary "XBFF"
+
/***
* @brief Generic XIFF header
* Used by XIFF based containers.
*/
struct PACKED XiffHeader final {
- BYTE f_Mag[kFourCCLength_XIFF]; // XIFF string (includes \0)
- DWORD f_Size; // overall size of header (XiffHeader) in bytes
- DWORD f_FormatType; // format type. generic
- BYTE f_SpecificMag[4]; // The sub header magic
- DWORD f_SpecificSize; // length of the format data
- DWORD f_SpecificFormatType; // format type. generic
+ BYTE f_Magic[kFourCCLength_XIFF]; // XIFF string (includes \0)
+ DWORD f_Size; // overall size of header (XiffHeader) in bytes
+ DWORD f_FormatType; // format type. generic
+ BYTE f_SpecificMag[kFourCCLength_XIFF]; // The sub header magic
+ DWORD f_SpecificSize; // length of the format data
+ DWORD f_SpecificFormatType; // format type. generic
};
typedef struct XiffHeader XiffHeader;
-#define kXIFFContainerVideo "XVFF"
-#define kXIFFContainerAudio "XAFF"
-#define kXIFFContainerInstaller "XNFF"
-#define kXIFFContainerGeneric "XIFF"
-#define kXIFFContainerBinary "XBFF"
-
#endif // ifndef __XIFF__
diff --git a/Public/Kits/System.Graphics/Frame.hxx b/Public/Kits/System.Graphics/Frame.hxx
index 6c305cd3..318f01cd 100644
--- a/Public/Kits/System.Graphics/Frame.hxx
+++ b/Public/Kits/System.Graphics/Frame.hxx
@@ -15,6 +15,7 @@
#include <System.Graphics/Core.hxx>
#include <System.Graphics/Dim2d.hxx>
+#include <System.Core/Defs.hxx>
#include <NewKit/MutableArray.hpp>
namespace System::Graphics {
@@ -29,7 +30,7 @@ class G_API GFrame {
virtual void Update() {
if (m_Frames.Count() == 0) return;
- for (int x = 0; x < m_Frames.Count(); ++x) {
+ for (DWORD x = 0; x < m_Frames.Count(); ++x) {
if (!m_Frames[x]->ShouldBeUpdated()) continue;
m_Frames[x]->Update();
@@ -41,7 +42,7 @@ class G_API GFrame {
virtual void UpdateInput() {
if (m_Frames.Count() == 0) return;
- for (int x = 0; x < m_Frames.Count(); ++x) {
+ for (DWORD x = 0; x < m_Frames.Count(); ++x) {
if (!m_Frames[x]->ShouldBeUpdated()) continue;
m_Frames[x]->UpdateInput();
@@ -50,7 +51,7 @@ class G_API GFrame {
virtual bool ShouldBeUpdated() { return false; }
- virtual void Paint() = 0;
+ virtual void Paint() {}
private:
HCore::MutableArray<GFrame*> m_Frames;