Add cross platform filesystem support

.github/workflows/build.yml

@@ -28,22 +28,57 @@ jobs:
           clang-format-version: '19'
           check-path: 'src'
 
-  dump-registry:
-    name: Dump Registry
-    runs-on: windows-latest
+
+  dump-root:
+    name: Dump Root FS
+    runs-on: ${{ matrix.runner }}
+    needs: [build]
+    strategy:
+      fail-fast: false
+      matrix:
+        platform:
+          - Windows 2025
+          - Windows 2022
+          - Windows 2019
+        include:
+          - platform: Windows 2025
+            runner: windows-2025
+          - platform: Windows 2022
+            runner: windows-2022
+          - platform: Windows 2019
+            runner: windows-2019
     steps:
       - name: Checkout Source
         uses: actions/checkout@v4
 
-      - name: Dump Registry
-        run: src/tools/grab-registry.bat
+      - name: Download DirectX Runtime
+        run: curl -L -o directx_Jun2010_redist.exe https://download.microsoft.com/download/8/4/A/84A35BF1-DAFE-4AE8-82AF-AD2AE20B6B14/directx_Jun2010_redist.exe
+
+      - name: Extract DirectX Runtime
+        run: ./directx_Jun2010_redist.exe /Q /T:"${{github.workspace}}/dxrt"
+
+      - name: Install DirectX Runtime
+        run: "cmd /c \"start /wait .\\dxrt\\dxsetup.exe /silent\""
+
+      - name: Download Windows Artifacts
+        uses: pyTooling/download-artifact@v4
+        with:
+          name: Windows Release Artifacts
+          path: build/release/artifacts
+
+      - name: Dump Root FS
+        run: src/tools/create-root.bat
+
+      - name: Dump API Set
+        run: cd root && ../build/release/artifacts/dump-apiset.exe
 
       - name: Upload Artifacts
-        uses: actions/upload-artifact@v4
+        uses: pyTooling/upload-artifact@v4
         with:
-          name: Temp Registry Dump
-          path: |
-            registry/*
+          name: ${{ matrix.platform }} Root FS
+          path: "*"
+          working-directory: root
+          retention-days: 1
 
   build:
     name: Build
@@ -55,7 +90,8 @@ jobs:
           - Windows
           - Linux GCC
           - Linux Clang
-          - macOS
+          - macOS arm64
+          - macOS x86_64
           - Android x86_64
           - Android arm64-v8a
         configuration:
@@ -73,8 +109,10 @@ jobs:
           - platform: Linux Clang
             runner: ubuntu-24.04
             clang-version: 18
-          - platform: macOS
+          - platform: macOS arm64
             runner: macos-latest
+          - platform: macOS x86_64
+            runner: macos-13
           - platform: Android x86_64
             runner: ubuntu-24.04
             abi: x86_64
@@ -127,35 +165,36 @@ jobs:
         if: ${{ !startsWith(matrix.platform, 'Android') }}
 
       - name: Upload Artifacts
-        uses: actions/upload-artifact@v4
+        uses: pyTooling/upload-artifact@v4
         with:
           name: ${{ matrix.platform }} ${{matrix.configuration}} Artifacts
-          path: |
-            build/${{matrix.preset}}/artifacts/*
+          working-directory: build/${{matrix.preset}}/artifacts/
+          path: "*"
 
       - name: Upload Test Configuration
-        uses: actions/upload-artifact@v4
+        uses: pyTooling/upload-artifact@v4
         with:
           name: Temp ${{ matrix.platform }} ${{matrix.configuration}} Test Config
-          path: |
-            build/${{matrix.preset}}/**/CTestTestfile.cmake
-
+          path: "**/CTestTestfile.cmake"
+          working-directory: build/${{matrix.preset}}
 
   test:
     name: Test
     runs-on: ${{ matrix.runner }}
-    needs: [dump-registry, build]
+    needs: [dump-root, build]
     strategy:
       fail-fast: false
       matrix:
-        platform:
-          # TODO: Move different windows platforms into registry dump matrix
+        filesystem:
           - Windows 2025
           - Windows 2022
           - Windows 2019
+        platform:
+          - Windows
           - Linux GCC
           - Linux Clang
-          - macOS
+          - macOS arm64
+          - macOS x86_64
         configuration:
           - Debug
           - Release
@@ -164,58 +203,54 @@ jobs:
             preset: debug
           - configuration: Release
             preset: release
