wip apple file system

irov · Nov 4, 2024 · 64b3380 · 64b3380
1 parent 48dd0ea
commit 64b3380
Show file tree

Hide file tree

Showing 23 changed files with 172 additions and 138 deletions.
diff --git a/src/Kernel/JSONHelper.cpp b/src/Kernel/JSONHelper.cpp
@@ -7,6 +7,8 @@
 
 #include "Config/StdString.h"
 
+#include "stdex/memorycopy.h"
+
 namespace Mengine
 {
     namespace Helper
@@ -58,7 +60,7 @@ namespace Mengine
                 }
 
                 const uint8_t * jd_buffer = jd->buffer + jd->carriage;
-                StdString::memcpy( _buffer, jd_buffer, _buflen );
+                stdex::memorycopy( _buffer, 0, jd_buffer, _buflen );
                 jd->carriage += _buflen;
 
                 return _buflen;

diff --git a/src/Kernel/SHA1.cpp b/src/Kernel/SHA1.cpp
@@ -6,6 +6,8 @@
 #include "Config/StdString.h"
 #include "Config/StdIO.h"
 
+#include "stdex/memorycopy.h"
+
 #define SHA1_ROLL Detail::SHA1_rotl32
 #define SHA1_BLK0(i) (block->l[i] = (SHA1_ROLL(block->l[i],24)&0xFF00FF00) | (SHA1_ROLL(block->l[i],8)&0x00FF00FF))
 #define SHA1_BLK(i) (block->l[i&15] = SHA1_ROLL(block->l[(i+13)&15]^block->l[(i+8)&15]^block->l[(i+2)&15]^block->l[i&15],1))
@@ -105,7 +107,7 @@ namespace Mengine
 
                 if( (j + len) > 63 )
                 {
-                    StdString::memcpy( &context->buffer[j], data, (i = 64 - j) * sizeof( uint8_t ) );
+                    stdex::memorycopy( context->buffer, j, data, (i = 64 - j) * sizeof( uint8_t ) );
 
                     SHA1_Transform( context->state, context->buffer );
 
@@ -121,7 +123,7 @@ namespace Mengine
                     i = 0;
                 }
 
-                StdString::memcpy( &context->buffer[j], &data[i], (len - i) * sizeof( uint8_t ) );
+                stdex::memorycopy( context->buffer, j, &data[i], (len - i) * sizeof( uint8_t ) );
             }
             //////////////////////////////////////////////////////////////////////////
             MENGINE_INLINE void SHA1_Final( SHA1_CTX * context, uint8_t * const digest, size_t _size )

diff --git a/src/Kernel/StringSlice.cpp b/src/Kernel/StringSlice.cpp
@@ -4,6 +4,8 @@
 
 #include "Config/StdString.h"
 
+#include "stdex/memorycopy.h"
+
 namespace Mengine
 {
     namespace Helper
@@ -20,7 +22,7 @@ namespace Mengine
 
             for( ; data_index + _capacity < _size; data_index += _capacity )
             {
-                StdString::memcpy( _buffer, _in + data_index, _capacity );
+                stdex::memorycopy( _buffer, 0, _in + data_index, _capacity );
                 _buffer[_capacity] = '\0';
 
                 if( _lambda( _buffer ) == false )
@@ -36,7 +38,7 @@ namespace Mengine
 
             size_t tail_size = _size - data_index;
 
-            StdString::memcpy( _buffer, _in + data_index, tail_size );
+            stdex::memorycopy( _buffer, 0, _in + data_index, tail_size );
             _buffer[tail_size] = '\0';
 
             if( _lambda( _buffer ) == false )
@@ -74,7 +76,7 @@ namespace Mengine
 
                     size_t correct_size = it_correct - it_slice;
 
-                    StdString::memcpy( _buffer, it_slice, correct_size );
+                    stdex::memorycopy( _buffer, 0, it_slice, correct_size );
                     _buffer[correct_size] = '\0';
 
                     if( _lambda( _buffer ) == false )
@@ -97,7 +99,7 @@ namespace Mengine
 
             size_t tail_size = it_end - it_slice;
 
-            StdString::memcpy( _buffer, it_slice, tail_size );
+            stdex::memorycopy( _buffer, 0, it_slice, tail_size );
             _buffer[tail_size] = '\0';
 
             if( _lambda( _buffer ) == false )
@@ -109,4 +111,4 @@ namespace Mengine
         }
         ///////////////////////////////////////////////////////////////////////
     }
