Merge branch 'main' of github.com:gdlocalisation/gdl-geode

gdlocalisation · Jan 7, 2025 · c61beae · c61beae
2 parents 8993ad8 + ee2e9de
commit c61beae
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 15 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -19,10 +19,6 @@ jobs:
           os: ubuntu-latest
           target: Android32
 
-        - name: Android64
-          os: ubuntu-latest
-          target: Android64
-
     name: ${{ matrix.config.name }}
     runs-on: ${{ matrix.config.os }}
 
@@ -34,10 +30,10 @@ jobs:
       - name: Build the mod
         uses: geode-sdk/build-geode-mod@main
         with:
-          bindings: QD-Studio/geode-bindings
-          bindings-ref: main
-          sdk: 'v3.0.0'
-          cli: 'v3.0.3'
+          # bindings: QD-Studio/geode-bindings
+          # bindings-ref: main
+          sdk: 'v4.1.2'
+          cli: 'v3.3.1'
           combine: true
           target: ${{ matrix.config.target }}
 

diff --git a/api/PageManager.cpp b/api/PageManager.cpp
@@ -2,6 +2,8 @@
 
 using namespace geode::prelude;
 
+#ifdef GEODE_IS_WINDOWS64
+
 void PageManager::freeAll() {
     for (auto& page : m_pages) {
         page.free();
@@ -73,4 +75,6 @@ PageManager::Page& PageManager::allocNewPage() {
     m_pages.push_back(Page {.m_address = (uint8_t*)newPageAddr, .m_totalSize = PAGE_SIZE, .m_offset = 0, .m_id = m_pages.size()});
 
     return m_pages.back();
-}
+}
+
+#endif
diff --git a/api/PageManager.hpp b/api/PageManager.hpp
@@ -1,7 +1,7 @@
 #pragma once
 #include <Geode/Geode.hpp>
 
-#if defined(GEODE_IS_WINDOWS64)
+#ifdef GEODE_IS_WINDOWS64
 
 class PageManager {
     struct Page {

diff --git a/api/stringPatch.cpp b/api/stringPatch.cpp
@@ -1,9 +1,12 @@
 #include "stringPatch.hpp"
 
+#ifdef GEODE_IS_WINDOWS64
 #include <Zydis/Zydis.h>
+#include <PageManager.hpp>
+#endif
+
 #include <string.h>
 #include <chrono>
-#include <PageManager.hpp>
 #include <utils.hpp>
 
 using namespace geode::prelude;
@@ -74,9 +77,9 @@ namespace gdl {
         // =========================================
 
         uint8_t* arr = (uint8_t*)srcAddr;
-        uint8_t* start = arr;
         uint8_t availableSize = 0;
         uint8_t reg = 0;
+
 
         // check for 64-bit or 16-bit operation
         if (*arr == 0x48 || *arr == 0x49 || *arr == 0x66) {
@@ -86,7 +89,7 @@ namespace gdl {
 
         if (*arr == 0x8D) { // lea
             auto modrm = gdlutils::decodeModRM(*arr);
-            availableSize += modrm.size + 1;
+            availableSize += modrm.size;
             reg = modrm.reg;
         } else if (*arr == 0x89 || *arr == 0x8B) { // mov <reg>, <reg> || mov <reg>, [mem]
             auto modrm = gdlutils::decodeModRM(*arr);

diff --git a/libs/utf8 b/libs/utf8
diff --git a/libs/zydis b/libs/zydis
diff --git a/src/patches.cpp b/src/patches.cpp
@@ -20,8 +20,10 @@ void patches::fixCyrillicP() {
     #error "Unsupported platform"
 #endif
 
+#ifdef GEODE_IS_WINDOWS
     if (res.isErr())
         log::warn("Failed to patch the Рррр fix ({}), be aware that CommentCell with cyrillic comments may crash!", res.err());
+#endif
 }
 
 void patches::patchStrings() {
+1 −1		.github/workflows/cmake-multi-platform.yml
+2 −3		CMakeLists.txt
+7 −7		README.md
+4 −4		source/utf8/core.h
+3 −3		source/utf8/unchecked.h
+6 −8		tests/CMakeLists.txt
+8 −61		.github/workflows/main.yml
+2 −0		CMakeLists.txt
+0 −25		Doxyfile.meson.in
+0 −1		assets/version-bump-checklist.txt
+1 −1		dependencies/zycore
+0 −10		dependencies/zycore.wrap
+2 −2		examples/ZydisPerfTest.c
+0 −28		examples/meson.build
+0 −25		man/meson.build
+0 −339		meson.build
+0 −87		meson_options.txt
+1 −1		resources/VersionInfo.rc
+7 −20		src/Utils.c
+0 −1		subprojects
+0 −34		tests/meson.build
+0 −42		tests/zydis_encoder_types.py
+0 −85		tools/meson.build