-          - platform: Windows 2025
-            build-platform: Windows
-            runner: windows-2025
-          - platform: Windows 2022
-            build-platform: Windows
-            runner: windows-2022
-          - platform: Windows 2019
-            build-platform: Windows
-            runner: windows-2019
+          - platform: Windows
+            runner: windows-latest
           - platform: Linux GCC
-            build-platform: Linux GCC
             runner: ubuntu-24.04
           - platform: Linux Clang
-            build-platform: Linux Clang
             runner: ubuntu-24.04
-          - platform: macOS
-            build-platform: macOS
+          - platform: macOS arm64
             runner: macos-latest
+          - platform: macOS x86_64
+            runner: macos-13
     steps:
       - name: Download Test Config
-        uses: actions/download-artifact@v4
+        uses: pyTooling/download-artifact@v4
         with:
-          name: Temp ${{ matrix.build-platform }} ${{matrix.configuration}} Test Config
+          name: Temp ${{ matrix.platform }} ${{matrix.configuration}} Test Config
           path: build/${{matrix.preset}}
 
       - name: Download Artifacts
-        uses: actions/download-artifact@v4
+        uses: pyTooling/download-artifact@v4
         with:
-          name: ${{ matrix.build-platform }} ${{matrix.configuration}} Artifacts
+          name: ${{ matrix.platform }} ${{matrix.configuration}} Artifacts
           path: build/${{matrix.preset}}/artifacts
 
       - name: Download Windows Artifacts
-        uses: actions/download-artifact@v4
-        if: "${{ matrix.build-platform != 'Windows' }}"
+        uses: pyTooling/download-artifact@v4
+        if: "${{ matrix.platform != 'Windows' }}"
         with:
           name: Windows ${{matrix.configuration}} Artifacts
           path: build/${{matrix.preset}}/artifacts
 
-      - name: Download Registry Dump
-        uses: actions/download-artifact@v4
+      - name: Download Root FS
+        uses: pyTooling/download-artifact@v4
         with:
-          name: Temp Registry Dump
-          path: build/${{matrix.preset}}/artifacts/registry
+          name: ${{ matrix.filesystem }} Root FS
+          path: build/${{matrix.preset}}/artifacts/root
+
+      - name: Copy Test Sample
+        run: cp build/${{matrix.preset}}/artifacts/test-sample.exe build/${{matrix.preset}}/artifacts/root/filesys/c/
 
       - name: CMake Test
         run: cd build/${{matrix.preset}} && ctest --verbose
-        if: "${{ matrix.build-platform == 'Windows' }}"
+        env:
+          EMULATOR_ROOT: ${{github.workspace}}/build/${{matrix.preset}}/artifacts/root
 
   summary:
     name: Pipeline Summary
     runs-on: ubuntu-24.04
-    needs: [dump-registry, build, test, verify-formatting]
+    needs: [dump-root, build, test, verify-formatting]
     if: always()
     steps:
       - uses: geekyeggo/delete-artifact@v5

CMakeLists.txt

@@ -24,7 +24,11 @@ set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 set(CMAKE_OSX_DEPLOYMENT_TARGET 11.0)
-set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64")
+
+# Prevent unicorn from generating universal binaries on macOS
+# It doesn't support it, even if it thinks it does...
+set(ENV{ARCHFLAGS} "nope")
+
 
 ##########################################
 

cmake/compiler-env.cmake

@@ -26,7 +26,10 @@ set(CMAKE_INTERPROCEDURAL_OPTIMIZATION ON)
 ##########################################
 
 if(UNIX)
-  momo_add_c_and_cxx_compile_options(-fvisibility=hidden)
+  momo_add_c_and_cxx_compile_options(
+    -fvisibility=hidden
+    -ftrivial-auto-var-init=zero
+  )
 endif()
 
 ##########################################
@@ -91,6 +94,8 @@ if(MSVC)
   momo_add_release_link_options(
     #/LTCG
   )
+
+  add_compile_definitions(_CRT_SECURE_NO_WARNINGS)
 endif()
 
 ##########################################

src/analyzer/main.cpp

@@ -11,7 +11,9 @@ namespace
     {
         bool use_gdb{false};
         bool concise_logging{false};
+        bool verbose_logging{false};
         std::string registry_path{"./registry"};
+        std::string emulation_root{};
     };
 
     void watch_system_objects(windows_emulator& win_emu, const bool cache_logging)
@@ -107,6 +109,7 @@ namespace
         emulator_settings settings{
             .application = args[0],
             .registry_directory = options.registry_path,
+            .emulation_root = options.emulation_root,
             .arguments = parse_arguments(args),
             .silent_until_main = options.concise_logging,
         };
