From 6a18e607ffc4e83f2bd953c9de5c14f18e077df8 Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Wed, 27 Mar 2024 08:35:15 +0100 Subject: Kernel: Update System API, add prefix to functions. Signed-off-by: Amlal El Mahrouss --- Public/Developer/System.Core/Headers/Defines.hxx | 6 ++--- Public/Developer/System.Core/Headers/Dialog.hxx | 2 +- Public/Developer/System.Core/Headers/FS.hxx | 7 ++++++ Public/Developer/System.Core/Headers/Image.hxx | 9 -------- Public/Developer/System.Core/Headers/Menu.hxx | 9 -------- Public/Developer/System.Core/Headers/Rsrc.hxx | 9 -------- Public/Developer/System.Core/Headers/Thread.hxx | 4 ++-- Public/Developer/System.Core/Headers/TrueType.hxx | 4 ++-- Public/Developer/System.Core/Headers/Window.hxx | 28 +++++++++++------------ 9 files changed, 28 insertions(+), 50 deletions(-) create mode 100644 Public/Developer/System.Core/Headers/FS.hxx delete mode 100644 Public/Developer/System.Core/Headers/Image.hxx delete mode 100644 Public/Developer/System.Core/Headers/Menu.hxx delete mode 100644 Public/Developer/System.Core/Headers/Rsrc.hxx (limited to 'Public/Developer/System.Core/Headers') diff --git a/Public/Developer/System.Core/Headers/Defines.hxx b/Public/Developer/System.Core/Headers/Defines.hxx index 9932298e..64b1295e 100644 --- a/Public/Developer/System.Core/Headers/Defines.hxx +++ b/Public/Developer/System.Core/Headers/Defines.hxx @@ -11,7 +11,7 @@ #endif #ifdef _DEBUG -#define CA_MUST_PASS(e) { if (!e) { MsgBox("Sorry, ssertion failed.\nFile: %s\nLine: %i", __FILE__, __LINE__) __assert_chk_fail() } } +#define CA_MUST_PASS(e) { if (!e) { DlgMsgBox("Sorry, an assertion failed.\nFile: %s\nLine: %i", __FILE__, __LINE__) __assert_chk_fail() } } #else #define CA_MUST_PASS(e) CA_UNREFERENCED_PARAMETER(e) #endif @@ -131,9 +131,7 @@ enum RtProcessCall { }; #include - -#define kObjectGlobalNamespaceSystem "HCORE_ROOT\\" -#define kObjectGlobalNamespaceUser "HCORE_USER_ROOT\\" +#include enum { kObjectTypeProcess, diff --git a/Public/Developer/System.Core/Headers/Dialog.hxx b/Public/Developer/System.Core/Headers/Dialog.hxx index 1cc97a6e..0faaae67 100644 --- a/Public/Developer/System.Core/Headers/Dialog.hxx +++ b/Public/Developer/System.Core/Headers/Dialog.hxx @@ -13,4 +13,4 @@ /// @param format the format /// @param va_list the va args, that goes along with it. /// @return void -CA_EXTERN_C VoidType MsgBox(CharacterTypeUTF8* title, CharacterTypeUTF8* format, ...); +CA_EXTERN_C VoidType DlgMsgBox(CharacterTypeUTF8* title, CharacterTypeUTF8* format, ...); diff --git a/Public/Developer/System.Core/Headers/FS.hxx b/Public/Developer/System.Core/Headers/FS.hxx new file mode 100644 index 00000000..62ed1255 --- /dev/null +++ b/Public/Developer/System.Core/Headers/FS.hxx @@ -0,0 +1,7 @@ +/* ------------------------------------------- + + Copyright Mahrouss Logic + +------------------------------------------- */ + +#pragma once diff --git a/Public/Developer/System.Core/Headers/Image.hxx b/Public/Developer/System.Core/Headers/Image.hxx deleted file mode 100644 index 0fc4e738..00000000 --- a/Public/Developer/System.Core/Headers/Image.hxx +++ /dev/null @@ -1,9 +0,0 @@ -/* ------------------------------------------- - - Copyright Mahrouss Logic - -------------------------------------------- */ - -#pragma once - -#include diff --git a/Public/Developer/System.Core/Headers/Menu.hxx b/Public/Developer/System.Core/Headers/Menu.hxx deleted file mode 100644 index 0fc4e738..00000000 --- a/Public/Developer/System.Core/Headers/Menu.hxx +++ /dev/null @@ -1,9 +0,0 @@ -/* ------------------------------------------- - - Copyright Mahrouss Logic - -------------------------------------------- */ - -#pragma once - -#include diff --git a/Public/Developer/System.Core/Headers/Rsrc.hxx b/Public/Developer/System.Core/Headers/Rsrc.hxx deleted file mode 100644 index 0fc4e738..00000000 --- a/Public/Developer/System.Core/Headers/Rsrc.hxx +++ /dev/null @@ -1,9 +0,0 @@ -/* ------------------------------------------- - - Copyright Mahrouss Logic - -------------------------------------------- */ - -#pragma once - -#include diff --git a/Public/Developer/System.Core/Headers/Thread.hxx b/Public/Developer/System.Core/Headers/Thread.hxx index a441041d..6118ea21 100644 --- a/Public/Developer/System.Core/Headers/Thread.hxx +++ b/Public/Developer/System.Core/Headers/Thread.hxx @@ -28,11 +28,11 @@ typedef VoidType(*ThreadEntrypointKind)(VoidType); /// @param threadName the thread's name. /// @param threadStart where to start. /// @return -CA_EXTERN_C ThreadRef CreateThread(const CharacterTypeUTF8* threadName, ThreadEntrypointKind threadStart); +CA_EXTERN_C ThreadRef TmCreateThread(const CharacterTypeUTF8* threadName, ThreadEntrypointKind threadStart); /// @brief Dispoes the thread, and exits with code kThreadErrorExit /// @param ref /// @return -CA_EXTERN_C VoidType DisposeThread(ThreadRef ref); +CA_EXTERN_C VoidType TmDisposeThread(ThreadRef ref); #endif // __THREAD_API__ diff --git a/Public/Developer/System.Core/Headers/TrueType.hxx b/Public/Developer/System.Core/Headers/TrueType.hxx index 001d986e..185bbc78 100644 --- a/Public/Developer/System.Core/Headers/TrueType.hxx +++ b/Public/Developer/System.Core/Headers/TrueType.hxx @@ -23,9 +23,9 @@ typedef QWordType TTFFontRef; /// @brief Loads a new font into app's memory. /// @param name /// @return -CA_EXTERN_C TTFFontRef CreateFont(const char* name); +CA_EXTERN_C TTFFontRef FnCreateFont(const char* name); /// @brief Dispose an allocated font. /// @param fon /// @return -CA_EXTERN_C VoidType DisposeFont(TTFFontRef fon); \ No newline at end of file +CA_EXTERN_C VoidType FnDisposeFont(TTFFontRef fon); \ No newline at end of file diff --git a/Public/Developer/System.Core/Headers/Window.hxx b/Public/Developer/System.Core/Headers/Window.hxx index b7671661..39d5eb47 100644 --- a/Public/Developer/System.Core/Headers/Window.hxx +++ b/Public/Developer/System.Core/Headers/Window.hxx @@ -83,62 +83,62 @@ typedef QWordType ControlRef; /// @brief Creates a new control /// @param id the control rsrc fork. /// @return -CA_EXTERN_C ControlRef CreateControl(const DWordType id); +CA_EXTERN_C ControlRef WmCreateControl(const DWordType id); /// @brief Releases the control /// @param id the control ref. /// @return -CA_EXTERN_C VoidType ReleaseControl(const ControlRef id); +CA_EXTERN_C VoidType WmReleaseControl(const ControlRef id); /// @brief Moves a control inside a GraphicsPort. /// @param id the control ref. /// @param where where to move at. /// @return -CA_EXTERN_C Int32Type SetControlPosition(const ControlRef id, GraphicsPoint where); +CA_EXTERN_C Int32Type WmSetControlPosition(const ControlRef id, GraphicsPoint where); /// @brief Enable control. /// @param id /// @param enabled /// @return -CA_EXTERN_C Int32Type SetControlEnabled(const ControlRef id, BooleanType enabled); +CA_EXTERN_C Int32Type WmSetControlEnabled(const ControlRef id, BooleanType enabled); /// @brief Make control visible. /// @param id /// @param visible /// @return -CA_EXTERN_C Int32Type MakeControlVisible(const ControlRef id, BooleanType visible); +CA_EXTERN_C Int32Type WmMakeControlVisible(const ControlRef id, BooleanType visible); /// @brief Creates a new window. /// @param name the window name /// @param rsrcId the window fork rsrc id. /// @return the window graphics port. -CA_EXTERN_C GraphicsPort* CreateWindow(const char* name, const DWordType rsrcId); +CA_EXTERN_C GraphicsPort* WmCreateWindow(const char* name, const DWordType rsrcId); /// @brief Creates a new menu /// @param name the menu's name /// @param rsrcId the menu fork rsrc id. /// @return the menu graphics port. -CA_EXTERN_C GraphicsPort* CreateMenu(const char* name, const DWordType rsrcId); +CA_EXTERN_C GraphicsPort* WmCreateMenu(const char* name, const DWordType rsrcId); /// @brief Releases the window. /// @param port the window port. /// @return void -CA_EXTERN_C VoidType ReleaseWindow(GraphicsPort* port); +CA_EXTERN_C VoidType WmReleaseWindow(GraphicsPort* port); /// @brief Releases the menu /// @param port the menu port. /// @return void -CA_EXTERN_C VoidType ReleaseMenu(GraphicsPort* port); +CA_EXTERN_C VoidType WmReleaseMenu(GraphicsPort* port); /// @brief Moves a window on the desktop. (menu arent movable, will return kErrIncompatible is menu is provided.) /// @param id the gfx port. /// @param where to move. /// @return error code. -CA_EXTERN_C Int32Type MoveWindow(const GraphicsPort* id, GraphicsPoint where); +CA_EXTERN_C Int32Type WmMoveWindow(const GraphicsPort* id, GraphicsPoint where); enum { - kWinErrIncompatible = 0x74, - kWinErrOutOfMemory, - kWinErrInvalidArg, - kWinErrNotImplemented, + kWmErrIncompatible = 0x74, + kWmErrOutOfMemory, + kWmErrInvalidArg, + kWmErrNotImplemented, }; -- cgit v1.2.3