-}
+}
diff --git a/src/Platforms/iOSPlatform/iOSPlatformService.mm b/src/Platforms/iOSPlatform/iOSPlatformService.mm
@@ -96,10 +96,14 @@
     //////////////////////////////////////////////////////////////////////////    
     size_t iOSPlatformService::getCurrentPath( Char * const _currentPath ) const
     {
-        const Char deploy_mac_data[] = "";
-        StdString::strcpy( _currentPath, deploy_mac_data );
+        NSString * path = [[NSBundle mainBundle] resourcePath];
+
+        StdString::strncpy( _currentPath, [path UTF8String], MENGINE_MAX_PATH );
+        StdString::strncat( _currentPath, "/", MENGINE_MAX_PATH );
 
-        return sizeof( deploy_mac_data ) - 1;
+        size_t path_length = [path length] + 1;
+
+        return path_length;
     }
     //////////////////////////////////////////////////////////////////////////
     size_t iOSPlatformService::getUserPath( Char * const _userPath ) const
@@ -1662,7 +1666,7 @@ static bool s_isDirectoryFullpath( const Char * _fullpath )
     {
         Char pathCorrect[MENGINE_MAX_PATH + 1] = {'\0'};
         Helper::pathCorrectBackslashToA( pathCorrect, _filePath );
-
+        
         if( [[NSFileManager defaultManager] fileExistsAtPath:@(pathCorrect)] == NO)
         {
             return false;

diff --git a/src/Plugins/AppleAppLovinPlugin/AppleAppLovinPlugin.mm b/src/Plugins/AppleAppLovinPlugin/AppleAppLovinPlugin.mm
@@ -15,7 +15,7 @@
 //////////////////////////////////////////////////////////////////////////
 SERVICE_EXTERN( AppleAppLovinService );
 //////////////////////////////////////////////////////////////////////////
-PLUGIN_FACTORY( AppleAppLovin, Mengine::AppleAppLovinPlugin )
+PLUGIN_FACTORY( AppleAppLovin, Mengine::AppleAppLovinPlugin );
 //////////////////////////////////////////////////////////////////////////
 namespace Mengine
 {

diff --git a/src/Plugins/AppleFirebaseAnalyticsPlugin/AppleFirebaseAnalyticsPlugin.mm b/src/Plugins/AppleFirebaseAnalyticsPlugin/AppleFirebaseAnalyticsPlugin.mm
@@ -9,7 +9,7 @@
 //////////////////////////////////////////////////////////////////////////
 SERVICE_EXTERN( AppleFirebaseAnalyticsService );
 //////////////////////////////////////////////////////////////////////////
-PLUGIN_FACTORY( AppleFirebaseAnalytics, Mengine::AppleFirebaseAnalyticsPlugin )
+PLUGIN_FACTORY( AppleFirebaseAnalytics, Mengine::AppleFirebaseAnalyticsPlugin );
 //////////////////////////////////////////////////////////////////////////
 namespace Mengine
 {

diff --git a/src/Plugins/AppleFirebaseCrashlyticsPlugin/AppleFirebaseCrashlyticsPlugin.mm b/src/Plugins/AppleFirebaseCrashlyticsPlugin/AppleFirebaseCrashlyticsPlugin.mm
@@ -9,7 +9,7 @@
 //////////////////////////////////////////////////////////////////////////
 SERVICE_EXTERN( AppleFirebaseCrashlyticsService );
 //////////////////////////////////////////////////////////////////////////
-PLUGIN_FACTORY( AppleFirebaseCrashlytics, Mengine::AppleFirebaseCrashlyticsPlugin )
+PLUGIN_FACTORY( AppleFirebaseCrashlytics, Mengine::AppleFirebaseCrashlyticsPlugin );
 //////////////////////////////////////////////////////////////////////////
 namespace Mengine
 {

diff --git a/...gins/AppleFirebasePerformanceMonitoringPlugin/AppleFirebasePerformanceMonitoringPlugin.mm b/...gins/AppleFirebasePerformanceMonitoringPlugin/AppleFirebasePerformanceMonitoringPlugin.mm
@@ -9,7 +9,7 @@
 //////////////////////////////////////////////////////////////////////////
 SERVICE_EXTERN( AppleFirebasePerformanceMonitoringService );
 //////////////////////////////////////////////////////////////////////////
-PLUGIN_FACTORY( AppleFirebasePerformanceMonitoring, Mengine::AppleFirebasePerformanceMonitoringPlugin )
+PLUGIN_FACTORY( AppleFirebasePerformanceMonitoring, Mengine::AppleFirebasePerformanceMonitoringPlugin );
 //////////////////////////////////////////////////////////////////////////
 namespace Mengine
 {

diff --git a/src/Plugins/AppleFirebasePlugin/AppleFirebasePlugin.mm b/src/Plugins/AppleFirebasePlugin/AppleFirebasePlugin.mm
@@ -3,7 +3,7 @@
 #include "Kernel/PluginHelper.h"
 
 //////////////////////////////////////////////////////////////////////////
-PLUGIN_FACTORY( AppleFirebase, Mengine::AppleFirebasePlugin )
+PLUGIN_FACTORY( AppleFirebase, Mengine::AppleFirebasePlugin );
 //////////////////////////////////////////////////////////////////////////
 namespace Mengine
 {

diff --git a/src/Plugins/AppleFirebaseRemoteConfigPlugin/AppleFirebaseRemoteConfigPlugin.mm b/src/Plugins/AppleFirebaseRemoteConfigPlugin/AppleFirebaseRemoteConfigPlugin.mm
@@ -9,7 +9,7 @@
 //////////////////////////////////////////////////////////////////////////
 SERVICE_EXTERN( AppleFirebaseRemoteConfigService );
 //////////////////////////////////////////////////////////////////////////
-PLUGIN_FACTORY( AppleFirebaseRemoteConfig, Mengine::AppleFirebaseRemoteConfigPlugin )
+PLUGIN_FACTORY( AppleFirebaseRemoteConfig, Mengine::AppleFirebaseRemoteConfigPlugin );
 //////////////////////////////////////////////////////////////////////////
 namespace Mengine
 {

diff --git a/.../AppleGeneralDataProtectionRegulationPlugin/AppleGeneralDataProtectionRegulationPlugin.mm b/.../AppleGeneralDataProtectionRegulationPlugin/AppleGeneralDataProtectionRegulationPlugin.mm
@@ -17,7 +17,7 @@
 //////////////////////////////////////////////////////////////////////////
 SERVICE_EXTERN( AppleGeneralDataProtectionRegulationService );
 //////////////////////////////////////////////////////////////////////////
-PLUGIN_FACTORY( AppleGeneralDataProtectionRegulation, Mengine::AppleGeneralDataProtectionRegulationPlugin )
+PLUGIN_FACTORY( AppleGeneralDataProtectionRegulation, Mengine::AppleGeneralDataProtectionRegulationPlugin );
 //////////////////////////////////////////////////////////////////////////
 namespace Mengine
 {

diff --git a/src/Plugins/AppleNativePythonPlugin/AppleNativePythonPlugin.mm b/src/Plugins/AppleNativePythonPlugin/AppleNativePythonPlugin.mm
@@ -8,7 +8,7 @@
 //////////////////////////////////////////////////////////////////////////
 SERVICE_EXTERN( AppleNativePythonService );
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-PLUGIN_FACTORY( AppleNativePython, Mengine::AppleNativePythonPlugin )
+PLUGIN_FACTORY( AppleNativePython, Mengine::AppleNativePythonPlugin );
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 namespace Mengine
 {

diff --git a/src/Plugins/AppleStoreInAppPurchasePlugin/AppleStoreInAppPurchasePlugin.mm b/src/Plugins/AppleStoreInAppPurchasePlugin/AppleStoreInAppPurchasePlugin.mm
@@ -17,7 +17,7 @@
 //////////////////////////////////////////////////////////////////////////
 SERVICE_EXTERN( AppleStoreInAppPurchaseService );
 //////////////////////////////////////////////////////////////////////////
-PLUGIN_FACTORY( AppleStoreInAppPurchase, Mengine::AppleStoreInAppPurchasePlugin )
+PLUGIN_FACTORY( AppleStoreInAppPurchase, Mengine::AppleStoreInAppPurchasePlugin );
 //////////////////////////////////////////////////////////////////////////
 namespace Mengine
 {

diff --git a/src/Plugins/AppleStoreReviewPlugin/AppleStoreReviewPlugin.mm b/src/Plugins/AppleStoreReviewPlugin/AppleStoreReviewPlugin.mm
@@ -17,7 +17,7 @@
 //////////////////////////////////////////////////////////////////////////
 SERVICE_EXTERN( AppleStoreReviewService );
 //////////////////////////////////////////////////////////////////////////
-PLUGIN_FACTORY( AppleStoreReview, Mengine::AppleStoreReviewPlugin )
+PLUGIN_FACTORY( AppleStoreReview, Mengine::AppleStoreReviewPlugin );
 //////////////////////////////////////////////////////////////////////////
 namespace Mengine
 {

diff --git a/src/Plugins/TheoraPlugin/TheoraVideoDecoder.cpp b/src/Plugins/TheoraPlugin/TheoraVideoDecoder.cpp
@@ -9,6 +9,8 @@
 
 #include "Config/StdString.h"
 
+#include "stdex/memorycopy.h"
+
 #ifndef MENGINE_THEORA_OGG_BUFFER_SIZE
 #define MENGINE_THEORA_OGG_BUFFER_SIZE 4096
 #endif
@@ -168,7 +170,7 @@ namespace Mengine
                 }
                 else
                 {
-                    StdString::memcpy( &m_oggStreamState, &oggStreamStateTest, sizeof( ogg_stream_state ) );
+                    stdex::memorycopy( &m_oggStreamState, 0, &oggStreamStateTest, sizeof( ogg_stream_state ) );
 
                     theoraHeader = true;
                 }

diff --git a/src/Services/AccountService/Account.cpp b/src/Services/AccountService/Account.cpp
@@ -19,6 +19,8 @@
 
 #include "Config/StdString.h"
 
+#include "stdex/memorycopy.h"
+
 #ifndef MENGINE_ACCOUNT_SETTINGS_JSON_PATH
 #define MENGINE_ACCOUNT_SETTINGS_JSON_PATH "settings.json"
 #endif
@@ -237,7 +239,7 @@ namespace Mengine
             , uid
         );
 
-        StdString::memcpy( m_uid.data, uid, 20 );
+        stdex::memorycopy( m_uid.data, 0, uid, 20 );
 
         LOGGER_INFO( "account", "load account '%s' projectVersion [%u] uid '%.20s' settings"
             , m_id.c_str()

diff --git a/src/Systems/AppleFileSystem/AppleFileGroupDirectory.mm b/src/Systems/AppleFileSystem/AppleFileGroupDirectory.mm
@@ -18,8 +18,6 @@
 #include "Kernel/PathString.h"
 #include "Kernel/DocumentHelper.h"
 
-#include "SDL_rwops.h"
-
 namespace Mengine
 {
     //////////////////////////////////////////////////////////////////////////
@@ -35,7 +33,7 @@
     {
         m_factoryInputStreamFile = Helper::makeFactoryPool<AppleFileInputStream, 8>( MENGINE_DOCUMENT_FACTORABLE );
         m_factoryInputStreamMutexFile = Helper::makeFactoryPool<AppleMutexFileInputStream, 8>( MENGINE_DOCUMENT_FACTORABLE );
-        m_factoryOutputStreamFile = Helper::makeFactoryPool<FileOutputStream, 4>( MENGINE_DOCUMENT_FACTORABLE );
+        m_factoryOutputStreamFile = Helper::makeFactoryPool<AppleFileOutputStream, 4>( MENGINE_DOCUMENT_FACTORABLE );
 
         return true;
     }
@@ -213,7 +211,7 @@
             }
         }
 
-        SDLFileInputStreamPtr stream = m_factoryInputStreamFile->createObject( _doc );
+        AppleFileInputStreamPtr stream = m_factoryInputStreamFile->createObject( _doc );
 
         MENGINE_ASSERTION_MEMORY_PANIC( stream, "invalid create input file '%s:%s'"
             , m_folderPath.c_str()
@@ -321,7 +319,7 @@
     //////////////////////////////////////////////////////////////////////////
     OutputStreamInterfacePtr AppleFileGroupDirectory::createOutputFile( const DocumentInterfacePtr & _doc )
     {
-        SDLFileOutputStreamPtr stream = m_factoryOutputStreamFile->createObject( _doc );
+        AppleFileOutputStreamPtr stream = m_factoryOutputStreamFile->createObject( _doc );
 
         MENGINE_ASSERTION_MEMORY_PANIC( stream, "invalid create output file" );
 

diff --git a/src/Systems/AppleFileSystem/AppleFileInputStream.h b/src/Systems/AppleFileSystem/AppleFileInputStream.h
@@ -6,7 +6,7 @@
 #include "Kernel/ThreadGuard.h"
 #include "Kernel/BaseDebugFile.h"
 
-#include "SDL_rwops.h"
+#import <Foundation/Foundation.h>
 
 #ifndef MENGINE_FILE_STREAM_BUFFER_SIZE
 #define MENGINE_FILE_STREAM_BUFFER_SIZE 4096
@@ -49,7 +49,7 @@ namespace Mengine
         bool memory( void ** const _memory, size_t * const _size ) override;
 
     public:
-        m_fileHandle * getFileHandle() const;
+        NSFileHandle * getFileHandle() const;
 
     protected:
         bool openFile_( const FilePath & _relationPath, const FilePath & _folderPath, const FilePath & _filePath, Char *  const _fullPath );