@@ -116,7 +119,7 @@ namespace
         (void)&watch_system_objects;
         watch_system_objects(win_emu, options.concise_logging);
         win_emu.buffer_stdout = true;
-        // win_emu.verbose_calls = true;
+        win_emu.verbose_calls = options.verbose_logging;
 
         const auto& exe = *win_emu.process().executable;
 
@@ -200,10 +203,23 @@ namespace
             {
                 options.use_gdb = true;
             }
+            else if (arg == "-v")
+            {
+                options.verbose_logging = true;
+            }
             else if (arg == "-c")
             {
                 options.concise_logging = true;
             }
+            else if (arg == "-e")
+            {
+                if (args.size() < 2)
+                {
+                    throw std::runtime_error("No emulation root path provided after -e");
+                }
+                arg_it = args.erase(arg_it);
+                options.emulation_root = args[0];
+            }
             else if (arg == "-r")
             {
                 if (args.size() < 2)

src/common/network/address.hpp

@@ -1,7 +1,9 @@
 #pragma once
 
 #if _WIN32
+#ifndef _CRT_SECURE_NO_WARNINGS
 #define _CRT_SECURE_NO_WARNINGS
+#endif
 #define _CRT_NO_POSIX_ERROR_CODES
 #define NOMINMAX
 #define WIN32_LEAN_AND_MEAN

src/common/platform/status.hpp

@@ -31,6 +31,8 @@ using NTSTATUS = std::uint32_t;
 #define STATUS_ACCESS_DENIED              ((NTSTATUS)0xC0000022L)
 #define STATUS_BUFFER_TOO_SMALL           ((NTSTATUS)0xC0000023L)
 #define STATUS_OBJECT_NAME_NOT_FOUND      ((NTSTATUS)0xC0000034L)
+#define STATUS_MUTANT_NOT_OWNED           ((NTSTATUS)0xC0000046L)
+#define STATUS_SEMAPHORE_LIMIT_EXCEEDED   ((NTSTATUS)0xC0000047L)
 #define STATUS_NO_TOKEN                   ((NTSTATUS)0xC000007CL)
 #define STATUS_FILE_INVALID               ((NTSTATUS)0xC0000098L)
 #define STATUS_MEMORY_NOT_ALLOCATED       ((NTSTATUS)0xC00000A0L)

src/common/platform/unicode.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <string>
+#include <filesystem>
 
 template <typename Traits>
 struct UNICODE_STRING
@@ -62,9 +63,9 @@ inline std::string w_to_u8(const std::wstring_view w_view)
 }
 
 #ifndef OS_WINDOWS
-inline int open_unicode(FILE** handle, const std::u16string& fileName, const std::u16string& mode)
+inline int open_unicode(FILE** handle, const std::filesystem::path& fileName, const std::u16string& mode)
 {
-    *handle = fopen(u16_to_u8(fileName).c_str(), u16_to_u8(mode).c_str());
+    *handle = fopen(fileName.string().c_str(), u16_to_u8(mode).c_str());
     return errno;
 }
 #else
@@ -73,8 +74,8 @@ inline std::wstring u16_to_w(const std::u16string& u16str)
     return std::wstring(reinterpret_cast<const wchar_t*>(u16str.data()), u16str.size());
 }
 
-inline auto open_unicode(FILE** handle, const std::u16string& fileName, const std::u16string& mode)
+inline auto open_unicode(FILE** handle, const std::filesystem::path& fileName, const std::u16string& mode)
 {
-    return _wfopen_s(handle, u16_to_w(fileName).c_str(), u16_to_w(mode).c_str());
+    return _wfopen_s(handle, fileName.wstring().c_str(), u16_to_w(mode).c_str());
 }
 #endif

src/common/platform/win_pefile.hpp

@@ -278,7 +278,7 @@ typedef struct _IMAGE_BASE_RELOCATION
 {
     DWORD VirtualAddress;
     DWORD SizeOfBlock;
-    WORD TypeOffset[1];
+    // WORD TypeOffset[1];
 } IMAGE_BASE_RELOCATION, *PIMAGE_BASE_RELOCATION;
 
 #endif

src/common/utils/path_key.hpp

@@ -39,7 +39,10 @@ namespace utils
 
         static std::filesystem::path canonicalize_path(const std::filesystem::path& key)
         {
-            auto path = key.lexically_normal().wstring();
+            auto key_string = key.u16string();
+            std::ranges::replace(key_string, u'\\', '/');
+
+            auto path = std::filesystem::path(key_string).lexically_normal().wstring();
             return utils::string::to_lower_consume(path);
         }